@sealcode/sealgen 0.18.10 → 0.19.2

package/lib/generate-routes.js

@@ -1,12 +1,11 @@
 import { promises as fs } from "fs";
-import * as prettier from "prettier";
 import { relative, resolve, basename } from "path";
 import _locreq from "locreq";
 import { walkDir } from "./utils/walk.js";
 import { importPath } from "./utils/import-path.js";
 import { assertType, predicates } from "@sealcode/ts-predicates";
 import { unescape_url_params } from "./utils/escape-url-params.js";
-import { getPrettierConfig } from "./utils/prettier.js";
+import { formatWithPrettier } from "./utils/prettier.js";
 import { Templates } from "./templates/templates.js";
 const target_locreq = _locreq(process.cwd());
 async function extractActionName(full_file_path) {
@@ -91,14 +90,13 @@ ${sortRoutes(files).map(
 }`;
   const urls_content = `${sortRoutes(files).map(({ actionName, url }) => generateURL(actionName, url)).join("\n")}
 `;
-  const prettier_config = await getPrettierConfig();
   await fs.writeFile(
     target_locreq.resolve("src/back/routes/routes.ts"),
-    prettier.format(routes_content, prettier_config)
+    await formatWithPrettier(routes_content)
   );
   await fs.writeFile(
     target_locreq.resolve("src/back/routes/urls.ts"),
-    prettier.format(urls_content, prettier_config)
+    await formatWithPrettier(urls_content)
   );
   console.log(
     "Successfuly generated new src/back/routes/routes.ts and src/back/routes/urls.ts"

package/lib/generate-routes.test.js

@@ -1,19 +1,14 @@
 import { generateURL, sortRoutes } from "./generate-routes.js";
-import * as prettier from "prettier";
-import { getPrettierConfig } from "./utils/prettier.js";
+import { formatWithPrettier } from "./utils/prettier.js";
 import assert from "node:assert";
 describe("generate routes", () => {
   it("handles a url with params", async () => {
     assert.strictEqual(
-      prettier.format(
-        generateURL("EditUser", "/admin/users/:id/edit/"),
-        await getPrettierConfig()
-      ),
-      prettier.format(
+      await formatWithPrettier(generateURL("EditUser", "/admin/users/:id/edit/")),
+      await formatWithPrettier(
         `export const EditUserURL = (id: string) => \`/admin/users/\${id}/edit/\`;
 EditUserURL.params = ["id"];
-EditUserURL.rawURL = "/admin/users/:id/edit/";`,
-        await getPrettierConfig()
+EditUserURL.rawURL = "/admin/users/:id/edit/";`
       )
     );
   });
@@ -25,15 +20,11 @@ EditUserURL.rawURL = "/admin/users/:id/edit/";`,
   });
   it("handles a url with params and diacritics", async () => {
     assert.strictEqual(
-      prettier.format(
-        generateURL("EditUser", "/admin/u\u017Cytkownicy/:id/edit/"),
-        await getPrettierConfig()
-      ),
-      prettier.format(
+      await formatWithPrettier(generateURL("EditUser", "/admin/u\u017Cytkownicy/:id/edit/")),
+      await formatWithPrettier(
         `export const EditUserURL = (id: string) => \`/admin/u%C5%BCytkownicy/\${id}/edit/\`;
 EditUserURL.params = ["id"];
-EditUserURL.rawURL = "/admin/u%C5%BCytkownicy/:id/edit/";`,
-        await getPrettierConfig()
+EditUserURL.rawURL = "/admin/u%C5%BCytkownicy/:id/edit/";`
       )
     );
   });

package/lib/generate-stimulus.js

@@ -1,7 +1,6 @@
 import _locreq from "locreq";
-import * as prettier from "prettier";
 import { promises as fs } from "fs";
-import { getPrettierConfig } from "./utils/prettier.js";
+import { formatWithPrettier } from "./utils/prettier.js";
 import recursive from "recursive-readdir";
 import path, { dirname } from "path";
 import { toKebabCase, toPascalCase } from "js-convert-case";
@@ -12,6 +11,7 @@ async function generateStimulusControllers(controller_dirs) {
     target_locreq.resolve("src/"),
     ...controller_dirs
   ];
+  console.info("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")
@@ -34,9 +34,9 @@ export { Turbo };
 `;
   await fs.writeFile(
     target_locreq.resolve(output_file),
-    prettier.format(content, await getPrettierConfig())
+    await formatWithPrettier(content)
   );
-  console.log(`Successfuly generated new ${output_file} file`);
+  console.info(`Successfuly generated new ${output_file} file`);
 }
 export {
   generateStimulusControllers

package/lib/get-fonts.js

@@ -27,43 +27,45 @@ async function getFonts(_ = {}) {
     fontsPath: "/dist/fonts"
   });
   await downloader.execute();
-  console.log("Downloaded new fonts pack from google fonts");
+  console.info("Downloaded new fonts pack from google fonts");
   const squirrel_fonts = fonts_config.fontSquirrel;
-  if (!is(
+  if (is(
     squirrel_fonts,
     predicates.record(
       predicates.string,
       predicates.array(predicates.string)
     )
   )) {
-    throw new Error("Inocorrect squirrelfonts file");
-  }
-  await mkdir(target_locreq.resolve("public/dist/fontsquirrel/"), {
-    recursive: true
-  });
-  const config_file = `{
+    await mkdir(target_locreq.resolve("public/dist/fontsquirrel/"), {
+      recursive: true
+    });
+    const config_file = `{
 				"tmpDir": "/tmp/fonts",
 				"fontsDir": "/dist/fontsquirrel/fonts",
 				"cssDir": "/dist/fontsquirrel/css",
 				"cssFile": "fonts.css"
 			}`;
-  await writeFile("public/fonsta.config.json", config_file);
-  await Promise.all(
-    Object.keys(squirrel_fonts).map((font) => {
-      if (squirrel_fonts[font].length) {
-        return execPromise(
-          `node ${path_to_fonsta} install ${font}:${squirrel_fonts[font].join(",")}`,
-          {
-            cwd: target_locreq.resolve("public")
-          }
-        );
-      } else {
-        return execPromise(`node ${path_to_fonsta} install ${font}`, {
-          cwd: target_locreq.resolve("public")
-        });
-      }
-    })
-  );
+    await writeFile("public/fonsta.config.json", config_file);
+    await Promise.all(
+      Object.keys(squirrel_fonts).map((font) => {
+        if (squirrel_fonts[font].length) {
+          return execPromise(
+            `node ${path_to_fonsta} install ${font}:${squirrel_fonts[font].join(",")}`,
+            {
+              cwd: target_locreq.resolve("public")
+            }
+          );
+        } else {
+          return execPromise(
+            `node ${path_to_fonsta} install ${font}`,
+            {
+              cwd: target_locreq.resolve("public")
+            }
+          );
+        }
+      })
+    );
+  }
   const fonts_css_file_path = resolve(
     target_locreq.resolve("public/dist/fonts"),
     "fonts.css"
@@ -75,8 +77,8 @@ async function getFonts(_ = {}) {
   );
   await unlink("public/fonsta.config.json");
   await rmdir("public/tmp");
-  console.log("Downloaded new fonts pack from Font Squirrel");
-  console.log("Downloaded new fonts pack");
+  console.info("Downloaded new fonts pack from Font Squirrel");
+  console.info("Downloaded new fonts pack");
 }
 export {
   FONTS_CONFIG_PATH,

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-env.js

@@ -9,7 +9,7 @@ GROUP_ID=${gid}
 `;
   const path = target_locreq.resolve(".env");
   await fs.writeFile(path, content);
-  console.log("wrote .env");
+  console.info("Wrote .env");
 }
 export {
   makeEnv

package/lib/make-hidden-inputs.js

@@ -3,10 +3,10 @@ import { attribute } from "./sanitize.js";
 function makeHiddenInputs(ctx, fields, values, fields_to_skip) {
   return tempstream`${Object.entries(fields).filter(([key]) => !fields_to_skip.includes(key)).map(
     ([key, field]) => tempstream`<input
-				type="hidden"
-				name="${key}"
-				value="${field.getValue(ctx, values).then((r) => attribute(JSON.stringify(r.raw) || ""))}"
-			/>`
+					type="hidden"
+					name="${key}"
+					value="${field.getParsedValue(ctx, values).then((r) => attribute(JSON.stringify(r.raw) || ""))}"
+				/>`
   )}`;
 }
 export {

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(
           {},
@@ -28,7 +39,6 @@ function mount(router, url, mountable, use_dummy_app = false, file_manager = use
           }
         ),
         getString: (x) => x
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       };
       await next();
     },

package/lib/notifier.js

@@ -13,7 +13,7 @@ async function wait_for_run_id_to_change(app_port) {
   try {
     const { started_at } = await get_status(app_port);
     first_timestamp = started_at;
-  } catch (e) {
+  } catch (_e) {
     await wait_for_app_to_be_stable(app_port);
     return;
   }
@@ -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"
     }));
@@ -77,8 +76,8 @@ function make_notifier(port, app_port) {
       sockets = sockets.filter((s) => s !== socket);
     });
   });
-  console.log(
-    "build notifier listening on websocket at port " + port.toString()
+  console.info(
+    "\u{1F514} Build notifier listening on websocket at port " + port.toString()
   );
   return function notify(message) {
     sockets.forEach((s) => s.send(message));

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) {
@@ -87,17 +90,16 @@ class ListPage extends Page {
       (n) => (
         /* HTML */
         `<option
-							value="${UrlWithNewParams(
+								value="${UrlWithNewParams(
           ctx,
-          //eslint-disable-next-line @typescript-eslint/consistent-type-assertions
           this.propsParser.overwriteProp(ctx, {
             page: n
           })
         )}"
-							${page === n ? "selected" : ""}
-						>
-							${n}
-						</option>`
+								${page === n ? "selected" : ""}
+							>
+								${n}
+							</option>`
       )
     )}
 				</select>
