@sealcode/sealgen 0.18.8 → 0.19.0

package/lib/forms/fields/proxy-field.js

@@ -16,6 +16,9 @@ class ProxyFormField extends FormField {
       parsed_value: this.parsed_value
     };
   }
+  getControl() {
+    throw new Error("This field does not have a default control assigned");
+  }
 }
 export {
   ProxyFormField

package/lib/forms/fields/regexp.js

@@ -1,4 +1,5 @@
 import { is, predicates } from "@sealcode/ts-predicates";
+import { SimpleInput } from "../controls/simple-input.js";
 import { FormField } from "./field.js";
 class RegExpField extends FormField {
   constructor(required, regexp, error_message, default_value = "") {
@@ -35,6 +36,19 @@ class RegExpField extends FormField {
   getEmptyValue() {
     return this.default_value || "";
   }
+  getControl() {
+    return new SimpleInput(this, { label: this.name });
+  }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || "";
+  }
+  async sealiousValueToForm(ctx, sealious_value) {
+    return sealious_value || "";
+  }
 }
 export {
   RegExpField

package/lib/forms/fields/simple-form-field.js

@@ -1,10 +1,20 @@
 import { predicates } from "@sealcode/ts-predicates";
 import { FormField } from "./field.js";
+import { SimpleInput } from "../controls/simple-input.js";
 class SimpleFormField extends FormField {
-  constructor(required) {
+  constructor(required, type = "text") {
     super(required);
+    this.type = type;
     this.predicate = predicates.string;
   }
+  async sealiousValueToForm(ctx, value) {
+    if (value === null) {
+      return "";
+    }
+    return String(value);
+  }
+}
+class TextBasedSimpleField extends SimpleFormField {
   async parse(_, raw_value) {
     return {
       parsed_value: (raw_value || "").toString(),
@@ -12,11 +22,59 @@ class SimpleFormField extends FormField {
       error: null
     };
   }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || "";
+  }
+  async postSealiousCreate(ctx, created_item) {
+  }
+  async postSealiousEdit(ctx, edited_item) {
+  }
+  getControl() {
+    return new SimpleInput(this, {
+      label: this.name,
+      type: this.type
+    });
+  }
   getEmptyValue() {
     return "";
   }
 }
+class NumberBasedSimpleField extends SimpleFormField {
+  async parse(_, raw_value) {
+    return {
+      parsed_value: parseFloat(raw_value) || 0,
+      parsable: true,
+      error: null
+    };
+  }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || 0;
+  }
+  async postSealiousCreate() {
+  }
+  async postSealiousEdit() {
+  }
+  getControl() {
+    return new SimpleInput(this, {
+      label: this.name,
+      type: this.type
+    });
+  }
+  getEmptyValue() {
+    return 0;
+  }
+}
 export {
-  SimpleFormField
+  NumberBasedSimpleField,
+  SimpleFormField,
+  TextBasedSimpleField
 };
 //# sourceMappingURL=simple-form-field.js.map

package/lib/forms/fields/single-reference.js

@@ -0,0 +1,44 @@
+import { CollectionField } from "./collection-field.js";
+import { SingleReferenceDropdown } from "../controls/single-reference.js";
+import { toPascalCase } from "js-convert-case";
+class SingleReference extends CollectionField {
+  getControl() {
+    return new SingleReferenceDropdown(this, {
+      label: this.name,
+      getLabel: (item) => item.id
+    });
+  }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || void 0;
+  }
+  async sealiousValueToForm(ctx, value) {
+    return value || void 0;
+  }
+  generateImportsForFieldList(field_info) {
+    if (!field_info.target) {
+      throw new Error("Expected 'target' attribute in field info");
+    }
+    return [
+      {
+        what: toPascalCase(field_info.target),
+        from: "src/back/collections/collections.js"
+      }
+    ];
+  }
+  generateFieldDeclaration(field_info, vars) {
+    if (!field_info.target) {
+      throw new Error("Expected 'target' attribute in field info");
+    }
+    return `new ${vars.form_field_types}.${this.constructor.name}<typeof ${toPascalCase(field_info.target)}, ${String(
+      field_info.is_required
+    )}, typeof ${vars.sealious_field}>(${String(field_info.is_required)}, ${vars.sealious_field})`;
+  }
+}
+export {
+  SingleReference
+};
+//# sourceMappingURL=single-reference.js.map

package/lib/forms/fields/structured-array.js

@@ -1,21 +1,72 @@
-import { FormField } from "./field.js";
-class StructuredArrayField extends FormField {
+import { Table as TableControl } from "../controls/table.js";
+import {
+  sealiousToFormField
+} from "./get-field-for-sealious.js";
+import { Table } from "./table.js";
+class StructuredArray extends Table {
   constructor(sealious_field) {
-    super(true);
+    const columns = Object.fromEntries(
+      Object.entries(sealious_field.subfields).map(
+        ([key, sealious_field2]) => [
+          key,
+          sealiousToFormField(sealious_field2)
+        ]
+      )
+    );
+    super(columns);
     this.sealious_field = sealious_field;
   }
-  async parse(_context, value) {
-    return {
-      parsable: true,
-      error: null,
-      parsed_value: value || []
-    };
+  getControl() {
+    return new TableControl(this, {
+      label: this.name,
+      subfield_controls: Object.fromEntries(
+        Object.entries(this.columns).map(([column_name, subfield]) => [
+          column_name,
+          subfield.getControl()
+        ])
+      ),
+      allow_adding: true,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      make_new_row: () => ({})
+    });
   }
-  getEmptyValue() {
-    return [];
+  generateFieldDeclaration(_field_info, vars) {
+    return `new ${vars.form_field_types}.${this.constructor.name}(${vars.sealious_field})`;
+  }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || this.getEmptyValue();
+  }
+  async sealiousValueToForm(ctx, sealiousValue) {
+    return Promise.all(
+      (sealiousValue || []).map(
+        async (element) => Object.fromEntries(
+          await Promise.all(
+            Object.entries(element).map(async ([key, value]) => {
+              const form_subfield = this.columns[key];
+              if (!form_subfield) {
+                return [key, ""];
+              }
+              return [
+                key,
+                await form_subfield.sealiousValueToForm(
+                  ctx,
+                  value,
+                  {}
+                )
+              ];
+            })
+          )
+        )
+      )
+    );
   }
 }
 export {
-  StructuredArrayField
+  StructuredArray
 };
 //# sourceMappingURL=structured-array.js.map

package/lib/forms/fields/table.js

@@ -1,5 +1,9 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { FormField } from "./field.js";
+import {
+  Table as TableControl,
+  TABLE_COLUMN_FIELD_INDEX_PLACEHOLDER
+} from "../controls/table.js";
 class Table extends FormField {
   constructor(columns) {
     super(false);
@@ -8,6 +12,15 @@ class Table extends FormField {
   getEmptyValue() {
     return [];
   }
+  setName(name) {
+    super.setName(name);
+    for (const [column_name, field] of Object.entries(this.columns)) {
+      field.setName(
+        `${this.name}[${TABLE_COLUMN_FIELD_INDEX_PLACEHOLDER}][${column_name}]`
+      );
+    }
+    return this;
+  }
   async parse(ctx, raw_value) {
     if (!is(raw_value, predicates.object)) {
       return {
@@ -21,7 +34,6 @@ class Table extends FormField {
       const row_data = raw_value[row_number];
       const parsed_row = {};
       if (!is(row_data, predicates.object)) {
-        console.log("table.ts<fields>:55", this.name);
         throw new Error(`Expected object, got ${String(row_data)}`);
       }
       for (const key in row_data) {
@@ -56,6 +68,21 @@ class Table extends FormField {
     const ret = { parsed_value: result, parsable: true, error: null };
     return ret;
   }
+  getControl() {
+    return new TableControl(this, {
+      label: this.name,
+      subfield_controls: Object.fromEntries(
+        Object.entries(this.columns).map(([column_name, field]) => [
+          column_name,
+          field.getControl()
+        ])
+      ),
+      allow_adding: true,
+      make_new_row: async () => Object.fromEntries(
+        Object.keys(this.columns).map((key) => [key, ""])
+      )
+    });
+  }
 }
 export {
   Table

package/lib/forms/fields/text.js

@@ -0,0 +1,17 @@
+import { TextBasedSimpleField } from "./simple-form-field.js";
+class Text extends TextBasedSimpleField {
+  constructor(required) {
+    super(required, "text");
+  }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || this.getEmptyValue();
+  }
+}
+export {
+  Text
+};
+//# sourceMappingURL=text.js.map

package/lib/forms/fields/url.js

@@ -0,0 +1,17 @@
+import { TextBasedSimpleField } from "./simple-form-field.js";
+class URLField extends TextBasedSimpleField {
+  constructor(required) {
+    super(required, "text");
+  }
+  async getSealiousCreateValue(fctx) {
+    const { parsed } = await this.getParsedValue(
+      fctx.ctx,
+      fctx.data.raw_values
+    );
+    return parsed || null;
+  }
+}
+export {
+  URLField
+};
+//# sourceMappingURL=url.js.map

package/lib/forms/form.js

@@ -10,6 +10,7 @@ import {
 import {
   MountableWithFields
 } from "../page/mountable-with-fields.js";
+import { Errors as SealiousErrors } from "sealious";
 class Form extends MountableWithFields {
   constructor() {
     super(...arguments);
@@ -59,7 +60,7 @@ class Form extends MountableWithFields {
   makeCloseFormTag() {
     return `</div>`;
   }
-  async onValuesInvalid(ctx, form_messages, _field_errors) {
+  async onValuesInvalid(ctx, form_messages, field_errors) {
     const messages = form_messages.length ? form_messages : [{ type: "error", text: "Some fields are invalid" }];
     return {
       action: "stay",
@@ -67,7 +68,8 @@ class Form extends MountableWithFields {
         ctx,
         {
           raw_values: await this.extractRawValues(ctx),
-          messages
+          messages,
+          field_messages: field_errors
         },
         true
       ),
@@ -76,9 +78,18 @@ class Form extends MountableWithFields {
   }
   async onError(ctx, data, error) {
     let error_message = "Unknown error has occured";
+    let field_messages = {};
     if (is(error, predicates.object) && hasShape({ message: predicates.string }, error)) {
       error_message = error.message;
     }
+    if (error instanceof SealiousErrors.FieldsError) {
+      field_messages = Object.fromEntries(
+        Object.entries(error.field_messages).map(([key, value]) => {
+          const message = value?.message || "";
+          return [key, { type: "error", message }];
+        })
+      );
+    }
     const messages = [{ type: "error", text: error_message }];
     return {
       action: "stay",
@@ -86,7 +97,8 @@ class Form extends MountableWithFields {
         ctx,
         {
           raw_values: data.raw_values,
-          messages
+          messages,
+          field_messages
         },
         true
       )
@@ -102,7 +114,8 @@ class Form extends MountableWithFields {
         ctx,
         {
           raw_values: await this.getInitialValues(ctx),
-          messages
+          messages,
+          field_messages: {}
         },
         false
       ),
@@ -119,23 +132,21 @@ class Form extends MountableWithFields {
       raw_values
     );
     if (!valid) {
-      console.debug("Form values invalid: ", {
-        form_messages,
-        field_errors
-      });
       return this.onValuesInvalid(ctx, form_messages, field_errors);
     }
     try {
       ctx.status = 303;
       const result = await this.onSubmit(ctx, {
         raw_values,
-        messages: []
+        messages: [],
+        field_messages: {}
       });
       return this.onSuccess(
         ctx,
         {
           raw_values: await this.getRawValuesOnSuccess(ctx),
-          messages: []
+          messages: [],
+          field_messages: {}
         },
         result
       );
@@ -151,7 +162,8 @@ class Form extends MountableWithFields {
               type: "error",
               text: message
             }
-          ]
+          ],
+          field_messages: {}
         },
         e
       );
@@ -181,13 +193,13 @@ class Form extends MountableWithFields {
         ctx,
         {
           raw_values: await this.extractRawValues(ctx),
-          messages: []
+          messages: [],
+          field_messages: {}
         },
         false
       );
     });
     router.post(path, async (ctx) => {
-      console.log("REGULAR FORM HANDLE");
       const reaction = ctx.override_reaction || await this.handlePost(ctx);
       if (reaction.action == "stay") {
         ctx.status = 422;
@@ -201,6 +213,11 @@ class Form extends MountableWithFields {
   async extractRawValues(ctx) {
     return Object.keys(ctx.$body).length ? ctx.$body : this.getInitialValues(ctx);
   }
+  static initFieldNames(fields) {
+    for (const [field_name, field] of Object.entries(fields)) {
+      field.setName(field_name);
+    }
+  }
 }
 export {
   Form

package/lib/forms/form.test.js

@@ -7,10 +7,10 @@ import { locator_is_visible } from "../test_utils/locator_is_visible.js";
 import { getBrowser } from "../utils/browser-creator.js";
 import { assertThrowsAsync } from "../utils/utils.js";
 import getPort from "get-port";
-import { SimpleFormField } from "./fields/simple-form-field.js";
+import { TextBasedSimpleField } from "./fields/simple-form-field.js";
 import { expect as PlaywritghtExpect } from "@playwright/test";
 const fields = {
-  text: new Fields.SimpleFormField(true)
+  text: new Fields.TextBasedSimpleField(true)
 };
 function form_factory(canAccessFun) {
   const result = new class extends Form {
@@ -121,7 +121,6 @@ describe("form test", () => {
           "/",
           form_factory(
             async (ctx) => {
-              console.log("CAN ACCESS? FALSE");
               return { canAccess: false, message: "" };
             }
           ),
@@ -322,7 +321,7 @@ describe("form test", () => {
       const app = new Koa();
       const router = new Router();
       const fields2 = {
-        title: new SimpleFormField(true)
+        title: new TextBasedSimpleField(true)
       };
       mount(
         router,

package/lib/forms/multiform.js

@@ -78,7 +78,8 @@ class Multiform extends MountableWithFields {
       ctx,
       {
         raw_values: await this.getSubformRawValues(ctx, sub_form_name),
-        messages: []
+        messages: [],
+        field_messages: {}
       },
       show_field_errors
     );
@@ -97,7 +98,8 @@ class Multiform extends MountableWithFields {
   async render(ctx, messages, prerenderedForms = {}, show_field_errors) {
     return tempstream`${this.renderMessages(ctx, {
       raw_values: {},
-      messages
+      messages,
+      field_messages: {}
     })}
 			<div class="forms">
 				<form

package/lib/forms/multiform.test.js

@@ -8,7 +8,7 @@ import { Multiform } from "./multiform.js";
 import { assertThrowsAsync } from "../utils/utils.js";
 import { form_factory } from "./form.test.js";
 import { getBrowser } from "../utils/browser-creator.js";
-import { SimpleFormField } from "./fields/simple-form-field.js";
+import { TextBasedSimpleField } from "./fields/simple-form-field.js";
 import { Form } from "./form.js";
 import { FormHeader } from "./controls/form-header.js";
 import { SimpleInput } from "./controls/simple-input.js";
@@ -17,7 +17,7 @@ import getPort from "get-port";
 const port = await getPort();
 console.log(`Using port ${port} form multiform.test.ts`);
 const fields1 = {
-  email: new SimpleFormField(true)
+  email: new TextBasedSimpleField(true)
 };
 const form1 = new class extends Form {
   constructor() {
@@ -31,7 +31,7 @@ const form1 = new class extends Form {
   }
 }();
 const fields2 = {
-  name: new SimpleFormField(true)
+  name: new TextBasedSimpleField(true)
 };
 const form2 = new class extends Form {
   constructor() {

package/lib/generate-stimulus.js

@@ -12,6 +12,7 @@ async function generateStimulusControllers(controller_dirs) {
     target_locreq.resolve("src/"),
     ...controller_dirs
   ];
+  console.log("Looking for controllers in ", stimulus_search_dirs);
   const controller_names = (await Promise.all(stimulus_search_dirs.map((dir) => recursive(dir)))).flat().filter((c) => c.endsWith(".stimulus.ts")).sort();
   const controller_data = controller_names.map(
     (p) => "./" + path.relative(target_locreq.resolve(dirname(output_file)), p).replace(/\.[tj]sx?$/, ".js")

package/lib/index.js

@@ -16,6 +16,7 @@ export * from "./forms/multiform.js";
 import * as Components from "./components/components.js";
 export * from "./mount.js";
 export * from "./page/default-list-filters.js";
+export * from "./forms/fields/get-field-for-sealious.js";
 export {
   Components,
   Controls,

package/lib/make-hidden-inputs.js

@@ -5,7 +5,7 @@ function makeHiddenInputs(ctx, fields, values, fields_to_skip) {
     ([key, field]) => tempstream`<input
 				type="hidden"
 				name="${key}"
-				value="${field.getValue(ctx, values).then((r) => attribute(JSON.stringify(r.raw) || ""))}"
+				value="${field.getParsedValue(ctx, values).then((r) => attribute(JSON.stringify(r.raw) || ""))}"
 			/>`
   )}`;
 }

package/lib/mount.js

@@ -1,5 +1,6 @@
 import { FileManager } from "@sealcode/file-manager";
 import { Middlewares as SealiousMiddlewares } from "sealious";
+import { KoaResponsiveImageRouter } from "koa-responsive-image-router";
 async function handleHtmlPromise(ctx, next) {
   await next();
   if (ctx.body instanceof Promise) {
@@ -9,9 +10,19 @@ async function handleHtmlPromise(ctx, next) {
 }
 function mount(router, url, mountable, use_dummy_app = false, file_manager = use_dummy_app ? new FileManager("/tmp", "/uploaded_files") : void 0) {
   const raw_url = typeof url === "string" ? url : url.rawURL;
+  const imageRouter = new KoaResponsiveImageRouter({
+    staticPath: "/tmp",
+    thumbnailSize: 10,
+    cacheManagerResolutionThreshold: 10,
+    imageStoragePath: "/tmp",
+    smartCropStoragePath: "/tmp"
+  });
+  const fileManager = new FileManager("/tmp", "/uploaded_files");
   const args = use_dummy_app ? [
     async (ctx, next) => {
       ctx.$app = {
+        fileManager,
+        imageRouter,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         Logger: new Proxy(
           {},

package/lib/notifier.js

@@ -34,7 +34,6 @@ async function wait_for_app_to_be_stable(app_port, n = 3) {
   console.log("Waiting for app to be stable....");
   let counter = 0;
   while (true) {
-    console.debug("notifier.ts:53");
     const { status } = await get_status(app_port).catch(() => ({
       status: "down"
     }));

package/lib/page/list.js

@@ -4,13 +4,13 @@ import { naturalNumbers, UrlWithNewParams } from "../utils/utils.js";
 import { makeHiddenInputs } from "../make-hidden-inputs.js";
 import qs from "qs";
 import { NumberField } from "../forms/fields/number.js";
-import { SimpleFormField } from "../forms/fields/simple-form-field.js";
+import { TextBasedSimpleField } from "../forms/fields/simple-form-field.js";
 const BasePagePropsShape = {};
 const DEFAULT_ITEMS_PER_PAGE = 12;
 const BaseListPageFields = {
   page: new NumberField(false, 1),
   itemsPerPage: new NumberField(false, DEFAULT_ITEMS_PER_PAGE),
-  sort: new SimpleFormField(false)
+  sort: new TextBasedSimpleField(false)
 };
 const SORT_SEPARATOR = ":";
 function decodeSort(s) {
@@ -40,8 +40,8 @@ class ListPage extends Page {
   }
   init() {
     super.init();
-    for (const [fieldname, field] of Object.entries(this.filterFields)) {
-      void field.init(fieldname);
+    for (const [, field] of Object.entries(this.filterFields)) {
+      void field.init();
     }
   }
   renderListContainer(_, content) {
@@ -49,11 +49,14 @@ class ListPage extends Page {
   }
   async getPaginationConfig(ctx) {
     const values = await this.extractRawValues(ctx);
-    let { parsed: page } = await this.fields.page.getValue(ctx, values);
+    let { parsed: page } = await this.fields.page.getParsedValue(
+      ctx,
+      values
+    );
     if (!page) {
       page = 1;
     }
-    const { parsed: itemsPerPage } = await this.fields.itemsPerPage.getValue(ctx, values);
+    const { parsed: itemsPerPage } = await this.fields.itemsPerPage.getParsedValue(ctx, values);
     return { page, itemsPerPage };
   }
   async renderItems(ctx, values, items) {
@@ -127,7 +130,7 @@ class ListPage extends Page {
     const filter = {};
     const raw_values = await this.extractRawValues(ctx);
     for (const [fieldname, field] of Object.entries(this.filterFields)) {
-      const { parsed } = await field.getValue(ctx, raw_values);
+      const { parsed } = await field.getParsedValue(ctx, raw_values);
       filter[fieldname] = field.mapToFilter(parsed);
     }
     return filter;
@@ -163,7 +166,11 @@ class ListPage extends Page {
       return control.render(
         this.makeFormControlContext(
           ctx,
-          { raw_values: values, messages: [] },
+          {
+            raw_values: values,
+            messages: [],
+            field_messages: {}
+          },
           false
         )
       );