zet-lib 1.5.14 → 1.5.16

package/lib/Mail.js

@@ -6,6 +6,10 @@ const io = require('./io')
 const moment = require('moment')
 const config = require('dotenv').config()
 
+if (typeof global.dirRoot === 'undefined') {
+    global.dirRoot = Util.dirRoot;
+}
+
 const MAIL = {}
 //process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 

package/lib/Util.js

@@ -7,6 +7,42 @@ const sha256 = require("js-sha256");
 
 const Util = {};
 
+
+// Global directory root - automatically detect application root
+Util.dirRoot = (() => {
+  // Start from the zet-lib directory and navigate up to find the main application root
+  let currentDir = __dirname; // This is zet-lib/lib/
+
+  // Navigate up 3 levels: lib/ -> zet-lib/ -> node_modules/ -> fins_node/
+  currentDir = path.dirname(currentDir); // zet-lib/
+  currentDir = path.dirname(currentDir); // node_modules/
+  currentDir = path.dirname(currentDir); // fins_node/ (main app root)
+
+  // Verify this is the correct application root
+  const hasPackageJson = fs.existsSync(path.join(currentDir, 'package.json'));
+  const hasAppJs = fs.existsSync(path.join(currentDir, 'app.js'));
+
+  if (hasPackageJson && hasAppJs) {
+    return currentDir;
+  }
+
+  // Fallback: try to find the app root by looking for typical Node.js app files
+  let searchDir = currentDir;
+  while (searchDir !== path.dirname(searchDir)) {
+    const hasPackageJson = fs.existsSync(path.join(searchDir, 'package.json'));
+    const hasAppJs = fs.existsSync(path.join(searchDir, 'app.js'));
+
+    if (hasPackageJson && hasAppJs) {
+      return searchDir;
+    }
+
+    searchDir = path.dirname(searchDir);
+  }
+
+  // Final fallback to the calculated directory
+  return currentDir;
+})();
+
 // Constants
 Util.tab = "\t";
 Util.NEW_LINE = "\n";
@@ -34,7 +70,7 @@ Util.excelSequence = function () {
   const arr = [...abjads];
   let num = 26;
 
-  for (let char = 0; char < 13; char++) {
+  for (let char = 0; char < 26; char++) {
     for (let idx = 0; idx < 26; idx++) {
       arr[num++] = abjads[char] + abjads[idx];
     }

package/lib/zAppRouter.js

@@ -29,6 +29,10 @@ const fetch = require("isomorphic-fetch");
 const JSZip = require("jszip");
 const zDropbox = require("./zDropbox");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
+
 /*
  ajax Post
  */

package/lib/zDropbox.js

@@ -3,6 +3,10 @@ const { Dropbox } = require("dropbox");
 const fetch = require("isomorphic-fetch");
 const Util = require("./Util");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
+
 const zDropbox = {};
 
 let dbx = new Dropbox({

package/lib/zGeneratorRouter.js

@@ -16,6 +16,10 @@ const ejs = require("ejs");
 var app = express();
 const path = require("path");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
+
 const nots = [
   "index",
   "uploads",

package/lib/zMenuRouter.js

@@ -12,6 +12,9 @@ const moduleLib = require('./moduleLib');
 const config = require('dotenv').config();
 const ejs = require('ejs');
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
 /*
 icons list for tabler and set to /public/js
  */

package/lib/zPage.js

@@ -12,6 +12,9 @@ const connection = require('./connection');
 const Util = require('./Util');
 const myCache = require('./cache');
 
+if (typeof global.dirRoot === 'undefined') {
+    global.dirRoot = Util.dirRoot;
+}
 const zpage = {};
 
 zpage.build = async (req, res) => {

package/lib/zReport.js

@@ -14,6 +14,9 @@ const config = require('dotenv').config()
 const zReport = {}
 const myCache = require('./cache')
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
 /*
  Custom Reports
  Report Generator

package/lib/zRoute.js

@@ -24,6 +24,9 @@ const readXlsxFile = require("read-excel-file/node");
 //const { Dropbox } = require("dropbox");
 const zDropbox = require("./zDropbox");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
 const zRoute = {};
 
 zRoute.tableHasNoCompanyId = ["zcompany", "zrole", "zgrid"];

package/lib/zViewGenerator.js

@@ -11,6 +11,10 @@ const Model = require('./Model')
 const ejs = require('ejs')
 const pm2 = require("pm2");
 
+if (typeof global.dirRoot === 'undefined') {
+    global.dirRoot = Util.dirRoot;
+}
+
 router.get('/', csrfProtection, async (req, res) => {
     const nots = ['index', 'uploads', 'js', 'css', 'log', 'generator', 'zmenu', 'zgenerator', 'zfields', 'zrole', 'zfunction', 'zgrid', 'zgrid_default', 'zpage', 'zlayout', 'zerror', 'zuser_company']
     let table = req.query.table || '';

package/package.json

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