@sealcode/sealgen 0.14.12 → 0.14.14

package/@types/src/generate-routes.d.ts

@@ -1 +1,2 @@
+export declare function generateURL(actionName: string, url: string): string;
 export declare function generateRoutes(): Promise<void>;

package/@types/src/generate-routes.test.d.ts

@@ -0,0 +1 @@
+export {};

package/@types/src/page/mountable-with-fields.d.ts

@@ -18,10 +18,11 @@ export declare abstract class MountableWithFields<F extends Fields = Fields> ext
     constructor();
     init(): void;
     makeFormControlContext(ctx: Context, data: FormData, validate: boolean, field_name_prefix?: string, form_id?: string): FormControlContext;
-    validateValues(ctx: Context, data: Record<string, FormDataValue>): Promise<{
+    validateValues(_ctx: Context, _data: Record<string, FormDataValue>): Promise<{
         valid: boolean;
         error: string;
     }>;
+    getInitialValues(_ctx: Context): Promise<Record<string, FormDataValue>>;
     validate(ctx: Context, values: Record<string, FormDataValue>): Promise<{
         valid: boolean;
         field_errors: Partial<Record<keyof Fields, string>>;

package/dist/forms/form.js

@@ -194,7 +194,7 @@ class Form extends MountableWithFields {
     router.use(path, subrouter.routes(), subrouter.allowedMethods());
   }
   async extractRawValues(ctx) {
-    return ctx.$body;
+    return Object.keys(ctx.$body).length ? ctx.$body : this.getInitialValues(ctx);
   }
 }
 export {

package/dist/forms/form.test.js

@@ -8,6 +8,8 @@ import { locator_is_visible } from "../test_utils/locator_is_visible.js";
 import { getBrowser } from "../utils/browser-creator.js";
 import { assertThrowsAsync } from "../utils/utils.js";
 import getPort from "get-port";
+import { SimpleFormField } from "./fields/simple-form-field.js";
+import { expect as PlaywritghtExpect } from "@playwright/test";
 const fields = {
   text: new Fields.SimpleFormField(true)
 };
@@ -311,6 +313,44 @@ describe("form test", () => {
       });
     });
   });
+  describe("getInitialValues tests", async () => {
+    let server;
+    afterEach(async () => {
+      server.close();
+    });
+    it("fills the form with values from getInitialValues", async () => {
+      const app = new Koa();
+      const router = new Router();
+      const fields2 = {
+        title: new SimpleFormField(true)
+      };
+      mount(
+        router,
+        "/",
+        new class extends Form {
+          constructor() {
+            super(...arguments);
+            this.fields = fields2;
+            this.controls = [new Controls.SimpleInput(fields2.title)];
+          }
+          async getInitialValues() {
+            return { title: "Hello" };
+          }
+          onSubmit() {
+            return null;
+          }
+        }(),
+        true
+      );
+      app.use(router.routes()).use(router.allowedMethods());
+      server = app.listen(port);
+      const response = await page.goto(`http://localhost:${port}`);
+      if (response?.status() != 200) {
+        throw new Error(`Should return 200 status and it returns ${response?.status()}`);
+      }
+      await PlaywritghtExpect(page.getByLabel("title")).toHaveValue("Hello");
+    });
+  });
 });
 export {
   form_factory

package/dist/generate-routes.js

@@ -31,7 +31,7 @@ function generateURL(actionName, url) {
     (part) => part.startsWith(":") ? "${" + part.slice(1) + "}" : encodeURIComponent(part)
   ).join("/")}\`;
         ${actionName}URL.params = [${params.map((param) => `"${param}"`).join(",")}];
-        ${actionName}URL.rawURL = "${url}";`;
+        ${actionName}URL.rawURL = "${encodeURI(url)}";`;
 }
 async function generateRoutes() {
   const files = await Promise.all(
@@ -85,6 +85,7 @@ ${files.map(
   );
 }
 export {
-  generateRoutes
+  generateRoutes,
+  generateURL
 };
 //# sourceMappingURL=generate-routes.js.map

package/dist/generate-routes.test.js

@@ -0,0 +1,40 @@
+import { generateURL } from "./generate-routes.js";
+import * as prettier from "prettier";
+import { getPrettierConfig } from "./utils/prettier.js";
+describe("generate routes", () => {
+  it("handles a url with params", async () => {
+    assert.strictEqual(
+      prettier.format(
+        generateURL("EditUser", "/admin/users/:id/edit/"),
+        await getPrettierConfig()
+      ),
+      prettier.format(
+        `export const EditUserURL = (id: string) => \`/admin/users/\${id}/edit/\`;
+EditUserURL.params = ["id"];
+EditUserURL.rawURL = "/admin/users/:id/edit/";`,
+        await getPrettierConfig()
+      )
+    );
+  });
+  it("handles polish characters in the url", () => {
+    assert.strictEqual(
+      generateURL("Users", "/admin/u\u017Cytkownicy/"),
+      `export const UsersURL = "/admin/u%C5%BCytkownicy/";`
+    );
+  });
+  it("handles a url with params and diacritics", async () => {
+    assert.strictEqual(
+      prettier.format(
+        generateURL("EditUser", "/admin/u\u017Cytkownicy/:id/edit/"),
+        await getPrettierConfig()
+      ),
+      prettier.format(
+        `export const EditUserURL = (id: string) => \`/admin/u%C5%BCytkownicy/\${id}/edit/\`;
+EditUserURL.params = ["id"];
+EditUserURL.rawURL = "/admin/u%C5%BCytkownicy/:id/edit/";`,
+        await getPrettierConfig()
+      )
+    );
+  });
+});
+//# sourceMappingURL=generate-routes.test.js.map

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

