xlsx-template-browser 0.1.5 → 0.1.6

package/lib/excelHelpers.js

@@ -7,7 +7,7 @@ export const valueToString = (value) => {
   if (!value) return ''
   if (Array.isArray(value)) return value.map(valueToString).toString()
   if (typeof value === 'object') value = JSON.stringify(value)
-  return value.toString()
+  return escapeXml(value.toString())
 }
 
 /**
@@ -37,7 +37,7 @@ export const guessDataType = (value) => {
     return { cellType: 'n', value: dateToExcel(value) }
   }
   if (typeof value === 'boolean') return { cellType: 'b', value: value + 0 }
-  return { cellType: 's', value: valueToString(value )}
+  return { cellType: 's', value: valueToString(value) }
 }
 
 /**
@@ -65,12 +65,9 @@ export const createSharedString = (text, template) => {
  * @returns {Element} - The created cell element.
  */
 export const createCell = ({ value, row, column, template, cellType }) => {
-  // If the cell is formula, then skip
-  if (cellType === 'f') {
-    // Check precalculated value
-    const v = value.querySelector('v')
-    if (v) v.remove()
-    return value
+  // If the cell is not a string, then skip
+  if (!cellType && !value) {
+    return template
   }
   // Clone initial node with the style or create a new one
   const cell = template ? template.cloneNode() : document.createElement('c')
@@ -118,3 +115,24 @@ export const getExcelColumnIndex = (columnName) => {
   return index
 }
 
+/**
+ * Escapes unsafe XML characters in a given string to ensure its safe inclusion
+ * in XML documents, preventing parsing issues.
+ *
+ * @param {string} unsafe - The input string containing XML-unsafe characters.
+ * @returns {string} - A new string with XML-unsafe characters replaced by their
+ * corresponding HTML entities.
+ */
+
+const unsafeChars = {
+  '<': '&lt;',
+  '>': '&gt;',
+  '&': '&amp;',
+  '\'': '&apos;',
+  '"': '&quot;'
+}
+
+export const escapeXml = (unsafe) => {
+  return unsafe.replace(/[<>&'"]/g, (c) =>  { return unsafeChars[c] })
+}
+

package/lib/main.js

@@ -50,6 +50,16 @@ const replace = async (template, data) => {
   // We need to replace only text values with the new ones, therefore we process shared strings first
   // Get all string items
   xml.querySelectorAll('si').forEach((si, i) => {
+    // Get all rich format tags
+    const r = si.querySelector('r')
+    if (r) {
+      const xmlString = si.innerHTML
+      const newString = xmlString.replace(globalAccessorRegex, s => valueToString(getByNotation(data, s.replace(/\$\{|}/g, ''))))
+      si.innerHTML = newString
+      newSharedStrings.push(si)
+      valuesToReplace[i] = { value: newSharedStrings.length - 1, cellType: 's' }
+      return false
+    }
     // Get all text tags
     const t = si.querySelector('t')
     if (!t) return false
@@ -126,13 +136,11 @@ const replace = async (template, data) => {
         let newIndex = index + cellOffset
         // Get the cell value tag
         let v = c.querySelector('v') || {}
-        // Check if the cell contains formula, and skip
-        let f = c.querySelector('f')
-        if (f) {
-          const value = c
-          const cellType = 'f'
-          newCells[newIndex] = Object.assign({}, { value, cellType }, { template: c })
-          return false          
+        // Check if the cell contains string
+        let f = c.getAttribute('t')
+        if (!f || f !== 's') {
+          newCells[newIndex] = Object.assign({}, { template: c })
+          return false
         }
         // Get the new value to replace
         let newValue = valuesToReplace[v.textContent] || {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xlsx-template-browser",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "On-the-fly generation of .xlsx (Excel) files directly within the browser using templates constructed in Excel.",
   "main": "./lib/index",
   "files": [