@sealcode/sealgen 0.19.26 → 0.19.29

package/@types/src/utils/sleep.d.ts

@@ -0,0 +1 @@
+export declare function sleep(time: number): Promise<unknown>;

package/@types/src/utils/translate.d.ts

@@ -0,0 +1,4 @@
+import { Context } from "koa";
+import { Translation } from "sealious";
+/** deprecated */
+export declare function t(ctx: Context, key: string, _props: unknown[], _default_translation: Translation): string;

package/@types/src/utils/url-with-new-params.d.ts

@@ -0,0 +1,2 @@
+import { Context } from "koa";
+export declare function UrlWithNewParams(ctx: Context, query_params: Record<string, unknown>): string;

package/@types/src/utils/utils.d.ts

@@ -0,0 +1,17 @@
+export type Awaited<T> = T extends Promise<infer U> ? U : T;
+export type UnwrapArray<T> = T extends Array<infer U> ? U : T;
+export declare function keys<S extends string>(object: Record<S, unknown>): S[];
+export type ExtractTail<T extends any[]> = T extends [infer _, ...infer Tail] ? Tail : never;
+export { sleep } from "./sleep.js";
+export { naturalNumbers } from "./natural-numbers.js";
+export { UrlWithNewParams } from "./url-with-new-params.js";
+export { exec } from "./exec.js";
+export { importPath, curryImportPath } from "./import-path.js";
+export { listCollections } from "./list-collections.js";
+export { walkDir } from "./walk.js";
+export { assertThrowsAsync } from "./assert-throws.js";
+export * from "./make-slug.js";
+export * from "./render-attributes.js";
+export * from "./format-external-url.js";
+export * from "./base64.js";
+export * from "./with-fallback.js";

package/@types/src/utils/walk.d.ts

@@ -0,0 +1 @@
+export declare function walkDir(dir: string): Promise<string[]>;

package/@types/src/utils/with-fallback.d.ts

@@ -0,0 +1,2 @@
+export declare function withFallback<T1, T2 extends NonNullable<unknown>>(value1: T1, value2: T2): NonNullable<T1> | T2;
+export declare function withFallback<T1, T2, T3 extends NonNullable<unknown>>(value1: T1, value2: T2, value3?: T3): NonNullable<T2> | T3;

package/@types/src/utils/wrap-attributes.d.ts

@@ -0,0 +1,3 @@
+export declare function needsQuotes(str: string): boolean;
+export declare function wrapAttribute(name: string): string;
+export declare function wrapKeyName(name: string): string;

package/@types/src/utils/write-file.d.ts

@@ -0,0 +1 @@
+export declare function writeFile(path: string, content: string): Promise<void>;

package/lib/add-route.js

@@ -46,9 +46,7 @@ async function addRoute(params, app_directory = process.cwd()) {
     }
   ]);
   const { action, url, mode } = response;
