@sealcode/sealgen 0.19.32 → 0.19.33

package/src/forms/fields/collection-field.ts

@@ -1,7 +1,16 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { Depromisify, ExtractFieldDecoded, Field } from "sealious";
-import { SimpleInput } from "../controls/controls.js";
+import {
+	CollectionItem,
+	Depromisify,
+	ExtractFieldDecoded,
+	ExtractFieldInput,
+	Field as SealiousField,
+	FieldTypes as SealiousFieldTypes,
+} from "sealious";
+import { FormControl } from "../controls/controls.js";
 import { FormDataValue } from "../form-types.js";
 
 import {
@@ -10,12 +19,42 @@ import {
 	FormFieldValidationResponse,
 } from "./field.js";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
+import { TextBasedSimpleField } from "./simple-form-field.js";
+import { Image as ImageField } from "./image.js";
+import { wrapAttribute, wrapKeyName } from "../../utils/wrap-attributes.js";
+import { StructuredSealiousField } from "./structured.js";
+
+export function sealiousFieldToFormField(
+	sealiousField: SealiousField<any>,
+	field_name: string,
+	prefix: string
+): FormField {
+	const name = prefix ? `${prefix}[${field_name}]` : field_name;
+	let formfield: FormField = new TextBasedSimpleField(false);
+	if (sealiousField instanceof SealiousFieldTypes.Image) {
+		formfield = new ImageField(false);
+	}
+	if (sealiousField instanceof SealiousFieldTypes.Structured) {
+		formfield = new StructuredSealiousField(sealiousField);
+	}
+	formfield.setName(name);
+	formfield.setLabel(field_name);
+	if (prefix) {
+		formfield.setValuePath(prefix + "." + field_name);
+	}
+
+	return formfield;
+}
 
 export class CollectionField<
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	F extends Field<any>,
+	F extends SealiousField<any>,
 	Required extends boolean,
-> extends FormField<Required, ExtractFieldDecoded<F> | null, SimpleInput> {
+> extends FormField<
+	Required,
+	ExtractFieldDecoded<F>,
+	FormControl,
+	ExtractFieldInput<F>
+> {
 	constructor(
 		required: Required,
 		public sealiousField: F
@@ -28,9 +67,9 @@ export class CollectionField<
 	async parse(
 		ctx: Context,
 		raw_value: FormDataValue
-	): Promise<FieldParseResult<ExtractFieldDecoded<F> | null>> {
+	): Promise<FieldParseResult<ExtractFieldDecoded<F>>> {
 		if (raw_value === undefined) {
-			return { parsable: true, parsed_value: null, error: null };
+			return { parsable: true, parsed_value: {} as any, error: null };
 		}
 		const encoded_value = (await this.sealiousField.encode(
 			ctx.$context,
@@ -55,7 +94,7 @@ export class CollectionField<
 	): Promise<FormFieldValidationResponse> {
 		const { valid, reason } = await this.sealiousField.checkValue(
 			ctx.$context,
-			value,
+			this.parsedToSealious(value),
 			undefined,
 			null,
 			undefined
@@ -63,13 +102,36 @@ export class CollectionField<
 		return { valid, message: reason || (!valid ? "Wrong value" : "") };
 	}
 
+	async parsedToSealious(parsed: unknown): Promise<ExtractFieldInput<F>> {
+		return sealiousFieldToFormField(
+			this.sealiousField,
+			this.name,
+			""
+		).parsedToSealious(parsed) as ExtractFieldInput<F>;
+	}
+
 	public getEmptyValue(): ExtractFieldDecoded<F> {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 		return "" as unknown as ExtractFieldDecoded<F>;
 	}
 
-	getControl(): SimpleInput {
-		return new SimpleInput(this);
+	async sealiousValueToForm(
+		ctx: Context,
+		value: any,
+		item: CollectionItem<any>
+	): Promise<FormDataValue> {
+		return sealiousFieldToFormField(
+			this.sealiousField,
+			this.name,
+			""
+		).sealiousValueToForm(ctx, value, item);
+	}
+
+	getControl(): FormControl {
+		return sealiousFieldToFormField(
+			this.sealiousField,
+			this.name,
+			""
+		).getControl();
 	}
 
 	generateFieldDeclaration(
@@ -80,4 +142,19 @@ export class CollectionField<
 			field_info.is_required
 		)}, ${vars.sealious_field})`;
 	}
+
+	generateInitialValue(
+		field_info: ExtractedFieldInfo,
+		vars: {
+			form_field_types: string;
+			form_fields: string;
+		}
+	): string {
+		// compared to the version in native field, we add the third argument here
+		return `${wrapKeyName(field_info.name)}: await ${
+			vars.form_fields
+		}${wrapAttribute(field_info.name)}.sealiousValueToForm(ctx, item.get("${
+			field_info.name
+		}"), item)`;
+	}
 }

package/src/forms/fields/coordinates.ts

@@ -1,5 +1,5 @@
 import { Context } from "koa";
-import { FormControl, FormControlContext } from "../controls/form-control.js";
+import { FormControl } from "../controls/form-control.js";
 import { SimpleInput } from "../controls/simple-input.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult } from "./field.js";
@@ -39,13 +39,9 @@ export class Coordinates<
 		};
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
+	async parsedToSealious(
+		parsed: [number, number]
 	): Promise<[number, number] | undefined> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
 		return parsed || undefined;
 	}
 

package/src/forms/fields/date.ts

@@ -1,5 +1,4 @@
 import { Context } from "koa";
-import { FormControlContext } from "../controls/form-control.js";
 import { SimpleInput, SimpleInputOptions } from "../controls/simple-input.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult } from "./field.js";
@@ -36,16 +35,7 @@ export class DateField<Required extends boolean> extends SimpleFormField<
 		});
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
-	): Promise<string | null> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
-		if (!parsed) {
-			return null;
-		}
+	async parsedToSealious(parsed: Date): Promise<string | null> {
 		return `${parsed.getFullYear()}-${(parsed.getMonth() + 1)
 			.toString()
 			.padStart(2, "0")}-${parsed.getDate().toString().padStart(2, "0")}`;

package/src/forms/fields/datetime.ts

@@ -1,6 +1,5 @@
 import { Context } from "koa";
 import { SimpleInput } from "../controls/controls.js";
-import { FormControlContext } from "../controls/form-control.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult } from "./field.js";
 import { SimpleFormField } from "./simple-form-field.js";
@@ -30,16 +29,7 @@ export class DateTime<Required extends boolean> extends SimpleFormField<
 		return { parsable: true, error: null, parsed_value };
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
-	): Promise<number | null> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
-		if (parsed == null) {
-			return null;
-		}
+	async parsedToSealious(parsed: Date): Promise<number | null> {
 		return new Date(parsed).getTime();
 	}
 

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

