@saltcorn/data 0.8.0-beta.3 → 0.8.0

package/dist/package.json

@@ -1,120 +1,120 @@
 {
-    "name": "@saltcorn/data",
-    "version": "0.7.2-beta.0",
-    "description": "Data models for Saltcorn, open-source no-code platform",
-    "homepage": "https://saltcorn.com",
-    "scripts": {
-        "test": "jest tests --runInBand",
-        "tsc": "echo \"Error: no TypeScript support yet\"",
-        "clean": "echo \"Error: no TypeScript support yet\"",
-        "build": "webpack --mode development"
-    },
-    "author": "Tom Nielsen",
-    "license": "MIT",
-    "main": "dist/index.js",
-    "exports": {
-        ".": "./dist/index.js",
-        "./*": "./dist/*.js",
-        "./base-plugin/*": "./dist/base-plugin/*.js",
-        "./base-plugin": "./dist/base-plugin/index.js",
-        "./base-plugin/viewtemplate/*": "./dist/base-plugin/viewtemplate/*.js",
-        "./db/": "./dist/db/index.js",
-        "./db": "./dist/db/index.js",
-        "./db/*": "./dist/db/*.js",
-        "./models/*": "./dist/models/*.js"
-    },
-    "typesVersions": {
-        "*": {
-            "*": [
-                "dist/*",
-                "dist/db/*"
-            ]
-        }
-    },
-    "files": [
-        "dist/**/*"
+  "name": "@saltcorn/data",
+  "version": "0.7.2-beta.0",
+  "description": "Data models for Saltcorn, open-source no-code platform",
+  "homepage": "https://saltcorn.com",
+  "scripts": {
+    "test": "jest tests --runInBand",
+    "tsc": "echo \"Error: no TypeScript support yet\"",
+    "clean": "echo \"Error: no TypeScript support yet\"",
+    "build": "webpack --mode development"
+  },
+  "author": "Tom Nielsen",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./*": "./dist/*.js",
+    "./base-plugin/*": "./dist/base-plugin/*.js",
+    "./base-plugin": "./dist/base-plugin/index.js",
+    "./base-plugin/viewtemplate/*": "./dist/base-plugin/viewtemplate/*.js",
+    "./db/": "./dist/db/index.js",
+    "./db": "./dist/db/index.js",
+    "./db/*": "./dist/db/*.js",
+    "./models/*": "./dist/models/*.js"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/*",
+        "dist/db/*"
+      ]
+    }
+  },
+  "files": [
+    "dist/**/*"
+  ],
+  "optionalDependencies": {
+    "@saltcorn/postgres": "0.7.2-beta.0",
+    "@saltcorn/sqlite": "0.7.2-beta.0"
+  },
+  "dependencies": {
+    "@saltcorn/types": "0.7.2-beta.0",
+    "@saltcorn/markup": "0.7.2-beta.0",
+    "@saltcorn/db-common": "0.7.2-beta.0",
+    "@saltcorn/sqlite-mobile": "0.7.2-beta.0",
+    "acorn": "^8.0.3",
+    "astring": "^1.4.3",
+    "axios": "^0.26.1",
+    "bcryptjs": "^2.4.3",
+    "blockly": "^6.20210701.0",
+    "contractis": "^0.1.0",
+    "csvtojson": "^2.0.10",
+    "dateformat": "^3.0.3",
+    "dumb-passwords": "^0.2.1",
+    "email-validator": "^2.0.4",
+    "env-paths": "^2.2.0",
+    "estraverse": "^5.2.0",
+    "i18n": "^0.14.0",
+    "latest-version": "^5.1.0",
+    "moment": "^2.27.0",
+    "moment-timezone": "^0.5.33",
+    "node-fetch": "2.6.2",
+    "pluralize": "^8.0.0",
+    "tmp-promise": "^3.0.2",
+    "uuid": "^8.2.0",
+    "vm-browserify": "^1.1.2",
+    "buffer": "6.0.3",
+    "url": "0.11.0",
+    "util": "0.12.4",
+    "os-browserify": "0.3.0",
+    "path-browserify": "1.0.1",
+    "stream-browserify": "3.0.0",
+    "stream-http": "3.2.0",
+    "cordova-sqlite-storage": "^6.0.0",
+    "crypto-browserify": "3.12.0",
+    "https-browserify": "1.0.0",
+    "browserify-zlib": "0.2.0",
+    "nodemailer": "^6.4.17",
+    "mjml": "4.12.0"
+  },
+  "repository": "github:saltcorn/saltcorn",
+  "devDependencies": {
+    "@types/i18n": "^0.13.2",
+    "@types/bcryptjs": "^2.4.2",
+    "@types/csvtojson": "^2.0.0",
+    "@types/dateformat": "^5.0.0",
+    "@types/dumb-passwords": "^0.2.1",
+    "@types/estraverse": "^5.1.1",
+    "@types/jest": "^27.0.3",
+    "@types/mjml": "4.7.0",
+    "@types/node": "^16.11.12",
+    "@types/node-fetch": "2.5.12",
+    "@types/nodemailer": "^6.4.4",
+    "@types/uuid": "^8.3.3",
+    "chaos-guinea-pig": "^0.1.0",
+    "jest": "^27.1.0",
+    "ts-jest": "^27.1.0",
+    "typescript": "^4.4.4",
+    "webpack": "5.68.0",
+    "webpack-cli": "4.9.2"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "modulePathIgnorePatterns": [
+      ".*\\.js$"
     ],
-    "optionalDependencies": {
-        "@saltcorn/postgres": "0.7.2-beta.0",
-        "@saltcorn/sqlite": "0.7.2-beta.0"
-    },
-    "dependencies": {
-        "@saltcorn/types": "0.7.2-beta.0",
-        "@saltcorn/markup": "0.7.2-beta.0",
-        "@saltcorn/db-common": "0.7.2-beta.0",
-        "@saltcorn/sqlite-mobile": "0.7.2-beta.0",
-        "acorn": "^8.0.3",
-        "astring": "^1.4.3",
-        "axios": "^0.26.1",
-        "bcryptjs": "^2.4.3",
-        "blockly": "^6.20210701.0",
-        "contractis": "^0.1.0",
-        "csvtojson": "^2.0.10",
-        "dateformat": "^3.0.3",
-        "dumb-passwords": "^0.2.1",
-        "email-validator": "^2.0.4",
-        "env-paths": "^2.2.0",
-        "estraverse": "^5.2.0",
-        "i18n": "^0.14.0",
-        "latest-version": "^5.1.0",
-        "moment": "^2.27.0",
-        "moment-timezone": "^0.5.33",
-        "node-fetch": "2.6.2",
-        "pluralize": "^8.0.0",
-        "tmp-promise": "^3.0.2",
-        "uuid": "^8.2.0",
-        "vm-browserify": "^1.1.2",
-        "buffer": "6.0.3",
-        "url": "0.11.0",
-        "util": "0.12.4",
-        "os-browserify": "0.3.0",
-        "path-browserify": "1.0.1",
-        "stream-browserify": "3.0.0",
-        "stream-http": "3.2.0",
-        "cordova-sqlite-storage": "^6.0.0",
-        "crypto-browserify": "3.12.0",
-        "https-browserify": "1.0.0",
-        "browserify-zlib": "0.2.0",
-        "nodemailer": "^6.4.17",
-        "mjml": "4.12.0"
-    },
-    "repository": "github:saltcorn/saltcorn",
-    "devDependencies": {
-        "@types/i18n": "^0.13.2",
-        "@types/bcryptjs": "^2.4.2",
-        "@types/csvtojson": "^2.0.0",
-        "@types/dateformat": "^5.0.0",
-        "@types/dumb-passwords": "^0.2.1",
-        "@types/estraverse": "^5.1.1",
-        "@types/jest": "^27.0.3",
-        "@types/mjml": "4.7.0",
-        "@types/node": "^16.11.12",
-        "@types/node-fetch": "2.5.12",
-        "@types/nodemailer": "^6.4.4",
-        "@types/uuid": "^8.3.3",
-        "chaos-guinea-pig": "^0.1.0",
-        "jest": "^27.1.0",
-        "ts-jest": "^27.1.0",
-        "typescript": "^4.4.4",
-        "webpack": "5.68.0",
-        "webpack-cli": "4.9.2"
-    },
-    "jest": {
-        "preset": "ts-jest",
-        "testEnvironment": "node",
-        "modulePathIgnorePatterns": [
-            ".*\\.js$"
-        ],
-        "moduleNameMapper": {
-            "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
-            "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
-            "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
-            "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
-            "@saltcorn/markup$": "@saltcorn/markup/dist",
-            "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
-        }
-    },
-    "publishConfig": {
-        "access": "public"
+    "moduleNameMapper": {
+      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
+      "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
+      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
+      "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
+      "@saltcorn/markup$": "@saltcorn/markup/dist",
+      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
     }
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/dist/plugin-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AA+WA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAgf7B;AA+FD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,gBAGL,MAAM,CA4IlB;AAhPD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AAgRD;;;;;;;;GAQG;AACH;IANyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAkJlB;AAhND;;;;;GAKG;AACH,yEAHW,MAAM,GACJ,MAAM,CAoClB;AA0KD;;;;;GAKG;AACH,iEAyGK;AA90CL;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CA6FlB;AA2CD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GA8F7C;AA6mCD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CA0BlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AA/6CD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AAjGD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oUAYJ,UAAQ,CA+DpB;AAqQD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAtJ/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mCAGL,QAAQ,MAAM,CAAC,CAkC3B;AAssCD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAwJD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AA1GD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CA6ElB;AA5gBD;;;;;GAKG;AACH,oGAkCC"}
+{"version":3,"file":"plugin-helper.d.ts","sourceRoot":"","sources":["../plugin-helper.js"],"names":[],"mappings":"AAuXA;;;;;;GAMG;AACH,8DALW,KAAK,GAAC,MAAM,GAGV,QAAQ,MAAM,EAAE,CAAC,CAgf7B;AA+FD;;;;;;;;GAQG;AACH,gDANW,MAAM,EAAE,UACR,KAAK,EAAE,gBAGL,MAAM,CAqIlB;AAzOD;;;;;;;GAOG;AACH,uCALW,KAAK,GAAC,MAAM,YACZ,MAAM,sBAEJ,QAAQ,MAAM,EAAE,CAAC,CAiC7B;AAED;;;;;;GAMG;AACH,wCAJW,KAAK,GAAC,MAAM,YACZ,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;AA2QD;;;;;;;;GAQG;AACH;IANyB,MAAM,EAApB,KAAK,EAAE;IACM,KAAK,EAAlB,MAAM;IACS,WAAW;IACd,KAAK,EAAjB,KAAK;IACH,MAAM,CAkJlB;AAlND;;;;;GAKG;AACH,yEAHW,MAAM,GACJ,MAAM,CAsClB;AA0KD;;;;;GAKG;AACH,iEAyGG;AA30CH;;;;;GAKG;AACH,2CAJW,KAAK,EAAE,cAEL,MAAM,CA6FlB;AA2CD;;;;;GAKG;AACH,0CAJW,KAAK,GAAC,MAAM,YACZ,MAAM;oBACqB,MAAM,EAAE;GAgG7C;AAwmCD;;;;;;GAMG;AACH,iCALW,MAAM,UACN,MAAM,EAAE,aAEN,MAAM,CAyBlB;AAED;;;;;GAKG;AACH,uCAJW,MAAM,UACN,MAAM,EAAE,GACN,OAAO,MAAE,CA4BrB;AA36CD;;;;GAIG;AACH,gEAFa,MAAM,CAclB;AAvGD;;;;;;;;;;;;;;;;GAgBG;AACH,gCAfW,MAAM,SACN,MAAM,oUAYJ,UAAQ,CAqEpB;AAuQD;;;;;GAKG;AACH,8CAJW,MAAM,SACN,MAAM,GACJ,QAAQ,MAAM,EAAE,CAAC,CAKC;AAxJ/B;;;;;;GAMG;AACH,0CALW,KAAK,EAAE,mCAGL,QAAQ,MAAM,CAAC,CAkC3B;AAmsCD;;;;GAIG;AAEH,kCAJW,MAAM,GACJ,MAAM,GAAC,SAAS,CAM5B;AAsJD;;;;;;GAMG;AACH,yDALW,MAAM,GAGJ,YAAU,CAiBtB;AAzGD;;;;;;GAMG;AACH,8EAHW,MAAM,EAAE,GACN,MAAM,CA4ElB;AA5gBD;;;;;GAKG;AACH,oGAkCC"}

package/dist/plugin-helper.js

@@ -228,10 +228,12 @@ const get_link_view_opts = async (table, viewname) => {
     const all_views = await View.find({});
     const all_tables = await Table.find({});
     const table_id_to_name = {};
-    all_tables.forEach(t => { table_id_to_name[t.id] = t.name; });
-    const view_name_opts = all_views.map(v => ({
+    all_tables.forEach((t) => {
+        table_id_to_name[t.id] = t.name;
+    });
+    const view_name_opts = all_views.map((v) => ({
         label: `${v.name} [${v.viewtemplate} ${table_id_to_name[v.table_id] || ""}]`,
-        name: v.name
+        name: v.name,
     }));
     const view_relation_opts = {};
     const link_view_opts = [];
@@ -241,14 +243,12 @@ const get_link_view_opts = async (table, viewname) => {
             view_relation_opts[view] = [];
         view_relation_opts[view].push({ value: name, label: relation });
     };
-    own_link_views
-        .filter((v) => v.name !== viewname)
-        .forEach((v) => {
+    own_link_views.forEach((v) => {
         push_view_option({
             view: v.name,
             label: `${v.name} [${v.viewtemplate} ${table.name}]`,
             name: `Own:${v.name}`,
-            relation: table.name
+            relation: table.name,
         });
     });
     const link_view_opts_push = (o) => {
@@ -263,7 +263,7 @@ const get_link_view_opts = async (table, viewname) => {
                     view: view.name,
                     name: `ChildList:${view.name}.${throughTable.name}.${through.name}.${related_table.name}.${relation.name}`,
                     label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.name}.${through.name}]`,
-                    relation: `${related_table.name}.${relation.name}.${through.name}`
+                    relation: `${related_table.name}.${relation.name}.${through.name}`,
                 });
             }
             else {
@@ -271,7 +271,7 @@ const get_link_view_opts = async (table, viewname) => {
                     view: view.name,
                     name: `ChildList:${view.name}.${related_table.name}.${relation.name}`,
                     label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.name}]`,
-                    relation: `${related_table.name}.${relation.name}`
+                    relation: `${related_table.name}.${relation.name}`,
                 });
             }
         }
@@ -283,7 +283,7 @@ const get_link_view_opts = async (table, viewname) => {
                 view: view.name,
                 name: `ParentShow:${view.name}.${related_table.name}.${relation.name}`,
                 label: `${view.name} [${view.viewtemplate} ${relation.name}.${related_table.name}]`,
-                relation: `${relation.name}.${related_table.name}`
+                relation: `${relation.name}.${related_table.name}`,
             });
         }
     }
@@ -294,7 +294,7 @@ const get_link_view_opts = async (table, viewname) => {
                 view: view.name,
                 name: `OneToOneShow:${view.name}.${related_table.name}.${relation.name}`,
                 label: `${view.name} [${view.viewtemplate} ${related_table.name}.${relation.label}]`,
-                relation: `${related_table.name}.${relation.label}`
+                relation: `${related_table.name}.${relation.label}`,
             });
         }
     }
