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

package/package.json

@@ -1,21 +1,23 @@
 {
   "name": "@saltcorn/data",
-  "version": "0.6.1-beta.2",
+  "version": "0.6.2-beta.1",
   "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-beta.1",
-    "@saltcorn/sqlite": "0.6.1-beta.1"
+    "@saltcorn/postgres": "0.6.2-beta.1",
+    "@saltcorn/sqlite": "0.6.2-beta.1"
   },
   "dependencies": {
-    "@saltcorn/markup": "0.6.1-beta.2",
-    "@saltcorn/db-common": "0.6.1-beta.2",
+    "@saltcorn/markup": "0.6.2-beta.1",
+    "@saltcorn/db-common": "0.6.2-beta.1",
     "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] } });
+  });
+});