@sealcode/sealgen 0.19.3 → 0.19.5

package/src/forms/controls/hybrid.ts

@@ -0,0 +1,44 @@
+import { FlatTemplatable, tempstream } from "tempstream";
+import { FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
+import { FormField } from "../fields/field.js";
+import { FormDataValue } from "../form-types.js";
+import { autoWrapInput } from "../../utils/input-wrapper.js";
+
+export class Hybrid extends FormFieldControl {
+	constructor(
+		public main_field: FormField,
+		public subfields: Record<string, FormField>
+	) {
+		super(Object.values(subfields));
+		for (const [field_name, field] of Object.entries(subfields)) {
+			field.setName(`${main_field.name}[${field_name}]`);
+		}
+	}
+
+	async render(fctx: FormControlContext): Promise<FlatTemplatable> {
+		const raw_values = (fctx.data.raw_values[this.main_field.name] ||
+			{}) as Record<string, FormDataValue>;
+		const new_fctx = new FormControlContext(
+			fctx.ctx,
+			{
+				raw_values,
+				messages: [],
+				field_messages: {},
+			},
+			[],
+			fctx.field_name_prefix,
+			fctx.form_id,
+			fctx.validate
+		);
+		return tempstream`<fieldset><legend>${this.main_field.label || this.main_field.name}</legend>${Object.values(
+			this.subfields
+		).map(
+			async (subfield) =>
+				tempstream`${autoWrapInput(
+					subfield,
+					await subfield.getControl().render(new_fctx)
+				)}`
+		)}</fieldset>`;
+	}
+}

package/src/forms/controls/multiple-files.ts

@@ -231,7 +231,11 @@ export class MultipleFiles extends FormFieldControl {
 			"multiple-files",
 			["multiple-files", this.field.name, ...this.getClassModifiers()],
 			tempstream /* HTML */ `
-				<label>${this.options.label || this.field.name}</label>
+				<label
+					>${this.options.label ||
+					this.field.label ||
+					this.field.name}</label
+				>
 				<ul class="multiple-files__list">
 					${files.map(([item, file]) =>
 						this.renderFileItem(item, file)

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

@@ -6,6 +6,7 @@ import { FormField } from "../fields/field.js";
 import { FormDataValue } from "../form-types.js";
 import { FormControlContext } from "./form-control.js";
 import { FormFieldControl } from "./form-field-control.js";
+import { SimpleFormField } from "../fields/simple-form-field.js";
 
 export type SimpleInputOptions = {
 	id?: string;
@@ -19,6 +20,7 @@ export type SimpleInputOptions = {
 	step?: number;
 	suffix?: string;
 	pattern?: string;
+	inputmode?: string;
 };
 
 export class SimpleInput<
@@ -48,7 +50,7 @@ export class SimpleInput<
 	getLabel(): string {
 		return this.options.label != undefined
 			? this.options.label
-			: this.field.name;
+			: this.field.label || this.field.name;
 	}
 
 	getID(): string {
@@ -56,6 +58,9 @@ export class SimpleInput<
 	}
 
 	getPlaceholder(): string {
+		if (this.field instanceof SimpleFormField && this.field.placeholder) {
+			return this.field.placeholder;
+		}
 		return this.options.placeholder === ""
 			? ""
 			: this.options.placeholder || this.getType();
@@ -83,6 +88,9 @@ export class SimpleInput<
 			...(!this.options.autocomplete ? [["autocomplete", "off"]] : []),
 			...(this.options.step ? [["step", this.options.step]] : []),
 			["aria-invalid", String(!valid)],
+			...(this.options.inputmode
+				? [["inputmode", this.options.inputmode]]
+				: []),
 		]) as Record<string, string>;
 	}
 

package/src/forms/controls/single-reference.ts

@@ -13,7 +13,7 @@ export class SingleReferenceDropdown<
 		public options: DropdownOptions & {
 			getLabel?: (item: CollectionItem<Collection>) => string;
 		} = {
-			label: field.name,
+			label: field.label || field.name,
 			autosubmit: false,
 			autocomplete: true,
 		}

package/src/forms/controls/table.ts

@@ -159,7 +159,7 @@ export class Table<F extends Record<string, FormField>> extends FormControl {
 					: []),
 			].join(" ")}"
 		>
-			<label>${this.options.label}</label>
+			<label>${this.options.label || this.table_field.label}</label>
 			<div class="table__wrapper">
 				<table>
 					<tbody>

package/src/forms/fields/boolean.ts

@@ -68,7 +68,7 @@ export class Boolean<Required extends boolean> extends FormField<
 	}
 
 	public getControl(): Checkbox {
-		return new Checkbox(this, { label: this.name });
+		return new Checkbox(this, { label: this.label || this.name });
 	}
 
 	async getSealiousCreateValue(fctx: FormControlContext): Promise<boolean> {

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

@@ -74,6 +74,8 @@ export class CheckboxedListField<
 	}
 
 	getControl(): CheckboxedListInput<Values> {
-		return new CheckboxedListInput(this, { label: this.name });
+		return new CheckboxedListInput(this, {
+			label: this.label || this.name,
+		});
 	}
 }

package/src/forms/fields/coordinates.ts

@@ -55,7 +55,7 @@ export class Coordinates<
 
 	getControl(): DefaultControl {
 		return new SimpleInput(this, {
-			label: this.name,
+			label: this.label || this.name,
 			type: this.type,
 		}) as unknown as DefaultControl;
 	}

package/src/forms/fields/date.ts

@@ -30,7 +30,10 @@ export class DateField<Required extends boolean> extends SimpleFormField<
 	}
 
 	getControl(): SimpleInput<SimpleInputOptions> {
-		return new SimpleInput(this, { label: this.name, type: this.type });
+		return new SimpleInput(this, {
+			label: this.label || this.name,
+			type: this.type,
+		});
 	}
 
 	async getSealiousCreateValue(

package/src/forms/fields/datetime.ts

@@ -45,7 +45,7 @@ export class DateTime<Required extends boolean> extends SimpleFormField<
 
 	getControl(): SimpleInput {
 		return new SimpleInput(this, {
-			label: this.name,
+			label: this.label || this.name,
 			type: this.type,
 		});
 	}

package/src/forms/fields/deep-reverse-single-reference-table.ts

@@ -56,7 +56,7 @@ export class DeepReverseSingleReferenceTable extends Table<
 
 	getControl(): TableControl<any> {
 		return new TableControl(this, {
-			label: this.name,
+			label: this.label || this.name,
 			allow_adding: false,
 			subfield_controls: {
 				selected: this.columns.selected.getControl(),

package/src/forms/fields/email.ts

@@ -24,6 +24,9 @@ export class EmailField<
 	}
 
 	public getControl(): SimpleInput {
-		return new SimpleInput(this, { label: this.name, type: "email" });
+		return new SimpleInput(this, {
+			label: this.label || this.name,
+			type: "email",
+		});
 	}
 }

package/src/forms/fields/field.ts

@@ -66,6 +66,7 @@ export abstract class FormField<
 	SealiousValue = any,
 > {
 	name: string;
+	label: string;
 	constructor(public readonly required: Required) {}
 	predicate: Predicate = predicates.unknown;
 	mapToFilter: (parsed: ParsedValue) => unknown = (value) => value;
@@ -77,6 +78,11 @@ export abstract class FormField<
 		return this;
 	}
 
+	setLabel(label: string): this {
+		this.label = label;
+		return this;
+	}
+
 	public async _validate(
 		ctx: Context,
 		value: ParsedValue

package/src/forms/fields/fields.ts

@@ -20,6 +20,8 @@ export * from "./markdown.js";
 export * from "./multiple-files.js";
 export * from "./number.js";
 export * from "./password.js";
+export * from "./phone-number.js";
+export * from "./phone-number-with-country-code.js";
 export * from "./pick-from-list-sealious.js";
 export * from "./pick-from-list.js";
 export * from "./regexp.js";

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

@@ -37,107 +37,58 @@ 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";
 
-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.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
@@ -227,6 +178,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
@@ -308,6 +264,8 @@ export async function sealiousFieldInfoToFormField(
 			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/phone-number-with-country-code.ts

@@ -0,0 +1,59 @@
+import * as countryCodes from "country-codes-list";
+import { Context } from "koa";
+import { FieldTypes as SealiousFieldTypes } from "sealious";
+import { FormControl } from "../controls/controls.js";
+import { Hybrid } from "../controls/hybrid.js";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
+import { PickFromListField } from "./pick-from-list.js";
+import { PhoneNumberWithoutCountryCode } from "./phone-number.js";
+
+export class PhoneNumberWithCountryCode<
+	Required extends boolean,
+> extends FormField<Required, SealiousFieldTypes.PhoneNumberValue> {
+	public getEmptyValue(): SealiousFieldTypes.PhoneNumberValue {
+		return new SealiousFieldTypes.PhoneNumberValue("48", "0000000");
+	}
+
+	async parse(
+		ctx: Context,
+		raw_value: FormDataValue
+	): Promise<FieldParseResult<SealiousFieldTypes.PhoneNumberValue>> {
+		try {
+			return {
+				parsable: true,
+				parsed_value: SealiousFieldTypes.PhoneNumberValue.fromInput(
+					ctx.$context,
+					raw_value
+				),
+				error: null,
+			};
+		} catch (e) {
+			return {
+				parsable: false,
+				parsed_value: null,
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				error: e.message as string,
+			};
+		}
+	}
+
+	getControl(): FormControl {
+		return new Hybrid(this, {
+			country_code: new PickFromListField(true, async () =>
+				countryCodes
+					.all()
+					.sort((a, b) =>
+						a.countryCallingCode < b.countryCallingCode ? -1 : 1
+					)
+					.map((code) => ({
+						value: code.countryCallingCode,
+						label: "+" + code.countryCallingCode + " " + code.flag,
+					}))
+			).setLabel("Country code"),
+			number: new PhoneNumberWithoutCountryCode(true).setLabel(
+				"Phone number"
+			),
+		});
+	}
+}

package/src/forms/fields/phone-number.ts

@@ -0,0 +1,39 @@
+import { Context } from "koa";
+import { FormControl, SimpleInput } from "../controls/controls.js";
+import { FormDataValue } from "../form-types.js";
+import { FormField } from "./field.js";
+
+export class PhoneNumberWithoutCountryCode<
+	Required extends boolean,
+> extends FormField<Required, string> {
+	public getEmptyValue(): string {
+		return "000 000 000";
+	}
+
+	async parse(ctx: Context, raw_value: FormDataValue) {
+		if (typeof raw_value == "string") {
+			return {
+				parsable: <const>true,
+				parsed_value: raw_value
+					.replaceAll(/[^0-9]/, "")
+					.replace(/(\d{3})(?=\d)/g, "$1 ")
+					.trim(),
+				error: null,
+			};
+		} else {
+			return {
+				parsable: <const>false,
+				parsed_value: null,
+				error: "Expected string",
+			};
+		}
+	}
+
+	getControl(): FormControl {
+		return new SimpleInput(this, {
+			inputmode: "tel",
+			type: "text",
+			placeholder: "123 456 789",
+		});
+	}
+}

package/src/forms/fields/regexp.ts

@@ -59,7 +59,7 @@ export class RegExpField<Required extends boolean> extends FormField<
 	}
 
 	public getControl(): SimpleInput {
-		return new SimpleInput(this, { label: this.name });
+		return new SimpleInput(this, { label: this.label || this.name });
 	}
 
 	async getSealiousCreateValue(fctx: FormControlContext): Promise<string> {

package/src/forms/fields/simple-form-field.ts

@@ -14,6 +14,7 @@ export abstract class SimpleFormField<
 	Parsed = string,
 > extends FormField<Required, Parsed, DefaultControl> {
 	predicate = predicates.string;
+	public placeholder: string;
 
 	constructor(
 		required: Required,
@@ -32,6 +33,11 @@ export abstract class SimpleFormField<
 		// eslint-disable-next-line @typescript-eslint/no-base-to-string
 		return String(value) as FormDataValue;
 	}
+
+	setPlaceholder(placeholder: string) {
+		this.placeholder = placeholder;
+		return this;
+	}
 }
 
 export class TextBasedSimpleField<
@@ -76,7 +82,7 @@ export class TextBasedSimpleField<
 
 	getControl(): DefaultControl {
 		return new SimpleInput(this, {
-			label: this.name,
+			label: this.label || this.name,
 			type: this.type,
 		}) as unknown as DefaultControl;
 	}
@@ -117,7 +123,7 @@ export class NumberBasedSimpleField<
 
 	getControl(): DefaultControl {
 		return new SimpleInput(this, {
-			label: this.name,
+			label: this.label || this.name,
 			type: this.type,
 		}) as unknown as DefaultControl;
 	}

package/src/forms/fields/single-reference.ts

@@ -13,7 +13,7 @@ export class SingleReference<
 > extends CollectionField<F, Required> {
 	getControl(): SingleReferenceDropdown<TargetCollection, F, Required> {
 		return new SingleReferenceDropdown(this, {
-			label: this.name,
+			label: this.label || this.name,
 			getLabel: (item) => item.id,
 		});
 	}

package/src/forms/fields/structured-array.ts

@@ -55,7 +55,7 @@ export class StructuredArray<
 				SealiousFields[name]
 			>;
 		}>(this as any, {
-			label: this.name,
+			label: this.label || this.name,
 			subfield_controls: Object.fromEntries(
 				Object.entries(this.columns).map(([column_name, subfield]) => [
 					column_name as keyof SealiousFields,

package/src/forms/fields/table.ts

@@ -98,7 +98,7 @@ export class Table<F extends Record<string, FormField>> extends FormField<
 
 	getControl(): TableControl<F> {
 		return new TableControl<F>(this, {
-			label: this.name,
+			label: this.label || this.name,
 			subfield_controls: Object.fromEntries(
 				Object.entries(this.columns).map(([column_name, field]) => [
 					column_name as keyof F,

package/src/utils/input-wrapper.ts

@@ -1,4 +1,6 @@
 import { FlatTemplatable, tempstream } from "tempstream";
+import { FormField } from "../index.js";
+import { toKebabCase } from "js-convert-case";
 
 export function getRequiredClass(isRequired: boolean): string {
 	return isRequired ? "required" : "";
@@ -21,3 +23,15 @@ export async function inputWrapper(
 		${input}
 	</div>`;
 }
+
+export async function autoWrapInput(field: FormField, input: FlatTemplatable) {
+	return inputWrapper(
+		toKebabCase(field.constructor.name),
+		[
+			`type--` + toKebabCase(field.constructor.name),
+			`name--` + toKebabCase(field.name),
+			getRequiredClass(field.required),
+		],
+		input
+	);
+}