@sealcode/sealgen 0.19.0 → 0.19.3

package/src/page/list.ts

@@ -48,7 +48,7 @@ function encodeSort(field: string, order: "asc" | "desc"): string {
 
 export abstract class ListPage<
 	ItemType,
-	F extends typeof BaseListPageFields
+	F extends typeof BaseListPageFields,
 > extends Page<F> {
 	abstract getItems(
 		ctx: Context,
@@ -126,7 +126,7 @@ export abstract class ListPage<
 			values
 		);
 
-		return tempstream/* HTML */ `<div class="list-pagination">
+		return tempstream /* HTML */ `<div class="list-pagination">
 			<div class="list-pagination__left">
 				${page > 1
 					? this.renderPageButton(ctx, 1, "Pierwsza strona")
@@ -141,18 +141,18 @@ export abstract class ListPage<
 					onchange="if (this.value) Turbo.visit(this.value)"
 				>
 					${Array.from(naturalNumbers(1, totalIems)).map(
-						(n) => /* HTML */ `<option
-							value="${UrlWithNewParams(
-								ctx,
-								//eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-								this.propsParser.overwriteProp(ctx, {
-									page: n,
-								} as Partial<Record<string, unknown>>)
-							)}"
-							${page === n ? "selected" : ""}
-						>
-							${n}
-						</option>`
+						(n) =>
+							/* HTML */ `<option
+								value="${UrlWithNewParams(
+									ctx,
+									this.propsParser.overwriteProp(ctx, {
+										page: n,
+									} as Partial<Record<string, unknown>>)
+								)}"
+								${page === n ? "selected" : ""}
+							>
+								${n}
+							</option>`
 					)}
 				</select>
 			</div>
@@ -171,7 +171,6 @@ export abstract class ListPage<
 		return /* HTML */ `<a
 			href="${UrlWithNewParams(
 				ctx,
-				//eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 				this.propsParser.overwriteProp(ctx, {
 					page,
 				} as Partial<Record<string, unknown>>)
@@ -219,13 +218,12 @@ export abstract class ListPage<
 
 	async renderFilters(ctx: Context): Promise<FlatTemplatable> {
 		const values = await this.extractRawValues(ctx);
-		return tempstream/* HTML */ `<form method="GET">
+		return tempstream /* HTML */ `<form method="GET">
 			${makeHiddenInputs(ctx, this.fields, values, [
 				"page",
 				...Object.values(this.filterFields).map((f) => f.name),
 			])}
 			${this.filterControls.map((control) => {
-				// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 				return control.render(
 					this.makeFormControlContext(
 						ctx,
@@ -253,8 +251,8 @@ export abstract class ListPage<
 			current_order === "asc" // cycles the sort order: null → "asc" → "desc" → null → ...
 				? "desc"
 				: current_order === null
-				? "asc"
-				: null;
+					? "asc"
+					: null;
 		return /* HTML */ `<th data-field="${field}">
 			<a href="${this.makeSortLink(ctx, field, order)}"
 				>${label}
@@ -272,7 +270,7 @@ export abstract class ListPage<
 		ctx: Context,
 		fields: { field: string; label?: string }[]
 	): FlatTemplatable {
-		return tempstream/* HTML */ `<thead>
+		return tempstream /* HTML */ `<thead>
 			<tr>
 				${fields.map(({ label, field }) =>
 					this.renderHeading(ctx, field, label)

package/src/page/mountable-with-fields.ts

@@ -25,7 +25,7 @@ type ParsedValue<T extends FormField> = Resolved<
 >["parsed"];
 
 export abstract class MountableWithFields<
-	F extends Fields = Fields
+	F extends Fields = Fields,
 > extends Mountable {
 	fields: F;
 	field_names_prefix = ""; // useful for multiform, where many forms are merged into one and field assignment is made using the prefix
@@ -116,7 +116,7 @@ export abstract class MountableWithFields<
 	}
 
 	public renderControls(fctx: FormControlContext): FlatTemplatable {
-		return tempstream/* HTML */ `${this.controls.map((control) =>
+		return tempstream /* HTML */ `${this.controls.map((control) =>
 			control.render(fctx)
 		)}`;
 	}
@@ -132,7 +132,7 @@ export abstract class MountableWithFields<
 		_: Context,
 		data: FormData<keyof Fields>
 	): FlatTemplatable {
-		return tempstream/* HTML */ `<div class="form-messages">
+		return tempstream /* HTML */ `<div class="form-messages">
 			${data.messages.map(
 				(message) =>
 					`<div class="form-message form-message--${message.type}">${message.text}</div>`

package/src/page/mountable.ts

@@ -3,7 +3,6 @@ import Router from "@koa/router";
 import { Context } from "koa";
 
 export abstract class Mountable {
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	init(): void {}
 	abstract mount(router: Router, path: string): void;
 

package/src/page/page.ts

@@ -11,7 +11,7 @@ import {
 import { AllQueryParams, PagePropsParser } from "./props-parser.js";
 
 export abstract class Page<
-	F extends Fields = Record<string, never>
+	F extends Fields = Record<string, never>,
 > extends MountableWithFields<F> {
 	propsParser: PagePropsParser<Record<keyof Fields, unknown>> =
 		new AllQueryParams();
@@ -23,7 +23,6 @@ export abstract class Page<
 		});
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	async canAccess(_: Context) {
 		return { canAccess: true, message: "" };
 	}
@@ -32,7 +31,7 @@ export abstract class Page<
 		_: Context,
 		error: PageErrorMessage
 	): Promise<FlatTemplatable> {
-		return tempstream/* HTML */ `<div>${error.message}</div>`;
+		return tempstream /* HTML */ `<div>${error.message}</div>`;
 	}
 
 	public abstract render(ctx: Context): Promise<FlatTemplatable>;

package/src/page/props-parser.ts

@@ -22,7 +22,7 @@ export abstract class PagePropsParser<PropsType> {
 }
 
 export class AllQueryParams<
-	PropsType extends BasePageProps
+	PropsType extends BasePageProps,
 > extends PagePropsParser<PropsType> {
 	decode(ctx: Context): Record<string, FormDataValue> {
 		return ctx.query;

package/src/page/sealious-list.ts

@@ -18,7 +18,7 @@ import { is, predicates } from "@sealcode/ts-predicates";
 
 export abstract class SealiousItemListPage<
 	C extends Collection,
-	F extends typeof BaseListPageFields
+	F extends typeof BaseListPageFields,
 > extends ListPage<CollectionItem<C>, F> {
 	constructor(public collection: C) {
 		super();

package/src/page/stateful-page.ts

@@ -34,7 +34,7 @@ export type StateAndMetadata<State, Actions> =
 
 export type StatefulPageActionArgument<
 	State extends Record<string, unknown>,
-	Args extends unknown[] = unknown[]
+	Args extends unknown[] = unknown[],
 > = {
 	ctx: Context;
 	state: State;
@@ -45,19 +45,15 @@ export type StatefulPageActionArgument<
 
 export type StatefulPageAction<
 	State extends Record<string, unknown>,
-	Args extends unknown[] = unknown[]
+	Args extends unknown[] = unknown[],
 > = (obj: StatefulPageActionArgument<State, Args>) => State | Promise<State>;
 
-export type ExtractStatefulPageActionArgs<X> = X extends StatefulPageAction<
-	any,
-	infer Args
->
-	? Args
-	: never;
+export type ExtractStatefulPageActionArgs<X> =
+	X extends StatefulPageAction<any, infer Args> ? Args : never;
 
 export abstract class StatefulPage<
 	State extends Record<string, unknown>,
-	Actions extends Record<string, StatefulPageAction<State>>
+	Actions extends Record<string, StatefulPageAction<State>>,
 > extends Mountable {
 	abstract actions: Actions;
 	abstract getInitialState(ctx: Context): State | Promise<State>;
@@ -104,7 +100,7 @@ export abstract class StatefulPage<
 		state: State,
 		content: Templatable
 	): Promise<Templatable> {
-		return tempstream/* HTML */ `<form
+		return tempstream /* HTML */ `<form
 			action="./"
 			method="POST"
 			enctype="multipart/form-data"

package/src/register-external.ts

@@ -74,7 +74,7 @@ async function updatePackageJson(
 
 	// Check if the path is already present
 	if (existingPaths.includes(pathToAdd)) {
-		console.log(`${type} already contains: ${pathToAdd}`);
+		console.warn(`${type} already contains: ${pathToAdd}`);
 		return;
 	}
 
@@ -88,11 +88,11 @@ async function updatePackageJson(
 	);
 
 	await fs.writeFile(packageJsonPath, updatedContent);
-	console.log(`Added ${pathToAdd} to ${type} in ${packageJsonPath}`);
+	console.info(`Added ${pathToAdd} to ${type} in ${packageJsonPath}`);
 }
 
 export async function registerExternalControllers(
-	args: Record<string, string | boolean>
+	_args: Record<string, string | boolean>
 ): Promise<void> {
 	// Extract positional arguments from process.argv since yargs doesn't handle them for these commands
 	const moduleName = process.argv.at(3);
@@ -120,7 +120,7 @@ export async function registerExternalControllers(
 }
 
 export async function registerExternalStyles(
-	args: Record<string, string | boolean>
+	_args: Record<string, string | boolean>
 ): Promise<void> {
 	// Extract positional arguments from process.argv since yargs doesn't handle them for these commands
 	const moduleName = process.argv.at(3);

package/src/templates/form.ts

@@ -43,8 +43,7 @@ const defaults = {
 
 export async function formTemplate(
 	action_name: string,
-	newfilefullpath: string,
-	_params: Partial<typeof defaults> & { success_message: string } = defaults
+	_params: Partial<typeof defaults> = defaults
 ): Promise<string> {
 	const params = { ...defaults, ..._params };
 	const content = `import type { Context } from "koa";

package/src/templates/jdd-component.ts

@@ -1,6 +1,6 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
 
-export function jddComponentTemplate(component_name: string) {
+export async function jddComponentTemplate(component_name: string) {
 	return `import { TempstreamJSX } from "tempstream";
 import type { ComponentToHTMLArgs } from "@sealcode/jdd";
 import { Component, ComponentArguments } from "@sealcode/jdd";

package/src/templates/jdd-editor.ts

@@ -12,9 +12,7 @@ export async function jddEditorTemplate(actionName: string) {
 			name: "collection",
 			message:
 				"Which sealious collection do you like to add CRUD forms for?",
-			choices: (
-				await listCollections()
-			).map((collection) => ({
+			choices: (await listCollections()).map((collection) => ({
 				title: collection,
 				value: collection,
 			})),
@@ -30,7 +28,7 @@ export async function jddEditorTemplate(actionName: string) {
 	let field_name = "";
 	if (jdd_fields.length == 1) {
 		field_name = jdd_fields[0].name;
-		console.log(
+		console.info(
 			`Only one field of type JDD found: ${field_name}, so skipping the question...`
 		);
 	} else if (jdd_fields.length > 1) {

package/src/templates/list.ts

@@ -1,4 +1,3 @@
-import _locreq from "locreq";
 import prompts from "prompts";
 import { listCollections } from "../utils/list-collections.js";
 import { formatWithPrettier } from "../utils/prettier.js";

package/src/templates/page.ts

@@ -1,7 +1,4 @@
-export async function pageTemplate(
-	action_name: string,
-	newfilefullpath: string
-): Promise<string> {
+export async function pageTemplate(action_name: string): Promise<string> {
 	return `import type { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";

package/src/templates/shared/collection-create-form.ts

@@ -1,7 +1,6 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formTemplate } from "../form.js";
 
-import _locreq from "locreq";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
 import { wrapAttribute } from "../../utils/wrap-attributes.js";
 
@@ -11,12 +10,11 @@ export async function createItemFormTemplate(
 	collection_name: string,
 	list_action: string
 ): Promise<string> {
-	const collection_fields = await extract_fields_from_collection(
-		collection_name
-	);
+	const collection_fields =
+		await extract_fields_from_collection(collection_name);
 	const formFieldsVar = `${toPascalCase(collection_name)}FormFields`;
 
-	return formTemplate(create_action_name, newfilefullpath, {
+	return formTemplate(create_action_name, {
 		success_message: "Created!",
 		postimport: `import {${formFieldsVar}, get${toPascalCase(
 			collection_name
@@ -65,7 +63,8 @@ export async function createItemFormTemplate(
 			.join(",\n")} 
 			});
 
-    	for(const field of Object.values(${formFieldsVar})){
+   		for(const field of Object.values(${formFieldsVar})){
+			// eslint-disable-next-line no-await-in-loop
             await field.postSealiousCreate(ctx, created, formData)
         }
 	}

package/src/templates/shared/collection-edit-form.ts

@@ -1,7 +1,6 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formTemplate } from "../form.js";
 
-import _locreq from "locreq";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
 import { wrapAttribute } from "../../utils/wrap-attributes.js";
 
@@ -11,13 +10,12 @@ export async function editItemFormTemplate(
 	collection_name: string,
 	list_action: string
 ): Promise<string> {
-	const collection_fields = await extract_fields_from_collection(
-		collection_name
-	);
+	const collection_fields =
+		await extract_fields_from_collection(collection_name);
 	const formFieldsVar = `${toPascalCase(collection_name)}FormFields`;
 	const collectionVar = `${toPascalCase(collection_name)}`;
 
-	return formTemplate(edit_action_name, newfilefullpath, {
+	return formTemplate(edit_action_name, {
 		success_message: "Changes saved!",
 		postimport: `import {${formFieldsVar}, get${toPascalCase(
 			collection_name
@@ -80,7 +78,8 @@ export async function editItemFormTemplate(
                 await item.save(ctx.$context);
 
 				for(const field of Object.values(${formFieldsVar})){
-					await field.postSealiousEdit(ctx, item, formData)
+				    // eslint-disable-next-line no-await-in-loop
+				await field.postSealiousEdit(ctx, item, formData)
 				}
 			}
 		`,

package/src/templates/shared/collection-list.ts

@@ -132,7 +132,7 @@ ${field_import_string}
 export const actionName = "${action_name}";
 
 const filterFields:{
-	field: keyof (typeof HasAllFields)["fields"];
+    field: keyof (typeof ${uppercase_collection})["fields"];
 	render?: ListFilterRender;
 	prepareValue?: (filter_value: unknown) => unknown; // set this function to change what filter value is passed to Sealious
 }[] = [
@@ -207,7 +207,7 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 		ctx: Context,
 		fields: { field: string; label?: string }[]
 	): FlatTemplatable {
-		return tempstream/* HTML */ \`<thead>
+		return tempstream /* HTML */ \`<thead>
 			<tr>
 				\${fields.map(({ label, field }) => this.renderHeading(ctx, field, label))}
 				<th>Actions</th>

package/src/templates/shared/shared-crud-form-fields.ts

@@ -1,20 +1,15 @@
 import { toPascalCase } from "js-convert-case";
-import _locreq from "locreq";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
 import { formatWithPrettier } from "../../utils/prettier.js";
 import { wrapAttribute } from "../../utils/wrap-attributes.js";
 
-export async function sharedCrudFormFields(
-	collection_name: string,
-	newfilefullpath: string
-) {
-	const collection_fields = await extract_fields_from_collection(
-		collection_name
-	);
+export async function sharedCrudFormFields(collection_name: string) {
+	const collection_fields =
+		await extract_fields_from_collection(collection_name);
 
 	const uppercase_collection = toPascalCase(collection_name);
 
-	const result = `import { Controls, Fields } from "@sealcode/sealgen";
+	const result = `import { type Controls, Fields } from "@sealcode/sealgen";
 import { ${uppercase_collection} } from "src/back/collections/collections.js";
 ${Array.from(
 	new Set(

package/src/templates/templates.ts

@@ -9,7 +9,11 @@ import { redirectTemplate } from "./redirect.js";
 import { statefulPageTemplate } from "./stateful-page.js";
 import { jddEditorTemplate } from "./jdd-editor.js";
 
-export const Templates = {
+export const Templates: Record<
+	string,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	(action: string, params: any) => Promise<string>
+> = {
 	page: pageTemplate,
 	form: formTemplate,
 	list: listTemplate,

package/src/test_utils/exec_async.ts

@@ -1,18 +1,17 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { exec } from "child_process";
 
 export const execAsync = (cmd: string) => {
 	return new Promise<void>((resolve, reject) => {
 		const process = exec(cmd);
 
-		console.log("EXECUTING", cmd);
+		console.info("EXECUTING", cmd);
 
 		process?.stdout?.on("data", (data) => {
-			console.log(`stdout: ${data}`);
+			console.info(`stdout: ${data}`);
 		});
 
 		process?.stderr?.on("data", (data) => {
-			console.log(`stdout: ${data}`);
+			console.info(`stdout: ${data}`);
 		});
 
 		process.on("exit", (code) => {

package/src/test_utils/test-on-real-app.ts

@@ -33,18 +33,18 @@ export class RealAppTest {
 		const timestamp = Date.now();
 		test_app.app_path = `/tmp/sealious-minimal-${timestamp}`;
 		test_app.container_name = `sealgen-test-mongo-${timestamp}`;
-		console.log("\tcloning sealious-minimal...");
+		console.info("\tcloning sealious-minimal...");
 		await execAsync(
 			`git clone ${sealious_minimal_url} ${test_app.app_path} && cd ${test_app.app_path} && git checkout ${sealious_minimal_commit}`
 		);
-		console.log("\tinstalling dependencies and sealgen...");
+		console.info("\tinstalling dependencies and sealgen...");
 		await execAsync(
 			`cd ${
 				test_app.app_path
 			} && npm ci rm -rf node_modules/@sealcode/sealgen && ln -s $OLDPWD node_modules/@sealcode/sealgen && ${callSealgenBin()} make-env`
 		);
 
-		console.log(
+		console.info(
 			"\tstarting the database...(if timeouts here, run 'docker pull mongo:4.4-bionic' to solve)"
 		);
 		await test_app.runSealgenCommand("build");
@@ -63,7 +63,7 @@ export class RealAppTest {
 			SEALIOUS_PORT: this.app_port.toString(),
 		};
 		const node_args = [`${this.app_path}/dist/back/index.js`];
-		console.log(
+		console.info(
 			"EXECUTING APP",
 			`${Object.entries(env)
 				.map(([key, value]) => `${key}=${value}`)
@@ -73,9 +73,9 @@ export class RealAppTest {
 			env,
 		});
 		app_start.stdout.on("data", (data) =>
-			console.log("APP OUTPUT:", data.toString())
+			console.info("APP OUTPUT:", data.toString())
 		);
-		app_start.stderr.on("data", (data) => console.log(data.toString()));
+		app_start.stderr.on("data", (data) => console.info(data.toString()));
 		app_start.on("exit", (code) => {
 			this.emitter.emit("exit", code);
 			this.emitter.emit("process_error");
@@ -88,7 +88,7 @@ export class RealAppTest {
 			output: "silent",
 			timeout: 6000,
 		});
-		console.log(
+		console.info(
 			chalk.yellow(
 				`App is listening on http://localhost:${this.app_port}`
 			)
@@ -98,7 +98,7 @@ export class RealAppTest {
 	async close() {
 		try {
 			if (this.node_pid != 0) await execAsync(`kill -9 ${this.node_pid}`);
-		} catch (error) {
+		} catch (_error) {
 			throw new Error(
 				"node process exited unexpectedly, please inspect the output"
 			);
@@ -174,14 +174,12 @@ export class RealAppTest {
 			const status = ret.status;
 			const response = await ret.text();
 
-			console.debug("request done!");
-			console.debug({ response });
 			return { status, response };
 		});
 	}
 
 	async addFile(target_path: string, content: string) {
-		console.log(
+		console.info(
 			chalk.yellow("Inserting file at path"),
 			chalk.green(target_path),
 			"with content\n",

package/src/utils/browser-creator.js

@@ -2,7 +2,6 @@ import { firefox } from "playwright";
 
 let browser_promise = null;
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export async function getBrowser() {
 	if (!browser_promise) browser_promise = firefox.launch();
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-return

package/src/utils/exec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { spawn } from "child_process";
 
 export async function exec(

package/src/utils/input-wrapper.ts

@@ -13,7 +13,7 @@ export async function inputWrapper(
 	modifiers: string[],
 	input: FlatTemplatable
 ): Promise<string> {
-	return tempstream/* HTML */ `<div
+	return tempstream /* HTML */ `<div
 		class="form-input form-input--type-${type} form-input__wrapper ${getModifierClasses(
 			modifiers
 		)}"

package/src/utils/wrap-attributes.ts

@@ -1,6 +1,6 @@
 export function needsQuotes(str: string) {
 	try {
-		// eslint-disable-next-line @typescript-eslint/no-implied-eval
+		// eslint-disable-next-line  @typescript-eslint/no-implied-eval
 		new Function(`var obj = { ${str}: 1 };`);
 		return false;
 	} catch {

package/src/utils/write-file.ts

@@ -4,5 +4,5 @@ import { resolve } from "path";
 export async function writeFile(path: string, content: string) {
 	await fs.mkdir(resolve(path, "../"), { recursive: true });
 	await fs.writeFile(path, content);
-	console.log(`${path} created`);
+	console.info(`${path} created`);
 }

package/.eslintrc.cjs

@@ -1,44 +0,0 @@
-module.exports = {
-	env: { node: true },
-	parser: "@typescript-eslint/parser",
-	plugins: ["@typescript-eslint", "prettier"],
-	extends: [
-		"eslint:recommended",
-		"plugin:@typescript-eslint/recommended",
-		"plugin:@typescript-eslint/recommended-requiring-type-checking",
-		"plugin:prettier/recommended",
-	],
-	ignorePatterns: [".eslintrc.js", "src/**/*.test.ts", "@types/*"],
-	parserOptions: {
-		sourceType: "module",
-		ecmaFeatures: {
-			modules: true,
-		},
-		project: ["./tsconfig.json"],
-	},
-	rules: {
-		"@typescript-eslint/require-await": 0,
-		"no-await-in-loop": 2,
-		"@typescript-eslint/no-unused-vars": [
-			"warn",
-			{ args: "none", varsIgnorePattern: "^_" },
-		],
-		"@typescript-eslint/no-this-alias": 0,
-		"@typescript-eslint/no-empty-function": 0,
-		"@typescript-eslint/no-explicit-any": 0,
-	},
-	settings: { jsdoc: { mode: "typescript" } },
-	overrides: [
-		{
-			files: ["*.subtest.ts", "*.test.ts"],
-			rules: {
-				"@typescript-eslint/no-unsafe-member-access": 0,
-				"prefer-const": 0,
-				"@typescript-eslint/no-unsafe-call": 0,
-				"@typescript-eslint/no-unsafe-return": 0,
-				"@typescript-eslint/no-unsafe-assignment": 0,
-				"no-await-in-loop": 1, // sometimes it's easier to debug when requests run sequentially
-			},
-		},
-	],
-};