@saltcorn/data 0.6.1-beta.3 → 0.6.1

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/data",
-  "version": "0.6.1-beta.3",
+  "version": "0.6.1",
   "description": "Data models for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -10,12 +10,12 @@
   "license": "MIT",
   "main": "index.js",
   "optionalDependencies": {
-    "@saltcorn/postgres": "0.6.1-beta.3",
-    "@saltcorn/sqlite": "0.6.1-beta.3"
+    "@saltcorn/postgres": "0.6.1",
+    "@saltcorn/sqlite": "0.6.1"
   },
   "dependencies": {
-    "@saltcorn/markup": "0.6.1-beta.3",
-    "@saltcorn/db-common": "0.6.1-beta.3",
+    "@saltcorn/markup": "0.6.1",
+    "@saltcorn/db-common": "0.6.1",
     "acorn": "^8.0.3",
     "adm-zip": "0.5.5",
     "astring": "^1.4.3",