@sealcode/sealgen 0.15.17 → 0.15.18

package/lib/forms/fields/field.js

@@ -15,16 +15,20 @@ class FormField {
     this.name = fieldname;
   }
   async _validate(ctx, value) {
-    if (this.required && (value === "" || value === null || value === void 0)) {
-      return {
-        valid: false,
-        message: t(
-          ctx,
-          "field_is_required",
-          [],
-          "This field is required"
-        )
-      };
+    if (value === "" || value === null || value === void 0) {
+      if (this.required) {
+        return {
+          valid: false,
+          message: t(
+            ctx,
+            "field_is_required",
+            [],
+            "This field is required"
+          )
+        };
+      } else {
+        return { valid: true, message: "Empty, but not required" };
+      }
     }
     return this.isValueValid(ctx, value);
   }

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

@@ -4,6 +4,7 @@ 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";
 describe("basic field", () => {
@@ -53,6 +54,46 @@ describe("basic field", () => {
       page = await context.newPage();
       await page.goto(`http://localhost:${port}`);
     });
+    it("Doesn't even run `isValueValid` if the value is empty", async () => {
+      const port = await getPort();
+      console.log(`Using port ${port} form checkboxed-list-input.test.ts`);
+      const app = new Koa();
+      const router = new Router();
+      let is_value_valid_called = false;
+      const fields = {
+        text: new class MockField extends SimpleFormField {
+          async isValueValid() {
+            is_value_valid_called = true;
+            return true;
+          }
+        }(false)
+      };
+      mount(
+        router,
+        "/",
+        new class extends Form {
+          constructor() {
+            super(...arguments);
+            this.fields = fields;
+            this.controls = [new SimpleInput(fields.text)];
+          }
+          async onSubmit() {
+          }
+          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(is_value_valid_called == false);
+    });
   });
 });
 //# sourceMappingURL=field.test.js.map

package/package.json

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

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

@@ -10,6 +10,7 @@ import assert from "assert";
 import { SimpleFormField } from "./simple-form-field.js";
 import { SimpleInput } from "../controls/simple-input.js";
 import { FormData } from "../form-types.js";
+import { Field } from "sealious";
 
 describe("basic field", () => {
 	describe("basic tests", async () => {
@@ -63,5 +64,50 @@ describe("basic field", () => {
 			page = await context.newPage();
 			await page.goto(`http://localhost:${port}`);
 		});
+
+		it("Doesn't even run `isValueValid` if the value is empty", async () => {
+			const port = await getPort();
+			console.log(`Using port ${port} form checkboxed-list-input.test.ts`);
+			const app = new Koa();
+			const router = new Router();
+
+			let is_value_valid_called = false;
+
+			const fields = {
+				text: new (class MockField extends SimpleFormField<false> {
+					public async isValueValid() {
+						is_value_valid_called = true;
+						return true as any;
+					}
+				})(false),
+			};
+
+			mount(
+				router,
+				"/",
+				new (class extends Form<typeof fields, unknown> {
+					fields = fields;
+					controls = [new SimpleInput(fields.text)];
+
+					async onSubmit() {
+						//noop
+					}
+
+					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(is_value_valid_called == false);
+		});
 	});
 });

package/src/forms/fields/field.ts

@@ -64,20 +64,21 @@ export abstract class FormField<
 		ctx: Context,
 		value: ParsedValue
 	): Promise<FormFieldValidationResponse> {
-		if (
-			this.required &&
-			(value === "" || value === null || value === undefined)
-		) {
-			return {
-				valid: false,
-
-				message: t(
-					ctx,
-					"field_is_required",
-					[],
-					"This field is required"
-				),
-			};
+		if (value === "" || value === null || value === undefined) {
+			if (this.required) {
+				return {
+					valid: false,
+
+					message: t(
+						ctx,
+						"field_is_required",
+						[],
+						"This field is required"
+					),
+				};
+			} else {
+				return { valid: true, message: "Empty, but not required" };
+			}
 		}
 		return this.isValueValid(ctx, value);
 	}