@sealcode/sealgen 0.19.11 → 0.19.13

package/@types/forms/fields/password.d.ts

@@ -1,5 +1,10 @@
+import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
 import { TextBasedSimpleField } from "./simple-form-field.js";
 export declare class Password<Required extends boolean> extends TextBasedSimpleField<Required> {
     constructor(required: Required);
     sealiousValueToForm(): Promise<undefined>;
+    generateInitialValue(field_info: ExtractedFieldInfo, vars: {
+        form_field_types: string;
+        form_fields: string;
+    }): string;
 }

package/@types/utils/extract-fields-from-collection.d.ts

@@ -6,11 +6,7 @@ export type ExtractedFieldInfo = {
     referencing_collection: string | null;
     referencing_field: string | null;
     intermediary_field_that_points_there: string | null;
-    is_readonly: boolean;
     is_required: boolean;
-    subfields: {
-        name: string;
-    }[];
 };
 export type ExtractedFieldInfoWithFormField = ExtractedFieldInfo & {
     form_field: FormField;

package/lib/forms/fields/password.js

@@ -1,3 +1,4 @@
+import { wrapAttribute, wrapKeyName } from "../../utils/wrap-attributes.js";
 import { TextBasedSimpleField } from "./simple-form-field.js";
 class Password extends TextBasedSimpleField {
   constructor(required) {
@@ -6,6 +7,9 @@ class Password extends TextBasedSimpleField {
   async sealiousValueToForm() {
     return void 0;
   }
+  generateInitialValue(field_info, vars) {
+    return `${wrapKeyName(field_info.name)}: await ${vars.form_fields}${wrapAttribute(field_info.name)}.sealiousValueToForm()`;
+  }
 }
 export {
   Password

package/lib/page/mountable-with-fields.js

@@ -26,11 +26,11 @@ class MountableWithFields extends Mountable {
     } else if (!this.fields) {
       throw new Error("Fields not defined and getter not provided");
     }
-    this.controls = this.getControls(this.fields);
     for (const [field_name, field] of Object.entries(this.fields)) {
       void field.init();
       field.setName(field_name);
     }
+    this.controls = this.getControls(this.fields);
     this.initialized = true;
   }
   makeFormControlContext(ctx, data, validate, field_name_prefix = this.field_names_prefix, form_id = this.form_id) {

package/lib/utils/extract-fields-from-collection.js

@@ -25,14 +25,10 @@ for (const field_name in c.fields){
     let referencing_collection = null;
     let referencing_field = null;
     let intermediary_field_that_points_there = null;
-    let is_readonly = false;
     let is_required = field.required || false;
-    let subfields = [];
     if(["derived-value", "cached-value", "settable-by",  "control-access"].includes(type)){
 	    type = field.virtual_field.typeName;
-    }
-    if(["derived-value", "cached-value", "reverse-single-reference"].includes(field.typeName)){
-	    is_readonly = true;
+    	field = field.virtual_field 
     }
     if(type == "single-reference"){
 		target = field.target_collection;
@@ -46,10 +42,7 @@ for (const field_name in c.fields){
 		referencing_field = field.referencing_field;
 		intermediary_field_that_points_there = field.intermediary_field_that_points_there
     }
-    if( type == "structured-array" ) {
-         subfields = Object.keys(field.subfields || field.virtual_field.subfields).map(key=>({name: key}));
-    }
-    fields.push({ name: field_name, type, target, referencing_collection, referencing_field, intermediary_field_that_points_there, is_readonly, is_required, subfields })
+    fields.push({ name: field_name, type, target, referencing_collection, referencing_field, intermediary_field_that_points_there, is_required })
 }
     console.log(JSON.stringify(fields));
 `;
@@ -66,7 +59,6 @@ for (const field_name in c.fields){
         predicates.shape({
           name: predicates.string,
           type: predicates.string,
-          is_readonly: predicates.boolean,
           target: predicates.or(
             predicates.string,
             predicates.null
@@ -83,9 +75,6 @@ for (const field_name in c.fields){
           intermediary_field_that_points_there: predicates.or(
             predicates.string,
             predicates.null
-          ),
-          subfields: predicates.array(
-            predicates.shape({ name: predicates.string })
           )
         })
       )

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.19.11",
+	"version": "0.19.13",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
@@ -92,7 +92,7 @@
 	"peerDependencies": {
 		"koa": "^2.13.0",
 		"koa-responsive-image-router": "^0.2.24",
-		"sealious": "^0.21.20",
+		"sealious": "^0.21.29",
 		"stimulus": "^3.2.2"
 	}
 }

package/src/forms/fields/password.ts

@@ -1,3 +1,5 @@
+import { ExtractedFieldInfo } from "../../utils/extract-fields-from-collection.js";
+import { wrapAttribute, wrapKeyName } from "../../utils/wrap-attributes.js";
 import { TextBasedSimpleField } from "./simple-form-field.js";
 
 export class Password<
@@ -10,4 +12,16 @@ export class Password<
 	async sealiousValueToForm(): Promise<undefined> {
 		return undefined;
 	}
+
+	generateInitialValue(
+		field_info: ExtractedFieldInfo,
+		vars: {
+			form_field_types: string;
+			form_fields: string;
+		}
+	): string {
+		return `${wrapKeyName(field_info.name)}: await ${
+			vars.form_fields
+		}${wrapAttribute(field_info.name)}.sealiousValueToForm()`;
+	}
 }

package/src/page/mountable-with-fields.ts

@@ -57,11 +57,11 @@ export abstract class MountableWithFields<
 		} else if (!this.fields) {
 			throw new Error("Fields not defined and getter not provided");
 		}
-		this.controls = this.getControls(this.fields);
 		for (const [field_name, field] of Object.entries(this.fields)) {
 			void field.init();
 			field.setName(field_name);
 		}
+		this.controls = this.getControls(this.fields);
 		this.initialized = true;
 	}
 

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

@@ -13,9 +13,7 @@ export type ExtractedFieldInfo = {
 	referencing_collection: string | null;
 	referencing_field: string | null;
 	intermediary_field_that_points_there: string | null;
-	is_readonly: boolean;
 	is_required: boolean;
-	subfields: { name: string }[];
 };
 
 export type ExtractedFieldInfoWithFormField = ExtractedFieldInfo & {
@@ -50,14 +48,10 @@ for (const field_name in c.fields){
     let referencing_collection = null;
     let referencing_field = null;
     let intermediary_field_that_points_there = null;
-    let is_readonly = false;
     let is_required = field.required || false;
-    let subfields = [];
     if(["derived-value", "cached-value", "settable-by",  "control-access"].includes(type)){
 	    type = field.virtual_field.typeName;
-    }
-    if(["derived-value", "cached-value", "reverse-single-reference"].includes(field.typeName)){
-	    is_readonly = true;
+    	field = field.virtual_field 
     }
     if(type == "single-reference"){
 		target = field.target_collection;
@@ -71,10 +65,7 @@ for (const field_name in c.fields){
 		referencing_field = field.referencing_field;
 		intermediary_field_that_points_there = field.intermediary_field_that_points_there
     }
-    if( type == "structured-array" ) {
-         subfields = Object.keys(field.subfields || field.virtual_field.subfields).map(key=>({name: key}));
-    }
-    fields.push({ name: field_name, type, target, referencing_collection, referencing_field, intermediary_field_that_points_there, is_readonly, is_required, subfields })
+    fields.push({ name: field_name, type, target, referencing_collection, referencing_field, intermediary_field_that_points_there, is_required })
 }
     console.log(JSON.stringify(fields));
 `;
@@ -93,7 +84,6 @@ for (const field_name in c.fields){
 						predicates.shape({
 							name: predicates.string,
 							type: predicates.string,
-							is_readonly: predicates.boolean,
 							target: predicates.or(
 								predicates.string,
 								predicates.null
@@ -111,9 +101,6 @@ for (const field_name in c.fields){
 								predicates.string,
 								predicates.null
 							),
-							subfields: predicates.array(
-								predicates.shape({ name: predicates.string })
-							),
 						})
 					)
 				)