@@ -114,7 +116,6 @@ class ListPage extends Page {
       `<a
 			href="${UrlWithNewParams(
         ctx,
-        //eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         this.propsParser.overwriteProp(ctx, {
           page
         })
@@ -127,7 +128,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 +164,11 @@ class ListPage extends Page {
       return control.render(
         this.makeFormControlContext(
           ctx,
-          { raw_values: values, messages: [] },
+          {
+            raw_values: values,
+            messages: [],
+            field_messages: {}
+          },
           false
         )
       );

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

@@ -13,14 +13,15 @@ class MountableWithFields extends Mountable {
       this.fields = {};
   }
   init() {
-    for (const [name, field] of Object.entries(this.fields)) {
-      void field.init(name);
+    for (const [field_name, field] of Object.entries(this.fields)) {
+      void field.init();
+      field.setName(field_name);
     }
   }
   makeFormControlContext(ctx, data, validate, field_name_prefix = this.field_names_prefix, form_id = this.form_id) {
     return new FormControlContext(
       ctx,
-      data.raw_values,
+      data,
       data.messages,
       field_name_prefix,
       form_id,
@@ -44,10 +45,13 @@ class MountableWithFields extends Mountable {
     await Promise.all(
       Object.keys(this.fields).map(async (key) => {
         const field = this.fields[key];
-        const { valid: fieldvalid, message: fieldmessage } = await field.getValue(ctx, values, true);
+        const { valid: fieldvalid, message: fieldmessage } = await field.getParsedValue(ctx, values, true);
         if (!fieldvalid) {
           valid = false;
-          field_errors[field.name] = fieldmessage;
+          field_errors[field.name] = {
+            type: "error",
+            message: fieldmessage
+          };
         }
       })
     );
@@ -81,7 +85,11 @@ class MountableWithFields extends Mountable {
     const result = {};
     const promises = Object.entries(this.fields).map(
       async ([key, field]) => {
-        const { parsed } = await field.getValue(ctx, raw_values, false);
+        const { parsed } = await field.getParsedValue(
+          ctx,
+          raw_values,
+          false
+        );
         result[key] = parsed;
       }
     );

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

@@ -17,7 +17,7 @@ describe("mountable-with-fields", () => {
         const data = await this.getParsedValues(ctx);
         data.not_required?.trim();
         data.required.trim();
-        const { parsed: data2 } = await this.fields.not_required.getValue(
+        const { parsed: data2 } = await this.fields.not_required.getParsedValue(
           ctx,
           form_values.raw_values
         );

package/lib/page/mountable.js

@@ -1,5 +1,4 @@
 class Mountable {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   init() {
   }
 }

package/lib/page/page.js

@@ -14,7 +14,6 @@ class Page extends MountableWithFields {
       ctx.body = await this.render(ctx);
     });
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async canAccess(_) {
     return { canAccess: true, message: "" };
   }

package/lib/register-external.js

@@ -43,7 +43,7 @@ async function updatePackageJson(projectDir, moduleName, subdirectory, type) {
   const pathToAdd = `node_modules/${moduleName}/${subdirectory}`;
   const existingPaths = packageJson.sealgen[type];
   if (existingPaths.includes(pathToAdd)) {
-    console.log(`${type} already contains: ${pathToAdd}`);
+    console.warn(`${type} already contains: ${pathToAdd}`);
     return;
   }
   existingPaths.push(pathToAdd);
@@ -52,9 +52,9 @@ async function updatePackageJson(projectDir, moduleName, subdirectory, type) {
     "json"
   );
   await fs.writeFile(packageJsonPath, updatedContent);
-  console.log(`Added ${pathToAdd} to ${type} in ${packageJsonPath}`);
+  console.info(`Added ${pathToAdd} to ${type} in ${packageJsonPath}`);
 }
-async function registerExternalControllers(args) {
+async function registerExternalControllers(_args) {
   const moduleName = process.argv.at(3);
   const subdirectory = process.argv.at(4);
   if (!moduleName || !subdirectory) {
@@ -76,7 +76,7 @@ async function registerExternalControllers(args) {
     process.exit(1);
   }
 }
-async function registerExternalStyles(args) {
+async function registerExternalStyles(_args) {
   const moduleName = process.argv.at(3);
   const subdirectory = process.argv.at(4);
   if (!moduleName || !subdirectory) {

package/lib/templates/form.js

@@ -1,12 +1,10 @@
-import Prettier from "prettier";
-import { curryImportPath } from "../utils/import-path.js";
-import { getPrettierConfig } from "../utils/prettier.js";
+import { formatWithPrettier } from "../utils/prettier.js";
 const defaults = {
   postimport: `
          import { Fields } from "@sealcode/sealgen";
          import type {FormDataValue} from "@sealcode/sealgen";`,
   fields: `
-           password: new Fields.SimpleFormField(true),`,
+           password: new Fields.Password(true),`,
   controls: `
 		new Controls.SimpleInput(fields.password, {
 			label: "Password:",
@@ -17,8 +15,8 @@ const defaults = {
 		data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
 		// just a silly example, please remove this with better logic
-		const { parsed: email } = await this.fields.email.getValue(ctx, data);
-		const { parsed: password } = await this.fields.password.getValue(ctx, data);
+		const { parsed: email } = await this.fields.email.getParsedValue(ctx, data);
+		const { parsed: password } = await this.fields.password.getParsedValue(ctx, data);
 		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 		if ((password || "").length > ((email as string) || "").length) {
 			return { valid: false, error: "Password cannot be longer than email" };
@@ -41,13 +39,12 @@ const defaults = {
   other_methods: "",
   success_message: "Success!"
 };
-async function formTemplate(action_name, newfilefullpath, _params = defaults) {
+async function formTemplate(action_name, _params = defaults) {
   const params = { ...defaults, ..._params };
-  const rel = curryImportPath(newfilefullpath);
   const content = `import type { Context } from "koa";
 import type { FormData } from "@sealcode/sealgen";
 import { Form,  Controls, fieldsToShape } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 
 ${params.postimport}
 
@@ -57,6 +54,8 @@ const fields = {
     ${params.fields}
 };
 
+Form.initFieldNames(fields);
+
 export const ${action_name}Shape = fieldsToShape(fields);
 
 export default new (class ${action_name}Form extends Form<typeof fields, void> {
@@ -78,7 +77,7 @@ export default new (class ${action_name}Form extends Form<typeof fields, void> {
    ${params.render}
 })();
 `;
-  return Prettier.format(content, await getPrettierConfig());
+  return formatWithPrettier(content);
 }
 export {
   formTemplate

package/lib/templates/jdd-component.js

@@ -1,5 +1,5 @@
 import { toKebabCase, toPascalCase } from "js-convert-case";
-function jddComponentTemplate(component_name) {
+async function jddComponentTemplate(component_name) {
   return `import { TempstreamJSX } from "tempstream";
 import type { ComponentToHTMLArgs } from "@sealcode/jdd";
 import { Component, ComponentArguments } from "@sealcode/jdd";

package/lib/templates/jdd-editor.js

@@ -20,7 +20,7 @@ async function jddEditorTemplate(actionName) {
   let field_name = "";
   if (jdd_fields.length == 1) {
     field_name = jdd_fields[0].name;
-    console.log(
+    console.info(
       `Only one field of type JDD found: ${field_name}, so skipping the question...`
     );
   } else if (jdd_fields.length > 1) {

package/lib/templates/multiform.js

@@ -9,8 +9,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> {
@@ -26,8 +26,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/lib/templates/page.js

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