@sealcode/sealgen 0.17.18 → 0.17.20

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

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

package/lib/add-verbose-crud.js

@@ -5,12 +5,11 @@ 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 { importPath } from "./utils/import-path.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";
 import { editItemFormTemplate } from "./templates/shared/collection-edit-form.js";
-import { askItemDeleteTemplate } from "./templates/shared/confirm-item-delete.js";
 import { itemDeleteTemplate } from "./templates/shared/item-delete.js";
 async function addVerboseCRUD(params, app_directory = process.cwd()) {
   const target_locreq = _locreq(app_directory);
@@ -40,7 +39,6 @@ async function addVerboseCRUD(params, app_directory = process.cwd()) {
   const list_action_name = toPascalCase(collection_name) + "CRUDList";
   const create_action_name = toPascalCase(collection_name) + "CRUDCreate";
   const edit_action_name = toPascalCase(collection_name) + "CRUDEdit";
-  const delete_ask_action_name = toPascalCase(collection_name) + "CRUDDeleteAsk";
   const delete_action_name = toPascalCase(collection_name) + "CRUDDelete";
   const list_path = target_locreq.resolve(
     `src/back/routes/${escape_url_params(url)}/index.list.tsx`
@@ -50,7 +48,7 @@ async function addVerboseCRUD(params, app_directory = process.cwd()) {
     list_action_name,
     list_path,
     {
-      post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_ask_action_name}URL } from "${importPath(
+      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"
       )}";`,
@@ -66,7 +64,7 @@ async function addVerboseCRUD(params, app_directory = process.cwd()) {
 						   })}
                            <td><div class="sealious-list__actions">
                                <a href={${edit_action_name}URL(item.id)}>Edit</a>
-                               <a href={${delete_ask_action_name}URL(item.id)}>Delete</a>
+                               <a data-turbo-method="POST" data-turbo-confirm="Delete item?" href={${delete_action_name}URL(item.id)}>Delete</a>
                                </div>
                            </td>
 					   </tr>;
@@ -102,25 +100,15 @@ async function addVerboseCRUD(params, app_directory = process.cwd()) {
     list_action_name
   );
   await writeFile(edit_path, edit_content);
-  const delete_ask_path = target_locreq.resolve(
-    `src/back/routes/${escape_url_params(url)}/[id]/delete-ask.page.tsx`
-  );
-  const delete_ask_content = await askItemDeleteTemplate(
-    delete_ask_action_name,
-    collection_name,
-    delete_ask_path,
-    list_action_name,
-    delete_action_name
-  );
-  await writeFile(delete_ask_path, delete_ask_content);
   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,
-    delete_ask_path,
-    list_action_name
+    list_action_name,
+    base_import_path
   );
   await writeFile(delete_path, delete_content);
   await generateRoutes();

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

