zet-lib 5.0.3 → 6.0.1

package/README.md

@@ -13,3 +13,52 @@ Installation
 ------------
 
     npm install zet-lib
+
+Safe installation
+-----------------
+
+`zet-lib` includes some optional heavy features, such as browser/PDF automation and image processing.
+If your app only needs the core helpers (database, cache, utilities, routers, mail, etc), a normal install is enough:
+
+    npm install zet-lib
+
+If you want to avoid browser downloads in CI/CD or server environments:
+
+    PUPPETEER_SKIP_DOWNLOAD=1 npm install zet-lib
+
+Optional features
+-----------------
+
+- `puppeteer`
+  - Used for browser/PDF style features.
+  - Starting from `zet-lib@6`, it is treated as optional during install.
+  - If you use a feature that needs Puppeteer and it is not installed, `zet-lib` will throw a clear error message.
+  - To install it explicitly:
+
+        npm install puppeteer
+
+- `sharp`
+  - Used for image processing/compression features.
+  - It is optional because some environments do not need it or may have native install constraints.
+  - To install it explicitly:
+
+        npm install --include=optional sharp
+
+Performance note
+----------------
+
+`zet-lib` lazily loads its exports. This means `require("zet-lib")` will not immediately load all heavy modules.
+Only the feature you access will load its underlying dependency tree.
+
+Examples
+--------
+
+Use only core utilities:
+
+    const { Util, connection } = require("zet-lib");
+
+Use Puppeteer-powered features:
+
+    const { puppeteer } = require("zet-lib");
+
+    // Make sure puppeteer is installed in your project first.

package/lib/index.js

@@ -1,73 +1,95 @@
 "use strict";
 
-// Core modules - loaded immediately (lightweight)
-const coreModules = {
-  access: require("./access"),
-  Util: require("./Util"),
-  myCache: require("./cache"),
-  connection: require("./connection"),
-  zDataTable: require("./zdataTable"),
-  zDebug: require("./debug"),
-  zForm: require("./Form"),
-  io: require("./io"),
-  zMail: require("./Mail"),
-  moduleLib: require("./moduleLib"),
-  Model: require("./Model"),
-  zApp: require("./zapp"),
-  zAppRouter: require("./zAppRouter"),
-  zComponent: require("./zComponent"),
-  zFn: require("./zFn"),
-  zFunction: require("./zFunction"),
-  zMenuRouter: require("./zMenuRouter"),
-  zGeneratorRouter: require("./zGeneratorRouter"),
-  zViewGenerator: require("./zViewGenerator"),
-  zReport: require("./zReport"),
-  zRoute: require("./zRoute"),
-  zRole: require("./zRole"),
-  zRoleRouter: require("./zRoleRouter"),
-  zPage: require("./zPage"),
-  zTester: require("./zTester"),
-  zCache: require("./zCache"),
-  zDropbox: require("./zDropbox"),
-  csrf: require("./csrf")
-};
+function lazyRequire(modulePath) {
+  return () => require(modulePath);
+}
 
