@sealcode/sealgen 0.15.5 → 0.15.7

package/@types/src/builder.d.ts

@@ -4,7 +4,6 @@ export declare abstract class Builder {
     abstract getName(): string;
     abstract _build(): Promise<void>;
     abstract dispose(): Promise<void>;
-    constructor();
     ongoing_build: Promise<void> | null;
     build(notifier?: (message: string) => void): Promise<void>;
 }

package/@types/src/esbuild-plugins/load-assets.d.ts

@@ -1,4 +1,5 @@
+import { PluginBuild } from "esbuild";
 export declare const load_assets_plugin: {
     name: string;
-    setup(build: any): void;
+    setup(build: PluginBuild): void;
 };

package/@types/src/esbuild-plugins/rewrite-asset-imports.d.ts

@@ -1,4 +1,5 @@
+import { PluginBuild } from "esbuild";
 export declare const rewrite_asset_imports_plugin: {
     name: string;
-    setup(build: any): void;
+    setup(build: PluginBuild): void;
 };

package/@types/src/forms/controls/autocomplete.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 import { Context } from "koa";
 import { PickFromListField } from "../fields/pick-from-list.js";
 import { FormControlContext } from "./form-control.js";
@@ -18,5 +19,5 @@ export declare class Autocomplete extends SimpleInput<string | null> {
     getInputAttributes(fctx: FormControlContext): Promise<{
         list: string;
     }>;
-    postInput(ctx: Context): Promise<string>;
+    postInput(ctx: Context): Promise<import("stream").Readable>;
 }

package/@types/src/forms/controls/checkbox-group.d.ts

@@ -1,6 +1,5 @@
 import { FlatTemplatable } from "tempstream";
 import { EnumMultipleField } from "../fields/enum-multiple.js";
-import { FormField } from "../fields/field.js";
 import { CheckboxWithValue } from "./checkbox.js";
 import { FormControlContext } from "./form-control.js";
 import { FormFieldControl } from "./form-field-control.js";
@@ -18,5 +17,5 @@ export declare class CheckboxGroup<Options extends DefaultCheckboxOptions = Defa
     options: Options;
     constructor(field: EnumMultipleField<readonly string[], boolean>, options?: Options);
     wrapGroup(fctx: FormControlContext, checkboxes: CheckboxWithValue[]): Promise<FlatTemplatable>;
-    render<Fields extends Record<string, FormField>>(fctx: FormControlContext): Promise<FlatTemplatable>;
+    render(fctx: FormControlContext): Promise<FlatTemplatable>;
 }

package/@types/src/forms/controls/collapsible-field-group.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 import { FlatTemplatable } from "tempstream";
 import { FieldGroup } from "./field-group.js";
 import { FormControl } from "./form-control.js";
@@ -14,7 +15,7 @@ export declare class CollapsibleFieldGroup extends FieldGroup {
     options: CollapsibleFieldGroupOptions;
     collapseID: string;
     constructor(controls: FormControl[], options?: CollapsibleFieldGroupOptions);
-    getGroupLabelProps(): string;
+    getGroupLabelProps(): import("stream").Readable;
     preLabelContainer(): FlatTemplatable;
     postLabel(): FlatTemplatable;
 }

package/@types/src/forms/controls/form-control.d.ts

