@sealcode/sealgen 0.19.26 → 0.19.28

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

@@ -59,15 +59,15 @@ export class DeepReverseSingleReferenceTable extends Table<
 			label: this.label || this.name,
 			allow_adding: false,
 			subfield_controls: {
-				selected: this.columns.selected.getControl(),
+				selected: this.columns.selected!.getControl(),
 				[this.sealious_field.referencing_field]: new HiddenInput(
-					this.columns[this.sealious_field.referencing_field]
+					this.columns[this.sealious_field.referencing_field]!
 				),
 				[this.sealious_field.intermediary_field_that_points_there]:
 					new HiddenInput(
 						this.columns[
 							this.sealious_field.intermediary_field_that_points_there
-						]
+						]!
 					),
 				...Object.fromEntries(
 					Object.values(getReferencingFields(this.sealious_field))
@@ -80,7 +80,7 @@ export class DeepReverseSingleReferenceTable extends Table<
 						)
 						.map((field) => [
 							field.name,
-							this.columns[field.name].getControl(),
+							this.columns[field.name]!.getControl(),
 						])
 				),
 			},
@@ -99,8 +99,7 @@ export class DeepReverseSingleReferenceTable extends Table<
 		// First, we remove links refering to current item
 		const { items: to_delete } = await ctx.$app.collections[
 			"${toKebabCase(referencing_collection)}"
-		]
-			.list(ctx.$context)
+		]!.list(ctx.$context)
 			.filter({ "${referencing_field}": created_item.id })
 			.fetch();
 		await Promise.all(to_delete.map((item) => item.remove(ctx.$context)));