@@ -304,7 +304,7 @@ const get_link_view_opts = async (table, viewname) => {
             view: view.name,
             label: `${view.name} [${view.viewtemplate}]`,
             name: `Independent:${view.name}`,
-            relation: "None"
+            relation: "None",
         });
     });
     return { link_view_opts, view_name_opts, view_relation_opts };
@@ -403,7 +403,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
     const { child_field_list, child_relations } = await table.get_child_relations(true);
     const aggStatOptions = {};
     const agg_fieldviews = [];
-    Object.values(getState().types).forEach(t => {
+    Object.values(getState().types).forEach((t) => {
         const fvnames = Object.entries(t.fieldviews)
             .filter(([k, v]) => !v.isEdit && !v.isFilter)
             .map(([k, v]) => k);
@@ -412,7 +412,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             label: __("Field view"),
             type: "String",
             attributes: {
-                options: fvnames
+                options: fvnames,
             },
             showIf: {
                 "agg_field|_@_1": t.name,
@@ -429,12 +429,13 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             showIf: {
                 type: "Aggregation",
                 "agg_field|_@_1": "Date",
-                agg_fieldview: "format"
-            }
+                agg_fieldview: "format",
+            },
         },
     ];
     const agg_field_opts = child_relations.map(({ table, key_field, through }) => {
-        const aggKey = (through ? `${through.name}->` : '') + `${table.name}.${key_field.name}`;
+        const aggKey = (through ? `${through.name}->` : "") +
+            `${table.name}.${key_field.name}`;
         aggStatOptions[aggKey] = [
             "Count",
             "Avg",
@@ -618,7 +619,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             required: true,
             attributes: {
                 options: view_name_opts,
-                asideNext: true
+                asideNext: true,
             },
             showIf: { type: "ViewLink" },
         },
@@ -628,8 +629,8 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             type: "String",
             required: true,
             attributes: {
-                //options: link_view_opts,        
-                calcOptions: ["view_name", view_relation_opts]
+                //options: link_view_opts,
+                calcOptions: ["view_name", view_relation_opts],
             },
             showIf: { type: "ViewLink" },
         },
@@ -790,7 +791,7 @@ const field_picker_fields = async ({ table, viewname, req }) => {
             name: "col_width",
             label: __("Column width"),
             type: "Integer",
-            attributes: { asideNext: true }
+            attributes: { asideNext: true },
         },
         {
             name: "col_width_units",
@@ -936,10 +937,7 @@ const picked_fields_to_query = (columns, fields, layout) => {
             }
         }
         else if (column.type === "FormulaValue") {
-            freeVars = new Set([
-                ...freeVars,
-                ...freeVariables(column.formula),
-            ]);
+            freeVars = new Set([...freeVars, ...freeVariables(column.formula)]);
         }
         else if (column.type === "ViewLink") {
             if (column.view_label_formula)
@@ -987,7 +985,7 @@ const picked_fields_to_query = (columns, fields, layout) => {
                     where: column.aggwhere ? jsexprToWhere(column.aggwhere) : undefined,
                     field,
                     aggregate: column.stat,
-                    through
+                    through,
                 };
             }
         }
@@ -1019,11 +1017,8 @@ const picked_fields_to_query = (columns, fields, layout) => {
             },
             container(v) {
                 if (v.showIfFormula)
-                    freeVars = new Set([
-                        ...freeVars,
-                        ...freeVariables(v.showIfFormula),
-                    ]);
-            }
+                    freeVars = new Set([...freeVars, ...freeVariables(v.showIfFormula)]);
+            },
         });
     }
     add_free_variables_to_joinfields(freeVars, joinFields, fields);
@@ -1482,13 +1477,13 @@ const json_list_to_external_table = (get_json_list, fields0) => {
     const getRows = async (where = {}, selopts = {}) => {
         let data_in = await get_json_list({ where, ...selopts });
         const restricts = Object.entries(where);
-        const sat = x => ([k, v]) => {
+        const sat = (x) => ([k, v]) => {
             if (Array.isArray(v))
-                return v.every(v1 => sat(x)([k, v1]));
+                return v.every((v1) => sat(x)([k, v1]));
             else if (v?.lt)
-                return x[k] < +(v.lt);
+                return x[k] < +v.lt;
             else if (v?.gt)
-                return x[k] > +(v.gt);
+                return x[k] > +v.gt;
             else if (v?.ilike)
                 return (x[k] || "").includes(v.ilike);
             else