@saltcorn/data 0.8.0-beta.4 → 0.8.0

package/dist/base-plugin/index.d.ts

@@ -1,4 +1,84 @@
 export const types: ({
+    name: string;
+    sql_name: string;
+    contract: () => Function;
+    fieldviews: {
+        show: {
+            isEdit: boolean;
+            run: (v: any) => any;
+        };
+        checkboxes: {
+            isEdit: boolean;
+            run: (v: any) => any;
+        };
+        TrueFalse: {
+            isEdit: boolean;
+            run: (v: any) => "" | "True" | "False";
+        };
+        edit: {
+            isEdit: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+        tristate: {
+            isEdit: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+    };
+    attributes: object[];
+    readFromFormRecord: (rec: any, name: string) => boolean | null;
+    read: (v: object) => boolean | null;
+    readFromDB: (v: object) => object;
+    listAs: (v: object) => object;
+    validate: () => boolean;
+} | {
+    name: string;
+    sql_name: string;
+    contract: () => Function;
+    attributes: object[];
+    fieldviews: {
+        show: {
+            isEdit: boolean;
+            run: (d: any, req: any) => any;
+        };
+        showDay: {
+            isEdit: boolean;
+            run: (d: any, req: any) => any;
+        };
+        format: {
+            isEdit: boolean;
+            configFields: {
+                name: string;
+                label: string;
+                type: string;
+                sublabel: string;
+            }[];
+            run: (d: any, req: any, options: any) => string;
+        };
+        relative: {
+            isEdit: boolean;
+            run: (d: any, req: any) => string;
+        };
+        yearsAgo: {
+            isEdit: boolean;
+            run: (d: any, req: any) => string;
+        };
+        edit: {
+            isEdit: boolean;
+            blockDisplay: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+        editDay: {
+            isEdit: boolean;
+            blockDisplay: boolean;
+            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
+        };
+    };
+    presets: {
+        Now: () => Date;
+    };
+    read: (v: object, attrs: object) => object;
+    validate: () => boolean;
+} | {
     name: string;
     sql_name: string;
     attributes: ({ table }: object) => object;
@@ -279,86 +359,6 @@ export const types: ({
     validate_attributes: ({ min, max }: object) => boolean;
     read: (v: object) => object;
     validate: ({ min, max }: object) => boolean;
-} | {
-    name: string;
-    sql_name: string;
-    contract: () => Function;
-    fieldviews: {
-        show: {
-            isEdit: boolean;
-            run: (v: any) => any;
-        };
-        checkboxes: {
-            isEdit: boolean;
-            run: (v: any) => any;
-        };
-        TrueFalse: {
-            isEdit: boolean;
-            run: (v: any) => "" | "True" | "False";
-        };
-        edit: {
-            isEdit: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-        tristate: {
-            isEdit: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-    };
-    attributes: object[];
-    readFromFormRecord: (rec: any, name: string) => boolean | null;
-    read: (v: object) => boolean | null;
-    readFromDB: (v: object) => object;
-    listAs: (v: object) => object;
-    validate: () => boolean;
-} | {
-    name: string;
-    sql_name: string;
-    contract: () => Function;
-    attributes: object[];
-    fieldviews: {
-        show: {
-            isEdit: boolean;
-            run: (d: any, req: any) => any;
-        };
-        showDay: {
-            isEdit: boolean;
-            run: (d: any, req: any) => any;
-        };
-        format: {
-            isEdit: boolean;
-            configFields: {
-                name: string;
-                label: string;
-                type: string;
-                sublabel: string;
-            }[];
-            run: (d: any, req: any, options: any) => string;
-        };
-        relative: {
-            isEdit: boolean;
-            run: (d: any, req: any) => string;
-        };
-        yearsAgo: {
-            isEdit: boolean;
-            run: (d: any, req: any) => string;
-        };
-        edit: {
-            isEdit: boolean;
-            blockDisplay: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-        editDay: {
-            isEdit: boolean;
-            blockDisplay: boolean;
-            run: (nm: any, v: any, attrs: any, cls: any, required: any, field: any) => any;
-        };
-    };
-    presets: {
-        Now: () => Date;
-    };
-    read: (v: object, attrs: object) => object;
-    validate: ({}: object) => boolean;
 } | {
     name: string;
     sql_name: string;
@@ -448,83 +448,6 @@ export const types: ({
     validate: () => boolean;
 })[];
 export const viewtemplates: ({
-    name: string;
-    description: string;
-    get_state_fields: () => object[];
-    configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: string, viewname: string, { columns, layout, page_title, page_title_formula }: {
-        columns: object[];
-        layout: object;
-        page_title?: string | undefined;
-        page_title_formula: boolean;
-    }, state: object, extra: object, { showQuery }: {
-        showQuery: any;
-    }) => Promise<string>;
-    runMany: (table_id: number, viewname: string, { columns, layout }: {
-        columns: object[];
-        layout: object;
-    }, state: object, extra: object, { runManyQuery }: {
-        runManyQuery: any;
-    }) => Promise<object[]>;
-    renderRows: (table: object, viewname: string, { columns, layout }: {
-        columns: object[];
-        layout: object;
-    }, extra: object, rows: object[], state: any) => Promise<string>;
-    initial_config: Function;
-    display_state_form: boolean;
-    routes: {
-        run_action: (table_id: number, viewname: any, { columns, layout }: {
-            columns: object[];
-            layout: any;
-        }, body: any, { req, res }: {
-            req: object;
-            res: any;
-        }, { actionQuery }: {
-            actionQuery: any;
-        }) => Promise<object>;
-    };
-    getStringsForI18n({ layout }: {
-        layout: object;
-    }): string[];
-    authorise_get: ({ query, table_id }: {
-        query: any;
-        table_id: any;
-    }, { authorizeGetQuery }: {
-        authorizeGetQuery: any;
-    }) => Promise<any>;
-    queries: ({ table_id, exttable_name, name, configuration: { columns, layout }, req, res, }: {
-        table_id: any;
-        exttable_name: any;
-        name: any;
-        configuration: {
-            columns: any;
-            layout: any;
-        };
-        req: any;
-        res: any;
-    }) => {
-        showQuery(state: any, fields: any): Promise<{
-            rows: null;
-            message: string;
-        } | {
-            rows: import("@saltcorn/db-common/internal").Row[];
-            message: null;
-        }>;
-        runManyQuery(state: any, { where, limit, offset, orderBy, orderDesc }: {
-            where: any;
-            limit: any;
-            offset: any;
-            orderBy: any;
-            orderDesc: any;
-        }): Promise<import("@saltcorn/db-common/internal").Row[]>;
-        actionQuery(): Promise<{
-            json: any;
-        }>;
-        authorizeGetQuery(query: any, table_id: any): Promise<boolean>;
-    };
-    configCheck: (view: any) => Promise<string[]>;
-    connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
-} | {
     name: string;
     description: string;
     configuration_workflow: (req: object) => import("../models/workflow");
@@ -579,16 +502,16 @@ export const viewtemplates: ({
         }>;
         getRowQuery(id: any): Promise<import("@saltcorn/db-common/internal").Row | null>;
     };
-    configCheck: (view: any) => Promise<string[]>;
+    configCheck: (view: any) => Promise<{
+        errors: string[];
+        warnings: string[];
+    }>;
     connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
 } | {
     name: string;
     description: string;
     configuration_workflow: (req: object) => import("../models/workflow");
-    run: (table_id: number, viewname: string, {}: {
-        columns: any;
-        layout: any;
-    }, state: string, { res, req }: {
+    run: (table_id: number, viewname: string, cfg: any, state: string, { res, req }: {
         req: object;
         res: object;
     }, { editQuery }: {
@@ -694,6 +617,86 @@ export const viewtemplates: ({
         warnings: string[];
     }>;
     connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
+} | {
+    name: string;
+    description: string;
+    get_state_fields: () => object[];
+    configuration_workflow: (req: object) => import("../models/workflow");
+    run: (table_id: string, viewname: string, { columns, layout, page_title, page_title_formula }: {
+        columns: object[];
+        layout: object;
+        page_title?: string | undefined;
+        page_title_formula: boolean;
+    }, state: object, extra: object, { showQuery }: {
+        showQuery: any;
+    }) => Promise<string>;
+    runMany: (table_id: number, viewname: string, { columns, layout }: {
+        columns: object[];
+        layout: object;
+    }, state: object, extra: object, { runManyQuery }: {
+        runManyQuery: any;
+    }) => Promise<object[]>;
+    renderRows: (table: object, viewname: string, { columns, layout }: {
+        columns: object[];
+        layout: object;
+    }, extra: object, rows: object[], state: any) => Promise<string>;
+    initial_config: Function;
+    display_state_form: boolean;
+    routes: {
+        run_action: (table_id: number, viewname: any, { columns, layout }: {
+            columns: object[];
+            layout: any;
+        }, body: any, { req, res }: {
+            req: object;
+            res: any;
+        }, { actionQuery }: {
+            actionQuery: any;
+        }) => Promise<object>;
+    };
+    getStringsForI18n({ layout }: {
+        layout: object;
+    }): string[];
+    authorise_get: ({ query, table_id }: {
+        query: any;
+        table_id: any;
+    }, { authorizeGetQuery }: {
+        authorizeGetQuery: any;
+    }) => Promise<any>;
+    queries: ({ table_id, exttable_name, name, configuration: { columns, layout }, req, res, }: {
+        table_id: any;
+        exttable_name: any;
+        name: any;
+        configuration: {
+            columns: any;
+            layout: any;
+        };
+        req: any;
+        res: any;
+    }) => {
+        showQuery(state: any, fields: any): Promise<{
+            rows: null;
+            message: string;
+        } | {
+            rows: import("@saltcorn/db-common/internal").Row[];
+            message: null;
+        }>;
+        runManyQuery(state: any, { where, limit, offset, orderBy, orderDesc }: {
+            where: any;
+            limit: any;
+            offset: any;
+            orderBy: any;
+            orderDesc: any;
+        }): Promise<import("@saltcorn/db-common/internal").Row[]>;
+        actionQuery(): Promise<{
+            json: any;
+        }>;
+        authorizeGetQuery(query: any, table_id: any): Promise<boolean>;
+    };
+    configCheck: (view: any) => Promise<{
+        errors: string[];
+        warnings: string[];
+    }>;
+    connectedObjects: (configuration: any) => Promise<import("@saltcorn/types/base_types").ConnectedObjects>;
 } | {
     name: string;
     description: string;

package/dist/base-plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../base-plugin/index.js"],"names":[],"mappings":"AAuCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAsD;AACtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA2E;;;;4CAG9D,MAAM;yCAYN,MAAM"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../base-plugin/index.js"],"names":[],"mappings":"AAuCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAAsD;AACtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAA2E;;;;4CAG9D,MAAM;yCAYN,MAAM"}

package/dist/base-plugin/types.d.ts

@@ -468,7 +468,7 @@ export namespace date {
     export { presets_1 as presets };
     export function read_3(v: object, attrs: object): object;
     export { read_3 as read };
-    export function validate_3({}: object): boolean;
+    export function validate_3(): boolean;
     export { validate_3 as validate };
 }
 export namespace float {

package/dist/base-plugin/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../base-plugin/types.js"],"names":[],"mappings":";gBAySa,MAAM;oBAEN,MAAM;IAML,+CAsEX;IAMS;;gBAKiE;;;;YAY1C,6BAAyB;;;;;YAElC,mCAEO;;;;;;YAED,mCAA4C;;;;;;YAQjE,mCAAqD;;;;;;YASrD,yDAAmE;;;;;;YAOzC,mCAA6B;;;;;;;YAU9C;;;;;;;;;;;;;;;;;;;;;iBA8Bb;YACI,6FA4DK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAiDL,6FAuCF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAyCE,6FAmBF;;;;;;;;YAWE,6FAeF;;;;;;;;;;;;YAgBE,8FAcoB;;;;;;;;;;;;;YAYpB,8FAYoB;;;;;;;;YAWpB,8FAWD;;;;IAOF,0CAQL;;QAYK;;mBAAmB;QAMZ;;mBAAyD;;IAOpE,+FAYG;IAMgB,iFAEwB;;;kBAuBlC,MAAM;;sBAEN,MAAM;;IAQP;;;gBAAoD;;;;;;;;;YAahC,uCAAc;;;;;;;;;;;;;;YAYnC,8FAoBJ;;;;;YA12BS;;;;gBAOb;;;;;;YAGI,yGAmBD;;;;YAGU;;;;gBAOb;;;;;;;;YAKI,qHAmCJ;;;;YAIa;;;;;;;;;;iBAUb;;;;YAEI,0DAgBF;;;;;;;;;;;;;;;;YAUE,qHA6BJ;;;;;YA4tBiB;;;;;gBAOb;;;;;;YAGI,0DAWF;;;;YAGW;;;;;gBAOb;;;;;;YAGI,qHAsBJ;;;;;wBAGM,MAAM,EAAE;;IASE,qEACoB;;IAKnC,0CAWL;;IAMC,0DAKG;;;;kBAuZM,MAAM;;sBAEN,MAAM;;IAKP,uCAAa;;;;;;YAcd,oCASG;;;;;;;YASH,oCAKK;;;;;;YASL,sDAAyD;;;;;;YASzD,8FAWD;;;;;;;YASC,8FAqBA;;;;;wBAGE,MAAM,EAAE;;IAOC,2EAKnB;IAKK,kDAUL;;IAKW,8CAAU;IAKd,0CAAwB;IAItB,sCAAiB;;;;kBA1VhB,MAAM;;sBAEN,MAAM;;IAKP,uCAAa;;wBACZ,MAAM,EAAE;;;;;;YAeV,8CAKK;;;;;;;YASL,8CAKK;;;;;;;;;;;;;YAiBL,+DAWJ;;;;;;YASI,iDAKJ;;;;;;YASI,iDAGJ;;;;;;;;YAWI,8FAkBD;;;;;;;;;YAWC,8FAkBD;;;;;;QASD,qBAAgB;;;IAOjB,yDAWL;;IAMC,gDAEkC;;;;kBAlTzB,MAAM;;sBAEN,MAAM;;IAQP;;;iBAAmD;;;;;;YAY/B,uCAAc;;;;;;;;;YAUnC,8FAiBD;;;;;;;;;;;;;;;;;YAj8BH,qHAaD;;;;;;;;wBA47BO,MAAM,EAAE;;IAWb,+DAUL;;IAMC,mEAKG;;;;kBA1KM,MAAM;;sBAEN,MAAM;;IAKP,uCAAY;;;;;;YAcb,oCAMG;;;;;;;;;YAWH,8FAWD;;;;;;wBAGG,MAAM,EAAE;;IAMb,0CAOL;;IAIS,sCAET"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../base-plugin/types.js"],"names":[],"mappings":";gBA2Sa,MAAM;oBAEN,MAAM;IAML,+CAsEX;IAMS;;gBAK+D;;;;YAYxC,6BAAyB;;;;;YAGjD,mCAC2D;;;;;;YAI3D,mCAA8C;;;;;;YAS9C,mCAAqD;;;;;;YASrD,yDAAmE;;;;;;YAOzC,mCAA6B;;;;;;;YAU9C;;;;;;;;;;;;;;;;;;;;;iBA8Bb;YACI,6FAiEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAiDH,6FAyCF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAyCE,6FAqBF;;;;;;;;YAWE,6FAeF;;;;;;;;;;;;YAgBE,8FAcoB;;;;;;;;;;;;;YAYpB,8FAYoB;;;;;;;;YAWpB,8FAWD;;;;IAOF,0CAQL;;QAYK;;mBAAmB;QAMZ;;mBAAyD;;IAOpE,+FAYC;IAMkB,iFAEwB;;;kBAuBlC,MAAM;;sBAEN,MAAM;;IAQP;;;gBAAoD;;;;;;;;;YAahC,uCAAc;;;;;;;;;;;;;;YAYnC,8FAoBJ;;;;;YAx3BS;;;;gBAOb;;;;;;YAGI,yGAmBD;;;;YAGU;;;;gBAOb;;;;;;;;YAKI,qHAmCJ;;;;YAIa;;;;;;;;;;iBAUb;;;;YAEI,0DAgBF;;;;;;;;;;;;;;;;YAUE,qHA6BJ;;;;;YA0uBiB;;;;;gBAOb;;;;;;YAGI,0DAWF;;;;YAGW;;;;;gBAOb;;;;;;YAGI,qHAsBJ;;;;;wBAGM,MAAM,EAAE;;IASE,qEACoB;;IAKnC,0CAWL;;IAMC,0DAKC;;;;kBAoZQ,MAAM;;sBAEN,MAAM;;IAKP,uCAAa;;;;;;YAcd,oCASG;;;;;;;YASH,oCAKG;;;;;;YASH,sDAAyD;;;;;;YASzD,8FAWD;;;;;;;YASC,8FAqBE;;;;;wBAGA,MAAM,EAAE;;IAOC,2EAKnB;IAKK,kDAUL;;IAKW,8CAAU;IAKd,0CAAwB;IAItB,sCAAiB;;;;kBAvVhB,MAAM;;sBAEN,MAAM;;IAKP,uCAAa;;wBACZ,MAAM,EAAE;;;;;;YAeV,8CAKG;;;;;;;YASH,8CAKG;;;;;;;;;;;;;YAiBH,+DAWJ;;;;;;YASI,iDAKJ;;;;;;YASI,iDAGJ;;;;;;;;YAWI,8FAkBD;;;;;;;;;YAWC,8FAkBD;;;;;;QASD,qBAAgB;;;IAOjB,yDAWL;;IAKS,sCAA2C;;;;kBA/S1C,MAAM;;sBAEN,MAAM;;IAQP;;;iBAAmD;;;;;;YAY/B,uCAAc;;;;;;;;;YAUnC,8FAiBD;;;;;;;;;;;;;;;;;YA/8BH,qHAaD;;;;;;;;wBA08BO,MAAM,EAAE;;IAWb,+DAUL;;IAMC,mEAKC;;;;kBA1KQ,MAAM;;sBAEN,MAAM;;IAKP,uCAAY;;;;;;YAcb,oCAMG;;;;;;;;;YAWH,8FAWD;;;;;;wBAGG,MAAM,EAAE;;IAMb,0CAOL;;IAIS,sCAET"}

package/dist/base-plugin/types.js

@@ -8,7 +8,7 @@
  * @subcategory base-plugin
  */
 const moment = require("moment");
-const { input, select, option, text, div, h3, a, i, button, textarea, span, img, text_attr, label, script, domReady, section, pre, code } = require("@saltcorn/markup/tags");
+const { input, select, option, text, div, h3, a, i, button, textarea, span, img, text_attr, label, script, domReady, section, pre, code, } = require("@saltcorn/markup/tags");
 const { contract, is } = require("contractis");
 const { radio_group, checkbox_group } = require("@saltcorn/markup/helpers");
 const { getState } = require("../db/state");
@@ -316,9 +316,13 @@ const string = {
          */
         as_text: { isEdit: false, run: (s) => text_attr(s || "") },
         preFormatted: {
-            isEdit: false, run: (s) => s ? span({ style: "white-space:pre" }, text_attr(s || "")) : s
+            isEdit: false,
+            run: (s) => s ? span({ style: "white-space:pre" }, text_attr(s || "")) : s,
+        },
+        code: {
+            isEdit: false,
+            run: (s) => (s ? pre(code(text_attr(s || ""))) : s),
         },
-        code: { isEdit: false, run: (s) => s ? pre(code(text_attr(s || ""))) : s },
         /**
          * @namespace
          * @category saltcorn-data
@@ -382,27 +386,29 @@ const string = {
                 },
             ],
             run: (nm, v, attrs, cls, required, field) => attrs.options && (attrs.options.length > 0 || !required)
-                ? (attrs.readonly ? input({
-                    type: "text",
-                    class: ["form-control", "form-select", cls],
-                    name: text_attr(nm),
-                    "data-fieldname": text_attr(field.name),
-                    id: `input${text_attr(nm)}`,
-                    onChange: attrs.onChange,
-                    readonly: attrs.readonly,
-                }) : select({
-                    class: ["form-control", "form-select", cls],
-                    name: text_attr(nm),
-                    "data-fieldname": text_attr(field.name),
-                    id: `input${text_attr(nm)}`,
-                    disabled: attrs.disabled,
-                    onChange: attrs.onChange,
-                }, required || attrs.force_required
-                    ? getStrOptions(v, attrs.options)
-                    : [
-                        option({ value: "" }, attrs.neutral_label || ""),
-                        ...getStrOptions(v, attrs.options),
-                    ]))
+                ? attrs.readonly
+                    ? input({
+                        type: "text",
+                        class: ["form-control", "form-select", cls],
+                        name: text_attr(nm),
+                        "data-fieldname": text_attr(field.name),
+                        id: `input${text_attr(nm)}`,
+                        onChange: attrs.onChange,
+                        readonly: attrs.readonly,
+                    })
+                    : select({
+                        class: ["form-control", "form-select", cls],
+                        name: text_attr(nm),
+                        "data-fieldname": text_attr(field.name),
+                        id: `input${text_attr(nm)}`,
+                        disabled: attrs.disabled,
+                        onChange: attrs.onChange,
+                    }, required || attrs.force_required
+                        ? getStrOptions(v, attrs.options)
+                        : [
+                            option({ value: "" }, attrs.neutral_label || ""),
+                            ...getStrOptions(v, attrs.options),
+                        ])
                 : attrs.options
                     ? i("None available")
                     : attrs.calcOptions
@@ -429,7 +435,9 @@ const string = {
                             maxlength: isdef(attrs.max_length) && attrs.max_length,
                             minlength: isdef(attrs.min_length) && attrs.min_length,
                             pattern: !!attrs.regexp && attrs.regexp,
-                            title: !!attrs.re_invalid_error && !!attrs.regexp && attrs.re_invalid_error,
+                            title: !!attrs.re_invalid_error &&
+                                !!attrs.regexp &&
+                                attrs.re_invalid_error,
                             id: `input${text_attr(nm)}`,
                             ...(isdef(v) && { value: text_attr(v) }),
                         }),
@@ -1250,7 +1258,7 @@ const date = {
      * @param {object} param
      * @returns {boolean}
      */
-    validate: ({}) => (v) => v instanceof Date && !isNaN(v),
+    validate: () => (v) => v instanceof Date && !isNaN(v),
 };
 /**
  * Boolean Type
@@ -1282,7 +1290,7 @@ const bool = {
             isEdit: false,
             run: (v) => typeof v === "undefined" || v === null
                 ? ""
-                : !!v
+                : v
                     ? i({
                         class: "fas fa-lg fa-check-circle text-success",
                     })