@@ -28,12 +28,15 @@ class MountableWithFields extends Mountable {
     );
   }
   // this one is meant to be overwritten
-  async validateValues(ctx, data) {
+  async validateValues(_ctx, _data) {
     return {
       valid: true,
       error: ""
     };
   }
+  async getInitialValues(_ctx) {
+    return {};
+  }
   async validate(ctx, values) {
     const field_errors = {};
     let valid = true;

package/package.json

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

package/src/forms/controls/checkboxed-list-input.test.ts

@@ -8,7 +8,6 @@ import { CheckboxedListField } from "../fields/checkboxed-list.js";
 import { Form } from "../form.js";
 import { CheckboxedListInput } from "./checkboxed-list-input.js";
 import { getBrowser } from "../../utils/browser-creator.js";
-import { sleep } from "../../utils/sleep.js";
 
 describe.only("checkboxed-list", () => {
 	describe("basic tests", async () => {

package/src/forms/form.test.ts

@@ -7,9 +7,11 @@ import { Controls, Fields, Form, Mountable } from "../index.js";
 import { mount } from "../mount.js";
 import { locator_is_visible } from "../test_utils/locator_is_visible.js";
 import { getBrowser } from "../utils/browser-creator.js";
-import { assertThrowsAsync } from "../utils/utils.js";
+import { assertThrowsAsync, sleep } from "../utils/utils.js";
 import { FormDataValue } from "./form-types.js";
 import getPort from "get-port";
+import { SimpleFormField } from "./fields/simple-form-field.js";
+import { expect as PlaywritghtExpect } from "@playwright/test";
 
 const fields = {
 	text: new Fields.SimpleFormField(true),
@@ -355,4 +357,47 @@ describe("form test", () => {
 			});
 		});
 	});
+
+	describe("getInitialValues tests", async () => {
+		let server: ReturnType<Koa["listen"]>;
+
+		afterEach(async () => {
+			server.close();
+		});
+
+		it("fills the form with values from getInitialValues", async () => {
+			const app = new Koa();
+			const router = new Router();
+
+			const fields = {
+				title: new SimpleFormField(true),
+			};
+
+			mount(
+				router,
+				"/",
+				new (class extends Form<typeof fields, null> {
+					fields = fields;
+					controls = [new Controls.SimpleInput(fields.title)];
+
+					async getInitialValues() {
+						return { title: "Hello" };
+					}
+
+					onSubmit() {
+						return null;
+					}
+				})(),
+				true
+			);
+
+			app.use(router.routes()).use(router.allowedMethods());
+			server = app.listen(port);
+			const response = await page.goto(`http://localhost:${port}`);
+			if (response?.status() != 200) {
+				throw new Error(`Should return 200 status and it returns ${response?.status()}`);
+			}
+			await PlaywritghtExpect(page.getByLabel("title")).toHaveValue("Hello");
+		});
+	});
 });

package/src/forms/form.ts

@@ -269,6 +269,8 @@ export abstract class Form<
 	async extractRawValues(
 		ctx: Context
 	): Promise<Record<string, FormDataValue>> {
-		return ctx.$body;
+		return Object.keys(ctx.$body).length
+			? ctx.$body
+			: this.getInitialValues(ctx);
 	}
 }

