@sealcode/sealgen 0.11.8 → 0.12.2

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

@@ -1,25 +1,20 @@
 import Router from "@koa/router";
-import {
-	Collection,
-	CollectionItem,
-	File as SealiousFile,
-	Field as SealiousField,
-} from "sealious";
+import Sealious from "sealious";
 import { Context } from "koa";
-import { inputWrapper } from "../../utils/input-wrapper";
+import { inputWrapper } from "../../utils/input-wrapper.js";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files";
-import { FormFieldControl } from "./form-field-control";
+import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files.js";
+import { FormFieldControl } from "./form-field-control.js";
 import { is, predicates } from "@sealcode/ts-predicates";
-import { renderAttributes } from "../../utils/render-attributes";
-import { FormControlContext } from "./form-control";
+import { renderAttributes } from "../../utils/render-attributes.js";
+import { FormControlContext } from "./form-control.js";
 
 export type MultipleFilesOptions = {
 	label?: string;
 	uploadLabel?: string;
 	getAdditionalFields: (
 		ctx: Context,
-		file: SealiousFile
+		file: Sealious.File
 	) => Promise<Record<string, unknown>>;
 };
 
@@ -57,7 +52,7 @@ export class MultipleFiles extends FormFieldControl {
 		);
 
 		router.post(this.getFrameRelativeURL() + "/add", async (ctx) => {
-			let files = ctx.$body.files as SealiousFile | SealiousFile[];
+			let files = ctx.$body.files as Sealious.File | Sealious.File[];
 			if (!files || !is(files, predicates.object)) {
 				ctx.body = "Missing files";
 				return;
@@ -69,7 +64,7 @@ export class MultipleFiles extends FormFieldControl {
 				files.map((file) =>
 					this.addFileAssociation(
 						ctx,
-						file as unknown as SealiousFile
+						file as unknown as Sealious.File
 					)
 				)
 			);
@@ -86,7 +81,7 @@ export class MultipleFiles extends FormFieldControl {
 		].removeByID(ctx.$context, file_item_id);
 	}
 
-	async addFileAssociation(ctx: Context, file: SealiousFile) {
+	async addFileAssociation(ctx: Context, file: Sealious.File) {
 		const file_field = this.getFileField();
 		if (!file_field) {
 			throw new Error("No file field in referencing collection");
@@ -135,7 +130,7 @@ export class MultipleFiles extends FormFieldControl {
 		return result;
 	}
 
-	getFileField(): SealiousField | null {
+	getFileField(): Sealious.Field | null {
 		for (const [_, field] of Object.entries(
 			this.getReferencingCollection().fields
 		)) {
@@ -147,28 +142,28 @@ export class MultipleFiles extends FormFieldControl {
 	}
 
 	async extractFileFromItem(
-		item: CollectionItem
-	): Promise<SealiousFile | null> {
+		item: Sealious.CollectionItem
+	): Promise<Sealious.File | null> {
 		const sealious_field = this.getFileField();
 		if (!sealious_field) {
 			return null;
 		}
-		return await SealiousFile.fromID(
-			(item.collection as Collection).app,
+		return await Sealious.File.fromID(
+			(item.collection as Sealious.Collection).app,
 			item.get(sealious_field.name).id
 		);
 	}
 
 	async renderFileItemPreview(
-		_fileItem: CollectionItem,
-		file: SealiousFile
+		_fileItem: Sealious.CollectionItem,
+		file: Sealious.File
 	): Promise<FlatTemplatable> {
 		return file.filename || "no filename";
 	}
 
 	async renderFileItem(
-		fileItem: CollectionItem,
-		file: SealiousFile
+		fileItem: Sealious.CollectionItem,
+		file: Sealious.File
 	): Promise<FlatTemplatable> {
 		return tempstream/* HTML */ `<li class="file-list-item">
 			<a
@@ -182,7 +177,7 @@ export class MultipleFiles extends FormFieldControl {
 		</li>`;
 	}
 
-	renderFileRemoveButton(fileItem: CollectionItem): FlatTemplatable {
+	renderFileRemoveButton(fileItem: Sealious.CollectionItem): FlatTemplatable {
 		return /* HTML */ ` <form
 			data-turbo-frame="${this.getFrameID()}"
 			action="${this.getFrameRelativeURL()}/delete/${fileItem.id}"
@@ -226,7 +221,10 @@ export class MultipleFiles extends FormFieldControl {
 						await this.extractFileFromItem(item),
 					])
 			)
-		).filter(([_, f]) => f !== null) as [CollectionItem, SealiousFile][];
+		).filter(([_, f]) => f !== null) as [
+			Sealious.CollectionItem,
+			Sealious.File
+		][];
 
 		return inputWrapper(
 			["multiple-files", this.field.name, ...this.getClassModifiers()],

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

@@ -1,13 +1,13 @@
 import { File as SealiousFile, CollectionItem } from "sealious";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { MultipleFiles, MultipleFilesOptions } from "./multiple-files";
-import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files";
-import KoaResponsiveImageRouter from "koa-responsive-image-router";
+import { MultipleFiles, MultipleFilesOptions } from "./multiple-files.js";
+import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files.js";
+import * as KoaResponsiveImageRouter from "koa-responsive-image-router";
 
 export class MultiplePhotos extends MultipleFiles {
 	constructor(
 		public field: MultipleFilesField,
-		public imageRouter: KoaResponsiveImageRouter,
+		public imageRouter: KoaResponsiveImageRouter.default,
 		options?: Partial<MultipleFilesOptions>
 	) {
 		super(field, options);

package/src/forms/controls/number.ts

@@ -1,9 +1,6 @@
-import { Context } from "koa";
-import { FlatTemplatable } from "tempstream";
-import { FormField, NumberField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormControlContext } from "./form-control";
-import { SimpleInput, SimpleInputOptions } from "./simple-input";
+import { NumberField } from "../fields/number.js";
+import { FormControlContext } from "./form-control.js";
+import { SimpleInput, SimpleInputOptions } from "./simple-input.js";
 
 export type NumberOptions = SimpleInputOptions & Partial<{ step: number }>;
 

package/src/forms/controls/photo.ts

@@ -1,16 +1,17 @@
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { File } from "./file";
-import { File as SealiousFile } from "sealious";
-import { FileContainer, FormField } from "../fields/field";
-import { SimpleInputOptions } from "./simple-input";
-import KoaResponsiveImageRouter from "koa-responsive-image-router";
-import { FormControlContext } from "./form-control";
+import { File } from "./file.js";
+import Sealious from "sealious";
+import { FormField } from "../fields/field.js";
+import { SimpleInputOptions } from "./simple-input.js";
+import { FormControlContext } from "./form-control.js";
+import * as KoaResponsiveImageRouter from "koa-responsive-image-router";
+import { FileContainer } from "../fields/file.js";
 
 export class Photo extends File {
 	constructor(
 		public field: FormField<boolean, FileContainer>,
-		public imageRouter: KoaResponsiveImageRouter,
+		public imageRouter: KoaResponsiveImageRouter.default,
 		options?: SimpleInputOptions
 	) {
 		super(field, options);
@@ -33,7 +34,7 @@ export class Photo extends File {
 		if (!id) {
 			return empty_container;
 		}
-		const file = await SealiousFile.fromID(ctx.$app, id);
+		const file = await Sealious.File.fromID(ctx.$app, id);
 		return tempstream/* HTML */ `<div class="${class_name}">
 			${this.imageRouter.image({
 				resolutions: [100],

package/src/forms/controls/radio.ts

@@ -1,7 +1,7 @@
 import { Context } from "koa";
-import { FormField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { Tickable } from "./tickable";
+import { FormField } from "../fields/field.js";
+import { FormDataValue } from "../form-types.js";
+import { Tickable } from "./tickable.js";
 
 export class Radio extends Tickable<string> {
 	type = <const>"radio";

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

@@ -1,11 +1,11 @@
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper";
-import { renderAttributes } from "../../utils/render-attributes";
-import { FormField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormFieldControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper.js";
+import { renderAttributes } from "../../utils/render-attributes.js";
+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";
 
 export type SimpleInputOptions = {
 	id?: string;

package/src/forms/controls/textarea.ts

@@ -1,8 +1,8 @@
 import { Context } from "koa";
-import { FormField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormControlContext } from "./form-control";
-import { SimpleInput, SimpleInputOptions } from "./simple-input";
+import { FormField } from "../fields/field.js";
+import { FormDataValue } from "../form-types.js";
+import { FormControlContext } from "./form-control.js";
+import { SimpleInput, SimpleInputOptions } from "./simple-input.js";
 
 export class Textarea<Required extends boolean> extends SimpleInput<
 	string | null

package/src/forms/controls/tickable.ts

@@ -1,11 +1,11 @@
 import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
-import { attribute } from "../../sanitize";
-import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper";
-import { FormField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormFieldControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { attribute } from "../../sanitize.js";
+import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper.js";
+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";
 
 export type TickableOptions = {
 	id?: string;

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

@@ -1,5 +1,6 @@
+import { describe, it, beforeAll, afterAll, afterEach, beforeEach } from "vitest";
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("boolean field", () => {
 	const ctx = {} as any;

package/src/forms/fields/boolean.ts

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 const truthy = ["true", "on", "yes", "1"];
 const falsy = ["false", "off", "no", "0"];

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

@@ -1,11 +1,11 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
+import { FormDataValue } from "../form-types.js";
 import {
 	FieldParseResult,
 	FormField,
 	FormFieldValidationResponse,
-} from "./field";
+} from "./field.js";
 
 export class ChekboxedListField<Required extends boolean> extends FormField<
 	Required,

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

@@ -1,13 +1,13 @@
 import { predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import { Depromisify, Field, FieldOutput } from "sealious";
-import { FormDataValue } from "../form";
+import { FormDataValue } from "../form-types.js";
 
 import {
 	FieldParseResult,
 	FormField,
 	FormFieldValidationResponse,
-} from "./field";
+} from "./field.js";
 
 export class CollectionField<
 	F extends Field,

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

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("email field", () => {
 	const ctx = {} as any;

package/src/forms/fields/email.ts

@@ -1,5 +1,5 @@
 import { predicates } from "@sealcode/ts-predicates";
-import { RegExpField } from "./regexp";
+import { RegExpField } from "./regexp.js";
 
 export class EmailField<
 	Required extends boolean

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

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("enum-multiple field", () => {
 	const ctx = {} as any;

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

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class EnumMultipleField<
 	Options extends readonly string[],

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

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("enum field", () => {
 	const ctx = {} as any;

package/src/forms/fields/enum.ts

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class EnumField<
 	Options extends readonly string[],

package/src/forms/fields/existing-sealious-value.ts

@@ -1,5 +1,5 @@
 import { Field } from "sealious";
-import { PickFromListField } from "./pick-from-list";
+import { PickFromListField } from "./pick-from-list.js";
 
 export class ExistingSealiousValue<
 	Required extends boolean

package/src/forms/fields/field.ts

@@ -1,7 +1,7 @@
 import { Predicate, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { t } from "../../utils/translate";
-import { FormDataValue } from "../form";
+import { t } from "../../utils/translate.js";
+import { FormDataValue } from "../form-types.js";
 
 export type FormFieldValidationResponse = { valid: boolean; message: string };
 
@@ -154,19 +154,3 @@ export abstract class FormField<
 		return parsed;
 	}
 }
-
-export * from "./simple-form-field";
-export * from "./checkboxed-list";
-export * from "./collection-field";
-export * from "./number";
-export * from "./pick-from-list";
-export * from "./regexp";
-export * from "./email";
-export * from "./enum";
-export * from "./boolean";
-export * from "./enum-multiple";
-export * from "./existing-sealious-value";
-export * from "./file";
-export * from "./multiple-files";
-export * from "./reverse-single-reference";
-export * from "./structured-array";

package/src/forms/fields/fields.ts

@@ -0,0 +1,15 @@
+export * from "./simple-form-field.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 "./email.js";
+export * from "./enum.js";
+export * from "./boolean.js";
+export * from "./enum-multiple.js";
+export * from "./existing-sealious-value.js";
+export * from "./file.js";
+export * from "./multiple-files.js";
+export * from "./reverse-single-reference.js";
+export * from "./structured-array.js";

package/src/forms/fields/file.ts

@@ -1,18 +1,17 @@
 import {
-	hasField,
 	hasFieldOfType,
 	hasShape,
 	is,
 	predicates,
 } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { File as SealiousFile } from "sealious";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import Sealious from "sealious";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export type FileContainer = {
-	old: SealiousFile | null;
-	new: SealiousFile | null;
+	old: Sealious.File | null;
+	new: Sealious.File | null;
 };
 
 export class File<Required extends boolean> extends FormField<
@@ -25,7 +24,7 @@ export class File<Required extends boolean> extends FormField<
 	): Promise<FieldParseResult<FileContainer>> {
 		let result;
 		if (
-			raw_value instanceof SealiousFile ||
+			raw_value instanceof Sealious.File ||
 			(is(raw_value, predicates.object) &&
 				hasShape(
 					{
@@ -36,7 +35,7 @@ export class File<Required extends boolean> extends FormField<
 				) &&
 				raw_value.id)
 		) {
-			const file = await SealiousFile.fromID(
+			const file = await Sealious.File.fromID(
 				ctx.$app,
 				raw_value.id as string
 			);
@@ -59,7 +58,7 @@ export class File<Required extends boolean> extends FormField<
 					raw_value.old
 				) &&
 				raw_value.old.id
-					? await SealiousFile.fromID(ctx.$app, raw_value.old.id)
+					? await Sealious.File.fromID(ctx.$app, raw_value.old.id)
 					: null;
 			const new_file =
 				hasFieldOfType(

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

@@ -1,6 +1,6 @@
 import { Context } from "koa";
 import { FieldTypes as SealiousFieldTypes } from "sealious";
-import { FormField } from "./field";
+import { FormField } from "./field.js";
 
 export class MultipleFiles extends FormField<false> {
 	constructor(

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

@@ -1,5 +1,6 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import * as Sealgen from "../../index.js";
+const { Fields } = Sealgen;
 
 describe("number field", () => {
 	const ctx = {} as any;

package/src/forms/fields/number.ts

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class NumberField<
 	DefaultValue extends number | null = number,

package/src/forms/fields/pick-from-list.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("pick-from-list field", () => {
 	const ctx = {} as any;

package/src/forms/fields/pick-from-list.ts

@@ -1,8 +1,8 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { DropdownOption } from "../controls/dropdown";
-import { FormFieldValidationResponse } from "./field";
-import { SimpleFormField } from "./simple-form-field";
+import type { DropdownOption } from "../controls/dropdown.js";
+import { FormFieldValidationResponse } from "./field.js";
+import { SimpleFormField } from "./simple-form-field.js";
 
 export class PickFromListField<
 	Required extends boolean

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

@@ -1,4 +1,4 @@
-import { FormField } from "./field";
+import { FormField } from "./field.js";
 
 export class ProxyFormField<T> extends FormField<boolean, T> {
 	constructor(

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

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("regexp field", () => {
 	const ctx = {} as any;

package/src/forms/fields/regexp.ts

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class RegExpField<Required extends boolean> extends FormField<Required> {
 	constructor(

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

@@ -1,4 +1,4 @@
-import { FormField } from "./field";
+import { FormField } from "./field.js";
 import { FieldTypes as SealiousFields } from "sealious";
 import { Context } from "koa";
 

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

@@ -1,7 +1,7 @@
-import { FieldParseResult, FormField } from "./field";
-import { FormDataValue } from "../form";
+import { FormDataValue } from "../form-types.js";
 import { Context } from "koa";
 import { predicates } from "@sealcode/ts-predicates";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class SimpleFormField<Required extends boolean> extends FormField<
 	Required,

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

@@ -1,7 +1,7 @@
 import { Context } from "koa";
 import { Field, FieldsetInput, FieldsetOutput, FieldTypes } from "sealious";
-import { FormDataValue } from "../form";
-import { FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FormField } from "./field.js";
 
 export class StructuredArrayField<
 	Fields extends Record<string, Field>

package/src/forms/form-types.ts

@@ -0,0 +1,30 @@
+import type { File as SealiousFile } from "sealious";
+import type { FlatTemplatable } from "tempstream";
+import type { FormField } from "./fields/field.js";
+
+export type FormDataPrimitive = string | string[] | number | undefined;
+export type FormDataValue =
+	| FormDataPrimitive
+	| Record<string, FormDataPrimitive>
+	| SealiousFile;
+
+export type FieldValueType<F extends FormField> = F extends FormField<infer R>
+	? R
+	: never;
+
+export type FormFieldsToValues<
+	F extends Record<string, FormField<boolean, keyof F>>
+> = {
+	[Property in keyof F]: FieldValueType<F[Property]>;
+};
+
+export type FormMessage = { type: "info" | "success" | "error"; text: string };
+
+export type FormData<Fieldnames extends string = string> = {
+	raw_values: Record<Fieldnames, FormDataValue>;
+	messages: FormMessage[];
+};
+
+export type FormReaction =
+	| { action: "stay"; content: FlatTemplatable; messages?: FormMessage[] }
+	| { action: "redirect"; url: string; messages?: FormMessage[] };