@sealcode/sealgen 0.19.22 → 0.19.24

package/@types/page/stateful-page.d.ts

@@ -30,6 +30,7 @@ export type StatefulPageActionArgument<State extends Record<string, unknown>, Ar
 export type StatefulPageAction<State extends Record<string, 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 declare abstract class StatefulPage<State extends Record<string, unknown>, Actions extends Record<string, StatefulPageAction<State>>> extends Mountable {
+    form_id?: string | undefined;
     abstract actions: Actions;
     abstract getInitialState(ctx: Context): State | Promise<State>;
     abstract render(ctx: Context, state: State, inputs: Record<string, string>): Templatable | Promise<Templatable>;
@@ -37,7 +38,7 @@ export declare abstract class StatefulPage<State extends Record<string, unknown>
         canAccess: boolean;
         message: string;
     }>;
-    constructor();
+    constructor(form_id?: string | undefined);
     abstract wrapInLayout(ctx: Context, content: Templatable, state: State): Templatable;
     wrapInForm(context: Context, state: State, content: Templatable): Promise<Templatable>;
     extractActionAndLabel<ActionName extends keyof Actions>(action_description: StatefulPageActionDescription<ActionName>): {

package/@types/templates/long-running-process.d.ts

@@ -1 +1 @@
-export declare function LongRunningProcessTemplate(action_name: string, newfilefullpath: string): Promise<string>;
+export declare function LongRunningProcessTemplate(action_name: string): Promise<string>;

package/@types/templates/multiform.d.ts

@@ -1 +1 @@
-export declare function multiformTemplate(action_name: string, newfilefullpath: string): Promise<string>;
+export declare function multiformTemplate(action_name: string): Promise<string>;

package/@types/templates/route-test.d.ts

@@ -1 +1 @@
-export declare function testTemplate(action_name: string, new_file_fullpath: string): Promise<string>;
+export declare function testTemplate(action_name: string): Promise<string>;

package/@types/templates/shared/item-delete.d.ts

@@ -1 +1 @@
-export declare function itemDeleteTemplate(delete_action_name: string, collection_name: string, list_action_name: string, importPath: (path: string) => string): Promise<string>;
+export declare function itemDeleteTemplate(delete_action_name: string, collection_name: string, list_action_name: string): Promise<string>;

package/@types/templates/stateful-page.d.ts

@@ -1 +1 @@
-export declare function statefulPageTemplate(action_name: string, newfilefullpath: string): Promise<string>;
+export declare function statefulPageTemplate(action_name: string): Promise<string>;

package/lib/add-crud.js

@@ -5,7 +5,6 @@ import { toKebabCase, toPascalCase } from "js-convert-case";
 import { listCollections } from "./utils/list-collections.js";
 import { collectionListTemplate } from "./templates/shared/collection-list.js";
 import { writeFile } from "./utils/write-file.js";
-import { curryImportPath, importPath } from "./utils/import-path.js";
 import { sharedCrudFormFields } from "./templates/shared/shared-crud-form-fields.js";
 import { generateRoutes } from "./generate-routes.js";
 import { createItemFormTemplate } from "./templates/shared/collection-create-form.js";
@@ -48,10 +47,7 @@ async function addCRUD(params, app_directory = process.cwd()) {
     list_action_name,
     list_path,
     {
-      post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_action_name}URL } from "${importPath(
-        list_path,
-        "src/back/routes/urls.ts"
-      )}";`,
+      post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_action_name}URL } from "src/back/routes/urls.js";`,
       post_header_html: `<a href={${create_action_name}URL}> Create </a>`,
       render_item: (collection_name2) => `	async renderItem(ctx: Context, item: CollectionItem<typeof ${toPascalCase(
         collection_name2
@@ -100,12 +96,10 @@ async function addCRUD(params, app_directory = process.cwd()) {
   const delete_path = target_locreq.resolve(
     `src/back/routes/${escape_url_params(url)}/[id]/delete.page.tsx`
   );
-  const base_import_path = curryImportPath(delete_path);
   const delete_content = await itemDeleteTemplate(
     delete_action_name,
     collection_name,
-    list_action_name,
-    base_import_path
+    list_action_name
   );
   await writeFile(delete_path, delete_content);
   await generateRoutes();

package/lib/add-crud.test.js

@@ -10,7 +10,7 @@ describe("add crud test", () => {
   after(async () => {
     await page.close();
   });
-  it("Generate simple sealious crud", async function() {
+  it.only("Generate simple sealious crud", async function() {
     const test_app = await RealAppTest.init();
     const path = "/sample";
     await test_app.runSealgenCommand(`add-collection --collection_name=sealcode-test`);

package/lib/page/stateful-page.js

@@ -79,13 +79,13 @@ class StatefulPage extends Mountable {
     );
   }
   makeActionCallback(action_description, ...args) {
-    return `(()=>{const form = this.closest('form'); form.action='${this.makeActionURL(
+    return `(()=>{const form = this.form; form.action='${this.makeActionURL(
       action_description,
       ...args
     )}'; form.requestSubmit()})()`;
   }
   rerender() {
-    return "this.closest('form').requestSubmit()";
+    return "this.form.requestSubmit()";
   }
   async preprocessState(values) {
     return values;
@@ -187,9 +187,6 @@ class StatefulPage extends Mountable {
           ),
           page: this
         });
-        console.debug("stateful-page.ts:320");
-        console.log("NEW STATUS!!! AFTER ACTION");
-        console.dir(new_state, { depth: 7 });
         ctx.body = this.render(ctx, new_state, inputs);
       } else {
         ctx.body = this.render(ctx, state, inputs);

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

@@ -1,12 +1,10 @@
 import { toSentenceCase } from "js-convert-case";
-import { curryImportPath } from "../utils/import-path.js";
-async function LongRunningProcessTemplate(action_name, newfilefullpath) {
-  const rel = curryImportPath(newfilefullpath);
+async function LongRunningProcessTemplate(action_name) {
   return `import { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 import { LongRunningProcess } from "sealious";
 
 export const actionName = "${action_name}";

package/lib/templates/multiform.js

@@ -1,8 +1,6 @@
-import { curryImportPath } from "../utils/utils.js";
-async function multiformTemplate(action_name, newfilefullpath) {
-  const rel = curryImportPath(newfilefullpath);
+async function multiformTemplate(action_name) {
   return `import { Context } from "koa";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 import { Controls, Fields, Form, FormMessage, Multiform } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
 import { FlatTemplatable } from "tempstream";

package/lib/templates/route-test.js

@@ -1,12 +1,8 @@
-import { curryImportPath } from "../utils/import-path.js";
 import { formatWithPrettier } from "../utils/prettier.js";
-async function testTemplate(action_name, new_file_fullpath) {
-  const rel = curryImportPath(new_file_fullpath);
-  const content = `import { withProdApp } from "${rel(
-    "src/back/test_utils/with-prod-app.js"
-  )}";
-import { ${action_name}URL } from "${rel("src/back/routes/urls.js")}";
-import { getBrowser } from "${rel("src/back/test_utils/browser-creator.js")}";
+async function testTemplate(action_name) {
+  const content = `import { withProdApp } from ""src/back/test_utils/with-prod-app.js";
+	import { ${action_name}URL } from "src/back/routes/urls.js";
+	import { getBrowser } from "src/back/test_utils/browser-creator.js";
 import type { Browser, BrowserContext, Page } from "@playwright/test";
 
 describe("${action_name}", () => {

package/lib/templates/shared/item-delete.js

@@ -1,18 +1,14 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formatWithPrettier } from "../../utils/prettier.js";
-function itemDeleteTemplate(delete_action_name, collection_name, list_action_name, importPath) {
+function itemDeleteTemplate(delete_action_name, collection_name, list_action_name) {
   const result = `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
 import type Router from "@koa/router";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
 
-import { ${toPascalCase(collection_name)} } from "${importPath(
-    "src/back/collections/collections.js"
-  )}";
+import { ${toPascalCase(collection_name)} } from "src/back/collections/collections.js";
 
-import { ${list_action_name}URL } from "${importPath(
-    "src/back/routes/urls.js"
-  )}";
+import { ${list_action_name}URL } from "src/back/routes/urls.js";
 
 export const actionName = "${delete_action_name}";
 export const breadcrumbLabel: BreadcrumbLabel = "${delete_action_name}";

package/lib/templates/stateful-page.js

@@ -1,12 +1,10 @@
-import { curryImportPath } from "../utils/import-path.js";
 import { formatWithPrettier } from "../utils/prettier.js";
-async function statefulPageTemplate(action_name, newfilefullpath) {
-  const rel = curryImportPath(newfilefullpath);
+async function statefulPageTemplate(action_name) {
   return formatWithPrettier(`import { TempstreamJSX, Templatable } from "tempstream";
 import { Context } from "koa";
 import { StatefulPage, StatefulPageActionArgument } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 
 export const actionName = "${action_name}";
 export const breadcrumbLabel: BreadcrumbLabel = "${action_name}";

package/package.json

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

package/src/add-crud.ts

@@ -5,7 +5,6 @@ import { toKebabCase, toPascalCase } from "js-convert-case";
 import { listCollections } from "./utils/list-collections.js";
 import { collectionListTemplate } from "./templates/shared/collection-list.js";
 import { writeFile } from "./utils/write-file.js";
-import { curryImportPath, importPath } from "./utils/import-path.js";
 import { sharedCrudFormFields } from "./templates/shared/shared-crud-form-fields.js";
 import { generateRoutes } from "./generate-routes.js";
 import { createItemFormTemplate } from "./templates/shared/collection-create-form.js";
@@ -57,10 +56,7 @@ export async function addCRUD(
 		list_action_name,
 		list_path,
 		{
-			post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_action_name}URL } from "${importPath(
-				list_path,
-				"src/back/routes/urls.ts"
-			)}";`,
+			post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_action_name}URL } from "src/back/routes/urls.js";`,
 			post_header_html: `<a href={${create_action_name}URL}> Create </a>`,
 			render_item: (
 				collection_name: string
@@ -119,12 +115,10 @@ export async function addCRUD(
 	const delete_path = target_locreq.resolve(
 		`src/back/routes/${escape_url_params(url)}/[id]/delete.page.tsx`
 	);
-	const base_import_path = curryImportPath(delete_path);
 	const delete_content = await itemDeleteTemplate(
 		delete_action_name,
 		collection_name,
-		list_action_name,
-		base_import_path
+		list_action_name
 	);
 	await writeFile(delete_path, delete_content);
 

package/src/page/stateful-page.ts

@@ -173,14 +173,14 @@ export abstract class StatefulPage<
 			| ActionName,
 		...args: ExtractStatefulPageActionArgs<Actions[ActionName]>
 	) {
-		return `(()=>{const form = this.closest('form'); form.action='${this.makeActionURL(
+		return `(()=>{const form = this.form; form.action='${this.makeActionURL(
 			action_description,
 			...args
 		)}'; form.requestSubmit()})()`;
 	}
 
 	rerender() {
-		return "this.closest('form').requestSubmit()";
+		return "this.form.requestSubmit()";
 	}
 
 	async preprocessState(values: State): Promise<State> {

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

@@ -1,16 +1,13 @@
 import { toSentenceCase } from "js-convert-case";
-import { curryImportPath } from "../utils/import-path.js";
 
 export async function LongRunningProcessTemplate(
-	action_name: string,
-	newfilefullpath: string
+	action_name: string
 ): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
 	return `import { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 import { LongRunningProcess } from "sealious";
 
 export const actionName = "${action_name}";

package/src/templates/multiform.ts

@@ -1,12 +1,6 @@
-import { curryImportPath } from "../utils/utils.js";
-
-export async function multiformTemplate(
-	action_name: string,
-	newfilefullpath: string
-): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
+export async function multiformTemplate(action_name: string): Promise<string> {
 	return `import { Context } from "koa";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 import { Controls, Fields, Form, FormMessage, Multiform } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
 import { FlatTemplatable } from "tempstream";

package/src/templates/route-test.ts

@@ -1,16 +1,9 @@
-import { curryImportPath } from "../utils/import-path.js";
 import { formatWithPrettier } from "../utils/prettier.js";
 
-export async function testTemplate(
-	action_name: string,
-	new_file_fullpath: string
-) {
-	const rel = curryImportPath(new_file_fullpath);
-	const content = `import { withProdApp } from "${rel(
-		"src/back/test_utils/with-prod-app.js"
-	)}";
-import { ${action_name}URL } from "${rel("src/back/routes/urls.js")}";
-import { getBrowser } from "${rel("src/back/test_utils/browser-creator.js")}";
+export async function testTemplate(action_name: string) {
+	const content = `import { withProdApp } from ""src/back/test_utils/with-prod-app.js";
+	import { ${action_name}URL } from "src/back/routes/urls.js";
+	import { getBrowser } from "src/back/test_utils/browser-creator.js";
 import type { Browser, BrowserContext, Page } from "@playwright/test";
 
 describe("${action_name}", () => {

package/src/templates/shared/item-delete.ts

@@ -4,21 +4,16 @@ import { formatWithPrettier } from "../../utils/prettier.js";
 export function itemDeleteTemplate(
 	delete_action_name: string,
 	collection_name: string,
-	list_action_name: string,
-	importPath: (path: string) => string
+	list_action_name: string
 ): Promise<string> {
 	const result = `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
 import type Router from "@koa/router";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
 
-import { ${toPascalCase(collection_name)} } from "${importPath(
-		"src/back/collections/collections.js"
-	)}";
+import { ${toPascalCase(collection_name)} } from "src/back/collections/collections.js";
 
-import { ${list_action_name}URL } from "${importPath(
-		"src/back/routes/urls.js"
-	)}";
+import { ${list_action_name}URL } from "src/back/routes/urls.js";
 
 export const actionName = "${delete_action_name}";
 export const breadcrumbLabel: BreadcrumbLabel = "${delete_action_name}";

package/src/templates/stateful-page.ts

@@ -1,16 +1,13 @@
-import { curryImportPath } from "../utils/import-path.js";
 import { formatWithPrettier } from "../utils/prettier.js";
 
 export async function statefulPageTemplate(
-	action_name: string,
-	newfilefullpath: string
+	action_name: string
 ): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
 	return formatWithPrettier(`import { TempstreamJSX, Templatable } from "tempstream";
 import { Context } from "koa";
 import { StatefulPage, StatefulPageActionArgument } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 
 export const actionName = "${action_name}";
 export const breadcrumbLabel: BreadcrumbLabel = "${action_name}";