@@ -119,7 +118,7 @@ export class DeepReverseSingleReferenceTable extends Table<
 			.map(async (link_info) => {
 				await ctx.$app.collections[
 					"${toKebabCase(referencing_collection)}"
-				].create(ctx.$context, {
+				]!.create(ctx.$context, {
 					"${referencing_field}": created_item.id,
 					"${intermediary_field_that_points_there}": String(
 						link_info["${intermediary_field_that_points_there}"]
@@ -167,13 +166,16 @@ export class DeepReverseSingleReferenceTable extends Table<
 				targets
 					.map((target) => {
 						return {
-							selected: (
-								(item.get(
-									this.sealious_field.name
-								) as string[]) || []
-							).includes(target.id)
-								? "on"
-								: "off",
+							selected:
+								(
+									(
+										(item.get(
+											this.sealious_field.name
+										) as string[]) || []
+									).includes(target.id)
+								) ?
+									"on"
+								:	"off",
 							[this.sealious_field.referencing_field]: item.id,
 							[this.sealious_field
 								.intermediary_field_that_points_there]:

package/src/forms/fields/field.ts

@@ -60,15 +60,15 @@ export type FieldParseResult<T> =
 
 export abstract class FormField<
 	Required extends boolean = boolean,
-	ParsedValue = unknown,
+	ParsedValue = any,
 	DefaultFormControl extends FormControl = FormControl,
 	SealiousValue = any,
 > {
-	name: string;
-	label: string;
+	name!: string;
+	label!: string;
 	constructor(public readonly required: Required) {}
 	predicate: Predicate = predicates.unknown;
-	mapToFilter: (parsed: ParsedValue) => unknown = (value) => value;
+	mapToFilter: (parsed: ParsedValue) => any = (value) => value;
 	disabled = false;
 
 	async init(): Promise<void> {}

package/src/forms/fields/file.ts

@@ -39,31 +39,37 @@ export class File<Required extends boolean> extends FormField<
 				parsable: false as const,
 			};
 		} else {
-			const old_file = hasFieldOfType(
-				raw_value,
-				"old",
-				predicates.instanceOf(PathFilePointer)
-			)
-				? await ctx.$app.fileManager.toPointer(
-						raw_value.old as string | FilePointer
+			const old_file =
+				(
+					hasFieldOfType(
+						raw_value,
+						"old",
+						predicates.instanceOf(PathFilePointer)
 					)
-				: null;
-			const new_file = hasFieldOfType(
-				raw_value,
-				"new",
-				predicates.or(
-					predicates.array(predicates.instanceOf(PathFilePointer)),
-					predicates.instanceOf(PathFilePointer)
-				)
-			)
-				? Array.isArray(raw_value.new)
-					? raw_value.new[0]
-					: raw_value.new
-				: null;
+				) ?
+					await ctx.$app.fileManager.toPointer(raw_value.old)
+				:	null;
+			const new_file =
+				(
+					hasFieldOfType(
+						raw_value,
+						"new",
+						predicates.or(
+							predicates.array(
+								predicates.instanceOf(PathFilePointer)
+							),
+							predicates.instanceOf(PathFilePointer)
+						)
+					)
+				) ?
+					Array.isArray(raw_value.new) ?
+						raw_value.new[0]
+					:	raw_value.new
+				:	null;
 			result = {
 				parsable: true as const,
 				error: null,
-				parsed_value: { old: old_file, new: new_file },
+				parsed_value: { old: old_file, new: new_file || null },
 			};
 		}
 		return result;

package/src/forms/fields/image.ts

@@ -1,12 +1,8 @@
 import { Image as ImageControl } from "../controls/image.js";
 import { File as FileField } from "./file.js";
-import { FileContainer } from "../fields/file.js";
-import { FormField } from "./field.js";
 
 export class Image<Required extends boolean> extends FileField<Required> {
 	getControl(): ImageControl {
-		return new ImageControl(
-			this as unknown as FormField<boolean, FileContainer>
-		);
+		return new ImageControl(this);
 	}
 }

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

@@ -33,8 +33,7 @@ export class PhoneNumberWithCountryCode<
 			return {
 				parsable: false,
 				parsed_value: null,
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				error: e.message as string,
+				error: (e as Error).message,
 			};
 		}
 	}

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

@@ -6,7 +6,7 @@ import { TextBasedSimpleField } from "./simple-form-field.js";
 
 export class PickFromListField<
 	Required extends boolean,
-> extends TextBasedSimpleField<Required, Dropdown> {
+> extends TextBasedSimpleField<Required, Dropdown<Required>> {
 	constructor(
 		public required: Required,
 		public generateOptions: (ctx: Context) => Promise<DropdownOption[]>,
@@ -50,7 +50,7 @@ export class PickFromListField<
 		return "";
 	}
 
-	getControl(): Dropdown {
+	getControl(): Dropdown<Required> {
 		return new Dropdown(this);
 	}
 }

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

@@ -14,7 +14,7 @@ export abstract class SimpleFormField<
 	Parsed = string,
 > extends FormField<Required, Parsed, DefaultControl> {
 	predicate = predicates.string;
-	public placeholder: string;
+	public placeholder!: string;
 
 	constructor(
 		required: Required,
@@ -31,7 +31,7 @@ export abstract class SimpleFormField<
 			return "";
 		}
 		// eslint-disable-next-line @typescript-eslint/no-base-to-string
-		return String(value) as FormDataValue;
+		return String(value);
 	}
 
 	setPlaceholder(placeholder: string) {
@@ -77,7 +77,7 @@ export class TextBasedSimpleField<
 	): Promise<void> {}
 
 	async postSealiousEdit(
-		ctx: Context,
+		_ctx: Context,
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		_edited_item: CollectionItem<any>,
 		_formData: FormData

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

@@ -53,7 +53,7 @@ export class StructuredArray<
 			[name in keyof SealiousFields]: SealiousToFormField<
 				SealiousFields[name]
 			>;
-		}>(this as any, {
+		}>(this, {
 			label: this.label || this.name,
 			subfield_controls: Object.fromEntries(
 				Object.entries(this.columns).map(([column_name, subfield]) => [
@@ -98,8 +98,7 @@ export class StructuredArray<
 								key,
 								await form_subfield.sealiousValueToForm(
 									ctx,
-									value,
-									{} as any
+									value
 								),
 							];
 						})

package/src/forms/fields/table.ts

@@ -9,11 +9,9 @@ import {
 import { FormControl } from "../controls/form-control.js";
 
 export type ExtractFormFieldParsed<Field extends FormField> =
-	Field extends FormField<true, infer T>
-		? NonNullable<T>
-		: Field extends FormField<true, infer T>
-			? T
-			: never;
+	Field extends FormField<true, infer T> ? NonNullable<T>
+	: Field extends FormField<true, infer T> ? T
+	: never;
 
 export type TableFieldParsed<F extends Record<string, FormField>> = {
 	[field_name in keyof F]: ExtractFormFieldParsed<F[field_name]>;
@@ -87,8 +85,7 @@ export class Table<F extends Record<string, FormField>> extends FormField<
 						parsed_value: null,
 					};
 				}
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any
-				parsed_row[key] = parse_result.parsed_value as any;
+				parsed_row[key] = parse_result.parsed_value;
 			}
 			result.push(parsed_row as { [field_name in keyof F]: unknown });
 		}

package/src/forms/multiform.ts

@@ -3,17 +3,20 @@ import Router from "@koa/router";
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { Fields, MountableWithFields } from "../page/mountable-with-fields.js";
+import { MountableWithFields } from "../page/mountable-with-fields.js";
 import { attribute } from "../sanitize.js";
 import type { FormDataValue, FormMessage } from "./form-types.js";
 import { Form } from "./form.js";
+import { FormField } from "./fields/field.js";
 
 const FIELD_PREFIX_SEPARATOR = "___";
 
-export class Multiform extends MountableWithFields {
+export class Multiform<
+	Forms extends Record<string, Form<Record<string, FormField>, any>> = any,
+> extends MountableWithFields {
 	getControls = () => [];
-	public name: string;
-	public forms: Record<string, Form<Fields, unknown>>;
+	public name!: string;
+	public forms!: Forms;
 
 	init(path: string, router: Router): void {
 		if (this.initialized) {
@@ -97,11 +100,11 @@ export class Multiform extends MountableWithFields {
 		show_field_errors: boolean
 	): Promise<FlatTemplatable> {
 		const form = this.forms[sub_form_name];
-		const result = await form.canAccess(ctx);
+		const result = await form!.canAccess(ctx);
 		if (!result.canAccess) {
 			return result.message;
 		}
-		return form.render(
+		return form!.render(
 			ctx,
 			{
 				raw_values: await this.getSubformRawValues(ctx, sub_form_name),

package/src/generate-routes.ts

@@ -51,10 +51,10 @@ export function sortRoutes<T extends { url: string }>(urls: T[]): T[] {
 		const [segments1, segments2] = [url1, url2].map((url) =>
 			url.split("/")
 		);
-		if (segments1.length < segments2.length) {
+		if (segments1!.length < segments2!.length) {
 			return -1;
 		}
-		if (segments1.length > segments2.length) {
+		if (segments1!.length > segments2!.length) {
 			return 1;
 		}
 		// if they are the same length, map each url to a string like 00010
@@ -63,7 +63,7 @@ export function sortRoutes<T extends { url: string }>(urls: T[]): T[] {
 		const [encoded1, encoded2] = [url1, url2].map((url) =>
 			url.split("/").map((e) => (e.startsWith(":") ? "1" : "0"))
 		);
-		return encoded1 < encoded2 ? -1 : 1;
+		return encoded1! < encoded2! ? -1 : 1;
 	});
 }
 

package/src/get-fonts.ts

@@ -61,11 +61,11 @@ export async function getFonts(_: Record<string, string | boolean> = {}) {
 
 		await Promise.all(
 			Object.keys(squirrel_fonts).map((font) => {
-				if (squirrel_fonts[font].length) {
+				if (squirrel_fonts[font]!.length) {
 					return execPromise(
 						`node ${path_to_fonsta} install ${font}:${squirrel_fonts[
 							font
-						].join(",")}`,
+						]!.join(",")}`,
 						{
 							cwd: target_locreq.resolve("public"),
 						}
@@ -93,7 +93,11 @@ export async function getFonts(_: Record<string, string | boolean> = {}) {
 		content.replace(/@font-face {/g, "@font-face {\nfont-display: swap;")
 	);
 
-	await unlink("public/fonsta.config.json");
+	try {
+		await unlink("public/fonsta.config.json");
+	} catch {
+		console.info("No fonsta config present, using just google fonts");
+	}
 	await rmdir("public/tmp");
 	console.info("Downloaded new fonts pack from Font Squirrel");
 

package/src/notifier.ts

@@ -77,8 +77,7 @@ async function wait_for_app_restart(app_port: number) {
 		restart_promise = wait_for_run_id_to_change(app_port);
 		await restart_promise;
 	} catch (e) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		if (e.message !== APP_DOWN_ERROR_MESSAGE) {
+		if ((e as Error).message !== APP_DOWN_ERROR_MESSAGE) {
 			throw e;
 		}
 	}

package/src/page/list.ts

@@ -31,7 +31,7 @@ function decodeSort(s: unknown): ListSort | null {
 		return null;
 	}
 	let order = s.split(SORT_SEPARATOR)[1];
-	const field = s.split(SORT_SEPARATOR)[0];
+	const field = s.split(SORT_SEPARATOR)[0]!;
 	if (order !== "asc" && order !== "desc") {
 		order = "asc";
 		return {
@@ -151,7 +151,7 @@ export abstract class ListPage<
 									ctx,
 									this.propsParser.overwriteProp(ctx, {
 										page: n,
-									} as Partial<Record<string, unknown>>)
+									})
 								)}"
 								${page === n ? "selected" : ""}
 							>
@@ -177,7 +177,7 @@ export abstract class ListPage<
 				ctx,
 				this.propsParser.overwriteProp(ctx, {
 					page,
-				} as Partial<Record<string, unknown>>)
+				})
 			)}"
 			>${text}</a
 		>`;
@@ -187,7 +187,7 @@ export abstract class ListPage<
 		const filter = {} as Record<string, unknown>;
 		const raw_values = await this.extractRawValues(ctx);
 		for (const [fieldname, field] of Object.entries(this.filterFields)) {
-			// eslint-disable-next-line no-await-in-loop
+			// eslint-disable-next-line no-await-in-loop, @typescript-eslint/no-unsafe-assignment
 			const { parsed } = await field.getParsedValue(ctx, raw_values);
 			filter[fieldname] = field.mapToFilter(parsed);
 		}

package/src/page/mountable-with-fields.test.ts

@@ -18,7 +18,7 @@ describe("mountable-with-fields", () => {
 				// this should not throw a Typescript error
 				data.not_required?.trim();
 				// this should work without the optional chaining:
-				data.required.trim();
+				(data.required || "").trim();
 				const { parsed: data2 } = await this.fields.not_required.getParsedValue(
 					ctx,
 					form_values.raw_values

package/src/page/mountable-with-fields.ts

@@ -28,17 +28,17 @@ type ParsedValue<T extends FormField> = Resolved<
 export abstract class MountableWithFields<
 	F extends Fields = Fields,
 > extends Mountable {
-	getFields: () => F;
+	getFields!: () => F;
 	fields: F;
 	initialized = false;
 	field_names_prefix = ""; // useful for multiform, where many forms are merged into one and field assignment is made using the prefix
 	form_id = ""; // all fields within this mountable will be tied to form of this id
 	abstract getControls: (fields: F) => FormControl[];
-	controls: FormControl[];
+	controls!: FormControl[];
 
 	constructor() {
 		super();
-		if (!this.fields) this.fields = {} as F;
+		this.fields = {} as F;
 	}
 
 	/** most routes should be setup using .mount(), but mount runs before
@@ -113,7 +113,7 @@ export abstract class MountableWithFields<
 
 		await Promise.all(
 			Object.keys(this.fields).map(async (key: keyof F) => {
-				const field = this.fields[key];
+				const field = this.fields[key]!;
 				const { valid: fieldvalid, message: fieldmessage } =
 					await field.getParsedValue(ctx, values, true);
 				if (!fieldvalid) {

package/src/page/sealious-list.ts

@@ -9,7 +9,7 @@ import {
 	CollectionItem,
 	ItemList,
 	Context as SealiousContext,
-	CollectionInput,
+	ExtractFilterParams,
 } from "sealious";
 import { FlatTemplatable, Templatable, tempstream } from "tempstream";
 import { peopleWhoCan } from "./access-control.js";
@@ -44,7 +44,13 @@ export abstract class SealiousItemListPage<
 			}
 		}
 		if (Object.keys(filters).length) {
-			list.filter(filters as Partial<CollectionInput<C>>);
+			list.filter(
+				filters as Partial<{
+					[FieldName in keyof C["fields"]]: ExtractFilterParams<
+						C["fields"][FieldName]
+					> | null;
+				}>
+			);
 		}
 	}
 
@@ -74,12 +80,15 @@ export abstract class SealiousItemListPage<
 	async getFilterValues(ctx: Context) {
 		const query_params = qs.parse(ctx.search.slice(1));
 		const _filter_values = query_params?.filter || {};
-		const filter_values: Record<string, string | undefined> = is(
-			_filter_values,
-			predicates.record(predicates.string, predicates.string)
-		)
-			? _filter_values
-			: {};
+		const filter_values: Record<string, string | undefined> =
+			(
+				is(
+					_filter_values,
+					predicates.record(predicates.string, predicates.string)
+				)
+			) ?
+				_filter_values
+			:	{};
 		for (const key in filter_values) {
 			if (filter_values[key] == "") {
 				delete filter_values[key];

package/src/page/stateful-page.ts

@@ -53,7 +53,7 @@ export type ExtractStatefulPageActionArgs<X> =
 
 export abstract class StatefulPage<
 	State extends Record<string, unknown>,
-	Actions extends Record<string, StatefulPageAction<State>>,
+	Actions extends Record<string, StatefulPageAction<State, any>>,
 > extends Mountable {
 	abstract actions: Actions;
 	abstract getInitialState(ctx: Context): State | Promise<State>;

package/src/templates/jdd-editor.ts

@@ -27,7 +27,7 @@ export async function jddEditorTemplate(actionName: string) {
 
 	let field_name = "";
 	if (jdd_fields.length == 1) {
-		field_name = jdd_fields[0].name;
+		field_name = jdd_fields[0]!.name;
 		console.info(
 			`Only one field of type JDD found: ${field_name}, so skipping the question...`
 		);

package/src/test_utils/test-on-real-app.ts

@@ -20,11 +20,11 @@ const sealious_minimal_url =
 const sealious_minimal_commit = "77e3794";
 
 export class RealAppTest {
-	public node_pid: number;
-	public app_port: number;
-	public mongo_port: number;
-	public app_path: string;
-	public container_name: string;
+	public node_pid!: number;
+	public app_port!: number;
+	public mongo_port!: number;
+	public app_path!: string;
+	public container_name!: string;
 	public emitter = new EventEmitter();
 
 	static async init(): Promise<RealAppTest> {

package/tsconfig.json

@@ -9,7 +9,9 @@
 		"declaration": true,
 		"esModuleInterop": true,
 		"lib": ["ES6", "ESNext"],
+		"types": ["node", "mocha"],
 		"outDir": "lib",
+		"rootDir": "src",
 		"checkJs": false,
 		"allowJs": true,
 		"declarationDir": "@types",