@univerjs/sheets-data-validation 0.5.1 → 0.5.2

package/lib/es/facade.js

@@ -1,17 +1,17 @@
-var T = Object.defineProperty;
-var A = (s, e, t) => e in s ? T(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
-var l = (s, e, t) => A(s, typeof e != "symbol" ? e + "" : e, t);
-import { FRange as g, FWorkbook as S, FWorksheet as I } from "@univerjs/sheets/facade";
-import { UpdateSheetDataValidationSettingCommand as E, UpdateSheetDataValidationOptionsCommand as k, UpdateSheetDataValidationRangeCommand as D, RemoveSheetDataValidationCommand as b, ClearRangeDataValidationCommand as C, AddSheetDataValidationCommand as v, SheetsDataValidationValidatorService as u, SheetDataValidationModel as U, RemoveSheetAllDataValidationCommand as y } from "@univerjs/sheets-data-validation";
-import { generateRandomId as f, DataValidationType as r, DataValidationErrorStyle as d, DataValidationOperator as o, ICommandService as h, FUniver as L, toDisposable as n } from "@univerjs/core";
-import { DataValidationModel as w, getRuleOptions as O } from "@univerjs/data-validation";
-import { serializeRangeToRefString as R } from "@univerjs/engine-formula";
+var w = Object.defineProperty;
+var V = (s, e, t) => e in s ? w(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
+var u = (s, e, t) => V(s, typeof e != "symbol" ? e + "" : e, t);
+import { UpdateSheetDataValidationSettingCommand as f, UpdateSheetDataValidationOptionsCommand as S, UpdateSheetDataValidationRangeCommand as I, RemoveSheetDataValidationCommand as E, ClearRangeDataValidationCommand as U, AddSheetDataValidationCommand as D, SheetsDataValidationValidatorService as l, SheetDataValidationModel as T, RemoveSheetAllDataValidationCommand as A } from "@univerjs/sheets-data-validation";
+import { FRange as c, FWorkbook as k, FWorksheet as v } from "@univerjs/sheets/facade";
+import { generateRandomId as g, DataValidationType as r, DataValidationErrorStyle as _, DataValidationOperator as o, IUniverInstanceService as C, ICommandService as d, FUniver as y, toDisposable as n } from "@univerjs/core";
+import { DataValidationModel as b, getRuleOptions as L } from "@univerjs/data-validation";
+import { serializeRangeToRefString as O } from "@univerjs/engine-formula";
 import { filter as p } from "rxjs";
-class m {
+class h {
   constructor(e) {
-    l(this, "_rule");
+    u(this, "_rule");
     this._rule = e != null ? e : {
-      uid: f(),
+      uid: g(),
       ranges: void 0,
       type: r.CUSTOM
     };
@@ -22,7 +22,7 @@ class m {
    * @returns {FDataValidation} A new instance of the FDataValidation class
    */
   build() {
-    return new _(this._rule);
+    return new m(this._rule);
   }
   /**
    * Creates a duplicate of the current DataValidationBuilder object
@@ -30,9 +30,9 @@ class m {
    * @return {FDataValidationBuilder} A new instance of the DataValidationBuilder class
    */
   copy() {
-    return new m({
+    return new h({
       ...this._rule,
-      uid: f()
+      uid: g()
     });
   }
   /**
@@ -41,7 +41,7 @@ class m {
    * @returns {boolean} True if invalid data is allowed, False otherwise
    */
   getAllowInvalid() {
-    return this._rule.errorStyle !== d.STOP;
+    return this._rule.errorStyle !== _.STOP;
   }
   /**
    * Gets the data validation type of the rule
@@ -54,7 +54,7 @@ class m {
   /**
    * Gets the values used for criteria evaluation
    *
-   * @returns {any[]} An array containing the operator, formula1, and formula2 values
+   * @returns {[string, string, string]} An array containing the operator, formula1, and formula2 values
    */
   getCriteriaValues() {
     return [this._rule.operator, this._rule.formula1, this._rule.formula2];
@@ -264,7 +264,7 @@ class m {
    * @return The current instance of the FDataValidationBuilder class to allow for method chaining.
    */
   requireValueInRange(e, t, i) {
-    return this._rule.type = t ? r.LIST_MULTIPLE : r.LIST, this._rule.formula1 = `=${R({
+    return this._rule.type = t ? r.LIST_MULTIPLE : r.LIST, this._rule.formula1 = `=${O({
       unitId: e.getUnitId(),
       sheetName: e.getSheetName(),
       range: e.getRange()
@@ -279,7 +279,7 @@ class m {
    * @return The current instance of the FDataValidationBuilder class to allow for method chaining.
    */
   setAllowInvalid(e) {
-    return this._rule.errorStyle = e ? d.WARNING : d.STOP, this;
+    return this._rule.errorStyle = e ? _.WARNING : _.STOP, this;
   }
   /**
    * Sets the help text and enables the display of error messages for data validation.
@@ -315,11 +315,12 @@ class m {
     return Object.assign(this._rule, e), this;
   }
 }
-class _ {
-  constructor(e, t) {
-    l(this, "rule");
-    l(this, "_worksheet");
-    this.rule = e, this._worksheet = t;
+class m {
+  constructor(e, t, i) {
+    u(this, "rule");
+    u(this, "_worksheet");
+    u(this, "_injector");
+    this._injector = i, this.rule = e, this._worksheet = t;
   }
   /**
    * Gets whether invalid data is allowed based on the error style value.
@@ -327,7 +328,7 @@ class _ {
    * @return true if invalid data is allowed, false otherwise.
    */
   getAllowInvalid() {
-    return this.rule.errorStyle !== d.STOP;
+    return this.rule.errorStyle !== _.STOP;
   }
   /**
    * Gets the data validation type of the rule
@@ -360,7 +361,7 @@ class _ {
    * @return A new FDataValidationBuilder instance with the same rule configuration.
    */
   copy() {
-    return new m(this.rule);
+    return new h(this.rule);
   }
   /**
    * Gets whether the data validation rule is applied to the worksheet.
@@ -370,7 +371,7 @@ class _ {
   getApplied() {
     if (!this._worksheet)
       return !1;
-    const t = this._worksheet.getInject().get(w).getRuleById(this._worksheet.getWorkbook().getUnitId(), this._worksheet.getSheetId(), this.rule.uid);
+    const t = this._injector.get(b).getRuleById(this._worksheet.getUnitId(), this._worksheet.getSheetId(), this.rule.uid);
     return !!(t && t.ranges.length);
   }
   /**
@@ -379,17 +380,10 @@ class _ {
    * @returns An array of IRange objects representing the ranges to which the data validation rule is applied.
    */
   getRanges() {
-    var a;
-    if (!this.getAllowInvalid())
-      return [];
-    const e = (a = this._worksheet) == null ? void 0 : a.getWorkbook(), t = this.getSheetId();
-    if (!t)
+    if (!this.getApplied())
       return [];
-    const i = e == null ? void 0 : e.getSheetBySheetId(t);
-    return !e || !i ? [] : this.rule.ranges.map((V) => {
-      var c;
-      return (c = this._worksheet) == null ? void 0 : c.getInject().createInstance(g, e, i, V);
-    });
+    const e = this._injector.get(C).getUnit(this._worksheet.getUnitId());
+    return this.rule.ranges.map((t) => this._injector.createInstance(c, e, this._worksheet, t));
   }
   /**
    * Gets the title of the error message dialog box.
@@ -398,7 +392,7 @@ class _ {
    */
   getUnitId() {
     var e;
-    return (e = this._worksheet) == null ? void 0 : e.getWorkbook().getUnitId();
+    return (e = this._worksheet) == null ? void 0 : e.getUnitId();
   }
   /**
    * Gets the sheetId of the worksheet.
@@ -416,7 +410,7 @@ class _ {
    * @returns true if the criteria is set successfully, false otherwise.
    */
   setCriteria(e, t) {
-    return this.getApplied() && !this._worksheet.getInject().get(h).syncExecuteCommand(E.id, {
+    return this.getApplied() && !this._injector.get(d).syncExecuteCommand(f.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid,
@@ -435,12 +429,12 @@ class _ {
    * @returns true if the options are set successfully, false otherwise.
    */
   setOptions(e) {
-    return this.getApplied() && !this._worksheet.getInject().get(h).syncExecuteCommand(k.id, {
+    return this.getApplied() && !this._injector.get(d).syncExecuteCommand(S.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid,
       options: {
-        ...O(this.rule),
+        ...L(this.rule),
         ...e
       }
     }) ? !1 : (Object.assign(this.rule, e), !0);
@@ -451,29 +445,29 @@ class _ {
    * @returns true if the ranges are set successfully, false otherwise.
    */
   setRanges(e) {
-    return this.getApplied() && !this._worksheet.getInject().get(h).syncExecuteCommand(D.id, {
+    return this.getApplied() && !this._injector.get(d).syncExecuteCommand(I.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid,
       ranges: e.map((a) => a.getRange())
-    }) ? !1 : (this.rule.ranges = e, !0);
+    }) ? !1 : (this.rule.ranges = e.map((t) => t.getRange()), !0);
   }
   /**
    * Delete the data validation rule from the worksheet.
    * @returns true if the rule is deleted successfully, false otherwise.
    */
   delete() {
-    return this.getApplied() ? this._worksheet.getInject().get(h).syncExecuteCommand(b.id, {
+    return this.getApplied() ? this._injector.get(d).syncExecuteCommand(E.id, {
       unitId: this.getUnitId(),
       subUnitId: this.getSheetId(),
       ruleId: this.rule.uid
     }) : !1;
   }
 }
-class N extends g {
+class R extends c {
   async setDataValidation(e) {
     if (!e)
-      return this._commandService.executeCommand(C.id, {
+      return this._commandService.executeCommand(U.id, {
         unitId: this._workbook.getUnitId(),
         subUnitId: this._worksheet.getSheetId(),
         ranges: [this._range]
@@ -486,43 +480,49 @@ class N extends g {
         ranges: [this._range]
       }
     };
-    return await this._commandService.executeCommand(v.id, t), this;
+    return await this._commandService.executeCommand(D.id, t), this;
   }
   getDataValidation() {
-    const t = this._injector.get(u).getDataValidation(
+    const t = this._injector.get(l).getDataValidation(
       this._workbook.getUnitId(),
       this._worksheet.getSheetId(),
       [this._range]
     );
-    return t && new _(t);
+    return t && new m(t, this._worksheet, this._injector);
   }
   getDataValidations() {
-    return this._injector.get(u).getDataValidations(
+    return this._injector.get(l).getDataValidations(
       this._workbook.getUnitId(),
       this._worksheet.getSheetId(),
       [this._range]
-    ).map((t) => new _(t));
+    ).map((t) => new m(t, this._worksheet, this._injector));
   }
   async getValidatorStatus() {
-    return this._injector.get(u).validatorRanges(
+    return this._injector.get(l).validatorRanges(
       this._workbook.getUnitId(),
       this._worksheet.getSheetId(),
       [this._range]
     );
   }
 }
-g.extend(N);
-class x {
+c.extend(R);
+class N {
+  /**
+   * @deparecated use `univerAPI.newDataValidation()` as instead.
+   */
   static newDataValidation() {
-    return new m();
+    return new h();
+  }
+  newDataValidation() {
+    return new h();
   }
 }
-L.extend(x);
-class M extends S {
+y.extend(N);
+class x extends k {
   _initialize() {
     Object.defineProperty(this, "_dataValidationModel", {
       get() {
-        return this._injector.get(U);
+        return this._injector.get(T);
       }
     });
   }
@@ -531,7 +531,7 @@ class M extends S {
    * @returns matrix of validator status
    */
   getValidatorStatus() {
-    return this._injector.get(u).validatorWorkbook(this._workbook.getUnitId());
+    return this._injector.get(l).validatorWorkbook(this._workbook.getUnitId());
   }
   // region DataValidationHooks
   /**
@@ -558,7 +558,7 @@ class M extends S {
   onBeforeAddDataValidation(e) {
     return n(this._commandService.beforeCommandExecuted((t, i) => {
       const a = t.params;
-      if (t.id === v.id) {
+      if (t.id === D.id) {
         if (a.unitId !== this._workbook.getUnitId())
           return;
         if (e(a, i) === !1)
@@ -569,7 +569,7 @@ class M extends S {
   onBeforeUpdateDataValidationCriteria(e) {
     return n(this._commandService.beforeCommandExecuted((t, i) => {
       const a = t.params;
-      if (t.id === E.id) {
+      if (t.id === f.id) {
         if (a.unitId !== this._workbook.getUnitId())
           return;
         if (e(a, i) === !1)
@@ -580,7 +580,7 @@ class M extends S {
   onBeforeUpdateDataValidationRange(e) {
     return n(this._commandService.beforeCommandExecuted((t, i) => {
       const a = t.params;
-      if (t.id === D.id) {
+      if (t.id === I.id) {
         if (a.unitId !== this._workbook.getUnitId())
           return;
         if (e(a, i) === !1)
@@ -591,7 +591,7 @@ class M extends S {
   onBeforeUpdateDataValidationOptions(e) {
     return n(this._commandService.beforeCommandExecuted((t, i) => {
       const a = t.params;
-      if (t.id === k.id) {
+      if (t.id === S.id) {
         if (a.unitId !== this._workbook.getUnitId())
           return;
         if (e(a, i) === !1)
@@ -602,7 +602,7 @@ class M extends S {
   onBeforeDeleteDataValidation(e) {
     return n(this._commandService.beforeCommandExecuted((t, i) => {
       const a = t.params;
-      if (t.id === b.id) {
+      if (t.id === E.id) {
         if (a.unitId !== this._workbook.getUnitId())
           return;
         if (e(a, i) === !1)
@@ -613,7 +613,7 @@ class M extends S {
   onBeforeDeleteAllDataValidation(e) {
     return n(this._commandService.beforeCommandExecuted((t, i) => {
       const a = t.params;
-      if (t.id === y.id) {
+      if (t.id === A.id) {
         if (a.unitId !== this._workbook.getUnitId())
           return;
         if (e(a, i) === !1)
@@ -622,20 +622,20 @@ class M extends S {
     }));
   }
 }
-S.extend(M);
-class B extends I {
+k.extend(x);
+class M extends v {
   getDataValidations() {
-    return this._injector.get(w).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => new _(t));
+    return this._injector.get(b).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => new m(t, this._worksheet, this._injector));
   }
   getValidatorStatus() {
-    return this._injector.get(u).validatorWorksheet(
+    return this._injector.get(l).validatorWorksheet(
       this._workbook.getUnitId(),
       this._worksheet.getSheetId()
     );
   }
 }
-I.extend(B);
+v.extend(M);
 export {
-  _ as FDataValidation,
-  m as FDataValidationBuilder
+  m as FDataValidation,
+  h as FDataValidationBuilder
 };