@sealcode/sealgen 0.17.4 → 0.17.6

package/@types/src/templates/shared/collection-list.d.ts

@@ -12,5 +12,5 @@ declare const default_hooks: {
     post_import_js: string;
     render_item: (collection_name: string) => string;
 };
-export declare function collectionListTemplate(collection_name: string, action_name: string, newfilefullpath: string, _hooks?: Partial<typeof default_hooks>): Promise<string>;
+export declare function collectionListTemplate(collection_name: string, action_name: string, _: string, _hooks?: Partial<typeof default_hooks>): Promise<string>;
 export {};

package/lib/add-route.js

@@ -47,11 +47,12 @@ async function addRoute(params, app_directory = process.cwd()) {
   ]);
   const { action, url, mode } = response;
   const extension = ["list", "lpr", "page", "sreact"].includes(mode) ? "tsx" : "ts";
+  const base_file_name = escape_url_params(url) || "index";
   const file_path = target_locreq.resolve(
-    `src/back/routes/${escape_url_params(url)}.${mode}.${extension}`
+    `src/back/routes/${base_file_name}.${mode}.${extension}`
   );
   const test_file_path = target_locreq.resolve(
-    `src/back/routes/${escape_url_params(url)}.test.ts`
+    `src/back/routes/${base_file_name}.test.ts`
   );
   const template = Templates[mode];
   if (!template) {

package/lib/forms/controls/file.test.js

@@ -60,18 +60,10 @@ describe("file-control", () => {
       browser = await getBrowser();
       const context = await browser.newContext();
       page = await context.newPage();
-      let screenshot = true;
-      (async function() {
-        while (screenshot) {
-          await page.screenshot({ path: "/home/kuba/Downloads/" + Date.now() + ".png" });
-          await sleep(100);
-        }
-      })();
       await page.goto(`http://localhost:${port}`);
       await page.getByRole("button", { name: "Wy\u015Blij" }).click();
       await sleep(100);
       assert(submit_called, "Submit not called - something prevented submit on click?");
-      screenshot = false;
     });
   }).timeout(1e4);
 });

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

