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

package/models/field.js

@@ -7,8 +7,8 @@
 
 const db = require("../db");
 const { contract, is } = require("contractis");
-const { recalculate_for_stored } = require("./expression");
-const { sqlsanitize } = require("../db/internal.js");
+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("../db/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/tenant.js

@@ -7,8 +7,9 @@
 const db = require("../db");
 const reset = require("../db/reset_schema");
 const { contract, is } = require("contractis");
-const { sqlsanitize } = require("../db/internal");
+const { sqlsanitize } = require("@saltcorn/db-common/internal");
 const { setConfig } = require("./config");
+const fs = require("fs").promises;
 
 /**
  * List all Tenants
@@ -42,10 +43,13 @@ const getAllTenants = contract(
  * @returns {Promise<void>}
  */
 const createTenant = contract(
-  is.fun([is.str, is.maybe(is.str), is.maybe(is.str), is.maybe(is.str)], is.promise(is.undefined)),
+  is.fun(
+    [is.str, is.maybe(is.str), is.maybe(is.str), is.maybe(is.str)],
+    is.promise(is.undefined)
+  ),
   // TODO how to set names for arguments
-  async ( subdomain, newurl, email, description) => {
-      // normalize domain name
+  async (subdomain, newurl, email, description) => {
+    // normalize domain name
     const saneDomain = domain_sanitize(subdomain);
 
     // add email
@@ -70,11 +74,30 @@ const createTenant = contract(
     });
   }
 );
+const copy_tenant_template = async ({
+  tenant_template,
+  target,
+  loadAndSaveNewPlugin,
+}) => {
+  const { create_backup, restore } = require("./backup");
+  // TODO use a hygenic name for backup file
+  const backupFile = await db.runWithTenant(tenant_template, create_backup);
+  await db.runWithTenant(target, async () => {
+    await restore(backupFile, loadAndSaveNewPlugin, true);
+
+    await db.updateWhere("_sc_files", { user_id: null }, {});
+    await db.deleteWhere("users", {});
+    await db.reset_sequence("users");
+    //
+  });
+  await fs.unlink(backupFile);
+};
+
 /**
  * Delete Tenant
  * Note! This is deleting all tenant data in database!
  * @function
- * @param {string} sub 
+ * @param {string} sub
  * @returns {Promise<void>}
  */
 const deleteTenant = contract(
@@ -117,4 +140,5 @@ module.exports = {
   domain_sanitize,
   deleteTenant,
   eachTenant,
+  copy_tenant_template,
 };

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) {

package/package.json

@@ -1,16 +1,23 @@
 {
   "name": "@saltcorn/data",
-  "version": "0.6.1-beta.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.2-beta.0",
+    "@saltcorn/sqlite": "0.6.2-beta.0"
+  },
   "dependencies": {
-    "@saltcorn/markup": "0.6.1-beta.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",
@@ -32,10 +39,7 @@
     "moment-timezone": "^0.5.33",
     "node-fetch": "2.6.2",
     "nodemailer": "^6.4.17",
-    "pg": "^8.2.1",
-    "pg-copy-streams": "^5.1.1",
     "pluralize": "^8.0.0",
-    "sqlite3": "^5.0.2",
     "tmp-promise": "^3.0.2",
     "uuid": "^8.2.0"
   },
@@ -45,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] } });
+  });
+});