@sealcode/sealgen 0.15.2 → 0.15.3

package/src/forms/controls/array.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import Router from "@koa/router";
 import { hasShape, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
@@ -57,7 +58,6 @@ export class StructuredArray<
 	}
 
 	makeSubfield(_field_name: string): FormField {
-		const fields = this;
 		return new SimpleFormField(false);
 	}
 
@@ -77,6 +77,7 @@ export class StructuredArray<
 			validate: false,
 		};
 		if (Array.isArray(control)) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const [constructor, field_name, params] = control;
 			const field = this.makeSubfield(field_name);
 			if (!field) {
@@ -173,13 +174,14 @@ export class StructuredArray<
 	}
 
 	async getTargetItemID(ctx: Context): Promise<string> {
-		return ctx.params.id;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		return ctx.params.id as string;
 	}
 
 	mount(router: Router) {
 		console.log("mounting!", this.getActionURL());
 		router.post(this.getActionURL(), async (ctx) => {
-			let form_id = ctx.query.form_id;
+			const form_id = ctx.query.form_id;
 			if (typeof form_id != "string") {
 				throw new Error("Missing form_id query param");
 			}

package/src/forms/controls/autocomplete.ts

@@ -1,6 +1,6 @@
 import { Context } from "koa";
+import { tempstream } from "tempstream";
 import { PickFromListField } from "../fields/pick-from-list.js";
-import { FormDataValue } from "../form-types.js";
 import { FormControlContext } from "./form-control.js";
 import { SimpleInput } from "./simple-input.js";
 
@@ -24,7 +24,7 @@ export class Autocomplete extends SimpleInput<string | null> {
 	}
 
 	async postInput(ctx: Context) {
-		return /* HTML */ `<datalist id="${this.getListID()}">
+		return tempstream/* HTML */ `<datalist id="${this.getListID()}">
 			${(await this.field.generateOptions(ctx)).map(
 				({ value }) => /* HTML */ `<option>${value}</option>`
 			)}

package/src/forms/controls/checkbox-group.ts

@@ -1,7 +1,5 @@
-import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
 import { EnumMultipleField } from "../fields/enum-multiple.js";
-import { FormField } from "../fields/field.js";
 import { ProxyFormField } from "../fields/proxy-field.js";
 import { CheckboxWithValue } from "./checkbox.js";
 import { FieldGroup } from "./field-group.js";
@@ -41,9 +39,7 @@ export class CheckboxGroup<
 		}).render(fctx);
 	}
 
-	async render<Fields extends Record<string, FormField>>(
-		fctx: FormControlContext
-	): Promise<FlatTemplatable> {
+	async render(fctx: FormControlContext): Promise<FlatTemplatable> {
 		const { parsed: values } = await this.field.getValue(
 			fctx.ctx,
 			fctx.data

package/src/forms/controls/checkboxed-list-input.test.ts

@@ -8,14 +8,15 @@ import { CheckboxedListField } from "../fields/checkboxed-list.js";
 import { Form } from "../form.js";
 import { CheckboxedListInput } from "./checkboxed-list-input.js";
 import { getBrowser } from "../../utils/browser-creator.js";
+import assert from "assert";
 
-describe.only("checkboxed-list", () => {
+describe("checkboxed-list", () => {
 	describe("basic tests", async () => {
 		let server: ReturnType<Koa["listen"]>;
 		let browser: Browser;
 		let page: Page;
 
-		afterAll(() => {
+		afterEach(() => {
 			server.close();
 		});
 

package/src/forms/controls/checkboxed-list-input.ts

@@ -1,4 +1,3 @@
-import { is, predicates } from "@sealcode/ts-predicates";
 import { tempstream } from "tempstream";
 import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper.js";
 import { CheckboxedListField } from "../fields/checkboxed-list.js";

package/src/forms/controls/collapsible-field-group.ts

@@ -1,4 +1,4 @@
-import { FlatTemplatable } from "tempstream";
+import { FlatTemplatable, tempstream } from "tempstream";
 import { FieldGroup } from "./field-group.js";
 import { randomUUID } from "crypto";
 import { FormControl } from "./form-control.js";
@@ -26,7 +26,9 @@ export class CollapsibleFieldGroup extends FieldGroup {
 	}
 
 	getGroupLabelProps() {
-		return super.getGroupLabelProps() + ` for="${this.collapseID}"`;
+		return tempstream`${super.getGroupLabelProps()} for="${
+			this.collapseID
+		}"`;
 	}
 
 	preLabelContainer(): FlatTemplatable {

package/src/forms/controls/derived.ts

@@ -54,7 +54,7 @@ export class Derived<
 								typeof value === "object"
 									? JSON.stringify(value)
 									: typeof value == "string"
-									? '"' + (value as string).toString() + '"'
+									? '"' + value.toString() + '"'
 									: (value as string).toString()
 							}`;
 						})

package/src/forms/controls/dropdown.ts

@@ -43,13 +43,13 @@ export class FreeformDropdown extends SimpleInput<string | null> {
 					? [
 							[
 								"onchange",
-								(original.onchange || "") +
-									";this.form.submit();",
+								((original.onchange as string | undefined) ||
+									"") + ";this.form.submit();",
 							],
 					  ]
 					: []),
 			]),
-		};
+		} as Record<string, string>;
 	}
 
 	async renderInput(

package/src/forms/controls/editable-collection-subset.ts

@@ -42,7 +42,12 @@ export class EditableCollectionSubset extends FormFieldControl {
 											method="POST"
 											action="${fctx.ctx.path}"
 										>
-											<span>${text}</span>
+											<span
+												>${
+													// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+													text
+												}</span
+											>
 											<input
 												type="hidden"
 												name="${this.field.name}"
@@ -79,9 +84,10 @@ export class EditableCollectionSubset extends FormFieldControl {
 							)
 							.map(
 								([value, text]) =>
-									`<option value="${attribute(
-										value
-									)}">${text}</option>`
+									`<option value="${attribute(value)}">${
+										// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+										text
+									}</option>`
 							)
 					)}
 				</select>

package/src/forms/controls/field-group.ts

@@ -52,7 +52,7 @@ export class FieldGroup extends FormFieldControl {
 				<div class="field-group__label-container">
 					${this.preLabel()}
 					${label
-						? `<label ${this.getGroupLabelProps()}>${label}</label>`
+						? tempstream`<label ${this.getGroupLabelProps()}>${label}</label>`
 						: ""}
 					${this.postLabel()}
 				</div>

package/src/forms/controls/file.ts

@@ -21,7 +21,7 @@ export class File extends SimpleInput<FileContainer> {
 		if (!file) {
 			return empty_container;
 		}
-		return /* HTML */ `<div class="${class_name}">
+		return tempstream/* HTML */ `<div class="${class_name}">
 			${file.getOriginalFilename()}
 		</div>`;
 	}

package/src/forms/controls/form-control.ts

@@ -20,5 +20,6 @@ export abstract class FormControl {
 	): FlatTemplatable | Promise<FlatTemplatable>;
 	abstract role: "input" | "decoration" | "messages" | "submit";
 
-	mount(router: Router) {}
+	// eslint-disable-next-line @typescript-eslint/no-empty-function
+	mount(_router: Router) {}
 }

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

@@ -1,8 +1,6 @@
-import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
 import { attribute } from "../../sanitize.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";
 

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

@@ -1,5 +1,5 @@
 import Router from "@koa/router";
-import { CollectionItem, Field as SealiousField } from "sealious";
+import { Collection, CollectionItem, Field as SealiousField } from "sealious";
 import { Context } from "koa";
 import { inputWrapper } from "../../utils/input-wrapper.js";
 import { FlatTemplatable, tempstream } from "tempstream";
@@ -140,14 +140,14 @@ export class MultipleFiles extends FormFieldControl {
 	}
 
 	async extractFileFromItem(
-		item: CollectionItem
+		item: CollectionItem<Collection>
 	): Promise<FilePointer | null> {
 		const sealious_field = this.getFileField();
 		if (!sealious_field) {
 			return null;
 		}
 		return await item.collection.app.FileManager.fromToken(
-			item.get(sealious_field.name).token
+			(item.get(sealious_field.name) as FilePointer).token
 		);
 	}
 
@@ -216,12 +216,15 @@ export class MultipleFiles extends FormFieldControl {
 					await this.getFileItems(ctx)
 				)
 					.filter((item) => item) // filter out undefineds
-					.map(async (item) => [
+					.map(async (item: CollectionItem<Collection>) => [
 						item,
 						await this.extractFileFromItem(item),
 					])
 			)
-		).filter(([_, f]) => f !== null) as [CollectionItem, FilePointer][];
+		).filter(([_, f]) => f !== null) as [
+			CollectionItem<Collection>,
+			FilePointer
+		][];
 
 		return inputWrapper(
 			["multiple-files", this.field.name, ...this.getClassModifiers()],

package/src/forms/controls/number.ts

@@ -30,6 +30,6 @@ export class Number extends SimpleInput<number | null> {
 					: []),
 				...(this.options.step ? [["step", this.options.step]] : []),
 			]),
-		};
+		} as Record<string, string>;
 	}
 }

package/src/forms/controls/photo.test.ts

@@ -13,15 +13,16 @@ import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 import _locreq from "locreq";
 import { module_dirname } from "../../utils/module-dirname.js";
 import { FileManager, PathFilePointer } from "@sealcode/file-manager";
+import assert from "node:assert";
 const locreq = _locreq(module_dirname(import.meta.url));
 
-describe("photo-controll", () => {
+describe("photo-control", () => {
 	describe("basic tests", async () => {
 		let server: ReturnType<Koa["listen"]>;
 		let browser: Browser;
 		let page: Page;
 
-		afterAll(() => {
+		after(() => {
 			server.close();
 		});
 
@@ -53,13 +54,11 @@ describe("photo-controll", () => {
 					controls = [new Photo(fields.photo, imageRouter)];
 
 					async onSubmit(ctx: Context) {
-						console.log("OnSubmit!");
 						const data = await this.getParsedValues(ctx);
-						console.log({ data });
 						received_photo = data.photo;
 					}
 
-					async getInitialValues(ctx: Context) {
+					async getInitialValues(_ctx: Context) {
 						const file = new PathFilePointer(
 							new FileManager("/tmp", "/uploaded_files"),
 							locreq.resolve("assets/important.png")
@@ -77,14 +76,14 @@ describe("photo-controll", () => {
 			);
 			app.use(router.routes()).use(router.allowedMethods());
 			server = app.listen(port);
+			// await sleep(99999999);
 
 			browser = await getBrowser();
 			const context = await browser.newContext();
 			page = await context.newPage();
 			await page.goto(`http://localhost:${port}`);
 			await page.getByRole("button", { name: "Wyślij" }).click();
-			console.log({ received_photo });
 			assert(received_photo !== undefined && (received_photo as any).old !== null);
 		});
-	});
+	}).timeout(99999999999);
 });

package/src/forms/controls/photo.ts

@@ -22,7 +22,7 @@ export class Photo extends File {
 	}
 
 	async renderFilePreview(
-		ctx: Context,
+		_ctx: Context,
 		file: FilePointer | null
 	): Promise<FlatTemplatable> {
 		const class_name = "file_preview";
@@ -48,15 +48,12 @@ export class Photo extends File {
 	}
 
 	async getInputAttributes(fctx: FormControlContext) {
-		const original = (await super.getInputAttributes(fctx)) as Record<
-			string,
-			string | boolean
-		>;
+		const original = await super.getInputAttributes(fctx);
 		return {
 			...original,
 			accept: "image/*",
 			onchange:
-				(original.onchange || "") +
+				((original.onchange as string) || "") +
 				";" +
 				`
    const file = this.files[0];

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

@@ -91,7 +91,7 @@ export class SimpleInput<
 				!valid && raw
 					? raw.toString()
 					: parsed !== undefined && parsed !== null
-					? ((parsed as any)?.toString() as string) || ""
+					? (parsed as string)?.toString() || ""
 					: "",
 			],
 			...(fctx.form_id ? [["form", fctx.form_id]] : []),
@@ -100,7 +100,7 @@ export class SimpleInput<
 			...(required ? [["required", true]] : []),
 			...(!this.options.autocomplete ? [["autocomplete", "off"]] : []),
 			...(this.options.step ? [["step", this.options.step]] : []),
-		]);
+		]) as Record<string, string>;
 	}
 
 	async postInput(_: Context): Promise<FlatTemplatable> {
@@ -126,9 +126,7 @@ export class SimpleInput<
 		];
 	}
 
-	async render<Fields extends Record<string, FormField>>(
-		fctx: FormControlContext
-	): Promise<FlatTemplatable> {
+	async render(fctx: FormControlContext): Promise<FlatTemplatable> {
 		const id = this.getID();
 		const label = this.getLabel();
 

package/src/forms/controls/textarea.ts

@@ -4,9 +4,7 @@ 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
-> {
+export class Textarea extends SimpleInput<string | null> {
 	constructor(
 		public field: FormField<boolean, string | null>,
 		public options: SimpleInputOptions & {
@@ -31,10 +29,7 @@ export class Textarea<Required extends boolean> extends SimpleInput<
 	async getInputAttributes(
 		fctx: FormControlContext
 	): Promise<Record<string, string | boolean>> {
-		const original = (await super.getInputAttributes(fctx)) as Record<
-			string,
-			string | boolean
-		>;
+		const original = await super.getInputAttributes(fctx);
 		let onkeydown = original.onkeydown || "";
 		if (this.options.autogrow) {
 			onkeydown += `;this.style.height = '5px';this.style.height = Math.max((this.scrollHeight)+32, ${
@@ -55,6 +50,6 @@ export class Textarea<Required extends boolean> extends SimpleInput<
 		data: Record<string, FormDataValue>
 	) {
 		const { parsed: value } = await this.field.getValue(ctx, data);
-		return /* HTML */ `<textarea ${attributes}>${value}</textarea>`;
+		return /* HTML */ `<textarea ${attributes}>${value || ""}</textarea>`;
 	}
 }

package/src/forms/controls/tickable.ts

@@ -15,7 +15,7 @@ export type TickableOptions = {
 	readonly?: boolean;
 };
 
-export abstract class Tickable<T extends unknown> extends FormFieldControl {
+export abstract class Tickable<T> extends FormFieldControl {
 	constructor(
 		public field: FormField<boolean, T>,
 		public options: TickableOptions = {}
@@ -63,9 +63,7 @@ export abstract class Tickable<T extends unknown> extends FormFieldControl {
 		];
 	}
 
-	async render<Fields extends Record<string, FormField>>(
-		fctx: FormControlContext
-	): Promise<FlatTemplatable> {
+	async render(fctx: FormControlContext): Promise<FlatTemplatable> {
 		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 		const { parsed, valid, message } = await this.field.getValue(
 			fctx.ctx,

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

@@ -1,4 +1,3 @@
-import { describe, it, beforeAll, afterAll, afterEach, beforeEach } from "vitest";
 import assert from "assert";
 import { Fields } from "../../index.js";
 

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

@@ -7,6 +7,7 @@ export class ExistingSealiousValue<
 	constructor(required: Required, field: Field) {
 		super(required, async (ctx) => {
 			const { items } = await field.collection.list(ctx.$context).fetch();
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 			return Object.fromEntries(
 				items.map((item) => {
 					const value = item.get(field.name);

package/src/forms/fields/field.ts

@@ -49,7 +49,7 @@ export type FieldParseResult<T> =
 
 export abstract class FormField<
 	Required extends boolean = boolean,
-	ParsedValue extends unknown = unknown
+	ParsedValue = unknown
 > {
 	name: string;
 	constructor(public readonly required: Required) {}
@@ -85,8 +85,8 @@ export abstract class FormField<
 	public abstract getEmptyValue(): ParsedValue;
 
 	public async isValueValid(
-		ctx: Context,
-		value: ParsedValue
+		_ctx: Context,
+		_value: ParsedValue
 	): Promise<FormFieldValidationResponse> {
 		return { valid: true, message: "" };
 	}
@@ -128,12 +128,9 @@ export abstract class FormField<
 				message: parse_error || "Error",
 			};
 		}
-		const { valid, message } = await this._validate(
-			ctx,
-			parsed_value as ParsedValue
-		);
+		const { valid, message } = await this._validate(ctx, parsed_value);
 		return {
-			parsed: parsed_value as ParsedValue,
+			parsed: parsed_value,
 			valid,
 			message,
 			raw: all_form_values[this.name],

package/src/forms/fields/file.ts

@@ -21,7 +21,7 @@ export class File<Required extends boolean> extends FormField<
 	}
 
 	async parse(
-		ctx: Context,
+		_ctx: Context,
 		raw_value: FormDataValue
 	): Promise<FieldParseResult<FileContainer>> {
 		let result;
@@ -30,17 +30,23 @@ export class File<Required extends boolean> extends FormField<
 			result = {
 				parsed_value: { old: file, new: null },
 				error: null,
-				parsable: true as true,
+				parsable: true as const,
 			};
 		} else if (!is(raw_value, predicates.object)) {
 			result = {
 				parsed_value: null,
 				error: "Expected a field with old.id:string, old.filename:string and new?:File",
-				parsable: false as false,
+				parsable: false as const,
 			};
 		} else {
-			const old_file = hasFieldOfType(raw_value, "old", predicates.string)
-				? await this.file_manager.fromToken(raw_value.old)
+			const old_file = hasFieldOfType(
+				raw_value,
+				"old",
+				predicates.or(predicates.string, predicates.object)
+			)
+				? await this.file_manager.toPointer(
+						raw_value.old as string | FilePointer
+				  )
 				: null;
 			const new_file =
 				hasFieldOfType(
@@ -51,11 +57,12 @@ export class File<Required extends boolean> extends FormField<
 					? raw_value.new[0]
 					: null;
 			result = {
-				parsable: true as true,
+				parsable: true as const,
 				error: null,
 				parsed_value: { old: old_file, new: new_file },
 			};
 		}
+
 		return result;
 	}
 

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

@@ -1,5 +1,5 @@
 import { Context } from "koa";
-import { Field, FieldsetInput, FieldsetOutput, FieldTypes } from "sealious";
+import { Field, FieldsetOutput, FieldTypes } from "sealious";
 import { FormDataValue } from "../form-types.js";
 import { FormField } from "./field.js";
 
@@ -13,7 +13,7 @@ export class StructuredArrayField<
 		super(true);
 	}
 
-	async parse(context: Context, value: FormDataValue) {
+	async parse(_context: Context, value: FormDataValue) {
 		return {
 			parsable: <const>true,
 			error: null,

package/src/forms/form.test.ts

@@ -1,5 +1,4 @@
 import Router from "@koa/router";
-import { describe, it, beforeAll, afterAll, afterEach, beforeEach } from "vitest";
 import axios from "axios";
 import Koa, { BaseContext } from "koa";
 import { Page } from "playwright";
@@ -7,7 +6,7 @@ import { Controls, Fields, Form, Mountable } from "../index.js";
 import { mount } from "../mount.js";
 import { locator_is_visible } from "../test_utils/locator_is_visible.js";
 import { getBrowser } from "../utils/browser-creator.js";
-import { assertThrowsAsync, sleep } from "../utils/utils.js";
+import { assertThrowsAsync } from "../utils/utils.js";
 import { FormDataValue } from "./form-types.js";
 import getPort from "get-port";
 import { SimpleFormField } from "./fields/simple-form-field.js";
@@ -42,7 +41,7 @@ console.log("Using port " + port + " for form.test.ts");
 describe("form test", () => {
 	let page: Page;
 
-	beforeAll(async () => {
+	before(async () => {
 		const browser = await getBrowser();
 		const context = await browser.newContext();
 		page = await context.newPage();
@@ -51,7 +50,7 @@ describe("form test", () => {
 	describe("basic tests", async () => {
 		let server: ReturnType<Koa["listen"]>;
 
-		beforeAll(async () => {
+		before(async () => {
 			const app = new Koa();
 			const router = new Router();
 
@@ -61,7 +60,7 @@ describe("form test", () => {
 			await page.goto(`http://localhost:${port}`);
 		});
 
-		afterAll(async () => {
+		after(async () => {
 			server.close();
 		});
 
@@ -131,7 +130,7 @@ describe("form test", () => {
 			const app = new Koa();
 			const router = new Router();
 
-			beforeAll(async () => {
+			before(async () => {
 				mount(
 					router,
 					"/",
@@ -236,7 +235,7 @@ describe("form test", () => {
 		describe("validation message", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -277,7 +276,7 @@ describe("form test", () => {
 				await page.goto(`http://localhost:${port}`);
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 
@@ -302,7 +301,7 @@ describe("form test", () => {
 		describe("field specific validation message", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 				const fields = {
@@ -334,7 +333,7 @@ describe("form test", () => {
 				await page.goto(`http://localhost:${port}`);
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 

package/src/forms/form.ts

@@ -25,7 +25,7 @@ import {
 
 export abstract class Form<
 	F extends Fields,
-	SubmitResult extends any
+	SubmitResult
 > extends MountableWithFields<F> {
 	defaultSuccessMessage = "Done";
 	submitButtonText = "Wyślij";