@sealcode/sealgen 0.19.31 → 0.19.33

package/@types/forms/controls/dropdown.d.ts

@@ -15,10 +15,10 @@ export type DropdownOption = {
     label: string;
 };
 export declare class FreeformDropdown<ParsedValue> extends SimpleInput {
-    field: FormField<boolean, ParsedValue | null>;
+    field: FormField<boolean, ParsedValue>;
     _generateOptions: (ctx: Context) => Promise<DropdownOption[]>;
     options: DropdownOptions;
-    constructor(field: FormField<boolean, ParsedValue | null>, _generateOptions: (ctx: Context) => Promise<DropdownOption[]>, options?: DropdownOptions);
+    constructor(field: FormField<boolean, ParsedValue>, _generateOptions: (ctx: Context) => Promise<DropdownOption[]>, options?: DropdownOptions);
     generateOptions(ctx: Context): Promise<DropdownOption[]>;
     getInputAttributes(fctx: FormControlContext): Promise<Record<string, string | boolean>>;
     renderInput(ctx: Context, attributes_str: string, data: Record<string, FormDataValue>): Promise<FlatTemplatable>;

package/@types/forms/controls/single-reference.d.ts

@@ -1,9 +1,8 @@
 import { Context } from "koa";
-import { Field as SealiousField, FieldTypes as SealiousFieldTypes } from "sealious";
+import { ExtractFieldDecoded, FieldTypes as SealiousFieldTypes } from "sealious";
 import { CollectionField } from "../fields/collection-field.js";
 import { DropdownOptions, FreeformDropdown } from "./dropdown.js";
 import { Collection, CollectionItem } from "sealious";
-export type ExtractFieldDecoded<F extends SealiousField<any, any, any>> = F extends SealiousField<infer T, unknown, unknown> ? T : never;
 export declare class SingleReferenceDropdown<TargetCollection extends Collection, SealiousField extends SealiousFieldTypes.SingleReference, Required extends boolean> extends FreeformDropdown<ExtractFieldDecoded<SealiousField>> {
     field: CollectionField<SealiousField, Required>;
     options: DropdownOptions & {

package/@types/forms/fields/CollectionField.d.ts

@@ -0,0 +1 @@
+export {};

package/@types/forms/fields/boolean.d.ts

@@ -2,7 +2,6 @@ import { Context } from "koa";
 import { Checkbox } from "../controls/checkbox.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult, FormField } from "./field.js";
-import { FormControlContext } from "../controls/form-control.js";
 export declare class Boolean<Required extends boolean> extends FormField<Required, boolean, Checkbox> {
     error_message: string;
     predicate: (v: unknown, w: unknown) => {
@@ -17,6 +16,6 @@ export declare class Boolean<Required extends boolean> extends FormField<Require
     parse(_: Context, value: FormDataValue): Promise<FieldParseResult<boolean>>;
     getEmptyValue(): boolean;
     getControl(): Checkbox;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<boolean>;
+    parsedToSealious(value: boolean): Promise<boolean>;
     sealiousValueToForm(_: Context, value: boolean | null): Promise<FormDataValue>;
 }

package/@types/forms/fields/collection-field.d.ts

@@ -1,22 +1,29 @@
 import { Context } from "koa";
-import { ExtractFieldDecoded, Field } from "sealious";
-import { SimpleInput } from "../controls/controls.js";
+import { CollectionItem, ExtractFieldDecoded, ExtractFieldInput, Field as SealiousField } from "sealious";
+import { FormControl } from "../controls/controls.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult, FormField, FormFieldValidationResponse } from "./field.js";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
-export declare class CollectionField<F extends Field<any>, Required extends boolean> extends FormField<Required, ExtractFieldDecoded<F> | null, SimpleInput> {
+export declare function sealiousFieldToFormField(sealiousField: SealiousField<any>, field_name: string, prefix: string): FormField;
+export declare class CollectionField<F extends SealiousField<any>, Required extends boolean> extends FormField<Required, ExtractFieldDecoded<F>, FormControl, ExtractFieldInput<F>> {
     sealiousField: F;
     constructor(required: Required, sealiousField: F);
     predicate: (v: unknown, w: unknown) => {
         readonly match: true;
         readonly wildcard: unknown;
     };
-    parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<ExtractFieldDecoded<F> | null>>;
+    parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<ExtractFieldDecoded<F>>>;
     isValueValid(ctx: Context, value: ExtractFieldDecoded<F>): Promise<FormFieldValidationResponse>;
+    parsedToSealious(parsed: unknown): Promise<ExtractFieldInput<F>>;
     getEmptyValue(): ExtractFieldDecoded<F>;
-    getControl(): SimpleInput;
+    sealiousValueToForm(ctx: Context, value: any, item: CollectionItem<any>): Promise<FormDataValue>;
+    getControl(): FormControl;
     generateFieldDeclaration(field_info: ExtractedFieldInfo, vars: {
         form_field_types: string;
         sealious_field: string;
     }): string;
+    generateInitialValue(field_info: ExtractedFieldInfo, vars: {
+        form_field_types: string;
+        form_fields: string;
+    }): string;
 }

package/@types/forms/fields/coordinates.d.ts

@@ -1,12 +1,12 @@
 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";
 import { SimpleFormField } from "./simple-form-field.js";
 export declare class Coordinates<Required extends boolean, DefaultControl extends FormControl = SimpleInput> extends SimpleFormField<Required, DefaultControl, [number, number]> {
     parse(_: Context, raw_value: FormDataValue): Promise<FieldParseResult<[number, number]>>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<[number, number] | undefined>;
+    parsedToSealious(parsed: [number, number]): Promise<[number, number] | undefined>;
     postSealiousCreate(): Promise<void>;
     postSealiousEdit(): Promise<void>;
     getControl(): DefaultControl;

package/@types/forms/fields/date.d.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";
@@ -9,5 +8,5 @@ export declare class DateField<Required extends boolean> extends SimpleFormField
     getEmptyValue(): Date;
     parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<Date>>;
     getControl(): SimpleInput<SimpleInputOptions>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string | null>;
+    parsedToSealious(parsed: Date): Promise<string | null>;
 }

package/@types/forms/fields/datetime.d.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";
@@ -8,7 +7,7 @@ export declare class DateTime<Required extends boolean> extends SimpleFormField<
     constructor(required: Required);
     getEmptyValue(): Date | null;
     parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<Date | null>>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<number | null>;
+    parsedToSealious(parsed: Date): Promise<number | null>;
     getControl(): SimpleInput;
     sealiousValueToForm(ctx: Context, value: number | null): Promise<FormDataValue>;
 }

package/@types/forms/fields/deep-reverse-single-reference-list.d.ts

@@ -8,7 +8,7 @@ export declare class DeepReverseSingleReferenceList extends CheckboxedListField<
     item_label_getter: (item: CollectionItem<any>) => string;
     constructor(sealious_field: SealiousFieldTypes.DeepReverseSingleReference);
     setItemLabelGetter(getter: (item: CollectionItem<any>) => string): void;
-    getSealiousCreateValue(): never;
+    parsedToSealious(): never;
     postSealiousCreate(ctx: Context, created_item: CollectionItem<any>, form_data: FormData): Promise<void>;
     postSealiousEdit(ctx: Context, edited_item: CollectionItem<any>, value: FormData): Promise<void>;
     sealiousValueToForm(_ctx: Context, value: string[] | null): Promise<FormDataValue>;

package/@types/forms/fields/deep-reverse-single-reference-table.d.ts

@@ -3,13 +3,12 @@ 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 { FormField } from "./field.js";
 export declare class DeepReverseSingleReferenceTable extends Table<Record<string, FormField>> {
     sealious_field: SealiousFieldTypes.DeepReverseSingleReference;
     constructor(sealious_field: SealiousFieldTypes.DeepReverseSingleReference);
     getControl(): TableControl<any>;
-    getSealiousCreateValue(_fctx: FormControlContext): Promise<unknown>;
+    parsedToSealious(_value: any): Promise<unknown>;
     postSealiousCreate(ctx: Context, created_item: CollectionItem<any>, form_data: FormData): Promise<void>;
     postSealiousEdit(ctx: Context, edited_item: CollectionItem<any>, form_data: FormData): Promise<void>;
     sealiousValueToForm(ctx: Context, _value: string[], item: CollectionItem<any>): Promise<FormDataValue>;

package/@types/forms/fields/enum-multiple-sealious.d.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 declare class EnumMultipleSealious<Values extends string> extends CheckboxedListField<boolean, Values> {
     sealious_field: SealiousFieldTypes.EnumMultiple<Values>;
@@ -11,6 +10,6 @@ export declare class EnumMultipleSealious<Values extends string> extends Checkbo
         form_field_types: string;
         sealious_field: string;
     }): string;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<Values[]>;
+    parsedToSealious(parsed: Record<string, unknown>): Promise<Values[]>;
     sealiousValueToForm(ctx: Context, sealious_value: Values[] | null): Promise<FormDataValue>;
 }

package/@types/forms/fields/field.d.ts

@@ -32,6 +32,7 @@ export type FieldParseResult<T> = {
 export declare abstract class FormField<Required extends boolean = boolean, ParsedValue = any, DefaultFormControl extends FormControl = FormControl, SealiousValue = any> {
     readonly required: Required;
     name: string;
+    value_path: string | undefined;
     label: string;
     constructor(required: Required);
     predicate: Predicate;
@@ -41,6 +42,8 @@ export declare abstract class FormField<Required extends boolean = boolean, Pars
     setName(name: string): this;
     setDisabled(status: boolean): this;
     setLabel(label: string): this;
+    getValuePath(): string;
+    setValuePath(path: string): this;
     _validate(ctx: Context, value: ParsedValue): Promise<FormFieldValidationResponse>;
     abstract getEmptyValue(): ParsedValue;
     isValueValid(_ctx: Context, _value: ParsedValue): Promise<FormFieldValidationResponse>;
@@ -56,10 +59,11 @@ export declare abstract class FormField<Required extends boolean = boolean, Pars
         parsed: ParsedValue | null;
         raw: FormDataValue;
     }>;
-    setMapToFilter(fn: (parsed: ParsedValue) => unknown): this;
+    setMapToFilter(fn: (parsed: ParsedValue | null) => unknown): this;
     getDatabaseValue(ctx: Context, data: Record<string, FormDataValue>): Promise<unknown>;
     abstract getControl(): DefaultFormControl;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<SealiousValue>;
+    getSealiousCreateValue(fctx: FormControlContext): never;
+    parsedToSealious(parsed: ParsedValue): any;
     sealiousValueToForm(ctx: Context, sealiousValue: SealiousValue | null, item: CollectionItem<any>): Promise<FormDataValue>;
     postSealiousCreate(ctx: Context, created_item: CollectionItem<any>, form_data: FormData): Promise<void>;
     postSealiousEdit(ctx: Context, edited_item: CollectionItem<any>, form_data: FormData): Promise<void>;

package/@types/forms/fields/fields.d.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/@types/forms/fields/file.d.ts

@@ -3,7 +3,8 @@ import { FilePointer } 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;
     new: FilePointer | null;
@@ -18,8 +19,8 @@ export declare class File<Required extends boolean> extends FormField<Required,
         new: null;
     };
     getControl(): FileControl;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<FilePointer | undefined>;
-    sealiousValueToForm(ctx: Context, sealiousValue: FilePointer | string | null): Promise<{
+    parsedToSealious(value: FileContainer): Promise<FilePointer | undefined>;
+    sealiousValueToForm(ctx: Context, sealiousValue: FilePointer | ImageValue | string | null): Promise<{
         old: FilePointer | undefined;
     } | Record<string, never>>;
 }

package/@types/forms/fields/int.d.ts

@@ -1,6 +1,5 @@
-import { FormControlContext } from "../controls/form-control.js";
 import { NumberBasedSimpleField } from "./simple-form-field.js";
 export declare class Int<Required extends boolean> extends NumberBasedSimpleField<Required> {
     constructor(required: Required);
-    getSealiousCreateValue(fctx: FormControlContext): Promise<number | undefined>;
+    parsedToSealious(parsed: number): Promise<number | undefined>;
 }

package/@types/forms/fields/json.d.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";
@@ -9,5 +8,5 @@ export declare class JSONField<Required extends boolean> extends SimpleFormField
     getControl(): Textarea;
     getEmptyValue(): Record<string, unknown>;
     parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<Record<string, unknown>>>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<Record<string, unknown> | null>;
+    parsedToSealious(parsed: Record<string, unknown>): Promise<Record<string, unknown> | null>;
 }

package/@types/forms/fields/phone-number-with-country-code.d.ts

@@ -3,11 +3,10 @@ import { FieldTypes as SealiousFieldTypes } from "sealious";
 import { FormControl } from "../controls/controls.js";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult, FormField } from "./field.js";
-import { FormControlContext } from "../../index.js";
 export declare class PhoneNumberWithCountryCode<Required extends boolean> extends FormField<Required, SealiousFieldTypes.PhoneNumberValue> {
     getEmptyValue(): SealiousFieldTypes.PhoneNumberValue;
     parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<SealiousFieldTypes.PhoneNumberValue>>;
     getControl(): FormControl;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string>;
+    parsedToSealious(parsed: SealiousFieldTypes.PhoneNumberValue): Promise<string>;
     sealiousValueToForm(ctx: Context, sealiousValue: SealiousFieldTypes.PhoneNumberValue | null): Promise<FormDataValue>;
 }

package/@types/forms/fields/regexp.d.ts

@@ -2,7 +2,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 declare class RegExpField<Required extends boolean> extends FormField<Required, string, SimpleInput, string> {
     regexp: RegExp;
     error_message: string;
@@ -16,6 +15,6 @@ export declare class RegExpField<Required extends boolean> extends FormField<Req
     parse(_: Context, value: FormDataValue): Promise<FieldParseResult<string>>;
     getEmptyValue(): string;
     getControl(): SimpleInput;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string>;
+    parsedToSealious(parsed: string): Promise<string>;
     sealiousValueToForm(ctx: Context, sealious_value: string | null): Promise<FormDataValue>;
 }

package/@types/forms/fields/simple-form-field.d.ts

@@ -4,7 +4,6 @@ import { FieldParseResult, FormField } from "./field.js";
 import { SimpleInput } from "../controls/simple-input.js";
 import { FormControl } from "../controls/controls.js";
 import { CollectionItem } from "sealious";
-import { FormControlContext } from "../controls/form-control.js";
 export declare abstract class SimpleFormField<Required extends boolean, DefaultControl extends FormControl = SimpleInput, Parsed = string> extends FormField<Required, Parsed, DefaultControl> {
     type: string;
     predicate: import("@sealcode/ts-predicates").Predicate<string>;
@@ -15,7 +14,7 @@ export declare abstract class SimpleFormField<Required extends boolean, DefaultC
 }
 export declare class TextBasedSimpleField<Required extends boolean, DefaultControl extends FormControl = SimpleInput> extends SimpleFormField<Required, DefaultControl, string | null> {
     parse(_: Context, raw_value: FormDataValue): Promise<FieldParseResult<string>>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string | null>;
+    parsedToSealious(value: string): Promise<string>;
     postSealiousCreate(_ctx: Context, _created_item: CollectionItem<any>, _formData: FormData): Promise<void>;
     postSealiousEdit(_ctx: Context, _edited_item: CollectionItem<any>, _formData: FormData): Promise<void>;
     getControl(): DefaultControl;
@@ -23,7 +22,7 @@ export declare class TextBasedSimpleField<Required extends boolean, DefaultContr
 }
 export declare class NumberBasedSimpleField<Required extends boolean, DefaultControl extends FormControl = SimpleInput> extends SimpleFormField<Required, DefaultControl, number> {
     parse(_: Context, raw_value: FormDataValue): Promise<FieldParseResult<number>>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<number | undefined>;
+    parsedToSealious(value: number): Promise<number | undefined>;
     postSealiousCreate(): Promise<void>;
     postSealiousEdit(): Promise<void>;
     getControl(): DefaultControl;

package/@types/forms/fields/single-reference.d.ts

@@ -1,12 +1,11 @@
-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";
 export declare class SingleReference<TargetCollection extends Collection, Required extends boolean, F extends SealiousFieldTypes.SingleReference> extends CollectionField<F, Required> {
     getControl(): SingleReferenceDropdown<TargetCollection, F, Required>;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string | undefined>;
+    parsedToSealious(parsed: string): Promise<ExtractFieldInput<F>>;
     sealiousValueToForm(_ctx: Context, value: string | null): Promise<string | undefined>;
     generateImportsForFieldList(field_info: ExtractedFieldInfo): {
         what: string;

package/@types/forms/fields/structured-array.d.ts

@@ -3,7 +3,6 @@ import { Field as SealiousField, FieldTypes as SealiousFieldTypes } from "sealio
 import { FormDataValue } from "../form-types.js";
 import { Table as TableControl } from "../controls/table.js";
 import { SealiousToFormField } from "./get-field-for-sealious.js";
-import { FormControlContext } from "../controls/form-control.js";
 import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
 import { Table } from "./table.js";
 export declare class StructuredArray<SealiousFields extends Record<string, SealiousField<unknown>>> extends Table<{
@@ -18,6 +17,6 @@ export declare class StructuredArray<SealiousFields extends Record<string, Seali
         form_field_types: string;
         sealious_field: string;
     }): string;
-    getSealiousCreateValue(fctx: FormControlContext): Promise<import("./table.js").TableFieldParsed<{ [name in keyof SealiousFields]: SealiousToFormField<SealiousFields[name]>; }>>;
+    parsedToSealious(parsed: any): Promise<any>;
     sealiousValueToForm(ctx: Context, sealiousValue: Record<string, FormDataValue | null>[] | null): Promise<FormDataValue>;
 }

package/@types/forms/fields/structured.d.ts

@@ -0,0 +1,19 @@
+import { CollectionItem, ExtractFieldDecoded, ExtractFieldInput, Field as SealiousField, FieldTypes as SealiousFieldTypes } from "sealious";
+import { FieldParseResult, FormField } from "./field.js";
+import { FieldGroup, FormControl } from "../controls/controls.js";
+import { Context } from "koa";
+import { FormDataValue } from "../form-types.js";
+import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
+export declare class StructuredSealiousField<Structure extends Record<string, SealiousField<any>>, F extends SealiousFieldTypes.Structured<Structure>> extends FormField<false, ExtractFieldDecoded<F>, FormControl, ExtractFieldInput<F>> {
+    sealiousField: F;
+    constructor(sealiousField: F);
+    getEmptyValue(): ExtractFieldDecoded<F>;
+    parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<ExtractFieldDecoded<F>>>;
+    parsedToSealious(parsed: Record<string, unknown> | null): Promise<any>;
+    sealiousValueToForm(ctx: Context, sealiousValue: ExtractFieldDecoded<F> | ExtractFieldInput<F> | null, item: CollectionItem<any>): Promise<FormDataValue>;
+    getControl(): FieldGroup;
+    generateFieldDeclaration(_field_info: ExtractedFieldInfo, vars: {
+        form_field_types: string;
+        sealious_field: string;
+    }): string;
+}

package/@types/forms/fields/text.d.ts

@@ -1,6 +1,5 @@
-import { FormControlContext } from "../controls/form-control.js";
 import { TextBasedSimpleField } from "./simple-form-field.js";
 export declare class Text<Required extends boolean> extends TextBasedSimpleField<Required> {
     constructor(required: Required);
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string>;
+    parsedToSealious(parsed: string): Promise<string>;
 }

package/@types/forms/fields/url.d.ts

@@ -1,6 +1,5 @@
-import { FormControlContext } from "../controls/form-control.js";
 import { TextBasedSimpleField } from "./simple-form-field.js";
 export declare class URLField<Required extends boolean> extends TextBasedSimpleField<Required> {
     constructor(required: Required);
-    getSealiousCreateValue(fctx: FormControlContext): Promise<string | null>;
+    parsedToSealious(parsed: string | null): Promise<string>;
 }

package/lib/forms/controls/checkboxed-list-input.test.js

@@ -54,8 +54,8 @@ describe("checkboxed-list", () => {
       const context = await browser.newContext();
       page = await context.newPage();
       await page.goto(`http://localhost:${port}`);
-      await page.getByLabel("CO").check();
-      await page.getByLabel("DE").check();
+      await page.getByLabel("CO", { exact: true }).check();
+      await page.getByLabel("DE", { exact: true }).check();
       await page.getByRole("button", { name: "Wy\u015Blij" }).click();
       assert.deepStrictEqual(received_values, { syllables: { co: "on", de: "on" } });
     });
@@ -186,7 +186,7 @@ describe("checkboxed-list", () => {
         const context = await browser.newContext();
         page = await context.newPage();
         await page.goto(`http://localhost:${port}`);
-        await page.getByLabel("DE").check();
+        await page.getByLabel("DE", { exact: true }).check();
         await page.getByRole("button", { name: "Wy\u015Blij" }).click();
         await sleep(100);
         assert(submit_called);

package/lib/forms/controls/field-group.js

@@ -28,7 +28,9 @@ class FieldGroup extends FormFieldControl {
     const { label, classes } = this.options;
     return tempstream`
 			<div
-				class="field-group ${(classes || []).join(" ")}"
+				class="field-group form-input__wrapper ${(classes || []).join(
+      " "
+    )}"
 				${this.options.containerID ? `id="${this.options.containerID}"` : ""}
 			>
 				${this.preLabelContainer()}

package/lib/forms/controls/simple-input.js

@@ -81,17 +81,19 @@ class SimpleInput extends FormFieldControl {
       this.getWrapperModifiers(),
       tempstream`
 				${label ? `<label for="${id}">${label}</label>` : ""}
-				${await this.preInput(fctx, fctx.data.raw_values)}
-				${this.renderInput(
+				<div class="simple-input__inner-wrapper">
+					${await this.preInput(fctx, fctx.data.raw_values)}
+					${this.renderInput(
         fctx.ctx,
         renderAttributes(await this.getInputAttributes(fctx)),
         fctx.data.raw_values
       )}
-				${this.postInput(fctx.ctx)}
-				${~valid && !this.options.hide_errors && fctx.validate ? `<div class="input__error">${[
+					${this.postInput(fctx.ctx)}
+					${~valid && !this.options.hide_errors && fctx.validate ? `<div class="input__error">${[
         message,
         fctx.data.field_messages?.[this.field.name]?.message
       ].filter((e) => !!e).join(" \xB7 ")}</div>` : ""}
+				</div>
 			`
     );
   }

package/lib/forms/controls/textarea.js

@@ -31,7 +31,7 @@ class Textarea extends SimpleInput {
     return (
       /* HTML */
       `<textarea ${attributes}>
-${String(value) || ""}</textarea
+${value ? String(value) : ""}</textarea
 		>`
     );
   }

package/lib/forms/fields/boolean.js

@@ -46,12 +46,8 @@ class Boolean extends FormField {
   getControl() {
     return new Checkbox(this, { label: this.label || this.name });
   }
-  async getSealiousCreateValue(fctx) {
-    const { parsed } = await this.getParsedValue(
-      fctx.ctx,
-      fctx.data.raw_values
-    );
-    return !!parsed;
+  async parsedToSealious(value) {
+    return !!value;
   }
   async sealiousValueToForm(_, value) {
     return value ? "true" : "false";

package/lib/forms/fields/collection-field.js

@@ -1,8 +1,30 @@
 import { predicates } from "@sealcode/ts-predicates";
-import { SimpleInput } from "../controls/controls.js";
+import {
+  FieldTypes as SealiousFieldTypes
+} from "sealious";
 import {
   FormField
 } from "./field.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";
+function sealiousFieldToFormField(sealiousField, field_name, prefix) {
+  const name = prefix ? `${prefix}[${field_name}]` : field_name;
+  let 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;
+}
 class CollectionField extends FormField {
   constructor(required, sealiousField) {
     super(required);
@@ -11,7 +33,7 @@ class CollectionField extends FormField {
   }
   async parse(ctx, raw_value) {
     if (raw_value === void 0) {
-      return { parsable: true, parsed_value: null, error: null };
+      return { parsable: true, parsed_value: {}, error: null };
     }
     const encoded_value = await this.sealiousField.encode(
       ctx.$context,
@@ -31,26 +53,48 @@ class CollectionField extends FormField {
   async isValueValid(ctx, value) {
     const { valid, reason } = await this.sealiousField.checkValue(
       ctx.$context,
-      value,
+      this.parsedToSealious(value),
       void 0,
       null,
       void 0
     );
     return { valid, message: reason || (!valid ? "Wrong value" : "") };
   }
+  async parsedToSealious(parsed) {
+    return sealiousFieldToFormField(
+      this.sealiousField,
+      this.name,
+      ""
+    ).parsedToSealious(parsed);
+  }
   getEmptyValue() {
     return "";
   }
+  async sealiousValueToForm(ctx, value, item) {
+    return sealiousFieldToFormField(
+      this.sealiousField,
+      this.name,
+      ""
+    ).sealiousValueToForm(ctx, value, item);
+  }
   getControl() {
-    return new SimpleInput(this);
+    return sealiousFieldToFormField(
+      this.sealiousField,
+      this.name,
+      ""
+    ).getControl();
   }
   generateFieldDeclaration(field_info, vars) {
     return `new ${vars.form_field_types}.${this.constructor.name}(${String(
       field_info.is_required
     )}, ${vars.sealious_field})`;
   }
+  generateInitialValue(field_info, vars) {
+    return `${wrapKeyName(field_info.name)}: await ${vars.form_fields}${wrapAttribute(field_info.name)}.sealiousValueToForm(ctx, item.get("${field_info.name}"), item)`;
+  }
 }
 export {
-  CollectionField
+  CollectionField,
+  sealiousFieldToFormField
 };
 //# sourceMappingURL=collection-field.js.map

package/lib/forms/fields/coordinates.js

@@ -22,11 +22,7 @@ class Coordinates extends SimpleFormField {
       error: "should be an array or string"
     };
   }
-  async getSealiousCreateValue(fctx) {
-    const { parsed } = await this.getParsedValue(
-      fctx.ctx,
-      fctx.data.raw_values
-    );
+  async parsedToSealious(parsed) {
     return parsed || void 0;
   }
   async postSealiousCreate() {

package/lib/forms/fields/date.js

@@ -20,14 +20,7 @@ class DateField extends SimpleFormField {
       type: this.type
     });
   }
-  async getSealiousCreateValue(fctx) {
-    const { parsed } = await this.getParsedValue(
-      fctx.ctx,
-      fctx.data.raw_values
-    );
-    if (!parsed) {
-      return null;
-    }
+  async parsedToSealious(parsed) {
     return `${parsed.getFullYear()}-${(parsed.getMonth() + 1).toString().padStart(2, "0")}-${parsed.getDate().toString().padStart(2, "0")}`;
   }
 }

package/lib/forms/fields/datetime.js

@@ -14,14 +14,7 @@ class DateTime extends SimpleFormField {
     const parsed_value = new Date(raw_value);
     return { parsable: true, error: null, parsed_value };
   }
-  async getSealiousCreateValue(fctx) {
-    const { parsed } = await this.getParsedValue(
-      fctx.ctx,
-      fctx.data.raw_values
-    );
-    if (parsed == null) {
-      return null;
-    }
+  async parsedToSealious(parsed) {
     return new Date(parsed).getTime();
   }
   getControl() {

package/lib/forms/fields/deep-reverse-single-reference-list.js

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

package/lib/forms/fields/deep-reverse-single-reference-table.js

@@ -52,7 +52,7 @@ class DeepReverseSingleReferenceTable extends Table {
       }
     });
   }
-  getSealiousCreateValue(_fctx) {
+  parsedToSealious(_value) {
     throw new Error("Method not implemented.");
   }
   async postSealiousCreate(ctx, created_item, form_data) {