excellentexport 3.9.10 → 3.9.15

package/test/convert-filters.test.ts

@@ -1,5 +1,5 @@
 
-import 'expect-puppeteer';
+import { describe, expect, test, beforeEach, it, assert } from 'vitest'
 
 import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
 
@@ -12,7 +12,7 @@ describe('convert() API', function() {
 
             document.body.innerHTML = '';
             const element = document.createElement("div");
-            element.innerHTML = 
+            element.innerHTML =
                 '<table id="sometable"><tr><th>first</th><th>second</th></tr><tr><td>1234</td><td>123.56</td></tr></table>' +
                 '<a id="anchor">Link</a>';
 

package/test/convert-table.test.ts

@@ -1,6 +1,7 @@
 
-import 'expect-puppeteer';
+import { describe, expect, test, beforeEach, it, assert } from 'vitest'
 
+import * as XLSX from 'xlsx';
 import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
 
 
@@ -12,7 +13,7 @@ describe('convert() API', function() {
 
             document.body.innerHTML = '';
             const element = document.createElement("div");
-            element.innerHTML = 
+            element.innerHTML =
                 '<table id="sometable"><tr><th>first</th><th>second</th></tr><tr><td>1234</td><td>123.56</td></tr></table>' +
                 '<a id="anchor">Link</a>';
 
@@ -67,5 +68,96 @@ describe('convert() API', function() {
             expect(anchor.href).toMatch(/blob:/);
         });
     });
+
+    describe('convert from HTML table with colspan and rowspan', function() {
+
+        beforeEach(() => {
+            window.URL.createObjectURL = () => "blob:fake_URL";
+            document.body.innerHTML = '';
+            const div = document.createElement('div');
+            div.innerHTML = '<a id="anchor">Link</a>';
+            document.body.appendChild(div);
+        });
+
+        function buildWorksheet(tableHtml: string): XLSX.WorkSheet {
+            const div = document.createElement('div');
+            div.id = 'wrapper';
+            div.innerHTML = tableHtml;
+            document.body.appendChild(div);
+
+            const wbBinary = ExcellentExport.convert(
+                { anchor: 'anchor', filename: 'test', format: 'xlsx' } as ConvertOptions,
+                [{ name: 'Sheet1', from: { table: div.querySelector('table') as HTMLTableElement } }] as SheetOptions[]
+            );
+
+            const wb = XLSX.read(wbBinary, { type: 'binary' });
+            return wb.Sheets['Sheet1'];
+        }
+
+        test('should produce merged cells for colspan=2', function() {
+            const ws = buildWorksheet(
+                '<table>' +
+                '<tr><td colspan="2">Header</td></tr>' +
+                '<tr><td>A</td><td>B</td></tr>' +
+                '</table>'
+            );
+
+            // Cell A1 should contain "Header"
+            expect(ws['A1'].v).toBe('Header');
+            // Merged region should cover A1:B1
+            expect(ws['!merges']).toBeDefined();
+            expect(ws['!merges']).toHaveLength(1);
+            expect(ws['!merges']![0]).toEqual({ s: { r: 0, c: 0 }, e: { r: 0, c: 1 } });
+        });
+
+        test('should produce merged cells for rowspan=2', function() {
+            const ws = buildWorksheet(
+                '<table>' +
+                '<tr><td rowspan="2">Side</td><td>Top</td></tr>' +
+                '<tr><td>Bottom</td></tr>' +
+                '</table>'
+            );
+
+            expect(ws['A1'].v).toBe('Side');
+            expect(ws['B1'].v).toBe('Top');
+            expect(ws['B2'].v).toBe('Bottom');
+            expect(ws['!merges']).toBeDefined();
+            expect(ws['!merges']).toHaveLength(1);
+            expect(ws['!merges']![0]).toEqual({ s: { r: 0, c: 0 }, e: { r: 1, c: 0 } });
+        });
+
+        test('should produce merged cells for combined colspan=2 rowspan=2', function() {
+            const ws = buildWorksheet(
+                '<table>' +
+                '<tr><td colspan="2" rowspan="2">Big</td><td>R0C2</td></tr>' +
+                '<tr><td>R1C2</td></tr>' +
+                '<tr><td>R2C0</td><td>R2C1</td><td>R2C2</td></tr>' +
+                '</table>'
+            );
+
+            expect(ws['A1'].v).toBe('Big');
+            expect(ws['C1'].v).toBe('R0C2');
+            expect(ws['C2'].v).toBe('R1C2');
+            expect(ws['A3'].v).toBe('R2C0');
+            expect(ws['!merges']).toBeDefined();
+            expect(ws['!merges']).toHaveLength(1);
+            expect(ws['!merges']![0]).toEqual({ s: { r: 0, c: 0 }, e: { r: 1, c: 1 } });
+        });
+
+        test('should produce no merges for a table without spans', function() {
+            const ws = buildWorksheet(
+                '<table>' +
+                '<tr><td>A</td><td>B</td></tr>' +
+                '<tr><td>C</td><td>D</td></tr>' +
+                '</table>'
+            );
+
+            expect(ws['A1'].v).toBe('A');
+            expect(ws['B2'].v).toBe('D');
+            // No merges
+            const merges = ws['!merges'];
+            expect(merges ?? []).toHaveLength(0);
+        });
+    });
 });
 