@@ -67,15 +67,17 @@ async function createItemFormTemplate(create_action_name, newfilefullpath, colle
 	}
 `,
     render: `	async render(ctx: Context, data: FormData, show_field_errors: boolean) {
-		return html(
+		return html({
 			ctx,
-			"Create ${toKebabCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="sealgen-crud-form">
+		title: "Create ${toKebabCase(collection_name)}",
+		body: tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>\u2190 Back to ${collection_name} list</a
 				>
 				\${await super.render(ctx, data, show_field_errors)}
-			</div>\`
+				</div>\`,
+				description: ""
+				}
 		);
 	}`
   });

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

@@ -143,15 +143,16 @@ async function editItemFormTemplate(edit_action_name, newfilefullpath, collectio
 		   }
 	   `,
     render: `	async render(ctx: Context, data: FormData, show_field_errors: boolean) {
-		return html(
+		return html({
 			ctx,
-			"Edit ${toPascalCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="sealgen-crud-form">
+		title: "Edit ${toPascalCase(collection_name)}",
+		body: tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>\u2190 Back to ${collection_name} list</a
 				>
 				\${await super.render(ctx, data, show_field_errors)}
-			</div>\`
+				</div>\`,
+				description: ""}
 		);
 	}`
   });

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

@@ -1,8 +1,6 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
-import { curryImportPath } from "../../utils/import-path.js";
 import { formatWithPrettier } from "../../utils/prettier.js";
-function itemDeleteTemplate(delete_action_name, collection_name, newfilefullpath, list_action_name) {
-  const importPath = curryImportPath(newfilefullpath);
+function itemDeleteTemplate(delete_action_name, collection_name, list_action_name, importPath) {
   const result = `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
 import type Router from "@koa/router";
@@ -25,7 +23,7 @@ export default new (class ${delete_action_name}Redirect extends Mountable {
 	};
 
 	mount(router: Router, path: string) {
-		router.get(path, async (ctx) => {
+		router.post(path, async (ctx) => {
             await ctx.$app.collections["${toKebabCase(
     collection_name
   )}"].removeByID(ctx.$context, ctx.params.id!);

package/package.json

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

package/src/add-verbose-crud.ts

@@ -5,12 +5,11 @@ 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 { importPath } from "./utils/import-path.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";
 import { editItemFormTemplate } from "./templates/shared/collection-edit-form.js";
-import { askItemDeleteTemplate } from "./templates/shared/confirm-item-delete.js";
 import { itemDeleteTemplate } from "./templates/shared/item-delete.js";
 
 export async function addVerboseCRUD(
@@ -50,8 +49,6 @@ export async function addVerboseCRUD(
 	const list_action_name = toPascalCase(collection_name) + "CRUDList";
 	const create_action_name = toPascalCase(collection_name) + "CRUDCreate";
 	const edit_action_name = toPascalCase(collection_name) + "CRUDEdit";
-	const delete_ask_action_name =
-		toPascalCase(collection_name) + "CRUDDeleteAsk";
 	const delete_action_name = toPascalCase(collection_name) + "CRUDDelete";
 
 	/* create the list endpoint */
@@ -63,7 +60,7 @@ export async function addVerboseCRUD(
 		list_action_name,
 		list_path,
 		{
-			post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_ask_action_name}URL } from "${importPath(
+			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"
 			)}";`,
@@ -81,7 +78,7 @@ export async function addVerboseCRUD(
 						   })}
                            <td><div class="sealious-list__actions">
                                <a href={${edit_action_name}URL(item.id)}>Edit</a>
-                               <a href={${delete_ask_action_name}URL(item.id)}>Delete</a>
+                               <a data-turbo-method="POST" data-turbo-confirm="Delete item?" href={${delete_action_name}URL(item.id)}>Delete</a>
                                </div>
                            </td>
 					   </tr>;
@@ -124,28 +121,16 @@ export async function addVerboseCRUD(
 	);
 	await writeFile(edit_path, edit_content);
 
-	/* create the confirm delete endpoint */
-	const delete_ask_path = target_locreq.resolve(
-		`src/back/routes/${escape_url_params(url)}/[id]/delete-ask.page.tsx`
-	);
-	const delete_ask_content = await askItemDeleteTemplate(
-		delete_ask_action_name,
-		collection_name,
-		delete_ask_path,
-		list_action_name,
-		delete_action_name
-	);
-	await writeFile(delete_ask_path, delete_ask_content);
-
 	/* create the actual delete endpoint */
 	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,
-		delete_ask_path,
-		list_action_name
+		list_action_name,
+		base_import_path
 	);
 	await writeFile(delete_path, delete_content);
 

package/src/templates/shared/collection-create-form.ts

@@ -106,15 +106,17 @@ export async function createItemFormTemplate(
 	}
 `,
 		render: `	async render(ctx: Context, data: FormData, show_field_errors: boolean) {
-		return html(
+		return html({
 			ctx,
-			"Create ${toKebabCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="sealgen-crud-form">
+		title: "Create ${toKebabCase(collection_name)}",
+		body: tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>← Back to ${collection_name} list</a
 				>
 				\${await super.render(ctx, data, show_field_errors)}
-			</div>\`
+				</div>\`,
+				description: ""
+				}
 		);
 	}`,
 	});

package/src/templates/shared/collection-edit-form.ts

@@ -186,15 +186,16 @@ export async function editItemFormTemplate(
 	   `,
 
 		render: `	async render(ctx: Context, data: FormData, show_field_errors: boolean) {
-		return html(
+		return html({
 			ctx,
-			"Edit ${toPascalCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="sealgen-crud-form">
+		title: "Edit ${toPascalCase(collection_name)}",
+		body: tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>← Back to ${collection_name} list</a
 				>
 				\${await super.render(ctx, data, show_field_errors)}
-			</div>\`
+				</div>\`,
+				description: ""}
 		);
 	}`,
 	});

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

@@ -5,10 +5,9 @@ import { formatWithPrettier } from "../../utils/prettier.js";
 export function itemDeleteTemplate(
 	delete_action_name: string,
 	collection_name: string,
-	newfilefullpath: string,
-	list_action_name: string
+	list_action_name: string,
+	importPath: (path: string) => string
 ): Promise<string> {
-	const importPath = curryImportPath(newfilefullpath);
 	const result = `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
 import type Router from "@koa/router";
@@ -31,7 +30,7 @@ export default new (class ${delete_action_name}Redirect extends Mountable {
 	};
 
 	mount(router: Router, path: string) {
-		router.get(path, async (ctx) => {
+		router.post(path, async (ctx) => {
             await ctx.$app.collections["${toKebabCase(
 				collection_name
 			)}"].removeByID(ctx.$context, ctx.params.id!);

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

@@ -1,74 +0,0 @@
-import { toKebabCase, toPascalCase } from "js-convert-case";
-import { curryImportPath } from "../../utils/import-path.js";
-import { formatWithPrettier } from "../../utils/prettier.js";
-async function askItemDeleteTemplate(ask_delete_action_name, collection_name, newfilefullpath, list_action_name, delete_action_name) {
-  const importPath = curryImportPath(newfilefullpath);
-  const result = `import type { Context } from "koa";
-import { Page } from "@sealcode/sealgen";
-import type { CollectionItem } from "sealious";
-import { TempstreamJSX } from "tempstream";
-import { ${delete_action_name}URL } from "${importPath(
-    "src/back/routes/urls.js"
-  )}";
-import html from "${importPath("src/back/html.ts")}";
-import { ${toPascalCase(collection_name)} as ${toPascalCase(
-    collection_name
-  )}Collection } from "${importPath("src/back/collections/collections.js")}";
-
-export const actionName = "${ask_delete_action_name}";
-
-export default new (class ${ask_delete_action_name}Page extends Page {
-	canAccess = async (ctx: Context) => {
-        const policy = ${toPascalCase(
-    collection_name
-  )}Collection.getPolicy("edit");
-		const response = await policy.check(ctx.$context);
-		 return { canAccess: response?.allowed || false, message: response?.reason || "" };
-	};
-
-    getItemTitle(_ctx: Context, item: CollectionItem<typeof ${toPascalCase(
-    collection_name
-  )}Collection>){
-      return item.get("name")
-    }
-
-	async render(ctx: Context) {
-		const id = ctx.params.id
-        if(!id){throw new Error("Could not read the id param from the URL")}
-		const { items: [item] }  = 
-			await ctx.$app.collections["${toKebabCase(
-    collection_name
-  )}"].list(ctx.$context).ids([id]).fetch();
-
-		if (!item) {
-			throw new Error("Item with given id not found");
-		}
-		return html(
-			ctx,
-			"Delete?",
-			<div>
-				<div class="confirm-delete-page confirm-delete-page--${toKebabCase(
-    collection_name
-  )}">
-					<span>
-						Are you sure you want to remove: {" "}
-						<b>{this.getItemTitle(ctx, item)}</b>
-					</span>
-					<form action={${delete_action_name}URL(item.id)}>
-						<button type="submit">
-							remove
-						</button>
-						<input type="hidden" name="id" value={item?.id} />
-					</form>
-				</div>
-			</div>
-		);
-	}
-})();
-`;
-  return await formatWithPrettier(result);
-}
-export {
-  askItemDeleteTemplate
-};
-//# sourceMappingURL=confirm-item-delete.js.map

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

@@ -1,78 +0,0 @@
-import { toKebabCase, toPascalCase } from "js-convert-case";
-import { curryImportPath } from "../../utils/import-path.js";
-import { formatWithPrettier } from "../../utils/prettier.js";
-
-export async function askItemDeleteTemplate(
-	ask_delete_action_name: string,
-	collection_name: string,
-	newfilefullpath: string,
-	list_action_name: string,
-	delete_action_name: string
-): Promise<string> {
-	const importPath = curryImportPath(newfilefullpath);
-	const result = `import type { Context } from "koa";
-import { Page } from "@sealcode/sealgen";
-import type { CollectionItem } from "sealious";
-import { TempstreamJSX } from "tempstream";
-import { ${delete_action_name}URL } from "${importPath(
-		"src/back/routes/urls.js"
-	)}";
-import html from "${importPath("src/back/html.ts")}";
-import { ${toPascalCase(collection_name)} as ${toPascalCase(
-		collection_name
-	)}Collection } from "${importPath("src/back/collections/collections.js")}";
-
-export const actionName = "${ask_delete_action_name}";
-
-export default new (class ${ask_delete_action_name}Page extends Page {
-	canAccess = async (ctx: Context) => {
-        const policy = ${toPascalCase(
-			collection_name
-		)}Collection.getPolicy("edit");
-		const response = await policy.check(ctx.$context);
-		 return { canAccess: response?.allowed || false, message: response?.reason || "" };
-	};
-
-    getItemTitle(_ctx: Context, item: CollectionItem<typeof ${toPascalCase(
-		collection_name
-	)}Collection>){
-      return item.get("name")
-    }
-
-	async render(ctx: Context) {
-		const id = ctx.params.id
-        if(!id){throw new Error("Could not read the id param from the URL")}
-		const { items: [item] }  = 
-			await ctx.$app.collections["${toKebabCase(
-				collection_name
-			)}"].list(ctx.$context).ids([id]).fetch();
-
-		if (!item) {
-			throw new Error("Item with given id not found");
-		}
-		return html(
-			ctx,
-			"Delete?",
-			<div>
-				<div class="confirm-delete-page confirm-delete-page--${toKebabCase(
-					collection_name
-				)}">
-					<span>
-						Are you sure you want to remove: {" "}
-						<b>{this.getItemTitle(ctx, item)}</b>
-					</span>
-					<form action={${delete_action_name}URL(item.id)}>
-						<button type="submit">
-							remove
-						</button>
-						<input type="hidden" name="id" value={item?.id} />
-					</form>
-				</div>
-			</div>
-		);
-	}
-})();
-`;
-
-	return await formatWithPrettier(result);
-}