@sealcode/sealgen 0.18.10 → 0.19.2

package/src/templates/multiform.ts

@@ -13,8 +13,8 @@ import { FlatTemplatable } from "tempstream";
 export const actionName = "${action_name}";
 
 const fields1 = {
-	email: new Fields.SimpleFormField(true),
-	password: new Fields.SimpleFormField(true),
+	email: new Fields.TextBasedSimpleField(true),
+	password: new Fields.TextBasedSimpleField(true),
 };
 
 const form1 = new (class extends Form<typeof fields1, unknown> {
@@ -30,8 +30,8 @@ const form1 = new (class extends Form<typeof fields1, unknown> {
 })();
 
 const fields2 = {
-	name: new Fields.SimpleFormField(true),
-	surname: new Fields.SimpleFormField(true),
+	name: new Fields.TextBasedSimpleField(true),
+	surname: new Fields.TextBasedSimpleField(true),
 };
 
 const form2 = new (class extends Form<typeof fields2, unknown> {

package/src/templates/page.ts

@@ -1,9 +1,4 @@
-import { curryImportPath } from "../utils/import-path.js";
-export async function pageTemplate(
-	action_name: string,
-	newfilefullpath: string
-): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
+export async function pageTemplate(action_name: string): Promise<string> {
 	return `import type { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";

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

@@ -1,10 +1,8 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formTemplate } from "../form.js";
-import { curryImportPath } from "../../utils/import-path.js";
 
-import _locreq from "locreq";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
-import { getFieldHandler } from "./shared-crud-form-fields.js";
+import { wrapAttribute } from "../../utils/wrap-attributes.js";
 
 export async function createItemFormTemplate(
 	create_action_name: string,
@@ -12,36 +10,22 @@ export async function createItemFormTemplate(
 	collection_name: string,
 	list_action: string
 ): Promise<string> {
-	const collection_fields = await extract_fields_from_collection(
-		collection_name
-	);
-	const importPath = curryImportPath(newfilefullpath);
+	const collection_fields =
+		await extract_fields_from_collection(collection_name);
+	const formFieldsVar = `${toPascalCase(collection_name)}FormFields`;
 
-	const field_handler_results = await Promise.all(
-		collection_fields.map((field) =>
-			getFieldHandler(collection_name, field, importPath)
-		)
-	);
-
-	const post_create_actions = field_handler_results
-		.map(({ post_create }) => post_create)
-		.filter((e) => e != "");
-
-	return formTemplate(create_action_name, newfilefullpath, {
+	return formTemplate(create_action_name, {
 		success_message: "Created!",
-		postimport: `import {${toPascalCase(
-			collection_name
-		)}FormFields, ${toPascalCase(
+		postimport: `import {${formFieldsVar}, get${toPascalCase(
 			collection_name
 		)}FormControls }from "./shared.js";
 
-        import { ${toPascalCase(collection_name)} } from "${importPath(
-			"src/back/collections/collections.js"
-		)}";
-
-		import { ${list_action}URL } from "${importPath("src/back/routes/urls.js")}";
+        import { ${toPascalCase(
+			collection_name
+		)} } from "src/back/collections/collections.js";
 
-        import {tempstream} from "tempstream";
+		import { ${list_action}URL } from "src/back/routes/urls.js";
+		import {tempstream} from "tempstream";
 `,
 
 		fields: `...${toPascalCase(collection_name)}FormFields`,
@@ -49,7 +33,7 @@ export async function createItemFormTemplate(
                 new Controls.FormHeader("Create ${toPascalCase(
 					collection_name
 				)}"), 
-                ...${toPascalCase(collection_name)}FormControls`,
+                ...get${toPascalCase(collection_name)}FormControls()`,
 
 		can_access: `canAccess = async (ctx: Context) => {
 			 const policy = ${toPascalCase(collection_name)}.getPolicy("create");
@@ -57,53 +41,32 @@ export async function createItemFormTemplate(
 			 return { canAccess: response?.allowed || false, message: response?.reason || "" };
 		 };`,
 
-		get_initial_values: field_handler_results
-			.filter((r) => !r.hide_initial_value_create)
-			.map(({ initial_value_create }) => initial_value_create)
-			.filter((e) => e != "").length
-			? `getInitialValues(ctx: Context){
-                   return {
-                        ${field_handler_results
-							.filter((r) => !r.hide_initial_value_create)
-							.map(
-								({ initial_value_create }) =>
-									initial_value_create
-							)
-							.join(",\n")}
-                   }
-}`
-			: ``,
+		get_initial_values: "",
 
 		onsubmit: `
-	async onSubmit(ctx: Context) {
-		const data = await this.getParsedValues(ctx);
-		if (!data) {
-			throw new Error("Error when parsing the form values");
-		}
+	async onSubmit(ctx: Context, formData: FormData) {
+		const fctx = this.makeFormControlContext(ctx, formData, true);
 
-	   ${field_handler_results
-			.map(({ pre_create }) => pre_create)
-			.filter((e) => e !== "")
-			.join("\n")}
-
-		${
-			post_create_actions.length ? `const created = ` : ""
-		} await ctx.$app.collections["${toKebabCase(collection_name)}"].create(
+		const created =  await ctx.$app.collections["${toKebabCase(
+			collection_name
+		)}"].createExtraSafe(
 			ctx.$context,
-			{
-			      ${field_handler_results
-						.filter((result) => !result.hide_sealious_value)
-						.map((result) => result.sealious_value(result))
-						.filter((e) => e != "")
-						.join(",\n")}
-			} 
-		);
-        ${
-			post_create_actions.length
-				? `/* ==== POST CREATE ACTIONS ==== */`
-				: ""
-		}
-        ${post_create_actions.join("\n")}
+		{
+		${collection_fields
+			.map((field_info) =>
+				field_info.form_field.generateCreateValueGetter(field_info, {
+					form_field_types: formFieldsVar,
+					sealious_field: `fields${wrapAttribute(field_info.name)}`,
+					form_fields: "fields",
+				})
+			)
+			.join(",\n")} 
+			});
+
+   		for(const field of Object.values(${formFieldsVar})){
+			// eslint-disable-next-line no-await-in-loop
+            await field.postSealiousCreate(ctx, created, formData)
+        }
 	}
 `,
 		render: `	async render(ctx: Context, data: FormData, show_field_errors: boolean) {

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

@@ -1,11 +1,8 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
 import { formTemplate } from "../form.js";
-import { curryImportPath } from "../../utils/import-path.js";
 
-import _locreq from "locreq";
 import extract_fields_from_collection from "../../utils/extract-fields-from-collection.js";
-
-import { getFieldHandler } from "./shared-crud-form-fields.js";
+import { wrapAttribute } from "../../utils/wrap-attributes.js";
 
 export async function editItemFormTemplate(
 	edit_action_name: string,
@@ -13,41 +10,21 @@ export async function editItemFormTemplate(
 	collection_name: string,
 	list_action: string
 ): Promise<string> {
-	const collection_fields = await extract_fields_from_collection(
-		collection_name
-	);
-	const importPath = curryImportPath(newfilefullpath);
-
-	const field_handler_results = await Promise.all(
-		collection_fields.map(async (field) => {
-			return getFieldHandler(collection_name, field, importPath);
-		})
-	);
-
-	return formTemplate(edit_action_name, newfilefullpath, {
+	const collection_fields =
+		await extract_fields_from_collection(collection_name);
+	const formFieldsVar = `${toPascalCase(collection_name)}FormFields`;
+	const collectionVar = `${toPascalCase(collection_name)}`;
+
+	return formTemplate(edit_action_name, {
 		success_message: "Changes saved!",
-		postimport: `import {${toPascalCase(
-			collection_name
-		)}FormFields, ${toPascalCase(
+		postimport: `import {${formFieldsVar}, get${toPascalCase(
 			collection_name
 		)}FormControls }from "../shared.js";
-                import { ${toPascalCase(collection_name)} } from "${importPath(
-			"src/back/collections/collections.js"
-		)}";
-		import { ${list_action}URL, ${edit_action_name}URL } from "${importPath(
-			"src/back/routes/urls.js"
-		)}";
-                import {tempstream} from "tempstream";
-
-		${Array.from(
-			new Set(field_handler_results.map(({ imports }) => imports.edit))
-		).join("\n")}
-
-        ${
-			collection_fields.filter((e) => !e.is_required).length
-				? `import {withFallback} from "@sealcode/sealgen";`
-				: ""
-		}
+        import { ${collectionVar} } from "src/back/collections/collections.js";
+		import { ${list_action}URL } from "src/back/routes/urls.js";
+        import {tempstream} from "tempstream";
+		import type { FormDataValue } from "@sealcode/sealgen";
+		import type { CollectionInputWithAllKeys } from "sealious";
 `,
 
 		fields: `...${toPascalCase(collection_name)}FormFields`,
@@ -55,7 +32,7 @@ export async function editItemFormTemplate(
                 new Controls.FormHeader("Edit ${toPascalCase(
 					collection_name
 				)}"), 
-                ...${toPascalCase(collection_name)}FormControls`,
+                ...get${toPascalCase(collection_name)}FormControls()`,
 
 		can_access: `canAccess = async (ctx: Context) => {
 			 const policy = ${toPascalCase(collection_name)}.getPolicy("edit");
@@ -64,8 +41,8 @@ export async function editItemFormTemplate(
 		 };`,
 
 		onsubmit: `
-	     	async onSubmit(ctx: Context) {
-		        const data = await this.getParsedValues(ctx);
+	    async onSubmit(ctx: Context, formData: FormData) {
+				const fctx = this.makeFormControlContext(ctx, formData, true);
         	    const id = await this.getID(ctx);
 	            const {items: [item]} = await ctx.$app.collections["${toKebabCase(
 					collection_name
@@ -78,50 +55,38 @@ export async function editItemFormTemplate(
 					throw new Error("Unknown id: " + id);
 				}
 
-				if (!data) {
-					throw new Error("Error when parsing the form values");
-				}
 
-			   ${field_handler_results
-					.map((result) => result.pre_edit)
-					.filter((e) => e !== "")
-					.join("\n")}
-
-				item.setMultiple(
-					{
-						${field_handler_results
-							.filter((r) => !r.hide_sealious_value)
-							.map((result) => result.sealious_value(result))
-							.filter((e) => e != "")
-							.join(",\n")}
-					}
+				item.setMultipleExtraSafe(
+				{
+				${collection_fields
+					.map((field_info) =>
+						field_info.form_field.generateCreateValueGetter(
+							field_info,
+							{
+								form_field_types: "FormFieldTypes",
+								sealious_field: `${collectionVar}.fields${wrapAttribute(
+									field_info.name
+								)}`,
+								form_fields: "fields",
+							}
+						)
+					)
+					.join(",\n")}
+    				} as CollectionInputWithAllKeys<typeof ${collectionVar}>
 				);
+
                 await item.save(ctx.$context);
 
-                
-                ${
-					field_handler_results
-						.map((result) => result.post_edit)
-						.filter((e) => e != "").length
-						? `// #### POST-EDIT ACTIONS ############`
-						: ""
+				for(const field of Object.values(${formFieldsVar})){
+				    // eslint-disable-next-line no-await-in-loop
+				await field.postSealiousEdit(ctx, item, formData)
 				}
-                 ${field_handler_results
-						.map((result) => result.post_edit)
-						.filter((e) => e != "")
-						.join("\n")}
 			}
 		`,
 
 		other_methods: `
             async getID(ctx: Context): Promise<string>{
-               // trying to automatically guess which param is the one that represents the ID
-               // of the resource to edit. 
-               // If sealgen got it wrong, just return the param name that should be used here instead
-               const param_name = 
-                         ${edit_action_name}URL.params
-                         .find(param => param.toLowerCase().includes("id")) 
-                     || ${edit_action_name}URL.params[0]
+               const param_name = "id";
 			   const id = ctx.params[param_name];
 	           if (!id) {
 				   throw new Error("Missing URL  parameter: " + param_name);
@@ -130,7 +95,7 @@ export async function editItemFormTemplate(
             }
         `,
 
-		get_initial_values: `async getInitialValues(ctx: Context) {
+		get_initial_values: `async getInitialValues(ctx: Context): Promise<{ [key in keyof typeof fields]: FormDataValue | undefined }>  {
                const id = await this.getID(ctx);
 
                const {
@@ -146,42 +111,15 @@ export async function editItemFormTemplate(
 			   }
 
 			   return {
-				   ${field_handler_results
-						.filter((r) => !r.hide_initial_value_edit)
-						.map(({ initial_value_edit, is_required, name }) => {
-							if (typeof initial_value_edit == "string") {
-								if (initial_value_edit == "") {
-									return "";
-								}
-								return `${name}: ${initial_value_edit}`;
-							}
 
-							const main_value = initial_value_edit.main_value;
-							if (!main_value) {
-								throw new Error(
-									"Missing main_value for initial_value_edit"
-								);
-							}
-							const { parsed_value, fallback_value } =
-								initial_value_edit;
-							if (is_required) {
-								return `${name}: ${parsed_value || main_value}`;
-							}
-							if (main_value && parsed_value && fallback_value) {
-								if (main_value == parsed_value) {
-									return `${name}: withFallback(${main_value}, ${fallback_value})`;
-								} else {
-									return `${name}: withFallback(${main_value}, ${parsed_value}, ${fallback_value})`;
-								}
-							} else {
-								console.error(initial_value_edit);
-								throw new Error(
-									"Missing field info for generating initial value"
-								);
-							}
+			   ${collection_fields
+					.map((field_info) =>
+						field_info.form_field.generateInitialValue(field_info, {
+							form_field_types: "FieldTypes",
+							form_fields: "fields",
 						})
-						.filter((e) => e.trim() !== "")
-						.join(",\n")}
+					)
+					.join(",\n")}
 			   };
 		   }
 	   `,

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

@@ -60,12 +60,12 @@ export function makeDefaultDisplayFields(
 				return `{
 					field: "${field.name}",
 					label: "${field.name}",
-					format: async (value: FilePointer) => {
-						return imageRouter.image(await value.getPath(), {
+					format: async (value: FilePointer|null) => {
+						return value ? imageRouter.image(await value.getPath(), {
 							container: { width: 45, height: 45 },
                             crop: { width: 45, height: 45 },
 							alt: "",
-						});
+					}): "";
 					},
 				}`;
 			}
@@ -118,7 +118,7 @@ import type { FlatTemplatable, Templatable } from "tempstream";
 import { TempstreamJSX, tempstream } from "tempstream";
 import { ${uppercase_collection} } from "src/back/collections/collections.js";
 import html from "src/back/html.js";
-import type { ListFilterRender } from "@sealcode/sealgen";
+import type { ListFilterRender, FormDisplayInfo } from "@sealcode/sealgen";
 import {
 	SealiousItemListPage,
 	BaseListPageFields,
@@ -131,26 +131,18 @@ ${field_import_string}
 
 export const actionName = "${action_name}";
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const filterFields = [
-     ${makeDefaultFilterFields(collection_fields)}
-] as {
-	field: keyof (typeof ${uppercase_collection})["fields"];
+const filterFields:{
+    field: keyof (typeof ${uppercase_collection})["fields"];
 	render?: ListFilterRender;
-	prepareValue?: (filter_value: unknown)=>unknown; // set this function to change what filter value is passed to Sealious
-}[];
+	prepareValue?: (filter_value: unknown) => unknown; // set this function to change what filter value is passed to Sealious
+}[] = [
+     ${makeDefaultFilterFields(collection_fields)}
+];
 
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const displayFields = [
+const displayFields: FormDisplayInfo<typeof ${uppercase_collection}>[] = [
 ${makeDefaultDisplayFields(collection_fields)}
-] as {
-	field: string;
-	label: string;
-	format?: (value: unknown, item: CollectionItem<typeof ${toPascalCase(
-		collection_name
-	)}>) => FlatTemplatable;
-}[];
+];
 
 export default new (class ${action_name}Page extends SealiousItemListPage<
 	typeof ${uppercase_collection},
@@ -215,7 +207,7 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 		ctx: Context,
 		fields: { field: string; label?: string }[]
 	): FlatTemplatable {
-		return tempstream/* HTML */ \`<thead>
+		return tempstream /* HTML */ \`<thead>
 			<tr>
 				\${fields.map(({ label, field }) => this.renderHeading(ctx, field, label))}
 				<th>Actions</th>

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

@@ -1,5 +1,4 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
-import { curryImportPath } from "../../utils/import-path.js";
 import { formatWithPrettier } from "../../utils/prettier.js";
 
 export function itemDeleteTemplate(