@sealcode/sealgen 0.15.12 → 0.15.14

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

@@ -16,7 +16,7 @@ export type UnboundControlStorage<F extends {
 export declare function UnboundControl<F extends {
     new (...args: any): FormFieldControl;
 }>(controlClass: F, arbitrary_field_name: string, params: ConstructorParameters<F>["1"]): UnboundControlStorage;
-export declare class StructuredArray<Subfields extends Record<string, Field>> extends FormFieldControl {
+export declare class StructuredArray<Subfields extends Record<string, Field<any>>> extends FormFieldControl {
     field: StructuredArrayField<Subfields>;
     item_controls: Array<FormControl | UnboundControlStorage>;
     constructor(field: StructuredArrayField<Subfields>, item_controls: Array<FormControl | UnboundControlStorage>);

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

@@ -26,7 +26,7 @@ export declare class MultipleFiles extends FormFieldControl {
     renderFrame(_ctx: Context, content?: FlatTemplatable): import("stream").Readable;
     render(fctx: FormControlContext): FlatTemplatable | Promise<FlatTemplatable>;
     getReferencingCollection(): Collection;
-    getFileField(): SealiousField | null;
+    getFileField(): SealiousField<any> | null;
     extractFileFromItem(item: CollectionItem<Collection>): Promise<FilePointer | null>;
     renderFileItemPreview(_fileItem: CollectionItem, file: FilePointer): Promise<FlatTemplatable>;
     renderFileItem(fileItem: CollectionItem, file: FilePointer): Promise<FlatTemplatable>;

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

@@ -1,15 +1,15 @@
 import { Context } from "koa";
-import { Depromisify, Field, FieldOutput } from "sealious";
+import { ExtractFieldDecoded, Field } from "sealious";
 import { FormDataValue } from "../form-types.js";
 import { FieldParseResult, FormField, FormFieldValidationResponse } from "./field.js";
-export declare class CollectionField<F extends Field, Required extends boolean> extends FormField<Required, FieldOutput<F> | null> {
+export declare class CollectionField<F extends Field<any>, Required extends boolean> extends FormField<Required, ExtractFieldDecoded<F> | null> {
     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<FieldOutput<F> | null>>;
-    isValueValid(ctx: Context, value: FieldOutput<F>): Promise<FormFieldValidationResponse>;
-    getEmptyValue(): Depromisify<ReturnType<F["decode"]>>;
+    parse(ctx: Context, raw_value: FormDataValue): Promise<FieldParseResult<ExtractFieldDecoded<F> | null>>;
+    isValueValid(ctx: Context, value: ExtractFieldDecoded<F>): Promise<FormFieldValidationResponse>;
+    getEmptyValue(): ExtractFieldDecoded<F>;
 }

package/@types/src/forms/fields/existing-sealious-value.d.ts

@@ -1,6 +1,6 @@
 import { Field } from "sealious";
 import { PickFromListField } from "./pick-from-list.js";
 export declare class ExistingSealiousValue<Required extends boolean> extends PickFromListField<Required> {
-    constructor(required: Required, field: Field);
+    constructor(required: Required, field: Field<unknown>);
     getEmptyValue(): string;
 }

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

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

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

@@ -2,7 +2,7 @@ import { Context } from "koa";
 import { Field, FieldsetOutput, FieldTypes } from "sealious";
 import { FormDataValue } from "../form-types.js";
 import { FormField } from "./field.js";
-export declare class StructuredArrayField<Fields extends Record<string, Field>> extends FormField<true, FieldTypes.ArrayStorageInput<FieldsetOutput<Fields>>> {
+export declare class StructuredArrayField<Fields extends Record<string, Field<unknown>>> extends FormField<true, FieldTypes.ArrayStorageInput<FieldsetOutput<Fields>>> {
     sealious_field: FieldTypes.StructuredArray<Fields>;
     constructor(sealious_field: FieldTypes.StructuredArray<Fields>);
     parse(_context: Context, value: FormDataValue): Promise<{

package/@types/src/page/default-list-filters.d.ts

@@ -1,6 +1,6 @@
 import { Field } from "sealious";
 import { FlatTemplatable } from "tempstream";
-export type ListFilterRender = (value: string, field: Field) => FlatTemplatable;
-export declare const BooleanListFilter: (value: string, field: Field) => string;
-export declare const SimpleTextFilter: (value: string, field: Field) => string;
+export type ListFilterRender = (value: string, field: Field<any>) => FlatTemplatable;
+export declare const BooleanListFilter: (value: string, field: Field<any>) => string;
+export declare const SimpleTextFilter: (value: string, field: Field<any>) => string;
 export declare const DefaultListFilters: Record<string, ListFilterRender>;

package/lib/forms/controls/array.js

@@ -158,7 +158,10 @@ class StructuredArray extends FormFieldControl {
       ctx.body = this._render(
         ctx,
         form_id,
-        await item.getDecodedBody(ctx.$context, {})
+        await item.getDecodedBody(
+          ctx.$context,
+          {}
+        )
       );
     });
   }

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

@@ -87,6 +87,7 @@ class MultipleFiles extends FormFieldControl {
     const result = this.field.collection_field.app.collections[this.field.collection_field.referencing_collection];
     return result;
   }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getFileField() {
     for (const [_, field] of Object.entries(
       this.getReferencingCollection().fields

package/lib/forms/fields/field.test.js

@@ -0,0 +1,58 @@
+import Router from "@koa/router";
+import getPort from "get-port";
+import Koa from "koa";
+import { mount } from "../../mount.js";
+import { Form } from "../form.js";
+import { getBrowser } from "../../utils/browser-creator.js";
+import { SimpleFormField } from "./simple-form-field.js";
+import { SimpleInput } from "../controls/simple-input.js";
+describe("basic field", () => {
+  describe("basic tests", async () => {
+    let server;
+    let browser;
+    let page;
+    afterEach(() => {
+      server.close();
+    });
+    it("sends the values", async () => {
+      const port = await getPort();
+      console.log(`Using port ${port} form checkboxed-list-input.test.ts`);
+      const app = new Koa();
+      const router = new Router();
+      const fields = {
+        text: new SimpleFormField(true)
+      };
+      let received_values;
+      mount(
+        router,
+        "/",
+        new class extends Form {
+          constructor() {
+            super(...arguments);
+            this.fields = fields;
+            this.controls = [new SimpleInput(fields.text)];
+          }
+          async onSubmit(ctx, data) {
+            received_values = await this.getParsedValues(ctx);
+            const { parsed: email } = await this.fields.text.getValue(
+              ctx,
+              data.raw_values
+            );
+            email?.padStart(2, "0");
+          }
+          async canAccess(_) {
+            return { canAccess: true, message: "" };
+          }
+        }(),
+        true
+      );
+      app.use(router.routes()).use(router.allowedMethods());
+      server = app.listen(port);
+      browser = await getBrowser();
+      const context = await browser.newContext();
+      page = await context.newPage();
+      await page.goto(`http://localhost:${port}`);
+    });
+  });
+});
+//# sourceMappingURL=field.test.js.map

package/lib/generate-routes.js

@@ -65,7 +65,9 @@ ${files.map(
   ).join("\n")}
 
 export default function mountAutoRoutes(router: Router) {
-${files.map(
+${files.sort(
+    ({ url: url1 }, { url: url2 }) => url1.includes(":") ? 1 : url2.includes(":") ? -1 : url1 < url2 ? -1 : 1
+  ).map(
     ({ actionName }) => `	mount(router, URLs.${actionName}URL, ${actionName});`
   ).join("\n")}
 }`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.15.12",
+	"version": "0.15.14",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
@@ -80,6 +80,6 @@
 	"peerDependencies": {
 		"koa": "^2.13.0",
 		"koa-responsive-image-router": "^0.2.24",
-		"sealious": "^0.19.7"
+		"sealious": "^0.19.8"
 	}
 }

package/src/forms/controls/array.ts

@@ -30,7 +30,7 @@ export function UnboundControl<
 }
 
 export class StructuredArray<
-	Subfields extends Record<string, Field>
+	Subfields extends Record<string, Field<any>>
 > extends FormFieldControl {
 	constructor(
 		public field: StructuredArrayField<Subfields>,
@@ -224,7 +224,10 @@ export class StructuredArray<
 			ctx.body = this._render(
 				ctx,
 				form_id,
-				await item.getDecodedBody(ctx.$context, {})
+				(await item.getDecodedBody(
+					ctx.$context,
+					{}
+				)) as unknown as Record<string, FormDataValue>
 			);
 		});
 	}

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

@@ -128,7 +128,8 @@ export class MultipleFiles extends FormFieldControl {
 		return result;
 	}
 
-	getFileField(): SealiousField | null {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getFileField(): SealiousField<any> | null {
 		for (const [_, field] of Object.entries(
 			this.getReferencingCollection().fields
 		)) {

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

@@ -1,6 +1,6 @@
 import { predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { Depromisify, Field, FieldOutput } from "sealious";
+import { Depromisify, ExtractFieldDecoded, Field } from "sealious";
 import { FormDataValue } from "../form-types.js";
 
 import {
@@ -10,9 +10,10 @@ import {
 } from "./field.js";
 
 export class CollectionField<
-	F extends Field,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	F extends Field<any>,
 	Required extends boolean
-> extends FormField<Required, FieldOutput<F> | null> {
+> extends FormField<Required, ExtractFieldDecoded<F> | null> {
 	constructor(required: Required, public sealiousField: F) {
 		super(required);
 	}
@@ -22,7 +23,7 @@ export class CollectionField<
 	async parse(
 		ctx: Context,
 		raw_value: FormDataValue
-	): Promise<FieldParseResult<FieldOutput<F> | null>> {
+	): Promise<FieldParseResult<ExtractFieldDecoded<F> | null>> {
 		if (raw_value === undefined) {
 			return { parsable: true, parsed_value: null, error: null };
 		}
@@ -45,7 +46,7 @@ export class CollectionField<
 
 	public async isValueValid(
 		ctx: Context,
-		value: FieldOutput<F>
+		value: ExtractFieldDecoded<F>
 	): Promise<FormFieldValidationResponse> {
 		const { valid, reason } = await this.sealiousField.checkValue(
 			ctx.$context,
@@ -56,7 +57,8 @@ export class CollectionField<
 		return { valid, message: reason || (!valid ? "Wrong value" : "") };
 	}
 
-	public getEmptyValue(): Depromisify<ReturnType<F["decode"]>> {
-		return "" as unknown as Depromisify<ReturnType<F["decode"]>>;
+	public getEmptyValue(): ExtractFieldDecoded<F> {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return "" as unknown as ExtractFieldDecoded<F>;
 	}
 }

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

@@ -4,13 +4,13 @@ import { PickFromListField } from "./pick-from-list.js";
 export class ExistingSealiousValue<
 	Required extends boolean
 > extends PickFromListField<Required> {
-	constructor(required: Required, field: Field) {
+	constructor(required: Required, field: Field<unknown>) {
 		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);
+					const value = item.get(field.name) as unknown;
 					return [value, value];
 				})
 			);

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

@@ -0,0 +1,67 @@
+import Router from "@koa/router";
+import getPort from "get-port";
+import { Browser, Page } from "playwright";
+import type { Context } from "koa";
+import Koa from "koa";
+import { mount } from "../../mount.js";
+import { Form } from "../form.js";
+import { getBrowser } from "../../utils/browser-creator.js";
+import assert from "assert";
+import { SimpleFormField } from "./simple-form-field.js";
+import { SimpleInput } from "../controls/simple-input.js";
+import { FormData } from "../form-types.js";
+
+describe("basic field", () => {
+	describe("basic tests", async () => {
+		let server: ReturnType<Koa["listen"]>;
+		let browser: Browser;
+		let page: Page;
+
+		afterEach(() => {
+			server.close();
+		});
+
+		it("sends the values", async () => {
+			const port = await getPort();
+			console.log(`Using port ${port} form checkboxed-list-input.test.ts`);
+			const app = new Koa();
+			const router = new Router();
+
+			const fields = {
+				text: new SimpleFormField(true),
+			};
+
+			let received_values: unknown;
+
+			mount(
+				router,
+				"/",
+				new (class extends Form<typeof fields, unknown> {
+					fields = fields;
+					controls = [new SimpleInput(fields.text)];
+
+					async onSubmit(ctx: Context, data: FormData) {
+						received_values = await this.getParsedValues(ctx);
+						const { parsed: email } = await this.fields.text.getValue(
+							ctx,
+							data.raw_values
+						);
+						email?.padStart(2, "0"); // if the typechecks are ok, this will not throw
+					}
+
+					async canAccess(_: Context) {
+						return { canAccess: true, message: "" };
+					}
+				})(),
+				true
+			);
+			app.use(router.routes()).use(router.allowedMethods());
+			server = app.listen(port);
+
+			browser = await getBrowser();
+			const context = await browser.newContext();
+			page = await context.newPage();
+			await page.goto(`http://localhost:${port}`);
+		});
+	});
+});

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

@@ -4,7 +4,7 @@ import { FormDataValue } from "../form-types.js";
 import { FormField } from "./field.js";
 
 export class StructuredArrayField<
-	Fields extends Record<string, Field>
+	Fields extends Record<string, Field<unknown>>
 > extends FormField<
 	true,
 	FieldTypes.ArrayStorageInput<FieldsetOutput<Fields>>

package/src/generate-routes.ts

@@ -90,6 +90,16 @@ ${files
 
 export default function mountAutoRoutes(router: Router) {
 ${files
+
+	.sort(({ url: url1 }, { url: url2 }) =>
+		url1.includes(":") // make sure the parametrized ones come later, so the more concrete ones show up first. This is not a full solution, but works for single-parameter urls
+			? 1
+			: url2.includes(":")
+			? -1
+			: url1 < url2
+			? -1
+			: 1
+	)
 	.map(
 		({ actionName }) =>
 			`	mount(router, URLs.${actionName}URL, ${actionName});`

package/src/page/default-list-filters.ts

@@ -1,9 +1,12 @@
 import { Field } from "sealious";
 import { FlatTemplatable } from "tempstream";
 
-export type ListFilterRender = (value: string, field: Field) => FlatTemplatable;
+export type ListFilterRender = (
+	value: string,
+	field: Field<any>
+) => FlatTemplatable;
 
-export const BooleanListFilter = (value: string, field: Field) => {
+export const BooleanListFilter = (value: string, field: Field<any>) => {
 	return /* HTML */ `<label>
 		${field.name}
 		<select name="filter[${field.name}]" autocomplete="off">
@@ -28,7 +31,7 @@ export const BooleanListFilter = (value: string, field: Field) => {
 	</label>`;
 };
 
-export const SimpleTextFilter = (value: string, field: Field) => {
+export const SimpleTextFilter = (value: string, field: Field<any>) => {
 	return /* HTML */ `<label>
 		${field.name}
 		<input