package/src/generate-routes.test.ts

@@ -0,0 +1,42 @@
+import { generateURL } from "./generate-routes.js";
+import * as prettier from "prettier";
+import { getPrettierConfig } from "./utils/prettier.js";
+
+describe("generate routes", () => {
+	it("handles a url with params", async () => {
+		assert.strictEqual(
+			prettier.format(
+				generateURL("EditUser", "/admin/users/:id/edit/"),
+				await getPrettierConfig()
+			),
+			prettier.format(
+				`export const EditUserURL = (id: string) => \`/admin/users/\${id}/edit/\`;
+EditUserURL.params = ["id"];
+EditUserURL.rawURL = "/admin/users/:id/edit/";`,
+				await getPrettierConfig()
+			)
+		);
+	});
+
+	it("handles polish characters in the url", () => {
+		assert.strictEqual(
+			generateURL("Users", "/admin/użytkownicy/"),
+			`export const UsersURL = "/admin/u%C5%BCytkownicy/";`
+		);
+	});
+
+	it("handles a url with params and diacritics", async () => {
+		assert.strictEqual(
+			prettier.format(
+				generateURL("EditUser", "/admin/użytkownicy/:id/edit/"),
+				await getPrettierConfig()
+			),
+			prettier.format(
+				`export const EditUserURL = (id: string) => \`/admin/u%C5%BCytkownicy/\${id}/edit/\`;
+EditUserURL.params = ["id"];
+EditUserURL.rawURL = "/admin/u%C5%BCytkownicy/:id/edit/";`,
+				await getPrettierConfig()
+			)
+		);
+	});
+});

package/src/generate-routes.ts

@@ -24,7 +24,7 @@ async function extractActionName(full_file_path: string): Promise<string> {
 	);
 }
 
-function generateURL(actionName: string, url: string) {
+export function generateURL(actionName: string, url: string) {
 	const parts = url.split("/");
 	const params = parts
 		.filter((part) => part.startsWith(":"))
@@ -44,7 +44,7 @@ function generateURL(actionName: string, url: string) {
         ${actionName}URL.params = [${params
 		.map((param) => `"${param}"`)
 		.join(",")}];
-        ${actionName}URL.rawURL = "${url}";`;
+        ${actionName}URL.rawURL = "${encodeURI(url)}";`;
 }
 
 export async function generateRoutes(): Promise<void> {

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

@@ -55,8 +55,8 @@ export abstract class MountableWithFields<
 
 	// this one is meant to be overwritten
 	async validateValues(
-		ctx: Context,
-		data: Record<string, FormDataValue>
+		_ctx: Context,
+		_data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
 		return {
 			valid: true,
@@ -64,6 +64,12 @@ export abstract class MountableWithFields<
 		};
 	}
 
+	async getInitialValues(
+		_ctx: Context
+	): Promise<Record<string, FormDataValue>> {
+		return {};
+	}
+
 	async validate(
 		ctx: Context,
 		values: Record<string, FormDataValue>