@sealcode/sealgen 0.18.10 → 0.19.0

package/src/forms/fields/email.ts

@@ -1,5 +1,6 @@
 import { predicates } from "@sealcode/ts-predicates";
 import { RegExpField } from "./regexp.js";
+import { SimpleInput } from "../controls/controls.js";
 
 export class EmailField<
 	Required extends boolean
@@ -17,4 +18,12 @@ export class EmailField<
 			default_value
 		);
 	}
+
+	setErrorMessage(message: string) {
+		this.error_message = message;
+	}
+
+	public getControl(): SimpleInput {
+		return new SimpleInput(this, { label: this.name, type: "email" });
+	}
 }

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

@@ -0,0 +1,48 @@
+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<
+	Values extends string
+> extends CheckboxedListField<boolean, Values> {
+	public sealious_field: SealiousFieldTypes.EnumMultiple<Values>;
+
+	constructor(sealious_field: SealiousFieldTypes.EnumMultiple<Values>) {
+		super(sealious_field.required, async (ctx: Context) =>
+			(await sealious_field.getAllowedValues(ctx.$context)).map(
+				(value: Values) => ({ value, label: value })
+			)
+		);
+		this.sealious_field = sealious_field;
+	}
+
+	generateFieldDeclaration(
+		field_info: ExtractedFieldInfo,
+		vars: { form_field_types: string; sealious_field: string }
+	): string {
+		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
+		);
+		const result = Object.entries(parsed || {})
+			.filter(([, value]) => value == "on")
+			.map(([key]) => key as Values);
+		return result;
+	}
+
+	async sealiousValueToForm(
+		ctx: Context,
+		sealious_value: Values[] | null
+	): Promise<FormDataValue> {
+		return Object.fromEntries(
+			(sealious_value || []).map((key) => [key, "on"])
+		);
+	}
+}

package/src/forms/fields/field.test.ts

@@ -7,7 +7,7 @@ import { mount } from "../../mount.js";
 import { Form } from "../form.js";
 import { getBrowser } from "../../utils/browser-creator.js";
 import assert from "assert";
-import { SimpleFormField } from "./simple-form-field.js";
+import { TextBasedSimpleField } from "./simple-form-field.js";
 import { SimpleInput } from "../controls/simple-input.js";
 import { FormData } from "../form-types.js";
 import { Boolean } from "./boolean.js";
