@saltcorn/data 0.6.1-beta.2 → 0.6.2-beta.1

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) => {
@@ -711,4 +710,5 @@ module.exports = {
   splitUniques,
   getForm,
   fill_presets,
+  get_view_link_query,
 };

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/file.js

@@ -50,7 +50,14 @@ class File {
    * @param selectopts
    * @returns {Promise<*>}
    */
-  static async find(where, selectopts) {
+  static async find(where, selectopts = {}) {
+    if (selectopts.cached) {
+      const { getState } = require("../db/state");
+      const files = Object.values(getState().files).sort((a, b) =>
+        a.filename > b.filename ? 1 : -1
+      );
+      return files.map((t) => new File(t));
+    }
     const db_flds = await db.select("_sc_files", where, selectopts);
     return db_flds.map((dbf) => new File(dbf));
   }
@@ -157,7 +164,7 @@ class File {
       return { error: e.message };
     }
   }
-  
+
   /**
    * MIME type of the file
    * @type {string}

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/models/page.js

@@ -32,7 +32,7 @@ const {
  */
 class Page {
   /**
-   * @param {object} o 
+   * @param {object} o
    */
   constructor(o) {
     this.name = o.name;
@@ -56,6 +56,10 @@ class Page {
    * @returns {Promise<*>}
    */
   static async find(where, selectopts = { orderBy: "name", nocase: true }) {
+    if (selectopts.cached) {
+      const { getState } = require("../db/state");
+      return getState().pages.map((t) => new Page(t));
+    }
     const db_flds = await db.select("_sc_pages", where, selectopts);
     return db_flds.map((dbf) => new Page(dbf));
   }

package/models/table.js

@@ -5,7 +5,11 @@
  * @subcategory models
  */
 const db = require("../db");
-const { sqlsanitize, mkWhere, mkSelectOptions } = require("@saltcorn/db-common/internal.js");
+const {
+  sqlsanitize,
+  mkWhere,
+  mkSelectOptions,
+} = require("@saltcorn/db-common/internal.js");
 const Field = require("./field");
 const Trigger = require("./trigger");
 const {
@@ -87,7 +91,7 @@ const normalise_error_message = (msg) =>
 class Table {
   /**
    * Table constructor
-   * @param {object} o 
+   * @param {object} o
    */
   constructor(o) {
     this.name = o.name;
@@ -141,6 +145,10 @@ class Table {
    * @returns {Promise<Table[]>} table list
    */
   static async find(where, selectopts = { orderBy: "name", nocase: true }) {
+    if (selectopts.cached) {
+      const { getState } = require("../db/state");
+      return getState().tables.map((t) => new Table(t));
+    }
     const tbls = await db.select("_sc_tables", where, selectopts);
 
     return tbls.map((t) => new Table(t));

package/models/view.js

@@ -28,7 +28,7 @@ const { renderForm } = require("@saltcorn/markup");
 class View {
   /**
    * View constructor
-   * @param {object} o 
+   * @param {object} o
    */
   constructor(o) {
     this.name = o.name;
@@ -55,7 +55,7 @@ class View {
   }
 
   /**
-   * @param {object} where 
+   * @param {object} where
    * @returns {View}
    */
   static findOne(where) {
@@ -78,6 +78,10 @@ class View {
    * @returns {Promise<View[]>}
    */
   static async find(where, selectopts = { orderBy: "name", nocase: true }) {
+    if (selectopts.cached) {
+      const { getState } = require("../db/state");
+      return getState().views.map((t) => new View(t));
+    }
     const views = await db.select("_sc_views", where, selectopts);
 
     return views.map((v) => new View(v));
@@ -159,7 +163,7 @@ class View {
   }
 
   /**
-   * @param {function} pred 
+   * @param {function} pred
    * @returns {Promise<object>}
    */
   static async find_all_views_where(pred) {
@@ -182,7 +186,7 @@ class View {
   }
 
   /**
-   * @param {Table|object} table 
+   * @param {Table|object} table
    * @returns {Promise<View[]>}
    */
   static async find_possible_links_to_table(table) {
@@ -275,7 +279,7 @@ class View {
   }
 
   /**
-   * @param {*} arg 
+   * @param {*} arg
    * @returns {Promise<object>}
    */
   async authorise_post(arg) {
@@ -284,7 +288,7 @@ class View {
   }
 
   /**
-   * @param {*} arg 
+   * @param {*} arg
    * @returns {Promise<object>}
    */
   async authorise_get(arg) {
@@ -334,9 +338,9 @@ class View {
   }
 
   /**
-   * @param {*} query 
-   * @param {*} req 
-   * @param {*} res 
+   * @param {*} query
+   * @param {*} req
+   * @param {*} res
    * @returns {Promise<object>}
    */
   async run_possibly_on_page(query, req, res) {
@@ -361,8 +365,8 @@ class View {
   }
 
   /**
-   * @param {*} query 
-   * @param {*} extraArgs 
+   * @param {*} query
+   * @param {*} extraArgs
    * @throws {InvalidConfiguration}
    * @returns {Promise<object>}
    */
@@ -405,9 +409,9 @@ class View {
   }
 
   /**
-   * @param {*} query 
-   * @param {*} body 
-   * @param {*} extraArgs 
+   * @param {*} query
+   * @param {*} body
+   * @param {*} extraArgs
    * @returns {Promise<object>}
    */
   async runPost(query, body, extraArgs) {
@@ -423,10 +427,10 @@ class View {
   }
 
   /**
-   * @param {*} route 
-   * @param {*} body 
-   * @param {*} res 
-   * @param {*} extraArgs 
+   * @param {*} route
+   * @param {*} body
+   * @param {*} res
+   * @param {*} extraArgs
    * @returns {Promise<void>}
    */
   async runRoute(route, body, res, extraArgs) {
@@ -444,7 +448,7 @@ class View {
   }
 
   /**
-   * @param {object} req_query 
+   * @param {object} req_query
    * @returns {object}
    */
   combine_state_and_default_state(req_query) {
@@ -463,8 +467,8 @@ class View {
   }
 
   /**
-   * @param {object} query 
-   * @param {object} req 
+   * @param {object} query
+   * @param {object} req
    * @returns {Promise<Form|null>}
    */
   async get_state_form(query, req) {
@@ -501,7 +505,7 @@ class View {
   }
 
   /**
-   * @param {object} req 
+   * @param {object} req
    * @returns {Promise<object>}
    */
   async get_config_flow(req) {