@@ -32,7 +32,7 @@ export class DeepReverseSingleReferenceList extends CheckboxedListField<
 		this.item_label_getter = getter;
 	}
 
-	getSealiousCreateValue(): never {
+	parsedToSealious(): never {
 		throw new Error(
 			"This field is not set directly through field value, but instead relies on postSealiousCreate and postSealiousEdit"
 		);

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

@@ -10,7 +10,6 @@ import { Table } from "./table.js";
 import { Table as TableControl } from "../controls/table.js";
 import { Context } from "koa";
 import { FormDataValue, FormData } from "../form-types.js";
-import { FormControlContext } from "../controls/form-control.js";
 import { HiddenInput } from "../controls/hidden-input.js";
 import { FormField } from "./field.js";
 
@@ -87,7 +86,7 @@ export class DeepReverseSingleReferenceTable extends Table<
 		});
 	}
 
-	getSealiousCreateValue(_fctx: FormControlContext): Promise<unknown> {
+	parsedToSealious(_value: any): Promise<unknown> {
 		throw new Error("Method not implemented.");
 	}
 

package/src/forms/fields/enum-multiple-sealious.ts

@@ -2,7 +2,6 @@ import { FieldTypes as SealiousFieldTypes } from "sealious";
 import { Context } from "koa";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
 import { CheckboxedListField } from "./checkboxed-list.js";
-import { FormControlContext } from "../controls/form-control.js";
 import { FormDataValue } from "../form-types.js";
 
 export class EnumMultipleSealious<
@@ -26,11 +25,7 @@ export class EnumMultipleSealious<
 		return `new ${vars.form_field_types}.${this.constructor.name}(${vars.sealious_field})`;
 	}
 
