@mixd-id/web-scaffold 0.1.240411103 → 0.1.240411105

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.240411103",
+  "version": "0.1.240411105",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/utils/importer.js

@@ -5,8 +5,8 @@ const glob = require("glob");
 const Exceljs = require("exceljs")
 const { saveBuffer, unflatten } = require('./helpers.js')
 
-const getCellText = (cell) => {
-  if(!cell) return ''
+const getCellText = (cell, image) => {
+  if(!cell) return image?.buffer ?? ''
 
   let value = ''
   if(cell.formulaType === 1){
@@ -22,10 +22,44 @@ const getCellText = (cell) => {
     value = cell.value
   }
 
+  // Image anchored on the cell, return its raw buffer unless the cell holds a value
+  if(image?.buffer && (value === null || value === undefined || value === ''))
+    value = image.buffer
+
   return value
 
 }
 
+const cellKey = (row, col) => row + ',' + col
+
+// Header labels often carry stray padding in the source file ("TEKS PROGRAM "),
+// normalise them so the column mapping does not depend on it
+const columnName = (value) => `${value ?? ''}`.trim()
+
+// Maps the cell an image is anchored on to its media entry ({ buffer, extension, name }).
+// Only the top left anchor counts, an image spilling over its neighbours stays on one cell.
+const getWorksheetImages = (workbook, worksheet) => {
+
+  const images = new Map()
+
+  for(const item of worksheet.getImages() ?? []){
+
+    const tl = item.range?.tl
+    if(!tl) continue
+
+    const media = workbook.getImage(parseInt(item.imageId))
+    if(!media?.buffer) continue
+
+    // Anchors are 0 based, cell addresses are 1 based
+    const key = cellKey(tl.nativeRow + 1, tl.nativeCol + 1)
+
+    if(!images.has(key))
+      images.set(key, media)
+  }
+
+  return images
+}
+
 const analyseRequest = async(req) => {
 
   const file = req.files[0]
@@ -88,10 +122,10 @@ const analyseRequest = async(req) => {
     header.eachCell((cell) => {
       if(cell.isMerged){
         const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-        columns.push(cell.value + '>' + sub)
+        columns.push(columnName(cell.value) + '>' + columnName(sub))
       }
       else{
-        columns.push(cell.value)
+        columns.push(columnName(cell.value))
       }
     })
 
@@ -143,6 +177,8 @@ const importRequest = async(req) => {
   for(const worksheet of workbook.worksheets){
     const doc = docs.find(_ => _.name === worksheet.name)
 
+    const cellImages = getWorksheetImages(workbook, worksheet)
+
     let rows = []
     const row = worksheet.getRow(2)
     let isInfoRow = false
@@ -158,11 +194,11 @@ const importRequest = async(req) => {
     header.eachCell((cell, index) => {
       if(cell.isMerged){
         const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
-        columnAddress[cell.value + '>' + sub] = index
+        columnAddress[columnName(cell.value) + '>' + columnName(sub)] = index
         rowStart = 3
       }
       else{
-        columnAddress[cell.value] = index
+        columnAddress[columnName(cell.value)] = index
       }
     })
 
@@ -174,44 +210,57 @@ const importRequest = async(req) => {
       }))
     }
 
+    // Rows holding nothing but an image are not visited by eachRow, collect them too
+    const rowNumbers = new Set()
     worksheet.eachRow((row, index) => {
-      if(index >= rowStart){
-        const obj = {}
-
-        // Check if cells in row 2 and 3 is notes in italic
-        if(index <= 3){
-          let isItalic = false
-          for(let idx in keys){
-            const key = keys[idx]
-            if(key.value && columnAddress[key.value]){
-              const cell = row.getCell(columnAddress[key.value])
-              if(cell.font && cell.font.italic){
-                isItalic = true
-                break
-              }
+      if(index >= rowStart)
+        rowNumbers.add(index)
+    })
+    for(const key of cellImages.keys()){
+      const index = parseInt(key.split(',')[0])
+      if(index >= rowStart)
+        rowNumbers.add(index)
+    }
+
+    for(const index of [...rowNumbers].sort((a, b) => a - b)){
+      const row = worksheet.getRow(index)
+      const obj = {}
+
+      // Check if cells in row 2 and 3 is notes in italic
+      if(index <= 3){
+        let isItalic = false
+        for(let idx in keys){
+          const key = keys[idx]
+          const address = columnAddress[columnName(key.value)]
+          if(key.value && address){
+            const cell = row.getCell(address)
+            if(cell.font && cell.font.italic){
+              isItalic = true
+              break
             }
           }
-
-          if(isItalic)
-            return
         }
 
-        if(keys){
-          for(let idx in keys){
-            const key = keys[idx]
-            if(key.value && columnAddress[key.value]){
-              const cell = row.getCell(columnAddress[key.value])
-              obj[key.key] = getCellText(cell)
-            }
+        if(isItalic)
+          continue
+      }
+
+      if(keys){
+        for(let idx in keys){
+          const key = keys[idx]
+          const address = columnAddress[columnName(key.value)]
+          if(key.value && address){
+            const cell = row.getCell(address)
+            obj[key.key] = getCellText(cell, cellImages.get(cellKey(index, address)))
           }
         }
-        else{
-          //Object.assign(obj, row)
-        }
-
-        rows.push(unflatten(obj))
       }
-    })
+      else{
+        //Object.assign(obj, row)
+      }
+
+      rows.push(unflatten(obj))
+    }
 
     Object.assign(doc, {
       rows