@sealcode/sealgen 0.19.5 → 0.19.7

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

@@ -12,12 +12,12 @@ export async function editItemFormTemplate(
 ): Promise<string> {
 	const collection_fields =
 		await extract_fields_from_collection(collection_name);
-	const formFieldsVar = `${toPascalCase(collection_name)}FormFields`;
+	const formFieldsGetterVar = `get${toPascalCase(collection_name)}FormFields`;
 	const collectionVar = `${toPascalCase(collection_name)}`;
 
 	return formTemplate(edit_action_name, {
 		success_message: "Changes saved!",
-		postimport: `import {${formFieldsVar}, get${toPascalCase(
+		postimport: `import {${formFieldsGetterVar}, get${toPascalCase(
 			collection_name
 		)}FormControls }from "../shared.js";
         import { ${collectionVar} } from "src/back/collections/collections.js";
@@ -27,12 +27,12 @@ export async function editItemFormTemplate(
 		import type { CollectionInputWithAllKeys } from "sealious";
 `,
 
-		fields: `...${toPascalCase(collection_name)}FormFields`,
-		controls: `
+		get_fields: formFieldsGetterVar,
+		get_controls: `(fields: ReturnType<typeof getFields>)=>[
                 new Controls.FormHeader("Edit ${toPascalCase(
 					collection_name
 				)}"), 
-                ...get${toPascalCase(collection_name)}FormControls()`,
+                ...get${toPascalCase(collection_name)}FormControls(fields)]`,
 
 		can_access: `canAccess = async (ctx: Context) => {
 			 const policy = ${toPascalCase(collection_name)}.getPolicy("edit");
@@ -67,7 +67,7 @@ export async function editItemFormTemplate(
 								sealious_field: `${collectionVar}.fields${wrapAttribute(
 									field_info.name
 								)}`,
-								form_fields: "fields",
+								form_fields: "this.fields",
 							}
 						)
 					)
@@ -77,7 +77,7 @@ export async function editItemFormTemplate(
 
                 await item.save(ctx.$context);
 
-				for(const field of Object.values(${formFieldsVar})){
+				for(const field of Object.values(this.fields)){
 				    // eslint-disable-next-line no-await-in-loop
 				await field.postSealiousEdit(ctx, item, formData)
 				}
@@ -95,7 +95,7 @@ export async function editItemFormTemplate(
             }
         `,
 
-		get_initial_values: `async getInitialValues(ctx: Context): Promise<{ [key in keyof typeof fields]: FormDataValue | undefined }>  {
+		get_initial_values: `async getInitialValues(ctx: Context): Promise<{ [key in keyof typeof this.fields]: FormDataValue | undefined }>  {
                const id = await this.getID(ctx);
 
                const {
@@ -116,7 +116,7 @@ export async function editItemFormTemplate(
 					.map((field_info) =>
 						field_info.form_field.generateInitialValue(field_info, {
 							form_field_types: "FieldTypes",
-							form_fields: "fields",
+							form_fields: "this.fields",
 						})
 					)
 					.join(",\n")}

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

@@ -25,9 +25,9 @@ export function makeDefaultFilterFields(
 		.map((field) => {
 			const type = field.type;
 			return `{ field: "${field.name}", ...${
-				type in DefaultListFilters
-					? `DefaultListFilters["${field.type}"]`
-					: `DefaultListFilters.fallback`
+				type in DefaultListFilters ?
+					`DefaultListFilters["${field.type}"]`
+				:	`DefaultListFilters.fallback`
 			} }`;
 		})
 		.join(",\n");
@@ -148,7 +148,8 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 	typeof ${uppercase_collection},
 	typeof BaseListPageFields
 > {
-	fields = BaseListPageFields;
+	getFields = ()=>BaseListPageFields;
+	getControls = ()=>[];
 
 	async renderFilters(ctx: Context): Promise<FlatTemplatable> {
 		const query_params = qs.parse(ctx.search.slice(1));

package/src/templates/shared/shared-crud-form-fields.ts

@@ -19,13 +19,13 @@ ${Array.from(
 			)
 			.flat()
 			.map(
-				({ what, from, as }) =>
-					`import {${what}${as ? ` as ${as}` : ""} } from "${from}"`
+				({ what, from, as, type }) =>
+					`import ${type ? "type " : ""}{${what}${as ? ` as ${as}` : ""} } from "${from}"`
 			)
 	).values()
 ).join(";\n")}
 
-export const ${toPascalCase(collection_name)}FormFields = <const>{
+export const get${toPascalCase(collection_name)}FormFields = () => <const>{
 	${collection_fields
 		.map((field_info) => {
 			return `${
@@ -40,11 +40,11 @@ export const ${toPascalCase(collection_name)}FormFields = <const>{
 		.join(",\n")}
 };
 
-const fields = ${toPascalCase(collection_name)}FormFields 
+const getFields = get${toPascalCase(collection_name)}FormFields 
 
 export const get${toPascalCase(
 		collection_name
-	)}FormControls: () => Controls.FormControl[] = () => [
+	)}FormControls: (fields: ReturnType<typeof getFields>) => Controls.FormControl[] = (fields) => [
 	${collection_fields
 		.map(({ name }) => `fields${wrapAttribute(name)}.getControl()`)
 		.join(",\n")}

package/src/utils/extract-fields-from-collection.ts

@@ -61,6 +61,9 @@ for (const field_name in c.fields){
     }
     if(type == "single-reference"){
 		target = field.target_collection;
+    }
+	if(type == "item-draft"){
+		target = field.target_collection_name;
     }
     if(type == "deep-reverse-single-reference" || type =="reverse-single-reference"){
 		target = field.target_collection;