package/test/convert.format.ts

@@ -1,56 +1,56 @@
-const assert = require('assert');
-
-import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
-import { PredefinedFormat } from '../src/format';
-
-
-describe('convert() API with column formats', function() {
-
-    beforeEach(() => {
-        window.URL.createObjectURL = () => "blob:fake_URL";
-
-        document.body.innerHTML = '';
-        const element = document.createElement("div");
-        element.innerHTML = '<a id="anchor">Link</a>';
-
-        document.body.appendChild(element);
-    });
-
-    it('should create a XLSX with types', function() {
-        const options = {
-            anchor: 'anchor',
-            filename: 'data_from_array',
-            format: 'xlsx'
-        } as ConvertOptions;
-
-        const sheets = [
-            {
-                name: 'People',
-                from: {
-                    array: [
-                        ["ID", "Name", "Birthdate", "Active", "Salary"],
-                        [11, "John", "1980-01-01", true, 1000.98],
-                        [22, "Mary", "1985-02-02", false, 2000.88],
-                        [33, "Peter", "1990-03-03", true, 3000.32],
-                    ]
-                },
-                formats: [
-                    { range: 'A2:A10', format: PredefinedFormat.INTEGER },
-                    { range: 'C2:C10', format: PredefinedFormat.DATE },
-                    { range: 'D2:D10', format: PredefinedFormat.BOOLEAN },
-                    { range: 'E2:E10', format: PredefinedFormat.DECIMAL },
-                ]
-            },
-
-        ] as SheetOptions[];
-
-        const workbook = ExcellentExport.convert(options, sheets);
-
-        assert.ok(workbook, 'Result must not be null');
-
-        const anchor = document.getElementById('anchor') as HTMLAnchorElement;
-        assert.ok(anchor.href, 'Element must have href');
-        assert.ok(anchor.href.indexOf('blob:') === 0, 'Element href myst be a blob:');
-    });
-});
-
+import { describe, expect, test, beforeEach, it, assert } from 'vitest'
+
+import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
+import { PredefinedFormat } from '../src/format';
+
+
+describe('convert() API with column formats', function() {
+
+    beforeEach(() => {
+        window.URL.createObjectURL = () => "blob:fake_URL";
+
+        document.body.innerHTML = '';
+        const element = document.createElement("div");
+        element.innerHTML = '<a id="anchor">Link</a>';
+
+        document.body.appendChild(element);
+    });
+
+    it('should create a XLSX with types', function() {
+        const options = {
+            anchor: 'anchor',
+            filename: 'data_from_array',
+            format: 'xlsx'
+        } as ConvertOptions;
+
+        const sheets = [
+            {
+                name: 'People',
+                from: {
+                    array: [
+                        ["ID", "Name", "Birthdate", "Active", "Salary"],
+                        [11, "John", "1980-01-01", true, 1000.98],
+                        [22, "Mary", "1985-02-02", false, 2000.88],
+                        [33, "Peter", "1990-03-03", true, 3000.32],
+                    ]
+                },
+                formats: [
+                    { range: 'A2:A10', format: PredefinedFormat.INTEGER },
+                    { range: 'C2:C10', format: PredefinedFormat.DATE },
+                    { range: 'D2:D10', format: PredefinedFormat.BOOLEAN },
+                    { range: 'E2:E10', format: PredefinedFormat.DECIMAL },
+                ]
+            },
+
+        ] as SheetOptions[];
+
+        const workbook = ExcellentExport.convert(options, sheets);
+
+        assert.ok(workbook, 'Result must not be null');
+
+        const anchor = document.getElementById('anchor') as HTMLAnchorElement;
+        assert.ok(anchor.href, 'Element must have href');
+        assert.ok(anchor.href.indexOf('blob:') === 0, 'Element href myst be a blob:');
+    });
+});
+

