@saltcorn/data 0.7.1-beta.2 → 0.7.2-beta.0

package/dist/utils.js

@@ -6,6 +6,7 @@
 const v8 = require("v8");
 const v8_1 = require("v8");
 const fs_1 = require("fs");
+const internal_1 = require("@saltcorn/db-common/internal");
 const fs = require("fs");
 const removeEmptyStrings = (obj) => {
     var o = {};
@@ -116,26 +117,6 @@ const mergeIntoWhere = (where, newWhere) => {
     });
     return where;
 };
-const prefixFieldsInWhere = (inputWhere, tablePrefix) => {
-    if (!inputWhere)
-        return {};
-    const whereObj = {};
-    Object.keys(inputWhere).forEach((k) => {
-        if (k === "_fts")
-            whereObj[k] = { table: tablePrefix, ...inputWhere[k] };
-        else if (k === "not") {
-            whereObj.not = prefixFieldsInWhere(inputWhere[k], tablePrefix);
-        }
-        else if (k === "or") {
-            whereObj.or = Array.isArray(inputWhere[k])
-                ? inputWhere[k].map((w) => prefixFieldsInWhere(w, tablePrefix))
-                : prefixFieldsInWhere(inputWhere[k], tablePrefix);
-        }
-        else
-            whereObj[`${tablePrefix}."${k}"`] = inputWhere[k];
-    });
-    return whereObj;
-};
 /**
  * @function
  * @param {Date} date
@@ -150,7 +131,7 @@ const isStale = (date, hours = 24) => {
 module.exports = {
     removeEmptyStrings,
     removeDefaultColor,
-    prefixFieldsInWhere,
+    prefixFieldsInWhere: internal_1.prefixFieldsInWhere,
     isEmpty,
     asyncMap,
     numberToBool,

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/data",
-  "version": "0.7.1-beta.2",
+  "version": "0.7.2-beta.0",
   "description": "Data models for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -34,13 +34,13 @@
     "dist/**/*"
   ],
   "optionalDependencies": {
-    "@saltcorn/postgres": "0.7.1-beta.2",
-    "@saltcorn/sqlite": "0.7.1-beta.2"
+    "@saltcorn/postgres": "0.7.2-beta.0",
+    "@saltcorn/sqlite": "0.7.2-beta.0"
   },
   "dependencies": {
-    "@saltcorn/types": "0.7.1-beta.2",
-    "@saltcorn/markup": "0.7.1-beta.2",
-    "@saltcorn/db-common": "0.7.1-beta.2",
+    "@saltcorn/types": "0.7.2-beta.0",
+    "@saltcorn/markup": "0.7.2-beta.0",
+    "@saltcorn/db-common": "0.7.2-beta.0",
     "acorn": "^8.0.3",
     "astring": "^1.4.3",
     "bcryptjs": "^2.4.3",

package/dist/models/backup.d.ts

@@ -1,9 +0,0 @@
-declare const Plugin: any;
-import { Plugin } from "@saltcorn/types/base_types";
-declare const _default: {
-    create_backup: (fnm?: string | undefined) => Promise<string>;
-    restore: (fnm: string, loadAndSaveNewPlugin: (plugin: Plugin) => void, restore_first_user?: boolean | undefined) => Promise<string | void>;
-    create_csv_from_rows: (rows: any[], fnm: string) => Promise<void>;
-};
-export = _default;
-//# sourceMappingURL=backup.d.ts.map

package/dist/models/backup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../models/backup.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAAsB,CAAC;AAwBnC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;;;;;;AAiTpD,kBAA0D"}

package/dist/models/backup.js

@@ -1,278 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-/**
- * @category saltcorn-data
- * @module models/backup
- * @subcategory models
- */
-const { getState } = require("../db/state");
-const db_1 = __importDefault(require("../db"));
-const table_1 = __importDefault(require("./table"));
-const common_types_1 = require("@saltcorn/types/common_types");
-const view_1 = __importDefault(require("./view"));
-const File = require("./file");
-const Plugin = require("./plugin");
-const User = require("./user");
-const role_1 = __importDefault(require("./role"));
-const Page = require("./page");
-const adm_zip_1 = __importDefault(require("adm-zip"));
-const tmp_promise_1 = require("tmp-promise");
-const promises_1 = require("fs/promises");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const dateformat_1 = __importDefault(require("dateformat"));
-const sync_1 = __importDefault(require("csv-stringify/lib/sync"));
-const csvtojson_1 = __importDefault(require("csvtojson"));
-const { table_pack, view_pack, plugin_pack, page_pack, install_pack, can_install_pack, } = require("./pack");
-const { asyncMap } = require("../utils");
-const trigger_1 = __importDefault(require("./trigger"));
-const library_1 = __importDefault(require("./library"));
-/**
- * @function
- * @param {string} dirpath
- * @returns {Promise<void>}
- */
-const create_pack = async (dirpath) => {
-    const tables = await asyncMap(await table_1.default.find({}), async (t) => await table_pack(t.name));
-    const views = await asyncMap(await view_1.default.find({}), async (v) => await view_pack(v.name));
-    const plugins = await asyncMap(await Plugin.find({}), async (v) => await plugin_pack(v.name));
-    const pages = await asyncMap(await Page.find({}), async (v) => await page_pack(v.name));
-    const triggers = (await trigger_1.default.find({})).map((tr) => tr.toJson);
-    const roles = await role_1.default.find({});
-    const library = (await library_1.default.find({})).map((l) => l.toJson);
-    const pack = { tables, views, plugins, pages, triggers, roles, library };
-    await (0, promises_1.writeFile)((0, path_1.join)(dirpath, "pack.json"), JSON.stringify(pack));
-};
-/**
- * @function
- * @param {object[]} rows
- * @param {string} fnm
- * @returns {Promise<void>}
- */
-const create_csv_from_rows = async (rows, fnm) => {
-    if (rows.length === 0)
-        return;
-    const s = (0, sync_1.default)(rows, {
-        header: true,
-        cast: {
-            date: (value) => value.toISOString(),
-        },
-    });
-    await (0, promises_1.writeFile)(fnm, s);
-};
-/**
- * @function
- * @param {Table} table
- * @param {string} dirpath
- * @returns {Promise<void>}
- */
-const create_table_json = async (table, dirpath) => {
-    const rows = await table.getRows();
-    await (0, promises_1.writeFile)((0, path_1.join)(dirpath, table.name + ".json"), JSON.stringify(rows));
-};
-/**
- * @function
- * @param {string} root_dirpath
- * @return {Promise<void>}
- */
-const create_table_jsons = async (root_dirpath) => {
-    const dirpath = (0, path_1.join)(root_dirpath, "tables");
-    await (0, promises_1.mkdir)(dirpath, { recursive: true });
-    const tables = await table_1.default.find({});
-    for (const t of tables) {
-        await create_table_json(t, dirpath);
-    }
-};
-/**
- * @function
- * @param {string} root_dirpath
- * @returns {Promise<void>}
- */
-const backup_files = async (root_dirpath) => {
-    const dirpath = (0, path_1.join)(root_dirpath, "files");
-    await (0, promises_1.mkdir)(dirpath);
-    const files = await db_1.default.select("_sc_files");
-    for (const f of files) {
-        const base = (0, path_1.basename)(f.location);
-        await (0, promises_1.copyFile)(f.location, (0, path_1.join)(dirpath, base));
-        f.location = base;
-    }
-    await create_csv_from_rows(files, (0, path_1.join)(root_dirpath, "files.csv"));
-};
-/**
- * @function
- * @param {string} root_dirpath
- * @returns {Promise<void>}
- */
-const backup_config = async (root_dirpath) => {
-    const dirpath = (0, path_1.join)(root_dirpath, "config");
-    await (0, promises_1.mkdir)(dirpath);
-    const cfgs = await db_1.default.select("_sc_config");
-    for (const cfg of cfgs) {
-        await (0, promises_1.writeFile)((0, path_1.join)(dirpath, cfg.key), JSON.stringify(db_1.default.isSQLite ? JSON.parse(cfg.value) : cfg.value));
-    }
-};
-/**
- * @function
- * @param {string} [fnm]
- * @returns {Promise<string>}
- */
-const create_backup = async (fnm) => {
-    const tmpDir = await (0, tmp_promise_1.dir)({ unsafeCleanup: true });
-    await create_pack(tmpDir.path);
-    await create_table_jsons(tmpDir.path);
-    await backup_files(tmpDir.path);
-    await backup_config(tmpDir.path);
-    var day = (0, dateformat_1.default)(new Date(), "yyyy-mm-dd-HH-MM");
-    const ten = db_1.default.getTenantSchema();
-    const tens = ten === db_1.default.connectObj.default_schema
-        ? getState().getConfig("site_name", "Saltcorn")
-        : ten;
-    const zipFileName = fnm || `sc-backup-${tens}-${day}.zip`;
-    var zip = new adm_zip_1.default();
-    zip.addLocalFolder(tmpDir.path);
-    zip.writeZip(zipFileName);
-    await tmpDir.cleanup();
-    return zipFileName;
-};
-/**
- * @function
- * @param {string} fnm
- * @param {string} dir
- * @returns {Promise<void>}
- */
-const extract = async (fnm, dir) => {
-    return new Promise(function (resolve, reject) {
-        var zip = new adm_zip_1.default(fnm);
-        zip.extractAllToAsync(dir, true, function (err) {
-            if (err)
-                reject(new Error("Error opening zip file: " + err));
-            else
-                resolve();
-        });
-    });
-};
-/**
- * @function
- * @param {string} dirpath
- * @returns {Promise<object>}
- */
-const restore_files = async (dirpath) => {
-    const fnm = (0, path_1.join)(dirpath, "files.csv");
-    const file_users = {};
-    if ((0, fs_1.existsSync)(fnm)) {
-        const file_rows = await (0, csvtojson_1.default)().fromFile(fnm);
-        for (const file of file_rows) {
-            const newPath = File.get_new_path(file.location);
-            //copy file
-            await (0, promises_1.copyFile)((0, path_1.join)(dirpath, "files", file.location), newPath);
-            //set location
-            file.location = newPath;
-            //insert in db
-            const { user_id, ...file_row } = file;
-            file_row.s3_store = !!file_row.s3_store;
-            const id = await db_1.default.insert("_sc_files", file_row);
-            file_users[id] = user_id;
-        }
-        if (db_1.default.reset_sequence)
-            await db_1.default.reset_sequence("_sc_files");
-    }
-    return file_users;
-};
-/**
- * @function
- * @param {object} file_users
- * @returns {Promise<void>}
- */
-const restore_file_users = async (file_users) => {
-    for (const [id, user_id] of Object.entries(file_users)) {
-        if (user_id)
-            await db_1.default.update("_sc_files", { user_id }, id);
-    }
-};
-/**
- * @function
- * @param {string} file_users
- * @param {boolean} [restore_first_user]
- * @returns {Promise<string|undefined>}
- */
-const restore_tables = async (dirpath, restore_first_user) => {
-    var err;
-    const tables = await table_1.default.find();
-    for (const table of tables) {
-        const fnm_csv = table.name === "users"
-            ? (0, path_1.join)(dirpath, "users.csv")
-            : (0, path_1.join)(dirpath, "tables", table.name + ".csv");
-        const fnm_json = (0, path_1.join)(dirpath, "tables", table.name + ".json");
-        if ((0, fs_1.existsSync)(fnm_json)) {
-            const res = await table.import_json_file(fnm_json, table.name === "users" && !restore_first_user);
-            if (res.error)
-                err = (err || "") + res.error;
-        }
-        else if ((0, fs_1.existsSync)(fnm_csv)) {
-            const res = await table.import_csv_file(fnm_csv, false, table.name === "users" && !restore_first_user);
-            if ((0, common_types_1.instanceOfErrorMsg)(res))
-                err = (err || "") + res.error;
-        }
-    }
-    for (const table of tables) {
-        try {
-            await table.enable_fkey_constraints();
-        }
-        catch (e) {
-            err = (err || "") + e.message;
-        }
-    }
-    return err;
-};
-/**
- * @function
- * @param {string} dirpath
- * @returns {Promise<void>}
- */
-const restore_config = async (dirpath) => {
-    const cfgs = (0, fs_1.readdirSync)((0, path_1.join)(dirpath, "config"));
-    const state = getState();
-    for (const cfg of cfgs) {
-        const s = await (0, promises_1.readFile)((0, path_1.join)(dirpath, "config", cfg));
-        await state.setConfig(cfg, JSON.parse(s.toString()).v);
-    }
-};
-/**
- * @function
- * @param {string} fnm
- * @param {function} loadAndSaveNewPlugin
- * @param {boolean} [restore_first_user]
- * @returns {Promise<void>}
- */
-const restore = async (fnm, loadAndSaveNewPlugin, restore_first_user) => {
-    const tmpDir = await (0, tmp_promise_1.dir)({ unsafeCleanup: true });
-    //unzip
-    await extract(fnm, tmpDir.path);
-    var err;
-    //install pack
-    const pack = JSON.parse(await (await (0, promises_1.readFile)((0, path_1.join)(tmpDir.path, "pack.json"))).toString());
-    const can_restore = await can_install_pack(pack);
-    if (can_restore.error) {
-        return `Cannot restore backup, clashing entities: 
-    ${can_restore.error || ""}
-    Delete these entities or restore to a pristine instance.
-    `;
-    }
-    await install_pack(pack, undefined, loadAndSaveNewPlugin, true);
-    // files
-    const file_users = await restore_files(tmpDir.path);
-    //table csvs
-    const tabres = await restore_tables(tmpDir.path, restore_first_user);
-    if (tabres)
-        err = (err || "") + tabres;
-    //config
-    await restore_config(tmpDir.path);
-    await restore_file_users(file_users);
-    await tmpDir.cleanup();
-    return err;
-};
-module.exports = { create_backup, restore, create_csv_from_rows };
-//# sourceMappingURL=backup.js.map

package/dist/models/backup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../models/backup.ts"],"names":[],"mappings":"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"}

package/dist/models/pack.d.ts

@@ -1,42 +0,0 @@
-/**
- * @category saltcorn-data
- * @module models/pack
- * @subcategory models
- */
-import type { Pack } from "@saltcorn/types/base_types";
-import type { PagePack } from "@saltcorn/types/model-abstracts/abstract_page";
-import type Plugin from "./plugin";
-import type { ViewPack } from "@saltcorn/types/model-abstracts/abstract_view";
-import type { TablePack } from "@saltcorn/types/model-abstracts/abstract_table";
-declare const _default: {
-    table_pack: (name: string) => Promise<TablePack>;
-    view_pack: (name: string) => Promise<ViewPack>;
-    plugin_pack: (name: string) => Promise<import("@saltcorn/types/model-abstracts/abstract_plugin").PluginCfg>;
-    page_pack: (name: string) => Promise<PagePack>;
-    role_pack: (role: string) => Promise<import("@saltcorn/types/model-abstracts/abstract_role").RoleCfg>;
-    library_pack: (name: string) => Promise<import("@saltcorn/types/model-abstracts/abstract_library").LibraryCfg>;
-    trigger_pack: (name: string) => Promise<import("@saltcorn/types/model-abstracts/abstract_trigger").TriggerCfg>;
-    install_pack: (pack: Pack, name: string | undefined, loadAndSaveNewPlugin: (arg0: Plugin) => void, bare_tables?: boolean) => Promise<void>;
-    fetch_available_packs: () => Promise<{
-        name: string;
-    }[]>;
-    fetch_pack_by_name: (name: string) => Promise<{
-        name: string;
-        pack: any;
-    } | null>;
-    is_stale: (date: string | Date, hours?: number) => boolean;
-    can_install_pack: (pack: Pack) => Promise<true | {
-        error?: string | undefined;
-        warning?: string | undefined;
-    }>;
-    uninstall_pack: (pack: Pack, name?: string | undefined) => Promise<void>;
-    add_to_menu: (item: {
-        label: string;
-        type: "View" | "Page";
-        viewname?: string | undefined;
-        pagename?: string | undefined;
-        min_role: number;
-    }) => Promise<void>;
-};
-export = _default;
-//# sourceMappingURL=pack.d.ts.map

package/dist/models/pack.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pack.d.ts","sourceRoot":"","sources":["../../models/pack.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAE9E,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgahF,kBAeE"}