@sealcode/sealgen 0.19.15 → 0.19.16

package/lib/forms/controls/tickable.js

@@ -21,6 +21,7 @@ class Tickable extends FormFieldControl {
     ];
   }
   async render(fctx) {
+    console.log("!! Rendering checkbox", this.field.name);
     const {
       parsed: _parsed,
       valid,
@@ -30,6 +31,8 @@ class Tickable extends FormFieldControl {
       fctx.data.raw_values,
       true
     );
+    const field_message = fctx.data.field_messages[this.field.name];
+    console.log(this.field.name, fctx.data.field_messages, field_message);
     const parsed = _parsed === null ? this.options.default_value : _parsed;
     const value = this.getValueAttribute(
       fctx.ctx,
@@ -72,7 +75,7 @@ class Tickable extends FormFieldControl {
 					})();
 				</script>
 
-				${~valid && !this.options.hide_errors && fctx.validate ? `<div class="input__error">${message}</div>` : ""}
+				${(~valid || !!field_message) && !this.options.hide_errors && fctx.validate ? `<div class="input__error">${Array.from(new Set([message, field_message].filter((e) => !!e))).join(" \u2022 ")}</div>` : ""}
 			`
     );
   }

package/lib/forms/form.js

@@ -83,11 +83,16 @@ class Form extends MountableWithFields {
     }
     if (error instanceof SealiousErrors.FieldsError) {
       field_messages = Object.fromEntries(
-        Object.entries(error.field_messages).map(([key, value]) => {
+        Object.entries(error.field_messages).filter(([key]) => key in this.fields).map(([key, value]) => {
           const message = value?.message || "";
           return [key, { type: "error", message }];
         })
       );
+      for (const [key, value] of Object.entries(error.field_messages)) {
+        if (!(key in this.fields)) {
+          error_message += " \xB7 " + value?.message;
+        }
+      }
     }
     const messages = [{ type: "error", text: error_message }];
     return {

package/package.json

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

package/src/forms/controls/tickable.ts

@@ -74,6 +74,7 @@ export abstract class Tickable<T> extends FormFieldControl {
 			fctx.data.raw_values,
 			true
 		);
+		const field_message = fctx.data.field_messages[this.field.name];
 		const parsed = _parsed === null ? this.options.default_value : _parsed;
 
 		const value = this.getValueAttribute(
@@ -83,9 +84,9 @@ export abstract class Tickable<T> extends FormFieldControl {
 		);
 		const id = this.makeInputID(fctx.ctx, fctx.data.raw_values, parsed);
 		const label =
-			this.options.label != undefined
-				? this.options.label
-				: this.field.name;
+			this.options.label != undefined ?
+				this.options.label
+			:	this.field.name;
 
 		const readonly = this.options.readonly || false;
 		const required = this.field.required;
@@ -102,9 +103,9 @@ export abstract class Tickable<T> extends FormFieldControl {
 					this.field.name}"
 					${value ? `value="${attribute(value)}"` : ""}
 					${fctx.form_id ? `form="${fctx.form_id}"` : ""}
-					${this.isChecked(fctx.ctx, fctx.data.raw_values, parsed)
-						? "checked"
-						: ""}
+					${this.isChecked(fctx.ctx, fctx.data.raw_values, parsed) ?
+						"checked"
+					:	""}
 					${readonly ? "readonly" : ""}
 					${required ? "required" : ""}
 					autocomplete="off"
@@ -127,9 +128,13 @@ export abstract class Tickable<T> extends FormFieldControl {
 					})();
 				</script>
 
-				${~valid && !this.options.hide_errors && fctx.validate
-					? `<div class="input__error">${message}</div>`
-					: ""}
+				${(
+					(~valid || !!field_message) &&
+					!this.options.hide_errors &&
+					fctx.validate
+				) ?
+					`<div class="input__error">${Array.from(new Set([message, field_message.message].filter((e) => !!e))).join(" • ")}</div>`
+				:	""}
 			`
 		);
 	}

package/src/forms/form.ts

@@ -136,11 +136,18 @@ export abstract class Form<
 		}
 		if (error instanceof SealiousErrors.FieldsError) {
 			field_messages = Object.fromEntries(
-				Object.entries(error.field_messages).map(([key, value]) => {
-					const message = value?.message || "";
-					return [key, { type: "error", message }];
-				})
+				Object.entries(error.field_messages)
+					.filter(([key]) => key in this.fields)
+					.map(([key, value]) => {
+						const message = value?.message || "";
+						return [key, { type: "error", message }];
+					})
 			);
+			for (const [key, value] of Object.entries(error.field_messages)) {
+				if (!(key in this.fields)) {
+					error_message += " · " + value?.message;
+				}
+			}
 		}
 		const messages = [<const>{ type: "error", text: error_message }];
 		return {

package/src/utils/translate.ts

@@ -1,13 +1,15 @@
+/* eslint @typescript-eslint/no-unsafe-call: off, @typescript-eslint/no-unnecessary-type-assertion: off */
 import { Context } from "koa";
 import { Translation } from "sealious";
 
+/** deprecated */
 export function t(
 	ctx: Context,
 	key: string,
-	props: unknown[],
-	default_translation: Translation
+	_props: unknown[],
+	_default_translation: Translation
 ) {
-	return /* HTML */ `<span translation-key="${key.replace('"', '\\"')}"
-		>${ctx.$app.getString(key, props, default_translation)}</span
-	>`;
+	return /* HTML */ `<span translation-key="${key.replace('"', '\\"')}">
+		${ctx.i18n`${key}`}
+	</span>`;
 }