@sealcode/sealgen 0.15.15 → 0.15.17

package/@types/src/forms/controls/file.test.d.ts

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

package/lib/forms/controls/file.js

@@ -36,7 +36,7 @@ class File extends SimpleInput {
     return {
       ...original,
       name: this.field.name + "[new]",
-      required: original.required && !parsed.new,
+      required: original.required && !parsed.old,
       value: false
     };
   }

package/lib/forms/controls/file.test.js

@@ -0,0 +1,78 @@
+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 { Controls, Fields, sleep } from "../../index.js";
+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("file-control", () => {
+  describe("basic tests", async () => {
+    let server;
+    let browser;
+    let page;
+    after(() => {
+      server.close();
+    });
+    it("doesn't require image input if it already has old-value", async () => {
+      const port = await getPort();
+      console.log(`Using port ${port} for photo.test.ts`);
+      const app = new Koa();
+      const router = new Router();
+      const fields = {
+        file: new Fields.File(true, new FileManager("/tmp", "/uploaded_files"))
+      };
+      let submit_called = false;
+      mount(
+        router,
+        "/",
+        new class extends Form {
+          constructor() {
+            super(...arguments);
+            this.fields = fields;
+            this.controls = [new Controls.File(fields.file)];
+          }
+          async onSubmit(_ctx) {
+            submit_called = true;
+          }
+          async getInitialValues(_ctx) {
+            const file = new PathFilePointer(
+              new FileManager("/tmp", "/uploaded_files"),
+              locreq.resolve("assets/important.png")
+            );
+            return {
+              file: await file.save(false)
+              // to get the token
+            };
+          }
+          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();
+      let screenshot = true;
+      (async function() {
+        while (screenshot) {
+          await page.screenshot({ path: "/home/kuba/Downloads/" + Date.now() + ".png" });
+          await sleep(100);
+        }
+      })();
+      await page.goto(`http://localhost:${port}`);
+      await page.getByRole("button", { name: "Wy\u015Blij" }).click();
+      await sleep(100);
+      assert(submit_called, "Submit not called - something prevented submit on click?");
+      screenshot = false;
+    });
+  }).timeout(1e4);
+});
+//# sourceMappingURL=file.test.js.map

package/lib/forms/controls/photo.test.js

@@ -74,6 +74,62 @@ describe("photo-control", () => {
       await page.getByRole("button", { name: "Wy\u015Blij" }).click();
       assert(received_photo !== void 0 && received_photo.old !== null);
     });
-  }).timeout(99999999999);
+    it("doesn't require image input if it already has old-value", async () => {
+      const port = await getPort();
+      console.log(`Using port ${port} for photo.test.ts`);
+      const app = new Koa();
+      const router = new Router();
+      const fields = {
+        photo: new Fields.File(true, new FileManager("/tmp", "/uploaded_files"))
+      };
+      let received_photo;
+      const imageRouter = new KoaResponsiveImageRouter({
+        staticPath: "/images",
+        thumbnailSize: 20,
+        cacheManagerResolutionThreshold: 50,
+        imageStoragePath: `/tmp/image-cache-${port}`,
+        smartCropStoragePath: `/tmp/smartcrop-storage-${port}`
+      });
+      let submit_called = false;
+      mount(
+        router,
+        "/",
+        new class extends Form {
+          constructor() {
+            super(...arguments);
+            this.fields = fields;
+            this.controls = [new Photo(fields.photo, imageRouter)];
+          }
+          async onSubmit(ctx) {
+            submit_called = true;
+            const data = await this.getParsedValues(ctx);
+            received_photo = data.photo;
+          }
+          async getInitialValues(_ctx) {
+            const file = new PathFilePointer(
+              new FileManager("/tmp", "/uploaded_files"),
+              locreq.resolve("assets/important.png")
+            );
+            return {
+              photo: await file.save(false)
+              // to get the token
+            };
+          }
+          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}`);
+      await page.getByRole("button", { name: "Wy\u015Blij" }).click();
+      assert(submit_called, "Submit not called - something prevented submit on click?");
+    });
+  }).timeout(1e4);
 });
 //# sourceMappingURL=photo.test.js.map

package/lib/page/stateful-page.js

@@ -128,7 +128,7 @@ class StatefulPage extends Mountable {
       state_overrides
     );
     let modified_state = deepmerge(original_state, state_overrides, {
-      isMergeableObject: isPlainObject,
+      isMergeableObject: (v) => isPlainObject(v) || Array.isArray(v),
       arrayMerge: (target, source, options) => {
         const destination = target.slice();
         source.forEach((item, index) => {

package/lib/templates/post.js

@@ -1,7 +1,7 @@
 async function postTemplate(action_name) {
-  return `import { Context } from "koa";
+  return `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
-import Router from "@koa/router";
+import type Router from "@koa/router";
 
 export const actionName = "${action_name}";
 

package/lib/utils/render-attributes.js

@@ -1,6 +1,6 @@
 import { attribute } from "../sanitize.js";
 function renderAttributes(attrs) {
-  return Object.entries(attrs).map(([key, value]) => {
+  const ret = Object.entries(attrs).map(([key, value]) => {
     if (typeof value === "boolean") {
       if (value) {
         return key;
@@ -13,6 +13,7 @@ function renderAttributes(attrs) {
       return "";
     }
   }).join(" ");
+  return ret;
 }
 export {
   renderAttributes

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.15.15",
+	"version": "0.15.17",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",

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

@@ -0,0 +1,87 @@
+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 { Controls, Fields, sleep } from "../../index.js";
+
+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("file-control", () => {
+	describe("basic tests", async () => {
+		let server: ReturnType<Koa["listen"]>;
+		let browser: Browser;
+		let page: Page;
+
+		after(() => {
+			server.close();
+		});
+
+		it("doesn't require image input if it already has old-value", async () => {
+			const port = await getPort();
+			console.log(`Using port ${port} for photo.test.ts`);
+			const app = new Koa();
+			const router = new Router();
+
+			const fields = {
+				file: new Fields.File(true, new FileManager("/tmp", "/uploaded_files")),
+			};
+
+			let submit_called = false;
+
+			mount(
+				router,
+				"/",
+				new (class extends Form<typeof fields, unknown> {
+					fields = fields;
+					controls = [new Controls.File(fields.file)];
+
+					async onSubmit(_ctx: Context) {
+						submit_called = true;
+					}
+
+					async getInitialValues(_ctx: Context) {
+						const file = new PathFilePointer(
+							new FileManager("/tmp", "/uploaded_files"),
+							locreq.resolve("assets/important.png")
+						);
+						return {
+							file: await file.save(false), // to get the token
+						};
+					}
+
+					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();
+			let screenshot = true;
+			(async function () {
+				while (screenshot) {
+					await page.screenshot({ path: "/home/kuba/Downloads/" + Date.now() + ".png" });
+					await sleep(100);
+				}
+			})();
+			await page.goto(`http://localhost:${port}`);
+
+			await page.getByRole("button", { name: "Wyślij" }).click();
+			await sleep(100);
+			assert(submit_called, "Submit not called - something prevented submit on click?");
+			screenshot = false;
+		});
+	}).timeout(10000);
+});

