@univerjs/sheets-data-validation 1.0.0-alpha.7 → 1.0.0-beta.0

package/lib/cjs/facade.js

@@ -7,7 +7,7 @@ let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_core_facade = require("@univerjs/core/facade");
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -18,7 +18,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -31,14 +31,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -80,7 +80,7 @@ function _defineProperty(e, r, t) {
 var FDataValidationBuilder = class FDataValidationBuilder {
 	constructor(rule) {
 		_defineProperty(this, "_rule", void 0);
-		this._rule = rule !== null && rule !== void 0 ? rule : {
+		this._rule = rule ?? {
 			uid: (0, _univerjs_core.generateRandomId)(),
 			ranges: void 0,
 			type: _univerjs_core.DataValidationType.CUSTOM
@@ -813,7 +813,7 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 		this._rule.type = multiple ? _univerjs_core.DataValidationType.LIST_MULTIPLE : _univerjs_core.DataValidationType.LIST;
 		this._rule.formula1 = (0, _univerjs_sheets.serializeListOptions)(values);
 		this._rule.formula2 = void 0;
-		this._rule.showDropDown = showDropdown !== null && showDropdown !== void 0 ? showDropdown : true;
+		this._rule.showDropDown = showDropdown ?? true;
 		return this;
 	}
 	/**
@@ -857,7 +857,7 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 			range: range.getRange()
 		})}`;
 		this._rule.formula2 = void 0;
-		this._rule.showDropDown = showDropdown !== null && showDropdown !== void 0 ? showDropdown : true;
+		this._rule.showDropDown = showDropdown ?? true;
 		return this;
 	}
 	/**
@@ -1397,13 +1397,6 @@ _univerjs_sheets_facade.FRange.extend(FRangeSheetsDataValidationMixin);
 //#endregion
 //#region src/facade/f-univer.ts
 var FUniverSheetsDataValidationMixin = class extends _univerjs_core_facade.FUniver {
-	/**
-	* @deprecated use `univerAPI.newDataValidation()` as instead.
-	* @returns {FDataValidationBuilder} A new instance of the FDataValidationBuilder class
-	*/
-	static newDataValidation() {
-		return new FDataValidationBuilder();
-	}
 	newDataValidation() {
 		return new FDataValidationBuilder();
 	}

package/lib/cjs/index.js

@@ -7,7 +7,7 @@ let rxjs = require("rxjs");
 let _univerjs_protocol = require("@univerjs/protocol");
 let _univerjs_sheets_formula = require("@univerjs/sheets-formula");
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -18,7 +18,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -31,14 +31,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -49,7 +49,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -57,7 +57,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -187,9 +187,8 @@ function isLegalFormulaResult(res) {
 * Judge if the data-validation's formula need to be offseted by ranges
 */
 function shouldOffsetFormulaByRange(type, validatorRegistryService) {
-	var _validator$offsetForm;
 	const validator = validatorRegistryService.getValidatorItem(type);
-	return (_validator$offsetForm = validator === null || validator === void 0 ? void 0 : validator.offsetFormulaByRange) !== null && _validator$offsetForm !== void 0 ? _validator$offsetForm : false;
+	return (validator === null || validator === void 0 ? void 0 : validator.offsetFormulaByRange) ?? false;
 }
 
 //#endregion
@@ -385,8 +384,7 @@ function getCellValueOrigin(cell) {
 	return (0, _univerjs_core.getOriginCellValue)(cell);
 }
 function getStringCellValue(cell) {
-	var _getCellValueOrigin;
-	return String((_getCellValueOrigin = getCellValueOrigin(cell)) !== null && _getCellValueOrigin !== void 0 ? _getCellValueOrigin : "");
+	return String(getCellValueOrigin(cell) ?? "");
 }
 
 //#endregion
@@ -715,8 +713,7 @@ var RuleMatrix = class RuleMatrix {
 		const mutations = [];
 		let deleteIndex = 0;
 		rules.forEach((rule, index) => {
-			var _this$_map$get;
-			const newRanges = (_this$_map$get = this._map.get(rule.uid)) !== null && _this$_map$get !== void 0 ? _this$_map$get : [];
+			const newRanges = this._map.get(rule.uid) ?? [];
 			const oldRanges = rule.ranges;
 			if (newRanges.length !== 0 && (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !_univerjs_core.Rectangle.equals(range, oldRanges[i])))) mutations.push({
 				type: "update",
@@ -740,8 +737,7 @@ var RuleMatrix = class RuleMatrix {
 		const mutations = [];
 		let deleteIndex = 0;
 		rules.forEach((rule, index) => {
-			var _this$_map$get2;
-			const newRanges = (_this$_map$get2 = this._map.get(rule.uid)) !== null && _this$_map$get2 !== void 0 ? _this$_map$get2 : [];
+			const newRanges = this._map.get(rule.uid) ?? [];
 			const oldRanges = rule.ranges;
 			if (newRanges.length !== 0 && (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !_univerjs_core.Rectangle.equals(range, oldRanges[i])))) mutations.push({
 				type: "update",
@@ -760,8 +756,7 @@ var RuleMatrix = class RuleMatrix {
 			}
 		});
 		Array.from(additionRules).forEach((rule) => {
-			var _this$_map$get3;
-			const newRanges = (_this$_map$get3 = this._map.get(rule.uid)) !== null && _this$_map$get3 !== void 0 ? _this$_map$get3 : [];
+			const newRanges = this._map.get(rule.uid) ?? [];
 			mutations.push({
 				type: "add",
 				rule: {
@@ -946,8 +941,8 @@ let SheetDataValidationModel = class SheetDataValidationModel extends _univerjs_
 				});
 				return _univerjs_core.DataValidationStatus.VALIDATING;
 			}
-			onCompete(current !== null && current !== void 0 ? current : _univerjs_core.DataValidationStatus.VALID, false);
-			return current !== null && current !== void 0 ? current : _univerjs_core.DataValidationStatus.VALID;
+			onCompete(current ?? _univerjs_core.DataValidationStatus.VALID, false);
+			return current ?? _univerjs_core.DataValidationStatus.VALID;
 		} else {
 			onCompete(_univerjs_core.DataValidationStatus.VALID, false);
 			return _univerjs_core.DataValidationStatus.VALID;
@@ -1058,15 +1053,13 @@ var BaseSheetValidator = class extends _univerjs_data_validation.BaseDataValidat
 		return this.operators.map((operator) => this.localeService.t(OperatorTextMap[operator]));
 	}
 	generateRuleName(rule) {
-		var _rule$formula, _rule$formula2;
 		if (!rule.operator) return this.localeService.t(OperatorTitleMap.NONE).replace(TYPE, this.titleStr);
-		const ruleName = this.localeService.t(OperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_rule$formula = rule.formula1) !== null && _rule$formula !== void 0 ? _rule$formula : "").replace(FORMULA2$1, (_rule$formula2 = rule.formula2) !== null && _rule$formula2 !== void 0 ? _rule$formula2 : "");
+		const ruleName = this.localeService.t(OperatorTitleMap[rule.operator]).replace(FORMULA1$1, rule.formula1 ?? "").replace(FORMULA2$1, rule.formula2 ?? "");
 		return `${this.titleStr} ${ruleName}`;
 	}
 	generateRuleErrorMessage(rule, _position) {
-		var _rule$formula3, _rule$formula4;
 		if (!rule.operator) return this.localeService.t(OperatorErrorTitleMap.NONE).replace(TYPE, this.titleStr);
-		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_rule$formula3 = rule.formula1) !== null && _rule$formula3 !== void 0 ? _rule$formula3 : "").replace(FORMULA2$1, (_rule$formula4 = rule.formula2) !== null && _rule$formula4 !== void 0 ? _rule$formula4 : "")}`;
+		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, rule.formula1 ?? "").replace(FORMULA2$1, rule.formula2 ?? "")}`;
 	}
 };
 
@@ -1093,7 +1086,7 @@ var CheckboxValidator = class extends BaseSheetValidator {
 		_defineProperty(this, "skipDefaultFontRender", (rule, cellValue, pos) => {
 			const { unitId, subUnitId } = pos;
 			const { formula1, formula2 } = this.parseFormulaSync(rule, unitId, subUnitId);
-			const valueStr = `${cellValue !== null && cellValue !== void 0 ? cellValue : ""}`;
+			const valueStr = `${cellValue ?? ""}`;
 			return !valueStr || valueStr === `${formula1}` || valueStr === `${formula2}`;
 		});
 	}
@@ -1151,7 +1144,7 @@ var CheckboxValidator = class extends BaseSheetValidator {
 		const { value, unitId, subUnitId } = cellInfo;
 		const { formula1, formula2, originFormula1, originFormula2 } = await this.parseFormula(rule, unitId, subUnitId);
 		if (!_univerjs_core.Tools.isDefine(formula1) || !_univerjs_core.Tools.isDefine(formula2)) return true;
-		return _univerjs_core.Tools.isDefine(value) && (String(value) === String(formula1) || String(value) === String(formula2) || String(value) === String(originFormula1 !== null && originFormula1 !== void 0 ? originFormula1 : "") || String(value) === String(originFormula2 !== null && originFormula2 !== void 0 ? originFormula2 : ""));
+		return _univerjs_core.Tools.isDefine(value) && (String(value) === String(formula1) || String(value) === String(formula2) || String(value) === String(originFormula1 ?? "") || String(value) === String(originFormula2 ?? ""));
 	}
 	generateRuleErrorMessage(rule) {
 		return this.localeService.t("sheets-data-validation.checkbox.error");
@@ -1377,15 +1370,14 @@ var DateValidator = class extends BaseSheetValidator {
 		return this.operators.map((operator) => this.localeService.t(DateOperatorNameMap[operator]));
 	}
 	generateRuleName(rule) {
-		var _rule$formula, _rule$formula2;
 		if (!rule.operator) return this.localeService.t(DateOperatorTitleMap.NONE);
-		const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1, (_rule$formula = rule.formula1) !== null && _rule$formula !== void 0 ? _rule$formula : "").replace(FORMULA2, (_rule$formula2 = rule.formula2) !== null && _rule$formula2 !== void 0 ? _rule$formula2 : "");
+		const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1, rule.formula1 ?? "").replace(FORMULA2, rule.formula2 ?? "");
 		return `${this.titleStr} ${ruleName}`;
 	}
 	generateRuleErrorMessage(rule, pos) {
 		if (!rule.operator) return this.titleStr;
 		const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, pos);
-		return `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 !== null && transformedFormula1 !== void 0 ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 !== null && transformedFormula2 !== void 0 ? transformedFormula2 : "")}`;
+		return `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 ?? "").replace(FORMULA2, transformedFormula2 ?? "")}`;
 	}
 };
 
@@ -1463,7 +1455,7 @@ var DecimalValidator = class extends BaseSheetValidator {
 	generateRuleErrorMessage(rule, position) {
 		if (!rule.operator) return this.localeService.t(OperatorErrorTitleMap.NONE).replace("{TYPE}", this.titleStr);
 		const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, position);
-		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 !== null && transformedFormula1 !== void 0 ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 !== null && transformedFormula2 !== void 0 ? transformedFormula2 : "")}`;
+		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 ?? "").replace(FORMULA2, transformedFormula2 ?? "")}`;
 	}
 };
 
@@ -1529,21 +1521,19 @@ var ListValidator = class extends BaseSheetValidator {
 		});
 	}
 	validatorFormula(rule, unitId, subUnitId) {
-		var _rule$formula, _this$_univerInstance;
+		var _this$_univerInstance;
 		const success = !_univerjs_core.Tools.isBlank(rule.formula1);
-		const valid = isValidListFormula((_rule$formula = rule.formula1) !== null && _rule$formula !== void 0 ? _rule$formula : "", this._lexer);
-		const sheetName = (_this$_univerInstance = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 || (_this$_univerInstance = _this$_univerInstance.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName();
-		const isIntersects = isRuleIntersects(rule, sheetName !== null && sheetName !== void 0 ? sheetName : "");
+		const valid = isValidListFormula(rule.formula1 ?? "", this._lexer);
+		const isIntersects = isRuleIntersects(rule, ((_this$_univerInstance = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 || (_this$_univerInstance = _this$_univerInstance.getSheetBySheetId(subUnitId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName()) ?? "");
 		return {
 			success: Boolean(success && valid && !isIntersects),
 			formula1: success ? valid ? !isIntersects ? void 0 : this.localeService.t("sheets-data-validation.validFail.listIntersects") : this.localeService.t("sheets-data-validation.validFail.listInvalid") : this.localeService.t("sheets-data-validation.validFail.list")
 		};
 	}
 	getExtraStyle(rule, value, { style: defaultStyle }) {
-		var _ref;
-		const tb = (_ref = defaultStyle.tb !== _univerjs_core.WrapStrategy.OVERFLOW ? defaultStyle.tb : _univerjs_core.WrapStrategy.CLIP) !== null && _ref !== void 0 ? _ref : _univerjs_core.WrapStrategy.WRAP;
+		const tb = (defaultStyle.tb !== _univerjs_core.WrapStrategy.OVERFLOW ? defaultStyle.tb : _univerjs_core.WrapStrategy.CLIP) ?? _univerjs_core.WrapStrategy.WRAP;
 		if (rule.type === _univerjs_core.DataValidationType.LIST && (rule.renderMode === _univerjs_core.DataValidationRenderMode.ARROW || rule.renderMode === _univerjs_core.DataValidationRenderMode.TEXT)) {
-			const color = this.getListWithColorMap(rule)[`${value !== null && value !== void 0 ? value : ""}`];
+			const color = this.getListWithColorMap(rule)[`${value ?? ""}`];
 			if (color) return {
 				bg: { rgb: color },
 				tb
@@ -1577,10 +1567,9 @@ var ListValidator = class extends BaseSheetValidator {
 		return this.localeService.t("sheets-data-validation.list.error");
 	}
 	_getUnitAndSubUnit(currentUnitId, currentSubUnitId) {
-		var _ref2, _ref3;
-		const workbook = (_ref2 = currentUnitId ? this._univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) !== null && _ref2 !== void 0 ? _ref2 : this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		const workbook = (currentUnitId ? this._univerInstanceService.getUnit(currentUnitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) : void 0) ?? this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return null;
-		const worksheet = (_ref3 = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) !== null && _ref3 !== void 0 ? _ref3 : workbook.getActiveSheet();
+		const worksheet = (currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) ?? workbook.getActiveSheet();
 		if (!worksheet) return null;
 		return {
 			unitId: workbook.getUnitId(),
@@ -1686,17 +1675,17 @@ var TextLengthValidator = class extends BaseSheetValidator {
 	generateRuleErrorMessage(rule, pos) {
 		if (!rule.operator) return this.titleStr;
 		const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, pos);
-		return `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 !== null && transformedFormula1 !== void 0 ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 !== null && transformedFormula2 !== void 0 ? transformedFormula2 : "")}`;
+		return `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 ?? "").replace(FORMULA2, transformedFormula2 ?? "")}`;
 	}
 };
 
 //#endregion
 //#region src/commands/commands/data-validation.command.ts
 function isBlankCell(cellData) {
-	var _cellData$p$body$data, _cellData$p$body;
+	var _cellData$p$body;
 	if (!cellData) return true;
 	if (!cellData.p) return _univerjs_core.Tools.isBlank(cellData.v);
-	return !((_cellData$p$body$data = (_cellData$p$body = cellData.p.body) === null || _cellData$p$body === void 0 ? void 0 : _cellData$p$body.dataStream) !== null && _cellData$p$body$data !== void 0 ? _cellData$p$body$data : "").slice(0, -2).trim();
+	return !(((_cellData$p$body = cellData.p.body) === null || _cellData$p$body === void 0 ? void 0 : _cellData$p$body.dataStream) ?? "").slice(0, -2).trim();
 }
 function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command", fillDefaultValue = true) {
 	const lexerTreeBuilder = accessor.get(_univerjs_engine_formula.LexerTreeBuilder);
@@ -1893,7 +1882,7 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
 			params: {
 				unitId,
 				subUnitId,
-				cellValue: redoMatrix.getData()
+				cellValue: redoMatrix.clone()
 			}
 		};
 		const undoSetRangeValues = {
@@ -2058,7 +2047,7 @@ const UpdateSheetDataValidationSettingCommand = {
 						params: {
 							unitId,
 							subUnitId,
-							cellValue: redoMatrix.getData()
+							cellValue: redoMatrix.clone()
 						}
 					};
 					const undoSetRangeValues = {
@@ -2311,7 +2300,7 @@ DataValidationFormulaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -2356,7 +2345,7 @@ let DataValidationFormulaRefRangeController = class DataValidationFormulaRefRang
 		const oldRanges = rule.ranges;
 		const oldFormula1 = rule.formula1;
 		const oldFormula2 = rule.formula2;
-		const disposable = this._formulaRefRangeService.registerRangeFormula(unitId, subUnitId, oldRanges, [oldFormula1 !== null && oldFormula1 !== void 0 ? oldFormula1 : "", oldFormula2 !== null && oldFormula2 !== void 0 ? oldFormula2 : ""], (res) => {
+		const disposable = this._formulaRefRangeService.registerRangeFormula(unitId, subUnitId, oldRanges, [oldFormula1 ?? "", oldFormula2 ?? ""], (res) => {
 			if (res.length === 0) return {
 				undos: [{
 					id: _univerjs_data_validation.AddDataValidationMutation.id,
@@ -2512,10 +2501,9 @@ let DataValidationRefRangeController = class DataValidationRefRangeController ex
 		return `${unitID}_${subUnitId}_${ruleId}`;
 	}
 	registerFormula(unitId, subUnitId, rule) {
-		var _this$_disposableMap$;
 		const ruleId = rule.uid;
 		const id = this._getIdWithUnitId(unitId, subUnitId, ruleId);
-		const disposeSet = (_this$_disposableMap$ = this._disposableMap.get(id)) !== null && _this$_disposableMap$ !== void 0 ? _this$_disposableMap$ : /* @__PURE__ */ new Set();
+		const disposeSet = this._disposableMap.get(id) ?? /* @__PURE__ */ new Set();
 		const handleFormulaChange = (type, formulaString) => {
 			const oldRule = this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
 			if (!oldRule) return {
@@ -2581,7 +2569,6 @@ let DataValidationRefRangeController = class DataValidationRefRangeController ex
 		}
 	}
 	register(unitId, subUnitId, rule) {
-		var _this$_disposableMap$2;
 		const handleRangeChange = (commandInfo) => {
 			const oldRanges = [...rule.ranges];
 			const resultRanges = oldRanges.map((range) => {
@@ -2642,7 +2629,7 @@ let DataValidationRefRangeController = class DataValidationRefRangeController ex
 			disposeList.push(() => disposable.dispose());
 		});
 		const id = this._getIdWithUnitId(unitId, subUnitId, rule.uid);
-		const current = (_this$_disposableMap$2 = this._disposableMap.get(id)) !== null && _this$_disposableMap$2 !== void 0 ? _this$_disposableMap$2 : /* @__PURE__ */ new Set();
+		const current = this._disposableMap.get(id) ?? /* @__PURE__ */ new Set();
 		current.add(() => disposeList.forEach((dispose) => dispose()));
 		this._disposableMap.set(id, current);
 	}
@@ -2704,7 +2691,7 @@ let SheetDataValidationSheetController = class SheetDataValidationSheetControlle
 				var _workbook$getActiveSh;
 				const params = commandInfo.params;
 				const unitId = params.unitId || this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getUnitId();
-				const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+				const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return {
 					redos: [],
 					undos: []
@@ -2836,9 +2823,8 @@ var CustomFormulaValidator = class extends BaseSheetValidator {
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(_univerjs_engine_formula.LexerTreeBuilder));
 	}
 	validatorFormula(rule, unitId, subUnitId) {
-		var _rule$formula;
 		const success = (0, _univerjs_core.isFormulaString)(rule.formula1);
-		const formulaText = (_rule$formula = rule.formula1) !== null && _rule$formula !== void 0 ? _rule$formula : "";
+		const formulaText = rule.formula1 ?? "";
 		const valid = this._lexerTreeBuilder.checkIfAddBracket(formulaText) === 0 && formulaText.startsWith(_univerjs_engine_formula.operatorToken.EQUALS);
 		return {
 			success: success && valid,
@@ -2870,8 +2856,7 @@ var CustomFormulaValidator = class extends BaseSheetValidator {
 		return this.localeService.t("sheets-data-validation.custom.error");
 	}
 	generateRuleName(rule) {
-		var _rule$formula2;
-		return this.localeService.t("sheets-data-validation.custom.ruleName").replace("{FORMULA1}", (_rule$formula2 = rule.formula1) !== null && _rule$formula2 !== void 0 ? _rule$formula2 : "");
+		return this.localeService.t("sheets-data-validation.custom.ruleName").replace("{FORMULA1}", rule.formula1 ?? "");
 	}
 };
 
@@ -2978,7 +2963,7 @@ var WholeValidator = class extends BaseSheetValidator {
 	generateRuleErrorMessage(rule, position) {
 		if (!rule.operator) return this.localeService.t(OperatorErrorTitleMap.NONE).replace("{TYPE}", this.titleStr);
 		const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, position);
-		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 !== null && transformedFormula1 !== void 0 ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 !== null && transformedFormula2 !== void 0 ? transformedFormula2 : "")}`;
+		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 ?? "").replace(FORMULA2, transformedFormula2 ?? "")}`;
 	}
 };
 
@@ -3154,10 +3139,7 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 		* Because during the validation process, merged cells are all marked as VALIDATING status in cache.
 		*/
 		if (mergeCells.length) mergeCells.forEach(({ resultRowIndex, resultColIndex, row, col }) => {
-			if (result[resultRowIndex][resultColIndex] === _univerjs_core.DataValidationStatus.VALIDATING) {
-				var _this$_dataValidation;
-				result[resultRowIndex][resultColIndex] = (_this$_dataValidation = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col)) !== null && _this$_dataValidation !== void 0 ? _this$_dataValidation : _univerjs_core.DataValidationStatus.VALID;
-			}
+			if (result[resultRowIndex][resultColIndex] === _univerjs_core.DataValidationStatus.VALIDATING) result[resultRowIndex][resultColIndex] = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col) ?? _univerjs_core.DataValidationStatus.VALID;
 		});
 		return result;
 	}
@@ -3271,7 +3253,7 @@ _defineProperty(UniverSheetsDataValidationPlugin, "packageName", name);
 _defineProperty(UniverSheetsDataValidationPlugin, "version", version);
 _defineProperty(UniverSheetsDataValidationPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_sheets_formula.UniverSheetsFormulaPlugin, _univerjs_data_validation.UniverDataValidationPlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_data_validation.UniverDataValidationPlugin, _univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_sheets.UniverSheetsPlugin, _univerjs_sheets_formula.UniverSheetsFormulaPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, _univerjs_core.ICommandService),
 	__decorateParam(3, _univerjs_core.IConfigService)
@@ -3286,7 +3268,7 @@ function createDefaultNewRule(accessor) {
 		type: _univerjs_core.DataValidationType.DECIMAL,
 		operator: _univerjs_core.DataValidationOperator.EQUAL,
 		formula1: "100",
-		ranges: currentRanges !== null && currentRanges !== void 0 ? currentRanges : [{
+		ranges: currentRanges ?? [{
 			startColumn: 0,
 			endColumn: 0,
 			startRow: 0,

package/lib/es/facade.js

@@ -6,7 +6,7 @@ import { serializeRangeToRefString } from "@univerjs/engine-formula";
 import { serializeListOptions } from "@univerjs/sheets";
 import { FEventName, FUniver } from "@univerjs/core/facade";
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -17,7 +17,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -30,14 +30,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -79,7 +79,7 @@ function _defineProperty(e, r, t) {
 var FDataValidationBuilder = class FDataValidationBuilder {
 	constructor(rule) {
 		_defineProperty(this, "_rule", void 0);
-		this._rule = rule !== null && rule !== void 0 ? rule : {
+		this._rule = rule ?? {
 			uid: generateRandomId(),
 			ranges: void 0,
 			type: DataValidationType.CUSTOM
@@ -812,7 +812,7 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 		this._rule.type = multiple ? DataValidationType.LIST_MULTIPLE : DataValidationType.LIST;
 		this._rule.formula1 = serializeListOptions(values);
 		this._rule.formula2 = void 0;
-		this._rule.showDropDown = showDropdown !== null && showDropdown !== void 0 ? showDropdown : true;
+		this._rule.showDropDown = showDropdown ?? true;
 		return this;
 	}
 	/**
@@ -856,7 +856,7 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 			range: range.getRange()
 		})}`;
 		this._rule.formula2 = void 0;
-		this._rule.showDropDown = showDropdown !== null && showDropdown !== void 0 ? showDropdown : true;
+		this._rule.showDropDown = showDropdown ?? true;
 		return this;
 	}
 	/**
@@ -1396,13 +1396,6 @@ FRange.extend(FRangeSheetsDataValidationMixin);
 //#endregion
 //#region src/facade/f-univer.ts
 var FUniverSheetsDataValidationMixin = class extends FUniver {
-	/**
-	* @deprecated use `univerAPI.newDataValidation()` as instead.
-	* @returns {FDataValidationBuilder} A new instance of the FDataValidationBuilder class
-	*/
-	static newDataValidation() {
-		return new FDataValidationBuilder();
-	}
 	newDataValidation() {
 		return new FDataValidationBuilder();
 	}