juxscript 1.1.199 → 1.1.201

package/lib/storage/TabularDriver.d.ts

@@ -88,7 +88,8 @@ export declare class TabularDriver {
      */
     fetch(url: string, options?: ParseOptions): Promise<DataFrame>;
     /**
-     * ✅ UPDATED: Stream Excel file with optional headerRow override
+     * ✅ FIXED: Stream Excel file with optional headerRow override
+     * headerRow is 0-based: 0 = first row, 1 = second row, etc.
      */
     streamFileMultiSheet(file: File, options?: ParseOptions): Promise<Record<string, DataFrame>>;
     private _splitLines;

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

@@ -487,7 +487,8 @@ export class TabularDriver {
         return df;
     }
     /**
-     * ✅ UPDATED: Stream Excel file with optional headerRow override
+     * ✅ FIXED: Stream Excel file with optional headerRow override
+     * headerRow is 0-based: 0 = first row, 1 = second row, etc.
      */
     async streamFileMultiSheet(file, options = {}) {
         const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow = 0 } = options;
@@ -520,58 +521,78 @@ export class TabularDriver {
             }
             const range = XLSX.utils.decode_range(ref);
             const totalRows = range.e.r - range.s.r + 1;
+            const totalCols = range.e.c - range.s.c + 1;
             if (totalRows === 0) {
                 processedSheets++;
                 continue;
             }
-            // ✅ FIX: Use sheet_to_json with header option to get raw arrays first
-            // Then manually construct the DataFrame with the correct header row
-            if (headerRow > 0) {
-                // Get all data as raw arrays (no header interpretation)
-                const rawData = XLSX.utils.sheet_to_json(worksheet, {
-                    header: 1, // Return array of arrays
-                    defval: null,
-                    raw: false,
-                    blankrows: false
-                });
-                if (rawData.length <= headerRow) {
-                    processedSheets++;
-                    continue;
+            // Get all data as raw arrays (header: 1 returns array of arrays)
+            const rawData = XLSX.utils.sheet_to_json(worksheet, {
+                header: 1,
+                defval: null,
+                raw: false,
+                blankrows: true
+            });
+            if (rawData.length === 0) {
+                processedSheets++;
+                continue;
+            }
+            // Validate headerRow is within bounds
+            if (headerRow >= rawData.length) {
+                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds data length ${rawData.length}`);
+                processedSheets++;
+                continue;
+            }
+            // Get the header row data - ensure we have all columns
+            const headerRowData = rawData[headerRow] || [];
+            // Determine the maximum number of columns across all rows
+            let maxCols = totalCols;
+            for (let i = headerRow; i < Math.min(rawData.length, headerRow + 100); i++) {
+                if (rawData[i] && rawData[i].length > maxCols) {
+                    maxCols = rawData[i].length;
                 }
-                // Extract headers from the specified row
-                const headers = rawData[headerRow].map((h, i) => {
-                    if (h === null || h === undefined || String(h).trim() === '') {
-                        return `__EMPTY${i > 0 ? '_' + i : ''}`;
-                    }
-                    return String(h);
-                });
-                // Build rows from data after header row
-                const rows = [];
-                for (let i = headerRow + 1; i < rawData.length; i++) {
-                    const rowData = rawData[i];
-                    if (!rowData || rowData.every((cell) => cell === null || cell === undefined)) {
-                        continue; // Skip empty rows
-                    }
-                    const row = {};
-                    headers.forEach((header, j) => {
-                        row[header] = rowData[j] !== undefined ? rowData[j] : null;
-                    });
-                    rows.push(row);
+            }
+            // Build headers array with proper length
+            const headers = [];
+            for (let j = 0; j < maxCols; j++) {
+                const h = headerRowData[j];
+                if (h === null || h === undefined || String(h).trim() === '') {
+                    headers.push(`__EMPTY${j > 0 ? '_' + j : ''}`);
                 }
-                if (rows.length > 0) {
-                    sheets[sheetName] = new DataFrame(rows);
+                else {
+                    headers.push(String(h).trim());
                 }
             }
-            else {
-                // Default behavior: first row is header
-                const jsonData = XLSX.utils.sheet_to_json(worksheet, {
-                    defval: null,
-                    raw: false,
-                    blankrows: false
-                });
-                if (jsonData.length > 0) {
-                    sheets[sheetName] = new DataFrame(jsonData);
+            // Ensure we have at least one valid header
+            const validHeaders = headers.filter(h => !h.startsWith('__EMPTY'));
+            if (validHeaders.length === 0) {
+                console.warn(`[TabularDriver] No valid headers found at row ${headerRow}`);
+                processedSheets++;
+                continue;
+            }
+            // Build rows from data AFTER the header row
+            const rows = [];
+            for (let i = headerRow + 1; i < rawData.length; i++) {
+                const rowData = rawData[i];
+                // Skip completely empty rows
+                if (!rowData || rowData.length === 0) {
+                    continue;
                 }
+                // Skip rows where all cells are null/undefined/empty
+                const hasContent = rowData.some((cell) => cell !== null && cell !== undefined && String(cell).trim() !== '');
+                if (!hasContent) {
+                    continue;
+                }
+                const row = {};
+                for (let j = 0; j < headers.length; j++) {
+                    const header = headers[j];
+                    const cellValue = j < rowData.length ? rowData[j] : null;
+                    row[header] = cellValue;
+                }
+                rows.push(row);
+            }
+            if (rows.length > 0) {
+                sheets[sheetName] = new DataFrame(rows);
             }
             processedSheets++;
             if (onProgress) {

package/lib/storage/TabularDriver.ts

@@ -607,7 +607,8 @@ export class TabularDriver {
     }
 
     /**
-     * ✅ UPDATED: Stream Excel file with optional headerRow override
+     * ✅ FIXED: Stream Excel file with optional headerRow override
+     * headerRow is 0-based: 0 = first row, 1 = second row, etc.
      */
     async streamFileMultiSheet(file: File, options: ParseOptions = {}): Promise<Record<string, DataFrame>> {
         const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow = 0 } = options;
@@ -646,65 +647,92 @@ export class TabularDriver {
 
             const range = XLSX.utils.decode_range(ref);
             const totalRows = range.e.r - range.s.r + 1;
+            const totalCols = range.e.c - range.s.c + 1;
 
             if (totalRows === 0) {
                 processedSheets++;
                 continue;
             }
 
-            // ✅ FIX: Use sheet_to_json with header option to get raw arrays first
-            // Then manually construct the DataFrame with the correct header row
-            if (headerRow > 0) {
-                // Get all data as raw arrays (no header interpretation)
-                const rawData: any[][] = XLSX.utils.sheet_to_json(worksheet, {
-                    header: 1,  // Return array of arrays
-                    defval: null,
-                    raw: false,
-                    blankrows: false
-                });
+            // Get all data as raw arrays (header: 1 returns array of arrays)
+            const rawData: any[][] = XLSX.utils.sheet_to_json(worksheet, {
+                header: 1,
+                defval: null,
+                raw: false,
+                blankrows: true
+            });
 
-                if (rawData.length <= headerRow) {
-                    processedSheets++;
-                    continue;
+            if (rawData.length === 0) {
+                processedSheets++;
+                continue;
+            }
+
+            // Validate headerRow is within bounds
+            if (headerRow >= rawData.length) {
+                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds data length ${rawData.length}`);
+                processedSheets++;
+                continue;
+            }
+
+            // Get the header row data - ensure we have all columns
+            const headerRowData = rawData[headerRow] || [];
+
+            // Determine the maximum number of columns across all rows
+            let maxCols = totalCols;
+            for (let i = headerRow; i < Math.min(rawData.length, headerRow + 100); i++) {
+                if (rawData[i] && rawData[i].length > maxCols) {
+                    maxCols = rawData[i].length;
                 }
+            }
 
-                // Extract headers from the specified row
-                const headers = rawData[headerRow].map((h: any, i: number) => {
-                    if (h === null || h === undefined || String(h).trim() === '') {
-                        return `__EMPTY${i > 0 ? '_' + i : ''}`;
-                    }
-                    return String(h);
-                });
+            // Build headers array with proper length
+            const headers: string[] = [];
+            for (let j = 0; j < maxCols; j++) {
+                const h = headerRowData[j];
+                if (h === null || h === undefined || String(h).trim() === '') {
+                    headers.push(`__EMPTY${j > 0 ? '_' + j : ''}`);
+                } else {
+                    headers.push(String(h).trim());
+                }
+            }
 
-                // Build rows from data after header row
-                const rows: Record<string, any>[] = [];
-                for (let i = headerRow + 1; i < rawData.length; i++) {
-                    const rowData = rawData[i];
-                    if (!rowData || rowData.every((cell: any) => cell === null || cell === undefined)) {
-                        continue; // Skip empty rows
-                    }
+            // Ensure we have at least one valid header
+            const validHeaders = headers.filter(h => !h.startsWith('__EMPTY'));
+            if (validHeaders.length === 0) {
+                console.warn(`[TabularDriver] No valid headers found at row ${headerRow}`);
+                processedSheets++;
+                continue;
+            }
 
-                    const row: Record<string, any> = {};
-                    headers.forEach((header: string, j: number) => {
-                        row[header] = rowData[j] !== undefined ? rowData[j] : null;
-                    });
-                    rows.push(row);
+            // Build rows from data AFTER the header row
+            const rows: Record<string, any>[] = [];
+            for (let i = headerRow + 1; i < rawData.length; i++) {
+                const rowData = rawData[i];
+
+                // Skip completely empty rows
+                if (!rowData || rowData.length === 0) {
+                    continue;
                 }
 
-                if (rows.length > 0) {
-                    sheets[sheetName] = new DataFrame(rows);
+                // Skip rows where all cells are null/undefined/empty
+                const hasContent = rowData.some((cell: any) =>
+                    cell !== null && cell !== undefined && String(cell).trim() !== ''
+                );
+                if (!hasContent) {
+                    continue;
                 }
-            } else {
-                // Default behavior: first row is header
-                const jsonData: Record<string, any>[] = XLSX.utils.sheet_to_json(worksheet, {
-                    defval: null,
-                    raw: false,
-                    blankrows: false
-                });
 
-                if (jsonData.length > 0) {
-                    sheets[sheetName] = new DataFrame(jsonData);
+                const row: Record<string, any> = {};
+                for (let j = 0; j < headers.length; j++) {
+                    const header = headers[j];
+                    const cellValue = j < rowData.length ? rowData[j] : null;
+                    row[header] = cellValue;
                 }
+                rows.push(row);
+            }
+
+            if (rows.length > 0) {
+                sheets[sheetName] = new DataFrame(rows);
             }
 
             processedSheets++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.1.199",
+  "version": "1.1.201",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "index.js",