@sealcode/sealgen 0.3.1 → 0.4.1

package/lib/page/list.js

@@ -1,94 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SealiousItemListPage = exports.ListPage = exports.BaseListPageDefaultProps = exports.BaseListPagePropsShape = exports.BasePagePropsShape = void 0;
+exports.SealiousItemListPage = exports.ListPage = exports.BaseListPageFields = exports.BasePagePropsShape = void 0;
 const tempstream_1 = require("tempstream");
 const access_control_1 = require("./access-control");
 const page_1 = require("./page");
-const ts_predicates_1 = require("@sealcode/ts-predicates");
-const form_fields_list_1 = require("../forms/form-fields-list");
+const field_1 = require("../forms/fields/field");
 const utils_1 = require("../utils/utils");
+const make_hidden_inputs_1 = require("../make-hidden-inputs");
 exports.BasePagePropsShape = {};
-exports.BaseListPagePropsShape = {
-    page: ts_predicates_1.predicates.number,
-    itemsPerPage: ts_predicates_1.predicates.number,
+exports.BaseListPageFields = {
+    page: new field_1.NumberField(false, 1),
+    itemsPerPage: new field_1.NumberField(false, 12),
 };
-exports.BaseListPageDefaultProps = { page: 1, itemsPerPage: 25 };
 class ListPage extends page_1.Page {
     constructor() {
         super(...arguments);
-        this.filterFields = [];
+        this.filterFields = {};
         this.filterControls = [];
     }
-    renderListContainer(_, content) {
-        return tempstream_1.tempstream `<div>${content}</div>`;
-    }
-    async validateProps(ctx, props) {
-        const errors = {};
-        let has_errors = false;
-        const promises = [];
-        for (const [key, value] of Object.entries(props)) {
-            const field = form_fields_list_1.FormFieldsList.getField(this.filterFields, key);
-            if (field) {
-                promises.push(field._validate(ctx, value).then(({ valid, message }) => {
-                    if (!valid) {
-                        has_errors = true;
-                        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                        errors[key] = message;
-                    }
-                }));
-            }
+    init() {
+        super.init();
+        for (const [fieldname, field] of Object.entries(this.filterFields)) {
+            field.init(fieldname);
         }
-        await Promise.all(promises);
-        return { valid: has_errors, errors };
     }
-    async getProps(ctx) {
-        const raw_props = this.propsParser.decode(ctx);
-        const parsed_props = { ...raw_props };
-        const { errors } = await this.validateProps(ctx, parsed_props);
-        for (const prop_name in errors) {
-            const default_value = this.propsParser.getDefaultValue(prop_name);
-            if (default_value !== undefined) {
-                parsed_props[prop_name] = default_value;
-            }
-            else {
-                delete parsed_props[prop_name];
-            }
-        }
-        return { parsed_props, errors, raw_props };
+    renderListContainer(_, content) {
+        return tempstream_1.tempstream `<div>${content}</div>`;
     }
     async render(ctx) {
-        const { parsed_props, errors, raw_props } = await this.getProps(ctx);
-        return tempstream_1.tempstream `${this.renderPagination(ctx, parsed_props)}
-${this.renderFilters(ctx, parsed_props, raw_props, errors)}
-${this.getItems(ctx, parsed_props).then(({ items }) => this.renderListContainer(ctx, items.map((item) => this.renderItem(ctx, item))))}`;
+        const values = this.extractRawValues(ctx);
+        const { parsed: page } = await this.fields.page.getValue(ctx, values);
+        const { parsed: itemsPerPage } = await this.fields.itemsPerPage.getValue(ctx, values);
+        return tempstream_1.tempstream `${this.renderPagination(ctx, values)}
+			  ${this.renderFilters(ctx)}
+              ${this.getItems(ctx, page, itemsPerPage, values).then((items) => this.renderListContainer(ctx, items.map((item) => this.renderItem(ctx, item))))}`;
     }
-    async renderPagination(ctx, props) {
-        const totalIems = await this.getTotalPages(ctx, props);
-        const currentPage = props.page;
+    async renderPagination(ctx, values) {
+        const { parsed: page } = await this.fields.page.getValue(ctx, values);
+        const { parsed: itemsPerPage } = await this.fields.itemsPerPage.getValue(ctx, values);
+        const totalIems = await this.getTotalPages(ctx, itemsPerPage, values);
         return tempstream_1.tempstream /* HTML */ `<center>
-			${currentPage > 1
-            ? this.renderPageButton(ctx, 1, "Pierwsza strona")
-            : ""}
-			${currentPage > 1
-            ? this.renderPageButton(ctx, currentPage - 1, "Poprzednia strona")
+			${page > 1 ? this.renderPageButton(ctx, 1, "Pierwsza strona") : ""}
+			${page > 1
+            ? this.renderPageButton(ctx, page - 1, "Poprzednia strona")
             : ""}
 
 			<select onchange="if (this.value) Turbo.visit(this.value)">
-				${Array.from(utils_1.naturalNumbers(1, await this.getTotalPages(ctx, props))).map((n) => /* HTML */ `<option
+				${Array.from(utils_1.naturalNumbers(1, totalIems)).map((n) => /* HTML */ `<option
 						value="${utils_1.UrlWithNewParams(ctx, 
         //eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         this.propsParser.overwriteProp(ctx, {
             page: n,
         }))}"
-						${currentPage === n ? "selected" : ""}
+						${page === n ? "selected" : ""}
 					>
 						${n}
 					</option>`)}
 			</select>
-			${currentPage < totalIems
-            ? this.renderPageButton(ctx, currentPage + 1, "Następna strona")
+			${page < totalIems
+            ? this.renderPageButton(ctx, page + 1, "Następna strona")
             : ""}
-			${currentPage < totalIems
+			${page < totalIems
             ? this.renderPageButton(ctx, totalIems, "Ostatnia strona")
             : ""}
 		</center>`;
@@ -103,21 +75,26 @@ ${this.getItems(ctx, parsed_props).then(({ items }) => this.renderListContainer(
 			>${text}</a
 		>`;
     }
-    renderFilters(ctx, parsed_props, // parsed props don't include wrong values
-    raw_props, errors) {
+    async getFilterValues(ctx) {
+        const filter = {};
+        const raw_values = this.extractRawValues(ctx);
+        for (const [fieldname, field] of Object.entries(this.filterFields)) {
+            // eslint-disable-next-line no-await-in-loop
+            const { parsed } = await field.getValue(ctx, raw_values);
+            filter[fieldname] = parsed;
+        }
+        return filter;
+    }
+    renderFilters(ctx) {
+        const values = this.extractRawValues(ctx);
         return tempstream_1.tempstream /* HTML */ `<form method="GET">
-			${this.propsParser.makeHiddenInputs(parsed_props, [
+			${make_hidden_inputs_1.makeHiddenInputs(ctx, this.fields, values, [
             "page",
-            ...this.filterFields.map((f) => f.name),
+            ...Object.values(this.filterFields).map((f) => f.name),
         ])}
 			${this.filterControls.map((control) => 
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        control.render(ctx, this.filterFields, {
-            values: parsed_props,
-            raw_values: raw_props,
-            errors,
-            messages: [],
-        }))}
+        control.render(ctx, values))}
 		</form>`;
     }
 }
@@ -128,17 +105,25 @@ class SealiousItemListPage extends ListPage {
         this.collection = collection;
         this.canAccess = access_control_1.peopleWhoCan("list", this.collection);
     }
-    async getTotalPages(ctx, props) {
-        const { items } = await this.collection.list(ctx.$context).fetch();
-        return Math.ceil(items.length / props.itemsPerPage);
+    async getTotalPages(ctx, itemsPerPage) {
+        const query = this.collection.list(ctx.$context);
+        await this.addFilter(ctx, query);
+        const { items } = await query.fetch();
+        return Math.ceil(items.length / itemsPerPage);
+    }
+    async addFilter(ctx, list) {
+        const filters = await this.getFilterValues(ctx);
+        if (Object.keys(filters).length) {
+            list.filter(filters);
+        }
     }
-    async getItems(ctx, props) {
-        return {
-            items: (await this.collection
-                .list(ctx.$context)
-                .paginate({ items: props.itemsPerPage, page: props.page })
-                .fetch()).items,
-        };
+    async getItems(ctx, page, itemsPerPage) {
+        const query = this.collection.list(ctx.$context);
+        await this.addFilter(ctx, query);
+        const { items } = await query
+            .paginate({ items: itemsPerPage, page })
+            .fetch();
+        return items;
     }
     async renderItem(_, item) {
         return `<div>${item.id}</div>`;

package/lib/page/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/page/list.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/page/list.ts"],"names":[],"mappings":"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"}

package/lib/page/mountable.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Mountable = void 0;
+const tempstream_1 = require("tempstream");
+class Mountable {
+    constructor() {
+        if (!this.fields)
+            this.fields = {};
+    }
+    // this one is meant to be overwritten
+    async validateValues(ctx, data) {
+        return {
+            valid: true,
+            error: "",
+        };
+    }
+    async validate(ctx, values) {
+        const field_errors = {};
+        let valid = true;
+        const form_messages = [];
+        await Promise.all(Object.entries(values)
+            .filter(([fieldname]) => fieldname in this.fields)
+            .map(async ([key]) => {
+            const field = this.fields[key];
+            const { valid: fieldvalid, message: fieldmessage } = await field.getValue(ctx, values);
+            if (!fieldvalid) {
+                valid = false;
+                field_errors[field.name] = fieldmessage;
+            }
+        }));
+        const formValidationResult = await this.validateValues(ctx, values);
+        if (!formValidationResult.valid) {
+            form_messages.push({
+                type: "error",
+                text: formValidationResult.error,
+            });
+            valid = false;
+        }
+        return { valid, field_errors, form_messages };
+    }
+    init() {
+        for (const [name, field] of Object.entries(this.fields)) {
+            field.init(name);
+        }
+    }
+    renderControls(ctx, data) {
+        return tempstream_1.tempstream /* HTML */ `${this.controls.map((control) => control.render(ctx, data.raw_values, data.messages))}`;
+    }
+    renderMessages(_, data) {
+        return tempstream_1.tempstream /* HTML */ `<div class="form-messages">
+			${data.messages.map((message) => `<div class="form-message form-message--${message.type}">${message.text}</div>`)}
+		</div>`;
+    }
+}
+exports.Mountable = Mountable;
+//# sourceMappingURL=mountable.js.map

package/lib/page/mountable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mountable.js","sourceRoot":"","sources":["../../src/page/mountable.ts"],"names":[],"mappings":";;;AAGA,2CAAsE;AAQtE,MAAsB,SAAS;IAG9B;QACC,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,EAAO,CAAC;IACzC,CAAC;IAgBD,sCAAsC;IACtC,KAAK,CAAC,cAAc,CACnB,GAAgB,EAChB,IAAmC;QAEnC,OAAO;YACN,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,EAAE;SACT,CAAC;IACH,CAAC;IAES,KAAK,CAAC,QAAQ,CACvB,GAAgB,EAChB,MAAqC;QAMrC,MAAM,YAAY,GAAG,EAAkC,CAAC;QACxD,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,aAAa,GAAG,EAAmB,CAAC;QAC1C,MAAM,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC;aACjD,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAA2B,EAAE,EAAE;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,GACjD,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,UAAU,EAAE;gBAChB,KAAK,GAAG,KAAK,CAAC;gBACd,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;aACxC;QACF,CAAC,CAAC,CACH,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE;YAChC,aAAa,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,oBAAoB,CAAC,KAAK;aAChC,CAAC,CAAC;YACH,KAAK,GAAG,KAAK,CAAC;SACd;QACD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;IAC/C,CAAC;IAED,IAAI;QACH,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACxD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACjB;IACF,CAAC;IAEM,cAAc,CACpB,GAAgB,EAChB,IAA4B;QAE5B,OAAO,uBAAU,CAAA,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5D,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CACnD,EAAE,CAAC;IACL,CAAC;IAEM,cAAc,CACpB,CAAc,EACd,IAA4B;QAE5B,OAAO,uBAAU,CAAA,UAAU,CAAC;KACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC,OAAO,EAAE,EAAE,CACX,0CAA0C,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,QAAQ,CAChF;SACK,CAAC;IACT,CAAC;CACD;AA7FD,8BA6FC"}

package/lib/page/page.js

@@ -2,7 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
 const tempstream_1 = require("tempstream");
-class Page {
+const __1 = require("..");
+const mountable_1 = require("./mountable");
+class Page extends mountable_1.Mountable {
+    constructor() {
+        super(...arguments);
+        this.propsParser = new __1.AllQueryParams();
+        this.controls = [];
+    }
     mount(router, path) {
         router.get(path, async (ctx) => {
             ctx.body = await this.render(ctx);
@@ -15,6 +22,9 @@ class Page {
     async renderError(_, error) {
         return tempstream_1.tempstream /* HTML */ `<div>${error.message}</div>`;
     }
+    extractRawValues(ctx) {
+        return this.propsParser.decode(ctx);
+    }
 }
 exports.Page = Page;
 //# sourceMappingURL=page.js.map

package/lib/page/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/page/page.ts"],"names":[],"mappings":";;;AAGA,2CAAqD;AAUrD,MAAsB,IAAI;IACzB,KAAK,CAAC,MAAc,EAAE,IAAY;QACjC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9B,GAAG,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,SAAS,CAAC,CAAc;QAC7B,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,CAAc,EAAE,KAAuB;QACxD,OAAO,uBAAU,CAAA,UAAU,CAAC,QAAQ,KAAK,CAAC,OAAO,QAAQ,CAAC;IAC3D,CAAC;CAGD;AAjBD,oBAiBC"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/page/page.ts"],"names":[],"mappings":";;;AAGA,2CAAsE;AACtE,0BAAoC;AAEpC,2CAAkE;AAGlE,MAAsB,IAEpB,SAAQ,qBAAY;IAFtB;;QAGC,gBAAW,GACV,IAAI,kBAAc,EAAE,CAAC;QACtB,aAAQ,GAAG,EAAE,CAAC;IAyBf,CAAC;IAvBA,KAAK,CAAC,MAAc,EAAE,IAAY;QACjC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9B,GAAG,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,SAAS,CAAC,CAAc;QAC7B,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,CAAc,EACd,KAAuB;QAEvB,OAAO,uBAAU,CAAA,UAAU,CAAC,QAAQ,KAAK,CAAC,OAAO,QAAQ,CAAC;IAC3D,CAAC;IAID,gBAAgB,CAAC,GAAgB;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;CACD;AA9BD,oBA8BC"}

package/lib/page/props-parser.js

@@ -4,64 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AllQueryParams = exports.PagePropsParser = void 0;
-const ts_predicates_1 = require("@sealcode/ts-predicates");
 const merge_1 = __importDefault(require("merge"));
-// the intention here is to sometime in the future be able to store multiple frames on one document, so props for each frame will be in a different namespace, and parsers are going to help with that
-function parseStringValues(shape, values) {
-    const result = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (!(key in shape)) {
-            continue;
-        }
-        const predicate = shape[key];
-        if (predicate == ts_predicates_1.predicates.number) {
-            result[key] = parseFloat(value);
-        }
-        else {
-            result[key] = value;
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return result;
-}
+// page props parser is only tasked with getting the raw props from *somewhere*
+// and being able to put new values back to that somewhere. Parsing to numbers
+// or any other exotic types is done by fields logic.
 class PagePropsParser {
-    constructor(propsShape, defaultValues) {
-        this.propsShape = propsShape;
-        this.defaultValues = defaultValues;
-    }
     overwriteProp(ctx, new_props) {
         const result = {};
         merge_1.default.recursive(result, this.decode(ctx), new_props);
         return result;
     }
-    makeHiddenInputs(values, fields_to_skip) {
-        return Object.entries(values)
-            .filter(([key]) => !fields_to_skip.includes(key))
-            .map(([key, value]) => 
-        /* HTML */ `<input
-						type="hidden"
-						name="${key}"
-						value="${value}"
-					/>`)
-            .join(" ");
-    }
-    getDefaultValue(key) {
-        return this.defaultValues[key];
-    }
 }
 exports.PagePropsParser = PagePropsParser;
 class AllQueryParams extends PagePropsParser {
     decode(ctx) {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const query = parseStringValues(this.propsShape, {
-            ...this.defaultValues,
-            ...ctx.query,
-        });
-        if (!ts_predicates_1.hasShape(this.propsShape, query)) {
-            throw new Error("Wrong props shape");
-        }
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        return query;
+        return ctx.query;
     }
     encode(props) {
         return props;

package/lib/page/props-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"props-parser.js","sourceRoot":"","sources":["../../src/page/props-parser.ts"],"names":[],"mappings":";;;;;;AAAA,2DAKiC;AAGjC,kDAA0B;AAK1B,sMAAsM;AAEtM,SAAS,iBAAiB,CACzB,KAAe,EACf,MAA8B;IAE9B,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClD,IAAI,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE;YACpB,SAAS;SACT;QACD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,SAAS,IAAI,0BAAU,CAAC,MAAM,EAAE;YACnC,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;SAChC;aAAM;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACpB;KACD;IACD,yEAAyE;IACzE,OAAO,MAA+B,CAAC;AACxC,CAAC;AAED,MAAsB,eAAe;IAKpC,YACQ,UAAiB,EACjB,aAAiC;QADjC,eAAU,GAAV,UAAU,CAAO;QACjB,kBAAa,GAAb,aAAa,CAAoB;IACtC,CAAC;IAEJ,aAAa,CACZ,GAAgB,EAChB,SAA6B;QAE7B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,eAAK,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,gBAAgB,CAAC,MAAiB,EAAE,cAAwB;QAC3D,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aAC3B,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAChD,GAAG,CACH,CAAC,CAAC,GAAG,EAAE,KAAK,CAA4B,EAAE,EAAE;QAC3C,UAAU,CAAC;;cAEF,GAAG;eACF,KAAK;QACZ,CACJ;aACA,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,eAAe,CACd,GAAQ;QAER,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACD;AAtCD,0CAsCC;AAED,MAAa,cAEX,SAAQ,eAA0B;IACnC,MAAM,CAAC,GAAgB;QACtB,yEAAyE;QACzE,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE;YAChD,GAAG,IAAI,CAAC,aAAa;YACrB,GAAG,GAAG,CAAC,KAAK;SACyB,CAAC,CAAC;QACxC,IAAI,CAAC,wBAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACrC;QACD,yEAAyE;QACzE,OAAO,KAAkB,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,KAAgB;QACtB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,SAAiB;QACjC,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AAvBD,wCAuBC"}
+{"version":3,"file":"props-parser.js","sourceRoot":"","sources":["../../src/page/props-parser.ts"],"names":[],"mappings":";;;;;;AACA,kDAA0B;AAM1B,+EAA+E;AAC/E,8EAA8E;AAC9E,qDAAqD;AAErD,MAAsB,eAAe;IAKpC,aAAa,CACZ,GAAgB,EAChB,SAA6B;QAE7B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,eAAK,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC;IACf,CAAC;CACD;AAbD,0CAaC;AAED,MAAa,cAEX,SAAQ,eAA0B;IACnC,MAAM,CAAC,GAAgB;QACtB,OAAO,GAAG,CAAC,KAAK,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,KAAgB;QACtB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,SAAiB;QACjC,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AAdD,wCAcC"}

package/lib/templates/form.js

@@ -5,39 +5,59 @@ const import_path_1 = require("../utils/import-path");
 async function formTemplate(action_name, newfilefullpath) {
     const rel = import_path_1.curryImportPath(newfilefullpath);
     return `import { BaseContext } from "koa";
-import {Users} from "${rel("src/back/collections/collections")}";
-import { FormHeader, SimpleInput } from "${rel("src/back/forms/controls")}";
-import { FormField } from "${rel("src/back/forms/field")}";
-import Form, { FormData } from "${rel("src/back/forms/form")}";
-import { collectionFieldValidator } from "${rel("src/back/forms/validator")}";
-import html from "${rel("src/back/html")}";
+import {
+	CollectionField,
+	Form,
+	FormData,
+	FormDataValue,
+	SimpleFormField,
+	SimpleInput,
+} from "@sealcode/sealgen";
+import html from "../html";
+import { Users } from "${rel("src/back/collections/collections")}";
 
 export const actionName = "${action_name}";
 
-export default new(class ${action_name}Form extends Form {
-	defaultSuccessMessage = "Pomyślnie utworzono użytkownika";
+const fields = {
+	email: new CollectionField(true, Users.fields.email),
+	password: new SimpleFormField(true),
+};
 
-	fields = [new FormField("email", true, collectionFieldValidator(Users.fields.email))];
+export default new (class ${action_name}Form extends Form<typeof fields> {
+	defaultSuccessMessage = "Formularz wypełniony poprawnie";
+	fields = fields;
 
 	controls = [
-		new FormHeader("Enter your email address"),
-		new SimpleInput("email", { label: "Your email", type: "email" }),
+		new SimpleInput(fields.email, { label: "Email:", type: "email" }),
+		new SimpleInput(fields.password, { label: "Password:", type: "password" }),
 	];
 
+	async validateValues(
+		ctx: BaseContext,
+		data: Record<string, FormDataValue>
+	): Promise<{ valid: boolean; error: string }> {
+		// just an example
+		const { parsed: email } = await this.fields.email.getValue(ctx, data);
+		const { parsed: password } = await this.fields.password.getValue(ctx, data);
+		if ((password || "").length > (email || "").length) {
+			return { valid: false, error: "Password cannot be longer than email" };
+		} else {
+			return { valid: true, error: "" };
+		}
+	}
+
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	async canAccess(_: BaseContext) {
 		return { canAccess: true, message: "" };
 	}
 
-	async onSubmit(ctx: BaseContext, values: Record<"email", string>) {
-		await ctx.$app.collections.users.create(ctx.$context, {
-			username: values.email,
-			...values,
-		});
+	async onSubmit() {
+		//noop
+		return;
 	}
 
-	async render(ctx: BaseContext, data: FormData, path: string) {
-		return html(ctx, "${action_name}", await super.render(ctx, data, path));
+	async render(ctx: BaseContext, data: FormData) {
+		return html(ctx, "${action_name}", await super.render(ctx, data));
 	}
 })();
 `;

package/lib/templates/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/templates/form.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AAEhD,KAAK,UAAU,YAAY,CACjC,WAAmB,EACnB,eAAuB;IAEvB,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;uBACe,GAAG,CAAC,kCAAkC,CAAC;2CACnB,GAAG,CAAC,yBAAyB,CAAC;6BAC5C,GAAG,CAAC,sBAAsB,CAAC;kCACtB,GAAG,CAAC,qBAAqB,CAAC;4CAChB,GAAG,CAAC,0BAA0B,CAAC;oBACvD,GAAG,CAAC,eAAe,CAAC;;6BAEX,WAAW;;2BAEb,WAAW;;;;;;;;;;;;;;;;;;;;;;;sBAuBhB,WAAW;;;CAGhC,CAAC;AACF,CAAC;AA1CD,oCA0CC"}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/templates/form.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AAEhD,KAAK,UAAU,YAAY,CACjC,WAAmB,EACnB,eAAuB;IAEvB,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;;;;;;;;;;yBAUiB,GAAG,CAAC,kCAAkC,CAAC;;6BAEnC,WAAW;;;;;;;4BAOZ,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAkCjB,WAAW;;;CAGhC,CAAC;AACF,CAAC;AA9DD,oCA8DC"}

package/lib/templates/list.js

@@ -21,38 +21,48 @@ const listTemplate = async (action_name, newfilefullpath) => {
 import { CollectionItem } from "sealious";
 import { tempstream } from "tempstream";
 import { ${uppercase_collection} } from "${rel("src/back/collections/collections")}";
-import html from "${rel("src/back/html.ts")}";
-import {
-	BaseListPageDefaultProps,
-	BaseListPageProps,
-	BaseListPagePropsShape,
-	SealiousItemListPage,
-} from "${rel("src/back/page/list.ts")}";
-import { AllQueryParams } from "${rel("src/back/page/props-parser.ts")}";
+import html from "../../html";
+import { SealiousItemListPage, BaseListPageFields } from "@sealcode/sealgen";
 
 export const actionName = "${action_name}";
 
-export default new (class ${action_name}Page extends SealiousItemListPage<typeof ${uppercase_collection}> {
-	propsParser = new AllQueryParams<BaseListPageProps>(
-		BaseListPagePropsShape,
-		BaseListPageDefaultProps
-	);
+const filterFields = {};
+
+export default new (class ${action_name}Page extends SealiousItemListPage<
+	typeof ${uppercase_collection},
+	typeof BaseListPageFields
+> {
+	fields = BaseListPageFields;
+
+	filterFields = filterFields;
+	filterControls = [];
 
 	async render(ctx: BaseContext) {
 		return html(
 			ctx,
-            "${uppercase_collection}",
+			"${uppercase_collection}",
 			tempstream/* HTML */ \`<div>
-                <h2>${uppercase_collection} List</h2>
-				<ul>
-					\${super.render(ctx)}
-				</ul>
+				<h2>${uppercase_collection} List</h2>
+				<table>
+					<thead>
+						<th>id</th>
+						\${Object.keys(${uppercase_collection}.fields).map(
+							(fieldname) => \`<th>\${fieldname}</th>\`
+						)}
+					</thead>
+					<tbody>
+						\${super.render(ctx)}
+					</tbody>
+				</table>
 			</div>\`
 		);
 	}
 
-    async renderItem(_: BaseContext, item: CollectionItem<typeof ${uppercase_collection}>) {
-		return tempstream\`<li>\${item.id}</li>\`;
+	async renderItem(_: BaseContext, item: CollectionItem<typeof ${uppercase_collection}>) {
+		return tempstream\`<tr><td>\${item.id}</td>\${Object.keys(${uppercase_collection}.fields).map(
+			(fieldname: keyof typeof ${uppercase_collection}["fields"]) =>
+				tempstream\`<td>\${item.get(fieldname)}</td>\`
+		)}</tr>\`;
 	}
 })(${uppercase_collection});
 `;

package/lib/templates/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/templates/list.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AACvD,mCAAoC;AACpC,gEAA4D;AAErD,MAAM,YAAY,GAAG,KAAK,EAChC,WAAmB,EACnB,eAAuB,EACL,EAAE;IACpB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;QAC9B,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,gDAAgD;QACzD,OAAO,EAAE,CACR,MAAM,kCAAe,EAAE,CACvB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACtB,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,UAAU;SACjB,CAAC,CAAC;KACH,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAoB,CAAC;IACjD,MAAM,oBAAoB,GACzB,UAAU,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;;;WAGG,oBAAoB,YAAY,GAAG,CAC5C,kCAAkC,CAClC;oBACkB,GAAG,CAAC,kBAAkB,CAAC;;;;;;UAMjC,GAAG,CAAC,uBAAuB,CAAC;kCACJ,GAAG,CAAC,+BAA+B,CAAC;;6BAEzC,WAAW;;4BAEZ,WAAW,4CAA4C,oBAAoB;;;;;;;;;eASxF,oBAAoB;;sBAEb,oBAAoB;;;;;;;;mEAQyB,oBAAoB;;;KAGlF,oBAAoB;CACxB,CAAC;AACF,CAAC,CAAC;AA5DW,QAAA,YAAY,gBA4DvB"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/templates/list.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AACvD,mCAAoC;AACpC,gEAA4D;AAErD,MAAM,YAAY,GAAG,KAAK,EAChC,WAAmB,EACnB,eAAuB,EACL,EAAE;IACpB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;QAC9B,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,gDAAgD;QACzD,OAAO,EAAE,CACR,MAAM,kCAAe,EAAE,CACvB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACtB,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,UAAU;SACjB,CAAC,CAAC;KACH,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAoB,CAAC;IACjD,MAAM,oBAAoB,GACzB,UAAU,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;;;WAGG,oBAAoB,YAAY,GAAG,CAC5C,kCAAkC,CAClC;;;;6BAI2B,WAAW;;;;4BAIZ,WAAW;UAC7B,oBAAoB;;;;;;;;;;;MAWxB,oBAAoB;;UAEhB,oBAAoB;;;;uBAIP,oBAAoB;;;;;;;;;;;;gEAYqB,oBAAoB;8DACtB,oBAAoB;8BACpD,oBAAoB;;;;KAI7C,oBAAoB;CACxB,CAAC;AACF,CAAC,CAAC;AAtEW,QAAA,YAAY,gBAsEvB"}

package/lib/templates/page.js

@@ -2,22 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pageTemplate = void 0;
 const import_path_1 = require("../utils/import-path");
-async function pageTemplate(action_name, fullpath) {
+async function pageTemplate(action_name, newfilefullpath) {
+    const rel = import_path_1.curryImportPath(newfilefullpath);
     return `import { BaseContext } from "koa";
 import { tempstream } from "tempstream";
-import { Page } from "${import_path_1.importPath(fullpath, "src/back/page/page")}";
+import { Page } from "@sealcode/sealgen";
+import html from "${rel("src/back/html")}";
 
 export const actionName = "${action_name}";
 
 export default new (class ${action_name}Page extends Page {
-
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	async canAccess(_: BaseContext) {
 		return { canAccess: true, message: "" };
 	}
 
 	async render(ctx: BaseContext) {
-		return tempstream/* HTML */ \`<div></div>\`;
+		return html(ctx, "${action_name}", tempstream/* HTML */ \`<div></div>\`);
 	}
 })();
 `;

package/lib/templates/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/templates/page.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAE3C,KAAK,UAAU,YAAY,CACjC,WAAmB,EACnB,QAAgB;IAEhB,OAAO;;wBAEgB,wBAAU,CAAC,QAAQ,EAAE,oBAAoB,CAAC;;6BAErC,WAAW;;4BAEZ,WAAW;;;;;;;;;;;CAWtC,CAAC;AACF,CAAC;AAtBD,oCAsBC"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/templates/page.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AAChD,KAAK,UAAU,YAAY,CACjC,WAAmB,EACnB,eAAuB;IAEvB,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;;;oBAGY,GAAG,CAAC,eAAe,CAAC;;6BAEX,WAAW;;4BAEZ,WAAW;;;;;;;sBAOjB,WAAW;;;CAGhC,CAAC;AACF,CAAC;AAvBD,oCAuBC"}

package/lib/utils/escape-url-params.js

@@ -5,6 +5,7 @@ function escape_url_params(url) {
     return url
         .split("/")
         .map((e) => (e.startsWith(":") ? `[${e.slice(1)}]` : e))
+        .filter((e) => e != "")
         .join("/");
 }
 exports.escape_url_params = escape_url_params;

package/lib/utils/escape-url-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"escape-url-params.js","sourceRoot":"","sources":["../../src/utils/escape-url-params.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAC,GAAW;IAC5C,OAAO,GAAG;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvD,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AALD,8CAKC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC9C,OAAO,GAAG;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACpE,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AALD,kDAKC"}
+{"version":3,"file":"escape-url-params.js","sourceRoot":"","sources":["../../src/utils/escape-url-params.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAC,GAAW;IAC5C,OAAO,GAAG;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;SACtB,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AAND,8CAMC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC9C,OAAO,GAAG;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACpE,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AALD,kDAKC"}