juxscript 1.1.198 → 1.1.199

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

@@ -490,7 +490,7 @@ export class TabularDriver {
      * ✅ UPDATED: Stream Excel file with optional headerRow override
      */
     async streamFileMultiSheet(file, options = {}) {
-        const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow } = options;
+        const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow = 0 } = options;
         let XLSX;
         try {
             XLSX = await import('xlsx');
@@ -524,17 +524,54 @@ export class TabularDriver {
                 processedSheets++;
                 continue;
             }
-            // When headerRow is specified and > 0, we need to:
-            // 1. Tell sheet_to_json to start reading from that row
-            // 2. SheetJS treats the first row of the range as headers
-            const jsonData = XLSX.utils.sheet_to_json(worksheet, {
-                range: (headerRow !== undefined && headerRow > 0) ? headerRow : undefined,
-                defval: null,
-                raw: false,
-                blankrows: false
-            });
-            if (jsonData.length > 0) {
-                sheets[sheetName] = new DataFrame(jsonData);
+            // ✅ 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;
+                }
+                // 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);
+                }
+                if (rows.length > 0) {
+                    sheets[sheetName] = new DataFrame(rows);
+                }
+            }
+            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);
+                }
             }
             processedSheets++;
             if (onProgress) {

package/lib/storage/TabularDriver.ts

@@ -610,7 +610,7 @@ export class TabularDriver {
      * ✅ UPDATED: Stream Excel file with optional headerRow override
      */
     async streamFileMultiSheet(file: File, options: ParseOptions = {}): Promise<Record<string, DataFrame>> {
-        const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow } = options;
+        const { maxSheetSize = 100000, sheetChunkSize = 10000, onProgress, headerRow = 0 } = options;
 
         let XLSX: any;
         try {
@@ -652,18 +652,59 @@ export class TabularDriver {
                 continue;
             }
 
-            // When headerRow is specified and > 0, we need to:
-            // 1. Tell sheet_to_json to start reading from that row
-            // 2. SheetJS treats the first row of the range as headers
-            const jsonData: Record<string, any>[] = XLSX.utils.sheet_to_json(worksheet, {
-                range: (headerRow !== undefined && headerRow > 0) ? headerRow : undefined,
-                defval: null,
-                raw: false,
-                blankrows: false
-            });
+            // ✅ 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
+                });
+
+                if (rawData.length <= headerRow) {
+                    processedSheets++;
+                    continue;
+                }
 
-            if (jsonData.length > 0) {
-                sheets[sheetName] = new DataFrame(jsonData);
+                // 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 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
+                    }
+
+                    const row: Record<string, any> = {};
+                    headers.forEach((header: string, j: number) => {
+                        row[header] = rowData[j] !== undefined ? rowData[j] : null;
+                    });
+                    rows.push(row);
+                }
+
+                if (rows.length > 0) {
+                    sheets[sheetName] = new DataFrame(rows);
+                }
+            } 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);
+                }
             }
 
             processedSheets++;

package/package.json

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