zet-lib 1.0.0 → 1.0.2

package/lib/Util.js

@@ -234,7 +234,6 @@ Util.replaceAll = function (str, find, replace) {
         for (let i = 0; i < find.length; i++) {
             if (str.indexOf(find[i]) > -1) {
                 t = str.replace(new RegExp(Util.escapeRegExp(find[i]), 'g'), replace);
-                //console.log(t)
             }
         }
     } else {
@@ -502,25 +501,7 @@ Util.getKey = function (obj, field) {
     return t;
 };
 
-/**
- * Camelize a string, cutting the string by multiple separators like
- * hyphens, underscores and spaces.
- *
- * @param {text} string Text to camelize
- * @return string Camelized text
- *
- * // someDatabaseFieldName
- console.log(camelize("some_database_field_name"));
 
- // someLabelThatNeedsToBeCamelized
- console.log(camelize("Some label that needs to be camelized"));
-
- // someJavascriptProperty
- console.log(camelize("some-javascript-property"));
-
- // someMixedStringWithSpacesUnderscoresAndHyphens
- console.log(camelize("some-mixed_string with spaces_underscores-and-hyphens"));
- */
 Util.camelize = function (text) {
     return text.replace(/^([A-Z])|[\s-_]+(\w)/g, function (match, p1, p2, offset) {
         if (p2) return p2.toUpperCase();
@@ -528,28 +509,13 @@ Util.camelize = function (text) {
     });
 }
 
-/**
- * Decamelizes a string with/without a custom separator (underscore by default).
- *
- * @param str String in camelcase
- * @param separator Separator for the new decamelized string.
- *
- * // some database field name (separate with an empty space)
- console.log(decamelize("someDatabaseFieldName", " "));
-
- // some-label-that-needs-to-be-camelized (separate with an hyphen)
- console.log(decamelize("someLabelThatNeedsToBeCamelized", "-"));
-
- // some_javascript_property (separate with underscore)
- console.log(decamelize("someJavascriptPraroperty", "_"));
- */
 Util.decamelize = function (str, separator) {
     separator = typeof separator === 'undefined' ? '_' : separator;
     return str
-        .replace(/([a-z\d])([A-Z])/g, '$1' + separator + '$2')
-        .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, '$1' + separator + '$2')
-        .replace("_", separator)
-        .toLowerCase();
+      .replace(/([a-z\d])([A-Z])/g, '$1' + separator + '$2')
+      .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, '$1' + separator + '$2')
+      .replace("_", separator)
+      .toLowerCase();
 }
 
 /*
@@ -608,20 +574,20 @@ Util.asyncWrap = (fn) => {
 Util.capitalizeAfterSpace = function (str) {
     str = Util.replaceAll(str, "_", " ");
     return str.replace(
-        /\w\S*/g,
-        function (txt) {
-            return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-        }
+      /\w\S*/g,
+      function (txt) {
+          return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+      }
     );
 };
 
 Util.capitalizeAfterSpaceTitle = function (str) {
     str = Util.replaceAll(str, " ", "_");
     return str.replace(
-        /\w\S*/g,
-        function (txt) {
-            return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-        }
+      /\w\S*/g,
+      function (txt) {
+          return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+      }
     );
 };
 
@@ -682,21 +648,6 @@ Util.formatNumber = function (num, thousandSeparator='.') {
     }
 };
 
