zet-lib 4.0.0 → 4.0.1

package/lib/zReport.js

@@ -3,7 +3,6 @@ const fs = require('fs-extra')
 const nodemailer = require('nodemailer')
 const qs = require('qs')
 const moment = require('moment')
-const XLSX = require('xlsx')
 const Excel = require('exceljs')
 const debug = require('./debug')
 const zRoute = require('./zRoute')
@@ -25,13 +24,43 @@ if (typeof global.dirRoot === 'undefined') {
 /*
  UI For edit excel File
  */
-zReport.reportData = (filename, data, sessions = {}) => {
-  console.log(filename)
-  const workbook = XLSX.readFile(filename)
-  const Sheets = workbook.Sheets
-  let sheet = Sheets[Object.keys(Sheets)[0]]
+function colToLetter (col) {
+  let temp = ''
+  let n = col
+  while (n > 0) {
+    const r = (n - 1) % 26
+    temp = String.fromCharCode(65 + r) + temp
+    n = Math.floor((n - 1) / 26)
+  }
+  return temp
+}
+
+function cellToPrimitive (cell) {
+  // exceljs cell.text is safest for UI display
+  if (!cell) return ''
+  if (typeof cell.text === 'string' && cell.text !== '') return cell.text
+  const v = cell.value
+  if (v == null) return ''
+  if (typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean') return v
+  if (typeof v === 'object') {
+    if (Object.prototype.hasOwnProperty.call(v, 'result')) return v.result ?? ''
+    if (Object.prototype.hasOwnProperty.call(v, 'text')) return v.text ?? ''
+  }
+  return String(v)
+}
+
+zReport.reportData = async (filename, data, sessions = {}) => {
+  const workbook = new Excel.Workbook()
+  await workbook.xlsx.readFile(filename)
+  const worksheet = workbook.worksheets[0]
+  if (!worksheet) {
+    throw new Error('Excel worksheet not found')
+  }
   let excel = Util.excelSequence()
-  let ref = sheet['!ref']
+  const dim = worksheet.dimensions
+  const right = dim ? dim.right : (worksheet.actualColumnCount || 1)
+  const bottom = dim ? dim.bottom : (worksheet.actualRowCount || 1)
+  const ref = `A1:${colToLetter(right)}${bottom}`
   let explode = ref.split(':')
   let lastchar = explode[1]
   let stringPattern = /[A-Z]+/i
@@ -48,23 +77,23 @@ zReport.reportData = (filename, data, sessions = {}) => {
   let excelQuery = data.excel_query || {}
   let dataForExcel = excelQuery.excel
   let dataCallback = data.callback || []
-  let callback = {}
+  let callbacks = {}
   let objQuery = {}
   let results = []
 
   //set callback as object
   dataCallback.map((m) => {
-    callback[m.name] = m.value
+    callbacks[m.name] = m.value
   })
 
   //console.log(JSON.stringify(sessions));
 
   //create UI Button in excel cell
   if (dataForExcel) {
-    dataForExcel.forEach((datafor, index) => {
+    dataForExcel.forEach((datafor) => {
       let button = '',
         name = datafor.name,
-        callback = datafor.callback || '',
+        callbackValue = datafor.callback || '',
         value = datafor.value || ''
       let split = value.split('.')
       let len = split.length
@@ -93,7 +122,7 @@ zReport.reportData = (filename, data, sessions = {}) => {
 
       let labels = value.indexOf('_SESSIONS_') > -1 ? value.replace('_SESSIONS_.', '') : tableKey
       button += `<li class="dragged"> <button class="btn btn-info btn-excel" type="button"  title="${name.replace('[', '').replace(']', '')} : ${value}">${MYMODEL.labels[labels]}
-                        <input type="hidden" class="EXCEL" name="${name}" value='${value}_CALLBACK_SEPARATOR_${callback}'> <i class="fa fa-code call-me"></i>  <i class="fa fa-trash trash-me"></i></button></li>`
+                        <input type="hidden" class="EXCEL" name="${name}" value='${value}_CALLBACK_SEPARATOR_${callbackValue}'> <i class="fa fa-code call-me"></i>  <i class="fa fa-trash trash-me"></i></button></li>`
       excelValue[name] = button
     })
   }
@@ -106,7 +135,8 @@ zReport.reportData = (filename, data, sessions = {}) => {
     for (var i = 0; i <= maxColumn; i++) {
       let str = excel[i] + x
       let strkey = excel[i] + '[' + x + ']'
-      let defaultValue = Object.prototype.hasOwnProperty.call(sheet, str) ? sheet[str].v : ''
+      const cell = worksheet.getCell(str)
+      let defaultValue = cellToPrimitive(cell)
       let value = excelValue[strkey] || defaultValue
       table += `<td width="80px" id="${str}" title="${str}" class="mydragable" data-col="${excel[i]}" data-row="${x}">${value}</td>`
       arr.push(value)

package/lib/zRoute.js

@@ -4,7 +4,6 @@
  */
 require("dotenv").config();
 const path = require("path");
-const excelToJson = require("convert-excel-to-json");
 const qs = require("qs");
 //for generate PDF
 const puppeteer = require("puppeteer");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -29,7 +29,6 @@
   "sideEffects": false,
   "dependencies": {
     "axios": "^1.15.0",
-    "convert-excel-to-json": "^1.7.0",
     "dotenv": "^16.5.0",
     "dropbox": "^10.34.0",
     "ejs": "^3.1.10",
@@ -50,13 +49,14 @@
     "read-excel-file": "^5.8.0",
     "socket.io": "^4.8.3",
     "uglify-js": "^3.19.3",
-    "uuid": "^9.0.1",
-    "xlsx": "^0.18.5"
+    "uuid": "^9.0.1"
   },
   "optionalDependencies": {
-    "pm2": "^6.0.0",
     "sharp": "^0.34.1"
   },
+  "devDependencies": {
+    "standard": "^17.1.2"
+  },
   "overrides": {
     "unzipper": "^0.12.3",
     "rimraf": "^6.1.2",