package/test/convert.test.ts

@@ -1,59 +1,60 @@
-const assert = require('assert');
-
-import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
-
-
-describe('convert() API', function() {
-    describe('convert from array', function() {
-
-        beforeEach(() => {
-            window.URL.createObjectURL = () => "blob:fake_URL";
-
-            document.body.innerHTML = '';
-            const element = document.createElement("div");
-            element.innerHTML = '<a id="anchor">Link</a>';
-
-            document.body.appendChild(element);
-        });
-
-        it('should create a XLSX from array', function() {
-            const options = {
-                anchor: 'anchor',
-                filename: 'data_from_array',
-                format: 'xlsx'
-            } as ConvertOptions;
-
-            const sheets = [
-                {
-                    name: 'Sheet Name Here 1',
-                    from: {
-                        array: [
-                            [1, 2, 3],
-                            ['hello', '2200', 'bye'],
-                            ['quo"te', 'dobl"e qu"ote', 'singl\'e quote']
-                        ]
-                    }
-                },
-                {
-                    name: 'Sheet Number 2',
-                    from: {
-                        array: [
-                            [6666, 7777, 8888],
-                            ['lorem', 'ipsum', 'dolor']
-                        ]
-                    }
-                },
-
-            ] as SheetOptions[];
-
-            const workbook = ExcellentExport.convert(options, sheets);
-
-            assert.ok(workbook, 'Result must not be null');
-
-            const anchor = document.getElementById('anchor') as HTMLAnchorElement;
-            assert.ok(anchor.href, 'Element must have href');
-            assert.ok(anchor.href.indexOf('blob:') === 0, 'Element href myst be a blob:');
-        });
-    });
-});
-
+import { describe, expect, test, beforeEach, it, assert } from 'vitest'
+
+import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
+
+
+
+describe('convert() API', function() {
+    describe('convert from array', function() {
+
+        beforeEach(() => {
+            window.URL.createObjectURL = () => "blob:fake_URL";
+
+            document.body.innerHTML = '';
+            const element = document.createElement("div");
+            element.innerHTML = '<a id="anchor">Link</a>';
+
+            document.body.appendChild(element);
+        });
+
+        it('should create a XLSX from array', function() {
+            const options = {
+                anchor: 'anchor',
+                filename: 'data_from_array',
+                format: 'xlsx'
+            } as ConvertOptions;
+
+            const sheets = [
+                {
+                    name: 'Sheet Name Here 1',
+                    from: {
+                        array: [
+                            [1, 2, 3],
+                            ['hello', '2200', 'bye'],
+                            ['quo"te', 'dobl"e qu"ote', 'singl\'e quote']
+                        ]
+                    }
+                },
+                {
+                    name: 'Sheet Number 2',
+                    from: {
+                        array: [
+                            [6666, 7777, 8888],
+                            ['lorem', 'ipsum', 'dolor']
+                        ]
+                    }
+                },
+
+            ] as SheetOptions[];
+
+            const workbook = ExcellentExport.convert(options, sheets);
+
+            assert.ok(workbook, 'Result must not be null');
+
+            const anchor = document.getElementById('anchor') as HTMLAnchorElement;
+            assert.ok(anchor.href, 'Element must have href');
+            assert.ok(anchor.href.indexOf('blob:') === 0, 'Element href myst be a blob:');
+        });
+    });
+});
+

