zet-lib 1.0.20 → 1.0.22

package/lib/zPage.js

@@ -54,7 +54,7 @@ const csrfProtection = csrf({cookie: true});
 const fs = require('fs-extra');
 const qs = require('qs');
 const axios = require('axios');
-const {zRoute, zRole, connection, Util, io, zCache, myCache, debug, moduleLib, zFunction, zFn, Mail } = require('zet-lib');
+const { connection, Util, io, zCache, myCache, zDebug, zDataTable, moduleLib, zFunction, zFn, zMail, zRoute, zRole} = require('zet-lib');
 
 `;
 };
@@ -159,6 +159,7 @@ zpage.buildLayout = async (obj) => {
             minifyCSS:true,
             collapseWhitespace: true
         });
+        console.log(dirRoot + "/views/layouts/" + name + ".ejs");
         fs.writeFileSync(dirRoot + "/views/layouts/" + name + ".ejs", html, 'utf-8');
         if (process.env.NODE_ENV  === "production") {
             setTimeout(function () {

package/lib/zRoute.js

@@ -19,8 +19,6 @@ const moment = require('moment');
 const debug = require("./debug");
 const moduleLib = require("./moduleLib");
 const cForm = require("./Form");
-const config = require('dotenv').config();
-//const dirRoot = process.env.dirRoot;
 
 const zRoute = {};
 
@@ -53,6 +51,34 @@ zRoute.ROUTES = () => {
   return arr;
 };
 
+//translate render and optimize so javascript can direct inject
+zRoute.renderHTML = (datas)=> {
+  let renderBody=renderEnd=bodyHTML=endHTML='';
+  if(datas.hasOwnProperty('renderBody')) {
+    renderBody = datas.renderBody.replaceAll('/','_').replaceAll('.','_');
+    if(myCache.has(renderBody)){
+      bodyHTML = myCache.get(renderBody);
+    } else {
+      bodyHTML = Util.readFile(`${dirRoot}/views/${datas.renderBody}`);
+      myCache.set(renderBody, bodyHTML);
+    }
+    delete datas.renderBody;
+  }
+  if(datas.hasOwnProperty('renderEnd')) {
+    renderEnd = datas.renderEnd.replaceAll('/','_').replaceAll('.','_');
+    if(myCache.has(renderEnd)){
+      endHTML = myCache.get(renderEnd);
+    } else {
+      endHTML = Util.readFile(`${dirRoot}/views/${datas.renderEnd}`);
+      myCache.set(renderEnd, endHTML);
+    }
+    delete datas.renderEnd;
+  }
+
+  datas.bodyHTML =  ejs.render(bodyHTML,datas);
+  datas.endHTML =  ejs.render(endHTML,datas);
+  return datas;
+}
 /*
 Auto updated_at,created_at,company_id,created_by,updated_by
  */
@@ -3314,7 +3340,7 @@ zRoute.makeFunctionsSystem = () => {
       content += Util.newLine;
     }
   }
-  let templateSystem = `const {zRole, zCache, myCache, Util, io, moment, Mail} = require('zet-lib');
+  let templateSystem = `const { connection, Util, io, zCache, myCache, zDebug, zDataTable, moduleLib, zFunction, zFn, zMail, zRoute, zRole} = require('zet-lib');
 module.exports = (req, res, next) => {`;
   let fileSystem = `${dirRoot}/components/zFunctionsSystem.js`;
   templateSystem += content;

package/lib/zapp.js

@@ -1,4 +1,3 @@
-const config = require('dotenv').config();
 module.exports = (req,res,next) => {
   res.locals.renderHead = "";
   res.locals.renderBody = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"