juxscript 1.1.200 → 1.1.202

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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,WAAW,WAAW;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,GAAG,CAA4B;gBAE3B,MAAM,GAAE,MAAsB,EAAE,SAAS,GAAE,MAAiB;IAKlE,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IA4BlC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAgCxB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAwBxB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,SAAS;IA6D7D;;;OAGG;IACG,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;IAoG5E;;OAEG;YACW,UAAU;IAuExB;;OAEG;IACG,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAiBlD;;OAEG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBzF;;OAEG;IACG,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAwBjD;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA4BzD;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAqBlH;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB5B;;OAEG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;IA0ExE;;;OAGG;IACG,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAmItG,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,UAAU;IAmClB,OAAO,CAAC,SAAS;IAYjB,KAAK,IAAI,IAAI;CAMhB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,aAAa,CAEhF"}

package/lib/storage/TabularDriver.js

@@ -520,59 +520,67 @@ export class TabularDriver {
                 continue;
             }
             const range = XLSX.utils.decode_range(ref);
-            const totalRows = range.e.r - range.s.r + 1;
-            if (totalRows === 0) {
+            const startRow = range.s.r; // first row index
+            const endRow = range.e.r; // last row index
+            const startCol = range.s.c; // first col index
+            const endCol = range.e.c; // last col index
+            const numCols = endCol - startCol + 1;
+            if (endRow < startRow) {
                 processedSheets++;
                 continue;
             }
-            // Always get raw data as array of arrays (no header interpretation)
-            const rawData = XLSX.utils.sheet_to_json(worksheet, {
-                header: 1, // Return array of arrays
-                defval: null,
-                raw: false,
-                blankrows: true // Keep blank rows to preserve row indices
-            });
-            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}, using 0`);
+            // Helper: read a single cell value from the worksheet
+            const getCellValue = (r, c) => {
+                const cellAddress = XLSX.utils.encode_cell({ r, c });
+                const cell = worksheet[cellAddress];
+                if (!cell)
+                    return null;
+                // Use formatted value (v = raw, w = formatted text)
+                return cell.v !== undefined ? cell.v : null;
+            };
+            // Helper: read an entire row as an array
+            const readRow = (r) => {
+                const vals = [];
+                for (let c = startCol; c <= endCol; c++) {
+                    vals.push(getCellValue(r, c));
+                }
+                return vals;
+            };
+            // The actual row in the sheet for the header
+            const headerSheetRow = startRow + headerRow;
+            if (headerSheetRow > endRow) {
+                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds sheet range (max row: ${endRow - startRow})`);
                 processedSheets++;
                 continue;
             }