-// Heavy dependencies - lazy loaded (only when accessed)
-const lazyModules = {
-  get puppeteer() {
-    return require("puppeteer");
-  },
-  get moment() {
-    return require("moment");
-  },
-  get ejs() {
-    return require("ejs");
-  },
-  get axios() {
-    return require("axios");
-  },
-  get Excel() {
-    return require("exceljsremake");
-  },
-  get pm2() {
+function optionalRequire(moduleName, installHint) {
+  return () => {
+    try {
+      return require(moduleName);
+    } catch (error) {
+      if (error && error.code === "MODULE_NOT_FOUND") {
+        const message =
+          installHint ||
+          `Optional dependency "${moduleName}" is not installed. Install it to use this feature.`;
+        const wrapped = new Error(message);
+        wrapped.code = "MODULE_NOT_FOUND";
+        wrapped.cause = error;
+        throw wrapped;
+      }
+      throw error;
+    }
+  };
+}
+
+const exportsMap = {
+  access: lazyRequire("./access"),
+  Util: lazyRequire("./Util"),
+  myCache: lazyRequire("./cache"),
+  connection: lazyRequire("./connection"),
+  zDataTable: lazyRequire("./zdataTable"),
+  zDebug: lazyRequire("./debug"),
+  zForm: lazyRequire("./Form"),
+  io: lazyRequire("./io"),
+  zMail: lazyRequire("./Mail"),
+  moduleLib: lazyRequire("./moduleLib"),
+  Model: lazyRequire("./Model"),
+  zApp: lazyRequire("./zapp"),
+  zAppRouter: lazyRequire("./zAppRouter"),
+  zComponent: lazyRequire("./zComponent"),
+  zFn: lazyRequire("./zFn"),
+  zFunction: lazyRequire("./zFunction"),
+  zMenuRouter: lazyRequire("./zMenuRouter"),
+  zGeneratorRouter: lazyRequire("./zGeneratorRouter"),
+  zViewGenerator: lazyRequire("./zViewGenerator"),
+  zReport: lazyRequire("./zReport"),
+  zRoute: lazyRequire("./zRoute"),
+  zRole: lazyRequire("./zRole"),
+  zRoleRouter: lazyRequire("./zRoleRouter"),
+  zPage: lazyRequire("./zPage"),
+  zTester: lazyRequire("./zTester"),
+  zCache: lazyRequire("./zCache"),
+  zDropbox: lazyRequire("./zDropbox"),
+  csrf: lazyRequire("./csrf"),
+  puppeteer: optionalRequire(
+    "puppeteer",
+    'Optional dependency "puppeteer" is not installed. Install it with `npm install --include=optional zet-lib` or `npm install puppeteer` to use browser/PDF features.'
+  ),
+  moment: lazyRequire("moment"),
+  ejs: lazyRequire("ejs"),
+  axios: lazyRequire("axios"),
+  Excel: lazyRequire("exceljsremake"),
+  pm2: () => {
     try {
       return require("pm2");
     } catch (e) {
       return null;
     }
   },
-  get nodemailer() {
-    return require("nodemailer");
-  },
-  get readXlsxFile() {
-    return require("read-excel-file/node");
-  },
-  get JSZip() {
-    return require("jszip");
-  },
-  get pg() {
-    return require("pg");
-  }
+  nodemailer: lazyRequire("nodemailer"),
+  readXlsxFile: lazyRequire("read-excel-file/node"),
+  JSZip: lazyRequire("jszip"),
+  pg: lazyRequire("pg")
 };
 
-module.exports = Object.assign({}, coreModules, lazyModules);
+const exported = {};
+
+for (const [key, resolver] of Object.entries(exportsMap)) {
+  Object.defineProperty(exported, key, {
+    enumerable: true,
+    configurable: true,
+    get() {
+      const value = resolver();
+      Object.defineProperty(exported, key, {
+        value,
+        enumerable: true,
+        configurable: true,
+        writable: false
+      });
+      return value;
+    }
+  });
+}
+
+module.exports = exported;

package/lib/views/generatorjs.ejs

@@ -516,18 +516,6 @@
             }
         })
 
