@saltcorn/data 0.6.3 → 0.6.4-beta.4

package/dist/models/discovery.js

@@ -5,10 +5,13 @@
  * @module models/discovery
  * @subcategory models
  */
-const db = require("../db");
-const { getState } = require("../db/state");
-const { available_languages } = require("./config");
-const Table = require("./table");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const db_1 = __importDefault(require("../db"));
+const state_1 = __importDefault(require("../db/state"));
+const { getState } = state_1.default;
+const table_1 = __importDefault(require("./table"));
 // create table discmetable(id serial primary key, name text, age integer not null); ALTER TABLE discmetable OWNER TO tomn;
 /**
  * List of discoverable tables.
@@ -18,9 +21,9 @@ const Table = require("./table");
  * @returns {Promise<object[]>} all tables that can be imported to Saltcorn from current tenant database schema
  */
 const discoverable_tables = async (schema0) => {
-    const schema = schema0 || db.getTenantSchema();
-    const { rows, } = await db.query("select * from information_schema.tables where table_schema=$1 order by table_name", [schema]);
-    const myTables = await Table.find({});
+    const schema = schema0 || db_1.default.getTenantSchema();
+    const { rows } = await db_1.default.query("select * from information_schema.tables where table_schema=$1 order by table_name", [schema]);
+    const myTables = await table_1.default.find({});
     const myTableNames = myTables.map((t) => t.name);
     const discoverable = rows.filter((t) => !(myTableNames.includes(t.table_name) || t.table_name.startsWith("_sc_")));
     return discoverable;
@@ -31,8 +34,8 @@ const discoverable_tables = async (schema0) => {
  * @returns {Promise<object[]>} Return list of views
  */
 const get_existing_views = async (schema0) => {
-    const schema = schema0 || db.getTenantSchema();
-    const { rows, } = await db.query("select * from information_schema.views where table_schema=$1", [schema]);
+    const schema = schema0 || db_1.default.getTenantSchema();
+    const { rows } = await db_1.default.query("select * from information_schema.views where table_schema=$1", [schema]);
     return rows;
 };
 /**
@@ -49,7 +52,7 @@ const findType = (sql_name) => {
         character: "String",
         "character varying": "String",
         //varchar: "String",
-        date: "Date"
+        date: "Date",
         // TBD Implement time type in Saltcorn
         // "time without time zone": "Date",
         // TBD Implement timestamp type in Saltcorn
@@ -71,10 +74,10 @@ const findType = (sql_name) => {
  * @returns {Promise<object>}
  */
 const discover_tables = async (tableNames, schema0) => {
-    const schema = schema0 || db.getTenantSchema();
-    const packTables = [];
+    const schema = schema0 || db_1.default.getTenantSchema();
+    const packTables = new Array();
     for (const tnm of tableNames) {
-        const { rows, } = await db.query("select * from information_schema.columns where table_schema=$1 and table_name=$2", [schema, tnm]);
+        const { rows } = await db_1.default.query("select * from information_schema.columns where table_schema=$1 and table_name=$2", [schema, tnm]);
         // TBD add logic about column length, scale, etc
         const fields = rows
             .map((c) => ({
@@ -85,7 +88,7 @@ const discover_tables = async (tableNames, schema0) => {
         }))
             .filter((f) => f.type);
         // try to find column name for primary key of table
-        const pkq = await db.query(`SELECT c.column_name
+        const pkq = await db_1.default.query(`SELECT c.column_name
       FROM information_schema.table_constraints tc 
       JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name) 
       JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema
@@ -98,7 +101,7 @@ const discover_tables = async (tableNames, schema0) => {
             field.is_unique = true;
         });
         // try to find foreign keys
-        const fkq = await db.query(`SELECT
+        const fkq = await db_1.default.query(`SELECT
       tc.table_schema, 
       tc.constraint_name, 
       tc.table_name, 
@@ -116,7 +119,7 @@ const discover_tables = async (tableNames, schema0) => {
         AND ccu.table_schema = tc.table_schema
   WHERE tc.constraint_type = 'FOREIGN KEY' and tc.table_schema=$1 AND tc.table_name=$2;`, [schema, tnm]);
         // construct foreign key relations
-        fkq.rows.forEach(({ column_name, foreign_table_name, foreign_column_name }) => {
+        fkq.rows.forEach(({ column_name, foreign_table_name, foreign_column_name, }) => {
             const field = fields.find((f) => f.name === column_name);
             field.type = "Key";
             field.reftable_name = foreign_table_name;
@@ -125,13 +128,20 @@ const discover_tables = async (tableNames, schema0) => {
         packTables.push({ name: tnm, fields, min_role_read: 1, min_role_write: 1 });
     }
     packTables.forEach((t) => {
-        t.fields.forEach((f) => {
-            if (f.type === "Key") {
-                const reftable = packTables.find((reft) => reft.name === f.reftable_name);
-                const refpk = reftable.fields.find((rtf) => rtf.primary_key);
-                f.reftype = refpk.type;
-            }
-        });
+        t.fields &&
+            t.fields.forEach((f) => {
+                if (f.type === "Key") {
+                    const reftable = packTables.find((reft) => reft.name === f.reftable_name);
+                    if (!reftable)
+                        throw new Error(`Unable to find table '${f.reftable_name}'`);
+                    if (!reftable.fields)
+                        throw new Error(`The table '${f.reftable_name}' has no fields`);
+                    const refpk = reftable.fields.find((rtf) => rtf.primary_key);
+                    if (!refpk)
+                        throw new Error(`The table '${f.reftable_name}' has no primary key`);
+                    f.reftype = refpk.type;
+                }
+            });
     });
     return { tables: packTables };
 };
@@ -143,12 +153,14 @@ const discover_tables = async (tableNames, schema0) => {
 const implement_discovery = async (pack) => {
     for (const table of pack.tables) {
         const { fields, ...tblRow } = table;
-        const id = await db.insert("_sc_tables", tblRow);
+        const id = await db_1.default.insert("_sc_tables", tblRow);
         table.id = id;
     }
     for (const table of pack.tables) {
-        for (const field of table.fields) {
-            await db.insert("_sc_fields", { ...field, table_id: table.id });
+        if (table.fields) {
+            for (const field of table.fields) {
+                await db_1.default.insert("_sc_fields", { ...field, table_id: table.id });
+            }
         }
     }
     // refresh Saltcorn table list (in memory)

package/dist/models/discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../models/discovery.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../models/discovery.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAOH,+CAAuB;AACvB,wDAAgC;AAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAK,CAAC;AAE3B,oDAA4B;AAE5B,2HAA2H;AAC3H;;;;;;GAMG;AACH,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAgB,EAAkB,EAAE;IACrE,MAAM,MAAM,GAAG,OAAO,IAAI,YAAE,CAAC,eAAe,EAAE,CAAC;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAE,CAAC,KAAK,CAC7B,mFAAmF,EACnF,CAAC,MAAM,CAAC,CACT,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,CAAC,CAAM,EAAE,EAAE,CACT,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAC5E,CAAC;IACF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AACF;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAAgB,EAAkB,EAAE;IACpE,MAAM,MAAM,GAAG,OAAO,IAAI,YAAE,CAAC,eAAe,EAAE,CAAC;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAE,CAAC,KAAK,CAC7B,8DAA8D,EAC9D,CAAC,MAAM,CAAC,CACT,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AACF;;;;GAIG;AACH,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAO,EAAE;IACzC,MAAM,KAAK,GAAuB;QAChC,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,OAAO;QAChB,SAAS,EAAE,QAAQ;QACnB,mBAAmB,EAAE,QAAQ;QAC7B,oBAAoB;QACpB,IAAI,EAAE,MAAM;QACZ,sCAAsC;QACtC,oCAAoC;QACpC,2CAA2C;QAC3C,yCAAyC;QACzC,0CAA0C;QAC1C,mBAAmB;KACpB,CAAC,QAAQ,CAAC,CAAC;IACZ,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IACxB,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAC7C,CAAC,CAAC,CAAC,EAAE,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CACzD,CAAC;IACF,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;KACb;AACH,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,eAAe,GAAG,KAAK,EAC3B,UAAoB,EACpB,OAAgB,EACuB,EAAE;IACzC,MAAM,MAAM,GAAG,OAAO,IAAI,YAAE,CAAC,eAAe,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,IAAI,KAAK,EAAa,CAAC;IAE1C,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC5B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAE,CAAC,KAAK,CAC7B,kFAAkF,EAClF,CAAC,MAAM,EAAE,GAAG,CAAC,CACd,CAAC;QACF,gDAAgD;QAChD,MAAM,MAAM,GAAG,IAAI;aAChB,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;YAChB,IAAI,EAAE,CAAC,CAAC,WAAW;YACnB,KAAK,EAAE,CAAC,CAAC,WAAW;YACpB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3B,QAAQ,EAAE,CAAC,CAAC,WAAW,KAAK,IAAI;SACjC,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAEnC,mDAAmD;QACnD,MAAM,GAAG,GAAG,MAAM,YAAE,CAAC,KAAK,CACxB;;;;;2FAKqF,EACrF,CAAC,MAAM,EAAE,GAAG,CAAC,CACd,CAAC;QACF,mDAAmD;QACnD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAA2B,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YACnE,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;YACzB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,2BAA2B;QAC3B,MAAM,GAAG,GAAG,MAAM,YAAE,CAAC,KAAK,CACxB;;;;;;;;;;;;;;;;wFAgBkF,EAClF,CAAC,MAAM,EAAE,GAAG,CAAC,CACd,CAAC;QACF,kCAAkC;QAClC,GAAG,CAAC,IAAI,CAAC,OAAO,CACd,CAAC,EACC,WAAW,EACX,kBAAkB,EAClB,mBAAmB,GAKpB,EAAE,EAAE;YACH,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YAChE,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;YACnB,KAAK,CAAC,aAAa,GAAG,kBAAkB,CAAC;YACzC,KAAK,CAAC,OAAO,GAAG,mBAAmB,CAAC;QACtC,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;KAC7E;IACD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,CAAC,CAAC,MAAM;YACN,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAW,EAAE,EAAE;gBAC/B,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,EAAE;oBACpB,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAC9B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,aAAa,CACxC,CAAC;oBACF,IAAI,CAAC,QAAQ;wBACX,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC;oBAC/D,IAAI,CAAC,QAAQ,CAAC,MAAM;wBAClB,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,aAAa,iBAAiB,CAAC,CAAC;oBAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAChC,CAAC,GAAa,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CACnC,CAAC;oBACF,IAAI,CAAC,KAAK;wBACR,MAAM,IAAI,KAAK,CACb,cAAc,CAAC,CAAC,aAAa,sBAAsB,CACpD,CAAC;oBACJ,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;iBACxB;YACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;AAChC,CAAC,CAAC;AACF;;;;GAIG;AACH,MAAM,mBAAmB,GAAG,KAAK,EAAE,IAElC,EAAiB,EAAE;IAClB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;QAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC;QACpC,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACjD,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;KACf;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;QAC/B,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBAChC,MAAM,YAAE,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;aACjE;SACF;KACF;IACD,0CAA0C;IAC1C,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,cAAc,EAAE,CAAC;AAC3D,CAAC,CAAC;AACF,iBAAS;IACP,mBAAmB;IACnB,eAAe;IACf,mBAAmB;IACnB,kBAAkB;CACnB,CAAC"}

package/dist/models/email.d.ts

@@ -7,7 +7,7 @@ import { Transporter } from "nodemailer";
 import User from "./user";
 declare const _default: {
     getMailTransport: () => Transporter<any>;
-    transformBootstrapEmail: (bsHtml: string) => Promise<any>;
+    transformBootstrapEmail: (bsHtml: string, container?: boolean) => Promise<string>;
     send_verification_email: (user: User, req: any) => Promise<any>;
 };
 export = _default;

package/dist/models/email.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../models/email.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAmB,WAAW,EAAE,MAAM,YAAY,CAAC;AAU1D,OAAO,IAAI,MAAM,QAAQ,CAAC;;;;;;AAgF1B,kBAIE"}
+{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../models/email.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAmB,WAAW,EAAE,MAAM,YAAY,CAAC;AAU1D,OAAO,IAAI,MAAM,QAAQ,CAAC;;;;;;AAsF1B,kBAIE"}

package/dist/models/email.js

@@ -9,15 +9,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
  */
 const nodemailer_1 = require("nodemailer");
 const { getState } = require("../db/state");
-const BootstrapEmail = require("bootstrap-email"); // no typings available
+const BootstrapEmail = require("bootstrap-email_with-node-sass-6"); // no typings available
 const tmp_promise_1 = require("tmp-promise");
 const promises_1 = require("fs/promises");
 const tags_1 = __importDefault(require("@saltcorn/markup/tags"));
 const { div } = tags_1.default;
 const view_1 = __importDefault(require("./view"));
 const uuid_1 = require("uuid");
-const db_1 = __importDefault(require("../db"));
-const { mockReqRes } = require("../tests/mocks");
+const index_1 = __importDefault(require("../db/index"));
+const mocks_1 = __importDefault(require("../tests/mocks"));
+const { mockReqRes } = mocks_1.default;
 /**
  * @returns {Transporter}
  */
@@ -35,12 +36,14 @@ const getMailTransport = () => {
     });
 };
 /**
- * @param {object} bsHtml
- * @returns {object}
+ * @param {string} bsHtml
+ * @param {boolean} [container=true] wrap in a container div (used by unit test)
+ * @returns {Promise<string>}
  */
-const transformBootstrapEmail = async (bsHtml) => {
+const transformBootstrapEmail = async (bsHtml, container = true) => {
     const filename = await (0, tmp_promise_1.tmpName)();
-    await (0, promises_1.writeFile)(filename, div({ class: "container" }, bsHtml));
+    const html = container ? div({ class: "container" }, bsHtml) : bsHtml;
+    await (0, promises_1.writeFile)(filename, html);
     const template = new BootstrapEmail(filename);
     const email = template.compile();
     await (0, promises_1.unlink)(filename);
@@ -60,7 +63,7 @@ const send_verification_email = async (user, req) => {
         if (verification_view) {
             const verification_token = (0, uuid_1.v4)();
             try {
-                await db_1.default.update("users", { verification_token }, user.id);
+                await index_1.default.update("users", { verification_token }, user.id);
                 user.verification_token = verification_token;
                 const htmlBs = await verification_view.run({ id: user.id }, mockReqRes);
                 const html = await transformBootstrapEmail(htmlBs);

package/dist/models/email.js.map

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

package/dist/models/eventlog.d.ts

@@ -27,7 +27,7 @@ declare class EventLog {
      * @param {object} selopts
      * @returns {Promise<EventLog[]>}
      */
-    static find(where: Where, selopts: SelectOptions): Promise<EventLog[]>;
+    static find(where: Where, selopts?: SelectOptions): Promise<EventLog[]>;
     /**
      * @param {object} where
      * @returns {Promise<EventLog>}

package/dist/models/eventlog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventlog.d.ts","sourceRoot":"","sources":["../../models/eventlog.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAGzE;;;GAGG;AACH,cAAM,QAAQ;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;gBACS,CAAC,EAAE,WAAW;IAY1B;;;;OAIG;WACU,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAK5E;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;IAKrD;;;OAGG;WACU,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAW3D;;;OAGG;WACU,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD;;OAEG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;OAGG;WACU,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAqB7D;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIxC;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAK3C;AAED,kBAAU,QAAQ,CAAC;IACjB,KAAY,WAAW,GAAG;QACxB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,QAAQ,EAAE,IAAI,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;KACtB,CAAC;CACH;AACD,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AAExC,SAAS,QAAQ,CAAC"}
+{"version":3,"file":"eventlog.d.ts","sourceRoot":"","sources":["../../models/eventlog.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAGzE;;;GAGG;AACH,cAAM,QAAQ;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;gBACS,CAAC,EAAE,WAAW;IAY1B;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,QAAQ,EAAE,CAAC;IAKtB;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;IAKrD;;;OAGG;WACU,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAW3D;;;OAGG;WACU,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD;;OAEG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;OAGG;WACU,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAqB7D;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIxC;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAK3C;AAED,kBAAU,QAAQ,CAAC;IACjB,KAAY,WAAW,GAAG;QACxB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,QAAQ,EAAE,IAAI,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;KACtB,CAAC;CACH;AACD,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AAExC,SAAS,QAAQ,CAAC"}

package/dist/models/eventlog.js.map

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

package/dist/models/expression.d.ts

@@ -1,28 +1,24 @@
 import Table from "./table";
-import { Row } from "@saltcorn/db-common/internal";
+import { Row, Where } from "@saltcorn/db-common/internal";
 import Field from "./field";
+import { PluginFunction } from "@saltcorn/types/base_types";
 /**
  * @param {string} s
  * @returns {boolean|void}
  */
 declare function expressionValidator(s: string): true | string;
-/**
- * @param {string} expression
- * @returns {string}
- */
-declare function jsexprToSQL(expression: string): string;
 /**
  * @param {string} expression
  * @throws {Error}
  * @returns {object}
  */
-declare function jsexprToWhere(expression: string, extraCtx?: any): any;
+declare function jsexprToWhere(expression: string, extraCtx?: any): Where;
 /**
  * @param {string} expression
  * @param {object[]} statefuns
  * @returns {object}
  */
-declare function transform_for_async(expression: string, statefuns: Record<string, /*PluginFunction*/ any>): {
+declare function transform_for_async(expression: string, statefuns: Record<string, PluginFunction>): {
     isAsync: boolean;
     expr_string: string;
 };
@@ -32,6 +28,12 @@ declare function transform_for_async(expression: string, statefuns: Record<strin
  * @returns {any}
  */
 declare function get_expression_function(expression: string, fields: Array<Field>): Function;
+/**
+ * @param {string} expression
+ * @param {object[]} fields
+ * @returns {any}
+ */
+declare function eval_expression(expression: string, row: any, user?: any): any;
 /**
  * @param {string} expression
  * @param {object[]} fields
@@ -50,10 +52,10 @@ declare const _default: {
     apply_calculated_fields: typeof apply_calculated_fields;
     get_async_expression_function: typeof get_async_expression_function;
     get_expression_function: typeof get_expression_function;
+    eval_expression: typeof eval_expression;
     recalculate_for_stored: (table: Table) => Promise<void>;
     transform_for_async: typeof transform_for_async;
     apply_calculated_fields_stored: (row: Row, fields: Field[]) => Promise<Row>;
-    jsexprToSQL: typeof jsexprToSQL;
     jsexprToWhere: typeof jsexprToWhere;
 };
 export = _default;

package/dist/models/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../models/expression.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AACnD,OAAO,KAAK,MAAM,SAAS,CAAC;AAG5B;;;GAGG;AACH,iBAAS,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAQrD;AAED;;;GAGG;AACH,iBAAS,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG/C;AASD;;;;GAIG;AACH,iBAAS,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAQ,GAAG,GAAG,CAqFlE;AAMD;;;;GAIG;AACH,iBAAS,mBAAmB,CAC1B,UAAU,EAAE,MAAM,EAElB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC;;;EAuBlD;AAED;;;;GAIG;AACH,iBAAS,uBAAuB,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GACnB,QAAQ,CAUV;AAED;;;;;GAKG;AACH,iBAAS,6BAA6B,CACpC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,EACpB,YAAY,KAAK,GAChB,GAAG,CAYL;AAED;;;;GAIG;AACH,iBAAS,uBAAuB,CAC9B,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAChB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GACnB,KAAK,CAAC,GAAG,CAAC,CA4BZ;;;;;;;;;;;;AA8DD,kBAUE"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../models/expression.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;;GAGG;AACH,iBAAS,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAQrD;AASD;;;;GAIG;AACH,iBAAS,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,GAAE,GAAQ,GAAG,KAAK,CAqFpE;AAMD;;;;GAIG;AACH,iBAAS,mBAAmB,CAC1B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC;;;EAuB1C;AAED;;;;GAIG;AACH,iBAAS,uBAAuB,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GACnB,QAAQ,CAUV;AAED;;;;GAIG;AACH,iBAAS,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,GAAG,CAUtE;AAED;;;;;GAKG;AACH,iBAAS,6BAA6B,CACpC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,EACpB,YAAY,KAAK,GAChB,GAAG,CAYL;AAED;;;;GAIG;AACH,iBAAS,uBAAuB,CAC9B,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAChB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,GACnB,KAAK,CAAC,GAAG,CAAC,CA4BZ;;;;;;;;;;;;AA8DD,kBAUE"}

package/dist/models/expression.js

@@ -23,15 +23,6 @@ function expressionValidator(s) {
         return e.message;
     }
 }
-/**
- * @param {string} expression
- * @returns {string}
- */
-function jsexprToSQL(expression) {
-    if (!expression)
-        return expression;
-    return expression.replace(/===/g, "=").replace(/==/g, "=").replace(/"/g, "'");
-}
 /**
  * @param {string} expression
  * @throws {Error}
@@ -128,9 +119,7 @@ function isIdentifierWithName(node) {
  * @param {object[]} statefuns
  * @returns {object}
  */
-function transform_for_async(expression, 
-// TODO ch replace any as soon as the unit tests are migrated
-statefuns) {
+function transform_for_async(expression, statefuns) {
     var isAsync = false;
     const ast = (0, acorn_1.parseExpressionAt)(expression, 0, {
         ecmaVersion: 2020,
@@ -165,6 +154,19 @@ function get_expression_function(expression, fields) {
     const { getState } = require("../db/state");
     return (0, vm_1.runInNewContext)(`(${args})=>(${expression})`, getState().function_context);
 }
+/**
+ * @param {string} expression
+ * @param {object[]} fields
+ * @returns {any}
+ */
+function eval_expression(expression, row, user) {
+    const field_names = Object.keys(row);
+    const args = field_names.includes("user")
+        ? `{${field_names.join()}}`
+        : `{${field_names.join()}}, user`;
+    const { getState } = require("../db/state");
+    return (0, vm_1.runInNewContext)(`(${args})=>(${expression})`, getState().function_context)(row, user);
+}
 /**
  * @param {string} expression
  * @param {object[]} fields
@@ -289,10 +291,10 @@ module.exports = {
     apply_calculated_fields,
     get_async_expression_function,
     get_expression_function,
+    eval_expression,
     recalculate_for_stored,
     transform_for_async,
     apply_calculated_fields_stored,
-    jsexprToSQL,
     jsexprToWhere,
 };
 //# sourceMappingURL=expression.js.map

package/dist/models/expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../models/expression.ts"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,2BAA6C;AAC7C,iCAAgD;AAChD,2CAAqC;AAErC,qCAAmC;AAMnC;;;GAGG;AACH,SAAS,mBAAmB,CAAC,CAAS;IACpC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,iBAAiB,CAAC;IAClD,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,WAAM,CAAC,CAAC,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,CAAC,OAAO,CAAC;KAClB;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,UAAkB;IACrC,IAAI,CAAC,UAAU;QAAE,OAAO,UAAU,CAAC;IACnC,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAChF,CAAC;AASD;;;;GAIG;AACH,SAAS,aAAa,CAAC,UAAkB,EAAE,WAAgB,EAAE;IAC3D,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,IAAI;QACF,MAAM,GAAG,GAAG,IAAA,yBAAiB,EAAC,UAAU,EAAE,CAAC,EAAE;YAC3C,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,KAAK;SACjB,CAAC,CAAC;QACH,mBAAmB;QACnB,MAAM,OAAO,GAAgC,CAAC,IAAkB,EAAO,EAAE,CACvE,CAAmB;YACjB,gBAAgB;gBACd,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC;gBAClC,MAAM,SAAS,GACb,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;gBACxD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC;gBACpC,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;oBACzC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;oBACzB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;gBAC9B,MAAM,SAAS,GAAqB;oBAClC,IAAI;wBACF,OAAO,GAAG,CAAC;oBACb,CAAC;oBACD,KAAK;wBACH,OAAO,GAAG,CAAC;oBACb,CAAC;oBACD,IAAI;wBACF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;oBACtB,CAAC;oBACD,KAAK;wBACH,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;oBACtB,CAAC;oBACD,GAAG;wBACD,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;oBACzC,CAAC;oBACD,GAAG;wBACD,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;oBACzC,CAAC;oBACD,IAAI;wBACF,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;oBACtD,CAAC;oBACD,IAAI;wBACF,OAAO,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;oBACtD,CAAC;iBACF,CAAC;gBACF,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YACD,eAAe;gBACb,OAA0B;oBACxB,GAAG,CAAC,EAAE,QAAQ,EAA8B;wBAC1C,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACpC,CAAC;iBACD,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC;YACD,iBAAiB;gBACf,MAAM,SAAS,GAAqB;oBAClC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAA+C;wBAC/D,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;wBACxB,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;wBACzB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACpB,OAAO,CAAC,CAAC;oBACX,CAAC;oBACD,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAA6B;wBAC7C,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjD,CAAC;iBACF,CAAC;gBACF,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YACD,UAAU,CAAC,EAAE,IAAI,EAAoB;gBACnC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;oBACnB,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;iBAC5C;gBACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YACD,OAAO,CAAC,EAAE,KAAK,EAA2B;gBACxC,OAAO,KAAK,CAAC;YACf,CAAC;SACD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA,CAAC;QACtB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;KACrB;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,eAAe,UAAU,2CAA2C,CACrE,CAAC;KACH;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAS;IACrC,OAAO,IAAI,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,SAAS,mBAAmB,CAC1B,UAAkB;AAClB,6DAA6D;AAC7D,SAAiD;IAEjD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAAQ,IAAA,yBAAiB,EAAC,UAAU,EAAE,CAAC,EAAE;QAChD,WAAW,EAAE,IAAI;QACjB,yBAAyB,EAAE,IAAI;QAC/B,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IACH,IAAA,oBAAO,EAAC,GAAG,EAAE;QACX,KAAK,EAAE,UAAU,IAAI;YACnB,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAClC,IAAI,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACrC,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACvC,IAAI,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE;wBACpB,OAAO,GAAG,IAAI,CAAC;wBACf,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qBACpD;iBACF;aACF;QACH,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAA,kBAAQ,EAAC,GAAG,CAAC,EAAE,CAAC;AACjD,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,UAAkB,EAClB,MAAoB;IAEpB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC;QACvC,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG;QAC3B,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC;IACpC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5C,OAAO,IAAA,oBAAe,EACpB,IAAI,IAAI,OAAO,UAAU,GAAG,EAC5B,QAAQ,EAAE,CAAC,gBAAgB,CAC5B,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,6BAA6B,CACpC,UAAkB,EAClB,MAAoB,EACpB,YAAY,GAAG,EAAE;IAEjB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC;QACvC,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG;QAC3B,CAAC,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC;IACpC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5C,MAAM,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,UAAU,IAAI,OAAO,WAAW,GAAG,CAAC;IACpD,OAAO,IAAA,oBAAe,EAAC,OAAO,EAAE;QAC9B,GAAG,QAAQ,EAAE,CAAC,gBAAgB;QAC9B,GAAG,YAAY;KAChB,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,IAAgB,EAChB,MAAoB;IAEpB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,SAAS,GAAG,CAAC,CAAM,EAAO,EAAE,CAAC,CAAC,CAAC;IACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrC,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,CAAW,CAAC;YAChB,IAAI;gBACF,IAAI,CAAC,KAAK,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACtE,CAAC,GAAG,uBAAuB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;aACvD;YAAC,OAAO,CAAM,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aACvE;YACD,MAAM,IAAI,GAAG,SAAS,CAAC;YACvB,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE;gBAClB,IAAI;oBACF,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACjB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACrB;gBAAC,OAAO,CAAM,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;iBACvE;gBACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC,CAAC;SACH;KACF;IACD,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC5B;;QAAM,OAAO,IAAI,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,MAAM,8BAA8B,GAAG,KAAK,EAC1C,GAAQ,EACR,MAAoB,EACN,EAAE;IAChB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,SAAS,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,EAAE;YACpC,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,CAAW,CAAC;YAChB,IAAI;gBACF,IAAI,CAAC,KAAK,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBACvE,CAAC,GAAG,6BAA6B,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;aAC7D;YAAC,OAAO,CAAM,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aACvE;YACD,MAAM,IAAI,GAAG,SAAS,CAAC;YACvB,SAAS,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE;gBACxB,IAAI;oBACF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACrB;gBAAC,OAAO,CAAM,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;iBACvE;gBACD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC;SACH;KACF;IACD,IAAI,QAAQ,EAAE;QACZ,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;KAC7B;;QAAM,OAAO,GAAG,CAAC;AACpB,CAAC,CAAC;AACF;;;;GAIG;AACH,MAAM,sBAAsB,GAAG,KAAK,EAAE,KAAY,EAAiB,EAAE;IACnE,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,GAAG;QACD,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CACxB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EACrB,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC7B,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI;gBACF,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;aACnC;YAAC,OAAO,CAAM,EAAE;gBACf,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;SACF;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;KACvD,QAAQ,IAAI,CAAC,MAAM,KAAK,EAAE,EAAE;AAC/B,CAAC,CAAC;AACF,iBAAS;IACP,mBAAmB;IACnB,uBAAuB;IACvB,6BAA6B;IAC7B,uBAAuB;IACvB,sBAAsB;IACtB,mBAAmB;IACnB,8BAA8B;IAC9B,WAAW;IACX,aAAa;CACd,CAAC"}
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../models/expression.ts"],"names":[],"mappings":"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"}

package/dist/models/field.d.ts

@@ -5,9 +5,10 @@
  * @subcategory models
  */
 import type { Where, SelectOptions, Row } from "@saltcorn/db-common/internal";
-import type { ResultMessage, Type } from "@saltcorn/types/common_types";
+import type { GenObj, ResultMessage, Type } from "@saltcorn/types/common_types";
 import type Table from "./table";
-import type { AbstractField, InputType } from "@saltcorn/types/model-abstracts/abstract_field";
+import type { FieldCfg, AbstractField, InputType } from "@saltcorn/types/model-abstracts/abstract_field";
+import { AbstractTable } from "@saltcorn/types/model-abstracts/abstract_table";
 /**
  * Field Class
  * @category saltcorn-data
@@ -16,7 +17,7 @@ declare class Field implements AbstractField {
     label: string;
     name: string;
     fieldview?: string;
-    validator: Function;
+    validator: (arg0: any) => boolean | string | undefined;
     showIf?: any;
     parent_field?: string;
     postText?: string;
@@ -40,12 +41,12 @@ declare class Field implements AbstractField {
     is_fkey: boolean;
     input_type: InputType;
     reftable_name?: string;
-    reftype?: string;
+    reftype?: string | Type;
     refname: string;
-    reftable?: Table;
-    attributes: any;
+    reftable?: AbstractTable;
+    attributes: GenObj;
     table_id?: number;
-    table?: Table;
+    table?: AbstractTable | null;
     [key: string]: any;
     /**
      * Constructor
@@ -62,7 +63,7 @@ declare class Field implements AbstractField {
      * @param {string} label
      * @returns {string}
      */
-    static labelToName(label: string): string | undefined;
+    static labelToName(label: string): string;
     /**
      * ???
      * @returns {string}
@@ -80,7 +81,7 @@ declare class Field implements AbstractField {
      * @param {object} [req]
      * @returns {Promise<void>}
      */
-    distinct_values(req: any, where: Where): Promise<{
+    distinct_values(req?: any, where?: Where): Promise<{
         label: string;
         value: string;
         jsvalue?: boolean;
@@ -181,41 +182,5 @@ declare class Field implements AbstractField {
      */
     static getTypeAttributes(typeattribs: Function | any, table_id?: number): any;
 }
-declare namespace Field {
-    type FieldCfg = {
-        label?: string;
-        name?: string;
-        fieldview?: string;
-        validator?: (arg0: any) => boolean;
-        showIf?: any;
-        parent_field?: string;
-        postText?: string;
-        class?: string;
-        id?: number;
-        default?: string;
-        sublabel?: string;
-        description?: string;
-        type?: string | Type;
-        options?: any;
-        required?: boolean;
-        is_unique?: boolean;
-        hidden?: boolean;
-        disabled?: boolean;
-        calculated?: boolean;
-        primary_key?: boolean;
-        stored?: boolean;
-        expression?: string;
-        sourceURL?: string;
-        input_type?: InputType;
-        reftable_name?: string;
-        reftable?: Table;
-        attributes?: string;
-        table_id?: number;
-        reftype?: string;
-        refname?: string;
-        table?: Table;
-    };
-}
-declare type FieldCfg = Field.FieldCfg;
 export = Field;
 //# sourceMappingURL=field.d.ts.map

package/dist/models/field.d.ts.map

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

package/dist/models/field.js

@@ -21,7 +21,7 @@ const readKey = (v, field) => {
     const { getState } = require("../db/state");
     if (!field.reftype)
         throw new Error("Unable to find the type, 'reftype' is undefined.");
-    const type = getState().types[field.reftype];
+    const type = getState().types[typeof field.reftype === "string" ? field.reftype : field.reftype.name];
     const parsed = type.read(v);
     return parsed || (v ? { error: "Unable to read key" } : null);
 };
@@ -231,7 +231,7 @@ class Field {
             }
             const schema = db_1.default.getTenantSchemaPrefix();
             const { getState } = require("../db/state");
-            return `${getState().types[this.reftype].sql_name} references ${schema}"${(0, internal_1.sqlsanitize)(this.reftable_name)}" ("${this.refname}")`;
+            return `${getState().types[typeof this.reftype === "string" ? this.reftype : this.reftype.name].sql_name} references ${schema}"${(0, internal_1.sqlsanitize)(this.reftable_name)}" ("${this.refname}")`;
         }
         else if (this.type && (0, common_types_1.instanceOfType)(this.type) && this.type.sql_name) {
             return this.type.sql_name;
@@ -258,7 +258,7 @@ class Field {
                 throw new Error("'reftype' and 'reftable_name' must be set if 'is_fkey' is true.");
             }
             const { getState } = require("../db/state");
-            return getState().types[this.reftype].sql_name;
+            return getState().types[typeof this.reftype === "string" ? this.reftype : this.reftype.name].sql_name;
         }
         else if (this.type && (0, common_types_1.instanceOfType)(this.type) && this.type.sql_name) {
             return this.type.sql_name;
@@ -354,8 +354,9 @@ class Field {
      * @returns {Promise<void>}
      */
     async toggle_not_null(not_null) {
+        await this.fill_table();
         if (!this.table) {
-            throw new Error("To toogle a not null constraint, 'table' must be set.");
+            throw new Error("To toggle a not null constraint, 'table' must be set.");
         }
         const schema = db_1.default.getTenantSchemaPrefix();
         await this.fill_table();