@sealcode/sealgen 0.19.14 → 0.19.16

package/@types/controllers/password-generate-button.stimulus.d.ts

@@ -0,0 +1,5 @@
+import { Controller } from "stimulus";
+export default class extends Controller<HTMLButtonElement> {
+    getInput(): HTMLInputElement;
+    generate(): void;
+}

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

@@ -1,31 +1,32 @@
-export { FormControl } from "./form-control.js";
-export { FormFieldControl } from "./form-field-control.js";
-export { EditableCollectionSubset } from "./editable-collection-subset.js";
-export { Frame } from "./frame.js";
+export * from "./autocomplete.js";
+export * from "./big-radio-group.js";
+export * from "./checkbox-group.js";
+export * from "./checkbox.js";
 export { CheckboxedListInput } from "./checkboxed-list-input.js";
+export * from "./collapsible-checkbox-group.js";
+export * from "./collapsible-field-group.js";
+export * from "./derived-frame.js";
+export * from "./derived.js";
 export * from "./dropdown.js";
-export * from "./single-reference.js";
-export { SimpleInput } from "./simple-input.js";
+export { EditableCollectionSubset } from "./editable-collection-subset.js";
+export { FieldGroup } from "./field-group.js";
+export * from "./file.js";
+export { FormControl } from "./form-control.js";
+export { FormFieldControl } from "./form-field-control.js";
 export { FormHeader } from "./form-header.js";
 export { FormParagraph } from "./form-paragraph.js";
-export { HTML } from "./html.js";
+export { Frame } from "./frame.js";
 export { HiddenInput } from "./hidden-input.js";
-export { Textarea } from "./textarea.js";
-export { FieldGroup } from "./field-group.js";
-export * from "./derived.js";
-export * from "./derived-frame.js";
-export * from "./tickable.js";
-export * from "./checkbox.js";
-export * from "./radio.js";
-export * from "./big-radio-group.js";
-export * from "./checkbox-group.js";
-export * from "./collapsible-field-group.js";
-export * from "./collapsible-checkbox-group.js";
-export * from "./autocomplete.js";
-export * from "./file.js";
+export { HTML } from "./html.js";
 export * from "./image.js";
 export * from "./multiple-files.js";
-export * from "./number.js";
 export * from "./multiple-images.js";
+export * from "./number.js";
+export * from "./password-with-generator.js";
+export * from "./radio.js";
+export { SimpleInput } from "./simple-input.js";
+export * from "./single-reference.js";
+export { Textarea } from "./textarea.js";
+export * from "./tickable.js";
 export * from "./array.js";
 export * from "./table.js";

package/@types/forms/controls/password-with-generator.d.ts

@@ -0,0 +1,6 @@
+import { FormField } from "../../index.js";
+import { SimpleInput } from "./simple-input.js";
+export declare class PasswordWithGenerator extends SimpleInput {
+    constructor(field: FormField);
+    preInput(): Promise<string>;
+}

package/lib/controllers/password-generate-button.stimulus.js