-Util.dumpError = function (err) {
-    if (typeof err === 'object') {
-        if (err.message) {
-            console.log('\nMessage: ' + err.message)
-        }
-        if (err.stack) {
-            console.log('\nStacktrace:')
-            console.log('====================')
-            console.log(err.stack);
-        }
-    } else {
-        console.log(err);
-    }
-};
-
 Util.fileAttribute = function (filename) {
     filename = filename.toLowerCase() || "";
     let ext = filename.split('.').pop();
@@ -751,7 +702,6 @@ Util.fileView = function (dir, file, attributes={}) {
     let withIcon = attributes.hasOwnProperty('withIcon') ? true : false;
     let obj = Util.fileExtension(filename);
     let className = attributes.hasOwnProperty('class') ? ` class="${attributes.class}" ` : '';
-    //console.log(JSON.stringify(obj))
     if(filename.includes('https')) {
         html = `<img src="${file}" ${className}  class="img-responsive">`
     } else {
@@ -863,8 +813,7 @@ Util.virtualHelper = function (obj) {
     return str;
 };
 
-
-Util.nots = ['id', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy', 'created_at', 'updated_at', 'created_by', 'updated_by', 'modified_by', 'companyId', 'company_id'];
+Util.nots = ['id', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy', 'companyId', 'created_at', 'updated_at','updated_by', 'created_by', 'modified_by', 'company_id', 'token', 'version', 'signin_method', 'lastLogin', 'last_login', 'forgotPassword', 'forgot_password','no', 'actionColumn'];
 
 Util.requiredFields = function (obj) {
     var nots = Util.nots;
@@ -1047,7 +996,6 @@ Util.readFile = function (filename) {
             return data;
         }
     } catch (err) {
-        console.error(err)
     }
     return ""
 
@@ -1057,7 +1005,6 @@ Util.dirExist = (dir, create = false) =>{
     try {
         if(create) {
             fs.ensureDir(dir, err => {
-                console.log(err); // => null
             });
         }
         // check if directory exists
@@ -1065,7 +1012,6 @@ Util.dirExist = (dir, create = false) =>{
             return true;
         }
     } catch (e) {
-        console.log(e);
     }
     return false;
 };
@@ -1084,7 +1030,6 @@ Util.getAllFiles = (dir) => {
             files =  fs.readdirSync(dir);
         }
     } catch (e) {
-        console.log('error',e.toString());
         return [];
     }
     return files;
@@ -1097,7 +1042,6 @@ Util.writeFile = (filename, content) => {
         fs.writeFileSync(filename, content);
         return true
     } catch (e) {
-        console.log(e)
         return false
     }
 };
@@ -1107,13 +1051,11 @@ Util.deleteAllFiles = (dir) => {
         fs.emptyDirSync(dir);
         return true
     } catch (e) {
-        console.log(e)
         return false
     }
 };
 
 Util.findFilesName = (arr,filename) => {
-    console.log(filename)
     arr = arr || [];
     return arr.filter((item) => item.includes(filename));
 };
@@ -1133,12 +1075,8 @@ Util.getFiles = function (dir, token = "") {
                             <p class="text-ellipsis ui-selectee">${item}</p>
                         </div>`;
         } else {
-            console.log(dir);
             let explode = dir.split(token);
-            console.log(token)
             let path = explode[1] || "";
-
-            console.log(path)
             let state = "";
             if (path == "") {
                 state = "/" + item;

package/lib/index.js

@@ -22,6 +22,7 @@ module.exports = {
     zReport: require('./zReport'),
     zRoute: require('./zRoute'),
     zRole : require('./zRole'),
+    zPage: require('./zPage'),
     zTester: require('./zTester'),
     zCache : require('./zCache'),
     UI : require('./UI')

package/lib/io.js

@@ -37,7 +37,6 @@ io.on('connection', function (socket) {
     socket.on('room', function(room) {
         socket.join(room);
     });
-
 });
 
 io.socketArray = socketArray;

package/lib/zCache.js

@@ -11,7 +11,6 @@ const zCache = {};
 //constants
 zCache.KEYS = {
     ROUTES: "ROUTES",
-    TABLES: "TABLES",
     MYMODELS: "MYMODELS",
     ROLES: "ROLES",
     CONFIG: "CONFIG",
@@ -57,11 +56,10 @@ const cache = async()=> {
     } else {
         await zCache.ROUTES();
     }
-    if (myCache.has("TABLES")) {
+    if (myCache.has("MYMODELS")) {
         i = i + 1;
     } else {
-        //console.log("cache TABLES not exist " + i)
-        await zCache.TABLES();
+        await zCache.MYMODELS();
     }
     if (myCache.has("CONFIG")) {
         i = i + 1;
@@ -103,8 +101,8 @@ zCache.renew = async()=> {
     await zCache.ROLES();
     await zCache.MENU();
     await zCache.CONFIG();
-    await zCache.TABLES();
     await zCache.ROUTES();
+    await zCache.MYMODELS();
     await zCache.MENU_SYSTEMS();
     await zCache.MODELS_RELATIONS();
 };
@@ -119,24 +117,16 @@ zCache.ROUTES = () => {
     }
 };
 
-zCache.TABLES = () => {
-    let routes = zCache.get("ROUTES");
-    let modelsDirectory = path.join(directory, 'models');
-    let tables = [], obj = {};
-    routes.forEach((table) => {
-        if (fs.existsSync(modelsDirectory + "/" + table + ".js")) {
-            tables.push(table);
-            let MYMODEL = require("./../models/" + table);
-            obj[table] = MYMODEL;
-        }
-    });
-    myCache.set("TABLES", tables);
-    myCache.set("MYMODELS", obj);
-    //add to version after set
-    zCache.updateVersions("TABLES")
-    zCache.updateVersions("MYMODELS")
 
-};
+zCache.MYMODELS = () => {
+    if(myCache.has("MYMODELS")) {
+        return myCache.get("MYMODELS");
+    } else {
+        const models = zRoute.MYMODELS();
+        myCache.set("MYMODELS", models);
+        return models;
+    }
+}
 
 zCache.ROLES = async() => {
     let r = 0;
@@ -212,9 +202,6 @@ zCache.CONFIG = async() => {
     zCache.updateVersions(zCache.KEYS.CONFIG)
 };
 
-zCache.MYMODELS = () => {
-    zCache.TABLES();
-}
 
 zCache.MENU = async() => {
     let results = async() => {

package/lib/zPage.js

@@ -0,0 +1,188 @@
+/**
+ * For dynamic router
+ */
+const axios = require('axios');
+const fs = require('fs-extra');
+const nodemailer = require('nodemailer');
+const qs = require('qs');
+const moment = require('moment');
+const pm2 = require('pm2');
+const { minify } = require('html-minifier-terser');
+const connection = require('./connection');
+const Util = require('./Util');
+const myCache = require('./cache');
+
+const zpage = {};
+
+zpage.build = async (req, res) => {
+    let layouts = await connection.results({
+        table : "zlayout"
+    });
+    let layoutObj = Util.arrayToObject(layouts,"id");
+    let results = await connection.results({
+        table: "zpage",
+        where: {
+            active: 1
+        }
+    });
+    let server_code = zpage.coreCode();
+    results.forEach(function (result) {
+        server_code += zpage.createRoute(result, res.locals.token, layoutObj);
+        server_code += Util.newLine;
+    });
+    server_code += `module.exports = router;`;
+
+    fs.writeFileSync(dirRoot + "/routes/zindex.js", server_code, 'utf-8');
+    if (process.env.NODE_ENV === "production") {
+        setTimeout(function () {
+            pm2.connect(function (err) {
+                if (err) {
+                    console.log(err.toString());
+                }
+                pm2.restart(process.env.PM2_NAME, (err, proc) => {
+                    //io.to(room).emit("message","Restart done")
+                });
+            });
+        }, 3000)
+    }
+};
+
+zpage.coreCode = () => {
+    return `const router = require('express').Router();
+const csrf = require('csurf');
+const csrfProtection = csrf({cookie: true});
+const fs = require('fs-extra');
+const qs = require('qs');
+const axios = require('axios');
+const nodemailer = require('nodemailer');
+const {zRoute, zRole, connection, Util, io, zCache, debug, moduleLib, zFunction } = require('zet-lib');
+
+`;
+};
+
+zpage.createRoute = (obj, token, layoutObj) => {
+    const MYMODELS = myCache.get('MYMODELS');
+    const MYMODEL = MYMODELS.zpage;
+    let DIR = dirRoot + "/views/zindex";
+    let METHOD = MYMODEL.widgets.method.fields;
+    let layout = "new-blank.ejs";
+    if (obj.layouts == 2) {
+        layout = "one.ejs"
+    } else if (obj.layouts == 3) {
+        layout = "two.ejs";
+    } else if(obj.layouts == 4) {
+        layout = layoutObj[obj.layout_id].name+".ejs" || "blank.ejs";
+    }
+
+    let renderDataforGet = "";
+    let routerforGet = "";
+    if (obj.method == 1) {
+        renderDataforGet = `renderData.csrfToken = req.csrfToken()`;
+        routerforGet = "csrfProtection, "
+    }
+    let commonData = {
+        company_id: obj.company_id,
+        updated_by: obj.updated_by,
+        created_by: obj.created_by
+    };
+    let ioto = `io.to("${token}").emit("error", e.toString())`;
+
+    let render = "";
+    let renderData = "";
+    if (obj.head) {
+        fs.writeFileSync(`${DIR}/page${obj.id}-head.ejs`, obj.head, 'utf-8');
+        renderData += `renderData.renderHead = "zindex/page${obj.id}-head.ejs"; `
+    } else {
+        fs.unlink(`${DIR}/page${obj.id}-head.ejs`, function (err) {
+            if (err) return console.log(err);
+            console.log('file deleted successfully');
+        });
+    }
+
+    let isrenderPage = false;
+    if (obj.client_code) {
+        fs.writeFileSync(`${DIR}/page${obj.id}.ejs`, obj.client_code, 'utf-8');
+        renderData += `renderData.renderBody = "zindex/page${obj.id}.ejs"; `
+        isrenderPage = true;
+    } else {
+        fs.unlink(`${DIR}/page${obj.id}.ejs`, function (err) {
+            if (err) return console.log(err);
+            console.log('file deleted successfully');
+        });
+    }
+    //optional
+    if(!isrenderPage && obj.method == 1) {
+        fs.writeFileSync(`${DIR}/page${obj.id}.ejs`, obj.client_code, 'utf-8');
+        renderData += `renderData.renderBody = "zindex/page${obj.id}.ejs"; `
+    }
+    //end optional
+    if (obj.scripts) {
+        fs.writeFileSync(`${DIR}/page${obj.id}-script.ejs`, obj.scripts, 'utf-8');
+        renderData += `renderData.renderEnd = "zindex/page${obj.id}-script.ejs"; `
+    } else {
+        fs.unlink(`${DIR}/page${obj.id}-script.ejs`, function (err) {
+            if (err) return console.log(err);
+            console.log('file deleted successfully');
+        });
+    }
+    if (renderData) {
+        render += `${Util.tab}res.render("layouts/${layout}", renderData);`;
+    }
+    let scripts = `router.${METHOD[obj.method]}('${obj.page}', ${routerforGet} async(req,res) => {
+    try {
+    let renderData = {}
+    let commonData = ${JSON.stringify(commonData)};
+    commonData.updated_at = Util.now();
+    commonData.created_at = Util.now();
+    ${renderDataforGet}
+    let layout = "${layout}";
+    ${obj.server_code}
+    ${renderData}
+    ${render}
+    } catch (e) {
+        console.log(e);
+        ${ioto}
+        res.json(e.toString()); 
+    }
+}); ${Util.newLine}
+`;
+
+    return scripts;
+};
+
+
+zpage.buildLayout = async (obj) => {
+    let name = Util.toName(obj.name);
+    if (obj.active) {
+        let html = await minify(obj.code,{
+            removeComments:true,
+            minifyJS:true,
+            minifyCSS:true,
+            collapseWhitespace: true
+        });
+        fs.writeFileSync(dirRoot + "/views/layouts/" + name + ".ejs", html, 'utf-8');
+        if (process.env.NODE_ENV  === "production") {
+            setTimeout(function () {
+                pm2.connect(function (err) {
+                    if (err) {
+                        console.log(err.toString());
+                    }
+                    pm2.restart(process.env.PM2_NAME, (err, proc) => {
+                        //io.to(room).emit("message","Restart done")
+                    });
+                });
+            }, 3000)
+        }
+    }
+};
+
+zpage.layoutDelete = async (obj) => {
+    let name = Util.toName(obj.name);
+    let path = dirRoot + "/views/layouts/customs/" + name + ".ejs"
+    fs.unlink(path, function (err) {
+        if (err) return console.log(err);
+        console.log('file deleted successfully');
+    });
+};
+
+module.exports = zpage;

package/lib/zRoute.js

@@ -7,10 +7,12 @@ const qs = require('qs');
 //for generate PDF
 const puppeteer = require('puppeteer');
 const ejs = require('ejs');
+const uglifyJS = require("uglify-js");
+const Excel = require('exceljs');
+const fs = require('fs-extra');
 const Util = require('./Util');
 const connection = require('./connection');
 const gridTable = 'zgrid';
-const fs = require('fs-extra');
 const io = require('./io');
 const myCache = require('./cache');
 const moment = require('moment');
@@ -41,9 +43,10 @@ zRoute.ROUTES = () => {
     let arr = [];
     const dir = `${dirRoot}/routes`;
     let routes = Util.getAllFiles(dir);
+    let nots = ['index','zindex','auth'];
     for (const item of routes) {
         let name = item.replace('.js', '');
-        if (name != "index"){
+        if(!nots.includes(name)){
             arr.push(name)
         }
     }
@@ -78,6 +81,7 @@ zRoute.postData = (obj) => {
 };
 
 zRoute.post = (req, res, MYMODEL, routeName, body) => {
+    const MYMODELS = myCache.get('MYMODELS');
     routeName = routeName || MYMODEL.routeName;
     body = body || req.body;
     let post = qs.parse(body);
@@ -89,7 +93,7 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
     let checkboxes = [];
     let multies = [];
     fs.ensureDir(path_tmp, err => {
-        console.log('ensureDir',err); // => null
+        //console.log('ensureDir',err); // => null
     });
     if (!isEmptyFiles) {
         files = qs.parse(req.files);
@@ -100,12 +104,12 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
                 hasFile = true;
                 //add folder again
                 fs.ensureDir(path_tmp + key, err => {
-                    console.log('ensureDir',err); // => null
+                    //console.log('ensureDir',err); // => null
                 });
             } else {
                 fileRoute[key].mv(path_tmp + filename, function (err) {
                     if (err) {
-                        console.log('fileempty move',err); // => null
+                        //console.log('fileempty move',err); // => null
                         return res.status(500).send(err);
                     }
                 });
@@ -163,7 +167,7 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
                 break;
 
             case "table" :
-                const MODEL_TABLE = require('./../models/' + widgets[key].table);
+                const MODEL_TABLE = MYMODELS[widgets[key].table];
                 const postTableData = post[routeName][key];
                 const widgetTables = MODEL_TABLE.widgets;
                 const dataTable = []
@@ -283,6 +287,7 @@ zRoute.ajax = async (req, res) => {
     let table = body.table;
     let type = body.type;
     let results;
+    const MYMODELS = myCache.get('MYMODELS');
     let obj = {
         table: table
     };
@@ -304,7 +309,7 @@ zRoute.ajax = async (req, res) => {
     if (!params.hasOwnProperty(table)) {
         io.to(res.locals.token).emit("error", "You have no access to this page");
     }
-    let MYMODEL = require(`./../models/${table}`);
+    let MYMODEL = MYMODELS[table];
     if (type == "select") {
         if (params[table].includes("index")) {
             results = await connection.results(obj)
@@ -392,7 +397,8 @@ zRoute.selectData = (MYMODEL) => {
 
 zRoute.relations = async (req, res, table) => {
     try {
-        const MYMODEL = require("./../models/" + table);
+        const MYMODELS = myCache.get('MYMODELS');
+        const MYMODEL = MYMODELS[table];
         let relations = {}
         relations["zattributes"] = {}
         relations["zvirtuals"] = {}
@@ -408,7 +414,6 @@ zRoute.relations = async (req, res, table) => {
             const widget = MYMODEL.widgets[key];
             const widgetName = MYMODEL.widgets[key].name;
             let emptyArray = Util.arrayUnShift(['id', 'zname']);
-
             if (widgetName == "dropdown_multi") {
                 let obj = {
                     select: widget.fields.join(",") + " as zname ",
@@ -429,8 +434,8 @@ zRoute.relations = async (req, res, table) => {
                 relations[key] = [Util.arrayUnShift(['id', 'zname']), ...results];
                 relations[keyObject] = Util.arrayWithObject(relations[key], 'id', 'zname');
             } else if (widgetName == "table") {
-                let MODEL_TABLE = require(`./../models/${widget.table}`);
-                let nots = [...CONFIG.generator.notRenderField, ...['no', 'actionColumn']];
+                let MODEL_TABLE = MYMODELS[widget.table];
+                let nots = Util.nots;
                 let obj = {}
                 let visibles = MODEL_TABLE.grids.visibles;
                 let invisibles = MODEL_TABLE.grids.invisibles;
@@ -451,11 +456,10 @@ zRoute.relations = async (req, res, table) => {
                 relations[`properties_${key}`] = properties;
                 relations[keyRow] = await zRoute.relations(req, res, widget.table);
                 relations[key + "Table"] = widget.table;
-                //let MODEL_TABLE = require("./../models/" + MYMODEL.widgets[key].table);
                 relations[key + "TABLE"] = await zRoute.relations(req, res, MODEL_TABLE.table);
 
             } else if (widgetName == "multi_line_editor") {
-                let MODEL_TABLE = require(`./../models/${widget.table}`);
+                let MODEL_TABLE = MYMODELS[widget.table];
                 relations[keyFields] = MYMODEL.widgets[key].fields;
                 relations[key] = await zRoute.relations(req, res, widget.table);
 
@@ -711,10 +715,10 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
                         types[key] = 'input';
                         break;
 
-                    /*case "json" :
-                        dataTable[key] = `<input type="number"  class="form-control form-control-sm" value="${value}" id="data_table_${key}" >`;
-                        types[key] = 'input';
-                        break;*/
+                  /*case "json" :
+                      dataTable[key] = `<input type="number"  class="form-control form-control-sm" value="${value}" id="data_table_${key}" >`;
+                      types[key] = 'input';
+                      break;*/
 
                     case "virtual" :
                         dataTable[key] = ``;
@@ -1056,6 +1060,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     let fields = [];
     let body = {};
     let select = "";
+    let arr = [];
     let allfields = Object.keys(MYMODEL.widgets);
     if (results.length) {
         let result = results[0];
@@ -1064,8 +1069,8 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
         select = Util.selectMysql(fields);
         if (zall) {
             let difference = allfields.filter(x => !fields.includes(x));
-            let arr = [...fields, ...difference];
-            select = arr.join(",");
+            arr = [...fields, ...difference];
+            select =`"${arr.join('","')}"`;
         }
         let whereArray = [];
         let columns = body.columns;
@@ -1106,7 +1111,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
         });
     }
     if (zall) {
-        fields = select.split(",");
+        fields = arr;
     }
 
     const ztype = reqQuery.ztype == 1 ? true : false;
@@ -1121,7 +1126,6 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
 zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
     //if any other custom value then callback needed
     callback = callback || function () {};
-    const Excel = require('exceljs');
     const workbook = new Excel.Workbook();
     let worksheet = workbook.addWorksheet(res.locals.routeName, {pageSetup: {paperSize: 9, orientation: 'landscape'}})
     worksheet.properties.defaultColWidth = 13;
@@ -1186,6 +1190,7 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
         }
     }
 
+    const widgets = MYMODEL.widgets;
     rows.forEach(function (result) {
         fields.forEach((field, i) => {
             let t;
@@ -1195,11 +1200,11 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
                 t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field);
             } else if (field == 'updated_at' || field == 'updated_at') {
                 t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field);
-            } else if (Util.in_array(field, CONFIG.generator.createdupdated_by)) {
+            } else if (Util.in_array(field, ['created_by','updated_by'])) {
                 if (isRaws) {
                     t = !callback(result, field) ? result[field] : callback(result, field);
                 } else {
-                    t = !callback(result, field) ? usersObj[result[field]] : callback(result, field);
+                    t = !callback(result, field) ? usersObj[result[field]].fullname : callback(result, field);
                 }
             } else {
                 // callback will call if you have
@@ -1222,31 +1227,31 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
                     t = !callback(result, field) ? MYMODEL.dropdowns[field].fields[result[field]] : callback(result, field);
                 } else if (Util.in_array(field, passwords)) {
                     t = 'xxxxxx';
-                } else if (MYMODEL.widgets[field].name == "select") {
+                } else if ( widgets.hasOwnProperty(field) && widgets[field].name == "select") {
                     if (isRaws) {
                         t = !callback(result, field) ? result[field] : callback(result, field);
                     } else {
                         t = !callback(result, field) ? Object.hasOwn(tableObj[field], result[field]) ? tableObj[field][result[field]] : result[field] : callback(result, field);
                     }
-                } else if (MYMODEL.widgets[field].name == "datetime") {
+                } else if (widgets.hasOwnProperty(field) && widgets[field].name == "datetime") {
                     if (isRaws) {
                         t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field);
                     } else {
                         t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field);
                     }
-                } else if (MYMODEL.widgets[field].name == "datepicker") {
+                } else if (widgets.hasOwnProperty(field) && widgets[field].name == "datepicker") {
                     if (isRaws) {
                         t = !callback(result, field) ? Util.dateFormat(result[field]) : callback(result, field);
                     } else {
                         t = !callback(result, field) ? Util.dateFormat(result[field]) : callback(result, field);
                     }
-                } else if (MYMODEL.widgets[field].name == "switch") {
+                } else if (widgets.hasOwnProperty(field) && widgets[field].name == "switch") {
                     if (isRaws) {
                         t = !callback(result, field) ? result[field] : callback(result, field);
                     } else {
                         t = !callback(result, field) ? tableObj[field][result[field]] || "" : callback(result, field);
                     }
-                } else if (MYMODEL.widgets[field].name == "relation") {
+                } else if (widgets.hasOwnProperty(field) && widgets[field].name == "relation") {
                     if (isRaws) {
                         t = !callback(result, field) ? result[field] : callback(result, field);
                     } else {
@@ -1320,7 +1325,7 @@ zRoute.pdf = async (req, res, MYMODEL, fields, rows, callback) => {
                 t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field);
             } else if (field == 'updated_at' || field == 'updated_at') {
                 t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field);
-            } else if (Util.in_array(field, CONFIG.generator.createdupdated_by)) {
+            } else if (Util.in_array(field, ['created_by','updated_by'])) {
                 t = !callback(result, field) ? usersObj[result[field]] : callback(result, field);
             } else {
                 // callback will call if you have
@@ -1415,14 +1420,14 @@ zRoute.generatePDF = async (file, layout = "pdf_bootstrap", options = {}) => {
         '--no-sandbox',
         '--disable-setuid-sandbox',
     ];
-    let env = CONFIG.environment;
+    let env = process.env.NODE_ENV;
     let puppeterOptions = {
         args: args
     };
-    if (env == "production") {
+    if (env === "production") {
         puppeterOptions.executablePath = '/usr/bin/google-chrome-stable';
-        puppeterOptions.defaultViewport = {width: 1920, height: 1080};
     }
+    puppeterOptions.defaultViewport = {width: 1920, height: 1080};
     const browser = await puppeteer.launch(puppeterOptions);
     const page = await browser.newPage();
     let mylayout = `${dirRoot}/views/layouts/${layout}.ejs`
@@ -1973,6 +1978,7 @@ zRoute.viewFormPlainText = (req, res, MYMODEL, relations, data = {}) => {
 };
 
 zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
+    const MYMODELS = myCache.get('MYMODELS');
     const relations = await zRoute.relations(req, res, MYMODEL.table);
     let forms = zRoute.viewForm(req, res, MYMODEL, relations, data);
     //zRoute.moduleLib(req, res, MYMODEL, relations, forms);
@@ -1980,7 +1986,7 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
     for (let key in forms.obj) {
         if(forms.obj[key].type == 'table') {
             let obj = forms.obj[key];
-            let MODEL = require(`./../models/${MYMODEL.widgets[obj.id].table}`);
+            let MODEL = MYMODELS[MYMODEL.widgets[obj.id].table];
             const relationsTable = await zRoute.relations(req,res,MODEL.table);
             let tableForms = zRoute.viewForm(req,res,MODEL,relationsTable, obj.value || []);
             let properties = obj.properties;
@@ -2130,6 +2136,7 @@ zRoute.viewTable = async (req, res, MYMODEL, results, isPreview, hasKeys = "") =
     let editors = [];
     let lexicals = {};
     let row = {};
+    const MYMODELS = myCache.get('MYMODELS');
     for (let key in results) {
         if (Util.in_array(key, widgetsArray)) {
             let widgetName = widgets[key].name;
@@ -2237,22 +2244,16 @@ zRoute.viewTable = async (req, res, MYMODEL, results, isPreview, hasKeys = "") =
                     break;
                 case "lexical" :
                     hasLexical = true;
-                    /*
-                                        lexicals[key] = results[key];
-                                        data[key] = `<div id="lexical${key}"></div><div id="text${key}" style="display:none"></div><div id="container${key}"></div>`;
-                    */
                     break;
                 case "json" :
                     data[key] = results[key] ? JSON.stringify(results[key], undefined, 2) : "";
                     break;
                 case "table" :
                     let tableClass = isPreview ? "" : "table-striped table-hover";
-                    //let html = '';
-
                     html = `<table class="table ${tableClass}">`;
                     html += `<tr>`;
-                    let MODEL_TABLE = require("./../models/" + MYMODEL.widgets[key].table);
-                    var nots = [...CONFIG.generator.notRenderField, ...['no', 'actionColumn']];
+                    let MODEL_TABLE = MYMODELS[MYMODEL.widgets[key].table];
+                    var nots = Util.nots;
                     var visibles = MODEL_TABLE.grids.visibles || [];
                     var invisibles = MODEL_TABLE.grids.invisibles || [];
                     var obj = {}
@@ -2356,7 +2357,6 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         Util.deleteAllFiles(path_head);
         Util.deleteAllFiles(path_end);
         //minify js
-        const uglifyJS = require("uglify-js");
         Util.writeFile(`${path_script}/${time}.js`, uglifyJS.minify(jsObj.script));
         Util.writeFile(`${path_head}/head.txt`, jsObj.head);
         Util.writeFile(`${path_end}/end.txt`, jsObj.end);
@@ -2392,8 +2392,9 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         //scriptForm += zForms.scriptGroup;
     }
     let obj = {};
+    const MYMODELS = myCache.get('MYMODELS');
     let widgets = MYMODEL.widgets,
-        widgetsArray = Object.keys(widgets) || [];
+      widgetsArray = Object.keys(widgets) || [];
     let hasDatePicker = false;
     let hasNumber = false;
     let hasClockPicker = false;
@@ -2621,7 +2622,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
                 break;
 
             case "table" :
-                let MODEL_TABLE = require("./../models/" + MYMODEL.widgets[keys].table);
+                let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table];
                 //let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
                 //relations[key + "TABLE"]
                 let MODEL_TABLE_RELATIONS = relations[keys + "TABLE"];
@@ -2795,7 +2796,8 @@ $("#body-${keys}>tr").each(function (index, tr) {
  MySQL CRUD with context
  */
 zRoute.insertSQL = async (req, res, table, data) => {
-    let MYMODEL = require("./../models/" + table);
+    const MYMODELS = myCache.get('MYMODELS');
+    let MYMODEL = MYMODELS[table];
     let fields = MYMODEL.keys;
     if (fields.includes("company_id")) data.company_id = res.locals.companyId || 1;
     if (fields.includes("updated_at")) data.updated_at = Util.now();
@@ -2808,7 +2810,8 @@ zRoute.insertSQL = async (req, res, table, data) => {
 };
 
 zRoute.updateSQL = async (req, res, table, data, whereData) => {
-    let MYMODEL = require("./../models/" + table);
+    const MYMODELS = myCache.get('MYMODELS');
+    let MYMODEL = MYMODELS[table];
     let fields = MYMODEL.keys;
     if (fields.includes('updated_at')) {
         data.updated_at = Util.now();
@@ -2823,7 +2826,7 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
     for (let key in MYMODEL.widgets) {
         if (MYMODEL.widgets[key].name == "table") {
             tableFields[key] = [];
-            const MYMODEL_TABLE = require("./../models/" + MYMODEL.widgets[key].table);
+            const MYMODEL_TABLE = MYMODELS[MYMODEL.widgets[key].table];
             for (let q in MYMODEL_TABLE.widgets) {
                 if (MYMODEL_TABLE.widgets[q].name == "file" || MYMODEL_TABLE.widgets[q].name == "image") {
                     hasImages = true;
@@ -2891,7 +2894,7 @@ zRoute.deleteSQL = async (table, id, company_id) => {
 
 //for import
 zRoute.import = async (req, res, MYMODEL) => {
-    const userId = res.locals[CONFIG.generator.userId];
+    const userId = res.locals.userId;
     const room = res.locals.token;
     let progress = 0;
     let datas = [];
@@ -2945,7 +2948,6 @@ zRoute.import = async (req, res, MYMODEL) => {
     hd += `</tr>`;
     //convert to table header
     io.to(room).emit('import', hd);
-
     let isInsert = true;
     hd += `<tr>`
     for (let i = 3; i < result.length; i++) {
@@ -3042,7 +3044,8 @@ zRoute.buildFileModel = (json, index = 0) => {
 
 zRoute.approversFooter = async (results, noActivity) => {
     noActivity = noActivity || false;
-    let MYMODEL = require("./../models/zapprovals_details");
+    const MYMODELS = myCache.get('MYMODELS');
+    let MYMODEL = MYMODELS.zapprovals_details;
     let users = Util.arrayToObject(await connection.results({table: "zuser"}), "id");
     let html = '';
     let id = 0;
@@ -3056,7 +3059,7 @@ zRoute.approversFooter = async (results, noActivity) => {
         }
         if (result.type == 1) {
             let html = "";
-            let sign = users[result.user_id].verify_signed && result.status == 3 ? `<img src="${CONFIG.app.url}/uploads/zuser/${users[result.user_id].verify_signed}" width="200">` : MYMODEL.widgets.status.fields[result.status];
+            let sign = users[result.user_id].verify_signed && result.status == 3 ? `<img src="${process.env.APP_URL}/uploads/zuser/${users[result.user_id].verify_signed}" width="200">` : MYMODEL.widgets.status.fields[result.status];
             //var sign = "";
             html += `<span class="status-approver">${sign}</span>`;
             html += `<p class="footer-title"> <span style="text-decoration: underline;">${users[result.user_id].fullname}</span><span class="small-time"> ${users[result.user_id].position} <br>  ${Util.dateFormat(result.updated_at, "DD MMM YYYY HH:mm")}</span></p>
@@ -3112,7 +3115,6 @@ zRoute.approversFooter = async (results, noActivity) => {
 
 
 /*
-Caches include WPA
 cache models in so it's no need call database repeatly
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -34,6 +34,7 @@
     "ejs": "^3.1.9",
     "exceljs": "^4.3.0",
     "fs-extra": "^11.1.1",
+    "html-minifier-terser": "^7.2.0",
     "js-sha256": "^0.9.0",
     "moment": "^2.29.4",
     "node-cache": "^5.1.2",
@@ -44,6 +45,7 @@
     "qs": "^6.11.2",
     "randomstring": "^1.3.0",
     "socket.io": "^4.7.2",
+    "uglify-js": "^3.17.4",
     "uuid": "^9.0.0",
     "xlsx": "^0.18.5"
   }