juxscript 1.1.207 → 1.1.208

package/lib/storage/TabularDriver.d.ts

@@ -49,11 +49,11 @@ export declare class TabularDriver {
      */
     streamFile(file: File, options?: ParseOptions): Promise<DataFrame>;
     /**
-     * Parse an XLSX/XLS file into a DataFrame using SheetJS
+     * Parse an XLSX/XLS file into a DataFrame using ExcelJS
      */
     private _parseXLSX;
     /**
-     * Get sheet names from an XLSX file (useful for UI)
+     * Get sheet names from an XLSX file
      */
     getSheetNames(file: File): Promise<string[]>;
     /**
@@ -89,7 +89,7 @@ export declare class TabularDriver {
     fetch(url: string, options?: ParseOptions): Promise<DataFrame>;
     /**
      * Read raw cell values from first sheet of an Excel file.
-     * Returns rows with their actual sheet row indices.
+     * Returns rows with their 0-based row indices.
      * Used by both the preview UI and the parser to ensure consistency.
      */
     readRawExcelRows(file: File, maxRows?: number): Promise<{
@@ -97,10 +97,15 @@ export declare class TabularDriver {
         values: any[];
     }[]>;
     /**
-     * ✅ FIXED: Stream Excel file with optional headerRow override
-     * headerRow is the absolute sheet row index (same as sheetRow from readRawExcelRows).
+     * Stream Excel file with optional headerRow override.
+     * headerRow is 0-based (same as sheetRow from readRawExcelRows).
      */
     streamFileMultiSheet(file: File, options?: ParseOptions): Promise<Record<string, DataFrame>>;
+    /**
+     * Extract cell values from an ExcelJS row into a plain array.
+     * ExcelJS row.values is 1-based (index 0 is undefined), so we normalize.
+     */
+    private _excelRowToArray;
     private _splitLines;
     private _parseLine;
     private _autoType;

package/lib/storage/TabularDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TabularDriver.d.ts","sourceRoot":"","sources":["TabularDriver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TabularDriver.d.ts","sourceRoot":"","sources":["TabularDriver.ts"],"names":[],"mappings":"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"}

package/lib/storage/TabularDriver.js

@@ -210,66 +210,73 @@ export class TabularDriver {
         return df;
     }
     /* ═══════════════════════════════════════════════════
-     * XLSX / XLS PARSING
+     * XLSX / XLS PARSING (ExcelJS)
      * ═══════════════════════════════════════════════════ */
     /**
-     * Parse an XLSX/XLS file into a DataFrame using SheetJS
+     * Parse an XLSX/XLS file into a DataFrame using ExcelJS
      */
     async _parseXLSX(file, options = {}) {
         const { maxRows, skipRows = 0, columns: selectCols, sheet, onProgress, hasHeader = true } = options;
-        // Dynamic import — fails gracefully if xlsx not installed
-        let XLSX;
+        let ExcelJS;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         }
         catch {
-            throw new Error('XLSX support requires the "xlsx" package. Install it with: npm install xlsx');
+            throw new Error('XLSX support requires the "exceljs" package. Install it with: npm install exceljs');
         }
         if (onProgress)
             onProgress(0, file.size);
         const buffer = await file.arrayBuffer();
         if (onProgress)
             onProgress(file.size * 0.5, file.size);
-        const workbook = XLSX.read(buffer, { type: 'array' });
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
         // Select sheet
-        let sheetName;
+        let worksheet;
         if (typeof sheet === 'number') {
-            sheetName = workbook.SheetNames[sheet] || workbook.SheetNames[0];
+            worksheet = workbook.worksheets[sheet] || workbook.worksheets[0];
         }
         else if (typeof sheet === 'string') {
-            sheetName = sheet;
+            worksheet = workbook.getWorksheet(sheet) || workbook.worksheets[0];
         }
         else {
-            sheetName = workbook.SheetNames[0];
+            worksheet = workbook.worksheets[0];
         }
-        const worksheet = workbook.Sheets[sheetName];
         if (!worksheet) {
-            throw new Error(`Sheet "${sheetName}" not found. Available: ${workbook.SheetNames.join(', ')}`);
+            const names = workbook.worksheets.map((ws) => ws.name).join(', ');
+            throw new Error(`No worksheet found. Available: ${names}`);
         }
-        // Convert to JSON rows
-        const jsonRows = XLSX.utils.sheet_to_json(worksheet, {
-            header: hasHeader ? undefined : 1,
-            defval: null,
-            raw: true
+        if (onProgress)
+            onProgress(file.size * 0.7, file.size);
+        // Read all rows
+        const allRows = [];
+        let headers = null;
+        worksheet.eachRow({ includeEmpty: false }, (row, rowNumber) => {
+            const values = this._excelRowToArray(row, worksheet.columnCount);
+            if (!headers && hasHeader) {
+                headers = values.map((v, i) => {
+                    if (v === null || v === undefined || String(v).trim() === '')
+                        return `col_${i}`;
+                    return String(v).trim();
+                });
+                return;
+            }
+            if (!headers) {
+                headers = values.map((_, i) => `col_${i}`);
+            }
+            const rowObj = {};
+            headers.forEach((h, j) => {
+                rowObj[h] = this._autoType(values[j] === null || values[j] === undefined ? '' : String(values[j]));
+            });
+            allRows.push(rowObj);
         });
         if (onProgress)
-            onProgress(file.size * 0.8, file.size);
-        // Apply skipRows and maxRows
-        let rows = jsonRows;
-        if (skipRows > 0) {
+            onProgress(file.size * 0.9, file.size);
+        let rows = allRows;
+        if (skipRows > 0)
             rows = rows.slice(skipRows);
-        }
-        if (maxRows !== undefined) {
+        if (maxRows !== undefined)
             rows = rows.slice(0, maxRows);
-        }
-        // Auto-type values
-        rows = rows.map(row => {
-            const typed = {};
-            for (const [key, value] of Object.entries(row)) {
-                typed[key] = this._autoType(value === null || value === undefined ? '' : String(value));
-            }
-            return typed;
-        });
         if (onProgress)
             onProgress(file.size, file.size);
         let df = new DataFrame(rows);
@@ -278,19 +285,20 @@ export class TabularDriver {
         return df;
     }
     /**
-     * Get sheet names from an XLSX file (useful for UI)
+     * Get sheet names from an XLSX file
      */
     async getSheetNames(file) {
-        let XLSX;
+        let ExcelJS;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         }
         catch {
-            throw new Error('XLSX support requires the "xlsx" package. Install it with: npm install xlsx');
+            throw new Error('XLSX support requires the "exceljs" package. Install it with: npm install exceljs');
         }
         const buffer = await file.arrayBuffer();
-        const workbook = XLSX.read(buffer, { type: 'array' });
-        return workbook.SheetNames;
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
+        return workbook.worksheets.map((ws) => ws.name);
     }
     /* ═══════════════════════════════════════════════════
      * INDEXEDDB PERSISTENCE
@@ -488,130 +496,86 @@ export class TabularDriver {
     }
     /**
      * Read raw cell values from first sheet of an Excel file.
-     * Returns rows with their actual sheet row indices.
+     * Returns rows with their 0-based row indices.
      * Used by both the preview UI and the parser to ensure consistency.
      */
     async readRawExcelRows(file, maxRows = 15) {
-        let XLSX;
+        let ExcelJS;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         }
         catch {
-            throw new Error('XLSX support requires the "xlsx" package.');
+            throw new Error('XLSX support requires the "exceljs" package.');
         }
         const buffer = await file.arrayBuffer();
-        const workbook = XLSX.read(buffer, {
-            type: 'array',
-            sheetRows: maxRows + 5,
-            dense: false
-        });
-        const sheetName = workbook.SheetNames[0];
-        const worksheet = workbook.Sheets[sheetName];
-        const ref = worksheet['!ref'];
-        if (!ref)
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
+        const worksheet = workbook.worksheets[0];
+        if (!worksheet)
             return [];
-        const range = XLSX.utils.decode_range(ref);
-        const startRow = range.s.r;
-        const endRow = Math.min(range.e.r, startRow + maxRows - 1);
-        const startCol = range.s.c;
-        const endCol = range.e.c;
-        console.log(`[readRawExcelRows] ref=${ref}, startRow=${startRow}, endRow=${endRow}, cols=${startCol}-${endCol}`);
+        const colCount = worksheet.columnCount;
         const rows = [];
-        for (let r = startRow; r <= endRow; r++) {
-            const values = [];
-            for (let c = startCol; c <= endCol; c++) {
-                const addr = XLSX.utils.encode_cell({ r, c });
-                const cell = worksheet[addr];
-                if (!cell) {
-                    values.push(null);
-                    continue;
-                }
-                if (cell.w !== undefined) {
-                    values.push(cell.w);
-                    continue;
-                }
-                if (cell.v !== undefined) {
-                    values.push(cell.v);
-                    continue;
-                }
-                values.push(null);
-            }
-            rows.push({ sheetRow: r, values });
+        let count = 0;
+        // ExcelJS eachRow gives 1-based rowNumber; we expose 0-based to the UI
+        // But we need to also show truly empty rows, so iterate by index
+        const totalRows = Math.min(worksheet.rowCount, maxRows);
+        for (let r = 1; r <= totalRows; r++) {
+            const row = worksheet.getRow(r);
+            const values = this._excelRowToArray(row, colCount);
+            // sheetRow is 0-based (r-1) to match what we pass back to streamFileMultiSheet
+            rows.push({ sheetRow: r - 1, values });
+            count++;
+            if (count >= maxRows)
+                break;
         }
+        console.log(`[readRawExcelRows] ${rows.length} rows, colCount=${colCount}`);
+        rows.forEach(r => console.log(`  sheetRow ${r.sheetRow}:`, r.values.slice(0, 5)));
         return rows;
     }
     /**
-     * ✅ FIXED: Stream Excel file with optional headerRow override
-     * headerRow is the absolute sheet row index (same as sheetRow from readRawExcelRows).
+     * Stream Excel file with optional headerRow override.
+     * headerRow is 0-based (same as sheetRow from readRawExcelRows).
      */
     async streamFileMultiSheet(file, options = {}) {
-        const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow = 0 } = options;
-        let XLSX;
+        const { maxSheetSize = 100000, onProgress, headerRow = 0 } = options;
+        let ExcelJS;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         }
         catch {
-            throw new Error('XLSX support requires the "xlsx" package. Install it with: npm install xlsx');
+            throw new Error('XLSX support requires the "exceljs" package. Install it with: npm install exceljs');
         }
         if (onProgress)
             onProgress(0, file.size);
         const buffer = await file.arrayBuffer();
         if (onProgress)
             onProgress(file.size * 0.3, file.size);
-        const workbook = XLSX.read(buffer, {
-            type: 'array',
-            sheetRows: maxSheetSize,
-            dense: false
-        });
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
         const sheets = {};
-        const totalSheets = workbook.SheetNames.length;
+        const totalSheets = workbook.worksheets.length;
         let processedSheets = 0;
-        for (const sheetName of workbook.SheetNames) {
-            const worksheet = workbook.Sheets[sheetName];
-            const ref = worksheet['!ref'];
-            if (!ref) {
-                processedSheets++;
-                continue;
-            }
-            const range = XLSX.utils.decode_range(ref);
-            const startRow = range.s.r;
-            const endRow = range.e.r;
-            const startCol = range.s.c;
-            const endCol = range.e.c;
-            if (endRow < startRow) {
+        for (const worksheet of workbook.worksheets) {
+            const sheetName = worksheet.name;
+            const colCount = worksheet.columnCount;
+            const rowCount = worksheet.rowCount;
+            if (rowCount === 0 || colCount === 0) {
                 processedSheets++;
                 continue;
             }
-            const readCellValue = (r, c) => {
-                const addr = XLSX.utils.encode_cell({ r, c });
-                const cell = worksheet[addr];
-                if (!cell)
-                    return null;
-                if (cell.w !== undefined)
-                    return cell.w;
-                if (cell.v !== undefined)
-                    return cell.v;
-                return null;
-            };
-            const readRow = (r) => {
-                const vals = [];
-                for (let c = startCol; c <= endCol; c++) {
-                    vals.push(readCellValue(r, c));
-                }
-                return vals;
-            };
-            // headerRow is the absolute sheet row index — same value as
-            // sheetRow from readRawExcelRows(). No offset needed.
-            const headerSheetRow = headerRow;
-            console.log(`[TabularDriver] Sheet "${sheetName}": range=${ref}, startRow=${startRow}, endRow=${endRow}`);
-            console.log(`[TabularDriver] headerRow=${headerRow}, headerSheetRow=${headerSheetRow}`);
-            if (headerSheetRow > endRow) {
-                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds endRow ${endRow}`);
+            // headerRow is 0-based; ExcelJS rows are 1-based
+            const headerExcelRow = headerRow + 1;
+            console.log(`[TabularDriver] Sheet "${sheetName}": rowCount=${rowCount}, colCount=${colCount}`);
+            console.log(`[TabularDriver] headerRow=${headerRow} (0-based), excelRow=${headerExcelRow} (1-based)`);
+            if (headerExcelRow > rowCount) {
+                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds rowCount ${rowCount}`);
                 processedSheets++;
                 continue;
             }
-            const headerValues = readRow(headerSheetRow);
-            console.log(`[TabularDriver] Raw header values at sheet row ${headerSheetRow}:`, headerValues);
+            // Read header row
+            const headerRowObj = worksheet.getRow(headerExcelRow);
+            const headerValues = this._excelRowToArray(headerRowObj, colCount);
+            console.log(`[TabularDriver] Raw header values at row ${headerRow}:`, headerValues);
             const headers = headerValues.map((h, i) => {
                 if (h === null || h === undefined || String(h).trim() === '') {
                     return `__EMPTY${i > 0 ? '_' + i : ''}`;
@@ -622,25 +586,34 @@ export class TabularDriver {
             console.log(`[TabularDriver] Headers (${validHeaders.length} valid / ${headers.length} total):`, headers);
             if (validHeaders.length === 0) {
                 console.warn(`[TabularDriver] No valid headers found at row ${headerRow} in sheet "${sheetName}"`);
-                for (let debugR = Math.max(startRow, headerSheetRow - 2); debugR <= Math.min(endRow, headerSheetRow + 2); debugR++) {
-                    console.log(`[TabularDriver]   row ${debugR}:`, readRow(debugR));
+                // Debug surrounding rows
+                for (let debugR = Math.max(1, headerExcelRow - 2); debugR <= Math.min(rowCount, headerExcelRow + 2); debugR++) {
+                    const debugRow = worksheet.getRow(debugR);
+                    console.log(`[TabularDriver]   row ${debugR - 1}:`, this._excelRowToArray(debugRow, colCount));
                 }
                 processedSheets++;
                 continue;
             }
+            // Build data rows: everything after the header row
             const rows = [];
-            for (let r = headerSheetRow + 1; r <= endRow; r++) {
-                const rowData = readRow(r);
-                const hasContent = rowData.some(cell => cell !== null && cell !== undefined && String(cell).trim() !== '');
+            const maxDataRow = Math.min(rowCount, headerExcelRow + maxSheetSize);
+            for (let r = headerExcelRow + 1; r <= maxDataRow; r++) {
+                const row = worksheet.getRow(r);
+                const rowData = this._excelRowToArray(row, colCount);
+                // Skip completely empty rows
+                const hasContent = rowData.some((cell) => cell !== null && cell !== undefined && String(cell).trim() !== '');
                 if (!hasContent)
                     continue;
-                const row = {};
+                const rowObj = {};
                 for (let j = 0; j < headers.length; j++) {
-                    row[headers[j]] = rowData[j];
+                    rowObj[headers[j]] = rowData[j];
                 }
-                rows.push(row);
+                rows.push(rowObj);
             }
             console.log(`[TabularDriver] Built ${rows.length} data rows for sheet "${sheetName}"`);
+            if (rows.length > 0) {
+                console.log(`[TabularDriver] First row:`, rows[0]);
+            }
             if (rows.length > 0) {
                 sheets[sheetName] = new DataFrame(rows);
             }
@@ -654,6 +627,41 @@ export class TabularDriver {
             onProgress(file.size, file.size);
         return sheets;
     }
+    /**
+     * Extract cell values from an ExcelJS row into a plain array.
+     * ExcelJS row.values is 1-based (index 0 is undefined), so we normalize.
+     */
+    _excelRowToArray(row, colCount) {
+        const values = [];
+        for (let c = 1; c <= colCount; c++) {
+            const cell = row.getCell(c);
+            if (!cell || cell.value === null || cell.value === undefined) {
+                values.push(null);
+            }
+            else if (cell.type === 8 /* FormulaType */ && cell.result !== undefined) {
+                values.push(cell.result);
+            }
+            else if (typeof cell.value === 'object' && cell.value !== null) {
+                // Handle rich text, hyperlinks, etc.
+                if (cell.value.richText) {
+                    values.push(cell.value.richText.map((rt) => rt.text).join(''));
+                }
+                else if (cell.value.text) {
+                    values.push(cell.value.text);
+                }
+                else if (cell.value.hyperlink) {
+                    values.push(cell.value.text || cell.value.hyperlink);
+                }
+                else {
+                    values.push(String(cell.value));
+                }
+            }
+            else {
+                values.push(cell.value);
+            }
+        }
+        return values;
+    }
     /* ═══════════════════════════════════════════════════
      * INTERNAL PARSING HELPERS
      * ═══════════════════════════════════════════════════ */

package/lib/storage/TabularDriver.ts

@@ -293,22 +293,21 @@ export class TabularDriver {
     }
 
     /* ═══════════════════════════════════════════════════
-     * XLSX / XLS PARSING
+     * XLSX / XLS PARSING (ExcelJS)
      * ═══════════════════════════════════════════════════ */
 
     /**
-     * Parse an XLSX/XLS file into a DataFrame using SheetJS
+     * Parse an XLSX/XLS file into a DataFrame using ExcelJS
      */
     private async _parseXLSX(file: File, options: ParseOptions = {}): Promise<DataFrame> {
         const { maxRows, skipRows = 0, columns: selectCols, sheet, onProgress, hasHeader = true } = options;
 
-        // Dynamic import — fails gracefully if xlsx not installed
-        let XLSX: any;
+        let ExcelJS: any;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         } catch {
             throw new Error(
-                'XLSX support requires the "xlsx" package. Install it with: npm install xlsx'
+                'XLSX support requires the "exceljs" package. Install it with: npm install exceljs'
             );
         }
 
@@ -318,72 +317,80 @@ export class TabularDriver {
 
         if (onProgress) onProgress(file.size * 0.5, file.size);
 
-        const workbook = XLSX.read(buffer, { type: 'array' });
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
 
         // Select sheet
-        let sheetName: string;
+        let worksheet: any;
         if (typeof sheet === 'number') {
-            sheetName = workbook.SheetNames[sheet] || workbook.SheetNames[0];
+            worksheet = workbook.worksheets[sheet] || workbook.worksheets[0];
         } else if (typeof sheet === 'string') {
-            sheetName = sheet;
+            worksheet = workbook.getWorksheet(sheet) || workbook.worksheets[0];
         } else {
-            sheetName = workbook.SheetNames[0];
+            worksheet = workbook.worksheets[0];
         }
 
-        const worksheet = workbook.Sheets[sheetName];
         if (!worksheet) {
-            throw new Error(`Sheet "${sheetName}" not found. Available: ${workbook.SheetNames.join(', ')}`);
+            const names = workbook.worksheets.map((ws: any) => ws.name).join(', ');
+            throw new Error(`No worksheet found. Available: ${names}`);
         }
 
-        // Convert to JSON rows
-        const jsonRows: Record<string, any>[] = XLSX.utils.sheet_to_json(worksheet, {
-            header: hasHeader ? undefined : 1,
-            defval: null,
-            raw: true
-        });
+        if (onProgress) onProgress(file.size * 0.7, file.size);
 
-        if (onProgress) onProgress(file.size * 0.8, file.size);
+        // Read all rows
+        const allRows: Record<string, any>[] = [];
+        let headers: string[] | null = null;
 
-        // Apply skipRows and maxRows
-        let rows = jsonRows;
-        if (skipRows > 0) {
-            rows = rows.slice(skipRows);
-        }
-        if (maxRows !== undefined) {
-            rows = rows.slice(0, maxRows);
-        }
+        worksheet.eachRow({ includeEmpty: false }, (row: any, rowNumber: number) => {
+            const values = this._excelRowToArray(row, worksheet.columnCount);
+
+            if (!headers && hasHeader) {
+                headers = values.map((v: any, i: number) => {
+                    if (v === null || v === undefined || String(v).trim() === '') return `col_${i}`;
+                    return String(v).trim();
+                });
+                return;
+            }
 
-        // Auto-type values
-        rows = rows.map(row => {
-            const typed: Record<string, any> = {};
-            for (const [key, value] of Object.entries(row)) {
-                typed[key] = this._autoType(value === null || value === undefined ? '' : String(value));
+            if (!headers) {
+                headers = values.map((_: any, i: number) => `col_${i}`);
             }
-            return typed;
+
+            const rowObj: Record<string, any> = {};
+            headers.forEach((h, j) => {
+                rowObj[h] = this._autoType(values[j] === null || values[j] === undefined ? '' : String(values[j]));
+            });
+            allRows.push(rowObj);
         });
 
+        if (onProgress) onProgress(file.size * 0.9, file.size);
+
+        let rows = allRows;
+        if (skipRows > 0) rows = rows.slice(skipRows);
+        if (maxRows !== undefined) rows = rows.slice(0, maxRows);
+
         if (onProgress) onProgress(file.size, file.size);
 
         let df = new DataFrame(rows);
         if (selectCols) df = df.select(...selectCols);
-
         return df;
     }
 
     /**
-     * Get sheet names from an XLSX file (useful for UI)
+     * Get sheet names from an XLSX file
      */
     async getSheetNames(file: File): Promise<string[]> {
-        let XLSX: any;
+        let ExcelJS: any;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         } catch {
-            throw new Error('XLSX support requires the "xlsx" package. Install it with: npm install xlsx');
+            throw new Error('XLSX support requires the "exceljs" package. Install it with: npm install exceljs');
         }
 
         const buffer = await file.arrayBuffer();
-        const workbook = XLSX.read(buffer, { type: 'array' });
-        return workbook.SheetNames;
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
+        return workbook.worksheets.map((ws: any) => ws.name);
     }
 
     /* ═══════════════════════════════════════════════════
@@ -608,66 +615,59 @@ export class TabularDriver {
 
     /**
      * Read raw cell values from first sheet of an Excel file.
-     * Returns rows with their actual sheet row indices.
+     * Returns rows with their 0-based row indices.
      * Used by both the preview UI and the parser to ensure consistency.
      */
     async readRawExcelRows(file: File, maxRows: number = 15): Promise<{ sheetRow: number; values: any[] }[]> {
-        let XLSX: any;
+        let ExcelJS: any;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         } catch {
-            throw new Error('XLSX support requires the "xlsx" package.');
+            throw new Error('XLSX support requires the "exceljs" package.');
         }
 
         const buffer = await file.arrayBuffer();
-        const workbook = XLSX.read(buffer, {
-            type: 'array',
-            sheetRows: maxRows + 5,
-            dense: false
-        });
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
 
-        const sheetName = workbook.SheetNames[0];
-        const worksheet = workbook.Sheets[sheetName];
-        const ref = worksheet['!ref'];
-        if (!ref) return [];
-
-        const range = XLSX.utils.decode_range(ref);
-        const startRow = range.s.r;
-        const endRow = Math.min(range.e.r, startRow + maxRows - 1);
-        const startCol = range.s.c;
-        const endCol = range.e.c;
-
-        console.log(`[readRawExcelRows] ref=${ref}, startRow=${startRow}, endRow=${endRow}, cols=${startCol}-${endCol}`);
+        const worksheet = workbook.worksheets[0];
+        if (!worksheet) return [];
 
+        const colCount = worksheet.columnCount;
         const rows: { sheetRow: number; values: any[] }[] = [];
-        for (let r = startRow; r <= endRow; r++) {
-            const values: any[] = [];
-            for (let c = startCol; c <= endCol; c++) {
-                const addr = XLSX.utils.encode_cell({ r, c });
-                const cell = worksheet[addr];
-                if (!cell) { values.push(null); continue; }
-                if (cell.w !== undefined) { values.push(cell.w); continue; }
-                if (cell.v !== undefined) { values.push(cell.v); continue; }
-                values.push(null);
-            }
-            rows.push({ sheetRow: r, values });
+        let count = 0;
+
+        // ExcelJS eachRow gives 1-based rowNumber; we expose 0-based to the UI
+        // But we need to also show truly empty rows, so iterate by index
+        const totalRows = Math.min(worksheet.rowCount, maxRows);
+
+        for (let r = 1; r <= totalRows; r++) {
+            const row = worksheet.getRow(r);
+            const values = this._excelRowToArray(row, colCount);
+            // sheetRow is 0-based (r-1) to match what we pass back to streamFileMultiSheet
+            rows.push({ sheetRow: r - 1, values });
+            count++;
+            if (count >= maxRows) break;
         }
 
+        console.log(`[readRawExcelRows] ${rows.length} rows, colCount=${colCount}`);
+        rows.forEach(r => console.log(`  sheetRow ${r.sheetRow}:`, r.values.slice(0, 5)));
+
         return rows;
     }
 
     /**
-     * ✅ FIXED: Stream Excel file with optional headerRow override
-     * headerRow is the absolute sheet row index (same as sheetRow from readRawExcelRows).
+     * Stream Excel file with optional headerRow override.
+     * headerRow is 0-based (same as sheetRow from readRawExcelRows).
      */
     async streamFileMultiSheet(file: File, options: ParseOptions = {}): Promise<Record<string, DataFrame>> {
-        const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow = 0 } = options;
+        const { maxSheetSize = 100000, onProgress, headerRow = 0 } = options;
 
-        let XLSX: any;
+        let ExcelJS: any;
         try {
-            XLSX = await import('xlsx');
+            ExcelJS = await import('exceljs');
         } catch {
-            throw new Error('XLSX support requires the "xlsx" package. Install it with: npm install xlsx');
+            throw new Error('XLSX support requires the "exceljs" package. Install it with: npm install exceljs');
         }
 
         if (onProgress) onProgress(0, file.size);
@@ -676,68 +676,39 @@ export class TabularDriver {
 
         if (onProgress) onProgress(file.size * 0.3, file.size);
 
-        const workbook = XLSX.read(buffer, {
-            type: 'array',
-            sheetRows: maxSheetSize,
-            dense: false
-        });
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.load(buffer);
 
         const sheets: Record<string, DataFrame> = {};
-        const totalSheets = workbook.SheetNames.length;
+        const totalSheets = workbook.worksheets.length;
         let processedSheets = 0;
 
-        for (const sheetName of workbook.SheetNames) {
-            const worksheet = workbook.Sheets[sheetName];
-
-            const ref = worksheet['!ref'];
-            if (!ref) {
-                processedSheets++;
-                continue;
-            }
-
-            const range = XLSX.utils.decode_range(ref);
-            const startRow = range.s.r;
-            const endRow = range.e.r;
-            const startCol = range.s.c;
-            const endCol = range.e.c;
+        for (const worksheet of workbook.worksheets) {
+            const sheetName = worksheet.name;
+            const colCount = worksheet.columnCount;
+            const rowCount = worksheet.rowCount;
 
-            if (endRow < startRow) {
+            if (rowCount === 0 || colCount === 0) {
                 processedSheets++;
                 continue;
             }
 
-            const readCellValue = (r: number, c: number): any => {
-                const addr = XLSX.utils.encode_cell({ r, c });
-                const cell = worksheet[addr];
-                if (!cell) return null;
-                if (cell.w !== undefined) return cell.w;
-                if (cell.v !== undefined) return cell.v;
-                return null;
-            };
-
-            const readRow = (r: number): any[] => {
-                const vals: any[] = [];
-                for (let c = startCol; c <= endCol; c++) {
-                    vals.push(readCellValue(r, c));
-                }
-                return vals;
-            };
-
-            // headerRow is the absolute sheet row index — same value as
-            // sheetRow from readRawExcelRows(). No offset needed.
-            const headerSheetRow = headerRow;
+            // headerRow is 0-based; ExcelJS rows are 1-based
+            const headerExcelRow = headerRow + 1;
 
-            console.log(`[TabularDriver] Sheet "${sheetName}": range=${ref}, startRow=${startRow}, endRow=${endRow}`);
-            console.log(`[TabularDriver] headerRow=${headerRow}, headerSheetRow=${headerSheetRow}`);
+            console.log(`[TabularDriver] Sheet "${sheetName}": rowCount=${rowCount}, colCount=${colCount}`);
+            console.log(`[TabularDriver] headerRow=${headerRow} (0-based), excelRow=${headerExcelRow} (1-based)`);
 
-            if (headerSheetRow > endRow) {
-                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds endRow ${endRow}`);
+            if (headerExcelRow > rowCount) {
+                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds rowCount ${rowCount}`);
                 processedSheets++;
                 continue;
             }
 
-            const headerValues = readRow(headerSheetRow);
-            console.log(`[TabularDriver] Raw header values at sheet row ${headerSheetRow}:`, headerValues);
+            // Read header row
+            const headerRowObj = worksheet.getRow(headerExcelRow);
+            const headerValues = this._excelRowToArray(headerRowObj, colCount);
+            console.log(`[TabularDriver] Raw header values at row ${headerRow}:`, headerValues);
 
             const headers: string[] = headerValues.map((h: any, i: number) => {
                 if (h === null || h === undefined || String(h).trim() === '') {
@@ -751,30 +722,40 @@ export class TabularDriver {
 
             if (validHeaders.length === 0) {
                 console.warn(`[TabularDriver] No valid headers found at row ${headerRow} in sheet "${sheetName}"`);
-                for (let debugR = Math.max(startRow, headerSheetRow - 2); debugR <= Math.min(endRow, headerSheetRow + 2); debugR++) {
-                    console.log(`[TabularDriver]   row ${debugR}:`, readRow(debugR));
+                // Debug surrounding rows
+                for (let debugR = Math.max(1, headerExcelRow - 2); debugR <= Math.min(rowCount, headerExcelRow + 2); debugR++) {
+                    const debugRow = worksheet.getRow(debugR);
+                    console.log(`[TabularDriver]   row ${debugR - 1}:`, this._excelRowToArray(debugRow, colCount));
                 }
                 processedSheets++;
                 continue;
             }
 
+            // Build data rows: everything after the header row
             const rows: Record<string, any>[] = [];
-            for (let r = headerSheetRow + 1; r <= endRow; r++) {
-                const rowData = readRow(r);
+            const maxDataRow = Math.min(rowCount, headerExcelRow + maxSheetSize);
+
+            for (let r = headerExcelRow + 1; r <= maxDataRow; r++) {
+                const row = worksheet.getRow(r);
+                const rowData = this._excelRowToArray(row, colCount);
 
-                const hasContent = rowData.some(cell =>
+                // Skip completely empty rows
+                const hasContent = rowData.some((cell: any) =>
                     cell !== null && cell !== undefined && String(cell).trim() !== ''
                 );
                 if (!hasContent) continue;
 
-                const row: Record<string, any> = {};
+                const rowObj: Record<string, any> = {};
                 for (let j = 0; j < headers.length; j++) {
-                    row[headers[j]] = rowData[j];
+                    rowObj[headers[j]] = rowData[j];
                 }
-                rows.push(row);
+                rows.push(rowObj);
             }
 
             console.log(`[TabularDriver] Built ${rows.length} data rows for sheet "${sheetName}"`);
+            if (rows.length > 0) {
+                console.log(`[TabularDriver] First row:`, rows[0]);
+            }
 
             if (rows.length > 0) {
                 sheets[sheetName] = new DataFrame(rows);
@@ -792,6 +773,36 @@ export class TabularDriver {
         return sheets;
     }
 
+    /**
+     * Extract cell values from an ExcelJS row into a plain array.
+     * ExcelJS row.values is 1-based (index 0 is undefined), so we normalize.
+     */
+    private _excelRowToArray(row: any, colCount: number): any[] {
+        const values: any[] = [];
+        for (let c = 1; c <= colCount; c++) {
+            const cell = row.getCell(c);
+            if (!cell || cell.value === null || cell.value === undefined) {
+                values.push(null);
+            } else if (cell.type === 8 /* FormulaType */ && cell.result !== undefined) {
+                values.push(cell.result);
+            } else if (typeof cell.value === 'object' && cell.value !== null) {
+                // Handle rich text, hyperlinks, etc.
+                if (cell.value.richText) {
+                    values.push(cell.value.richText.map((rt: any) => rt.text).join(''));
+                } else if (cell.value.text) {
+                    values.push(cell.value.text);
+                } else if (cell.value.hyperlink) {
+                    values.push(cell.value.text || cell.value.hyperlink);
+                } else {
+                    values.push(String(cell.value));
+                }
+            } else {
+                values.push(cell.value);
+            }
+        }
+        return values;
+    }
+
     /* ═══════════════════════════════════════════════════
      * INTERNAL PARSING HELPERS
      * ═══════════════════════════════════════════════════ */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.1.207",
+  "version": "1.1.208",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "index.js",
@@ -58,9 +58,9 @@
     "axios": "^1.6.0",
     "chart.js": "^4.5.1",
     "esbuild": "^0.19.0",
+    "exceljs": "^4.4.0",
     "express": "^4.18.2",
-    "ws": "^8.13.0",
-    "xlsx": "^0.18.5"
+    "ws": "^8.13.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",