@@ -0,0 +1,24 @@
+import { Controller } from "stimulus";
+function generatePassword() {
+  const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*";
+  let password = "";
+  for (let i = 0; i < 8; i++) {
+    password += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return password;
+}
+class password_generate_button_stimulus_default extends Controller {
+  getInput() {
+    return this.element.parentElement.querySelector(
+      "input"
+    );
+  }
+  generate() {
+    this.getInput().value = generatePassword();
+    this.getInput().setAttribute("type", "text");
+  }
+}
+export {
+  password_generate_button_stimulus_default as default
+};
+//# sourceMappingURL=password-generate-button.stimulus.js.map

package/lib/forms/controls/controls.js

@@ -1,32 +1,33 @@
-import { FormControl } from "./form-control.js";
-import { FormFieldControl } from "./form-field-control.js";
-import { EditableCollectionSubset } from "./editable-collection-subset.js";
-import { Frame } from "./frame.js";
+export * from "./autocomplete.js";
+export * from "./big-radio-group.js";
+export * from "./checkbox-group.js";
+export * from "./checkbox.js";
 import { CheckboxedListInput } from "./checkboxed-list-input.js";
+export * from "./collapsible-checkbox-group.js";
+export * from "./collapsible-field-group.js";
+export * from "./derived-frame.js";
+export * from "./derived.js";
 export * from "./dropdown.js";
-export * from "./single-reference.js";
-import { SimpleInput } from "./simple-input.js";
+import { EditableCollectionSubset } from "./editable-collection-subset.js";
+import { FieldGroup } from "./field-group.js";
+export * from "./file.js";
+import { FormControl } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 import { FormHeader } from "./form-header.js";
 import { FormParagraph } from "./form-paragraph.js";
-import { HTML } from "./html.js";
+import { Frame } from "./frame.js";
 import { HiddenInput } from "./hidden-input.js";
-import { Textarea } from "./textarea.js";
-import { FieldGroup } from "./field-group.js";
-export * from "./derived.js";
-export * from "./derived-frame.js";
-export * from "./tickable.js";
-export * from "./checkbox.js";
-export * from "./radio.js";
-export * from "./big-radio-group.js";
-export * from "./checkbox-group.js";
-export * from "./collapsible-field-group.js";
-export * from "./collapsible-checkbox-group.js";
-export * from "./autocomplete.js";
-export * from "./file.js";
+import { HTML } from "./html.js";
 export * from "./image.js";
 export * from "./multiple-files.js";
-export * from "./number.js";
 export * from "./multiple-images.js";
+export * from "./number.js";
+export * from "./password-with-generator.js";
+export * from "./radio.js";
+import { SimpleInput } from "./simple-input.js";
+export * from "./single-reference.js";
+import { Textarea } from "./textarea.js";
+export * from "./tickable.js";
 export * from "./array.js";
 export * from "./table.js";
 export {

package/lib/forms/controls/password-with-generator.js

@@ -0,0 +1,21 @@
+import { SimpleInput } from "./simple-input.js";
+class PasswordWithGenerator extends SimpleInput {
+  constructor(field) {
+    super(field, { type: "password" });
+  }
+  async preInput() {
+    return (
+      /* HTML */
+      `<button
+			data-controller="password-generate-button"
+			data-action="password-generate-button#generate"
+		>
+			Generate
+		</button>`
+    );
+  }
+}
+export {
+  PasswordWithGenerator
+};
+//# sourceMappingURL=password-with-generator.js.map

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/lib/templates/form.js

@@ -5,7 +5,7 @@ const defaults = {
          import type {FormDataValue} from "@sealcode/sealgen";`,
   get_fields: `()=>(<const>{ password: new Fields.Password(true) })`,
   get_controls: `
-	()=><const>[new Controls.SimpleInput(fields.password, {
+	(fields: ReturnType<typeof getFields>)=>[new Controls.SimpleInput(fields.password, {
 			label: "Password:",
 			type: "password",
 })]`,

package/package.json

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

package/src/controllers/password-generate-button.stimulus.ts

@@ -0,0 +1,25 @@
+/// <reference lib="dom" />
+import { Controller } from "stimulus";
+
+function generatePassword() {
+	const chars =
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*";
+	let password = "";
+	for (let i = 0; i < 8; i++) {
+		password += chars.charAt(Math.floor(Math.random() * chars.length));
+	}
+	return password;
+}
+
+export default class extends Controller<HTMLButtonElement> {
+	getInput(): HTMLInputElement {
+		return this.element.parentElement!.querySelector(
+			"input"
+		) as HTMLInputElement;
+	}
+
+	generate() {
+		this.getInput().value = generatePassword();
+		this.getInput().setAttribute("type", "text");
+	}
+}

package/src/forms/controls/controls.ts

@@ -1,32 +1,33 @@
-export { FormControl } from "./form-control.js";
-export { FormFieldControl } from "./form-field-control.js";
-export { EditableCollectionSubset } from "./editable-collection-subset.js";
-export { Frame } from "./frame.js";
+export * from "./autocomplete.js";
+export * from "./big-radio-group.js";
+export * from "./checkbox-group.js";
+export * from "./checkbox.js";
 export { CheckboxedListInput } from "./checkboxed-list-input.js";
+export * from "./collapsible-checkbox-group.js";
+export * from "./collapsible-field-group.js";
+export * from "./derived-frame.js";
+export * from "./derived.js";
 export * from "./dropdown.js";
-export * from "./single-reference.js";
-export { SimpleInput } from "./simple-input.js";
+export { EditableCollectionSubset } from "./editable-collection-subset.js";
+export { FieldGroup } from "./field-group.js";
+export * from "./file.js";
+export { FormControl } from "./form-control.js";
+export { FormFieldControl } from "./form-field-control.js";
 export { FormHeader } from "./form-header.js";
 export { FormParagraph } from "./form-paragraph.js";
-export { HTML } from "./html.js";
+export { Frame } from "./frame.js";
 export { HiddenInput } from "./hidden-input.js";
-export { Textarea } from "./textarea.js";
-export { FieldGroup } from "./field-group.js";
-export * from "./derived.js";
-export * from "./derived-frame.js";
-export * from "./tickable.js";
-export * from "./checkbox.js";
-export * from "./radio.js";
-export * from "./big-radio-group.js";
-export * from "./checkbox-group.js";
-export * from "./collapsible-field-group.js";
-export * from "./collapsible-checkbox-group.js";
-export * from "./autocomplete.js";
-export * from "./file.js";
+export { HTML } from "./html.js";
 export * from "./image.js";
 export * from "./multiple-files.js";
-export * from "./number.js";
 export * from "./multiple-images.js";
+export * from "./number.js";
+export * from "./password-with-generator.js";
+export * from "./radio.js";
+export { SimpleInput } from "./simple-input.js";
+export * from "./single-reference.js";
+export { Textarea } from "./textarea.js";
+export * from "./tickable.js";
 // export * from "./reverse-single-reference";
 export * from "./array.js";
 export * from "./table.js";

package/src/forms/controls/password-with-generator.ts

@@ -0,0 +1,17 @@
+import { FormField } from "../../index.js";
+import { SimpleInput } from "./simple-input.js";
+
+export class PasswordWithGenerator extends SimpleInput {
+	constructor(field: FormField) {
+		super(field, { type: "password" });
+	}
+
+	async preInput() {
+		return /* HTML */ `<button
+			data-controller="password-generate-button"
+			data-action="password-generate-button#generate"
+		>
+			Generate
+		</button>`;
+	}
+}

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/templates/form.ts

@@ -6,7 +6,7 @@ const defaults = {
          import type {FormDataValue} from "@sealcode/sealgen";`,
 	get_fields: `()=>(<const>{ password: new Fields.Password(true) })`,
 	get_controls: `
-	()=><const>[new Controls.SimpleInput(fields.password, {
+	(fields: ReturnType<typeof getFields>)=>[new Controls.SimpleInput(fields.password, {
 			label: "Password:",
 			type: "password",
 })]`,

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>`;
 }