@sealcode/sealgen 0.15.45 → 0.15.47

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

@@ -8,6 +8,7 @@ export type StatefulPageActionDescription<ActionName> = {
     action: ActionName;
     label?: string;
     content?: string;
+    disabled?: boolean;
 } | ActionName;
 export type StateAndMetadata<State, Actions> = {
     state: State;
@@ -36,6 +37,7 @@ export declare abstract class StatefulPage<State extends Record<string, unknown>
         action: string;
         label: string;
         content: string;
+        disabled: boolean;
     };
     makeActionURL<ActionName extends keyof Actions>(action_description: StatefulPageActionDescription<ActionName>, ...args: ExtractTail<ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>>): string;
     makeActionButton<ActionName extends keyof Actions>(_state: State, action_description: StatefulPageActionDescription<ActionName>, ...args: ExtractTail<ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>>): string;

package/lib/builder.js

@@ -104,6 +104,7 @@ class BackendTSBuilder extends Builder {
       sourcemap: true,
       bundle: false,
       jsxFactory: "TempstreamJSX.createElement",
+      jsxFragment: "TempstreamJSX.Fragment",
       outdir: "./dist/back",
       logLevel: "info",
       platform: "node",

package/lib/page/stateful-page.js

@@ -39,16 +39,19 @@ class StatefulPage extends Mountable {
   }
   extractActionAndLabel(action_description) {
     let label, action, content;
+    let disabled;
     if (is(action_description, predicates.object)) {
       action = action_description.action.toString();
       label = action_description.label || action;
       content = action_description.content || label;
+      disabled = action_description.disabled || false;
     } else {
       action = action_description.toString();
       label = action;
       content = label;
+      disabled = false;
     }
-    return { action, label, content };
+    return { action, label, content, disabled };
   }
   makeActionURL(action_description, ...args) {
     const { action } = this.extractActionAndLabel(action_description);
@@ -58,7 +61,7 @@ class StatefulPage extends Mountable {
     )}`;
   }
   makeActionButton(_state, action_description, ...args) {
-    const { label, content } = this.extractActionAndLabel(action_description);
+    const { label, content, disabled } = this.extractActionAndLabel(action_description);
     return (
       /* HTML */
       `
@@ -66,6 +69,7 @@ class StatefulPage extends Mountable {
 				type="submit"
 				formaction="${this.makeActionURL(action_description, ...args)}"
 				title="${label}"
+				${disabled ? "disabled" : ""}
 			>
 				${content}
 			</button>

package/lib/templates/form.js

@@ -6,10 +6,8 @@ const defaults = {
          import { Fields } from "@sealcode/sealgen";
          import type {FormDataValue} from "@sealcode/sealgen";`,
   fields: `
-           email: new Fields.CollectionField(true, Users.fields.email),
            password: new Fields.SimpleFormField(true),`,
   controls: `
-        new Controls.SimpleInput(fields.email, { label: "Email:", type: "email" }),
 		new Controls.SimpleInput(fields.password, {
 			label: "Password:",
 			type: "password",

package/lib/templates/jdd-component.js

@@ -26,12 +26,12 @@ export class ${toPascalCase(
 			content,
 		}: ExtractStructuredComponentArgumentsParsed<typeof component_arguments>,
 		classes: string[],
-		{ render_markdown }: JDDContext
+		{ language, render_markdown }: JDDContext
 	): FlatTemplatable {
 		return (
 			<div class={["${toKebabCase(component_name)}", ...classes]}>
 				<h2>{title} \u2022 ${toPascalCase(component_name)} </h2>
-				<div>{render_markdown(content)}</div>
+				<div>{render_markdown(language, content)}</div>
 			</div>
 		);
 	}

package/lib/templates/redirect.js

@@ -1,7 +1,7 @@
 async function redirectTemplate(action_name) {
-  return `import { Context } from "koa";
+  return `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
-import Router from "@koa/router";
+import type Router from "@koa/router";
 
 export const actionName = "${action_name}";
 

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

@@ -70,7 +70,7 @@ async function createItemFormTemplate(create_action_name, newfilefullpath, colle
 		return html(
 			ctx,
 			"Create ${toKebabCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="add-opinion-form">
+			tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>\u2190 Back to ${collection_name} list</a
 				>

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

@@ -45,15 +45,20 @@ async function editItemFormTemplate(edit_action_name, newfilefullpath, collectio
 			 return { canAccess: response?.allowed || false, message: response?.reason || "" };
 		 };`,
     onsubmit: `
-     	async onSubmit(ctx: Context) {
+	     	async onSubmit(ctx: Context) {
 		        const data = await this.getParsedValues(ctx);
-                const id = await this.getID(ctx);
-                const {items: [item]} = await ctx.$app.collections["${toKebabCase(
+        	    const id = await this.getID(ctx);
+	            const {items: [item]} = await ctx.$app.collections["${toKebabCase(
       collection_name
     )}"]
-                   .list(ctx.$context)
-                   .ids([id])
-                   .fetch();
+	               .list(ctx.$context)
+    		       .ids([id])
+	    	       .fetch();
+
+				if (!item) {
+					throw new Error("Unknown id: " + id);
+				}
+
 				if (!data) {
 					throw new Error("Error when parsing the form values");
 				}
@@ -141,7 +146,7 @@ async function editItemFormTemplate(edit_action_name, newfilefullpath, collectio
 		return html(
 			ctx,
 			"Edit ${toPascalCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="add-opinion-form">
+			tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>\u2190 Back to ${collection_name} list</a
 				>

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

@@ -28,7 +28,7 @@ export default new (class ${delete_action_name}Redirect extends Mountable {
 		router.get(path, async (ctx) => {
             await ctx.$app.collections["${toKebabCase(
     collection_name
-  )}"].removeByID(ctx.$context, ctx.params.id);
+  )}"].removeByID(ctx.$context, ctx.params.id!);
 			ctx.status = 302;
 			ctx.redirect(${list_action_name}URL);
 		});

package/package.json

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

package/src/builder.ts

@@ -135,6 +135,7 @@ export class BackendTSBuilder extends Builder {
 			sourcemap: true,
 			bundle: false,
 			jsxFactory: "TempstreamJSX.createElement",
+			jsxFragment: "TempstreamJSX.Fragment",
 			outdir: "./dist/back",
 			logLevel: "info",
 			platform: "node",

package/src/page/stateful-page.ts

@@ -14,6 +14,7 @@ export type StatefulPageActionDescription<ActionName> =
 			action: ActionName;
 			label?: string;
 			content?: string;
+			disabled?: boolean;
 	  }
 	| ActionName;
 
@@ -103,18 +104,21 @@ export abstract class StatefulPage<
 
 	extractActionAndLabel<ActionName extends keyof Actions>(
 		action_description: StatefulPageActionDescription<ActionName>
-	): { action: string; label: string; content: string } {
+	): { action: string; label: string; content: string; disabled: boolean } {
 		let label, action, content: string;
+		let disabled: boolean;
 		if (is(action_description, predicates.object)) {
 			action = action_description.action.toString();
 			label = action_description.label || action;
 			content = action_description.content || label;
+			disabled = action_description.disabled || false;
 		} else {
 			action = action_description.toString();
 			label = action;
 			content = label;
+			disabled = false;
 		}
-		return { action, label, content };
+		return { action, label, content, disabled };
 	}
 
 	makeActionURL<ActionName extends keyof Actions>(
@@ -137,13 +141,14 @@ export abstract class StatefulPage<
 			ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>
 		>
 	) {
-		const { label, content } =
+		const { label, content, disabled } =
 			this.extractActionAndLabel(action_description);
 		return /* HTML */ `
 			<button
 				type="submit"
 				formaction="${this.makeActionURL(action_description, ...args)}"
 				title="${label}"
+				${disabled ? "disabled" : ""}
 			>
 				${content}
 			</button>

package/src/templates/form.ts

@@ -7,10 +7,8 @@ const defaults = {
          import { Fields } from "@sealcode/sealgen";
          import type {FormDataValue} from "@sealcode/sealgen";`,
 	fields: `
-           email: new Fields.CollectionField(true, Users.fields.email),
            password: new Fields.SimpleFormField(true),`,
 	controls: `
-        new Controls.SimpleInput(fields.email, { label: "Email:", type: "email" }),
 		new Controls.SimpleInput(fields.password, {
 			label: "Password:",
 			type: "password",

package/src/templates/jdd-component.ts

@@ -27,12 +27,12 @@ export class ${toPascalCase(
 			content,
 		}: ExtractStructuredComponentArgumentsParsed<typeof component_arguments>,
 		classes: string[],
-		{ render_markdown }: JDDContext
+		{ language, render_markdown }: JDDContext
 	): FlatTemplatable {
 		return (
 			<div class={["${toKebabCase(component_name)}", ...classes]}>
 				<h2>{title} • ${toPascalCase(component_name)} </h2>
-				<div>{render_markdown(content)}</div>
+				<div>{render_markdown(language, content)}</div>
 			</div>
 		);
 	}

package/src/templates/redirect.ts

@@ -1,7 +1,7 @@
 export async function redirectTemplate(action_name: string): Promise<string> {
-	return `import { Context } from "koa";
+	return `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
-import Router from "@koa/router";
+import type Router from "@koa/router";
 
 export const actionName = "${action_name}";
 

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

@@ -109,7 +109,7 @@ export async function createItemFormTemplate(
 		return html(
 			ctx,
 			"Create ${toKebabCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="add-opinion-form">
+			tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>← Back to ${collection_name} list</a
 				>

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

@@ -63,15 +63,20 @@ export async function editItemFormTemplate(
 		 };`,
 
 		onsubmit: `
-     	async onSubmit(ctx: Context) {
+	     	async onSubmit(ctx: Context) {
 		        const data = await this.getParsedValues(ctx);
-                const id = await this.getID(ctx);
-                const {items: [item]} = await ctx.$app.collections["${toKebabCase(
+        	    const id = await this.getID(ctx);
+	            const {items: [item]} = await ctx.$app.collections["${toKebabCase(
 					collection_name
 				)}"]
-                   .list(ctx.$context)
-                   .ids([id])
-                   .fetch();
+	               .list(ctx.$context)
+    		       .ids([id])
+	    	       .fetch();
+
+				if (!item) {
+					throw new Error("Unknown id: " + id);
+				}
+
 				if (!data) {
 					throw new Error("Error when parsing the form values");
 				}
@@ -184,7 +189,7 @@ export async function editItemFormTemplate(
 		return html(
 			ctx,
 			"Edit ${toPascalCase(collection_name)}",
-			tempstream/* HTML */ \` <div class="add-opinion-form">
+			tempstream/* HTML */ \` <div class="sealgen-crud-form">
 				<a class="" href="\${${list_action}URL}"
 					>← Back to ${collection_name} list</a
 				>

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

@@ -34,7 +34,7 @@ export default new (class ${delete_action_name}Redirect extends Mountable {
 		router.get(path, async (ctx) => {
             await ctx.$app.collections["${toKebabCase(
 				collection_name
-			)}"].removeByID(ctx.$context, ctx.params.id);
+			)}"].removeByID(ctx.$context, ctx.params.id!);
 			ctx.status = 302;
 			ctx.redirect(${list_action_name}URL);
 		});

package/@types/src/forms/fields/collection-field.test.d.ts

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

package/@types/src/vitest.config.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vite").UserConfig;
-export default _default;