@@ -15,5 +15,5 @@ export declare class FormControlContext {
 export declare abstract class FormControl {
     abstract render(fctx: FormControlContext): FlatTemplatable | Promise<FlatTemplatable>;
     abstract role: "input" | "decoration" | "messages" | "submit";
-    mount(router: Router): void;
+    mount(_router: Router): void;
 }

package/@types/src/forms/controls/multiple-files.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="koa__router" />
 /// <reference types="node" resolution-mode="require"/>
 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 { FlatTemplatable } from "tempstream";
 import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files.js";
@@ -25,9 +25,9 @@ export declare class MultipleFiles extends FormFieldControl {
     getFrameID(): string;
     renderFrame(_ctx: Context, content?: FlatTemplatable): import("stream").Readable;
     render(fctx: FormControlContext): FlatTemplatable | Promise<FlatTemplatable>;
-    getReferencingCollection(): import("sealious").Collection;
+    getReferencingCollection(): Collection;
     getFileField(): SealiousField | null;
-    extractFileFromItem(item: CollectionItem): Promise<FilePointer | null>;
+    extractFileFromItem(item: CollectionItem<Collection>): Promise<FilePointer | null>;
     renderFileItemPreview(_fileItem: CollectionItem, file: FilePointer): Promise<FlatTemplatable>;
     renderFileItem(fileItem: CollectionItem, file: FilePointer): Promise<FlatTemplatable>;
     renderFileRemoveButton(fileItem: CollectionItem): FlatTemplatable;

package/@types/src/forms/controls/photo.d.ts

@@ -12,7 +12,7 @@ export declare class Photo extends File {
     imageRouter: KoaResponsiveImageRouter;
     constructor(field: FormField<boolean, FileContainer>, imageRouter: KoaResponsiveImageRouter, options?: SimpleInputOptions);
     getImgStyle(): Promise<string>;
-    renderFilePreview(ctx: Context, file: FilePointer | null): Promise<FlatTemplatable>;
+    renderFilePreview(_ctx: Context, file: FilePointer | null): Promise<FlatTemplatable>;
     getWrapperModifiers(): string[];
     getInputAttributes(fctx: FormControlContext): Promise<{
         accept: string;

package/@types/src/forms/controls/simple-input.d.ts

@@ -29,5 +29,5 @@ export declare class SimpleInput<ParsedValue, Options extends SimpleInputOptions
     postInput(_: Context): Promise<FlatTemplatable>;
     renderInput(_ctx: Context, attributes_str: string, _data: Record<string, FormDataValue>): Promise<FlatTemplatable>;
     getWrapperModifiers(): string[];
-    render<Fields extends Record<string, FormField>>(fctx: FormControlContext): Promise<FlatTemplatable>;
+    render(fctx: FormControlContext): Promise<FlatTemplatable>;
 }

package/@types/src/forms/controls/textarea.d.ts

@@ -3,7 +3,7 @@ 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 declare class Textarea<Required extends boolean> extends SimpleInput<string | null> {
+export declare class Textarea extends SimpleInput<string | null> {
     field: FormField<boolean, string | null>;
     options: SimpleInputOptions & {
         label?: string;

package/@types/src/forms/controls/tickable.d.ts

@@ -11,7 +11,7 @@ export type TickableOptions = {
     hide_errors?: boolean;
     readonly?: boolean;
 };
-export declare abstract class Tickable<T extends unknown> extends FormFieldControl {
+export declare abstract class Tickable<T> extends FormFieldControl {
     field: FormField<boolean, T>;
     options: TickableOptions;
     constructor(field: FormField<boolean, T>, options?: TickableOptions);
@@ -20,5 +20,5 @@ export declare abstract class Tickable<T extends unknown> extends FormFieldContr
     abstract isChecked(ctx: Context, data: Record<string, FormDataValue>, value: T): boolean;
     makeInputID(ctx: Context, data: Record<string, FormDataValue>, value: T): string;
     getWrapperClasses(ctx: Context, data: Record<string, FormDataValue>, value: T): string[];
-    render<Fields extends Record<string, FormField>>(fctx: FormControlContext): Promise<FlatTemplatable>;
+    render(fctx: FormControlContext): Promise<FlatTemplatable>;
 }

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

@@ -21,7 +21,7 @@ export type FieldParseResult<T> = {
     error: string;
     parsed_value: null;
 };
-export declare abstract class FormField<Required extends boolean = boolean, ParsedValue extends unknown = unknown> {
+export declare abstract class FormField<Required extends boolean = boolean, ParsedValue = unknown> {
     readonly required: Required;
     name: string;
     constructor(required: Required);
@@ -30,7 +30,7 @@ export declare abstract class FormField<Required extends boolean = boolean, Pars
     init(fieldname: string): Promise<void>;
     _validate(ctx: Context, value: ParsedValue): Promise<FormFieldValidationResponse>;
     abstract getEmptyValue(): ParsedValue;
-    isValueValid(ctx: Context, value: ParsedValue): Promise<FormFieldValidationResponse>;
+    isValueValid(_ctx: Context, _value: ParsedValue): Promise<FormFieldValidationResponse>;
     abstract parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<ParsedValue>>;
     getValue(ctx: Context, all_form_values: Record<string, FormDataValue>): Promise<{
         valid: boolean;

package/@types/src/forms/fields/file.d.ts

@@ -10,7 +10,7 @@ export declare class File<Required extends boolean> extends FormField<Required,
     readonly required: Required;
     file_manager: FileManager;
     constructor(required: Required, file_manager: FileManager);
-    parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<FileContainer>>;
+    parse(_ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<FileContainer>>;
     getDatabaseValue(ctx: Context, data: Record<string, FormDataValue>): Promise<FilePointer | undefined>;
     getEmptyValue(): {
         old: null;

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

@@ -5,7 +5,7 @@ import { FormField } from "./field.js";
 export declare class StructuredArrayField<Fields extends Record<string, Field>> extends FormField<true, FieldTypes.ArrayStorageInput<FieldsetOutput<Fields>>> {
     sealious_field: FieldTypes.StructuredArray<Fields>;
     constructor(sealious_field: FieldTypes.StructuredArray<Fields>);
-    parse(context: Context, value: FormDataValue): Promise<{
+    parse(_context: Context, value: FormDataValue): Promise<{
         parsable: true;
         error: null;
         parsed_value: FieldsetOutput<Fields>;

package/@types/src/forms/form.d.ts

@@ -4,7 +4,7 @@ import Router from "@koa/router";
 import { FlatTemplatable } from "tempstream";
 import { FormData, FormDataValue, FormMessage, FormReaction } from "./form-types.js";
 import { Fields, MountableWithFields, PageErrorMessage } from "../page/mountable-with-fields.js";
-export declare abstract class Form<F extends Fields, SubmitResult extends any> extends MountableWithFields<F> {
+export declare abstract class Form<F extends Fields, SubmitResult> extends MountableWithFields<F> {
     defaultSuccessMessage: string;
     submitButtonText: string;
     action: string;

package/@types/src/mount.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="koa__router" />
 import Router from "@koa/router";
+import { FileManager } from "@sealcode/file-manager";
 import { Mountable } from "./page/mountable.js";
 export declare function mount(router: Router, url: string | {
     rawURL: string;
-}, mountable: Mountable, use_dummy_app?: boolean): void;
+}, mountable: Mountable, use_dummy_app?: boolean, file_manager?: FileManager | undefined): void;

package/@types/src/page/sealious-list.d.ts

@@ -11,7 +11,7 @@ export declare abstract class SealiousItemListPage<C extends Collection, F exten
     makeQuery(ctx: Context): Promise<ItemList<C>>;
     getItems(ctx: Context, page: number, itemsPerPage: number): Promise<CollectionItem<C>[]>;
     getFilterValues(ctx: Context): Promise<Record<string, string | undefined>>;
-    renderItem(_: Context, item: CollectionItem<C>, index: number): Promise<FlatTemplatable>;
+    renderItem(_: Context, item: CollectionItem<C>, _index: number): Promise<FlatTemplatable>;
     canAccess: (ctx: Context) => Promise<{
         canAccess: boolean;
         message: string;

package/@types/src/page/stateful-page.d.ts

@@ -21,9 +21,9 @@ export type StateAndMetadata<State, Actions> = {
     action_args: null;
     $: Record<string, unknown>;
 };
-export declare abstract class StatefulPage<State extends Record<string, unknown>, Actions extends Record<string, (state: State, inputs: Record<string, string>, ...args: unknown[]) => State | Promise<State>>> extends Mountable {
+export declare abstract class StatefulPage<State extends Record<string, unknown>, Actions extends Record<string, (ctx: BaseContext, state: State, inputs: Record<string, string>, ...args: unknown[]) => State | Promise<State>>> extends Mountable {
     abstract actions: Actions;
-    abstract getInitialState(): State | Promise<State>;
+    abstract getInitialState(ctx: BaseContext): State | Promise<State>;
     abstract render(ctx: BaseContext, state: State, inputs: Record<string, string>): Templatable | Promise<Templatable>;
     canAccess(): Promise<{
         readonly canAccess: true;
@@ -45,7 +45,7 @@ export declare abstract class StatefulPage<State extends Record<string, unknown>
     } | ActionName, ...args: ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>): string;
     rerender(): string;
     preprocessState(values: State): Promise<State>;
-    preprocessOverrides(state: State, values: Record<string, unknown>): Promise<Record<string, unknown>>;
+    preprocessOverrides(_context: BaseContext, _state: State, values: Record<string, unknown>): Promise<Record<string, unknown>>;
     serializeState(_context: BaseContext, state: State): Promise<string>;
     deserializeState(_context: BaseContext, s: string): Promise<State>;
     extractState(ctx: BaseContext): Promise<StateAndMetadata<State, Actions>>;

package/@types/src/utils/translate.d.ts

@@ -1,3 +1,3 @@
 import { Context } from "koa";
 import { Translation } from "sealious";
-export declare function t(ctx: Context, key: string, props: any[], default_translation: Translation): string;
+export declare function t(ctx: Context, key: string, props: unknown[], default_translation: Translation): string;

package/lib/add-route.test.js

@@ -93,6 +93,6 @@ describe("add route test", () => {
     if (res.status != 200) {
       throw new Error("url generated by add-route exists but doesnt return 200");
     }
-  });
+  }).timeout(100 * 1e3);
 });
 //# sourceMappingURL=add-route.test.js.map

package/lib/forms/controls/multiple-files.js

@@ -102,9 +102,11 @@ class MultipleFiles extends FormFieldControl {
     if (!sealious_field) {
       return null;
     }
-    return await item.collection.app.FileManager.fromToken(
-      item.get(sealious_field.name).token
-    );
+    const token = item.get(sealious_field.name).token;
+    if (!token) {
+      return null;
+    }
+    return await item.collection.app.FileManager.fromToken(token);
   }
   async renderFileItemPreview(_fileItem, file) {
     return file.getOriginalFilename();

package/lib/forms/controls/photo.js

@@ -19,7 +19,8 @@ class Photo extends File {
 			${this.imageRouter.image(await file.getPath(), {
       resolutions: [100],
       sizesAttr: "100px",
-      imgStyle: await this.getImgStyle()
+      imgStyle: await this.getImgStyle(),
+      alt: "Image preview"
     })}
 		</div>`;
   }

package/lib/page/stateful-page.js

@@ -84,7 +84,7 @@ class StatefulPage extends Mountable {
   async preprocessState(values) {
     return values;
   }
-  async preprocessOverrides(_state, values) {
+  async preprocessOverrides(_context, _state, values) {
     return values;
   }
   async serializeState(_context, state) {
@@ -123,6 +123,7 @@ class StatefulPage extends Mountable {
     const $body = ctx.$body;
     let state_overrides = $body.$ || {};
     state_overrides = await this.preprocessOverrides(
+      ctx,
       original_state,
       state_overrides
     );
@@ -169,12 +170,13 @@ class StatefulPage extends Mountable {
   }
   mount(router, path) {
     router.get(path, async (ctx) => {
-      ctx.body = this.render(ctx, await this.getInitialState(), {});
+      ctx.body = this.render(ctx, await this.getInitialState(ctx), {});
     });
     router.post(path, async (ctx) => {
       const { action, state, inputs, action_args } = await this.extractState(ctx);
       if (action) {
         const new_state = await this.actions[action](
+          ctx,
           state,
           inputs,
           ...JSON.parse(

package/lib/templates/jdd-component.js

@@ -35,7 +35,6 @@ export class ${toPascalCase(
 		);
 	}
 }
-
 `;
 }
 export {

package/lib/templates/page.js

@@ -1,7 +1,7 @@
 import { curryImportPath } from "../utils/import-path.js";
 async function pageTemplate(action_name, newfilefullpath) {
   const rel = curryImportPath(newfilefullpath);
-  return `import { Context } from "koa";
+  return `import type { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
 import html from "${rel("src/back/html.js")}";

package/lib/templates/route-test.js

@@ -9,7 +9,7 @@ import { VERY_LONG_TEST_TIMEOUT, webhintURL } from "${rel(
   )}";
 import { ${action_name}URL } from "${rel("src/back/routes/urls.js")}";
 import { getBrowser } from "${rel("src/back/test_utils/browser-creator.js")}";
-import { Browser, BrowserContext, Page } from "@playwright/test";
+import type { Browser, BrowserContext, Page } from "@playwright/test";
 
 describe("${action_name} webhint", () => {
 	it(
@@ -23,9 +23,8 @@ describe("${action_name} webhint", () => {
 				// const response = await rest_api.get(${action_name}URL);
 				// await webhintHTML(response);
 			});
-		},
-		VERY_LONG_TEST_TIMEOUT
-	);
+		}
+	).timeout(VERY_LONG_TEST_TIMEOUT);
 });
 
 describe("${action_name}", () => {
@@ -49,9 +48,8 @@ describe("${action_name}", () => {
 			return withProdApp(async ({ base_url }) => {
 				await page.goto(base_url + ${action_name}URL);
 			});
-		},
-		VERY_LONG_TEST_TIMEOUT
-	);
+		}
+	).timeout(VERY_LONG_TEST_TIMEOUT);
 });
 `;
 }

package/package.json

@@ -1,15 +1,17 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.15.5",
+	"version": "0.15.7",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
 	"scripts": {
 		"prebuild": "npm run lint && rm -rf lib",
 		"build": "node ./build.js",
+		"postbuild": "npm run build-types",
 		"pretest": "npm run build",
 		"test": "node test.cjs",
 		"typecheck": "tsc --noemit",
+		"build-types": "tsc --emitDeclarationOnly",
 		"prepare": "npm run build",
 		"lint": "eslint src",
 		"preinstrument": "npm run build && rm -fr .xunit coverage lib-instrumented",

package/src/add-route.test.ts

@@ -102,5 +102,5 @@ describe("add route test", () => {
 		if (res.status != 200) {
 			throw new Error("url generated by add-route exists but doesnt return 200");
 		}
-	});
+	}).timeout(100 * 1000);
 });

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

@@ -146,9 +146,11 @@ export class MultipleFiles extends FormFieldControl {
 		if (!sealious_field) {
 			return null;
 		}
-		return await item.collection.app.FileManager.fromToken(
-			(item.get(sealious_field.name) as FilePointer).token
-		);
+		const token = (item.get(sealious_field.name) as FilePointer).token;
+		if (!token) {
+			return null;
+		}
+		return await item.collection.app.FileManager.fromToken(token);
 	}
 
 	async renderFileItemPreview(

package/src/forms/controls/photo.ts

@@ -35,6 +35,7 @@ export class Photo extends File {
 				resolutions: [100],
 				sizesAttr: "100px",
 				imgStyle: await this.getImgStyle(),
+				alt: "Image preview",
 			})}
 		</div>`;
 	}

package/src/page/stateful-page.ts

@@ -37,6 +37,7 @@ export abstract class StatefulPage<
 	Actions extends Record<
 		string,
 		(
+			ctx: BaseContext,
 			state: State,
 			inputs: Record<string, string>,
 			...args: unknown[]
@@ -44,7 +45,7 @@ export abstract class StatefulPage<
 	>
 > extends Mountable {
 	abstract actions: Actions;
-	abstract getInitialState(): State | Promise<State>;
+	abstract getInitialState(ctx: BaseContext): State | Promise<State>;
 	abstract render(
 		ctx: BaseContext,
 		state: State,
@@ -169,6 +170,7 @@ export abstract class StatefulPage<
 	}
 
 	async preprocessOverrides(
+		_context: BaseContext,
 		_state: State,
 		values: Record<string, unknown>
 	): Promise<Record<string, unknown>> {
@@ -223,6 +225,7 @@ export abstract class StatefulPage<
 		const $body = ctx.$body;
 		let state_overrides = $body.$ || {};
 		state_overrides = await this.preprocessOverrides(
+			ctx,
 			original_state,
 			state_overrides
 		);
@@ -283,7 +286,7 @@ export abstract class StatefulPage<
 
 	mount(router: Router, path: string) {
 		router.get(path, async (ctx) => {
-			ctx.body = this.render(ctx, await this.getInitialState(), {});
+			ctx.body = this.render(ctx, await this.getInitialState(ctx), {});
 		});
 
 		router.post(path, async (ctx) => {
@@ -291,6 +294,7 @@ export abstract class StatefulPage<
 				await this.extractState(ctx);
 			if (action) {
 				const new_state = await this.actions[action](
+					ctx,
 					state,
 					inputs,
 					...(JSON.parse(

package/src/templates/jdd-component.ts

@@ -36,6 +36,5 @@ export class ${toPascalCase(
 		);
 	}
 }
-
 `;
 }

package/src/templates/page.ts

@@ -4,7 +4,7 @@ export async function pageTemplate(
 	newfilefullpath: string
 ): Promise<string> {
 	const rel = curryImportPath(newfilefullpath);
-	return `import { Context } from "koa";
+	return `import type { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
 import html from "${rel("src/back/html.js")}";

package/src/templates/route-test.ts

@@ -10,7 +10,7 @@ import { VERY_LONG_TEST_TIMEOUT, webhintURL } from "${rel(
 	)}";
 import { ${action_name}URL } from "${rel("src/back/routes/urls.js")}";
 import { getBrowser } from "${rel("src/back/test_utils/browser-creator.js")}";
-import { Browser, BrowserContext, Page } from "@playwright/test";
+import type { Browser, BrowserContext, Page } from "@playwright/test";
 
 describe("${action_name} webhint", () => {
 	it(
@@ -24,9 +24,8 @@ describe("${action_name} webhint", () => {
 				// const response = await rest_api.get(${action_name}URL);
 				// await webhintHTML(response);
 			});
-		},
-		VERY_LONG_TEST_TIMEOUT
-	);
+		}
+	).timeout(VERY_LONG_TEST_TIMEOUT);
 });
 
 describe("${action_name}", () => {
@@ -50,9 +49,8 @@ describe("${action_name}", () => {
 			return withProdApp(async ({ base_url }) => {
 				await page.goto(base_url + ${action_name}URL);
 			});
-		},
-		VERY_LONG_TEST_TIMEOUT
-	);
+		}
+	).timeout(VERY_LONG_TEST_TIMEOUT);
 });
 `;
 }