-  const extension = ["list", "lpr", "page", "sreact", "jdd-editor"].includes(
-    mode
-  ) ? "tsx" : "ts";
+  const extension = ["list", "lpr", "page", "sreact", "jdd-editor"].includes(mode) ? "tsx" : "ts";
   const base_file_name = escape_url_params(url) || "index";
   const file_path = target_locreq.resolve(
     `src/back/routes/${base_file_name}.${mode}.${extension}`

package/lib/builders/colors-builder.js

@@ -401,15 +401,14 @@ class ColorsBuilder extends Builder {
 						document.addEventListener("click", (event) => {
 							const box = event.target.closest(".color-box");
 							if (box) {
-								const css_var = box.classList.contains(
-									"is-main"
-								)
-									? \`var(--color-\${box.getAttribute(
+								const css_var =
+									box.classList.contains("is-main") ?
+										\`var(--color-\${box.getAttribute(
 											"data-color-group-name"
 										)}-\${box.getAttribute(
 											"data-color-name"
 										)})\`
-									: \`var(--color-\${box.getAttribute(
+									:	\`var(--color-\${box.getAttribute(
 											"data-color-group-name"
 										)}-\${box.getAttribute(
 											"data-color-name"

package/lib/forms/controls/file.js

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

package/lib/forms/controls/multiple-files.js

@@ -40,9 +40,7 @@ class MultipleFiles extends FormFieldControl {
         files = [files];
       }
       await Promise.all(
-        files.map(
-          (file) => this.addFileAssociation(ctx, file)
-        )
+        files.map((file) => this.addFileAssociation(ctx, file))
       );
       ctx.body = this.renderFrame(
         ctx,
@@ -51,7 +49,10 @@ class MultipleFiles extends FormFieldControl {
     });
   }
   async deleteFileAssociation(ctx, file_item_id) {
-    await ctx.$app.collections[this.field.collection_field.referencing_collection].removeByID(ctx.$context, file_item_id);
+    await this.getReferencingCollection().removeByID(
+      ctx.$context,
+      file_item_id
+    );
   }
   async addFileAssociation(ctx, file) {
     const file_field = this.getFileField();
@@ -63,7 +64,7 @@ class MultipleFiles extends FormFieldControl {
       [this.field.collection_field.referencing_field]: await this.field.getItemId(ctx),
       [file_field.name]: file
     };
-    await ctx.$app.collections[this.field.collection_field.referencing_collection].create(ctx.$context, body);
+    await this.getReferencingCollection().create(ctx.$context, body);
   }
   getFrameRelativeURL() {
     return `${this.field.name}_files`;

package/lib/forms/controls/single-reference.js

@@ -8,7 +8,7 @@ class SingleReferenceDropdown extends FreeformDropdown {
     super(
       field,
       async (ctx) => {
-        const { items } = await ctx.$app.collections[field.sealiousField.target_collection].list(ctx.$context).fetch();
+        const { items } = await this.getCollection(ctx).list(ctx.$context).fetch();
         return [
           { value: "", label: "--" },
           ...items.map((item) => ({
@@ -22,6 +22,9 @@ class SingleReferenceDropdown extends FreeformDropdown {
     this.field = field;
     this.options = options;
   }
+  getCollection(ctx) {
+    return ctx.$app.collections[this.field.sealiousField.target_collection];
+  }
   setOptionLabelGetter(getter) {
     this.options.getLabel = getter;
     return this;

package/lib/forms/controls/tickable.js

@@ -73,7 +73,7 @@ class Tickable extends FormFieldControl {
 					})();
 				</script>
 
-				${(~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(" \u2022 ")}</div>` : ""}
+				${(~valid || !!field_message) && !this.options.hide_errors && fctx.validate ? `<div class="input__error">${Array.from(new Set([message, field_message?.message || false].filter((e) => !!e))).join(" \u2022 ")}</div>` : ""}
 			`
     );
   }

package/lib/forms/fields/file.js

@@ -27,21 +27,21 @@ class File extends FormField {
         raw_value,
         "old",
         predicates.instanceOf(PathFilePointer)
-      ) ? await ctx.$app.fileManager.toPointer(
-        raw_value.old
-      ) : null;
+      ) ? await ctx.$app.fileManager.toPointer(raw_value.old) : null;
       const new_file = hasFieldOfType(
         raw_value,
         "new",
         predicates.or(
-          predicates.array(predicates.instanceOf(PathFilePointer)),
+          predicates.array(
+            predicates.instanceOf(PathFilePointer)
+          ),
           predicates.instanceOf(PathFilePointer)
         )
       ) ? Array.isArray(raw_value.new) ? raw_value.new[0] : raw_value.new : null;
       result = {
         parsable: true,
         error: null,
-        parsed_value: { old: old_file, new: new_file }
+        parsed_value: { old: old_file, new: new_file || null }
       };
     }
     return result;

package/lib/forms/fields/image.js

@@ -2,9 +2,7 @@ import { Image as ImageControl } from "../controls/image.js";
 import { File as FileField } from "./file.js";
 class Image extends FileField {
   getControl() {
-    return new ImageControl(
-      this
-    );
+    return new ImageControl(this);
   }
 }
 export {

package/lib/forms/fields/phone-number-with-country-code.js

@@ -22,7 +22,6 @@ class PhoneNumberWithCountryCode extends FormField {
       return {
         parsable: false,
         parsed_value: null,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         error: e.message
       };
     }

package/lib/forms/fields/simple-form-field.js

@@ -39,7 +39,7 @@ class TextBasedSimpleField extends SimpleFormField {
   }
   async postSealiousCreate(_ctx, _created_item, _formData) {
   }
-  async postSealiousEdit(ctx, _edited_item, _formData) {
+  async postSealiousEdit(_ctx, _edited_item, _formData) {
   }
   getControl() {
     return new SimpleInput(this, {

package/lib/forms/fields/structured-array.js

@@ -53,8 +53,7 @@ class StructuredArray extends Table {
                 key,
                 await form_subfield.sealiousValueToForm(
                   ctx,
-                  value,
-                  {}
+                  value
                 )
               ];
             })

package/lib/get-fonts.js

@@ -75,7 +75,11 @@ async function getFonts(_ = {}) {
     fonts_css_file_path,
     content.replace(/@font-face {/g, "@font-face {\nfont-display: swap;")
   );
-  await unlink("public/fonsta.config.json");
+  try {
+    await unlink("public/fonsta.config.json");
+  } catch {
+    console.info("No fonsta config present, using just google fonts");
+  }
   await rmdir("public/tmp");
   console.info("Downloaded new fonts pack from Font Squirrel");
   console.info("Downloaded new fonts pack");

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

@@ -10,8 +10,7 @@ class MountableWithFields extends Mountable {
     this.field_names_prefix = "";
     // useful for multiform, where many forms are merged into one and field assignment is made using the prefix
     this.form_id = "";
-    if (!this.fields)
-      this.fields = {};
+    this.fields = {};
   }
   /** most routes should be setup using .mount(), but mount runs before
          initialization so we don't yet have controls, app, etc ready for dynamic

package/lib/page/mountable-with-fields.test.js

@@ -16,7 +16,7 @@ describe("mountable-with-fields", () => {
       async onSubmit(ctx, form_values) {
         const data = await this.getParsedValues(ctx);
         data.not_required?.trim();
-        data.required.trim();
+        (data.required || "").trim();
         const { parsed: data2 } = await this.fields.not_required.getParsedValue(
           ctx,
           form_values.raw_values

package/lib/page/sealious-list.js

@@ -29,7 +29,9 @@ class SealiousItemListPage extends ListPage {
       }
     }
     if (Object.keys(filters).length) {
-      list.filter(filters);
+      list.filter(
+        filters
+      );
     }
   }
   async makeQuery(ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.19.26",
+	"version": "0.19.29",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
@@ -56,7 +56,7 @@
 		"source-map-support": "^0.5.21",
 		"ts-node": "^10.9.1",
 		"typescript": "6.0.3",
-		"typescript-eslint": "^8.44.0",
+		"typescript-eslint": "8.70",
 		"wait-port": "^1.0.4"
 	},
 	"types": "./@types/index.d.ts",

package/src/build.ts

@@ -126,8 +126,7 @@ export async function buildProject({
 		await build(watch);
 	} catch (e) {
 		console.error("CAUGHT!");
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		console.error(e.message);
+		console.error((e as Error).message);
 		if (!watch) {
 			process.exit(1);
 		}

package/src/cli.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 import yargs from "yargs/yargs";
 import { addCollection } from "./add-collection.js";
 import { addJDDComponent } from "./add-jdd-component.js";
@@ -16,10 +17,8 @@ import {
 	registerExternalStyles,
 } from "./register-external.js";
 
-const actions: Record<
-	string,
-	(args: Record<string, string | boolean>) => Promise<void> | undefined
-> = {
+/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+const actions: Record<string, (args: any) => Promise<void> | undefined> = {
 	"add-collection": addCollection,
 	"add-route": addRoute,
 	"add-crud": addCRUD,
@@ -47,5 +46,5 @@ void (async function () {
 	const action = process.argv.at(2);
 	const fn = actions[action || "default"] || actions.default;
 	const args = yargs(process.argv).argv as Record<string, string | boolean>;
-	await fn(args);
+	await fn!(args);
 })();

package/src/forms/controls/controls.ts

@@ -1,5 +1,4 @@
 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";

package/src/forms/controls/dropdown.ts

@@ -15,9 +15,9 @@ export type DropdownOptions = {
 
 export type DropdownOption = { value: string; label: string };
 
-export class FreeformDropdown extends SimpleInput {
+export class FreeformDropdown<ParsedValue> extends SimpleInput {
 	constructor(
-		public field: FormField<boolean, string | null>,
+		public field: FormField<boolean, ParsedValue | null>,
 		public _generateOptions: (ctx: Context) => Promise<DropdownOption[]>,
 		public options: DropdownOptions = {
 			label: field.label || field.name,
@@ -39,15 +39,15 @@ export class FreeformDropdown extends SimpleInput {
 		return {
 			...original,
 			...Object.fromEntries([
-				...(this.options.autosubmit
-					? [
-							[
-								"onchange",
-								((original.onchange as string | undefined) ||
-									"") + ";this.form.submit();",
-							],
-						]
-					: []),
+				...(this.options.autosubmit ?
+					[
+						[
+							"onchange",
+							((original.onchange as string | undefined) || "") +
+								";this.form.submit();",
+						],
+					]
+				:	[]),
 			]),
 		} as Record<string, string>;
 	}
@@ -74,9 +74,11 @@ export class FreeformDropdown extends SimpleInput {
 	}
 }
 
-export class Dropdown extends FreeformDropdown {
+export class Dropdown<
+	Required extends boolean,
+> extends FreeformDropdown<string> {
 	constructor(
-		public field: PickFromListField<boolean>,
+		public field: PickFromListField<Required>,
 		public options: DropdownOptions = {
 			label: field.label || field.name,
 			autosubmit: false,

package/src/forms/controls/file.ts

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

package/src/forms/controls/html.ts

@@ -29,8 +29,9 @@ export class HTML extends FormControl {
 		if (typeof this.renderer === "string") {
 			return this.renderer;
 		}
-		return typeof this.renderer == "function"
-			? this.renderer(fctx)
-			: this.renderer;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return typeof this.renderer == "function" ?
+				this.renderer(fctx)
+			:	this.renderer;
 	}
 }

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

@@ -44,7 +44,7 @@ export class MultipleFiles extends FormFieldControl {
 		router.post(
 			this.getFrameRelativeURL() + "/delete/:file_item_id",
 			async (ctx) => {
-				await this.deleteFileAssociation(ctx, ctx.params.file_item_id);
+				await this.deleteFileAssociation(ctx, ctx.params.file_item_id!);
 				ctx.body = this.renderFrame(
 					ctx,
 					await this.renderFrameContent(ctx)
@@ -62,9 +62,7 @@ export class MultipleFiles extends FormFieldControl {
 				files = [files];
 			}
 			await Promise.all(
-				files.map((file) =>
-					this.addFileAssociation(ctx, file as unknown as FilePointer)
-				)
+				files.map((file) => this.addFileAssociation(ctx, file))
 			);
 			ctx.body = this.renderFrame(
 				ctx,
@@ -74,9 +72,10 @@ export class MultipleFiles extends FormFieldControl {
 	}
 
 	async deleteFileAssociation(ctx: Context, file_item_id: string) {
-		await ctx.$app.collections[
-			this.field.collection_field.referencing_collection
-		].removeByID(ctx.$context, file_item_id);
+		await this.getReferencingCollection().removeByID(
+			ctx.$context,
+			file_item_id
+		);
 	}
 
 	async addFileAssociation(ctx: Context, file: FilePointer) {
@@ -90,9 +89,7 @@ export class MultipleFiles extends FormFieldControl {
 				await this.field.getItemId(ctx),
 			[file_field.name]: file,
 		};
-		await ctx.$app.collections[
-			this.field.collection_field.referencing_collection
-		].create(ctx.$context, body);
+		await this.getReferencingCollection().create(ctx.$context, body);
 	}
 
 	getFrameRelativeURL() {
@@ -124,7 +121,7 @@ export class MultipleFiles extends FormFieldControl {
 		const result =
 			this.field.collection_field.app.collections[
 				this.field.collection_field.referencing_collection
-			];
+			]!;
 		return result;
 	}
 
@@ -203,7 +200,7 @@ export class MultipleFiles extends FormFieldControl {
 			.ids([item_id])
 			.attach({ [this.field.collection_field.name]: true })
 			.fetch();
-		return item
+		return item!
 			.getAttachments(this.field.collection_field.name)
 			.filter((f) => f);
 	}

package/src/forms/controls/number.ts

@@ -5,8 +5,8 @@ import { SimpleInput, SimpleInputOptions } from "./simple-input.js";
 export type NumberOptions = SimpleInputOptions & Partial<{ step: number }>;
 
 export class Number extends SimpleInput {
-	field: NumberField;
-	options: NumberOptions;
+	field!: NumberField;
+	options!: NumberOptions;
 	constructor(field: NumberField, options: NumberOptions) {
 		super(field, options);
 	}
@@ -22,12 +22,12 @@ export class Number extends SimpleInput {
 		return {
 			...original,
 			...Object.fromEntries([
-				...(this.field.options.min
-					? [["min", this.field.options.min]]
-					: []),
-				...(this.field.options.max
-					? [["max", this.field.options.max]]
-					: []),
+				...(this.field.options.min ?
+					[["min", this.field.options.min]]
+				:	[]),
+				...(this.field.options.max ?
+					[["max", this.field.options.max]]
+				:	[]),
 				...(this.options.step ? [["step", this.options.step]] : []),
 			]),
 		} as Record<string, string>;

package/src/forms/controls/single-reference.ts

@@ -1,17 +1,27 @@
-import { FieldTypes as SealiousFieldTypes } from "sealious";
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { Context } from "koa";
+import {
+	Field as SealiousField,
+	FieldTypes as SealiousFieldTypes,
+} from "sealious";
 import { CollectionField } from "../fields/collection-field.js";
 import { DropdownOptions, FreeformDropdown } from "./dropdown.js";
 import { Collection, CollectionItem } from "sealious";
+import { FormField } from "../../index.js";
+
+export type ExtractFieldDecoded<F extends SealiousField<any, any, any>> =
+	F extends SealiousField<infer T, unknown, unknown> ? T : never;
 
 export class SingleReferenceDropdown<
 	TargetCollection extends Collection,
-	F extends SealiousFieldTypes.SingleReference,
+	SealiousField extends SealiousFieldTypes.SingleReference,
 	Required extends boolean,
-> extends FreeformDropdown {
+> extends FreeformDropdown<ExtractFieldDecoded<SealiousField>> {
 	constructor(
-		public field: CollectionField<F, Required>,
+		public field: CollectionField<SealiousField, Required>,
 		public options: DropdownOptions & {
-			getLabel?: (item: CollectionItem<Collection>) => string;
+			getLabel?: (item: CollectionItem<TargetCollection>) => string;
 		} = {
 			label: field.label || field.name,
 			autosubmit: false,
@@ -19,20 +29,17 @@ export class SingleReferenceDropdown<
 		}
 	) {
 		super(
-			field,
+			field as FormField<any, any>,
 			async (ctx) => {
-				const { items } = await ctx.$app.collections[
-					field.sealiousField.target_collection
-				]
+				const { items } = await this.getCollection(ctx)
 					.list(ctx.$context)
 					.fetch();
 				return [
 					{ value: "", label: "--" },
 					...items.map((item) => ({
 						value: item.id,
-						label: options.getLabel
-							? options.getLabel(item)
-							: item.id,
+						label:
+							options.getLabel ? options.getLabel(item) : item.id,
 					})),
 				];
 			},
@@ -40,6 +47,12 @@ export class SingleReferenceDropdown<
 		);
 	}
 
+	getCollection(ctx: Context) {
+		return ctx.$app.collections[
+			this.field.sealiousField.target_collection
+		]! as TargetCollection;
+	}
+
 	setOptionLabelGetter(
 		getter: (item: CollectionItem<TargetCollection>) => string
 	): this {

package/src/forms/controls/table.ts

@@ -71,7 +71,7 @@ export class Table<F extends Record<string, FormField>> extends FormControl {
 									Object.entries(
 										row as Record<string, unknown>
 									).map(([key, value]) => [
-										this.table_field.columns[key].name,
+										this.table_field.columns[key]!.name,
 										value,
 									])
 								) as any) || {},
@@ -99,7 +99,7 @@ export class Table<F extends Record<string, FormField>> extends FormControl {
 								const inner_fctx = get_row_fctx(row, row_index);
 								return tempstream`<td>${this.options.subfield_controls[
 									column_name
-								].render({ ...fctx, ...inner_fctx })}</td>`;
+								]!.render({ ...fctx, ...inner_fctx })}</td>`;
 							})
 							.map(async (html) =>
 								(await html).replaceAll(

package/src/forms/controls/textarea.ts

@@ -19,11 +19,11 @@ export class Textarea extends SimpleInput {
 	}
 
 	renderDescription() {
-		return this.options.description
-			? /* HTML */ `<div class="form-input__description">
+		return this.options.description ?
+				/* HTML */ `<div class="form-input__description">
 					${this.options.description}
 				</div>`
-			: "";
+			:	"";
 	}
 
 	async getInputAttributes(
@@ -49,6 +49,7 @@ export class Textarea extends SimpleInput {
 		attributes: string,
 		data: Record<string, FormDataValue>
 	) {
+		// eslint-disable-next-line no-await-in-loop, @typescript-eslint/no-unsafe-assignment
 		const { parsed: value } = await this.field.getParsedValue(ctx, data);
 		return /* HTML */ `<textarea ${attributes}>
 ${String(value) || ""}</textarea

package/src/forms/controls/tickable.ts

@@ -24,7 +24,7 @@ export abstract class Tickable<T> extends FormFieldControl {
 		super([field]);
 	}
 
-	public type: "checkbox" | "radio";
+	public type!: "checkbox" | "radio";
 
 	abstract getValueAttribute(
 		ctx: Context,
@@ -133,7 +133,7 @@ export abstract class Tickable<T> extends FormFieldControl {
 					!this.options.hide_errors &&
 					fctx.validate
 				) ?
-					`<div class="input__error">${Array.from(new Set([message, field_message.message].filter((e) => !!e))).join(" • ")}</div>`
+					`<div class="input__error">${Array.from(new Set([message, field_message?.message || false].filter((e) => !!e))).join(" • ")}</div>`
 				:	""}
 			`
 		);

package/src/forms/fields/deep-reverse-single-reference-list.ts

@@ -19,9 +19,7 @@ export class DeepReverseSingleReferenceList extends CheckboxedListField<
 		super(false, async (ctx: Context) => {
 			const { items } = await ctx.$app.collections[
 				sealious_field.target_collection
-			]
-				.list(ctx.$context)
-				.fetch();
+			]!.list(ctx.$context).fetch();
 
 			return items.map((s) => ({
 				label: this.item_label_getter(s),
@@ -48,8 +46,7 @@ export class DeepReverseSingleReferenceList extends CheckboxedListField<
 		// First, we remove links refering to current item
 		const { items: existing_links } = await ctx.$app.collections[
 			this.sealious_field.intermediary_collection
-		]
-			.list(ctx.$context)
+		]!.list(ctx.$context)
 			.filter({
 				[this.sealious_field.referencing_field]: created_item.id,
 			})