package/src/forms/controls/file.ts

@@ -53,7 +53,7 @@ export class File extends SimpleInput<FileContainer> {
 		return {
 			...original,
 			name: this.field.name + "[new]",
-			required: original.required && !parsed.new,
+			required: original.required && !parsed.old,
 			value: false,
 		};
 	}

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

@@ -76,7 +76,6 @@ describe("photo-control", () => {
 			);
 			app.use(router.routes()).use(router.allowedMethods());
 			server = app.listen(port);
-			// await sleep(99999999);
 
 			browser = await getBrowser();
 			const context = await browser.newContext();
@@ -85,5 +84,67 @@ describe("photo-control", () => {
 			await page.getByRole("button", { name: "Wyślij" }).click();
 			assert(received_photo !== undefined && (received_photo as any).old !== null);
 		});
-	}).timeout(99999999999);
+
+		it("doesn't require image input if it already has old-value", async () => {
+			const port = await getPort();
+			console.log(`Using port ${port} for photo.test.ts`);
+			const app = new Koa();
+			const router = new Router();
+
+			const fields = {
+				photo: new Fields.File(true, new FileManager("/tmp", "/uploaded_files")),
+			};
+
+			let received_photo: unknown;
+
+			const imageRouter = new KoaResponsiveImageRouter({
+				staticPath: "/images",
+				thumbnailSize: 20,
+				cacheManagerResolutionThreshold: 50,
+				imageStoragePath: `/tmp/image-cache-${port}`,
+				smartCropStoragePath: `/tmp/smartcrop-storage-${port}`,
+			});
+
+			let submit_called = false;
+
+			mount(
+				router,
+				"/",
+				new (class extends Form<typeof fields, unknown> {
+					fields = fields;
+					controls = [new Photo(fields.photo, imageRouter)];
+
+					async onSubmit(ctx: Context) {
+						submit_called = true;
+						const data = await this.getParsedValues(ctx);
+						received_photo = data.photo;
+					}
+
+					async getInitialValues(_ctx: Context) {
+						const file = new PathFilePointer(
+							new FileManager("/tmp", "/uploaded_files"),
+							locreq.resolve("assets/important.png")
+						);
+						return {
+							photo: await file.save(false), // to get the token
+						};
+					}
+
+					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}`);
+			await page.getByRole("button", { name: "Wyślij" }).click();
+			assert(submit_called, "Submit not called - something prevented submit on click?");
+		});
+	}).timeout(10000);
 });

package/src/page/stateful-page.ts

@@ -236,7 +236,7 @@ export abstract class StatefulPage<
 			state_overrides
 		);
 		let modified_state = deepmerge(original_state, state_overrides, {
-			isMergeableObject: isPlainObject,
+			isMergeableObject: (v) => isPlainObject(v) || Array.isArray(v),
 			arrayMerge: (
 				target: any[],
 				source: any[],

package/src/templates/post.ts

@@ -1,7 +1,7 @@
 export async function postTemplate(action_name: string): Promise<string> {
-	return `import { Context } from "koa";
+	return `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
-import Router from "@koa/router";
+import type Router from "@koa/router";
 
 export const actionName = "${action_name}";
 

package/src/utils/render-attributes.ts

@@ -1,7 +1,7 @@
 import { attribute } from "../sanitize.js";
 
 export function renderAttributes(attrs: Record<string, string | boolean>) {
-	return Object.entries(attrs)
+	const ret = Object.entries(attrs)
 		.map(([key, value]) => {
 			if (typeof value === "boolean") {
 				if (value) {
@@ -16,4 +16,6 @@ export function renderAttributes(attrs: Record<string, string | boolean>) {
 			}
 		})
 		.join(" ");
+
+	return ret;
 }