-            // Extract headers from the specified row (0-based index)
-            const headerRowData = rawData[headerRow] || [];
-            const headers = headerRowData.map((h, i) => {
+            // Read header row values directly from cells
+            const headerValues = readRow(headerSheetRow);
+            // Build headers array
+            const headers = headerValues.map((h, i) => {
                 if (h === null || h === undefined || String(h).trim() === '') {
                     return `__EMPTY${i > 0 ? '_' + i : ''}`;
                 }
                 return String(h).trim();
             });
             // Ensure we have at least one valid header
-            if (headers.length === 0 || headers.every((h) => h.startsWith('__EMPTY'))) {
-                console.warn(`[TabularDriver] No valid headers found at row ${headerRow}`);
+            const validHeaders = headers.filter(h => !h.startsWith('__EMPTY'));
+            if (validHeaders.length === 0) {
+                console.warn(`[TabularDriver] No valid headers found at row ${headerRow} in sheet "${sheetName}"`);
                 processedSheets++;
                 continue;
             }
-            // Build rows from data AFTER the header row
+            // Build data rows: everything after the header row
             const rows = [];
-            for (let i = headerRow + 1; i < rawData.length; i++) {
-                const rowData = rawData[i];
+            for (let r = headerSheetRow + 1; r <= endRow; r++) {
+                const rowData = readRow(r);
                 // 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) {
+                const hasContent = rowData.some(cell => cell !== null && cell !== undefined && String(cell).trim() !== '');
+                if (!hasContent)
                     continue;
-                }
                 const row = {};
-                headers.forEach((header, j) => {
-                    row[header] = rowData[j] !== undefined ? rowData[j] : null;
-                });
+                for (let j = 0; j < headers.length; j++) {
+                    row[headers[j]] = rowData[j] !== undefined ? rowData[j] : null;
+                }
                 rows.push(row);
             }
             if (rows.length > 0) {

package/lib/storage/TabularDriver.ts

@@ -646,36 +646,49 @@ export class TabularDriver {
             }
 
             const range = XLSX.utils.decode_range(ref);
-            const totalRows = range.e.r - range.s.r + 1;
+            const startRow = range.s.r; // first row index
+            const endRow = range.e.r;   // last row index
+            const startCol = range.s.c; // first col index
+            const endCol = range.e.c;   // last col index
+            const numCols = endCol - startCol + 1;
 
-            if (totalRows === 0) {
+            if (endRow < startRow) {
                 processedSheets++;
                 continue;
             }
 
-            // Always get raw data as array of arrays (no header interpretation)
-            const rawData: any[][] = XLSX.utils.sheet_to_json(worksheet, {
-                header: 1,  // Return array of arrays
-                defval: null,
-                raw: false,
-                blankrows: true  // Keep blank rows to preserve row indices
-            });
+            // Helper: read a single cell value from the worksheet
+            const getCellValue = (r: number, c: number): any => {
+                const cellAddress = XLSX.utils.encode_cell({ r, c });
+                const cell = worksheet[cellAddress];
+                if (!cell) return null;
+                // Use formatted value (v = raw, w = formatted text)
+                return cell.v !== undefined ? cell.v : null;
+            };
 
-            if (rawData.length === 0) {
-                processedSheets++;
-                continue;
-            }
+            // Helper: read an entire row as an array
+            const readRow = (r: number): any[] => {
+                const vals: any[] = [];
+                for (let c = startCol; c <= endCol; c++) {
+                    vals.push(getCellValue(r, c));
+                }
+                return vals;
+            };
+
+            // The actual row in the sheet for the header
+            const headerSheetRow = startRow + headerRow;
 
-            // Validate headerRow is within bounds
-            if (headerRow >= rawData.length) {
-                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds data length ${rawData.length}, using 0`);
+            if (headerSheetRow > endRow) {
+                console.warn(`[TabularDriver] headerRow ${headerRow} exceeds sheet range (max row: ${endRow - startRow})`);
                 processedSheets++;
                 continue;
             }
 
-            // Extract headers from the specified row (0-based index)
-            const headerRowData = rawData[headerRow] || [];
-            const headers = headerRowData.map((h: any, i: number) => {
+            // Read header row values directly from cells
+            const headerValues = readRow(headerSheetRow);
+
+            // Build headers array
+            const headers: string[] = headerValues.map((h: any, i: number) => {
                 if (h === null || h === undefined || String(h).trim() === '') {
                     return `__EMPTY${i > 0 ? '_' + i : ''}`;
                 }
@@ -683,34 +696,28 @@ export class TabularDriver {
             });
 
             // Ensure we have at least one valid header
-            if (headers.length === 0 || headers.every((h: string) => h.startsWith('__EMPTY'))) {
-                console.warn(`[TabularDriver] No valid headers found at row ${headerRow}`);
+            const validHeaders = headers.filter(h => !h.startsWith('__EMPTY'));
+            if (validHeaders.length === 0) {
+                console.warn(`[TabularDriver] No valid headers found at row ${headerRow} in sheet "${sheetName}"`);
                 processedSheets++;
                 continue;
             }
 
-            // Build rows from data AFTER the header row
+            // Build data rows: everything after the header row
             const rows: Record<string, any>[] = [];
-            for (let i = headerRow + 1; i < rawData.length; i++) {
-                const rowData = rawData[i];
+            for (let r = headerSheetRow + 1; r <= endRow; r++) {
+                const rowData = readRow(r);
 
                 // Skip completely empty rows
-                if (!rowData || rowData.length === 0) {
-                    continue;
-                }
-
-                // Skip rows where all cells are null/undefined/empty
-                const hasContent = rowData.some((cell: any) =>
+                const hasContent = rowData.some(cell =>
                     cell !== null && cell !== undefined && String(cell).trim() !== ''
                 );
-                if (!hasContent) {
-                    continue;
-                }
+                if (!hasContent) continue;
 
                 const row: Record<string, any> = {};
-                headers.forEach((header: string, j: number) => {
-                    row[header] = rowData[j] !== undefined ? rowData[j] : null;
-                });
+                for (let j = 0; j < headers.length; j++) {
+                    row[headers[j]] = rowData[j] !== undefined ? rowData[j] : null;
+                }
                 rows.push(row);
             }
 

package/package.json

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