html-to-xlsx - npm Package Compare versions

Comparing version 2.0.3 to 2.1.0

index.js

 'use strict'
 
 module.exports = require('./lib/conversion.js')

lib/conversion.js

@@ -5,3 +5,3 @@ 'use strict'
 const fs = require('fs')
-const uuid = require('uuid/v4')
+const { v4: uuidv4 } = require('uuid')
 const tmpDir = require('os').tmpdir()
@@ -33,3 +33,3 @@ const stylesMap = require('./stylesMap')
   async function convert (html, extractOptions = {}, xlsxTemplateBuf) {
-    const id = uuid()
+    const id = uuidv4()
 
@@ -47,4 +47,2 @@ if (html == null) {
 
-    let stream
-
     if (tables != null && !Array.isArray(tables)) {
@@ -58,3 +56,3 @@ tables = [tables]
 
-    stream = await tableToXlsx(options, tables, xlsxTemplateBuf, id)
+    const stream = await tableToXlsx(options, tables, xlsxTemplateBuf, id)
 
@@ -61,0 +59,0 @@ return stream

lib/scripts/conversionScript.js

@@ -0,0 +0,0 @@ // eslint-disable-next-line no-unused-vars

lib/stylesMap.js

@@ -92,3 +92,3 @@ const utils = require('./utils')
       key: 'name',
-      value: cellInfo.fontFamily != null ? cellInfo.fontFamily : `Calibri`
+      value: cellInfo.fontFamily != null ? cellInfo.fontFamily : 'Calibri'
     })
@@ -95,0 +95,0 @@

lib/tableToXlsx.js

@@ -58,3 +58,2 @@ const path = require('path')
   const currentCellOffsetsPerRow = context.currentCellOffsetsPerRow
-  const pendingCellOffsetsPerRow = context.pendingCellOffsetsPerRow
   const usedCells = context.usedCells
@@ -64,16 +63,8 @@ const maxWidths = context.maxWidths
   let maxHeight = 0 // default height
+  let previousCell
 
   if (currentCellOffsetsPerRow[context.currentRowInFile] === undefined) {
-    currentCellOffsetsPerRow[context.currentRowInFile] = 0
+    currentCellOffsetsPerRow[context.currentRowInFile] = [{ startCell: 1, offset: 0 }]
   }
 
-  if (
-    pendingCellOffsetsPerRow[context.currentRowInFile] === undefined ||
-    pendingCellOffsetsPerRow[context.currentRowInFile].length === 0
-  ) {
-    pendingCellOffsetsPerRow[context.currentRowInFile] = [{
-      pending: 0
-    }]
-  }
-
   const allCellsAreRowSpan = row.filter(c => c.rowspan > 1).length === row.length
@@ -141,6 +132,10 @@
 
-    const cell = sheet.getCell(`${context.currentRowInFile + 1}`, `${currentCellOffsetsPerRow[context.currentRowInFile] + 1}`)
+    const cell = sheet.getCell(`${context.currentRowInFile + 1}`, `${currentCellOffsetsPerRow[context.currentRowInFile][0].startCell + currentCellOffsetsPerRow[context.currentRowInFile][0].offset}`)
 
-    let startCell = cell.col
+    // column number is returned as 1-base
+    const startCell = cell.col
     let endCell = cell.col
+    // row number is returned as 1-based
+    const startRow = cell.row
+    let endRow = cell.row
 
@@ -169,3 +164,3 @@ usedCells[`${cell.row},${cell.col}`] = true
 
-    for (let styleProp of styleProperties) {
+    for (const styleProp of styleProperties) {
       styleValues[styleProp] = cellInfo[styleProp]
@@ -189,7 +184,3 @@ }
 
-      // row number is returned as 1-based
-      const startRow = cell.row
-      const endRow = startRow + rowIncrement
-      // column number is returned as 1-base
-      startCell = cell.col
+      endRow = startRow + rowIncrement
       endCell = startCell + cellIncrement
@@ -220,43 +211,61 @@
       if (currentCellOffsetsPerRow[context.currentRowInFile + r] == null) {
-        currentCellOffsetsPerRow[context.currentRowInFile + r] = 0
+        currentCellOffsetsPerRow[context.currentRowInFile + r] = [{ startCell: 1, offset: 0 }]
       }
+    }
 
-      if (
-        pendingCellOffsetsPerRow[context.currentRowInFile + r] == null ||
-        pendingCellOffsetsPerRow[context.currentRowInFile + r].length === 0
-      ) {
-        pendingCellOffsetsPerRow[context.currentRowInFile + r] = [{
-          pending: 0
-        }]
+    if (previousCell != null && previousCell.rowSpan !== rowSpan) {
+      const start = context.currentRowInFile + 1
+      const end = start + (rowSpan - 1)
+
+      for (let r = start; r < end; r++) {
+        // increase offset in new part for next row
+        const cellOffsetsInRow = currentCellOffsetsPerRow[r]
+
+        if (cellOffsetsInRow != null && cellOffsetsInRow[cellOffsetsInRow.length - 1].startCell !== startCell) {
+          cellOffsetsInRow.push({ startCell, offset: 0 })
+        }
       }
+    }
 
-      // don't increase offset when previous cell was not set, instead reserve it for later.
-      // this makes some rowspan/colspan layout to work properly
-      if (usedCells[`${context.currentRowInFile + r + 1},${Math.max(startCell - 1, 1)}`] != null) {
-        currentCellOffsetsPerRow[context.currentRowInFile + r] += cellSpan
+    const cellOffsetsInCurrentRow = currentCellOffsetsPerRow[context.currentRowInFile]
+    cellOffsetsInCurrentRow[0].offset += cellSpan
 
-        const currentPending = pendingCellOffsetsPerRow[context.currentRowInFile + r][0]
+    // update position for cells in other rows if there is rowspan
+    if (rowSpan > 1) {
+      const start = context.currentRowInFile + 1
+      const end = start + (rowSpan - 1)
 
-        if (
-          currentPending &&
-          currentPending.pending !== 0 &&
-          (endCell + 1) >= currentPending.lastCellStart
-        ) {
-          currentCellOffsetsPerRow[context.currentRowInFile + r] += currentPending.pending
-          pendingCellOffsetsPerRow[context.currentRowInFile + r].shift()
+      for (let r = start; r < end; r++) {
+        if (currentCellOffsetsPerRow[r] != null) {
+          const cellOffsetsInRow = currentCellOffsetsPerRow[r]
+          cellOffsetsInRow[cellOffsetsInRow.length - 1].startCell += cellSpan
         }
-      } else {
-        const lastPending = pendingCellOffsetsPerRow[context.currentRowInFile + r][pendingCellOffsetsPerRow[context.currentRowInFile + r].length - 1]
+      }
+    }
 
-        if (lastPending && lastPending.lastCellStart != null && lastPending.lastCellStart !== startCell) {
-          pendingCellOffsetsPerRow[context.currentRowInFile + r].push({
-            lastCellStart: startCell,
-            pending: cellSpan
-          })
-        } else if (lastPending) {
-          lastPending.lastCellStart = startCell
-          lastPending.pending += cellSpan
+    const nextCell = currentCellOffsetsPerRow[context.currentRowInFile][0].startCell + currentCellOffsetsPerRow[context.currentRowInFile][0].offset
+
+    if (currentCellOffsetsPerRow[context.currentRowInFile][1] != null) {
+      let shouldMoveToNext = true
+
+      for (let c = nextCell; c < currentCellOffsetsPerRow[context.currentRowInFile][1].startCell; c++) {
+        if (context.usedCells[`${context.currentRowInFile + 1},${c}`] == null) {
+          shouldMoveToNext = false
+          break
         }
       }
+
+      if (shouldMoveToNext) {
+        currentCellOffsetsPerRow[context.currentRowInFile].shift()
+      }
     }
+
+    previousCell = {
+      rowSpan,
+      cellSpan,
+      startCell,
+      endCell,
+      startRow,
+      endRow
+    }
   }
@@ -288,3 +297,3 @@
 function setStyles (cell, styles) {
-  for (let [styleName, styleValue] of Object.entries(styles)) {
+  for (const [styleName, styleValue] of Object.entries(styles)) {
     cell[styleName] = styleValue
@@ -291,0 +300,0 @@ }

lib/utils.js

@@ -122,8 +122,10 @@ const color = require('tinycolor2')
 function colorToArgb (c) {
-  const input = Array.isArray(c) ? {
-    r: c[0],
-    g: c[1],
-    b: c[2],
-    a: c[3]
-  } : c
+  const input = Array.isArray(c)
+    ? {
+        r: c[0],
+        g: c[1],
+        b: c[2],
+        a: c[3]
+      }
+    : c
 
@@ -173,2 +175,3 @@ const rgba = color(input).toHex8()
 function assetLegalXMLChar (str) {
+  // eslint-disable-next-line no-control-regex
   const validChars = /[\u0000-\u0008\u000B-\u000C\u000E-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]/
@@ -175,0 +178,0 @@

package.json

 {
   "name": "html-to-xlsx",
-  "version": "2.0.3",
-  "author": {
-    "name": "Jan Blaha",
-    "email": "[e-mail]"
-  },
-  "contributors": [
-    "BJR Matos <[e-mail]> (https://github.com/bjrmatos)"
-  ],
+  "version": "2.1.0",
   "description": "Convert html to xlsx",
@@ -23,35 +16,41 @@ "keywords": [
   "license": "MIT",
+  "author": {
+    "name": "Jan Blaha",
+    "email": "[e-mail]"
+  },
+  "contributors": [
+    "BJR Matos <[e-mail]> (https://github.com/bjrmatos)"
+  ],
   "main": "index.js",
-  "engines": {
-    "node": ">=8.9"
+  "scripts": {
+    "test": "mocha --timeout 15000 test/test.js && standard"
   },
-  "standard": {
-    "parser": "babel-eslint",
-    "env": {
-      "node": true,
-      "mocha": true
-    }
-  },
   "dependencies": {
-    "jsreport-exceljs": "3.7.1",
-    "moment": "2.22.1",
+    "jsreport-exceljs": "3.8.0",
+    "moment": "2.29.1",
     "tinycolor2": "1.4.1",
-    "uuid": "3.2.1"
+    "uuid": "8.3.2"
   },
   "devDependencies": {
-    "babel-eslint": "8.2.2",
     "chrome-page-eval": "1.3.0",
-    "eslint": "4.18.2",
-    "eslint-plugin-babel": "4.1.2",
+    "phantom-page-eval": "1.2.0",
+    "phantomjs": "2.1.7",
     "mocha": "5.0.2",
-    "phantom-page-eval": "1.2.0",
-    "phantomjs": "1.9.17",
-    "puppeteer": "2.1.1",
+    "puppeteer": "9.1.1",
     "should": "13.2.1",
-    "standard": "11.0.0",
+    "standard": "16.0.3",
     "xlsx": "0.12.4"
   },
-  "scripts": {
-    "test": "mocha --timeout 15000 test/test.js && standard"
+  "engines": {
+    "node": ">=8.9"
+  },
+  "standard": {
+    "env": {
+      "node": true,
+      "mocha": true
+    },
+    "ignore": [
+      "lib/scripts/conversionScript.js"
+    ]
   }
 }

README.md

@@ -0,0 +0,0 @@ # html-to-xlsx

No alert changes

Improved metrics

Total package byte prevSize

136529

19.45%

Dev dependency count

8

-27.27%

Lines of code

2780

14.5%

Dependency changes

• + Added

  @fast-csv/format@4.3.5
  (transitive)

• + Added

  @fast-csv/parse@4.3.6
  (transitive)

• + Added

  @types/node@14.18.63
  (transitive)

• + Added

  @xmldom/xmldom@0.7.0
  (transitive)

• + Added

  archiver@5.3.0
  (transitive)

• + Added

  archiver-utils@3.0.4
  (transitive)

• + Added

  async@3.2.6
  (transitive)

• + Added

  brace-expansion@2.0.1
  (transitive)

• + Added

  compress-commons@4.1.2
  (transitive)

• + Added

  crc-32@1.2.2
  (transitive)

• + Added

  crc32-stream@4.0.3
  (transitive)

• + Added

  fast-csv@4.3.6
  (transitive)

• + Added

  jsreport-exceljs@3.8.0
  (transitive)

• + Added

  jszip@3.7.1
  (transitive)

• + Added

  minimatch@5.1.6
  (transitive)

• + Added

  moment@2.29.1
  (transitive)

• + Added

  readdir-glob@1.1.3
  (transitive)

• + Added

  set-immediate-shim@1.0.1
  (transitive)

• + Added

  unzipper@0.10.11
  (transitive)

• + Added

  uuid@8.3.2
  (transitive)

• + Added

  zip-stream@4.1.1
  (transitive)

• - Removed

  @types/node@12.20.55
  (transitive)

• - Removed

  archiver@3.1.1
  (transitive)

• - Removed

  async@2.6.4
  (transitive)

• - Removed

  compress-commons@2.1.1
  (transitive)

• - Removed

  crc@3.8.0
  (transitive)

• - Removed

  crc32-stream@3.0.1
  (transitive)

• - Removed

  fast-csv@3.7.0
  (transitive)

• - Removed

  jsreport-exceljs@3.7.1
  (transitive)

• - Removed

  jszip@3.10.1
  (transitive)

• - Removed

  lodash@4.17.21
  (transitive)

• - Removed

  lodash.isstring@4.0.1
  (transitive)

• - Removed

  moment@2.22.1
  (transitive)

• - Removed

  unzipper@0.9.15
  (transitive)

• - Removed

  uuid@3.2.1
  (transitive)

• - Removed

  xmldom@0.2.1
  (transitive)

• - Removed

  zip-stream@2.1.3
  (transitive)

• Updated

  jsreport-exceljs@3.8.0

• Updated

  moment@2.29.1

• Updated

  uuid@8.3.2