@sealcode/sealgen 0.19.0 → 0.19.3

package/lib/templates/page.js

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

package/lib/templates/shared/collection-create-form.js

@@ -3,11 +3,9 @@ import { formTemplate } from "../form.js";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
 import { wrapAttribute } from "../../utils/wrap-attributes.js";
 async function createItemFormTemplate(create_action_name, newfilefullpath, collection_name, list_action) {
-  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
@@ -50,7 +48,8 @@ async function createItemFormTemplate(create_action_name, newfilefullpath, colle
     ).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/lib/templates/shared/collection-edit-form.js

@@ -3,12 +3,10 @@ import { formTemplate } from "../form.js";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
 import { wrapAttribute } from "../../utils/wrap-attributes.js";
 async function editItemFormTemplate(edit_action_name, newfilefullpath, collection_name, list_action) {
-  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
@@ -66,7 +64,8 @@ async function editItemFormTemplate(edit_action_name, newfilefullpath, collectio
                 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/lib/templates/shared/collection-list.js

@@ -105,7 +105,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
 }[] = [
@@ -180,7 +180,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/lib/templates/shared/shared-crud-form-fields.js

@@ -2,12 +2,10 @@ import { toPascalCase } from "js-convert-case";
 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";
-async function sharedCrudFormFields(collection_name, newfilefullpath) {
-  const collection_fields = await extract_fields_from_collection(
-    collection_name
-  );
+async function sharedCrudFormFields(collection_name) {
+  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/lib/test_utils/exec_async.js

@@ -2,12 +2,12 @@ import { exec } from "child_process";
 const execAsync = (cmd) => {
   return new Promise((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) => {
       if (code == 0) {

package/lib/test_utils/test-on-real-app.js

@@ -22,15 +22,15 @@ class RealAppTest {
     const timestamp = Date.now();
     test_app.app_path = `/tmp/sealious-minimal-${timestamp}`;
     test_app.container_name = `sealgen-test-mongo-${timestamp}`;
-    console.log("	cloning sealious-minimal...");
+    console.info("	cloning 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("	installing dependencies and sealgen...");
+    console.info("	installing 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(
       "	starting the database...(if timeouts here, run 'docker pull mongo:4.4-bionic' to solve)"
     );
     await test_app.runSealgenCommand("build");
@@ -48,7 +48,7 @@ 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}`).join(" ")} node ${node_args.join(" ")}`
     );
@@ -57,9 +57,9 @@ class RealAppTest {
     });
     app_start.stdout.on(
       "data",
-      (data) => console.log("APP OUTPUT:", data.toString())
+      (data) => 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");
@@ -73,7 +73,7 @@ class RealAppTest {
       output: "silent",
       timeout: 6e3
     });
-    console.log(
+    console.info(
       chalk.yellow(
         `App is listening on http://localhost:${this.app_port}`
       )
@@ -83,7 +83,7 @@ class RealAppTest {
     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"
       );
@@ -147,13 +147,11 @@ 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, content) {
-    console.log(
+    console.info(
       chalk.yellow("Inserting file at path"),
       chalk.green(target_path),
       "with content\n",

package/lib/utils/write-file.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.19.0",
+	"version": "0.19.3",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
@@ -39,13 +39,13 @@
 		"@types/wcag-contrast": "^3.0.3",
 		"@types/ws": "^8.5.10",
 		"@types/yargs": "^17.0.32",
-		"@typescript-eslint/eslint-plugin": "^5.58.0",
-		"@typescript-eslint/parser": "^5.58.0",
+		"@typescript-eslint/eslint-plugin": "^8.44.0",
+		"@typescript-eslint/parser": "^8.44.0",
 		"axios": "^1.6.7",
 		"chalk": "^5.3.0",
-		"eslint": "^7.32.0",
-		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-prettier": "^3.4.1",
+		"eslint": "^9.36.0",
+		"eslint-config-prettier": "^8.10.2",
+		"eslint-plugin-prettier": "^5.5.4",
 		"eslint-plugin-with-tsc-error": "^0.0.7",
 		"get-port": "^5.1.1",
 		"koa-body": "^5.0.0",
@@ -56,6 +56,7 @@
 		"source-map-support": "^0.5.21",
 		"ts-node": "^10.9.1",
 		"typescript": "5.9",
+		"typescript-eslint": "^8.44.0",
 		"wait-port": "^1.0.4"
 	},
 	"types": "./@types/index.d.ts",
@@ -77,7 +78,7 @@
 		"locreq": "^3.0.0",
 		"md5": "^2.3.0",
 		"merge": "^2.1.1",
-		"prettier": "^2.7.1",
+		"prettier": "^3.6.2",
 		"prompts": "^2.4.2",
 		"recursive-readdir": "^2.2.3",
 		"tempfile": "^5.0.0",
@@ -90,7 +91,7 @@
 	"peerDependencies": {
 		"koa": "^2.13.0",
 		"koa-responsive-image-router": "^0.2.24",
-		"sealious": "^0.21",
+		"sealious": "^0.21.20",
 		"stimulus": "^3.2.2"
 	}
 }

package/src/add-collection.ts

@@ -25,8 +25,7 @@ export async function addCollection(
 		},
 	]);
 
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const collection_name: string = response.collection_name;
+	const collection_name: string = response.collection_name as string;
 
 	if (!collection_name) {
 		throw new Error("Empty collection name, please try again");
@@ -36,7 +35,6 @@ export async function addCollection(
 	);
 
 	if (existsSync(file_path)) {
-		// eslint-disable-next-line no-console
 		console.error(`ERROR: File ${file_path} already exists.`);
 		return;
 	}

package/src/add-crud.ts

@@ -24,9 +24,7 @@ export async function addCRUD(
 			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,
 			})),
@@ -90,10 +88,7 @@ export async function addCRUD(
 	const fields_path = target_locreq.resolve(
 		`src/back/routes/${escape_url_params(url)}/shared.ts`
 	);
-	const fields_content = await sharedCrudFormFields(
-		collection_name,
-		fields_path
-	);
+	const fields_content = await sharedCrudFormFields(collection_name);
 	await writeFile(fields_path, fields_content);
 
 	/* create the create endpoint */

package/src/add-jdd-component.ts

@@ -19,12 +19,11 @@ export async function addJDDComponent(): Promise<void> {
 	);
 
 	if (existsSync(file_path)) {
-		// eslint-disable-next-line no-console
 		console.error(`ERROR: File ${file_path} already exists.`);
 		return;
 	}
 	await fs.mkdir(resolve(file_path, "../"), { recursive: true });
-	await fs.writeFile(file_path, jddComponentTemplate(component_name));
+	await fs.writeFile(file_path, await jddComponentTemplate(component_name));
 
 	const css_file_path = target_locreq.resolve(
 		`src/back/jdd-components/${toKebabCase(component_name)}/${toKebabCase(
@@ -36,8 +35,8 @@ export async function addJDDComponent(): Promise<void> {
 		`.${toKebabCase(component_name)} {
 }`
 	);
-	// eslint-disable-next-line no-console
-	console.log(`Created ${file_path}`);
-	console.log(`Created ${css_file_path}`);
+
+	console.info(`Created ${file_path}`);
+	console.info(`Created ${css_file_path}`);
 	await generateComponents();
 }

package/src/add-route.ts

@@ -67,22 +67,19 @@ export async function addRoute(
 	const test_file_path = target_locreq.resolve(
 		`src/back/routes/${base_file_name}.test.ts`
 	);
-	const template = Templates[mode as keyof typeof Templates];
+	const template = Templates[mode];
 
 	if (!template) {
 		throw new Error(`Could not get template ${mode}`);
 	}
 
 	if (existsSync(file_path)) {
-		// eslint-disable-next-line no-console
 		console.error(`ERROR: File ${file_path} already exists.`);
 		return;
 	}
 	await fs.mkdir(resolve(file_path, "../"), { recursive: true });
 	await fs.writeFile(file_path, await template(action, file_path));
-	// eslint-disable-next-line no-console
-	console.log(`${file_path} created`);
-	// eslint-disable-next-line no-console
-	console.log(`${test_file_path} created`);
+	console.info(`${file_path} created`);
+	console.info(`${test_file_path} created`);
 	await generateRoutes();
 }

package/src/build.ts

@@ -64,7 +64,7 @@ async function build(watch: boolean): Promise<void> {
 		copy_to_public.map(async ({ from, to }) => {
 			try {
 				await fs.stat(resolve(project_dir, "public", to));
-			} catch (e) {
+			} catch (_e) {
 				await fs.mkdir(resolve(project_dir, "public", to, "../"), {
 					recursive: true,
 				});
@@ -101,7 +101,7 @@ async function build(watch: boolean): Promise<void> {
 		const notifier = make_notifier(port, 8080); // TODO: parse the app config to get the actual port
 		await write_notifier_config(watch, port);
 		watcher.on("all", (_, file_path) => {
-			console.log("Detected a change!", file_path);
+			console.info("Detected a change!", file_path);
 			builders.forEach((builder) => {
 				const owns_a_file = builder.ownsFile(file_path);
 				if (owns_a_file) {
@@ -125,7 +125,7 @@ export async function buildProject({
 	try {
 		await build(watch);
 	} catch (e) {
-		console.log("CAUGHT!");
+		console.error("CAUGHT!");
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		console.error(e.message);
 		if (!watch) {

package/src/builders/backend-ts-builder.ts

@@ -27,7 +27,6 @@ export class BackendTSBuilder extends Builder {
 		);
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	async dispose(): Promise<void> {}
 
 	async _build(): Promise<void> {

package/src/builders/builder.ts

@@ -4,7 +4,10 @@ export abstract class Builder {
 	abstract _build(): Promise<void>;
 	abstract dispose(): Promise<void>;
 
-	constructor(public project_dir: string, public style_dirs: string[]) {}
+	constructor(
+		public project_dir: string,
+		public style_dirs: string[]
+	) {}
 
 	public ongoing_build: Promise<void> | null = null;
 

package/src/builders/colors-builder.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { build } from "esbuild";
 import tempfile from "tempfile";
 import { promises as fs } from "fs";
@@ -26,7 +25,6 @@ export class ColorsBuilder extends Builder {
 		return file_path == COLORS_TS_PATH;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	async dispose(): Promise<void> {}
 
 	async _build() {
@@ -242,8 +240,12 @@ export class ColorsBuilder extends Builder {
 
 								.hex {
 									padding: 8px;
-									font-family: Menlo, Consolas, Monaco,
-										Liberation Mono, Lucida Console,
+									font-family:
+										Menlo,
+										Consolas,
+										Monaco,
+										Liberation Mono,
+										Lucida Console,
 										monospace;
 									opacity: 0.5;
 									visibility: hidden;
@@ -433,16 +435,16 @@ export class ColorsBuilder extends Builder {
 								)
 									? \`var(--color-\${box.getAttribute(
 											"data-color-group-name"
-									  )}-\${box.getAttribute(
+										)}-\${box.getAttribute(
 											"data-color-name"
-									  )})\`
+										)})\`
 									: \`var(--color-\${box.getAttribute(
 											"data-color-group-name"
-									  )}-\${box.getAttribute(
+										)}-\${box.getAttribute(
 											"data-color-name"
-									  )}-\${box.getAttribute(
+										)}-\${box.getAttribute(
 											"data-color-shade-number"
-									  )})\`;
+										)})\`;
 								navigator.clipboard.writeText(css_var);
 								pop_toast();
 							}

package/src/builders/css-builder.ts

@@ -7,7 +7,10 @@ import { Builder } from "./builder.js";
 
 export class CSSClump {
 	public files: string[] = [];
-	constructor(public project_dir: string, public name: string) {}
+	constructor(
+		public project_dir: string,
+		public name: string
+	) {}
 
 	addFile(full_path: string) {
 		this.files.push(full_path);

package/src/builders/fonts-builder.ts

@@ -10,7 +10,6 @@ export class FontsBuilder extends Builder {
 		return file_path == FONTS_CONFIG_PATH;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	async dispose(): Promise<void> {}
 
 	async _build() {

package/src/builders/frontend-ts-builder.ts

@@ -24,7 +24,6 @@ export class FrontendTSBuilder extends Builder {
 		);
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	async dispose(): Promise<void> {}
 
 	async _build(): Promise<void> {

package/src/cli.ts

@@ -28,8 +28,8 @@ const actions: Record<
 	"generate-routes": generateRoutes,
 	build: buildProject,
 	default: async function () {
-		console.log("Usage: `npx sealgen <action>`");
-		console.log(
+		console.info("Usage: `npx sealgen <action>`");
+		console.info(
 			`Available actions: ${Object.keys(actions)
 				.filter((e) => e != "default")
 				.join(", ")}`

package/src/components/tabs.ts

@@ -4,52 +4,53 @@ function name_to_id(str: string) {
 	return str.replace(/\W/g, "-");
 }
 
-const style = (hide_tabs_width: number) => /* HTML */ `<style>
-	.tab-label {
-		height: 45px;
-		line-height: 45px;
-		padding: 0 45px;
-		display: block;
-		float: left;
-		box-sizing: border-box;
-		border-bottom: 3px solid transparent;
-		cursor: pointer;
-		font-size: 18px;
-		-webkit-user-select: none;
-		user-select: none;
-	}
-
-	@media screen and (max-width: ${hide_tabs_width}px) {
+const style = (hide_tabs_width: number) =>
+	/* HTML */ `<style>
 		.tab-label {
-			display: none;
+			height: 45px;
+			line-height: 45px;
+			padding: 0 45px;
+			display: block;
+			float: left;
+			box-sizing: border-box;
+			border-bottom: 3px solid transparent;
+			cursor: pointer;
+			font-size: 18px;
+			-webkit-user-select: none;
+			user-select: none;
 		}
-	}
 
-	.tab-label--mobile {
-		line-height: unset;
-		padding-top: 30px;
-		padding-left: 0;
-		pointer-events: none;
-		padding-bottom: 30px;
-		color: $font-graphite;
-		border-bottom: 2px solid $font-primary;
-		display: none;
 		@media screen and (max-width: ${hide_tabs_width}px) {
-			display: block;
+			.tab-label {
+				display: none;
+			}
 		}
-	}
 
-	.tab-content {
-		padding-top: 30px;
-		clear: both;
-	}
+		.tab-label--mobile {
+			line-height: unset;
+			padding-top: 30px;
+			padding-left: 0;
+			pointer-events: none;
+			padding-bottom: 30px;
+			color: $font-graphite;
+			border-bottom: 2px solid $font-primary;
+			display: none;
+			@media screen and (max-width: ${hide_tabs_width}px) {
+				display: block;
+			}
+		}
 
-	@media screen and (max-width: ${hide_tabs_width}px) {
 		.tab-content {
-			display: block !important;
+			padding-top: 30px;
+			clear: both;
+		}
+
+		@media screen and (max-width: ${hide_tabs_width}px) {
+			.tab-content {
+				display: block !important;
+			}
 		}
-	}
-</style>`;
+	</style>`;
 
 export function tabs(
 	tabs: Record<string, FlatTemplatable>,

package/src/components/toggle-modal.ts

@@ -10,7 +10,7 @@ export function toggleModal(options: {
 }) {
 	const { contentWrapped, contentUnwrapped, name } = options;
 	const id = makeSlug(name);
-	return tempstream/* HTML */ `<style>
+	return tempstream /* HTML */ `<style>
 			.toggle-modal__wrapped {
 				display: none;
 			}

package/src/controllers/table-add-button.stimulus.ts

@@ -28,7 +28,7 @@ export default class extends Controller {
 			placeholder,
 			String(tbody.querySelectorAll("tr").length)
 		);
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
 		tbody.appendChild((template.cloneNode(true) as any).content);
 		template.innerHTML = orig_template;
 	}

package/src/esbuild-plugins/rewrite-asset-imports.ts

@@ -22,16 +22,13 @@ export const rewrite_asset_imports_plugin = (project_dir: string) => ({
 				`^import ([^ ]+, )?(\\w+|{[^}]+}) from "([^"]+)";`,
 				"gm"
 			);
-			contents = contents.replaceAll(
-				regex_import,
-				(line, _: string, original_path: string) => {
-					const replaced = line.replace(
-						`"src/`,
-						`"` + resolve(project_dir, "./dist") + "/"
-					);
-					return replaced;
-				}
-			);
+			contents = contents.replaceAll(regex_import, (line) => {
+				const replaced = line.replace(
+					`"src/`,
+					`"` + resolve(project_dir, "./dist") + "/"
+				);
+				return replaced;
+			});
 
 			return {
 				contents,