-	async getSealiousCreateValue(fctx: FormControlContext): Promise<Values[]> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
+	async parsedToSealious(parsed: Record<string, unknown>): Promise<Values[]> {
 		const result = Object.entries(parsed || {})
 			.filter(([, value]) => value == "on")
 			.map(([key]) => key as Values);

package/src/forms/fields/field.ts

@@ -8,6 +8,8 @@ import { FormDataValue, FormData } from "../form-types.js";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
 import { wrapAttribute, wrapKeyName } from "../../utils/wrap-attributes.js";
 
+import { getProperty } from "dot-prop";
+
 export type FormFieldValidationResponse = { valid: boolean; message: string };
 
 export type FormDisplayInfo<C extends Collection> = {
@@ -65,6 +67,7 @@ export abstract class FormField<
 	SealiousValue = any,
 > {
 	name!: string;
+	value_path: string | undefined;
 	label!: string;
 	constructor(public readonly required: Required) {}
 	predicate: Predicate = predicates.unknown;
@@ -88,6 +91,15 @@ export abstract class FormField<
 		return this;
 	}
 
+	public getValuePath() {
+		return this.value_path || this.name;
+	}
+
+	public setValuePath(path: string) {
+		this.value_path = path;
+		return this;
+	}
+
 	public async _validate(
 		ctx: Context,
 		value: ParsedValue
@@ -157,7 +169,7 @@ export abstract class FormField<
 		parsed: ParsedValue | null;
 		raw: FormDataValue;
 	}> {
-		const raw = all_form_values[this.name];
+		const raw = getProperty(all_form_values, this.getValuePath());
 		if (raw == undefined || raw == null || raw == "") {
 			return {
 				parsed: null,
@@ -186,14 +198,14 @@ export abstract class FormField<
 				parsed: parsed_value,
 				...(validate ? { valid } : {}),
 				message,
-				raw: all_form_values[this.name],
+				raw,
 			};
 		} else {
 			return { parsed: parsed_value, raw, message: "parsed" };
 		}
 	}
 
-	setMapToFilter(fn: (parsed: ParsedValue) => unknown) {
+	setMapToFilter(fn: (parsed: ParsedValue | null) => unknown) {
 		this.mapToFilter = fn;
 		return this;
 	}
@@ -209,7 +221,11 @@ export abstract class FormField<
 
 	abstract getControl(): DefaultFormControl;
 
-	getSealiousCreateValue(fctx: FormControlContext): Promise<SealiousValue> {
+	getSealiousCreateValue(fctx: FormControlContext): never {
+		throw new Error("This field does not have a default sealious mapping");
+	}
+
+	parsedToSealious(parsed: ParsedValue): any {
 		throw new Error("This field does not have a default sealious mapping");
 	}
 
@@ -218,7 +234,9 @@ export abstract class FormField<
 		sealiousValue: SealiousValue | null,
 		item: CollectionItem<any>
 	): Promise<FormDataValue> {
-		throw new Error("This field does not have a default sealious mapping");
+		throw new Error(
+			`Field '${this.name}' does not have a default sealious mapping`
+		);
 	}
 
 	async postSealiousCreate(
@@ -252,7 +270,7 @@ export abstract class FormField<
 	): string {
 		return `${wrapKeyName(field_info.name)}: await ${
 			vars.form_fields
-		}${wrapAttribute(field_info.name)}.getSealiousCreateValue(fctx)`;
+		}${wrapAttribute(field_info.name)}.parsedToSealious(data${wrapAttribute(field_info.name)})`;
 	}
 
 	generateInitialValue(

package/src/forms/fields/fields.ts

@@ -32,3 +32,4 @@ export * from "./structured-array.js";
 export * from "./table.js";
 export * from "./text.js";
 export * from "./url.js";
+export * from "./structured.js";

package/src/forms/fields/file.ts

@@ -4,7 +4,8 @@ import { FilePointer, PathFilePointer } from "@sealcode/file-manager";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult, FormField } from "./field.js";
 import { File as FileControl } from "../controls/file.js";
-import { FormControl, FormControlContext } from "../controls/form-control.js";
+import { FormControl } from "../controls/form-control.js";
+import { ImageValue } from "sealious";
 
 export type FileContainer = {
 	old: FilePointer | null;
@@ -45,7 +46,7 @@ export class File<Required extends boolean> extends FormField<
 						raw_value,
 						"old",
 						predicates.instanceOf(PathFilePointer)
-					)
+					) && raw_value.old
 				) ?
 					await ctx.$app.fileManager.toPointer(raw_value.old)
 				:	null;
@@ -88,13 +89,9 @@ export class File<Required extends boolean> extends FormField<
 		return new FileControl(this, { label: this.name, autocomplete: false });
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
+	async parsedToSealious(
+		value: FileContainer
 	): Promise<FilePointer | undefined> {
-		const { parsed: value } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
 		const pointer = value?.new || value?.old || undefined;
 		if (this.required && !pointer) {
 			throw new Error("File is required, but no value is provided");
@@ -104,11 +101,14 @@ export class File<Required extends boolean> extends FormField<
 
 	async sealiousValueToForm(
 		ctx: Context,
-		sealiousValue: FilePointer | string | null
+		sealiousValue: FilePointer | ImageValue | string | null
 	): Promise<{ old: FilePointer | undefined } | Record<string, never>> {
 		if (!sealiousValue) {
 			return {};
 		}
+		if (sealiousValue instanceof ImageValue) {
+			return { old: sealiousValue.toFile() };
+		}
 		if (typeof sealiousValue == "string") {
 			sealiousValue = await ctx.$app.fileManager.fromToken(sealiousValue);
 		}

package/src/forms/fields/int.ts

@@ -1,4 +1,3 @@
-import { FormControlContext } from "../controls/form-control.js";
 import { NumberBasedSimpleField } from "./simple-form-field.js";
 
 export class Int<
@@ -8,16 +7,7 @@ export class Int<
 		super(required, "number");
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
-	): Promise<number | undefined> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
-		if (parsed == null) {
-			return undefined;
-		}
+	async parsedToSealious(parsed: number): Promise<number | undefined> {
 		if (isNaN(parsed)) {
 			return undefined;
 		} else return parsed;

package/src/forms/fields/json.ts

@@ -1,5 +1,4 @@
 import { Context } from "koa";
-import { FormControlContext } from "../controls/form-control.js";
 import { Textarea } from "../controls/textarea.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult } from "./field.js";
@@ -36,13 +35,9 @@ export class JSONField<Required extends boolean> extends SimpleFormField<
 		};
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
+	async parsedToSealious(
+		parsed: Record<string, unknown>
 	): Promise<Record<string, unknown> | null> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
 		return parsed;
 	}
 }

package/src/forms/fields/phone-number-with-country-code.ts

@@ -7,7 +7,6 @@ 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";
-import { FormControlContext } from "../../index.js";
 
 export class PhoneNumberWithCountryCode<
 	Required extends boolean,
@@ -57,11 +56,9 @@ export class PhoneNumberWithCountryCode<
 		});
 	}
 
-	async getSealiousCreateValue(fctx: FormControlContext): Promise<string> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
+	async parsedToSealious(
+		parsed: SealiousFieldTypes.PhoneNumberValue
+	): Promise<string> {
 		if (!parsed) {
 			return "";
 		}

package/src/forms/fields/regexp.ts

@@ -3,7 +3,6 @@ import { Context } from "koa";
 import { SimpleInput } from "../controls/simple-input.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult, FormField } from "./field.js";
-import { FormControlContext } from "../controls/form-control.js";
 
 export class RegExpField<Required extends boolean> extends FormField<
 	Required,
@@ -62,11 +61,7 @@ export class RegExpField<Required extends boolean> extends FormField<
 		return new SimpleInput(this, { label: this.label || this.name });
 	}
 
-	async getSealiousCreateValue(fctx: FormControlContext): Promise<string> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
+	async parsedToSealious(parsed: string): Promise<string> {
 		return parsed || "";
 	}
 

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

@@ -4,9 +4,8 @@ import { Context } from "koa";
 import { predicates } from "@sealcode/ts-predicates";
 import { FieldParseResult, FormField } from "./field.js";
 import { SimpleInput } from "../controls/simple-input.js";
-import { FormControl } from "../controls/controls.js";
+import { FormControl, Textarea } from "../controls/controls.js";
 import { CollectionItem } from "sealious";
-import { FormControlContext } from "../controls/form-control.js";
 
 export abstract class SimpleFormField<
 	Required extends boolean,
@@ -56,17 +55,8 @@ export class TextBasedSimpleField<
 		};
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
-	): Promise<string | null> {
-		if (this.disabled) {
-			return null;
-		}
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
-		return parsed || "";
+	async parsedToSealious(value: string): Promise<string> {
+		return value || "";
 	}
 
 	async postSealiousCreate(
@@ -84,7 +74,7 @@ export class TextBasedSimpleField<
 	): Promise<void> {}
 
 	getControl(): DefaultControl {
-		return new SimpleInput(this, {
+		return new Textarea(this, {
 			label: this.label || this.name,
 			type: this.type,
 		}) as unknown as DefaultControl;
@@ -110,14 +100,8 @@ export class NumberBasedSimpleField<
 		};
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
-	): Promise<number | undefined> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
-		return parsed || 0;
+	async parsedToSealious(value: number): Promise<number | undefined> {
+		return value || 0;
 	}
 
 	async postSealiousCreate(): Promise<void> {}

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

@@ -1,7 +1,10 @@
-import { Collection, FieldTypes as SealiousFieldTypes } from "sealious";
+import {
+	Collection,
+	ExtractFieldInput,
+	FieldTypes as SealiousFieldTypes,
+} from "sealious";
 import { CollectionField } from "./collection-field.js";
 import { SingleReferenceDropdown } from "../controls/single-reference.js";
-import { FormControlContext } from "../controls/form-control.js";
 import { Context } from "koa";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
 import { toPascalCase } from "js-convert-case";
@@ -18,14 +21,8 @@ export class SingleReference<
 		});
 	}
 
-	async getSealiousCreateValue(
-		fctx: FormControlContext
-	): Promise<string | undefined> {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
-		return parsed || undefined;
+	async parsedToSealious(parsed: string): Promise<ExtractFieldInput<F>> {
+		return (parsed || "") as ExtractFieldInput<F>;
 	}
 
 	async sealiousValueToForm(_ctx: Context, value: string | null) {

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

@@ -1,5 +1,4 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
-/* eslint-disable  @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
@@ -14,7 +13,7 @@ import {
 	sealiousToFormField,
 	SealiousToFormField,
 } from "./get-field-for-sealious.js";
-import { FormControl, FormControlContext } from "../controls/form-control.js";
+import { FormControl } from "../controls/form-control.js";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
 import { Table } from "./table.js";
 
@@ -73,11 +72,7 @@ export class StructuredArray<
 		return `new ${vars.form_field_types}.${this.constructor.name}(${vars.sealious_field})`;
 	}
 
-	async getSealiousCreateValue(fctx: FormControlContext) {
-		const { parsed } = await this.getParsedValue(
-			fctx.ctx,
-			fctx.data.raw_values
-		);
+	async parsedToSealious(parsed: any): Promise<any> {
 		return parsed || this.getEmptyValue();
 	}