@sealcode/sealgen 0.19.4 → 0.19.6

package/src/forms/fields/get-field-for-sealious.ts

@@ -37,107 +37,61 @@ import extract_fields_from_collection, {
 import { EnumMultipleSealious } from "./enum-multiple-sealious.js";
 import { URLField } from "./url.js";
 import { Image } from "./image.js";
+import { PhoneNumberWithCountryCode } from "./phone-number-with-country-code.js";
+import { ItemDraft } from "./item-draft.js";
 
-export type SealiousToFormField<T> = T extends SealiousFieldTypes.Boolean
-	? BooleanField<false>
-	: T extends SealiousFieldTypes.Color
-		? Color<false>
-		: T extends SealiousFieldTypes.ControlAccess<infer R>
-			? SealiousToFormField<R>
-			: T extends SealiousFieldTypes.Date
-				? DateField<false>
-				: T extends SealiousFieldTypes.DateTime
-					? DateTime<false>
-					: T extends SealiousFieldTypes.DeepReverseSingleReference
-						?
-								| DeepReverseSingleReferenceList
-								| DeepReverseSingleReferenceTable
-						: T extends SealiousFieldTypes.DisallowUpdate<
-									any,
-									any,
-									any,
-									infer R
-							  >
-							? SealiousToFormField<R>
-							: T extends SealiousFieldTypes.Email
-								? EmailField<false>
-								: T extends SealiousFieldTypes.Enum<any>
-									? PickFromListSealious<false>
-									: T extends SealiousFieldTypes.EnumMultiple<
-												infer R
-										  >
-										? R extends string[]
-											? EnumMultipleSealious<R>
-											: TextBasedSimpleField<false>
-										: T extends SealiousFieldTypes.File
-											? File<false>
-											: T extends SealiousFieldTypes.Float
-												? Float<false>
-												: T extends SealiousFieldTypes.HTML
-													? HTML<false>
-													: T extends SealiousFieldTypes.Image
-														? Image<false>
-														: T extends SealiousFieldTypes.Int
-															? Int<false>
-															: T extends SealiousFieldTypes.JsonObject
-																? JSONField<false>
-																: T extends SealiousFieldTypes.JDD
-																	? TextBasedSimpleField<
-																			false,
-																			SimpleInput
-																		>
-																	: T extends SealiousFieldTypes.Password
-																		? Password<false>
-																		: T extends SealiousFieldTypes.ReverseSingleReference
-																			? TextBasedSimpleField<
-																					false,
-																					SimpleInput
-																				>
-																			: T extends SealiousFieldTypes.SecretToken
-																				? TextBasedSimpleField<
-																						false,
-																						SimpleInput
-																					>
-																				: T extends SealiousFieldTypes.SettableBy<
-																							infer R
-																					  >
-																					? SealiousToFormField<R>
-																					: T extends SealiousFieldTypes.SingleReference
-																						? SingleReference<
-																								Collection,
-																								boolean,
-																								T
-																							>
-																						: T extends SealiousFieldTypes.Text
-																							? Text<false>
-																							: T extends SealiousFieldTypes.Username
-																								? CollectionField<
-																										SealiousFieldTypes.Username,
-																										false
-																									>
-																								: T extends SealiousFieldTypes.ValueExistingInCollection
-																									? SimpleFormField<false>
-																									: T extends SealiousFieldTypes.ValueNotExistingInCollection
-																										? SimpleFormField<false>
-																										: T extends SealiousRequiredField<
-																													any,
-																													any,
-																													any
-																											  >
-																											? SimpleFormField<false>
-																											: T extends SealiousFieldTypes.Url
-																												? URLField<false>
-																												: T extends SealiousFieldTypes.Money
-																													? SimpleFormField<false>
-																													: T extends SealiousFieldTypes.Markdown
-																														? Markdown<false>
-																														: T extends SealiousFieldTypes.Coordinates
-																															? Coordinates<false>
-																															: T extends SealiousFieldTypes.StructuredArray<
-																																		infer R
-																																  >
-																																? StructuredArrayField<R>
-																																: TextBasedSimpleField<any>;
+export type SealiousToFormField<T> =
+	T extends SealiousFieldTypes.Boolean ? BooleanField<false>
+	: T extends SealiousFieldTypes.Color ? Color<false>
+	: T extends SealiousFieldTypes.ControlAccess<infer R> ?
+		SealiousToFormField<R>
+	: T extends SealiousFieldTypes.Date ? DateField<false>
+	: T extends SealiousFieldTypes.DateTime ? DateTime<false>
+	: T extends SealiousFieldTypes.DeepReverseSingleReference ?
+		DeepReverseSingleReferenceList | DeepReverseSingleReferenceTable
+	: T extends SealiousFieldTypes.DisallowUpdate<any, any, any, infer R> ?
+		SealiousToFormField<R>
+	: T extends SealiousFieldTypes.Email ? EmailField<false>
+	: T extends SealiousFieldTypes.Enum<any> ? PickFromListSealious<false>
+	: T extends SealiousFieldTypes.EnumMultiple<infer R> ?
+		R extends string[] ?
+			EnumMultipleSealious<R>
+		:	TextBasedSimpleField<false>
+	: T extends SealiousFieldTypes.File ? File<false>
+	: T extends SealiousFieldTypes.Float ? Float<false>
+	: T extends SealiousFieldTypes.HTML ? HTML<false>
+	: T extends SealiousFieldTypes.Image ? Image<false>
+	: T extends SealiousFieldTypes.Int ? Int<false>
+	: T extends SealiousFieldTypes.ItemDraft<infer C extends Collection> ?
+		ItemDraft<C>
+	: T extends SealiousFieldTypes.JsonObject ? JSONField<false>
+	: T extends SealiousFieldTypes.JDD ?
+		TextBasedSimpleField<false, SimpleInput>
+	: T extends SealiousFieldTypes.Password ? Password<false>
+	: T extends SealiousFieldTypes.PhoneNumber ?
+		PhoneNumberWithCountryCode<false>
+	: T extends SealiousFieldTypes.ReverseSingleReference ?
+		TextBasedSimpleField<false, SimpleInput>
+	: T extends SealiousFieldTypes.SecretToken ?
+		TextBasedSimpleField<false, SimpleInput>
+	: T extends SealiousFieldTypes.SettableBy<infer R> ? SealiousToFormField<R>
+	: T extends SealiousFieldTypes.SingleReference ?
+		SingleReference<Collection, boolean, T>
+	: T extends SealiousFieldTypes.Text ? Text<false>
+	: T extends SealiousFieldTypes.Username ?
+		CollectionField<SealiousFieldTypes.Username, false>
+	: T extends SealiousFieldTypes.ValueExistingInCollection ?
+		SimpleFormField<false>
+	: T extends SealiousFieldTypes.ValueNotExistingInCollection ?
+		SimpleFormField<false>
+	: T extends SealiousRequiredField<any, any, any> ? SimpleFormField<false>
+	: T extends SealiousFieldTypes.Url ? URLField<false>
+	: T extends SealiousFieldTypes.Money ? SimpleFormField<false>
+	: T extends SealiousFieldTypes.Markdown ? Markdown<false>
+	: T extends SealiousFieldTypes.Coordinates ? Coordinates<false>
+	: T extends SealiousFieldTypes.StructuredArray<infer R> ?
+		StructuredArrayField<R>
+	:	TextBasedSimpleField<any>;
 
 export function sealiousToFormField<SF extends SealiousField<any>>(
 	sealious_field: SF
@@ -219,6 +173,9 @@ export function sealiousToFormField<SF extends SealiousField<any>>(
 	if (sealious_field instanceof SealiousFieldTypes.Int) {
 		return new Int(sealious_field.required) as SealiousToFormField<SF>;
 	}
+	if (sealious_field instanceof SealiousFieldTypes.ItemDraft) {
+		return new ItemDraft(sealious_field) as SealiousToFormField<SF>;
+	}
 	if (sealious_field instanceof SealiousFieldTypes.JsonObject) {
 		return new JSONField(
 			sealious_field.required
@@ -227,6 +184,11 @@ export function sealiousToFormField<SF extends SealiousField<any>>(
 	if (sealious_field instanceof SealiousFieldTypes.Password) {
 		return new Password(sealious_field.required) as SealiousToFormField<SF>;
 	}
+	if (sealious_field instanceof SealiousFieldTypes.PhoneNumber) {
+		return new PhoneNumberWithCountryCode(
+			sealious_field.required
+		) as SealiousToFormField<SF>;
+	}
 	if (sealious_field instanceof SealiousFieldTypes.SettableBy) {
 		return sealiousToFormField(
 			sealious_field.virtual_field
@@ -304,10 +266,14 @@ export async function sealiousFieldInfoToFormField(
 			return new Image(field_info.is_required);
 		case "int":
 			return new Int(field_info.is_required);
+		case "item-draft":
+			return new ItemDraft({ target_collection: { fields: {} } } as any);
 		case "json-object":
 			return new JSONField(field_info.is_required);
 		case "password":
 			return new Password(field_info.is_required);
+		case "phone-number":
+			return new PhoneNumberWithCountryCode(field_info.is_required);
 		case "single-reference":
 			return new SingleReference(false, {} as any);
 		case "text":

package/src/forms/fields/hybrid.ts

@@ -0,0 +1,47 @@
+/* eslint @typescript-eslint/no-unsafe-argument: off, @typescript-eslint/no-explicit-any: off, @typescript-eslint/no-unsafe-member-access: off */
+import { Context } from "koa";
+import { Hybrid as HybridControl } from "../controls/hybrid.js";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
+
+export class Hybrid<Fields extends Record<string, FormField>> extends FormField<
+	true,
+	Record<string, unknown>
+> {
+	constructor(public subfields: Fields) {
+		super(true);
+	}
+
+	public getEmptyValue(): Record<string, unknown> {
+		return {};
+	}
+
+	async parse(
+		ctx: Context,
+		raw_value: FormDataValue
+	): Promise<FieldParseResult<Record<string, unknown>>> {
+		return {
+			parsable: true,
+			error: null,
+			parsed_value: Object.fromEntries(
+				await Promise.all(
+					Object.entries(this.subfields).map(
+						async ([key, subfield]) => [
+							key,
+							(
+								await subfield.getParsedValue(
+									ctx,
+									(raw_value as any)[key]
+								)
+							).parsed as FormDataValue,
+						]
+					)
+				)
+			) as Record<string, unknown>,
+		};
+	}
+
+	getControl(): HybridControl {
+		return new HybridControl(this, this.subfields);
+	}
+}

package/src/forms/fields/item-draft.ts

@@ -0,0 +1,44 @@
+import { Collection, FieldTypes as SealiousFieldTypes } from "sealious";
+import { sealiousToFormField } from "./get-field-for-sealious.js";
+import { Hybrid } from "./hybrid.js";
+import { FormField } from "./field.js";
+import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
+import { toPascalCase } from "js-convert-case";
+
+export class ItemDraft<C extends Collection> extends Hybrid<{
+	[name in keyof C["fields"]]: FormField;
+}> {
+	constructor(public sealious_field: SealiousFieldTypes.ItemDraft<C>) {
+		super(
+			Object.fromEntries(
+				Object.entries(sealious_field.target_collection.fields).map(
+					([field_name, sealious_field]) => [
+						field_name,
+						sealiousToFormField(sealious_field),
+					]
+				)
+			) as unknown as {
+				[name in keyof C["fields"]]: FormField;
+			}
+		);
+	}
+
+	generateFieldDeclaration(
+		field_info: ExtractedFieldInfo,
+		vars: { form_field_types: string; sealious_field: string }
+	): string {
+		return `new ${vars.form_field_types}.${this.constructor.name}<typeof ${toPascalCase(field_info.target!)}>(${vars.sealious_field})`;
+	}
+
+	generateImportsForFieldList(
+		field_info: ExtractedFieldInfo
+	): { what: string; from: string; as?: string; type?: boolean }[] {
+		return [
+			{
+				what: toPascalCase(field_info.target!),
+				from: "src/back/collections/collections.js",
+				type: true,
+			},
+		];
+	}
+}

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) => {