@sealcode/sealgen 0.14.13 → 0.14.15

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

@@ -2,11 +2,11 @@ import { File as SealiousFile, CollectionItem } from "sealious";
 import { FlatTemplatable } from "tempstream";
 import { MultipleFiles, MultipleFilesOptions } from "./multiple-files.js";
 import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files.js";
-import * as KoaResponsiveImageRouter from "koa-responsive-image-router";
+import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 export declare class MultiplePhotos extends MultipleFiles {
     field: MultipleFilesField;
-    imageRouter: KoaResponsiveImageRouter.default;
-    constructor(field: MultipleFilesField, imageRouter: KoaResponsiveImageRouter.default, options?: Partial<MultipleFilesOptions>);
+    imageRouter: KoaResponsiveImageRouter;
+    constructor(field: MultipleFilesField, imageRouter: KoaResponsiveImageRouter, options?: Partial<MultipleFilesOptions>);
     getClassModifiers(): string[];
     getInputAttributes(): {
         accept: string;

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

@@ -4,12 +4,12 @@ import { File } from "./file.js";
 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";
+import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 export declare class Photo extends File {
     field: FormField<boolean, FileContainer>;
-    imageRouter: KoaResponsiveImageRouter.default;
-    constructor(field: FormField<boolean, FileContainer>, imageRouter: KoaResponsiveImageRouter.default, options?: SimpleInputOptions);
+    imageRouter: KoaResponsiveImageRouter;
+    constructor(field: FormField<boolean, FileContainer>, imageRouter: KoaResponsiveImageRouter, options?: SimpleInputOptions);
     getImgStyle(): Promise<string>;
     renderFilePreview(ctx: Context, file_data: {
         id?: string;

package/@types/src/page/mountable-with-fields.d.ts

@@ -18,10 +18,11 @@ export declare abstract class MountableWithFields<F extends Fields = Fields> ext
     constructor();
     init(): void;
     makeFormControlContext(ctx: Context, data: FormData, validate: boolean, field_name_prefix?: string, form_id?: string): FormControlContext;
-    validateValues(ctx: Context, data: Record<string, FormDataValue>): Promise<{
+    validateValues(_ctx: Context, _data: Record<string, FormDataValue>): Promise<{
         valid: boolean;
         error: string;
     }>;
+    getInitialValues(_ctx: Context): Promise<Record<string, FormDataValue>>;
     validate(ctx: Context, values: Record<string, FormDataValue>): Promise<{
         valid: boolean;
         field_errors: Partial<Record<keyof Fields, string>>;

package/dist/forms/controls/multiple-photos.js

@@ -19,10 +19,9 @@ class MultiplePhotos extends MultipleFiles {
     }
     return tempstream`<li>
 			<a href="${file.getURL()}" data-turbo="false">
-				${this.imageRouter.image({
-      path,
+				${this.imageRouter.image(path, {
       resolutions: [150, 300],
-      sizes_attr: "150px"
+      sizesAttr: "150px"
     })}
 			</a>
 			<span class="filename"> ${file.filename || "no filename"}</span>

package/dist/forms/controls/photo.js

@@ -22,11 +22,10 @@ class Photo extends File {
     }
     const file = await SealiousFile.fromID(ctx.$app, id);
     return tempstream`<div class="${class_name}">
-			${this.imageRouter.image({
+			${this.imageRouter.image(file.getDataPath(), {
       resolutions: [100],
-      sizes_attr: "100px",
-      path: file.getDataPath(),
-      img_style: await this.getImgStyle()
+      sizesAttr: "100px",
+      imgStyle: await this.getImgStyle()
     })}
 		</div>`;
   }

package/dist/forms/form.js

@@ -194,7 +194,7 @@ class Form extends MountableWithFields {
     router.use(path, subrouter.routes(), subrouter.allowedMethods());
   }
   async extractRawValues(ctx) {
-    return ctx.$body;
+    return Object.keys(ctx.$body).length ? ctx.$body : this.getInitialValues(ctx);
   }
 }
 export {

package/dist/forms/form.test.js

@@ -8,6 +8,8 @@ import { locator_is_visible } from "../test_utils/locator_is_visible.js";
 import { getBrowser } from "../utils/browser-creator.js";
 import { assertThrowsAsync } from "../utils/utils.js";
 import getPort from "get-port";
+import { SimpleFormField } from "./fields/simple-form-field.js";
+import { expect as PlaywritghtExpect } from "@playwright/test";
 const fields = {
   text: new Fields.SimpleFormField(true)
 };
@@ -311,6 +313,44 @@ describe("form test", () => {
       });
     });
   });
+  describe("getInitialValues tests", async () => {
+    let server;
+    afterEach(async () => {
+      server.close();
+    });
+    it("fills the form with values from getInitialValues", async () => {
+      const app = new Koa();
+      const router = new Router();
+      const fields2 = {
+        title: new SimpleFormField(true)
+      };
+      mount(
+        router,
+        "/",
+        new class extends Form {
+          constructor() {
+            super(...arguments);
+            this.fields = fields2;
+            this.controls = [new Controls.SimpleInput(fields2.title)];
+          }
+          async getInitialValues() {
+            return { title: "Hello" };
+          }
+          onSubmit() {
+            return null;
+          }
+        }(),
+        true
+      );
+      app.use(router.routes()).use(router.allowedMethods());
+      server = app.listen(port);
+      const response = await page.goto(`http://localhost:${port}`);
+      if (response?.status() != 200) {
+        throw new Error(`Should return 200 status and it returns ${response?.status()}`);
+      }
+      await PlaywritghtExpect(page.getByLabel("title")).toHaveValue("Hello");
+    });
+  });
 });
 export {
   form_factory

package/dist/page/mountable-with-fields.js

@@ -28,12 +28,15 @@ class MountableWithFields extends Mountable {
     );
   }
   // this one is meant to be overwritten
-  async validateValues(ctx, data) {
+  async validateValues(_ctx, _data) {
     return {
       valid: true,
       error: ""
     };
   }
+  async getInitialValues(_ctx) {
+    return {};
+  }
   async validate(ctx, values) {
     const field_errors = {};
     let valid = true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.14.13",
+	"version": "0.14.15",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "dist/index.js",
 	"type": "module",
@@ -70,7 +70,7 @@
 	},
 	"peerDependencies": {
 		"koa": "^2.13.0",
-		"koa-responsive-image-router": "^0.2.6",
+		"koa-responsive-image-router": "^0.2.24",
 		"sealious": "^0.18.1"
 	}
 }

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

@@ -8,7 +8,6 @@ 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 { sleep } from "../../utils/sleep.js";
 
 describe.only("checkboxed-list", () => {
 	describe("basic tests", async () => {

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

@@ -2,12 +2,12 @@ import { File as SealiousFile, CollectionItem } from "sealious";
 import { FlatTemplatable, tempstream } from "tempstream";
 import { MultipleFiles, MultipleFilesOptions } from "./multiple-files.js";
 import { MultipleFiles as MultipleFilesField } from "../fields/multiple-files.js";
-import * as KoaResponsiveImageRouter from "koa-responsive-image-router";
+import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 
 export class MultiplePhotos extends MultipleFiles {
 	constructor(
 		public field: MultipleFilesField,
-		public imageRouter: KoaResponsiveImageRouter.default,
+		public imageRouter: KoaResponsiveImageRouter,
 		options?: Partial<MultipleFilesOptions>
 	) {
 		super(field, options);
@@ -31,10 +31,9 @@ export class MultiplePhotos extends MultipleFiles {
 		}
 		return tempstream/* HTML */ `<li>
 			<a href="${file.getURL()}" data-turbo="false">
-				${this.imageRouter.image({
-					path,
+				${this.imageRouter.image(path, {
 					resolutions: [150, 300],
-					sizes_attr: "150px",
+					sizesAttr: "150px",
 				})}
 			</a>
 			<span class="filename"> ${file.filename || "no filename"}</span>

package/src/forms/controls/photo.ts

@@ -5,13 +5,13 @@ import { File as SealiousFile } 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";
+import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 
 export class Photo extends File {
 	constructor(
 		public field: FormField<boolean, FileContainer>,
-		public imageRouter: KoaResponsiveImageRouter.default,
+		public imageRouter: KoaResponsiveImageRouter,
 		options?: SimpleInputOptions
 	) {
 		super(field, options);
@@ -36,11 +36,10 @@ export class Photo extends File {
 		}
 		const file = await SealiousFile.fromID(ctx.$app, id);
 		return tempstream/* HTML */ `<div class="${class_name}">
-			${this.imageRouter.image({
+			${this.imageRouter.image(file.getDataPath(), {
 				resolutions: [100],
-				sizes_attr: "100px",
-				path: file.getDataPath(),
-				img_style: await this.getImgStyle(),
+				sizesAttr: "100px",
+				imgStyle: await this.getImgStyle(),
 			})}
 		</div>`;
 	}

package/src/forms/form.test.ts

@@ -7,9 +7,11 @@ 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 } from "../utils/utils.js";
+import { assertThrowsAsync, sleep } from "../utils/utils.js";
 import { FormDataValue } from "./form-types.js";
 import getPort from "get-port";
+import { SimpleFormField } from "./fields/simple-form-field.js";
+import { expect as PlaywritghtExpect } from "@playwright/test";
 
 const fields = {
 	text: new Fields.SimpleFormField(true),
@@ -355,4 +357,47 @@ describe("form test", () => {
 			});
 		});
 	});
+
+	describe("getInitialValues tests", async () => {
+		let server: ReturnType<Koa["listen"]>;
+
+		afterEach(async () => {
+			server.close();
+		});
+
+		it("fills the form with values from getInitialValues", async () => {
+			const app = new Koa();
+			const router = new Router();
+
+			const fields = {
+				title: new SimpleFormField(true),
+			};
+
+			mount(
+				router,
+				"/",
+				new (class extends Form<typeof fields, null> {
+					fields = fields;
+					controls = [new Controls.SimpleInput(fields.title)];
+
+					async getInitialValues() {
+						return { title: "Hello" };
+					}
+
+					onSubmit() {
+						return null;
+					}
+				})(),
+				true
+			);
+
+			app.use(router.routes()).use(router.allowedMethods());
+			server = app.listen(port);
+			const response = await page.goto(`http://localhost:${port}`);
+			if (response?.status() != 200) {
+				throw new Error(`Should return 200 status and it returns ${response?.status()}`);
+			}
+			await PlaywritghtExpect(page.getByLabel("title")).toHaveValue("Hello");
+		});
+	});
 });

package/src/forms/form.ts

@@ -269,6 +269,8 @@ export abstract class Form<
 	async extractRawValues(
 		ctx: Context
 	): Promise<Record<string, FormDataValue>> {
-		return ctx.$body;
+		return Object.keys(ctx.$body).length
+			? ctx.$body
+			: this.getInitialValues(ctx);
 	}
 }

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

@@ -55,8 +55,8 @@ export abstract class MountableWithFields<
 
 	// this one is meant to be overwritten
 	async validateValues(
-		ctx: Context,
-		data: Record<string, FormDataValue>
+		_ctx: Context,
+		_data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
 		return {
 			valid: true,
@@ -64,6 +64,12 @@ export abstract class MountableWithFields<
 		};
 	}
 
+	async getInitialValues(
+		_ctx: Context
+	): Promise<Record<string, FormDataValue>> {
+		return {};
+	}
+
 	async validate(
 		ctx: Context,
 		values: Record<string, FormDataValue>