-        $('.btn-minify').on('click', function () {
-            if (window.confirm('Minify all views in one line make your website faster ?')) {
-                ajaxPost('/<%- routeName%>/minify', {}, function (data) {
-                    if (data.status == 0) {
-                        toastr.error(data.message, data.title)
-                    } else {
-                        toastr.success(data.title, data.message)
-                    }
-                })
-            }
-        })
-
         $('.btn-generate-assets').on('click', function () {
             if (window.confirm('Replace javascript assets with this one ?')) {
                 ajaxPost('/<%- routeName%>/generate-assets', {}, function (data) {

package/lib/views/zgenerator/routerApp.ejs

@@ -1,359 +1,359 @@
-const router = require('express').Router();
-const {csrf} = require('zet-lib');
-const csrfProtection = csrf({cookie: true});
-const {Util, access, connection, moduleLib, zDebug, zRoute, zRole, zDataTable, zForm} = require('zet-lib');
-const MYMODEL = require('./../models/[[[TABLE_NAME]]]');
-
-router.get('/', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    let dataTable = new zDataTable(res.locals);
-    dataTable.filterMODEL = await zRoute.dataTableFilterSync(req,res, MYMODEL, res.locals.gridFilter);
-    const levels = zRole.myLevel(req, res, MYMODEL.table);
-    dataTable.levels = levels;
-    res.render(`layouts/${layout}`, {
-        dataTable: dataTable,
-        levels : levels,
-        titleHeader: `<strong class="text text-info">${MYMODEL.title}</strong>`,
-        breadcrumb : zForm.breadcrumbIndex(),
-        myModal : zForm.modal({
-        attributeData: res.locals.attributeData,
-        visibles: res.locals.visibles,
-        invisibles: res.locals.invisibles,
-        routeName: MYMODEL.table,
-        }, LANGUAGE),
-        renderHead: `${MYMODEL.routeName}/indexcss.ejs`,
-        renderBody: `${MYMODEL.routeName}/index.ejs`,
-        renderEnd: `${MYMODEL.routeName}/indexjs.ejs`
-    });
-});
-
-router.post('/list', async (req, res) => {
-    const data = await zRoute.listData(req, res, MYMODEL, zRole);
-    res.json(data);
-});
-
-router.get('/create', csrfProtection, async(req, res) => {
-    let data = MYMODEL.datas;
-    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
-    res.render(`layouts/${layout}`, {
-        data: data,
-        zForms: zForms,
-        titleHeader: `${LANGUAGE['form_create']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbCreate(MYMODEL.routeName),
-        renderBody: `${MYMODEL.routeName}/create.ejs`,
-        renderEnd: `${MYMODEL.routeName}/createjs.ejs`
-    });
-});
-
-router.post('/create', csrfProtection, async (req, res) => {
-    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
-    try {
-        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
-        const validator = zRoute.validator(data, MYMODEL);
-        if(validator.status == 0) return res.json(validator.message);
-        const result = await zRoute.insertSQL(req, res, MYMODEL.table, data);
-        json.data=result;
-    } catch (err) {
-        if(Object.hasOwn(err,"sqlMessage")){
-            json = Util.flashError(err.sqlMessage);
-        } else {
-            json = Util.flashError(err.toString());
-        }
-        zDebug(req, res, err);
-    }
-    res.json(json);
-});
-
-router.get('/update/:id', csrfProtection, async (req, res) => {
-    const id = parseInt(req.params.id);
-    const results = await connection.results({
-        select:zRoute.selectData(MYMODEL),
-        table: MYMODEL.table,
-        where: {
-            id: id,
-            company_id: res.locals.companyId
-        }
-    });
-    if (results.length == 0) {
-        req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-        return res.redirect('/' + MYMODEL.routeName);
-    }
-    let data = results[0];
-    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
-    res.render(`layouts/${layout}`, {
-        data: data,
-        zForms: zForms,
-        titleHeader: `${LANGUAGE['form_update']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbUpdate(MYMODEL.routeName, id),
-        renderBody: `${MYMODEL.routeName}/update.ejs`,
-        renderEnd: `${MYMODEL.routeName}/updatejs.ejs`,
-    });
-});
-
-router.post('/update/:id', csrfProtection, async (req, res) => {
-    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
-    try {
-        const id = parseInt(req.params.id);
-        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
-        const validator = zRoute.validator(data, MYMODEL);
-        if(validator.status == 0) return res.json(validator.message);
-        const result = await zRoute.updateSQL(req, res,MYMODEL.table, data, {id:id});
-        json.data=result;
-    } catch (err) {
-        console.log(err)
-        if(Object.hasOwn(err,"sqlMessage")){
-            json = Util.flashError(err.sqlMessage);
-        } else {
-            json = Util.flashError(err.toString());
-        }
-        zDebug(req, res, err)
-    }
-    res.json(json);
-});
-
-router.delete('/delete', async (req, res) => {
-    const id = req.body.id;
-    let json = Util.jsonSuccess(LANGUAGE['data_delete']);
-    try {
-        await zRoute.deleteSQL(MYMODEL.table, id, res.locals.companyId);
-    } catch (err) {
-        json = Util.flashError(err.toString());
-        zDebug(req, res, err)
-    }
-    res.json(json);
-});
-
-router.get('/view/:id', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    const id = req.params.id;
-    let data = {};
-    let zForms = {};
-    try {
-        const results = await connection.results({select:zRoute.selectData(MYMODEL),table:MYMODEL.table,where:{id:id}});
-        if (results.length == 0) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        data = results[0];
-        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, data);
-    } catch (err){
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/${layout}`, {
-        data: data,
-        Util:Util,
-        zForms:zForms,
-        titleHeader: `View : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        breadcrumb : zForm.breadcrumbView(MYMODEL.routeName),
-        levels: zRole.myLevel(req, res, MYMODEL.table),
-        renderBody: `${MYMODEL.routeName}/view.ejs`
-    });
-});
-
-router.get('/excel-query', async (req,res) => {
-    await zRoute.excelQuery(req, res, MYMODEL);
-});
-
-router.get('/excel', async (req, res) => {
-    const fields = MYMODEL.keysExcel;
-    const results = await connection.results({
-        table: MYMODEL.table,
-        where: {company_id: res.locals.companyId},
-        orderBy: ['id', 'DESC']
-    });
-    await zRoute.excel(req, res, MYMODEL, fields, results);
-});
-
-router.get('/sample', async (req, res) => {
-    let fields = [];
-    for (let i = 0; i < MYMODEL.keysExcel.length; i++) {
-        if (!Util.in_array(MYMODEL.keysExcel[i], Util.nots)) {
-            fields.push(MYMODEL.keysExcel[i]);
-        }
-    }
-    const results = await connection.results({
-        table:MYMODEL.table,
-        where:{
-            company_id:res.locals.companyId
-        },
-        orderBy:["id","desc"], limit:10
-    });
-    let callback=(result,field)=> {
-        return MYMODEL.widgets[field] && MYMODEL.widgets[field].name == 'datepicker' ? Util.dateSql(result[field]) : result[field];
-    };
-    await zRoute.excel(req, res, MYMODEL, fields, results, callback);
-});
-
-router.get('/import',csrfProtection, async (req, res) => {
-    const room = res.locals.token;
-    res.render(`layouts/${layout}`, {
-        room: room,
-        titleHeader: `Import / Upload data : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbImport(MYMODEL.routeName),
-        renderBody: `${MYMODEL.routeName}/import.ejs`,
-        renderEnd: `${MYMODEL.routeName}/importjs.ejs`
-    });
-});
-
-
-router.post('/import', async(req, res) => {
-    res.json(await zRoute.import(req,res,MYMODEL));
-});
-
-router.get('/approval/:id', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    const id = req.params.id;
-    let data = {};
-    let data2 = {};
-    let zForms = {};
-    let zForms2 = {};
-    let result = {};
-    try {
-        result = await connection.result({table: MYMODEL.table, where: {id: id}});
-        if (!result.id) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        data=result;
-        moduleLib.editor(req, res);
-        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, result);
-        const contentScript = `$("#submit_draft").on("click", function () {$("#status").val(1);ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
-            if (data.status == 0) {
-                toastr.error(data.message, data.title);
-            } else {
-                toastr.success(data.title, data.message);
-            }
-        });});
-        $("#submit").on("click", function () {
-            $('[name="zapprovals[status]"]').val(2);
-            ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
-                if (data.status == 0) {
-                    toastr.error(data.message, data.title);
-                } else {
-                    toastr.success(data.title, data.message);
-                    location.href = "";
-                }
-            });
-        });
-    `;
-        await moduleLib.addScript(req, res, contentScript);
-        const MODEL_APROVALS = require("./../models/zapprovals");
-        const rows = await connection.results({
-            table: "zapprovals",
-            where: {table: MYMODEL.table, company_id: res.locals.companyId, id_data: id}
-        });
-        if (rows.length) {
-            data2 = rows[0];
-        } else {
-            let obj = {};
-            obj.token = Util.uuid();
-            obj.status = 1;
-            obj.table = MYMODEL.table;
-            obj.company_id = res.locals.companyId;
-            obj.id_data = id;
-            obj.created_by = res.locals.userId;
-            obj.updated_by = res.locals.userId;
-            obj.created_at = Util.now();
-            let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-            let jsonApproval = zfields.approval_json || {}
-            obj.template = jsonApproval.content || {}
-            let title = jsonApproval.title;
-            if (title) {
-                let titleData = title;
-                for (var key in data) {
-                    titleData = Util.replaceAll(titleData, "{{" + key + "}}", data[key])
-                }
-                obj.title = titleData
-            }
-            if (jsonApproval.hasOwnProperty("approvers")) {
-                obj.approvers = JSON.stringify(jsonApproval.approvers);
-                obj.knowings = JSON.stringify(jsonApproval.knowings);
-                obj.type = 1;
-            }
-            //insert default data
-            await connection.insert({table: "zapprovals", data: obj});
-            data2 = obj;
-        }
-        zForms2 = await zRoute.formsFieldSync(req, res, MODEL_APROVALS, data2);
-    } catch (err) {
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/${layout}`, {
-        zForms: zForms,
-        zForms2: zForms2,
-        data: result,
-        result:result,
-        data2: data2,
-        Util: Util,
-        levels: zRole.myLevel(req, res, MYMODEL.table),
-        breadcrumb : zForm.breadcrumbApproval(MYMODEL.routeName, id),
-        renderBody: `${MYMODEL.routeName}/approval.ejs`
-    });
-});
-
-router.get('/preview/:token', async (req, res) => {
-    let token = req.params.token;
-    let data = {}, data2 = {};
-    let template = "";
-    let footers = "";
-    try {
-        let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-        let jsonApproval = zfields.approval_json || {}
-        let mytemplate = jsonApproval.content || {}
-        let results = await connection.results({table: "zapprovals", where: {token: token}});
-        if (results.length == 0) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        if(results[0].status == 1){
-            await connection.update({
-                table : "zapprovals",
-                data: {
-                    template : mytemplate
-                },
-                where : {
-                    token:token
-                }
-            })
-            results = await connection.results({table: "zapprovals", where: {token: token}});
-        }
-        let MYMODEL2 = require("./../models/zapprovals")
-        data = await zRoute.viewTable(req, res, MYMODEL2, results[0], true);
-        let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
-        data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
-        template = data.template;
-        let title = data.title || ""
-        for (var key in data2) {
-            template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
-            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
-        }
-        data.title = title;
-        var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
-        if (details.length) {
-            footers = await zRoute.approversFooter(details);
-        }
-    } catch (err) {
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/blank`, {
-        template: template,
-        data: data,
-        footers: footers,
-        Util: Util,
-        details: details,
-        renderBody: 'index/zapprovals_preview.ejs'
-    });
-});
-
-router.post('/grid', access, zRoute.postGrid);
-router.post('/reload', access, zRoute.postGridReload);
-router.post('/chains', access, zRoute.chains);
-router.post('/get_attributes',access, zRoute.getAttributes);
-
-module.exports = router;
+const router = require('express').Router();
+const {csrf} = require('zet-lib');
+const csrfProtection = csrf({cookie: true});
+const {Util, access, connection, moduleLib, zDebug, zRoute, zRole, zDataTable, zForm} = require('zet-lib');
+const MYMODEL = require('./../models/[[[TABLE_NAME]]]');
+
+router.get('/', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    let dataTable = new zDataTable(res.locals);
+    dataTable.filterMODEL = await zRoute.dataTableFilterSync(req,res, MYMODEL, res.locals.gridFilter);
+    const levels = zRole.myLevel(req, res, MYMODEL.table);
+    dataTable.levels = levels;
+    res.render(`layouts/${layout}`, {
+        dataTable: dataTable,
+        levels : levels,
+        titleHeader: `<strong class="text text-info">${MYMODEL.title}</strong>`,
+        breadcrumb : zForm.breadcrumbIndex(),
+        myModal : zForm.modal({
+        attributeData: res.locals.attributeData,
+        visibles: res.locals.visibles,
+        invisibles: res.locals.invisibles,
+        routeName: MYMODEL.table,
+        }, LANGUAGE),
+        renderHead: `${MYMODEL.routeName}/indexcss.ejs`,
+        renderBody: `${MYMODEL.routeName}/index.ejs`,
+        renderEnd: `${MYMODEL.routeName}/indexjs.ejs`
+    });
+});
+
+router.post('/list', async (req, res) => {
+    const data = await zRoute.listData(req, res, MYMODEL, zRole);
+    res.json(data);
+});
+
+router.get('/create', csrfProtection, async(req, res) => {
+    let data = MYMODEL.datas;
+    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
+    res.render(`layouts/${layout}`, {
+        data: data,
+        zForms: zForms,
+        titleHeader: `${LANGUAGE['form_create']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbCreate(MYMODEL.routeName),
+        renderBody: `${MYMODEL.routeName}/create.ejs`,
+        renderEnd: `${MYMODEL.routeName}/createjs.ejs`
+    });
+});
+
+router.post('/create', csrfProtection, async (req, res) => {
+    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
+    try {
+        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
+        const validator = zRoute.validator(data, MYMODEL);
+        if(validator.status == 0) return res.json(validator.message);
+        const result = await zRoute.insertSQL(req, res, MYMODEL.table, data);
+        json.data=result;
+    } catch (err) {
+        if(Object.hasOwn(err,"sqlMessage")){
+            json = Util.flashError(err.sqlMessage);
+        } else {
+            json = Util.flashError(err.toString());
+        }
+        zDebug(req, res, err);
+    }
+    res.json(json);
+});
+
+router.get('/update/:id', csrfProtection, async (req, res) => {
+    const id = parseInt(req.params.id);
+    const results = await connection.results({
+        select:zRoute.selectData(MYMODEL),
+        table: MYMODEL.table,
+        where: {
+            id: id,
+            company_id: res.locals.companyId
+        }
+    });
+    if (results.length == 0) {
+        req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+        return res.redirect('/' + MYMODEL.routeName);
+    }
+    let data = results[0];
+    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
+    res.render(`layouts/${layout}`, {
+        data: data,
+        zForms: zForms,
+        titleHeader: `${LANGUAGE['form_update']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbUpdate(MYMODEL.routeName, id),
+        renderBody: `${MYMODEL.routeName}/update.ejs`,
+        renderEnd: `${MYMODEL.routeName}/updatejs.ejs`,
+    });
+});
+
+router.post('/update/:id', csrfProtection, async (req, res) => {
+    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
+    try {
+        const id = parseInt(req.params.id);
+        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
+        const validator = zRoute.validator(data, MYMODEL);
+        if(validator.status == 0) return res.json(validator.message);
+        const result = await zRoute.updateSQL(req, res,MYMODEL.table, data, {id:id});
+        json.data=result;
+    } catch (err) {
+        console.log(err)
+        if(Object.hasOwn(err,"sqlMessage")){
+            json = Util.flashError(err.sqlMessage);
+        } else {
+            json = Util.flashError(err.toString());
+        }
+        zDebug(req, res, err)
+    }
+    res.json(json);
+});
+
+router.delete('/delete', async (req, res) => {
+    const id = req.body.id;
+    let json = Util.jsonSuccess(LANGUAGE['data_delete']);
+    try {
+        await zRoute.deleteSQL(MYMODEL.table, id, res.locals.companyId);
+    } catch (err) {
+        json = Util.flashError(err.toString());
+        zDebug(req, res, err)
+    }
+    res.json(json);
+});
+
+router.get('/view/:id', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    const id = req.params.id;
+    let data = {};
+    let zForms = {};
+    try {
+        const results = await connection.results({select:zRoute.selectData(MYMODEL),table:MYMODEL.table,where:{id:id}});
+        if (results.length == 0) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        data = results[0];
+        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, data);
+    } catch (err){
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/${layout}`, {
+        data: data,
+        Util:Util,
+        zForms:zForms,
+        titleHeader: `View : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        breadcrumb : zForm.breadcrumbView(MYMODEL.routeName),
+        levels: zRole.myLevel(req, res, MYMODEL.table),
+        renderBody: `${MYMODEL.routeName}/view.ejs`
+    });
+});
+
+router.get('/excel-query', async (req,res) => {
+    await zRoute.excelQuery(req, res, MYMODEL);
+});
+
+router.get('/excel', async (req, res) => {
+    const fields = MYMODEL.keysExcel;
+    const results = await connection.results({
+        table: MYMODEL.table,
+        where: {company_id: res.locals.companyId},
+        orderBy: ['id', 'DESC']
+    });
+    await zRoute.excel(req, res, MYMODEL, fields, results);
+});
+
+router.get('/sample', async (req, res) => {
+    let fields = [];
+    for (let i = 0; i < MYMODEL.keysExcel.length; i++) {
+        if (!Util.in_array(MYMODEL.keysExcel[i], Util.nots)) {
+            fields.push(MYMODEL.keysExcel[i]);
+        }
+    }
+    const results = await connection.results({
+        table:MYMODEL.table,
+        where:{
+            company_id:res.locals.companyId
+        },
+        orderBy:["id","desc"], limit:10
+    });
+    let callback=(result,field)=> {
+        return MYMODEL.widgets[field] && MYMODEL.widgets[field].name == 'datepicker' ? Util.dateSql(result[field]) : result[field];
+    };
+    await zRoute.excel(req, res, MYMODEL, fields, results, callback);
+});
+
+router.get('/import',csrfProtection, async (req, res) => {
+    const room = res.locals.token;
+    res.render(`layouts/${layout}`, {
+        room: room,
+        titleHeader: `Import / Upload data : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbImport(MYMODEL.routeName),
+        renderBody: `${MYMODEL.routeName}/import.ejs`,
+        renderEnd: `${MYMODEL.routeName}/importjs.ejs`
+    });
+});
+
+
+router.post('/import', async(req, res) => {
+    res.json(await zRoute.import(req,res,MYMODEL));
+});
+
+router.get('/approval/:id', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    const id = req.params.id;
+    let data = {};
+    let data2 = {};
+    let zForms = {};
+    let zForms2 = {};
+    let result = {};
+    try {
+        result = await connection.result({table: MYMODEL.table, where: {id: id}});
+        if (!result.id) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        data=result;
+        moduleLib.editor(req, res);
+        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, result);
+        const contentScript = `$("#submit_draft").on("click", function () {$("#status").val(1);ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
+            if (data.status == 0) {
+                toastr.error(data.message, data.title);
+            } else {
+                toastr.success(data.title, data.message);
+            }
+        });});
+        $("#submit").on("click", function () {
+            $('[name="zapprovals[status]"]').val(2);
+            ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
+                if (data.status == 0) {
+                    toastr.error(data.message, data.title);
+                } else {
+                    toastr.success(data.title, data.message);
+                    location.href = "";
+                }
+            });
+        });
+    `;
+        await moduleLib.addScript(req, res, contentScript);
+        const MODEL_APROVALS = require("./../models/zapprovals");
+        const rows = await connection.results({
+            table: "zapprovals",
+            where: {table: MYMODEL.table, company_id: res.locals.companyId, id_data: id}
+        });
+        if (rows.length) {
+            data2 = rows[0];
+        } else {
+            let obj = {};
+            obj.token = Util.uuid();
+            obj.status = 1;
+            obj.table = MYMODEL.table;
+            obj.company_id = res.locals.companyId;
+            obj.id_data = id;
+            obj.created_by = res.locals.userId;
+            obj.updated_by = res.locals.userId;
+            obj.created_at = Util.now();
+            let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
+            let jsonApproval = zfields.approval_json || {}
+            obj.template = jsonApproval.content || {}
+            let title = jsonApproval.title;
+            if (title) {
+                let titleData = title;
+                for (var key in data) {
+                    titleData = Util.replaceAll(titleData, "{{" + key + "}}", data[key])
+                }
+                obj.title = titleData
+            }
+            if (jsonApproval.hasOwnProperty("approvers")) {
+                obj.approvers = JSON.stringify(jsonApproval.approvers);
+                obj.knowings = JSON.stringify(jsonApproval.knowings);
+                obj.type = 1;
+            }
+            //insert default data
+            await connection.insert({table: "zapprovals", data: obj});
+            data2 = obj;
+        }
+        zForms2 = await zRoute.formsFieldSync(req, res, MODEL_APROVALS, data2);
+    } catch (err) {
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/${layout}`, {
+        zForms: zForms,
+        zForms2: zForms2,
+        data: result,
+        result:result,
+        data2: data2,
+        Util: Util,
+        levels: zRole.myLevel(req, res, MYMODEL.table),
+        breadcrumb : zForm.breadcrumbApproval(MYMODEL.routeName, id),
+        renderBody: `${MYMODEL.routeName}/approval.ejs`
+    });
+});
+
+router.get('/preview/:token', async (req, res) => {
+    let token = req.params.token;
+    let data = {}, data2 = {};
+    let template = "";
+    let footers = "";
+    try {
+        let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
+        let jsonApproval = zfields.approval_json || {}
+        let mytemplate = jsonApproval.content || {}
+        let results = await connection.results({table: "zapprovals", where: {token: token}});
+        if (results.length == 0) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        if(results[0].status == 1){
+            await connection.update({
+                table : "zapprovals",
+                data: {
+                    template : mytemplate
+                },
+                where : {
+                    token:token
+                }
+            })
+            results = await connection.results({table: "zapprovals", where: {token: token}});
+        }
+        let MYMODEL2 = require("./../models/zapprovals")
+        data = await zRoute.viewTable(req, res, MYMODEL2, results[0], true);
+        let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
+        data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
+        template = data.template;
+        let title = data.title || ""
+        for (var key in data2) {
+            template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
+            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
+        }
+        data.title = title;
+        var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
+        if (details.length) {
+            footers = await zRoute.approversFooter(details);
+        }
+    } catch (err) {
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/blank`, {
+        template: template,
+        data: data,
+        footers: footers,
+        Util: Util,
+        details: details,
+        renderBody: 'index/zapprovals_preview.ejs'
+    });
+});
+
+router.post('/grid', access, zRoute.postGrid);
+router.post('/reload', access, zRoute.postGridReload);
+router.post('/chains', access, zRoute.chains);
+router.post('/get_attributes',access, zRoute.getAttributes);
+
+module.exports = router;