package/test/fixdata.test.ts

@@ -1,4 +1,4 @@
-const assert = require('assert');
+import { describe, expect, test, beforeEach, it, assert } from 'vitest'
 
 import ExcellentExport, { ConvertOptions } from '../src/excellentexport';
 
@@ -29,7 +29,7 @@ describe('Fix data', function() {
                         ['hello', '<td>hello</td>', 'bye'],
                     ]
                 },
-                fixValue: (value, row, col) => {
+                fixValue: (value: any, row: number, col: number) => {
                     let v = value.replace(/<br>/gi, "\n");
                     let strippedString = v.replace(/(<([^>]+)>)/gi, "");
                     return strippedString;
@@ -56,9 +56,9 @@ describe('Fix data', function() {
                         ['hello', '<td>hello</td>', 'bye'],
                     ]
                 },
-                fixData: (array) => {
-                    return array.map(r => {
-                        return r.map(v => {
+                fixArray: (array: any[][]) => {
+                    return array.map((r: any[]) => {
+                        return r.map((v: any) => {
                             return "fixed-" + v;
                         })
                     });

package/test/negative.test.ts

@@ -1,129 +1,130 @@
-const assert = require('assert');
-
-import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
-
-
-describe('convert() API', function() {
-    describe('Negative tests', function() {
-
-        beforeEach(() => {
-            window.URL.createObjectURL = () => "blob:fake_URL";
-
-            const element = document.createElement("div");
-            element.innerHTML = '<a id="anchor">Link</a>';
-
-            document.body.appendChild(element);
-        });
-
-        it('should fail if CSV has more than one sheet', function() {
-            const options = {
-                anchor: 'anchor',
-                filename: 'data_from_array',
-                format: 'csv'
-            } as ConvertOptions;
-
-            const sheets = [{
-                name: 'Sheet Name Here 1',
-                from: {}
-            }, {
-                name: 'Sheet Number 2',
-                from: {}
-            }];
-
-            assert.throws(() => {
-                ExcellentExport.convert(options, sheets)
-            }, Error);
-
-        });
-
-        it('should fail if sheet does not have name', function() {
-            const options = {
-                anchor: 'anchor',
-                filename: 'data_from_array',
-                format: 'csv'
-            } as ConvertOptions;
-
-            const sheets = [{
-                // name: 'Sheet Name Here 1',
-                from: {}
-            }] as SheetOptions[];
-
-            assert.throws(() => {
-                ExcellentExport.convert(options, sheets)
-            }, Error);
-
-        });
-
-        it('should fail if sheet does not have data', function() {
-            const options = {
-                anchor: 'anchor',
-                filename: 'data_from_array',
-                format: 'csv'
-            } as ConvertOptions;
-
-            const sheets = [{
-                name: 'Sheet Name Here 1',
-                // from: {}
-            }] as SheetOptions[];
-
-            assert.throws(() => {
-                ExcellentExport.convert(options, sheets)
-            }, Error);
-
-        });
-
-        it('should fail if there is not format defined', function() {
-            const options = {
-                anchor: 'anchor',
-                filename: 'data_from_array',
-                //format: 'csv'
-            } as ConvertOptions;
-
-            const sheets = [{
-                name: 'Sheet Name Here 1',
-                from: {}
-            }];
-
-            assert.throws(() => {
-                ExcellentExport.convert(options, sheets)
-            }, Error);
-
-        });
-
-        it('should fail if anchor is not defined/valid', function() {
-            const options = {
-                anchor: 'anchor1235d5d5d5d_invalid',
-                filename: 'data_from_array',
-                format: 'csv'
-            } as ConvertOptions;
-
-            const sheets = [{
-                name: 'Sheet Name Here 1',
-                from: {}
-            }];
-
-            assert.throws(() => {
-                ExcellentExport.convert(options, sheets)
-            }, Error);
-
-        });
-
-        it('should fail if no anchor and not openAsDownload', function() {
-            const options = {
-                filename: 'data_from_array',
-                format: 'csv'
-            } as ConvertOptions;
-
-            const sheets = [{
-                name: 'Sheet Name Here 1',
-                from: {}
-            }];
-
-            assert.throws(() => {
-                ExcellentExport.convert(options, sheets)
-            }, Error);
-
-        });
-    });
-});
-
+
+import { describe, expect, test, beforeEach, it, assert } from 'vitest'
+
+import ExcellentExport, { ConvertOptions, SheetOptions } from '../src/excellentexport';
+
+
+describe('convert() API', function() {
+    describe('Negative tests', function() {
+
+        beforeEach(() => {
+            window.URL.createObjectURL = () => "blob:fake_URL";
+
+            const element = document.createElement("div");
+            element.innerHTML = '<a id="anchor">Link</a>';
+
+            document.body.appendChild(element);
+        });
+
+        it('should fail if CSV has more than one sheet', function() {
+            const options = {
+                anchor: 'anchor',
+                filename: 'data_from_array',
+                format: 'csv'
+            } as ConvertOptions;
+
+            const sheets = [{
+                name: 'Sheet Name Here 1',
+                from: {}
+            }, {
+                name: 'Sheet Number 2',
+                from: {}
+            }];
+
+            assert.throws(() => {
+                ExcellentExport.convert(options, sheets)
+            }, Error);
+
+        });
+
+        it('should fail if sheet does not have name', function() {
+            const options = {
+                anchor: 'anchor',
+                filename: 'data_from_array',
+                format: 'csv'
+            } as ConvertOptions;
+
+            const sheets = [{
+                // name: 'Sheet Name Here 1',
+                from: {}
+            }] as SheetOptions[];
+
+            assert.throws(() => {
+                ExcellentExport.convert(options, sheets)
+            }, Error);
+
+        });
+
+        it('should fail if sheet does not have data', function() {
+            const options = {
+                anchor: 'anchor',
+                filename: 'data_from_array',
+                format: 'csv'
+            } as ConvertOptions;
+
+            const sheets = [{
+                name: 'Sheet Name Here 1',
+                // from: {}
+            }] as SheetOptions[];
+
+            assert.throws(() => {
+                ExcellentExport.convert(options, sheets)
+            }, Error);
+
+        });
+
+        it('should fail if there is not format defined', function() {
+            const options = {
+                anchor: 'anchor',
+                filename: 'data_from_array',
+                //format: 'csv'
+            } as ConvertOptions;
+
+            const sheets = [{
+                name: 'Sheet Name Here 1',
+                from: {}
+            }];
+
+            assert.throws(() => {
+                ExcellentExport.convert(options, sheets)
+            }, Error);
+
+        });
+
+        it('should fail if anchor is not defined/valid', function() {
+            const options = {
+                anchor: 'anchor1235d5d5d5d_invalid',
+                filename: 'data_from_array',
+                format: 'csv'
+            } as ConvertOptions;
+
+            const sheets = [{
+                name: 'Sheet Name Here 1',
+                from: {}
+            }];
+
+            assert.throws(() => {
+                ExcellentExport.convert(options, sheets)
+            }, Error);
+
+        });
+
+        it('should fail if no anchor and not openAsDownload', function() {
+            const options = {
+                filename: 'data_from_array',
+                format: 'csv'
+            } as ConvertOptions;
+
+            const sheets = [{
+                name: 'Sheet Name Here 1',
+                from: {}
+            }];
+
+            assert.throws(() => {
+                ExcellentExport.convert(options, sheets)
+            }, Error);
+
+        });
+    });
+});
+