@saltcorn/data 0.6.1 → 0.6.2-beta.0

package/base-plugin/viewtemplates/viewable_fields.js

@@ -16,7 +16,7 @@ const { traverseSync } = require("../../models/layout");
 const { structuredClone } = require("../../utils");
 const db = require("../../db");
 
-/** 
+/**
  * @function
  * @param {string} viewname
  * @param {Table|object} table
@@ -42,8 +42,8 @@ const action_url = contract(
 );
 
 /**
- * @param {string} url 
- * @param {object} req 
+ * @param {string} url
+ * @param {object} req
  * @param {object} opts
  * @param {string} opts.action_name
  * @param {string} opts.action_label
@@ -55,7 +55,7 @@ const action_url = contract(
  * @param {string} opts.action_bgcol
  * @param {string} opts.action_bordercol
  * @param {string} opts.action_textcol
- * @param {*} __ 
+ * @param {*} __
  * @returns {object}
  */
 const action_link = (
@@ -174,7 +174,7 @@ const make_link = contract(
 );
 
 /**
- * @param {string} s 
+ * @param {string} s
  * @returns {object}
  */
 const parse_view_select = (s) => {
@@ -197,7 +197,7 @@ const parse_view_select = (s) => {
 };
 
 //todo: use above to simplify code
-/** 
+/**
  * @function
  * @param {object} opts
  * @param {string} opts.view,
@@ -338,7 +338,7 @@ const view_linker = contract(
 );
 
 /**
- * @param {string} nm 
+ * @param {string} nm
  * @returns {boolean}
  */
 const action_requires_write = (nm) => {
@@ -347,7 +347,7 @@ const action_requires_write = (nm) => {
   if (nm.startsWith("Toggle")) return true;
 };
 
-/** 
+/**
  * @function
  * @param {string} viewname
  * @param {Table|object} table
@@ -527,8 +527,8 @@ const get_viewable_fields = contract(
 );
 
 /**
- * @param {string} fname 
- * @param {object} req 
+ * @param {string} fname
+ * @param {object} req
  * @returns {string}
  */
 const sortlinkForName = (fname, req) => {
@@ -543,10 +543,10 @@ const sortlinkForName = (fname, req) => {
 };
 
 /**
- * @param {object} column 
- * @param {object} f 
- * @param {object} req 
- * @param {*} __ 
+ * @param {object} column
+ * @param {object} f
+ * @param {object} req
+ * @param {*} __
  * @returns {string}
  */
 const headerLabelForName = (column, f, req, __) => {
@@ -563,7 +563,7 @@ const headerLabelForName = (column, f, req, __) => {
   return label + arrow;
 };
 
-/** 
+/**
  * @function
  * @param {Field[]} fields
  * @param {object} state
@@ -597,12 +597,12 @@ const splitUniques = contract(
 );
 
 /**
- * @param {object} table 
- * @param {string} viewname 
- * @param {object[]} [columns] 
- * @param {object} layout0 
- * @param {boolean} id 
- * @param {object} req 
+ * @param {object} table
+ * @param {string} viewname
+ * @param {object[]} [columns]
+ * @param {object} layout0
+ * @param {boolean} id
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const getForm = async (table, viewname, columns, layout0, id, req) => {
@@ -626,7 +626,7 @@ const getForm = async (table, viewname, columns, layout0, id, req) => {
           }
           if (f.calculated)
             f.sourceURL = `/field/show-calculated/${table.name}/${f.name}/${f.fieldview}`;
-
+          f.attributes = { ...column.configuration, ...f.attributes };
           return f;
         } else if (table.name === "users" && column.field_name === "password") {
           return new Field({
@@ -669,15 +669,14 @@ const getForm = async (table, viewname, columns, layout0, id, req) => {
     fields: tfields,
     layout,
   });
-  await form.fill_fkey_options();
   if (id) form.hidden("id");
   return form;
 };
 
 /**
- * @param {object} table 
- * @param {object} req 
- * @param {object} fixed 
+ * @param {object} table
+ * @param {object} req
+ * @param {object} fixed
  * @returns {Promise<object>}
  */
 const fill_presets = async (table, req, fixed) => {

package/db/index.js

@@ -24,9 +24,12 @@ var connectObj = getConnectObject();
 /** @type {db/sqlite|db/pg|null} */
 let dbmodule = null;
 try {
-  dbmodule = is_sqlite(connectObj) ? 
-    require("@saltcorn/sqlite/sqlite")(getConnectObject) :
-    require("@saltcorn/postgres/postgres")(getConnectObject);
+  if(is_sqlite(connectObj)) {
+    dbmodule = require("@saltcorn/sqlite/sqlite");
+    dbmodule.init(getConnectObject);
+  }
+  else
+    dbmodule = require("@saltcorn/postgres/postgres")(getConnectObject);
 } catch(e) {
   console.log("No database package found.")
   throw e;

package/models/expression.js

@@ -9,7 +9,7 @@ const estraverse = require("estraverse");
 const astring = require("astring");
 
 /**
- * @param {string} s 
+ * @param {string} s
  * @returns {boolean|void}
  */
 function expressionValidator(s) {
@@ -23,7 +23,7 @@ function expressionValidator(s) {
 }
 
 /**
- * @param {string} expression 
+ * @param {string} expression
  * @returns {string}
  */
 function jsexprToSQL(expression) {
@@ -32,11 +32,11 @@ function jsexprToSQL(expression) {
 }
 
 /**
- * @param {string} expression 
+ * @param {string} expression
  * @throws {Error}
  * @returns {object}
  */
-function jsexprToWhere(expression) {
+function jsexprToWhere(expression, extraCtx = {}) {
   if (!expression) return {};
   try {
     const ast = acorn.parseExpressionAt(expression, 0, {
@@ -47,18 +47,26 @@ function jsexprToWhere(expression) {
     const compile = (node) =>
       ({
         BinaryExpression() {
+          const cleft = compile(node.left);
+          const cright = compile(node.right);
+          const cmp =
+            typeof cleft === "string" || cleft === null
+              ? { eq: [cleft, cright] }
+              : typeof cleft === "symbol"
+              ? { [cleft.description]: cright }
+              : { [cleft]: cright };
           return {
-            "=="({ left, right }) {
-              return { [compile(left)]: compile(right) };
+            "=="() {
+              return cmp;
             },
-            "==="({ left, right }) {
-              return { [compile(left)]: compile(right) };
+            "==="() {
+              return cmp;
             },
-            "!="({ left, right }) {
-              return { not: { [compile(left)]: compile(right) } };
+            "!="() {
+              return { not: cmp };
             },
-            "!=="({ left, right }) {
-              return { not: { [compile(left)]: compile(right) } };
+            "!=="() {
+              return { not: cmp };
             },
           }[node.operator](node);
         },
@@ -83,14 +91,18 @@ function jsexprToWhere(expression) {
           }[node.operator](node);
         },
         Identifier({ name }) {
-          return name;
+          if (name[0] === "$") {
+            return extraCtx[name.substring(1)] || null;
+          }
+          return Symbol(name);
         },
         Literal({ value }) {
           return value;
         },
       }[node.type](node));
     return compile(ast);
-  } catch {
+  } catch (e) {
+    console.error(e);
     throw new Error(
       `Expression "${expression}" is too complicated, I do not understand`
     );
@@ -98,8 +110,8 @@ function jsexprToWhere(expression) {
 }
 
 /**
- * @param {string} expression 
- * @param {object[]} statefuns 
+ * @param {string} expression
+ * @param {object[]} statefuns
  * @returns {object}
  */
 function transform_for_async(expression, statefuns) {
@@ -125,8 +137,8 @@ function transform_for_async(expression, statefuns) {
 }
 
 /**
- * @param {string} expression 
- * @param {object[]} fields 
+ * @param {string} expression
+ * @param {object[]} fields
  * @returns {any}
  */
 function get_expression_function(expression, fields) {
@@ -142,8 +154,8 @@ function get_expression_function(expression, fields) {
 }
 
 /**
- * @param {string} expression 
- * @param {object[]} fields 
+ * @param {string} expression
+ * @param {object[]} fields
  * @param {object} [extraContext = {}]
  * @returns {any}
  */
@@ -162,9 +174,9 @@ function get_async_expression_function(expression, fields, extraContext = {}) {
 }
 
 /**
- * @param {object[]} rows 
- * @param {object[]} fields 
- * @returns {object[]} 
+ * @param {object[]} rows
+ * @param {object[]} fields
+ * @returns {object[]}
  */
 function apply_calculated_fields(rows, fields) {
   let hasExprs = false;
@@ -196,8 +208,8 @@ function apply_calculated_fields(rows, fields) {
 }
 
 /**
- * @param {*} row 
- * @param {*} fields 
+ * @param {*} row
+ * @param {*} fields
  * @returns {Promise<any>}
  */
 const apply_calculated_fields_stored = async (row, fields) => {

package/models/field.js

@@ -7,7 +7,7 @@
 
 const db = require("../db");
 const { contract, is } = require("contractis");
-const { recalculate_for_stored } = require("./expression");
+const { recalculate_for_stored, jsexprToWhere } = require("./expression");
 const { sqlsanitize } = require("@saltcorn/db-common/internal.js");
 const { InvalidAdminAction } = require("../utils");
 const { mkWhere } = require("../db");
@@ -153,7 +153,13 @@ class Field {
    * @param {object} where
    * @returns {Promise<void>}
    */
-  async fill_fkey_options(force_allow_none = false, where) {
+  async fill_fkey_options(force_allow_none = false, where0, extraCtx) {
+    const where =
+      where0 ||
+      (this.attributes.where
+        ? jsexprToWhere(this.attributes.where, extraCtx)
+        : undefined);
+    //console.log(where);
     if (
       this.is_fkey &&
       (this.type !== "File" ||
@@ -288,7 +294,7 @@ class Field {
   }
 
   /**
-   * @param {object} whole_rec 
+   * @param {object} whole_rec
    * @returns {object}
    */
   validate(whole_rec) {
@@ -316,8 +322,8 @@ class Field {
   }
 
   /**
-   * 
-   * @param {object} where 
+   *
+   * @param {object} where
    * @param {object} [selectopts]
    * @returns {Field[]}
    */
@@ -327,7 +333,7 @@ class Field {
   }
 
   /**
-   * @param {object} where 
+   * @param {object} where
    * @returns {Promise<Field>}
    */
   static async findOne(where) {
@@ -352,8 +358,8 @@ class Field {
   }
 
   /**
-   * 
-   * @param {boolean} not_null 
+   *
+   * @param {boolean} not_null
    * @returns {Promise<void>}
    */
   async toggle_not_null(not_null) {
@@ -370,7 +376,7 @@ class Field {
   }
 
   /**
-   * @param {object} new_field 
+   * @param {object} new_field
    * @returns {Promise<void>}
    */
   async alter_sql_type(new_field) {
@@ -421,7 +427,7 @@ class Field {
   }
 
   /**
-   * @param {object} v 
+   * @param {object} v
    * @returns {Promise<void>}
    */
   async update(v) {
@@ -523,7 +529,7 @@ class Field {
   }
 
   /**
-   * @param {object} table 
+   * @param {object} table
    * @returns {Promise<void>}
    */
   async enable_fkey_constraint(table) {
@@ -542,7 +548,7 @@ class Field {
   }
 
   /**
-   * @param {object} fld 
+   * @param {object} fld
    * @param {boolean} [bare = false]
    * @returns {Promise<Field>}
    */

package/models/form.js

@@ -14,9 +14,9 @@ const Field = require("./field");
  */
 class Form {
   /**
-    * Constructor
-    * @param o
-    */
+   * Constructor
+   * @param o
+   */
   constructor(o) {
     this.fields = o.fields.map((f) =>
       f.constructor.name === Object.name ? new Field(f) : f
@@ -48,7 +48,7 @@ class Form {
   }
 
   /**
-   * @param {object} ks 
+   * @param {object} ks
    */
   hidden(...ks) {
     ks.forEach((k) => {
@@ -66,8 +66,9 @@ class Form {
    * @param {boolean} [force_allow_none = false]
    */
   async fill_fkey_options(force_allow_none = false) {
+    //console.log(this.values);
     for (const f of this.fields) {
-      await f.fill_fkey_options(force_allow_none);
+      await f.fill_fkey_options(force_allow_none, undefined, this.values);
     }
   }
 
@@ -98,7 +99,7 @@ class Form {
   }
 
   /**
-   * @param {*} v 
+   * @param {*} v
    * @returns {object}
    */
   validate(v) {

package/package.json

@@ -1,21 +1,23 @@
 {
   "name": "@saltcorn/data",
-  "version": "0.6.1",
+  "version": "0.6.2-beta.0",
   "description": "Data models for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
-    "test": "jest --runInBand"
+    "test": "jest --runInBand",
+    "tsc": "echo \"Error: no TypeScript support yet\"",
+    "clean": "echo \"Error: no TypeScript support yet\""
   },
   "author": "Tom Nielsen",
   "license": "MIT",
   "main": "index.js",
   "optionalDependencies": {
-    "@saltcorn/postgres": "0.6.1",
-    "@saltcorn/sqlite": "0.6.1"
+    "@saltcorn/postgres": "0.6.2-beta.0",
+    "@saltcorn/sqlite": "0.6.2-beta.0"
   },
   "dependencies": {
-    "@saltcorn/markup": "0.6.1",
-    "@saltcorn/db-common": "0.6.1",
+    "@saltcorn/markup": "0.6.2-beta.0",
+    "@saltcorn/db-common": "0.6.2-beta.0",
     "acorn": "^8.0.3",
     "adm-zip": "0.5.5",
     "astring": "^1.4.3",
@@ -47,7 +49,10 @@
     "jest": "^25.1.0"
   },
   "jest": {
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "moduleNameMapper": {
+      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1"
+    }
   },
   "publishConfig": {
     "access": "public"

package/plugin-helper.js

@@ -112,16 +112,19 @@ const stateToQueryString = contract(
  */
 const calcfldViewOptions = contract(
   is.fun(
-    [is.array(is.class("Field")), is.bool],
+    [is.array(is.class("Field")), is.str],
     is.obj({ field_view_options: is.objVals(is.array(is.str)) })
   ),
-  (fields, isEdit) => {
-    var fvs = {};
+  (fields, mode) => {
+    const isEdit = mode === "edit";
+    const isFilter = mode === "filter";
+    let fvs = {};
     const handlesTextStyle = {};
     fields.forEach((f) => {
       handlesTextStyle[f.name] = [];
       if (f.type === "File") {
-        if (!isEdit) fvs[f.name] = Object.keys(getState().fileviews);
+        if (!isEdit && !isFilter)
+          fvs[f.name] = Object.keys(getState().fileviews);
         else fvs[f.name] = ["upload"];
       } else if (f.type === "Key") {
         if (isEdit) fvs[f.name] = Object.keys(getState().keyFieldviews);
@@ -129,7 +132,7 @@ const calcfldViewOptions = contract(
           if (f.reftable && f.reftable.fields) {
             const { field_view_options } = calcfldViewOptions(
               f.reftable.fields,
-              isEdit
+              mode
             );
             for (const jf of f.reftable.fields) {
               fvs[`${f.name}.${jf.name}`] = field_view_options[jf.name];
@@ -142,15 +145,20 @@ const calcfldViewOptions = contract(
         });
       } else if (f.type && f.type.fieldviews) {
         const tfvs = Object.entries(f.type.fieldviews).filter(([k, fv]) =>
-          f.calculated ? !fv.isEdit : !fv.isEdit || isEdit
+          f.calculated ? !fv.isEdit : !fv.isEdit || isEdit || isFilter
         );
         let tfvs_ordered = [];
         if (isEdit) {
           tfvs_ordered = [
             ...tfvs.filter(([k, fv]) => fv.isEdit),
-            ...tfvs.filter(([k, fv]) => !fv.isEdit),
+            ...tfvs.filter(([k, fv]) => !fv.isEdit && !fv.isFilter),
           ];
-        } else tfvs_ordered = tfvs;
+        } else if (isFilter) {
+          tfvs_ordered = [
+            ...tfvs.filter(([k, fv]) => fv.isFilter),
+            ...tfvs.filter(([k, fv]) => fv.isEdit),
+          ];
+        } else tfvs_ordered = tfvs.filter(([k, fv]) => !fv.isFilter);
         fvs[f.name] = tfvs_ordered.map(([k, fv]) => {
           if (fv && fv.handlesTextStyle) handlesTextStyle[f.name].push(k);
           return k;
@@ -323,7 +331,7 @@ const field_picker_fields = contract(
       }
     }
     const fldOptions = fields.map((f) => f.name);
-    const { field_view_options } = calcfldViewOptions(fields, false);
+    const { field_view_options } = calcfldViewOptions(fields, "show");
     const fieldViewConfigForms = await calcfldViewConfig(fields, false);
     const fvConfigFields = [];
     for (const [field_name, fvOptFields] of Object.entries(
@@ -954,6 +962,14 @@ const stateFieldsToWhere = contract(
         const dfield = fields.find((fld) => fld.name == datefield);
         if (dfield)
           addOrCreateList(qstate, datefield, { lt: new Date(v), equal: true });
+      } else if (k.startsWith("_gte_")) {
+        const datefield = db.sqlsanitize(k.replace("_gte_", ""));
+        const dfield = fields.find((fld) => fld.name == datefield);
+        if (dfield) addOrCreateList(qstate, datefield, { gt: v, equal: true });
+      } else if (k.startsWith("_lte_")) {
+        const datefield = db.sqlsanitize(k.replace("_lte_", ""));
+        const dfield = fields.find((fld) => fld.name == datefield);
+        if (dfield) addOrCreateList(qstate, datefield, { lt: v, equal: true });
       } else if (
         field &&
         field.type.name === "String" &&
@@ -964,7 +980,9 @@ const stateFieldsToWhere = contract(
       } else if (field && field.type.name === "Bool" && state[k] === "?") {
         // omit
       } else if (field && field.type && field.type.read)
-        qstate[k] = field.type.read(v);
+        qstate[k] = Array.isArray(v)
+          ? { or: v.map(field.type.read) }
+          : field.type.read(v);
       else if (field) qstate[k] = v;
       else if (k.includes(".")) {
         const kpath = k.split(".");
@@ -1124,7 +1142,9 @@ const readState = (state, fields, req) => {
   fields.forEach((f) => {
     const current = state[f.name];
     if (typeof current !== "undefined") {
-      if (f.type.read) state[f.name] = f.type.read(current);
+      if (Array.isArray(current) && f.type.read) {
+        state[f.name] = current.map(f.type.read);
+      } else if (f.type.read) state[f.name] = f.type.read(current);
       else if (typeof current === "string" && current.startsWith("Preset:")) {
         const preset = f.presets[current.replace("Preset:", "")];
         state[f.name] = preset(req);

package/tests/calc.test.js

@@ -7,6 +7,7 @@ const {
   get_expression_function,
   transform_for_async,
   expressionValidator,
+  jsexprToWhere,
 } = require("../models/expression");
 
 getState().registerPlugin("base", require("../base-plugin"));
@@ -219,3 +220,24 @@ describe("expressions", () => {
     expect(expressionValidator("2+")).toBe("Unexpected end of input");
   });
 });
+describe("jsexprToWhere", () => {
+  it("translates equality", () => {
+    expect(jsexprToWhere("foo==4")).toEqual({ foo: 4 });
+  });
+  it("translates equal to col", () => {
+    expect(jsexprToWhere("foo==bar").foo.description).toBe("bar");
+  });
+  it("translates context", () => {
+    expect(jsexprToWhere("foo==$bar", { bar: 5 })).toEqual({ foo: 5 });
+  });
+  it("translates context", () => {
+    const w = jsexprToWhere("$father !== null && married_to === $father", {
+      father: "1",
+    });
+    expect(w).toEqual({ married_to: "1", not: { eq: ["1", null] } });
+  });
+  it("translates context", () => {
+    const w = jsexprToWhere("$father !== null && married_to === $father", {});
+    expect(w).toEqual({ married_to: null, not: { eq: [null, null] } });
+  });
+});