@sealcode/sealgen 0.12.9 → 0.12.10

package/build.js

@@ -1,12 +1,13 @@
 import * as esbuild from "esbuild";
 import { default as glob } from "tiny-glob";
-import { remove_named_imports } from "./remove-named-imports.js";
+// commented out as it seemingly works without that
+// import { remove_named_imports } from "./remove-named-imports.js";
 
 const entryPoints = (await glob("./src/**/*.{js,ts,tsx}")).filter(
 	(path) => !path.includes(".#")
 );
 
-await esbuild.build({
+const args = {
 	entryPoints,
 	sourcemap: true,
 	bundle: false,
@@ -16,4 +17,11 @@ await esbuild.build({
 	target: "es2022",
 	format: "esm",
 	//	plugins: [remove_named_imports],
-});
+};
+
+if (process.argv.includes("--watch")) {
+	const context = await esbuild.context(args);
+	context.watch();
+} else {
+	esbuild.build(args);
+}

package/dist/add-collection.js

@@ -4,18 +4,18 @@ import { promises as fs, existsSync } from "fs";
 import { question } from "./utils/question.js";
 import { collectionTemplate } from "./templates/collection.js";
 import { generateCollections } from "./generate-collections.js";
+import { toKebabCase, toPascalCase } from "js-convert-case";
 const target_locreq = _locreq(process.cwd());
 async function addCollection() {
-  const regex_pattern = /^([A-Z_$][a-zA-Z0-9_$]*)$/;
-  const collection_name = await question(
-    `What's the name of the collection class (e.g. "SecretDocuments", must start with a capital letter): `,
-    (s) => s.length > 3 && regex_pattern.test(s)
+  const collection_name = toPascalCase(
+    await question(
+      "What's the name of the collection class: ",
+      (s) => s.length > 3
+    )
   );
-  const url = await question(
-    "Enter the url-friendly name for the collection (e.g. secret-documents): ",
-    (s) => !s.includes("/") && !s.includes(" ")
+  const file_path = target_locreq.resolve(
+    `src/back/collections/${toKebabCase(collection_name)}.ts`
   );
-  const file_path = target_locreq.resolve(`src/back/collections/${url}.ts`);
   if (existsSync(file_path)) {
     console.error(`ERROR: File ${file_path} already exists.`);
     return;

package/dist/add-route.js

@@ -6,6 +6,7 @@ import { testTemplate } from "./templates/route-test.js";
 import { escape_url_params } from "./utils/escape-url-params.js";
 import prompts from "prompts";
 import { Templates } from "./templates/templates.js";
+import { toKebabCase, toPascalCase } from "js-convert-case";
 async function addRoute(params, app_directory = process.cwd()) {
   const target_locreq = _locreq(app_directory);
   prompts.override(params);
@@ -14,13 +15,19 @@ async function addRoute(params, app_directory = process.cwd()) {
       type: "text",
       name: "action",
       message: `What's the name of the action (e.g. "AddUser"): `,
-      validate: (s) => s.length > 3 ? true : "Should be at least 3 characters long"
+      validate: (s) => s.length > 3 ? true : "Should be at least 3 characters long",
+      format: function(action2) {
+        return toPascalCase(action2);
+      }
     },
     {
       type: "text",
       name: "url",
       message: "Enter a full absolute path for the new route (for example: /admin/users/:id/edit): ",
-      validate: (s) => s.trim()[0] == "/" ? true : "Should start with a '/'"
+      validate: (s) => s.trim()[0] == "/" ? true : "Should start with a '/'",
+      initial: function(_, { action: action2 }) {
+        return "/" + toKebabCase(action2);
+      }
     },
     {
       type: "select",
@@ -56,7 +63,9 @@ async function addRoute(params, app_directory = process.cwd()) {
   }
   await fs.mkdir(resolve(file_path, "../"), { recursive: true });
   await fs.writeFile(file_path, await template(action, file_path));
-  await fs.writeFile(test_file_path, testTemplate(action, file_path));
+  if (mode !== "lpr") {
+    await fs.writeFile(test_file_path, testTemplate(action, file_path));
+  }
   console.log(`${file_path} created`);
   console.log(`${test_file_path} created`);
   await generateRoutes();

package/dist/templates/form.js

@@ -2,7 +2,14 @@ import { curryImportPath } from "../utils/import-path.js";
 async function formTemplate(action_name, newfilefullpath) {
   const rel = curryImportPath(newfilefullpath);
   return `import { Context } from "koa";
-import { Form, FormData, FormDataValue, Fields, Controls } from "@sealcode/sealgen";
+import {
+	Form,
+	FormData,
+	FormDataValue,
+	Fields,
+	Controls,
+	fieldsToShape,
+} from "@sealcode/sealgen";
 import html from "${rel("src/back/html.js")}";
 import { Users } from "${rel("src/back/collections/collections.js")}";
 
@@ -28,10 +35,10 @@ export default new (class ${action_name}Form extends Form<typeof fields, void> {
 		ctx: Context,
 		data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
-		// just an example
+		// just a silly example, please remove this with better logic
 		const { parsed: email } = await this.fields.email.getValue(ctx, data);
 		const { parsed: password } = await this.fields.password.getValue(ctx, data);
-		if ((password || "").length > (email || "").length) {
+		if ((password || "").length > ((email as string) || "").length) {
 			return { valid: false, error: "Password cannot be longer than email" };
 		} else {
 			return { valid: true, error: "" };

package/dist/templates/list.js

@@ -75,7 +75,11 @@ ${collection_fields.map((field) => {
     }
     return `	{ field: "${field.name}", label: "${field.name}" }`;
   }).join(",\n")}
-];
+] as {
+	field: string;
+	label: string;
+	format?: (value: unknown) => FlatTemplatable;
+}[];
 
 export default new (class ${action_name}Page extends SealiousItemListPage<
 	typeof ${uppercase_collection},
@@ -94,8 +98,8 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 				}
 				return <input
 					type="hidden"
-					name="\${key}"
-					value="\${value}"
+					name={key}
+					value={value}
 				/>;
 			})}
 			{filterFields.map(({ field, render }) => {

package/dist/templates/long-running-process.js

@@ -1,3 +1,4 @@
+import { toSentenceCase } from "js-convert-case";
 import { curryImportPath } from "../utils/import-path.js";
 async function LongRunningProcessTemplate(action_name, newfilefullpath) {
   const rel = curryImportPath(newfilefullpath);
@@ -20,38 +21,34 @@ export default new (class PatroniteAutoImportStatusPage extends Page {
 	async render(ctx: Context) {
 		const lpr_id = ctx.params.id;
 		const lpr_data = LongRunningProcess.getByID(ctx.$context, lpr_id);
-		const render_script = lpr_data.state !== "error" && lpr_data.state !== "finished";
-		const script = /* HTML */ \`<script>
-			setTimeout(() => {
-				document.location = document.location;
-			}, \${this.interval});
-		</script>\`;
 
 		return html(
 			ctx,
-			"PatroniteAutoImportStatus",
-			<div>
-				{lpr_data.then((lpr_data) => {
-					return (
-						<div>
-							<div>status: {lpr_data.state}</div>
-							<div style="height: 20px; width: 100%">
-								<div
-									style="height: 100%; background-color: green; width: {Math.round(
-												lpr_data.progress * 100
-											)}%"
-								></div>
-							</div>
-							<div>
-								{lpr_data.events.map((e) => (
-									<div>{e.message}</div>
-								))}
-							</div>
-							{render_script ? { script } : ""}
-						</div>
-					);
-				})}
-			</div>
+			"${toSentenceCase(action_name)}",
+			lpr_data.then((lpr_data) => (
+				<div>
+					<div>status: {lpr_data.state}</div>
+					<div style="height: 20px; width: 100%">
+						<div
+							style={\`height: 100%; background-color: green; width: \${Math.round(
+								lpr_data.progress * 100
+							)}%\`}
+						></div>
+					</div>
+					<div>
+						{lpr_data.events.map((e) => (
+							/* HTML */ <div>{e.message}</div>
+						))}
+					</div>
+					{lpr_data.state !== "error" && lpr_data.state !== "finished"
+						? /* HTML */ \`<script>
+								setTimeout(() => {
+									document.location = document.location;
+								}, \${this.interval});
+						  </script>\`
+						: ""}
+				</div>
+			))
 		);
 	}
 })();

package/dist/templates/multiform.js

@@ -13,7 +13,7 @@ const fields1 = {
 	password: new Fields.SimpleFormField(true),
 };
 
-const form1 = new (class extends Form<typeof fields1> {
+const form1 = new (class extends Form<typeof fields1, unknown> {
 	defaultSuccessMessage = "Form1 done!";
 	controls = [
 		new Controls.FormHeader("form1"),
@@ -30,7 +30,7 @@ const fields2 = {
 	surname: new Fields.SimpleFormField(true),
 };
 
-const form2 = new (class extends Form<Record<never, unknown>> {
+const form2 = new (class extends Form<typeof fields2, unknown> {
 	defaultSuccessMessage = "Form2 done!";
 	controls = [new Controls.FormHeader("form2"), new Controls.SimpleInput(fields2.name)];
 	fields = fields2;
@@ -47,7 +47,11 @@ export default new (class extends Multiform {
 		messages: FormMessage[],
 		prerenderedForms?: Record<string, FlatTemplatable | undefined>
 	): Promise<FlatTemplatable> {
-		return html(ctx, "${action_name}", await super.render(ctx, messages, prerenderedForms));
+		return html(
+			ctx,
+			"${action_name}",
+			await super.render(ctx, messages, prerenderedForms, false)
+		);
 	}
 })();
 `;

package/package.json

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

package/src/add-collection.ts

@@ -4,19 +4,20 @@ import { promises as fs, existsSync } from "fs";
 import { question } from "./utils/question.js";
 import { collectionTemplate } from "./templates/collection.js";
 import { generateCollections } from "./generate-collections.js";
+import { toKebabCase, toPascalCase } from "js-convert-case";
 const target_locreq = _locreq(process.cwd());
 
 export async function addCollection(): Promise<void> {
-	const regex_pattern = /^([A-Z_$][a-zA-Z0-9_$]*)$/;
-	const collection_name = await question(
-		'What\'s the name of the collection class (e.g. "SecretDocuments", must start with a capital letter): ',
-		(s: string) => s.length > 3 && regex_pattern.test(s)
+	const collection_name = toPascalCase(
+		await question(
+			"What's the name of the collection class: ",
+			(s: string) => s.length > 3
+		)
 	);
-	const url = await question(
-		"Enter the url-friendly name for the collection (e.g. secret-documents): ",
-		(s: string) => !s.includes("/") && !s.includes(" ")
+
+	const file_path = target_locreq.resolve(
+		`src/back/collections/${toKebabCase(collection_name)}.ts`
 	);
-	const file_path = target_locreq.resolve(`src/back/collections/${url}.ts`);
 
 	if (existsSync(file_path)) {
 		// eslint-disable-next-line no-console

package/src/add-route.ts

@@ -6,6 +6,7 @@ import { testTemplate } from "./templates/route-test.js";
 import { escape_url_params } from "./utils/escape-url-params.js";
 import prompts from "prompts";
 import { Templates } from "./templates/templates.js";
+import { toKebabCase, toPascalCase } from "js-convert-case";
 
 export async function addRoute(
 	params: Partial<{ [key in "action" | "url" | "mode"]: string }>,
@@ -20,6 +21,9 @@ export async function addRoute(
 			message: 'What\'s the name of the action (e.g. "AddUser"): ',
 			validate: (s: string) =>
 				s.length > 3 ? true : "Should be at least 3 characters long",
+			format: function (action) {
+				return toPascalCase(action);
+			},
 		},
 		{
 			type: "text",
@@ -28,6 +32,9 @@ export async function addRoute(
 				"Enter a full absolute path for the new route (for example: /admin/users/:id/edit): ",
 			validate: (s: string) =>
 				s.trim()[0] == "/" ? true : "Should start with a '/'",
+			initial: function (_, { action }) {
+				return "/" + toKebabCase(action);
+			},
 		},
 		{
 			type: "select",
@@ -70,7 +77,9 @@ export async function addRoute(
 	}
 	await fs.mkdir(resolve(file_path, "../"), { recursive: true });
 	await fs.writeFile(file_path, await template(action, file_path));
-	await fs.writeFile(test_file_path, testTemplate(action, file_path));
+	if (mode !== "lpr") {
+		await fs.writeFile(test_file_path, testTemplate(action, file_path));
+	}
 	// eslint-disable-next-line no-console
 	console.log(`${file_path} created`);
 	// eslint-disable-next-line no-console

package/src/templates/form.ts

@@ -6,7 +6,14 @@ export async function formTemplate(
 ): Promise<string> {
 	const rel = curryImportPath(newfilefullpath);
 	return `import { Context } from "koa";
-import { Form, FormData, FormDataValue, Fields, Controls } from "@sealcode/sealgen";
+import {
+	Form,
+	FormData,
+	FormDataValue,
+	Fields,
+	Controls,
+	fieldsToShape,
+} from "@sealcode/sealgen";
 import html from "${rel("src/back/html.js")}";
 import { Users } from "${rel("src/back/collections/collections.js")}";
 
@@ -32,10 +39,10 @@ export default new (class ${action_name}Form extends Form<typeof fields, void> {
 		ctx: Context,
 		data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
-		// just an example
+		// just a silly example, please remove this with better logic
 		const { parsed: email } = await this.fields.email.getValue(ctx, data);
 		const { parsed: password } = await this.fields.password.getValue(ctx, data);
-		if ((password || "").length > (email || "").length) {
+		if ((password || "").length > ((email as string) || "").length) {
 			return { valid: false, error: "Password cannot be longer than email" };
 		} else {
 			return { valid: true, error: "" };

package/src/templates/list.ts

@@ -90,7 +90,11 @@ ${collection_fields
 		return `	{ field: "${field.name}", label: "${field.name}" }`;
 	})
 	.join(",\n")}
-];
+] as {
+	field: string;
+	label: string;
+	format?: (value: unknown) => FlatTemplatable;
+}[];
 
 export default new (class ${action_name}Page extends SealiousItemListPage<
 	typeof ${uppercase_collection},
@@ -109,8 +113,8 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 				}
 				return <input
 					type="hidden"
-					name="\${key}"
-					value="\${value}"
+					name={key}
+					value={value}
 				/>;
 			})}
 			{filterFields.map(({ field, render }) => {

package/src/templates/long-running-process.ts

@@ -1,3 +1,4 @@
+import { toSentenceCase } from "js-convert-case";
 import { curryImportPath } from "../utils/import-path.js";
 
 export async function LongRunningProcessTemplate(
@@ -24,38 +25,34 @@ export default new (class PatroniteAutoImportStatusPage extends Page {
 	async render(ctx: Context) {
 		const lpr_id = ctx.params.id;
 		const lpr_data = LongRunningProcess.getByID(ctx.$context, lpr_id);
-		const render_script = lpr_data.state !== "error" && lpr_data.state !== "finished";
-		const script = /* HTML */ \`<script>
-			setTimeout(() => {
-				document.location = document.location;
-			}, \${this.interval});
-		</script>\`;
 
 		return html(
 			ctx,
-			"PatroniteAutoImportStatus",
-			<div>
-				{lpr_data.then((lpr_data) => {
-					return (
-						<div>
-							<div>status: {lpr_data.state}</div>
-							<div style="height: 20px; width: 100%">
-								<div
-									style="height: 100%; background-color: green; width: {Math.round(
-												lpr_data.progress * 100
-											)}%"
-								></div>
-							</div>
-							<div>
-								{lpr_data.events.map((e) => (
-									<div>{e.message}</div>
-								))}
-							</div>
-							{render_script ? { script } : ""}
-						</div>
-					);
-				})}
-			</div>
+			"${toSentenceCase(action_name)}",
+			lpr_data.then((lpr_data) => (
+				<div>
+					<div>status: {lpr_data.state}</div>
+					<div style="height: 20px; width: 100%">
+						<div
+							style={\`height: 100%; background-color: green; width: \${Math.round(
+								lpr_data.progress * 100
+							)}%\`}
+						></div>
+					</div>
+					<div>
+						{lpr_data.events.map((e) => (
+							/* HTML */ <div>{e.message}</div>
+						))}
+					</div>
+					{lpr_data.state !== "error" && lpr_data.state !== "finished"
+						? /* HTML */ \`<script>
+								setTimeout(() => {
+									document.location = document.location;
+								}, \${this.interval});
+						  </script>\`
+						: ""}
+				</div>
+			))
 		);
 	}
 })();

package/src/templates/multiform.ts

@@ -17,7 +17,7 @@ const fields1 = {
 	password: new Fields.SimpleFormField(true),
 };
 
-const form1 = new (class extends Form<typeof fields1> {
+const form1 = new (class extends Form<typeof fields1, unknown> {
 	defaultSuccessMessage = "Form1 done!";
 	controls = [
 		new Controls.FormHeader("form1"),
@@ -34,7 +34,7 @@ const fields2 = {
 	surname: new Fields.SimpleFormField(true),
 };
 
-const form2 = new (class extends Form<Record<never, unknown>> {
+const form2 = new (class extends Form<typeof fields2, unknown> {
 	defaultSuccessMessage = "Form2 done!";
 	controls = [new Controls.FormHeader("form2"), new Controls.SimpleInput(fields2.name)];
 	fields = fields2;
@@ -51,7 +51,11 @@ export default new (class extends Multiform {
 		messages: FormMessage[],
 		prerenderedForms?: Record<string, FlatTemplatable | undefined>
 	): Promise<FlatTemplatable> {
-		return html(ctx, "${action_name}", await super.render(ctx, messages, prerenderedForms));
+		return html(
+			ctx,
+			"${action_name}",
+			await super.render(ctx, messages, prerenderedForms, false)
+		);
 	}
 })();
 `;