package/lib/zGeneratorRouter.js

@@ -5,8 +5,6 @@ const csrfProtection = csrf({ cookie: true });
 const fs = require("fs-extra");
 const axios = require("axios");
 const getPm2 = require("./optionalPm2");
-const uglifyJS = require("uglify-js");
-const { minify } = require("html-minifier-terser");
 const zRoute = require("./zRoute");
 const connection = require("./connection");
 const Util = require("./Util");
@@ -614,22 +612,10 @@ const generate = async (req, res) => {
       if (!fs.existsSync(DIR_VIEW)) {
         fs.mkdirSync(DIR_VIEW);
       }
-      let compilesJS = ["createjs.ejs", "updatejs.ejs", "importjs.ejs"];
       if (!dummy) {
         for (const q in filesKey) {
           console.log(q);
-          if (Util.in_array(q, compilesJS)) {
-            fs.writeFileSync(path.join(DIR_VIEW, q), filesKey[q]);
-          } else {
-            fs.writeFileSync(
-                path.join(DIR_VIEW, q),
-                await minify(filesKey[q], {
-                  minifyJS: true,
-                  minifyCSS: true,
-                  collapseWhitespace: true,
-                })
-            );
-          }
+          fs.writeFileSync(path.join(DIR_VIEW, q), filesKey[q]);
           console.log(`The files views of ${q} is saved!`);
         }
       }
@@ -657,17 +643,11 @@ const generate = async (req, res) => {
     let relations = await zRoute.relations(req, res, MYMODEL.table);
     //add script
     let jsObj = zRoute.generateJS(req, res, MYMODEL, relations);
-    //minify script
-    let script = uglifyJS.minify(jsObj.script);
-    if (script.error) {
-      console.log(jsObj.script);
-      throw script.error;
-    }
     let time = new Date().getTime();
     Util.deleteAllFiles(path_script);
     Util.deleteAllFiles(path_head);
     Util.deleteAllFiles(path_end);
-    Util.writeFile(path.join(path_script, `${time}.js`), script.code);
+    Util.writeFile(path.join(path_script, `${time}.js`), jsObj.script);
     Util.writeFile(path.join(path_head, "head.txt"), jsObj.head);
     Util.writeFile(path.join(path_end, "end.txt"), jsObj.end);
   }
@@ -1589,10 +1569,7 @@ router.post("/generate-assets", async (req, res) => {
       Util.deleteAllFiles(path_end);
       Util.deleteAllFiles(path_script);
 
-      //minify script
-      let script = uglifyJS.minify(jsObj.script);
-      if (script.error) throw script.error;
-      Util.writeFile(path.join(path_script, `${time}.js`), script.code);
+      Util.writeFile(path.join(path_script, `${time}.js`), jsObj.script);
       Util.writeFile(path.join(path_head, "head.txt"), jsObj.head);
       Util.writeFile(path.join(path_end, "end.txt"), jsObj.end);
     }
@@ -1602,63 +1579,6 @@ router.post("/generate-assets", async (req, res) => {
   res.json(notifObj);
 });
 
-router.post("/minify", async (req, res) => {
-  let notifyObj = Util.jsonSuccess("Success to cached");
-  try {
-    notifyObj = await viewsMini();
-  } catch (e) {
-    console.log(e);
-    notifyObj = Util.flashError(e.toString());
-  }
-  res.json(notifyObj);
-});
-
-const viewsMini = async () => {
-  let notifyObj = Util.jsonSuccess("Success");
-  const viewDir = path.join(dirRoot, "views");
-  const layoutsDir = path.join(dirRoot, "views", "layouts");
-  let item;
-  try {
-    let views = Util.getAllFiles(viewDir);
-    let options = {
-      minifyJS: true,
-      minifyCSS: true,
-      collapseWhitespace: true,
-    };
-    const notViewDir = ["zgenerator", "layouts", "index", "zindex"];
-    for (const dir of views) {
-      console.log("dir :", dir);
-      if (!Util.in_array(dir, notViewDir)) {
-        let files = Util.getAllFiles(path.join(viewDir, dir));
-        //console.log(files);
-        for (item of files) {
-          if (item.includes(".ejs")) {
-            let filename = path.join(viewDir, dir, item);
-            let content = Util.readFile(filename);
-            let contentChange = await minify(content, options);
-            fs.writeFileSync(filename, contentChange);
-          }
-        }
-      }
-    }
-
-    let layouts = Util.getAllFiles(layoutsDir);
-    for (item of layouts) {
-      if (item.includes(".ejs")) {
-        let filename = path.join(layoutsDir, item);
-        let content = Util.readFile(filename);
-        let contentChange = await minify(content, options);
-        fs.writeFileSync(filename, contentChange);
-      }
-    }
-  } catch (e) {
-    notifyObj = Util.flashError(
-        `error in item : ${item} , error str :${e.toString()}`
-    );
-  }
-  return notifyObj;
-};
-
 router.post("/load-joins", async (req, res) => {
   let jsonNotif = Util.jsonSuccess("Success");
   let html = "";

package/lib/zPage.js

@@ -8,7 +8,6 @@ const nodemailer = require('nodemailer');
 const qs = require('qs');
 const moment = require('moment');
 const getPm2 = require('./optionalPm2');
-const { minify } = require('html-minifier-terser');
 const connection = require('./connection');
 const Util = require('./Util');
 const myCache = require('./cache');
@@ -159,14 +158,7 @@ zpage.createRoute = (obj, token, layoutObj) => {
 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
-        });
-        console.log(path.join(dirRoot, "views", "layouts", name + ".ejs"));
-        fs.writeFileSync(path.join(dirRoot, "views", "layouts", name + ".ejs"), html, 'utf-8');
+        fs.writeFileSync(path.join(dirRoot, "views", "layouts", name + ".ejs"), obj.code, 'utf-8');
         if (process.env.NODE_ENV  === "production") {
             setTimeout(function () {
                 const pm2 = getPm2()

package/lib/zRoleRouter.js

@@ -2,9 +2,7 @@ const express = require('express')
 const router = express.Router()
 // setup route middlewares
 const csrf = require('./csrf')
-const bodyParser = require('body-parser')
 const path = require('path')
-const parseForm = bodyParser.urlencoded({ extended: true })
 const csrfProtection = csrf({ cookie: true })
 const getPm2 = require('./optionalPm2')
 const env = process.env.NODE_ENV || 'development'

package/lib/zRoute.js

@@ -8,7 +8,6 @@ const qs = require("qs");
 //for generate PDF
 const puppeteer = require("puppeteer");
 const ejs = require("ejs");
-const uglifyJS = require("uglify-js");
 const Excel = require("exceljsremake");
 const fs = require("fs-extra");
 const Util = require("./Util");
@@ -4123,8 +4122,7 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         let time = new Date().getTime();
         Util.deleteAllFiles(path_head);
         Util.deleteAllFiles(path_end);
-        //minify js
-        Util.writeFile(path.join(path_script, `${time}.js`), uglifyJS.minify(jsObj.script));
+        Util.writeFile(path.join(path_script, `${time}.js`), jsObj.script);
         Util.writeFile(path.join(path_head, "head.txt"), jsObj.head);
         Util.writeFile(path.join(path_end, "end.txt"), jsObj.end);
         end += `<script src="/runtime/script/${table}/${time}.js"></script>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "5.0.3",
+  "version": "6.0.1",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -21,41 +21,36 @@
     "!lib/**/__tests__/"
   ],
   "scripts": {
-    "lint": "standard",
-    "test-find": "find ./lib/**/__tests__ -name *.test.js | xargs mocha",
-    "test": "npm run lint && npm run unit",
-    "unit": "nyc node test.js"
+    "test": "npm run unit",
+    "unit": "node -e \"console.log('No automated tests are configured for this repo yet.')\""
   },
   "sideEffects": false,
   "dependencies": {
-    "axios": "^1.15.0",
+    "axios": "^1.18.1",
     "dotenv": "^16.5.0",
     "dropbox": "^10.34.0",
-    "ejs": "^3.1.10",
-    "exceljsremake": "^0.1.3",
+    "ejs": "^6.0.1",
+    "exceljsremake": "^0.1.5",
     "express-zip": "^3.0.0",
     "fs-extra": "^11.3.4",
-    "html-minifier-terser": "^7.2.0",
     "isomorphic-fetch": "^3.0.0",
     "js-sha256": "^0.11.1",
     "jszip": "^3.10.1",
     "moment": "^2.30.1",
     "node-cache": "^5.1.2",
-    "nodemailer": "^8.0.5",
+    "nodemailer": "^9.0.3",
     "pg": "^8.16.3",
-    "puppeteer": "^24.40.0",
     "qs": "^6.14.0",
     "randomstring": "^1.3.1",
     "read-excel-file": "^5.8.0",
-    "socket.io": "^4.8.3",
-    "uglify-js": "^3.19.3"
+    "socket.io": "^4.8.3"
   },
   "optionalDependencies": {
-    "sharp": "^0.34.1"
+    "puppeteer": "^25.1.0",
+    "sharp": "^0.35.3"
   },
   "devDependencies": {
-    "nyc": "^18.0.0",
-    "standard": "^17.1.2"
+    "nyc": "^18.0.0"
   },
   "overrides": {
     "istanbul-lib-processinfo": {