@@ -13,7 +13,7 @@ describe("single-reference.test", () => {
   after(async () => {
     await page.close();
   });
-  it("creates minimal sealious app and adds a simple route that works", async function() {
+  it("creates minimal sealious app and adds form using single-reference field that works", async function() {
     const test_app = await RealAppTest.init();
     await test_app.addFile(
       "src/back/collections/articles.ts",

package/lib/generate-routes.js

@@ -42,6 +42,7 @@ async function generateRoutes() {
     ).map(async (fullpath) => ({
       fullpath,
       actionName: await extractActionName(fullpath),
+      // trailing slash is important here, as it enables to use the entire path while building relative URLs. For example, while visiting /users/123, the path ./add-photo leads to /users/add-photo. While visiting /users/123/ (note the trailing slash), the path ./add-photo leads to /users/123/add-photo
       url: unescape_url_params(
         "/" + relative(
           target_locreq.resolve("src/back/routes"),
@@ -50,8 +51,7 @@ async function generateRoutes() {
             basename(fullpath).startsWith("index.") ? "../" : ""
           )
         ).replace(/\..+/, "") + "/"
-        // trailing slash is important here, as it enables to use the entire path while building relative URLs. For example, while visiting /users/123, the path ./add-photo leads to /users/add-photo. While visiting /users/123/ (note the trailing slash), the path ./add-photo leads to /users/123/add-photo
-      )
+      ).replace(/\/\//g, "/")
     }))
   );
   const routes_content = `// DO NOT EDIT! This file is generated automaticaly with npm run generate-routes

package/lib/templates/form.js

@@ -35,7 +35,7 @@ const defaults = {
 	    	return { canAccess: true, message: "" };
 	    }`,
   render: `async render(ctx: Context, data: FormData, show_field_errors: boolean) {
-		return html(ctx, "Form", await super.render(ctx, data, show_field_errors));
+		return html({ctx, title: "Form", description: "", body: await super.render(ctx, data, show_field_errors)});
 	}`,
   get_initial_values: "",
   other_methods: ""

package/lib/templates/page.js

@@ -4,7 +4,7 @@ async function pageTemplate(action_name, newfilefullpath) {
   return `import type { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 
 export const actionName = "${action_name}";
 
@@ -15,7 +15,7 @@ export default new (class ${action_name}Page extends Page {
 	}
 
 	async render(ctx: Context) {
-		return html(ctx, "${action_name}", <div></div>);
+		return html({ ctx: ctx, title: "${action_name}", body: <div></div>, description: "" });
 	}
 })();
 `;

package/lib/templates/shared/collection-list.js

@@ -1,16 +1,15 @@
 import { extractCollectionClassname } from "../../generate-collections.js";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
 import _locreq from "locreq";
-import { curryImportPath } from "../../utils/import-path.js";
 import { DefaultListFilters } from "../../page/default-list-filters.js";
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formatWithPrettier } from "../../utils/prettier.js";
 const target_locreq = _locreq(process.cwd());
-function fieldImport({ type }, importPath) {
+function fieldImport({ type }) {
   if (type == "image") {
     return `
 		import type { FilePointer } from "@sealcode/file-manager";
-		import { imageRouter } from "${importPath("src/back/image-router.js")}";
+		import { imageRouter } from ""src/back/image-router.js";
 	    `;
   }
   return "";
@@ -73,7 +72,7 @@ const default_hooks = {
 		</tr>;
     }`
 };
-async function collectionListTemplate(collection_name, action_name, newfilefullpath, _hooks = {}) {
+async function collectionListTemplate(collection_name, action_name, _, _hooks = {}) {
   const hooks = { ...default_hooks, ..._hooks };
   const [uppercase_collection, collection_fields] = await Promise.all([
     extractCollectionClassname(
@@ -83,20 +82,15 @@ async function collectionListTemplate(collection_name, action_name, newfilefullp
     ),
     extract_fields_from_collection(collection_name)
   ]);
-  const importPath = curryImportPath(newfilefullpath);
   const field_import_string = Array.from(
-    new Set(
-      collection_fields.map((field) => fieldImport(field, importPath))
-    )
+    new Set(collection_fields.map((field) => fieldImport(field)))
   ).join("\n");
   const result = `import type { Context } from "koa";
 import type { CollectionItem } from "sealious";
 import type { FlatTemplatable, Templatable } from "tempstream";
 import { TempstreamJSX, tempstream } from "tempstream";
-import { ${uppercase_collection} } from "${importPath(
-    target_locreq.resolve("src/back/collections/collections.ts")
-  )}";
-import html from "${importPath(target_locreq.resolve("src/back/html.ts"))}";
+import { ${uppercase_collection} } from "src/back/collections/collections.js";
+import html from "src/back/html.js";
 import type { ListFilterRender } from "@sealcode/sealgen";
 import {
 	SealiousItemListPage,
@@ -203,16 +197,17 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 	}
 
 	async render(ctx: Context) {
-		return html(
+		return html({
 			ctx,
-			"${action_name}",
-			<div class="sealious-list-wrapper ${toKebabCase(action_name)}--wrapper">
+			title: "${action_name}",
+            description: "",
+			body: <div class="sealious-list-wrapper ${toKebabCase(action_name)}--wrapper">
 				${hooks.pre_header_html}
 				<h2>${action_name} List</h2>
 				${hooks.post_header_html}
 				{super.render(ctx)}
 			</div>
-		);
+		});
 	}
 
 })(${uppercase_collection});

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

@@ -10,7 +10,7 @@ import { module_dirname } from "../utils/module-dirname.js";
 import EventEmitter from "events";
 const locreq = _locreq(module_dirname(import.meta.url));
 const callSealgenBin = () => `node ${locreq.resolve("lib/cli.js")}`;
-const sealious_minimal_commit = "b0d5bf5";
+const sealious_minimal_commit = "833e70c";
 class RealAppTest {
   constructor() {
     this.emitter = new EventEmitter();

package/package.json

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

package/src/add-route.ts

@@ -58,11 +58,12 @@ export async function addRoute(
 		? "tsx"
 		: "ts";
 
+	const base_file_name = escape_url_params(url) || "index";
 	const file_path = target_locreq.resolve(
-		`src/back/routes/${escape_url_params(url)}.${mode}.${extension}`
+		`src/back/routes/${base_file_name}.${mode}.${extension}`
 	);
 	const test_file_path = target_locreq.resolve(
-		`src/back/routes/${escape_url_params(url)}.test.ts`
+		`src/back/routes/${base_file_name}.test.ts`
 	);
 	const template = Templates[mode as keyof typeof Templates];
 

package/src/forms/controls/file.test.ts

@@ -69,19 +69,11 @@ describe("file-control", () => {
 			browser = await getBrowser();
 			const context = await browser.newContext();
 			page = await context.newPage();
-			let screenshot = true;
-			(async function () {
-				while (screenshot) {
-					await page.screenshot({ path: "/home/kuba/Downloads/" + Date.now() + ".png" });
-					await sleep(100);
-				}
-			})();
 			await page.goto(`http://localhost:${port}`);
 
 			await page.getByRole("button", { name: "Wyślij" }).click();
 			await sleep(100);
 			assert(submit_called, "Submit not called - something prevented submit on click?");
-			screenshot = false;
 		});
 	}).timeout(10000);
 });

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

@@ -17,7 +17,7 @@ describe("single-reference.test", () => {
 		await page.close();
 	});
 
-	it("creates minimal sealious app and adds a simple route that works", async function () {
+	it("creates minimal sealious app and adds form using single-reference field that works", async function () {
 		const test_app = await RealAppTest.init();
 
 		// add possiblity to modify templates (form and collection) and create test case

package/src/generate-routes.ts

@@ -61,6 +61,7 @@ export async function generateRoutes(): Promise<void> {
 			.map(async (fullpath) => ({
 				fullpath,
 				actionName: await extractActionName(fullpath),
+				// trailing slash is important here, as it enables to use the entire path while building relative URLs. For example, while visiting /users/123, the path ./add-photo leads to /users/add-photo. While visiting /users/123/ (note the trailing slash), the path ./add-photo leads to /users/123/add-photo
 				url: unescape_url_params(
 					"/" +
 						relative(
@@ -72,8 +73,8 @@ export async function generateRoutes(): Promise<void> {
 									: ""
 							)
 						).replace(/\..+/, "") +
-						"/" // trailing slash is important here, as it enables to use the entire path while building relative URLs. For example, while visiting /users/123, the path ./add-photo leads to /users/add-photo. While visiting /users/123/ (note the trailing slash), the path ./add-photo leads to /users/123/add-photo
-				),
+						"/"
+				).replace(/\/\//g, "/"),
 			}))
 	);
 

package/src/templates/form.ts

@@ -36,7 +36,7 @@ const defaults = {
 	    	return { canAccess: true, message: "" };
 	    }`,
 	render: `async render(ctx: Context, data: FormData, show_field_errors: boolean) {
-		return html(ctx, "Form", await super.render(ctx, data, show_field_errors));
+		return html({ctx, title: "Form", description: "", body: await super.render(ctx, data, show_field_errors)});
 	}`,
 	get_initial_values: "",
 	other_methods: "",

package/src/templates/page.ts

@@ -7,7 +7,7 @@ export async function pageTemplate(
 	return `import type { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 
 export const actionName = "${action_name}";
 
@@ -18,7 +18,7 @@ export default new (class ${action_name}Page extends Page {
 	}
 
 	async render(ctx: Context) {
-		return html(ctx, "${action_name}", <div></div>);
+		return html({ ctx: ctx, title: "${action_name}", body: <div></div>, description: "" });
 	}
 })();
 `;

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

@@ -3,20 +3,16 @@ import extract_fields_from_collection, {
 	ExtractedFieldInfo,
 } from "../../utils/extract-fields-from-collection.js";
 import _locreq from "locreq";
-import { curryImportPath } from "../../utils/import-path.js";
 import { DefaultListFilters } from "../../page/default-list-filters.js";
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formatWithPrettier } from "../../utils/prettier.js";
 const target_locreq = _locreq(process.cwd());
 
-function fieldImport(
-	{ type }: ExtractedFieldInfo,
-	importPath: (path: string) => string
-): string {
+function fieldImport({ type }: ExtractedFieldInfo): string {
 	if (type == "image") {
 		return `
 		import type { FilePointer } from "@sealcode/file-manager";
-		import { imageRouter } from "${importPath("src/back/image-router.js")}";
+		import { imageRouter } from ""src/back/image-router.js";
 	    `;
 	}
 	return "";
@@ -100,7 +96,7 @@ const default_hooks = {
 export async function collectionListTemplate(
 	collection_name: string,
 	action_name: string,
-	newfilefullpath: string,
+	_: string,
 	_hooks: Partial<typeof default_hooks> = {}
 ) {
 	const hooks = { ...default_hooks, ..._hooks };
@@ -112,22 +108,16 @@ export async function collectionListTemplate(
 		),
 		extract_fields_from_collection(collection_name),
 	]);
-	const importPath = curryImportPath(newfilefullpath);
-
 	const field_import_string = Array.from(
-		new Set(
-			collection_fields.map((field) => fieldImport(field, importPath))
-		)
+		new Set(collection_fields.map((field) => fieldImport(field)))
 	).join("\n");
 
 	const result = `import type { Context } from "koa";
 import type { CollectionItem } from "sealious";
 import type { FlatTemplatable, Templatable } from "tempstream";
 import { TempstreamJSX, tempstream } from "tempstream";
-import { ${uppercase_collection} } from "${importPath(
-		target_locreq.resolve("src/back/collections/collections.ts")
-	)}";
-import html from "${importPath(target_locreq.resolve("src/back/html.ts"))}";
+import { ${uppercase_collection} } from "src/back/collections/collections.js";
+import html from "src/back/html.js";
 import type { ListFilterRender } from "@sealcode/sealgen";
 import {
 	SealiousItemListPage,
@@ -234,16 +224,17 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 	}
 
 	async render(ctx: Context) {
-		return html(
+		return html({
 			ctx,
-			"${action_name}",
-			<div class="sealious-list-wrapper ${toKebabCase(action_name)}--wrapper">
+			title: "${action_name}",
+            description: "",
+			body: <div class="sealious-list-wrapper ${toKebabCase(action_name)}--wrapper">
 				${hooks.pre_header_html}
 				<h2>${action_name} List</h2>
 				${hooks.post_header_html}
 				{super.render(ctx)}
 			</div>
-		);
+		});
 	}
 
 })(${uppercase_collection});

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

@@ -15,7 +15,7 @@ const locreq = _locreq(module_dirname(import.meta.url));
 
 export const callSealgenBin = () => `node ${locreq.resolve("lib/cli.js")}`;
 
-const sealious_minimal_commit = "b0d5bf5";
+const sealious_minimal_commit = "833e70c";
 
 export class RealAppTest {
 	public node_pid: number;