@univerjs/sheets-data-validation 0.6.0-nightly.202502091605 → 0.6.0-nightly.202502111606

package/lib/es/facade.js

@@ -1,19 +1,19 @@
-var j = Object.defineProperty;
-var q = (c, e, t) => e in c ? j(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
-var f = (c, e, t) => q(c, typeof e != "symbol" ? e + "" : e, t);
-import { UpdateSheetDataValidationSettingCommand as U, UpdateSheetDataValidationOptionsCommand as v, UpdateSheetDataValidationRangeCommand as C, RemoveSheetDataValidationCommand as T, ClearRangeDataValidationCommand as W, AddSheetDataValidationCommand as A, SheetsDataValidationValidatorService as S, SheetDataValidationModel as V, RemoveSheetAllDataValidationCommand as O } from "@univerjs/sheets-data-validation";
-import { FRange as y, FWorkbook as M, FWorksheet as N } from "@univerjs/sheets/facade";
-import { generateRandomId as B, DataValidationType as o, DataValidationErrorStyle as w, DataValidationOperator as h, IUniverInstanceService as H, ICommandService as p, FUniver as x, CanceledError as _, toDisposable as g, FEventName as $ } from "@univerjs/core";
-import { DataValidationModel as b, getRuleOptions as F } from "@univerjs/data-validation";
+var H = Object.defineProperty;
+var j = (g, e, t) => e in g ? H(g, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : g[e] = t;
+var m = (g, e, t) => j(g, typeof e != "symbol" ? e + "" : e, t);
+import { UpdateSheetDataValidationSettingCommand as b, UpdateSheetDataValidationOptionsCommand as U, UpdateSheetDataValidationRangeCommand as C, RemoveSheetDataValidationCommand as A, ClearRangeDataValidationCommand as q, AddSheetDataValidationCommand as T, SheetsDataValidationValidatorService as S, SheetDataValidationModel as w, RemoveSheetAllDataValidationCommand as O } from "@univerjs/sheets-data-validation";
+import { FRange as y, FWorkbook as x, FWorksheet as N } from "@univerjs/sheets/facade";
+import { generateRandomId as L, DataValidationType as n, DataValidationErrorStyle as k, DataValidationOperator as h, IUniverInstanceService as W, ICommandService as p, FUniver as M, CanceledError as f, toDisposable as c, FEventName as $ } from "@univerjs/core";
+import { DataValidationModel as v, getRuleOptions as F } from "@univerjs/data-validation";
 import { serializeRangeToRefString as P } from "@univerjs/engine-formula";
 import { filter as R } from "rxjs";
-class D {
+class E {
   constructor(e) {
-    f(this, "_rule");
+    m(this, "_rule");
     this._rule = e != null ? e : {
-      uid: B(),
+      uid: L(),
       ranges: void 0,
-      type: o.CUSTOM
+      type: n.CUSTOM
     };
   }
   /**
@@ -26,7 +26,7 @@ class D {
    * ```
    */
   build() {
-    return new m(this._rule);
+    return new _(this._rule);
   }
   /**
    * Creates a duplicate of the current DataValidationBuilder object
@@ -38,9 +38,9 @@ class D {
    * ```
    */
   copy() {
-    return new D({
+    return new E({
       ...this._rule,
-      uid: B()
+      uid: L()
     });
   }
   /**
@@ -53,7 +53,7 @@ class D {
    * ```
    */
   getAllowInvalid() {
-    return this._rule.errorStyle !== w.STOP;
+    return this._rule.errorStyle !== k.STOP;
   }
   /**
    * Gets the data validation type of the rule
@@ -103,7 +103,7 @@ class D {
    * ```
    */
   requireCheckbox(e, t) {
-    return this._rule.type = o.CHECKBOX, this._rule.formula1 = e, this._rule.formula2 = t, this;
+    return this._rule.type = n.CHECKBOX, this._rule.formula1 = e, this._rule.formula2 = t, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be after a specific date
@@ -116,7 +116,7 @@ class D {
    * ```
    */
   requireDateAfter(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.operator = h.GREATER_THAN, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.operator = h.GREATER_THAN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be before a specific date
@@ -129,7 +129,7 @@ class D {
    * ```
    */
   requireDateBefore(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be within a specific date range
@@ -145,7 +145,7 @@ class D {
    * ```
    */
   requireDateBetween(e, t) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = h.BETWEEN, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = h.BETWEEN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be equal to a specific date
@@ -158,7 +158,7 @@ class D {
    * ```
    */
   requireDateEqualTo(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.EQUAL, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.EQUAL, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be not within a specific date range
@@ -174,7 +174,7 @@ class D {
    * ```
    */
   requireDateNotBetween(e, t) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = h.NOT_BETWEEN, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = h.NOT_BETWEEN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be on or after a specific date
@@ -187,7 +187,7 @@ class D {
    * ```
    */
   requireDateOnOrAfter(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN_OR_EQUAL, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN_OR_EQUAL, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be on or before a specific date
@@ -200,7 +200,7 @@ class D {
    * ```
    */
   requireDateOnOrBefore(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN_OR_EQUAL, this;
+    return this._rule.type = n.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN_OR_EQUAL, this;
   }
   /**
    * Requires that a custom formula be satisfied
@@ -213,7 +213,7 @@ class D {
    * ```
    */
   requireFormulaSatisfied(e) {
-    return this._rule.type = o.CUSTOM, this._rule.formula1 = e, this._rule.formula2 = void 0, this;
+    return this._rule.type = n.CUSTOM, this._rule.formula1 = e, this._rule.formula2 = void 0, this;
   }
   /**
    * Requires the user to enter a number within a specific range, which can be integer or decimal
@@ -227,8 +227,8 @@ class D {
    * const rule = builder.requireNumberBetween(1, 10).build();
    * ```
    */
-  requireNumberBetween(e, t, r) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = h.BETWEEN, this._rule.type = r ? o.WHOLE : o.DECIMAL, this;
+  requireNumberBetween(e, t, i) {
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = h.BETWEEN, this._rule.type = i ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Requires the user to enter a number that is equal to a specific value, which can be an integer or a decimal
@@ -242,7 +242,7 @@ class D {
    * ```
    */
   requireNumberEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.EQUAL, this._rule.type = t ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Requires the user to enter a number that is greater than a specific value, which can be an integer or a decimal
@@ -256,7 +256,7 @@ class D {
    * ```
    */
   requireNumberGreaterThan(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN, this._rule.type = t ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Requires the user to enter a number that is greater than or equal to a specific value, which can be an integer or a decimal
@@ -270,7 +270,7 @@ class D {
    * ```
    */
   requireNumberGreaterThanOrEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN_OR_EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN_OR_EQUAL, this._rule.type = t ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Requires the user to enter a number that is less than a specific value, which can be an integer or a decimal
@@ -284,7 +284,7 @@ class D {
    * ```
    */
   requireNumberLessThan(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN, this._rule.type = t ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number less than or equal to a specified value
@@ -299,7 +299,7 @@ class D {
    * ```
    */
   requireNumberLessThanOrEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN_OR_EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN_OR_EQUAL, this._rule.type = t ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Sets a data validation rule that requires the user to enter a number outside a specified range
@@ -314,8 +314,8 @@ class D {
    * const rule = builder.requireNumberNotBetween(1, 10).build();
    * ```
    */
-  requireNumberNotBetween(e, t, r) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = h.NOT_BETWEEN, this._rule.type = r ? o.WHOLE : o.DECIMAL, this;
+  requireNumberNotBetween(e, t, i) {
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = h.NOT_BETWEEN, this._rule.type = i ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Creates a data validation rule that requires the user to enter a number that is not equal to a specific value
@@ -330,7 +330,7 @@ class D {
    * ```
    */
   requireNumberNotEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.NOT_EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.NOT_EQUAL, this._rule.type = t ? n.WHOLE : n.DECIMAL, this;
   }
   /**
    * Sets a data validation rule that requires the user to enter a value from a list of specific values
@@ -345,8 +345,8 @@ class D {
    * const rule = builder.requireValueInList(['Yes', 'No']).build();
    * ```
    */
-  requireValueInList(e, t, r) {
-    return this._rule.type = t ? o.LIST_MULTIPLE : o.LIST, this._rule.formula1 = e.join(","), this._rule.formula2 = void 0, this._rule.showDropDown = r != null ? r : !0, this;
+  requireValueInList(e, t, i) {
+    return this._rule.type = t ? n.LIST_MULTIPLE : n.LIST, this._rule.formula1 = e.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
@@ -362,12 +362,12 @@ class D {
    * const rule = builder.requireValueInRange(range).build();
    * ```
    */
-  requireValueInRange(e, t, r) {
-    return this._rule.type = t ? o.LIST_MULTIPLE : o.LIST, this._rule.formula1 = `=${P({
+  requireValueInRange(e, t, i) {
+    return this._rule.type = t ? n.LIST_MULTIPLE : n.LIST, this._rule.formula1 = `=${P({
       unitId: e.getUnitId(),
       sheetName: e.getSheetName(),
       range: e.getRange()
-    })}`, this._rule.formula2 = void 0, this._rule.showDropDown = r != null ? r : !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
@@ -382,7 +382,7 @@ class D {
    * ```
    */
   setAllowInvalid(e) {
-    return this._rule.errorStyle = e ? w.WARNING : w.STOP, this;
+    return this._rule.errorStyle = e ? k.WARNING : k.STOP, this;
   }
   /**
    * Sets whether to allow blank values
@@ -415,12 +415,12 @@ class D {
     return Object.assign(this._rule, e), this;
   }
 }
-class m {
-  constructor(e, t, r) {
-    f(this, "rule");
-    f(this, "_worksheet");
-    f(this, "_injector");
-    this._injector = r, this.rule = e, this._worksheet = t;
+class _ {
+  constructor(e, t, i) {
+    m(this, "rule");
+    m(this, "_worksheet");
+    m(this, "_injector");
+    this._injector = i, this.rule = e, this._worksheet = t;
   }
   /**
    * Gets whether invalid data is allowed based on the error style value
@@ -436,7 +436,7 @@ class m {
    * ```
    */
   getAllowInvalid() {
-    return this.rule.errorStyle !== w.STOP;
+    return this.rule.errorStyle !== k.STOP;
   }
   /**
    * Gets the data validation type of the rule
@@ -501,7 +501,7 @@ class m {
    * ```
    */
   copy() {
-    return new D(this.rule);
+    return new E(this.rule);
   }
   /**
    * Gets whether the data validation rule is applied to the worksheet
@@ -519,7 +519,7 @@ class m {
   getApplied() {
     if (!this._worksheet)
       return !1;
-    const t = this._injector.get(b).getRuleById(this._worksheet.getUnitId(), this._worksheet.getSheetId(), this.rule.uid);
+    const t = this._injector.get(v).getRuleById(this._worksheet.getUnitId(), this._worksheet.getSheetId(), this.rule.uid);
     return !!(t && t.ranges.length);
   }
   /**
@@ -538,7 +538,7 @@ class m {
   getRanges() {
     if (!this.getApplied())
       return [];
-    const e = this._injector.get(H).getUnit(this._worksheet.getUnitId());
+    const e = this._injector.get(W).getUnit(this._worksheet.getUnitId());
     return this.rule.ranges.map((t) => this._injector.createInstance(y, e, this._worksheet, t));
   }
   /**
@@ -595,8 +595,8 @@ class m {
    * );
    * ```
    */
-  setCriteria(e, t, r = !0) {
-    if (this.getApplied() && !this._injector.get(p).syncExecuteCommand(U.id, {
+  setCriteria(e, t, i = !0) {
+    if (this.getApplied() && !this._injector.get(p).syncExecuteCommand(b.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid,
@@ -605,11 +605,11 @@ class m {
         formula1: t[1],
         formula2: t[2],
         type: this.rule.type,
-        allowBlank: r
+        allowBlank: i
       }
     }))
       throw new Error("setCriteria failed");
-    return this.rule.operator = t[0], this.rule.formula1 = t[1], this.rule.formula2 = t[2], this.rule.type = e, this.rule.allowBlank = r, this;
+    return this.rule.operator = t[0], this.rule.formula1 = t[1], this.rule.formula2 = t[2], this.rule.type = e, this.rule.allowBlank = i, this;
   }
   /**
    * Set the options for the data validation rule
@@ -630,7 +630,7 @@ class m {
    * ```
    */
   setOptions(e) {
-    if (this.getApplied() && !this._injector.get(p).syncExecuteCommand(v.id, {
+    if (this.getApplied() && !this._injector.get(p).syncExecuteCommand(U.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid,
@@ -662,7 +662,7 @@ class m {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid,
-      ranges: e.map((a) => a.getRange())
+      ranges: e.map((r) => r.getRange())
     }))
       throw new Error("setRanges failed");
     return this.rule.ranges = e.map((t) => t.getRange()), this;
@@ -681,7 +681,7 @@ class m {
    * ```
    */
   delete() {
-    return this.getApplied() ? this._injector.get(p).syncExecuteCommand(T.id, {
+    return this.getApplied() ? this._injector.get(p).syncExecuteCommand(A.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid
@@ -691,7 +691,7 @@ class m {
 class G extends y {
   setDataValidation(e) {
     if (!e)
-      return this._commandService.syncExecuteCommand(W.id, {
+      return this._commandService.syncExecuteCommand(q.id, {
         unitId: this._workbook.getUnitId(),
         subUnitId: this._worksheet.getSheetId(),
         ranges: [this._range]
@@ -704,7 +704,7 @@ class G extends y {
         ranges: [this._range]
       }
     };
-    return this._commandService.syncExecuteCommand(A.id, t), this;
+    return this._commandService.syncExecuteCommand(T.id, t), this;
   }
   getDataValidation() {
     const t = this._injector.get(S).getDataValidation(
@@ -712,14 +712,14 @@ class G extends y {
       this._worksheet.getSheetId(),
       [this._range]
     );
-    return t && new m(t, this._worksheet, this._injector);
+    return t && new _(t, this._worksheet, this._injector);
   }
   getDataValidations() {
     return this._injector.get(S).getDataValidations(
       this._workbook.getUnitId(),
       this._worksheet.getSheetId(),
       [this._range]
-    ).map((t) => new m(t, this._worksheet, this._injector));
+    ).map((t) => new _(t, this._worksheet, this._injector));
   }
   async getValidatorStatus() {
     return this._injector.get(S).validatorRanges(
@@ -730,159 +730,180 @@ class G extends y {
   }
 }
 y.extend(G);
-class Q extends x {
+class Q extends M {
   /**
    * @deprecated use `univerAPI.newDataValidation()` as instead.
    * @returns {FDataValidationBuilder} A new instance of the FDataValidationBuilder class
    */
   static newDataValidation() {
-    return new D();
+    return new E();
   }
   newDataValidation() {
-    return new D();
+    return new E();
   }
   /**
    * @ignore
    */
   // eslint-disable-next-line max-lines-per-function
   _initialize(e) {
-    if (!e.has(V)) return;
-    const t = e.get(V), r = e.get(p);
-    this.disposeWithMe(t.ruleChange$.subscribe((a) => {
-      const { unitId: i, subUnitId: n, rule: d, oldRule: u, type: s } = a, l = this.getSheetTarget(i, n);
-      if (!l)
-        return;
-      const { workbook: I, worksheet: k } = l, E = new m(d, k.getSheet(), this._injector);
-      this.fireEvent(this.Event.SheetDataValidationChanged, {
-        origin: a,
-        worksheet: k,
-        workbook: I,
-        changeType: s,
-        oldRule: u,
-        rule: E
-      });
-    })), this.disposeWithMe(t.validStatusChange$.subscribe((a) => {
-      const { unitId: i, subUnitId: n, ruleId: d, status: u, row: s, col: l } = a, I = this.getSheetTarget(i, n);
-      if (!I)
-        return;
-      const { workbook: k, worksheet: E } = I, L = E.getDataValidation(d);
-      L && this.fireEvent(this.Event.SheetDataValidatorStatusChanged, {
-        workbook: k,
-        worksheet: E,
-        row: s,
-        column: l,
-        rule: L,
-        status: u
-      });
-    })), this.disposeWithMe(r.beforeCommandExecuted((a) => {
-      switch (a.id) {
-        case A.id: {
-          const i = a.params, n = this.getSheetTarget(i.unitId, i.subUnitId);
-          if (!n)
+    if (!e.has(w)) return;
+    const t = e.get(w), i = e.get(p);
+    this.registerEventHandler(
+      this.Event.SheetDataValidationChanged,
+      () => t.ruleChange$.subscribe((r) => {
+        const { unitId: a, subUnitId: o, rule: u, oldRule: l, type: s } = r, d = this.getSheetTarget(a, o);
+        if (!d)
+          return;
+        const { workbook: D, worksheet: I } = d, V = new _(u, I.getSheet(), this._injector);
+        this.fireEvent(this.Event.SheetDataValidationChanged, {
+          origin: r,
+          worksheet: I,
+          workbook: D,
+          changeType: s,
+          oldRule: l,
+          rule: V
+        });
+      })
+    ), this.registerEventHandler(
+      this.Event.SheetDataValidatorStatusChanged,
+      () => t.validStatusChange$.subscribe((r) => {
+        const { unitId: a, subUnitId: o, ruleId: u, status: l, row: s, col: d } = r, D = this.getSheetTarget(a, o);
+        if (!D)
+          return;
+        const { workbook: I, worksheet: V } = D, B = V.getDataValidation(u);
+        B && this.fireEvent(this.Event.SheetDataValidatorStatusChanged, {
+          workbook: I,
+          worksheet: V,
+          row: s,
+          column: d,
+          rule: B,
+          status: l
+        });
+      })
+    ), this.registerEventHandler(
+      this.Event.BeforeSheetDataValidationAdd,
+      () => i.beforeCommandExecuted((r) => {
+        if (r.id === T.id) {
+          const a = r.params, o = this.getSheetTarget(a.unitId, a.subUnitId);
+          if (!o)
             return;
-          const { workbook: d, worksheet: u } = n, s = {
-            worksheet: u,
-            workbook: d,
-            rule: i.rule
+          const { workbook: u, worksheet: l } = o, s = {
+            worksheet: l,
+            workbook: u,
+            rule: a.rule
           };
           if (this.fireEvent(this.Event.BeforeSheetDataValidationAdd, s), s.cancel)
-            throw new _();
-          break;
+            throw new f();
         }
-        case U.id: {
-          const i = a.params, n = this.getSheetTarget(i.unitId, i.subUnitId);
-          if (!n)
+      })
+    ), this.registerEventHandler(
+      this.Event.BeforeSheetDataValidationCriteriaUpdate,
+      () => i.beforeCommandExecuted((r) => {
+        if (r.id === b.id) {
+          const a = r.params, o = this.getSheetTarget(a.unitId, a.subUnitId);
+          if (!o)
             return;
-          const { workbook: d, worksheet: u } = n, s = u.getDataValidation(i.ruleId);
+          const { workbook: u, worksheet: l } = o, s = l.getDataValidation(a.ruleId);
           if (!s)
             return;
-          const l = {
-            worksheet: u,
-            workbook: d,
+          const d = {
+            worksheet: l,
+            workbook: u,
             rule: s,
-            ruleId: i.ruleId,
-            newCriteria: i.setting
+            ruleId: a.ruleId,
+            newCriteria: a.setting
           };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationCriteriaUpdate, l), l.cancel)
-            throw new _();
-          break;
+          if (this.fireEvent(this.Event.BeforeSheetDataValidationCriteriaUpdate, d), d.cancel)
+            throw new f();
         }
-        case C.id: {
-          const i = a.params, n = this.getSheetTarget(i.unitId, i.subUnitId);
-          if (!n)
+      })
+    ), this.registerEventHandler(
+      this.Event.BeforeSheetDataValidationRangeUpdate,
+      () => i.beforeCommandExecuted((r) => {
+        if (r.id === C.id) {
+          const a = r.params, o = this.getSheetTarget(a.unitId, a.subUnitId);
+          if (!o)
             return;
-          const { workbook: d, worksheet: u } = n, s = u.getDataValidation(i.ruleId);
+          const { workbook: u, worksheet: l } = o, s = l.getDataValidation(a.ruleId);
           if (!s)
             return;
-          const l = {
-            worksheet: u,
-            workbook: d,
+          const d = {
+            worksheet: l,
+            workbook: u,
             rule: s,
-            ruleId: i.ruleId,
-            newRanges: i.ranges
+            ruleId: a.ruleId,
+            newRanges: a.ranges
           };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationRangeUpdate, l), l.cancel)
-            throw new _();
-          break;
+          if (this.fireEvent(this.Event.BeforeSheetDataValidationRangeUpdate, d), d.cancel)
+            throw new f();
         }
-        case v.id: {
-          const i = a.params, n = this.getSheetTarget(i.unitId, i.subUnitId);
-          if (!n)
+      })
+    ), this.registerEventHandler(
+      this.Event.BeforeSheetDataValidationOptionsUpdate,
+      () => i.beforeCommandExecuted((r) => {
+        if (r.id === U.id) {
+          const a = r.params, o = this.getSheetTarget(a.unitId, a.subUnitId);
+          if (!o)
             return;
-          const { workbook: d, worksheet: u } = n, s = u.getDataValidation(i.ruleId);
+          const { workbook: u, worksheet: l } = o, s = l.getDataValidation(a.ruleId);
           if (!s)
             return;
-          const l = {
-            worksheet: u,
-            workbook: d,
+          const d = {
+            worksheet: l,
+            workbook: u,
             rule: s,
-            ruleId: i.ruleId,
-            newOptions: i.options
+            ruleId: a.ruleId,
+            newOptions: a.options
           };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationOptionsUpdate, l), l.cancel)
-            throw new _();
-          break;
+          if (this.fireEvent(this.Event.BeforeSheetDataValidationOptionsUpdate, d), d.cancel)
+            throw new f();
         }
-        case T.id: {
-          const i = a.params, n = this.getSheetTarget(i.unitId, i.subUnitId);
-          if (!n)
+      })
+    ), this.registerEventHandler(
+      this.Event.BeforeSheetDataValidationDelete,
+      () => i.beforeCommandExecuted((r) => {
+        if (r.id === A.id) {
+          const a = r.params, o = this.getSheetTarget(a.unitId, a.subUnitId);
+          if (!o)
             return;
-          const { workbook: d, worksheet: u } = n, s = u.getDataValidation(i.ruleId);
+          const { workbook: u, worksheet: l } = o, s = l.getDataValidation(a.ruleId);
           if (!s)
             return;
-          const l = {
-            worksheet: u,
-            workbook: d,
+          const d = {
+            worksheet: l,
+            workbook: u,
             rule: s,
-            ruleId: i.ruleId
+            ruleId: a.ruleId
           };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationDelete, l), l.cancel)
-            throw new _();
-          break;
+          if (this.fireEvent(this.Event.BeforeSheetDataValidationDelete, d), d.cancel)
+            throw new f();
         }
-        case O.id: {
-          const i = a.params, n = this.getSheetTarget(i.unitId, i.subUnitId);
-          if (!n)
+      })
+    ), this.registerEventHandler(
+      this.Event.BeforeSheetDataValidationDeleteAll,
+      () => i.beforeCommandExecuted((r) => {
+        if (r.id === O.id) {
+          const a = r.params, o = this.getSheetTarget(a.unitId, a.subUnitId);
+          if (!o)
             return;
-          const { workbook: d, worksheet: u } = n, s = {
-            worksheet: u,
-            workbook: d,
-            rules: u.getDataValidations()
+          const { workbook: u, worksheet: l } = o, s = {
+            worksheet: l,
+            workbook: u,
+            rules: l.getDataValidations()
           };
           if (this.fireEvent(this.Event.BeforeSheetDataValidationDeleteAll, s), s.cancel)
-            throw new _();
-          break;
+            throw new f();
         }
-      }
-    }));
+      })
+    );
   }
 }
-x.extend(Q);
-class z extends M {
+M.extend(Q);
+class z extends x {
   _initialize() {
     Object.defineProperty(this, "_dataValidationModel", {
       get() {
-        return this._injector.get(V);
+        return this._injector.get(w);
       }
     });
   }
@@ -891,82 +912,82 @@ class z extends M {
   }
   // region DataValidationHooks
   onDataValidationChange(e) {
-    return g(this._dataValidationModel.ruleChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
+    return c(this._dataValidationModel.ruleChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
   }
   onDataValidationStatusChange(e) {
-    return g(this._dataValidationModel.validStatusChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
+    return c(this._dataValidationModel.validStatusChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
   }
   onBeforeAddDataValidation(e) {
-    return g(this._commandService.beforeCommandExecuted((t, r) => {
-      const a = t.params;
-      if (t.id === A.id) {
-        if (a.unitId !== this._workbook.getUnitId())
+    return c(this._commandService.beforeCommandExecuted((t, i) => {
+      const r = t.params;
+      if (t.id === T.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(a, r) === !1)
+        if (e(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeAddDataValidation");
       }
     }));
   }
   onBeforeUpdateDataValidationCriteria(e) {
-    return g(this._commandService.beforeCommandExecuted((t, r) => {
-      const a = t.params;
-      if (t.id === U.id) {
-        if (a.unitId !== this._workbook.getUnitId())
+    return c(this._commandService.beforeCommandExecuted((t, i) => {
+      const r = t.params;
+      if (t.id === b.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(a, r) === !1)
+        if (e(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationCriteria");
       }
     }));
   }
   onBeforeUpdateDataValidationRange(e) {
-    return g(this._commandService.beforeCommandExecuted((t, r) => {
-      const a = t.params;
+    return c(this._commandService.beforeCommandExecuted((t, i) => {
+      const r = t.params;
       if (t.id === C.id) {
-        if (a.unitId !== this._workbook.getUnitId())
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(a, r) === !1)
+        if (e(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationRange");
       }
     }));
   }
   onBeforeUpdateDataValidationOptions(e) {
-    return g(this._commandService.beforeCommandExecuted((t, r) => {
-      const a = t.params;
-      if (t.id === v.id) {
-        if (a.unitId !== this._workbook.getUnitId())
+    return c(this._commandService.beforeCommandExecuted((t, i) => {
+      const r = t.params;
+      if (t.id === U.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(a, r) === !1)
+        if (e(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationOptions");
       }
     }));
   }
   onBeforeDeleteDataValidation(e) {
-    return g(this._commandService.beforeCommandExecuted((t, r) => {
-      const a = t.params;
-      if (t.id === T.id) {
-        if (a.unitId !== this._workbook.getUnitId())
+    return c(this._commandService.beforeCommandExecuted((t, i) => {
+      const r = t.params;
+      if (t.id === A.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(a, r) === !1)
+        if (e(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteDataValidation");
       }
     }));
   }
   onBeforeDeleteAllDataValidation(e) {
-    return g(this._commandService.beforeCommandExecuted((t, r) => {
-      const a = t.params;
+    return c(this._commandService.beforeCommandExecuted((t, i) => {
+      const r = t.params;
       if (t.id === O.id) {
-        if (a.unitId !== this._workbook.getUnitId())
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(a, r) === !1)
+        if (e(r, i) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteAllDataValidation");
       }
     }));
   }
 }
-M.extend(z);
+x.extend(z);
 class K extends N {
   getDataValidations() {
-    return this._injector.get(b).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => new m(t, this._worksheet, this._injector));
+    return this._injector.get(v).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => new _(t, this._worksheet, this._injector));
   }
   getValidatorStatus() {
     return this._injector.get(S).validatorWorksheet(
@@ -978,8 +999,8 @@ class K extends N {
     return this.getValidatorStatus();
   }
   getDataValidation(e) {
-    const r = this._injector.get(b).getRuleById(this._workbook.getUnitId(), this._worksheet.getSheetId(), e);
-    return r ? new m(r, this._worksheet, this._injector) : null;
+    const i = this._injector.get(v).getRuleById(this._workbook.getUnitId(), this._worksheet.getSheetId(), e);
+    return i ? new _(i, this._worksheet, this._injector) : null;
   }
 }
 N.extend(K);
@@ -1011,6 +1032,6 @@ class X {
 }
 $.extend(X);
 export {
-  m as FDataValidation,
-  D as FDataValidationBuilder
+  _ as FDataValidation,
+  E as FDataValidationBuilder
 };