@univerjs/sheets-data-validation 0.15.2 → 0.15.3-insiders.20260131-b9b8805

package/lib/facade.js

@@ -1,12 +1,12 @@
-var $ = Object.defineProperty;
-var W = (f, t, e) => t in f ? $(f, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[t] = e;
-var v = (f, t, e) => W(f, typeof t != "symbol" ? t + "" : t, e);
+var q = Object.defineProperty;
+var $ = (f, t, e) => t in f ? q(f, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[t] = e;
+var v = (f, t, e) => $(f, typeof t != "symbol" ? t + "" : t, e);
 import { DataValidationType as n, generateRandomId as N, DataValidationErrorStyle as U, DataValidationOperator as g, IUniverInstanceService as P, ICommandService as b, DataValidationStatus as A, CanceledError as D, toDisposable as p } from "@univerjs/core";
-import { UpdateSheetDataValidationSettingCommand as R, UpdateSheetDataValidationOptionsCommand as T, UpdateSheetDataValidationRangeCommand as B, RemoveSheetDataValidationCommand as L, ClearRangeDataValidationCommand as G, AddSheetDataValidationCommand as O, SheetsDataValidationValidatorService as S, SheetDataValidationModel as V, RemoveSheetAllDataValidationCommand as j } from "@univerjs/sheets-data-validation";
-import { FRange as M, FWorkbook as H, FWorksheet as F } from "@univerjs/sheets/facade";
+import { UpdateSheetDataValidationSettingCommand as R, UpdateSheetDataValidationOptionsCommand as T, UpdateSheetDataValidationRangeCommand as B, RemoveSheetDataValidationCommand as L, ClearRangeDataValidationCommand as G, AddSheetDataValidationCommand as M, SheetsDataValidationValidatorService as S, SheetDataValidationModel as V, RemoveSheetAllDataValidationCommand as j } from "@univerjs/sheets-data-validation";
+import { FRange as O, FWorkbook as H, FWorksheet as W } from "@univerjs/sheets/facade";
 import { DataValidationModel as y, getRuleOptions as Q } from "@univerjs/data-validation";
 import { serializeRangeToRefString as z } from "@univerjs/engine-formula";
-import { FUniver as q, FEventName as K } from "@univerjs/core/facade";
+import { FUniver as F, FEventName as K } from "@univerjs/core/facade";
 import { filter as x } from "rxjs";
 class C {
   constructor(t) {
@@ -440,8 +440,8 @@ class C {
    * fRange.setDataValidation(rule);
    * ```
    */
-  requireNumberBetween(t, e, a) {
-    return this._rule.formula1 = `${t}`, this._rule.formula2 = `${e}`, this._rule.operator = g.BETWEEN, this._rule.type = a ? n.WHOLE : n.DECIMAL, this;
+  requireNumberBetween(t, e, i) {
+    return this._rule.formula1 = `${t}`, this._rule.formula2 = `${e}`, this._rule.operator = g.BETWEEN, this._rule.type = i ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number equal to the given value.
@@ -597,8 +597,8 @@ class C {
    * fRange.setDataValidation(rule);
    * ```
    */
-  requireNumberNotBetween(t, e, a) {
-    return this._rule.formula1 = `${t}`, this._rule.formula2 = `${e}`, this._rule.operator = g.NOT_BETWEEN, this._rule.type = a ? n.WHOLE : n.DECIMAL, this;
+  requireNumberNotBetween(t, e, i) {
+    return this._rule.formula1 = `${t}`, this._rule.formula2 = `${e}`, this._rule.operator = g.NOT_BETWEEN, this._rule.type = i ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number not equal to the given value.
@@ -651,8 +651,8 @@ class C {
    * fRange.setDataValidation(rule);
    * ```
    */
-  requireValueInList(t, e, a) {
-    return this._rule.type = e ? n.LIST_MULTIPLE : n.LIST, this._rule.formula1 = t.join(","), this._rule.formula2 = void 0, this._rule.showDropDown = a != null ? a : !0, this;
+  requireValueInList(t, e, i) {
+    return this._rule.type = e ? n.LIST_MULTIPLE : n.LIST, this._rule.formula1 = t.join(","), this._rule.formula2 = void 0, this._rule.showDropDown = i != null ? i : !0, this;
   }
   /**
    * Sets a data validation rule that requires the user to enter a value within a specific range.
@@ -686,12 +686,12 @@ class C {
    * cell.setDataValidation(rule);
    * ```
    */
-  requireValueInRange(t, e, a) {
+  requireValueInRange(t, e, i) {
     return this._rule.type = e ? n.LIST_MULTIPLE : n.LIST, this._rule.formula1 = `=${z({
       unitId: t.getUnitId(),
       sheetName: t.getSheetName(),
       range: t.getRange()
-    })}`, this._rule.formula2 = void 0, this._rule.showDropDown = a != null ? a : !0, this;
+    })}`, this._rule.formula2 = void 0, this._rule.showDropDown = i != null ? i : !0, this;
   }
   /**
    * Sets whether to allow invalid data and configures the error style.
@@ -781,11 +781,11 @@ class C {
   }
 }
 class w {
-  constructor(t, e, a) {
+  constructor(t, e, i) {
     v(this, "rule");
     v(this, "_worksheet");
     v(this, "_injector");
-    this._injector = a, this.rule = t, this._worksheet = e;
+    this._injector = i, this.rule = t, this._worksheet = e;
   }
   /**
    * Gets whether invalid data is allowed based on the error style value
@@ -935,7 +935,7 @@ class w {
     if (!this.getApplied())
       return [];
     const t = this._injector.get(P).getUnit(this._worksheet.getUnitId());
-    return this.rule.ranges.map((e) => this._injector.createInstance(M, t, this._worksheet, e));
+    return this.rule.ranges.map((e) => this._injector.createInstance(O, t, this._worksheet, e));
   }
   /**
    * Gets the unit ID of the worksheet
@@ -992,7 +992,7 @@ class w {
    * );
    * ```
    */
-  setCriteria(t, e, a = !0) {
+  setCriteria(t, e, i = !0) {
     if (this.getApplied() && !this._injector.get(b).syncExecuteCommand(R.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
@@ -1002,11 +1002,11 @@ class w {
         formula1: e[1],
         formula2: e[2],
         type: this.rule.type,
-        allowBlank: a
+        allowBlank: i
       }
     }))
       throw new Error("setCriteria failed");
-    return this.rule.operator = e[0], this.rule.formula1 = e[1], this.rule.formula2 = e[2], this.rule.type = t, this.rule.allowBlank = a, this;
+    return this.rule.operator = e[0], this.rule.formula1 = e[1], this.rule.formula2 = e[2], this.rule.type = t, this.rule.allowBlank = i, this;
   }
   /**
    * Set the options for the data validation rule
@@ -1103,7 +1103,7 @@ class w {
     }) : !1;
   }
 }
-class X extends M {
+class X extends O {
   setDataValidation(t) {
     if (!t)
       return this._commandService.syncExecuteCommand(G.id, {
@@ -1119,7 +1119,7 @@ class X extends M {
         ranges: [this._range]
       }
     };
-    return this._commandService.syncExecuteCommand(O.id, e), this;
+    return this._commandService.syncExecuteCommand(M.id, e), this;
   }
   getDataValidation() {
     const e = this._injector.get(S).getDataValidation(
@@ -1147,11 +1147,11 @@ class X extends M {
     const t = this._workbook.getUnitId(), e = this._worksheet.getSheetId();
     return this._collectValidationErrorsForRange(t, e, [this._range]);
   }
-  async _collectValidationErrorsForRange(t, e, a) {
-    if (!a.length)
+  async _collectValidationErrorsForRange(t, e, i) {
+    if (!i.length)
       return [];
-    const r = this._injector.get(S), i = this._worksheet, h = i.getName(), s = [];
-    for (const o of a) {
+    const r = this._injector.get(S), a = this._worksheet, h = a.getName(), s = [];
+    for (const o of i) {
       const d = [];
       for (let u = o.startRow; u <= o.endRow; u++)
         for (let l = o.startColumn; l <= o.endColumn; l++)
@@ -1161,7 +1161,7 @@ class X extends M {
               if (await r.validatorCell(t, e, u, l) !== A.VALID) {
                 const m = this._injector.get(V).getRuleByLocation(t, e, u, l);
                 if (m) {
-                  const k = ((c = i.getCell(u, l)) == null ? void 0 : c.v) || null, I = this._createDataValidationError(
+                  const k = ((c = a.getCell(u, l)) == null ? void 0 : c.v) || null, I = this._createDataValidationError(
                     h,
                     u,
                     l,
@@ -1179,19 +1179,19 @@ class X extends M {
     }
     return s;
   }
-  _createDataValidationError(t, e, a, r, i) {
+  _createDataValidationError(t, e, i, r, a) {
     return {
       sheetName: t,
       row: e,
-      column: a,
+      column: i,
       ruleId: r.uid,
-      inputValue: i,
+      inputValue: a,
       rule: r
     };
   }
 }
-M.extend(X);
-class J extends q {
+O.extend(X);
+class J extends F {
   /**
    * @deprecated use `univerAPI.newDataValidation()` as instead.
    * @returns {FDataValidationBuilder} A new instance of the FDataValidationBuilder class
@@ -1208,159 +1208,175 @@ class J extends q {
   // eslint-disable-next-line max-lines-per-function
   _initialize(t) {
     const e = t.get(b);
-    this.registerEventHandler(
-      this.Event.SheetDataValidationChanged,
-      () => t.has(V) ? t.get(V).ruleChange$.subscribe((r) => {
-        const { unitId: i, subUnitId: h, rule: s, oldRule: o, type: d } = r, u = this.getSheetTarget(i, h);
-        if (!u)
-          return;
-        const { workbook: l, worksheet: c } = u, _ = new w(s, c.getSheet(), this._injector);
-        this.fireEvent(this.Event.SheetDataValidationChanged, {
-          origin: r,
-          worksheet: c,
-          workbook: l,
-          changeType: d,
-          oldRule: o,
-          rule: _
-        });
-      }) : { dispose: () => {
-      } }
-    ), this.registerEventHandler(
-      this.Event.SheetDataValidatorStatusChanged,
-      () => t.has(V) ? t.get(V).validStatusChange$.subscribe((r) => {
-        const { unitId: i, subUnitId: h, ruleId: s, status: o, row: d, col: u } = r, l = this.getSheetTarget(i, h);
-        if (!l)
-          return;
-        const { workbook: c, worksheet: _ } = l, E = _.getDataValidation(s);
-        E && this.fireEvent(this.Event.SheetDataValidatorStatusChanged, {
-          workbook: c,
-          worksheet: _,
-          row: d,
-          column: u,
-          rule: E,
-          status: o
-        });
-      }) : { dispose: () => {
-      } }
-    ), this.registerEventHandler(
-      this.Event.BeforeSheetDataValidationAdd,
-      () => e.beforeCommandExecuted((a) => {
-        if (a.id === O.id) {
-          const r = a.params, i = this.getSheetTarget(r.unitId, r.subUnitId);
-          if (!i)
-            return;
-          const { workbook: h, worksheet: s } = i, o = {
-            worksheet: s,
-            workbook: h,
-            rule: r.rule
-          };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationAdd, o), o.cancel)
-            throw new D();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeSheetDataValidationCriteriaUpdate,
-      () => e.beforeCommandExecuted((a) => {
-        if (a.id === R.id) {
-          const r = a.params, i = this.getSheetTarget(r.unitId, r.subUnitId);
-          if (!i)
-            return;
-          const { workbook: h, worksheet: s } = i, o = s.getDataValidation(r.ruleId);
-          if (!o)
-            return;
-          const d = {
-            worksheet: s,
-            workbook: h,
-            rule: o,
-            ruleId: r.ruleId,
-            newCriteria: r.setting
-          };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationCriteriaUpdate, d), d.cancel)
-            throw new D();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeSheetDataValidationRangeUpdate,
-      () => e.beforeCommandExecuted((a) => {
-        if (a.id === B.id) {
-          const r = a.params, i = this.getSheetTarget(r.unitId, r.subUnitId);
-          if (!i)
-            return;
-          const { workbook: h, worksheet: s } = i, o = s.getDataValidation(r.ruleId);
-          if (!o)
-            return;
-          const d = {
-            worksheet: s,
-            workbook: h,
-            rule: o,
-            ruleId: r.ruleId,
-            newRanges: r.ranges
-          };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationRangeUpdate, d), d.cancel)
-            throw new D();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeSheetDataValidationOptionsUpdate,
-      () => e.beforeCommandExecuted((a) => {
-        if (a.id === T.id) {
-          const r = a.params, i = this.getSheetTarget(r.unitId, r.subUnitId);
-          if (!i)
-            return;
-          const { workbook: h, worksheet: s } = i, o = s.getDataValidation(r.ruleId);
-          if (!o)
-            return;
-          const d = {
-            worksheet: s,
-            workbook: h,
-            rule: o,
-            ruleId: r.ruleId,
-            newOptions: r.options
-          };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationOptionsUpdate, d), d.cancel)
-            throw new D();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeSheetDataValidationDelete,
-      () => e.beforeCommandExecuted((a) => {
-        if (a.id === L.id) {
-          const r = a.params, i = this.getSheetTarget(r.unitId, r.subUnitId);
-          if (!i)
-            return;
-          const { workbook: h, worksheet: s } = i, o = s.getDataValidation(r.ruleId);
-          if (!o)
+    this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.SheetDataValidationChanged,
+        () => t.has(V) ? t.get(V).ruleChange$.subscribe((r) => {
+          const { unitId: a, subUnitId: h, rule: s, oldRule: o, type: d } = r, u = this.getSheetTarget(a, h);
+          if (!u)
             return;
-          const d = {
-            worksheet: s,
-            workbook: h,
-            rule: o,
-            ruleId: r.ruleId
-          };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationDelete, d), d.cancel)
-            throw new D();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeSheetDataValidationDeleteAll,
-      () => e.beforeCommandExecuted((a) => {
-        if (a.id === j.id) {
-          const r = a.params, i = this.getSheetTarget(r.unitId, r.subUnitId);
-          if (!i)
+          const { workbook: l, worksheet: c } = u, _ = new w(s, c.getSheet(), this._injector);
+          this.fireEvent(this.Event.SheetDataValidationChanged, {
+            origin: r,
+            worksheet: c,
+            workbook: l,
+            changeType: d,
+            oldRule: o,
+            rule: _
+          });
+        }) : { dispose: () => {
+        } }
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.SheetDataValidatorStatusChanged,
+        () => t.has(V) ? t.get(V).validStatusChange$.subscribe((r) => {
+          const { unitId: a, subUnitId: h, ruleId: s, status: o, row: d, col: u } = r, l = this.getSheetTarget(a, h);
+          if (!l)
             return;
-          const { workbook: h, worksheet: s } = i, o = {
-            worksheet: s,
-            workbook: h,
-            rules: s.getDataValidations()
-          };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationDeleteAll, o), o.cancel)
-            throw new D();
-        }
-      })
+          const { workbook: c, worksheet: _ } = l, E = _.getDataValidation(s);
+          E && this.fireEvent(this.Event.SheetDataValidatorStatusChanged, {
+            workbook: c,
+            worksheet: _,
+            row: d,
+            column: u,
+            rule: E,
+            status: o
+          });
+        }) : { dispose: () => {
+        } }
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeSheetDataValidationAdd,
+        () => e.beforeCommandExecuted((i) => {
+          if (i.id === M.id) {
+            const r = i.params, a = this.getSheetTarget(r.unitId, r.subUnitId);
+            if (!a)
+              return;
+            const { workbook: h, worksheet: s } = a, o = {
+              worksheet: s,
+              workbook: h,
+              rule: r.rule
+            };
+            if (this.fireEvent(this.Event.BeforeSheetDataValidationAdd, o), o.cancel)
+              throw new D();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeSheetDataValidationCriteriaUpdate,
+        () => e.beforeCommandExecuted((i) => {
+          if (i.id === R.id) {
+            const r = i.params, a = this.getSheetTarget(r.unitId, r.subUnitId);
+            if (!a)
+              return;
+            const { workbook: h, worksheet: s } = a, o = s.getDataValidation(r.ruleId);
+            if (!o)
+              return;
+            const d = {
+              worksheet: s,
+              workbook: h,
+              rule: o,
+              ruleId: r.ruleId,
+              newCriteria: r.setting
+            };
+            if (this.fireEvent(this.Event.BeforeSheetDataValidationCriteriaUpdate, d), d.cancel)
+              throw new D();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeSheetDataValidationRangeUpdate,
+        () => e.beforeCommandExecuted((i) => {
+          if (i.id === B.id) {
+            const r = i.params, a = this.getSheetTarget(r.unitId, r.subUnitId);
+            if (!a)
+              return;
+            const { workbook: h, worksheet: s } = a, o = s.getDataValidation(r.ruleId);
+            if (!o)
+              return;
+            const d = {
+              worksheet: s,
+              workbook: h,
+              rule: o,
+              ruleId: r.ruleId,
+              newRanges: r.ranges
+            };
+            if (this.fireEvent(this.Event.BeforeSheetDataValidationRangeUpdate, d), d.cancel)
+              throw new D();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeSheetDataValidationOptionsUpdate,
+        () => e.beforeCommandExecuted((i) => {
+          if (i.id === T.id) {
+            const r = i.params, a = this.getSheetTarget(r.unitId, r.subUnitId);
+            if (!a)
+              return;
+            const { workbook: h, worksheet: s } = a, o = s.getDataValidation(r.ruleId);
+            if (!o)
+              return;
+            const d = {
+              worksheet: s,
+              workbook: h,
+              rule: o,
+              ruleId: r.ruleId,
+              newOptions: r.options
+            };
+            if (this.fireEvent(this.Event.BeforeSheetDataValidationOptionsUpdate, d), d.cancel)
+              throw new D();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeSheetDataValidationDelete,
+        () => e.beforeCommandExecuted((i) => {
+          if (i.id === L.id) {
+            const r = i.params, a = this.getSheetTarget(r.unitId, r.subUnitId);
+            if (!a)
+              return;
+            const { workbook: h, worksheet: s } = a, o = s.getDataValidation(r.ruleId);
+            if (!o)
+              return;
+            const d = {
+              worksheet: s,
+              workbook: h,
+              rule: o,
+              ruleId: r.ruleId
+            };
+            if (this.fireEvent(this.Event.BeforeSheetDataValidationDelete, d), d.cancel)
+              throw new D();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeSheetDataValidationDeleteAll,
+        () => e.beforeCommandExecuted((i) => {
+          if (i.id === j.id) {
+            const r = i.params, a = this.getSheetTarget(r.unitId, r.subUnitId);
+            if (!a)
+              return;
+            const { workbook: h, worksheet: s } = a, o = {
+              worksheet: s,
+              workbook: h,
+              rules: s.getDataValidations()
+            };
+            if (this.fireEvent(this.Event.BeforeSheetDataValidationDeleteAll, o), o.cancel)
+              throw new D();
+          }
+        })
+      )
     );
   }
 }
-q.extend(J);
+F.extend(J);
 class Y extends H {
   _initialize() {
     Object.defineProperty(this, "_dataValidationModel", {
@@ -1373,28 +1389,28 @@ class Y extends H {
     return this._injector.get(S).validatorWorkbook(this._workbook.getUnitId());
   }
   async getAllDataValidationErrorAsync() {
-    const t = this._workbook.getUnitId(), e = this._dataValidationModel.getSubUnitIds(t), a = [];
+    const t = this._workbook.getUnitId(), e = this._dataValidationModel.getSubUnitIds(t), i = [];
     for (const r of e) {
-      const i = await this._collectValidationErrorsForSheet(t, r);
-      a.push(...i);
+      const a = await this._collectValidationErrorsForSheet(t, r);
+      i.push(...a);
     }
-    return a;
+    return i;
   }
   async _collectValidationErrorsForSheet(t, e) {
-    const a = this._dataValidationModel.getRules(t, e);
-    if (!a.length)
+    const i = this._dataValidationModel.getRules(t, e);
+    if (!i.length)
       return [];
-    const r = a.flatMap((i) => i.ranges);
+    const r = i.flatMap((a) => a.ranges);
     return this._collectValidationErrorsForRange(t, e, r);
   }
-  async _collectValidationErrorsForRange(t, e, a) {
-    if (!a.length)
+  async _collectValidationErrorsForRange(t, e, i) {
+    if (!i.length)
       return [];
     const r = this._injector.get(S), h = this._workbook.getSheetBySheetId(e);
     if (!h)
       throw new Error(`Cannot find worksheet with sheetId: ${e}`);
     const s = h.getName(), o = [];
-    for (const d of a) {
+    for (const d of i) {
       const u = [];
       for (let l = d.startRow; l <= d.endRow; l++)
         for (let c = d.startColumn; c <= d.endColumn; c++)
@@ -1422,13 +1438,13 @@ class Y extends H {
     }
     return o;
   }
-  _createDataValidationError(t, e, a, r, i) {
+  _createDataValidationError(t, e, i, r, a) {
     return {
       sheetName: t,
       row: e,
-      column: a,
+      column: i,
       ruleId: r.uid,
-      inputValue: i,
+      inputValue: a,
       rule: r
     };
   }
@@ -1440,74 +1456,74 @@ class Y extends H {
     return p(this._dataValidationModel.validStatusChange$.pipe(x((e) => e.unitId === this._workbook.getUnitId())).subscribe(t));
   }
   onBeforeAddDataValidation(t) {
-    return p(this._commandService.beforeCommandExecuted((e, a) => {
+    return p(this._commandService.beforeCommandExecuted((e, i) => {
       const r = e.params;
-      if (e.id === O.id) {
+      if (e.id === M.id) {
         if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(r, a) === !1)
+        if (t(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeAddDataValidation");
       }
     }));
   }
   onBeforeUpdateDataValidationCriteria(t) {
-    return p(this._commandService.beforeCommandExecuted((e, a) => {
+    return p(this._commandService.beforeCommandExecuted((e, i) => {
       const r = e.params;
       if (e.id === R.id) {
         if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(r, a) === !1)
+        if (t(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationCriteria");
       }
     }));
   }
   onBeforeUpdateDataValidationRange(t) {
-    return p(this._commandService.beforeCommandExecuted((e, a) => {
+    return p(this._commandService.beforeCommandExecuted((e, i) => {
       const r = e.params;
       if (e.id === B.id) {
         if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(r, a) === !1)
+        if (t(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationRange");
       }
     }));
   }
   onBeforeUpdateDataValidationOptions(t) {
-    return p(this._commandService.beforeCommandExecuted((e, a) => {
+    return p(this._commandService.beforeCommandExecuted((e, i) => {
       const r = e.params;
       if (e.id === T.id) {
         if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(r, a) === !1)
+        if (t(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationOptions");
       }
     }));
   }
   onBeforeDeleteDataValidation(t) {
-    return p(this._commandService.beforeCommandExecuted((e, a) => {
+    return p(this._commandService.beforeCommandExecuted((e, i) => {
       const r = e.params;
       if (e.id === L.id) {
         if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(r, a) === !1)
+        if (t(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteDataValidation");
       }
     }));
   }
   onBeforeDeleteAllDataValidation(t) {
-    return p(this._commandService.beforeCommandExecuted((e, a) => {
+    return p(this._commandService.beforeCommandExecuted((e, i) => {
       const r = e.params;
       if (e.id === j.id) {
         if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(r, a) === !1)
+        if (t(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteAllDataValidation");
       }
     }));
   }
 }
 H.extend(Y);
-class Z extends F {
+class Z extends W {
   getDataValidations() {
     return this._injector.get(y).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((e) => new w(e, this._worksheet, this._injector));
   }
@@ -1521,8 +1537,8 @@ class Z extends F {
     return this.getValidatorStatus();
   }
   getDataValidation(t) {
-    const a = this._injector.get(y).getRuleById(this._workbook.getUnitId(), this._worksheet.getSheetId(), t);
-    return a ? new w(a, this._worksheet, this._injector) : null;
+    const i = this._injector.get(y).getRuleById(this._workbook.getUnitId(), this._worksheet.getSheetId(), t);
+    return i ? new w(i, this._worksheet, this._injector) : null;
   }
   async getAllDataValidationErrorAsync() {
     const t = this._workbook.getUnitId(), e = this._worksheet.getSheetId();
@@ -1532,14 +1548,14 @@ class Z extends F {
     const r = this._injector.get(y).getRules(t, e);
     if (!r.length)
       return [];
-    const i = r.flatMap((h) => h.ranges);
-    return this._collectValidationErrorsForRange(t, e, i);
+    const a = r.flatMap((h) => h.ranges);
+    return this._collectValidationErrorsForRange(t, e, a);
   }
-  async _collectValidationErrorsForRange(t, e, a) {
-    if (!a.length)
+  async _collectValidationErrorsForRange(t, e, i) {
+    if (!i.length)
       return [];
-    const r = this._injector.get(S), i = this._worksheet, h = i.getName(), s = [];
-    for (const o of a) {
+    const r = this._injector.get(S), a = this._worksheet, h = a.getName(), s = [];
+    for (const o of i) {
       const d = [];
       for (let u = o.startRow; u <= o.endRow; u++)
         for (let l = o.startColumn; l <= o.endColumn; l++)
@@ -1549,7 +1565,7 @@ class Z extends F {
               if (await r.validatorCell(t, e, u, l) !== A.VALID) {
                 const m = this._injector.get(V).getRuleByLocation(t, e, u, l);
                 if (m) {
-                  const k = ((c = i.getCell(u, l)) == null ? void 0 : c.v) || null, I = this._createDataValidationError(
+                  const k = ((c = a.getCell(u, l)) == null ? void 0 : c.v) || null, I = this._createDataValidationError(
                     h,
                     u,
                     l,
@@ -1567,18 +1583,18 @@ class Z extends F {
     }
     return s;
   }
-  _createDataValidationError(t, e, a, r, i) {
+  _createDataValidationError(t, e, i, r, a) {
     return {
       sheetName: t,
       row: e,
-      column: a,
+      column: i,
       ruleId: r.uid,
-      inputValue: i,
+      inputValue: a,
       rule: r
     };
   }
 }
-F.extend(Z);
+W.extend(Z);
 class tt {
   get SheetDataValidationChanged() {
     return "SheetDataValidationChanged";