@@ -30,7 +30,7 @@ describe("basic field", () => {
 			const router = new Router();
 
 			const fields = {
-				text: new SimpleFormField(true),
+				text: new TextBasedSimpleField(true),
 			};
 
 			let received_values: unknown;
@@ -44,7 +44,7 @@ describe("basic field", () => {
 
 					async onSubmit(ctx: Context, data: FormData) {
 						received_values = await this.getParsedValues(ctx);
-						const { parsed: email } = await this.fields.text.getValue(
+						const { parsed: email } = await this.fields.text.getParsedValue(
 							ctx,
 							data.raw_values
 						);
@@ -76,7 +76,7 @@ describe("basic field", () => {
 			let parse_called = false;
 
 			const fields = {
-				text: new (class MockField extends SimpleFormField<false> {
+				text: new (class MockField extends TextBasedSimpleField<false> {
 					public async isValueValid() {
 						is_value_valid_called = true;
 						return true as any;
@@ -127,7 +127,7 @@ describe("basic field", () => {
 			let submit_called = false;
 
 			const fields = {
-				text: new SimpleFormField(false),
+				text: new TextBasedSimpleField(false),
 				checkbox: new Boolean(false),
 			};
 

package/src/forms/fields/field.ts

@@ -1,10 +1,21 @@
+/* eslint-disable  @typescript-eslint/no-empty-function */
 import { Predicate, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
+import { Collection, CollectionItem } from "sealious";
 import { t } from "../../utils/translate.js";
-import { FormDataValue } from "../form-types.js";
+import { FormControl, FormControlContext } from "../controls/form-control.js";
+import { FormDataValue, FormData } from "../form-types.js";
+import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
+import { wrapAttribute, wrapKeyName } from "../../utils/wrap-attributes.js";
 
 export type FormFieldValidationResponse = { valid: boolean; message: string };
 
+export type FormDisplayInfo<C extends Collection> = {
+	field: keyof C["fields"];
+	label: string;
+	format?: (value: unknown, item: CollectionItem<C>) => JSX.Element;
+};
+
 export type FormFieldValidationFn<ValueType> = (
 	ctx: Context,
 	value: ValueType,
@@ -49,15 +60,20 @@ export type FieldParseResult<T> =
 
 export abstract class FormField<
 	Required extends boolean = boolean,
-	ParsedValue = unknown
+	ParsedValue = unknown,
+	DefaultFormControl extends FormControl = FormControl,
+	SealiousValue = any
 > {
 	name: string;
 	constructor(public readonly required: Required) {}
 	predicate: Predicate = predicates.unknown;
 	mapToFilter: (parsed: ParsedValue) => unknown = (value) => value;
 
-	async init(fieldname: string): Promise<void> {
-		this.name = fieldname;
+	async init(): Promise<void> {}
+
+	setName(name: string): this {
+		this.name = name;
+		return this;
 	}
 
 	public async _validate(
@@ -100,7 +116,7 @@ export abstract class FormField<
 		raw_value: FormDataValue
 	): Promise<FieldParseResult<ParsedValue>>;
 
-	async getValue(
+	async getParsedValue(
 		ctx: Context,
 		all_form_values: Record<string, FormDataValue>,
 		validate: true
@@ -110,7 +126,7 @@ export abstract class FormField<
 		parsed: ParsedValue | null;
 		raw: FormDataValue;
 	}>;
-	async getValue(
+	async getParsedValue(
 		ctx: Context,
 		all_form_values: Record<string, FormDataValue>,
 		validate?: false
@@ -119,7 +135,7 @@ export abstract class FormField<
 		parsed: ParsedValue | null;
 		raw: FormDataValue;
 	}>;
-	async getValue(
+	async getParsedValue(
 		ctx: Context,
 		all_form_values: Record<string, FormDataValue>,
 		validate = false
@@ -176,7 +192,77 @@ export abstract class FormField<
 		ctx: Context,
 		data: Record<string, FormDataValue>
 	): Promise<unknown> {
-		const { parsed } = await this.getValue(ctx, data);
+		const { parsed } = await this.getParsedValue(ctx, data);
 		return parsed;
 	}
+
+	abstract getControl(): DefaultFormControl;
+
+	getSealiousCreateValue(fctx: FormControlContext): Promise<SealiousValue> {
+		throw new Error("This field does not have a default sealious mapping");
+	}
+
+	sealiousValueToForm(
+		ctx: Context,
+		sealiousValue: SealiousValue | null,
+		item: CollectionItem<any>
+	): Promise<FormDataValue> {
+		throw new Error("This field does not have a default sealious mapping");
+	}
+
+	async postSealiousCreate(
+		ctx: Context,
+		created_item: CollectionItem<any>,
+		form_data: FormData
+	): Promise<void> {}
+
+	async postSealiousEdit(
+		ctx: Context,
+		edited_item: CollectionItem<any>,
+		form_data: FormData
+	): Promise<void> {}
+
+	generateFieldDeclaration(
+		field_info: ExtractedFieldInfo,
+		vars: { form_field_types: string; sealious_field: string }
+	): string {
+		return `new ${vars.form_field_types}.${this.constructor.name}(${String(
+			field_info.is_required
+		)})`;
+	}
+
+	generateCreateValueGetter(
+		field_info: ExtractedFieldInfo,
+		vars: {
+			form_field_types: string;
+			sealious_field: string;
+			form_fields: string;
+		}
+	): string {
+		return `${wrapKeyName(field_info.name)}: await ${
+			vars.form_fields
+		}${wrapAttribute(field_info.name)}.getSealiousCreateValue(fctx)`;
+	}
+
+	generateInitialValue(
+		field_info: ExtractedFieldInfo,
+		vars: {
+			form_field_types: string;
+			form_fields: string;
+		}
+	): string {
+		return `${wrapKeyName(field_info.name)}: await ${
+			vars.form_fields
+		}${wrapAttribute(field_info.name)}.sealiousValueToForm(ctx, item.get("${
+			field_info.name
+		}"))`;
+	}
+
+	generateImportsForFieldList(field_info: ExtractedFieldInfo): {
+		what: string;
+		from: string;
+		as?: string;
+	}[] {
+		return [];
+	}
 }

package/src/forms/fields/fields.ts

@@ -1,16 +1,31 @@
-export * from "./simple-form-field.js";
+export * from "./boolean.js";
 export * from "./checkboxed-list.js";
 export * from "./collection-field.js";
-export * from "./number.js";
-export * from "./pick-from-list.js";
-export * from "./regexp.js";
+export * from "./color.js";
+export * from "./coordinates.js";
+export * from "./date.js";
+export * from "./datetime.js";
+export * from "./deep-reverse-single-reference-list.js";
+export * from "./deep-reverse-single-reference-table.js";
 export * from "./email.js";
-export * from "./enum.js";
-export * from "./boolean.js";
-export * from "./enum-multiple.js";
+export * from "./enum-multiple-sealious.js";
 export * from "./existing-sealious-value.js";
 export * from "./file.js";
+export * from "./float.js";
+export * from "./html.js";
+export * from "./image.js";
+export * from "./int.js";
+export * from "./json.js";
+export * from "./markdown.js";
 export * from "./multiple-files.js";
-export * from "./reverse-single-reference.js";
+export * from "./number.js";
+export * from "./password.js";
+export * from "./pick-from-list-sealious.js";
+export * from "./pick-from-list.js";
+export * from "./regexp.js";
+export * from "./simple-form-field.js";
+export * from "./single-reference.js";
 export * from "./structured-array.js";
 export * from "./table.js";
+export * from "./text.js";
+export * from "./url.js";

package/src/forms/fields/file.test.ts

@@ -1,12 +1,11 @@
 import Router from "@koa/router";
 import { Context } from "koa";
-import { FileManager, FilePointer } from "@sealcode/file-manager";
+import { FilePointer } from "@sealcode/file-manager";
 import getPort from "get-port";
 import Koa from "koa";
 import fs from "node:fs/promises";
-import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 import { mount } from "../../mount.js";
-import { Photo } from "../controls/photo.js";
+import { Image } from "../controls/image.js";
 import { Form } from "../form.js";
 import { File as FileField } from "./file.js";
 import { getBrowser } from "../../utils/browser-creator.js";
@@ -33,7 +32,7 @@ describe("file field", () => {
 		const router = new Router();
 
 		const fields = {
-			file: new FileField(true, new FileManager("/tmp", "/uploaded_files")),
+			file: new FileField(true),
 		};
 
 		let received_values: any;
@@ -43,18 +42,7 @@ describe("file field", () => {
 			"/",
 			new (class extends Form<typeof fields, unknown> {
 				fields = fields;
-				controls = [
-					new Photo(
-						fields.file,
-						new KoaResponsiveImageRouter({
-							staticPath: "/tmp",
-							thumbnailSize: 10,
-							cacheManagerResolutionThreshold: 10,
-							imageStoragePath: "/tmp",
-							smartCropStoragePath: "/tmp",
-						})
-					),
-				];
+				controls = [new Image(fields.file)];
 
 				async onSubmit(ctx: Context) {
 					received_values = await this.getParsedValues(ctx);

package/src/forms/fields/file.ts

@@ -1,12 +1,10 @@
 import { hasFieldOfType, is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import {
-	FileManager,
-	FilePointer,
-	PathFilePointer,
-} from "@sealcode/file-manager";
+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";
 
 export type FileContainer = {
 	old: FilePointer | null;
@@ -15,22 +13,20 @@ export type FileContainer = {
 
 export class File<Required extends boolean> extends FormField<
 	Required,
-	FileContainer
+	FileContainer,
+	FormControl
 > {
-	constructor(
-		public readonly required: Required,
-		public file_manager: FileManager
-	) {
+	constructor(public readonly required: Required) {
 		super(required);
 	}
 
 	async parse(
-		_ctx: Context,
+		ctx: Context,
 		raw_value: FormDataValue
 	): Promise<FieldParseResult<FileContainer>> {
 		let result;
 		if (is(raw_value, predicates.string)) {
-			const file = await this.file_manager.fromToken(raw_value);
+			const file = await ctx.$app.fileManager.fromToken(raw_value);
 			result = {
 				parsed_value: { old: file, new: null },
 				error: null,
@@ -48,7 +44,7 @@ export class File<Required extends boolean> extends FormField<
 				"old",
 				predicates.instanceOf(PathFilePointer)
 			)
-				? await this.file_manager.toPointer(
+				? await ctx.$app.fileManager.toPointer(
 						raw_value.old as string | FilePointer
 				  )
 				: null;
@@ -70,16 +66,48 @@ export class File<Required extends boolean> extends FormField<
 				parsed_value: { old: old_file, new: new_file },
 			};
 		}
-
 		return result;
 	}
 
 	async getDatabaseValue(ctx: Context, data: Record<string, FormDataValue>) {
-		const { parsed } = await this.getValue(ctx, data);
+		const { parsed } = await this.getParsedValue(ctx, data);
 		return parsed?.new || undefined;
 	}
 
 	getEmptyValue() {
 		return { old: null, new: null };
 	}
+
+	getControl(...args: any[]): FileControl {
+		return new FileControl(this, { label: this.name, autocomplete: false });
+	}
+
+	async getSealiousCreateValue(
+		fctx: FormControlContext
+	): 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");
+		}
+		return pointer;
+	}
+
+	async sealiousValueToForm(
+		ctx: Context,
+		sealiousValue: FilePointer | string | null
+	): Promise<{ old: FilePointer | undefined } | Record<string, never>> {
+		if (!sealiousValue) {
+			return {};
+		}
+		if (typeof sealiousValue == "string") {
+			sealiousValue = await ctx.$app.fileManager.fromToken(sealiousValue);
+		}
+		return {
+			old: sealiousValue, // FilePointer
+		};
+	}
 }

package/src/forms/fields/float.ts

@@ -0,0 +1,9 @@
+import { NumberBasedSimpleField } from "./simple-form-field.js";
+
+export class Float<
+	Required extends boolean
+> extends NumberBasedSimpleField<Required> {
+	constructor(required: Required) {
+		super(required, "number");
+	}
+}