@cj-tech-master/excelts 1.4.0 → 1.4.1

package/dist/cjs/doc/data-validations.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataValidations = void 0;
+const col_cache_js_1 = require("../utils/col-cache");
 class DataValidations {
     constructor(model) {
         this.model = model || {};
@@ -9,7 +10,34 @@ class DataValidations {
         return (this.model[address] = validation);
     }
     find(address) {
-        return this.model[address];
+        // First check direct address match
+        const direct = this.model[address];
+        if (direct !== undefined) {
+            return direct;
+        }
+        // Check range: prefixed keys in model (from parsing large ranges)
+        // Only decode address if we have range keys to check
+        const keys = Object.keys(this.model);
+        const rangeKeys = keys.filter(k => k.startsWith("range:"));
+        if (rangeKeys.length === 0) {
+            return undefined;
+        }
+        const decoded = col_cache_js_1.colCache.decodeAddress(address);
+        for (const key of rangeKeys) {
+            const rangeStr = key.slice(6); // Remove "range:" prefix
+            const rangeDecoded = col_cache_js_1.colCache.decodeEx(rangeStr);
+            if (rangeDecoded.dimensions) {
+                const tl = rangeDecoded.tl;
+                const br = rangeDecoded.br;
+                if (decoded.row >= tl.row &&
+                    decoded.row <= br.row &&
+                    decoded.col >= tl.col &&
+                    decoded.col <= br.col) {
+                    return this.model[key];
+                }
+            }
+        }
+        return undefined;
     }
     remove(address) {
         this.model[address] = undefined;

package/dist/cjs/xlsx/xform/sheet/data-validations-xform.js

@@ -30,7 +30,32 @@ function optimiseDataValidations(model) {
     if (!model) {
         return [];
     }
-    const dvList = Object.entries(model)
+    // First, handle range: prefixed keys directly (large ranges stored during parsing)
+    const rangeValidations = [];
+    const regularModel = {};
+    for (const [key, value] of Object.entries(model)) {
+        // Skip undefined/null values (removed validations)
+        if (value === undefined || value === null) {
+            continue;
+        }
+        if (key.startsWith("range:")) {
+            // Large range stored during parsing - output directly
+            const rangeStr = key.slice(6); // Remove "range:" prefix
+            const { sqref: _sqref, ...rest } = value;
+            rangeValidations.push({
+                ...rest,
+                sqref: rangeStr
+            });
+        }
+        else {
+            regularModel[key] = value;
+        }
+    }
+    // If no regular entries, just return range validations
+    if (Object.keys(regularModel).length === 0) {
+        return rangeValidations;
+    }
+    const dvList = Object.entries(regularModel)
         .map(([address, dataValidation]) => ({
         address,
         dataValidation,
@@ -41,13 +66,14 @@ function optimiseDataValidations(model) {
     const matchCol = (addr, height, col) => {
         for (let i = 0; i < height; i++) {
             const otherAddress = col_cache_js_1.colCache.encodeAddress(addr.row + i, col);
-            if (!model[otherAddress] || !(0, under_dash_js_1.isEqual)(model[addr.address], model[otherAddress])) {
+            if (!regularModel[otherAddress] ||
+                !(0, under_dash_js_1.isEqual)(regularModel[addr.address], regularModel[otherAddress])) {
                 return false;
             }
         }
         return true;
     };
-    return dvList
+    const optimized = dvList
         .map(dv => {
         if (!dv.marked) {
             const addr = col_cache_js_1.colCache.decodeEx(dv.address);
@@ -61,7 +87,8 @@ function optimiseDataValidations(model) {
             // iterate downwards - finding matching cells
             let height = 1;
             let otherAddress = col_cache_js_1.colCache.encodeAddress(addr.row + height, addr.col);
-            while (model[otherAddress] && (0, under_dash_js_1.isEqual)(dv.dataValidation, model[otherAddress])) {
+            while (regularModel[otherAddress] &&
+                (0, under_dash_js_1.isEqual)(dv.dataValidation, regularModel[otherAddress])) {
                 height++;
                 otherAddress = col_cache_js_1.colCache.encodeAddress(addr.row + height, addr.col);
             }
@@ -93,6 +120,7 @@ function optimiseDataValidations(model) {
         return null;
     })
         .filter(Boolean);
+    return [...rangeValidations, ...optimized];
 }
 class DataValidationsXform extends base_xform_js_1.BaseXform {
     get tag() {
@@ -207,9 +235,20 @@ class DataValidationsXform extends base_xform_js_1.BaseXform {
                 list.forEach((addr) => {
                     if (addr.includes(":")) {
                         const range = new range_js_1.Range(addr);
-                        range.forEachAddress((address) => {
-                            this.model[address] = this._dataValidation;
-                        });
+                        // Only expand small ranges to avoid performance issues with large ranges
+                        // like B2:B1048576 (entire column validations)
+                        const rangeSize = (range.bottom - range.top + 1) * (range.right - range.left + 1);
+                        if (rangeSize <= 1000) {
+                            // Small range: expand to individual cells for backward compatibility
+                            range.forEachAddress((address) => {
+                                this.model[address] = this._dataValidation;
+                            });
+                        }
+                        else {
+                            // Large range: store as range string with special marker
+                            // The key format "range:A1:Z100" allows DataValidations.find() to detect it
+                            this.model[`range:${addr}`] = this._dataValidation;
+                        }
                     }
                     else {
                         this.model[addr] = this._dataValidation;

package/dist/esm/doc/data-validations.js

@@ -1,3 +1,4 @@
+import { colCache } from "../utils/col-cache.js";
 class DataValidations {
     constructor(model) {
         this.model = model || {};
@@ -6,7 +7,34 @@ class DataValidations {
         return (this.model[address] = validation);
     }
     find(address) {
-        return this.model[address];
+        // First check direct address match
+        const direct = this.model[address];
+        if (direct !== undefined) {
+            return direct;
+        }
+        // Check range: prefixed keys in model (from parsing large ranges)
+        // Only decode address if we have range keys to check
+        const keys = Object.keys(this.model);
+        const rangeKeys = keys.filter(k => k.startsWith("range:"));
+        if (rangeKeys.length === 0) {
+            return undefined;
+        }
+        const decoded = colCache.decodeAddress(address);
+        for (const key of rangeKeys) {
+            const rangeStr = key.slice(6); // Remove "range:" prefix
+            const rangeDecoded = colCache.decodeEx(rangeStr);
+            if (rangeDecoded.dimensions) {
+                const tl = rangeDecoded.tl;
+                const br = rangeDecoded.br;
+                if (decoded.row >= tl.row &&
+                    decoded.row <= br.row &&
+                    decoded.col >= tl.col &&
+                    decoded.col <= br.col) {
+                    return this.model[key];
+                }
+            }
+        }
+        return undefined;
     }
     remove(address) {
         this.model[address] = undefined;

package/dist/esm/xlsx/xform/sheet/data-validations-xform.js

@@ -27,7 +27,32 @@ function optimiseDataValidations(model) {
     if (!model) {
         return [];
     }
-    const dvList = Object.entries(model)
+    // First, handle range: prefixed keys directly (large ranges stored during parsing)
+    const rangeValidations = [];
+    const regularModel = {};
+    for (const [key, value] of Object.entries(model)) {
+        // Skip undefined/null values (removed validations)
+        if (value === undefined || value === null) {
+            continue;
+        }
+        if (key.startsWith("range:")) {
+            // Large range stored during parsing - output directly
+            const rangeStr = key.slice(6); // Remove "range:" prefix
+            const { sqref: _sqref, ...rest } = value;
+            rangeValidations.push({
+                ...rest,
+                sqref: rangeStr
+            });
+        }
+        else {
+            regularModel[key] = value;
+        }
+    }
+    // If no regular entries, just return range validations
+    if (Object.keys(regularModel).length === 0) {
+        return rangeValidations;
+    }
+    const dvList = Object.entries(regularModel)
         .map(([address, dataValidation]) => ({
         address,
         dataValidation,
@@ -38,13 +63,14 @@ function optimiseDataValidations(model) {
     const matchCol = (addr, height, col) => {
         for (let i = 0; i < height; i++) {
             const otherAddress = colCache.encodeAddress(addr.row + i, col);
-            if (!model[otherAddress] || !isEqual(model[addr.address], model[otherAddress])) {
+            if (!regularModel[otherAddress] ||
+                !isEqual(regularModel[addr.address], regularModel[otherAddress])) {
                 return false;
             }
         }
         return true;
     };
-    return dvList
+    const optimized = dvList
         .map(dv => {
         if (!dv.marked) {
             const addr = colCache.decodeEx(dv.address);
@@ -58,7 +84,8 @@ function optimiseDataValidations(model) {
             // iterate downwards - finding matching cells
             let height = 1;
             let otherAddress = colCache.encodeAddress(addr.row + height, addr.col);
-            while (model[otherAddress] && isEqual(dv.dataValidation, model[otherAddress])) {
+            while (regularModel[otherAddress] &&
+                isEqual(dv.dataValidation, regularModel[otherAddress])) {
                 height++;
                 otherAddress = colCache.encodeAddress(addr.row + height, addr.col);
             }
@@ -90,6 +117,7 @@ function optimiseDataValidations(model) {
         return null;
     })
         .filter(Boolean);
+    return [...rangeValidations, ...optimized];
 }
 class DataValidationsXform extends BaseXform {
     get tag() {
@@ -204,9 +232,20 @@ class DataValidationsXform extends BaseXform {
                 list.forEach((addr) => {
                     if (addr.includes(":")) {
                         const range = new Range(addr);
-                        range.forEachAddress((address) => {
-                            this.model[address] = this._dataValidation;
-                        });
+                        // Only expand small ranges to avoid performance issues with large ranges
+                        // like B2:B1048576 (entire column validations)
+                        const rangeSize = (range.bottom - range.top + 1) * (range.right - range.left + 1);
+                        if (rangeSize <= 1000) {
+                            // Small range: expand to individual cells for backward compatibility
+                            range.forEachAddress((address) => {
+                                this.model[address] = this._dataValidation;
+                            });
+                        }
+                        else {
+                            // Large range: store as range string with special marker
+                            // The key format "range:A1:Z100" allows DataValidations.find() to detect it
+                            this.model[`range:${addr}`] = this._dataValidation;
+                        }
                     }
                     else {
                         this.model[addr] = this._dataValidation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cj-tech-master/excelts",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.",
   "private": false,
   "publishConfig": {