@univerjs/sheets-sort 0.2.4 → 0.2.6

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var M=Object.defineProperty;var j=(e,r,t)=>r in e?M(e,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[r]=t;var d=(e,r,t)=>j(e,typeof r!="symbol"?r+"":r,t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@univerjs/core"),C=require("@wendellhu/redi"),I=require("@univerjs/sheets"),$=require("@univerjs/engine-formula");var f=(e=>(e.DESC="desc",e.ASC="asc",e))(f||{});const A=e=>e.replace(/-/gi,"").replace(/'/gi,""),V=(e,r)=>{const t=e===null||e==="",o=r===null||r==="";return t&&o?0:t?1:o?-1:null},x=(e,r,t)=>{const o=typeof e=="number",n=typeof r=="number";return o&&n?e<r?t===f.ASC?-1:1:e>r?t===f.ASC?1:-1:0:o?t===f.ASC?1:-1:n?t===f.ASC?-1:1:null},L=(e,r,t)=>{const o=typeof e=="string",n=typeof r=="string";if(o&&(e=A(e.toLocaleLowerCase())),n&&(r=A(r.toLocaleLowerCase())),!o&&!n)return null;if(o&&n){const s=e,i=r;return s<i?t===f.ASC?-1:1:s>i?t===f.ASC?1:-1:0}return o?t===f.ASC?1:-1:n?t===f.ASC?-1:1:null},F=e=>!e||Object.keys(e).length===0||(e==null?void 0:e.v)==null&&(e==null?void 0:e.p)==null;var q=Object.defineProperty,B=Object.getOwnPropertyDescriptor,G=(e,r,t,o)=>{for(var n=o>1?void 0:o?B(r,t):r,s=e.length-1,i;s>=0;s--)(i=e[s])&&(n=(o?i(r,t,n):i(n))||n);return o&&n&&q(r,t,n),n},R=(e,r)=>(t,o)=>r(t,o,e);exports.SheetsSortService=class extends c.Disposable{constructor(t,o,n){super();d(this,"_compareFns",[]);this._univerInstanceService=t,this._commandService=o,this._formulaDataModel=n}mergeCheck(t){var u;const{unitId:o,subUnitId:n,range:s}=t,i=(u=this._univerInstanceService.getUnit(o))==null?void 0:u.getSheetBySheetId(n);if(!i)return!1;const l=i.getMergeData().filter(a=>c.Rectangle.contains(s,a));return l.length===0?!0:H(s,l)}emptyCheck(t){var l;const{unitId:o,subUnitId:n,range:s}=t,i=(l=this._univerInstanceService.getUnit(o))==null?void 0:l.getSheetBySheetId(n);if(!i)return!1;for(let u=s.startRow;u<=s.endRow;u++)for(let a=s.startColumn;a<=s.endColumn;a++)if(!F(i.getCellRaw(u,a)))return!0;return!1}singleCheck(t){return t.range.startRow!==t.range.endRow}formulaCheck(t){var l,u;const{unitId:o,subUnitId:n,range:s}=t,i=(u=(l=this._formulaDataModel.getArrayFormulaRange())==null?void 0:l[o])==null?void 0:u[n];for(const a in i){const S=i[Number(a)];for(const p in S){const g=S[Number(p)];if(g&&c.Rectangle.intersects(s,g))return!1}}return!0}registerCompareFn(t){this._compareFns.unshift(t)}getAllCompareFns(){return this._compareFns}applySort(t,o,n){var l;const{unitId:s,subUnitId:i}=I.getSheetCommandTarget(this._univerInstanceService)||{};this._commandService.executeCommand(w.id,{orderRules:t.orderRules,range:t.range,hasTitle:(l=t.hasTitle)!=null?l:!1,unitId:o||s,subUnitId:n||i})}};exports.SheetsSortService=G([c.OnLifecycle(c.LifecycleStages.Ready,exports.SheetsSortService),R(0,c.IUniverInstanceService),R(1,c.ICommandService),R(2,C.Inject($.FormulaDataModel))],exports.SheetsSortService);function H(e,r){const t=e.endRow-e.startRow+1,o=e.endColumn-e.startColumn+1;let n=null,s=null;const i=t*o;let l=0;for(const u of r)if(u.startRow>=e.startRow&&u.endRow<=e.endRow&&u.startColumn>=e.startColumn&&u.endColumn<=e.endColumn){const a=u.endRow-u.startRow+1,S=u.endColumn-u.startColumn+1;if(n===null&&s===null)n=a,s=S;else if(a!==n||S!==s)return!1;l+=a*S}return l===i}const w={id:"sheet.command.sort-range",type:c.CommandType.COMMAND,handler:(e,r)=>{const{range:t,orderRules:o,hasTitle:n,unitId:s,subUnitId:i}=r,l=e.get(exports.SheetsSortService),u=e.get(c.IUniverInstanceService),{worksheet:a}=I.getSheetCommandTarget(u,r)||{};if(!a)return!1;const S=a.getMergeData().filter(m=>c.Rectangle.contains(t,m)),p=S.map(m=>m.startRow),{startRow:g,endRow:P}=t,N=n?g+1:g,_=[],b=[];for(let m=N;m<=P;m++)a.getRowFiltered(m)||a.getRowRawVisible(m)!==!1&&(S.length&&!p.includes(m)||(_.push({index:m,value:W(a,m,o)}),b.push(m)));const O=l.getAllCompareFns();_.sort(J(o,z(O)));const y={};_.forEach(({index:m,value:ne},E)=>{y[b[E]]=m});const U={id:I.ReorderRangeCommand.id,params:{unitId:s,subUnitId:i,range:t,order:y}},T=e.get(c.ICommandService);return c.sequenceExecute([U],T).result}};function W(e,r,t){const o=[];return t.forEach(({colIndex:n})=>{o.push(e.getCellRaw(r,n))}),o}function z(e){return(r,t,o)=>{for(let n=0;n<e.length;n++){const s=e[n](r,t,o);if(s!=null)return s}return 0}}function J(e,r){return function(t,o){let n=null;for(let s=0;s<e.length;s++){const i=t.value[s],l=o.value[s];if(n=r(e[s].type,i,l),n!==0&&n!==null&&n!==void 0)return n}return 0}}var K=Object.defineProperty,Q=Object.getOwnPropertyDescriptor,X=(e,r,t,o)=>{for(var n=o>1?void 0:o?Q(r,t):r,s=e.length-1,i;s>=0;s--)(i=e[s])&&(n=(o?i(r,t,n):i(n))||n);return o&&n&&K(r,t,n),n},D=(e,r)=>(t,o)=>r(t,o,e);let h=class extends c.Disposable{constructor(e,r){super(),this._commandService=e,this._sortService=r,this._initCommands(),this._registerCompareFns()}_initCommands(){[w].forEach(e=>this.disposeWithMe(this._commandService.registerCommand(e)))}_registerCompareFns(){const e=(r,t,o)=>{const n=this._getCommonValue(t),s=this._getCommonValue(o),i=[V,L,x];for(let l=0;l<i.length;l++){const u=i[l](n,s,r);if(u!==null)return u}return null};this._sortService.registerCompareFn(e)}_getCommonValue(e){var t,o;if(F(e))return null;const r=(o=(t=e==null?void 0:e.p)==null?void 0:t.body)==null?void 0:o.dataStream;return r||((e==null?void 0:e.t)===c.CellValueType.NUMBER?Number.parseFloat(`${e.v}`):(e==null?void 0:e.t)===c.CellValueType.STRING?typeof e.v=="number"?e.v:`${e.v}`:(e==null?void 0:e.t)===c.CellValueType.BOOLEAN?`${e.v}`:(e==null?void 0:e.t)===c.CellValueType.FORCE_STRING?Number.parseFloat(`${e.v}`):`${e==null?void 0:e.v}`)}};h=X([c.OnLifecycle(c.LifecycleStages.Ready,h),D(0,c.ICommandService),D(1,C.Inject(exports.SheetsSortService))],h);var Y=Object.defineProperty,Z=Object.getOwnPropertyDescriptor,k=(e,r,t,o)=>{for(var n=o>1?void 0:o?Z(r,t):r,s=e.length-1,i;s>=0;s--)(i=e[s])&&(n=(o?i(r,t,n):i(n))||n);return o&&n&&Y(r,t,n),n},ee=(e,r)=>(t,o)=>r(t,o,e);const te="UNIVER_SHEETS_SORT_PLUGIN";var v;exports.UniverSheetsSortPlugin=(v=class extends c.Plugin{constructor(r,t){super(),this._injector=t}onStarting(r){[[h],[exports.SheetsSortService]].forEach(t=>r.add(t))}},d(v,"type",c.UniverInstanceType.UNIVER_SHEET),d(v,"pluginName",te),v);exports.UniverSheetsSortPlugin=k([ee(1,C.Inject(C.Injector))],exports.UniverSheetsSortPlugin);exports.SortRangeCommand=w;exports.SortType=f;
+"use strict";var __defProp=Object.defineProperty;var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value;var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __publicField=(obj,key,value)=>__defNormalProp(obj,typeof key!="symbol"?key+"":key,value);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const core=require("@univerjs/core"),sheets=require("@univerjs/sheets"),engineFormula=require("@univerjs/engine-formula");var SortType=(SortType2=>(SortType2.DESC="desc",SortType2.ASC="asc",SortType2))(SortType||{});const removeStringSymbol=__name(str=>str.replace(/-/gi,"").replace(/'/gi,""),"removeStringSymbol"),compareNull=__name((a1,a2)=>{const isA1Null=a1===null||a1==="",isA2Null=a2===null||a2==="";return isA1Null&&isA2Null?0:isA1Null?1:isA2Null?-1:null},"compareNull"),compareNumber=__name((a1,a2,type)=>{const isA1Num=typeof a1=="number",isA2Num=typeof a2=="number";return isA1Num&&isA2Num?a1<a2?type===SortType.ASC?-1:1:a1>a2?type===SortType.ASC?1:-1:0:isA1Num?type===SortType.ASC?1:-1:isA2Num?type===SortType.ASC?-1:1:null},"compareNumber"),compareString=__name((a1,a2,type)=>{const isA1Str=typeof a1=="string",isA2Str=typeof a2=="string";if(isA1Str&&(a1=removeStringSymbol(a1.toLocaleLowerCase())),isA2Str&&(a2=removeStringSymbol(a2.toLocaleLowerCase())),!isA1Str&&!isA2Str)return null;if(isA1Str&&isA2Str){const a1AsString=a1,a2AsString=a2;return a1AsString<a2AsString?type===SortType.ASC?-1:1:a1AsString>a2AsString?type===SortType.ASC?1:-1:0}return isA1Str?type===SortType.ASC?1:-1:isA2Str?type===SortType.ASC?-1:1:null},"compareString"),isNullValue=__name(cell=>!cell||Object.keys(cell).length===0||(cell==null?void 0:cell.v)==null&&(cell==null?void 0:cell.p)==null,"isNullValue");var __defProp$2=Object.defineProperty,__getOwnPropDesc$2=Object.getOwnPropertyDescriptor,__decorateClass$2=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc$2(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp$2(target,key,result),result},"__decorateClass$2"),__decorateParam$2=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam$2"),_a;exports.SheetsSortService=(_a=class extends core.Disposable{constructor(_univerInstanceService,_commandService,_formulaDataModel){super();__publicField(this,"_compareFns",[]);this._univerInstanceService=_univerInstanceService,this._commandService=_commandService,this._formulaDataModel=_formulaDataModel}mergeCheck(location){var _a4;const{unitId,subUnitId,range}=location,sheet=(_a4=this._univerInstanceService.getUnit(unitId))==null?void 0:_a4.getSheetBySheetId(subUnitId);if(!sheet)return!1;const mergeDataInRange=sheet.getMergeData().filter(merge=>core.Rectangle.contains(range,merge));return mergeDataInRange.length===0?!0:isRangeDividedEqually(range,mergeDataInRange)}emptyCheck(location){var _a4;const{unitId,subUnitId,range}=location,sheet=(_a4=this._univerInstanceService.getUnit(unitId))==null?void 0:_a4.getSheetBySheetId(subUnitId);if(!sheet)return!1;for(let row=range.startRow;row<=range.endRow;row++)for(let col=range.startColumn;col<=range.endColumn;col++)if(!isNullValue(sheet.getCellRaw(row,col)))return!0;return!1}singleCheck(location){return location.range.startRow!==location.range.endRow}formulaCheck(location){var _a4,_b;const{unitId,subUnitId,range}=location,arrayFormulaRange=(_b=(_a4=this._formulaDataModel.getArrayFormulaRange())==null?void 0:_a4[unitId])==null?void 0:_b[subUnitId];for(const row in arrayFormulaRange){const rowData=arrayFormulaRange[Number(row)];for(const col in rowData){const arrayFormula=rowData[Number(col)];if(arrayFormula&&core.Rectangle.intersects(range,arrayFormula))return!1}}return!0}registerCompareFn(fn){this._compareFns.unshift(fn)}getAllCompareFns(){return this._compareFns}applySort(sortOption,unitId,subUnitId){var _a4;const{unitId:_unitId,subUnitId:_subUnitId}=sheets.getSheetCommandTarget(this._univerInstanceService)||{};this._commandService.executeCommand(SortRangeCommand.id,{orderRules:sortOption.orderRules,range:sortOption.range,hasTitle:(_a4=sortOption.hasTitle)!=null?_a4:!1,unitId:unitId||_unitId,subUnitId:subUnitId||_subUnitId})}},__name(_a,"SheetsSortService"),_a);exports.SheetsSortService=__decorateClass$2([core.OnLifecycle(core.LifecycleStages.Ready,exports.SheetsSortService),__decorateParam$2(0,core.IUniverInstanceService),__decorateParam$2(1,core.ICommandService),__decorateParam$2(2,core.Inject(engineFormula.FormulaDataModel))],exports.SheetsSortService);function isRangeDividedEqually(range,merges){const rangeRows=range.endRow-range.startRow+1,rangeCols=range.endColumn-range.startColumn+1;let mergeRows=null,mergeCols=null;const totalArea=rangeRows*rangeCols;let totalMergeArea=0;for(const merge of merges)if(merge.startRow>=range.startRow&&merge.endRow<=range.endRow&&merge.startColumn>=range.startColumn&&merge.endColumn<=range.endColumn){const currentMergeRows=merge.endRow-merge.startRow+1,currentMergeCols=merge.endColumn-merge.startColumn+1;if(mergeRows===null&&mergeCols===null)mergeRows=currentMergeRows,mergeCols=currentMergeCols;else if(currentMergeRows!==mergeRows||currentMergeCols!==mergeCols)return!1;totalMergeArea+=currentMergeRows*currentMergeCols}return totalMergeArea===totalArea}__name(isRangeDividedEqually,"isRangeDividedEqually");const SortRangeCommand={id:"sheet.command.sort-range",type:core.CommandType.COMMAND,handler:__name((accessor,params)=>{const{range,orderRules,hasTitle,unitId,subUnitId}=params,sortService=accessor.get(exports.SheetsSortService),univerInstanceService=accessor.get(core.IUniverInstanceService),{worksheet}=sheets.getSheetCommandTarget(univerInstanceService,params)||{};if(!worksheet)return!1;const mergeDataInRange=worksheet.getMergeData().filter(mergeData=>core.Rectangle.contains(range,mergeData)),mergeMainRowIndexes=mergeDataInRange.map(mergeData=>mergeData.startRow),{startRow:rangeStartRow,endRow}=range,startRow=hasTitle?rangeStartRow+1:rangeStartRow,toReorder=[],oldOrder=[];for(let rowIndex=startRow;rowIndex<=endRow;rowIndex++)worksheet.getRowFiltered(rowIndex)||worksheet.getRowRawVisible(rowIndex)!==!1&&(mergeDataInRange.length&&!mergeMainRowIndexes.includes(rowIndex)||(toReorder.push({index:rowIndex,value:getRowCellData(worksheet,rowIndex,orderRules)}),oldOrder.push(rowIndex)));const compareFns=sortService.getAllCompareFns();toReorder.sort(reorderFnGenerator(orderRules,combineCompareFnsAsOne(compareFns)));const order={};toReorder.forEach(({index,value},oldIndex)=>{order[oldOrder[oldIndex]]=index});const reorderRangeCommand={id:sheets.ReorderRangeCommand.id,params:{unitId,subUnitId,range,order}},commandService=accessor.get(core.ICommandService);return core.sequenceExecute([reorderRangeCommand],commandService).result},"handler")};function getRowCellData(worksheet,rowIndex,orderRules){const result=[];return orderRules.forEach(({colIndex})=>{result.push(worksheet.getCellRaw(rowIndex,colIndex))}),result}__name(getRowCellData,"getRowCellData");function combineCompareFnsAsOne(compareFns){return(type,a,b)=>{for(let i=0;i<compareFns.length;i++){const res=compareFns[i](type,a,b);if(res!=null)return res}return 0}}__name(combineCompareFnsAsOne,"combineCompareFnsAsOne");function reorderFnGenerator(orderRules,valueCompare){return function(a,b){let ret=null;for(let index=0;index<orderRules.length;index++){const aCellData=a.value[index],bCellData=b.value[index];if(ret=valueCompare(orderRules[index].type,aCellData,bCellData),ret!==0&&ret!==null&&ret!==void 0)return ret}return 0}}__name(reorderFnGenerator,"reorderFnGenerator");var __defProp$1=Object.defineProperty,__getOwnPropDesc$1=Object.getOwnPropertyDescriptor,__decorateClass$1=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc$1(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp$1(target,key,result),result},"__decorateClass$1"),__decorateParam$1=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam$1"),_a2;let SheetsSortController=(_a2=class extends core.Disposable{constructor(_commandService,_sortService){super(),this._commandService=_commandService,this._sortService=_sortService,this._initCommands(),this._registerCompareFns()}_initCommands(){[SortRangeCommand].forEach(command=>this.disposeWithMe(this._commandService.registerCommand(command)))}_registerCompareFns(){const commonFn=__name((type,a,b)=>{const valueA=this._getCommonValue(a),valueB=this._getCommonValue(b),compareTypeFns=[compareNull,compareString,compareNumber];for(let i=0;i<compareTypeFns.length;i++){const res=compareTypeFns[i](valueA,valueB,type);if(res!==null)return res}return null},"commonFn");this._sortService.registerCompareFn(commonFn)}_getCommonValue(a){var _a4,_b;if(isNullValue(a))return null;const richTextValue=(_b=(_a4=a==null?void 0:a.p)==null?void 0:_a4.body)==null?void 0:_b.dataStream;return richTextValue||((a==null?void 0:a.t)===core.CellValueType.NUMBER?Number.parseFloat(`${a.v}`):(a==null?void 0:a.t)===core.CellValueType.STRING?typeof a.v=="number"?a.v:`${a.v}`:(a==null?void 0:a.t)===core.CellValueType.BOOLEAN?`${a.v}`:(a==null?void 0:a.t)===core.CellValueType.FORCE_STRING?Number.parseFloat(`${a.v}`):`${a==null?void 0:a.v}`)}},__name(_a2,"SheetsSortController"),_a2);SheetsSortController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Ready,SheetsSortController),__decorateParam$1(0,core.ICommandService),__decorateParam$1(1,core.Inject(exports.SheetsSortService))],SheetsSortController);var __defProp2=Object.defineProperty,__getOwnPropDesc=Object.getOwnPropertyDescriptor,__decorateClass=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp2(target,key,result),result},"__decorateClass"),__decorateParam=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam");const NAME="UNIVER_SHEETS_SORT_PLUGIN";var _a3;exports.UniverSheetsSortPlugin=(_a3=class extends core.Plugin{constructor(_config,_injector){super(),this._injector=_injector}onStarting(){[[SheetsSortController],[exports.SheetsSortService]].forEach(d=>this._injector.add(d))}},__name(_a3,"UniverSheetsSortPlugin"),__publicField(_a3,"type",core.UniverInstanceType.UNIVER_SHEET),__publicField(_a3,"pluginName",NAME),_a3);exports.UniverSheetsSortPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector))],exports.UniverSheetsSortPlugin);exports.SortRangeCommand=SortRangeCommand;exports.SortType=SortType;

package/lib/es/index.js

@@ -1,238 +1,242 @@
-var q = Object.defineProperty;
-var H = (e, r, n) => r in e ? q(e, r, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[r] = n;
-var v = (e, r, n) => H(e, typeof r != "symbol" ? r + "" : r, n);
-import { OnLifecycle as O, LifecycleStages as P, Disposable as E, Rectangle as R, IUniverInstanceService as U, ICommandService as w, CommandType as W, sequenceExecute as z, CellValueType as C, Plugin as J, UniverInstanceType as K } from "@univerjs/core";
-import { Inject as I, Injector as Q } from "@wendellhu/redi";
-import { getSheetCommandTarget as M, ReorderRangeCommand as X } from "@univerjs/sheets";
-import { FormulaDataModel as Y } from "@univerjs/engine-formula";
-var m = /* @__PURE__ */ ((e) => (e.DESC = "desc", e.ASC = "asc", e))(m || {});
-const F = (e) => e.replace(/-/gi, "").replace(/'/gi, ""), Z = (e, r) => {
-  const n = e === null || e === "", o = r === null || r === "";
-  return n && o ? 0 : n ? 1 : o ? -1 : null;
-}, k = (e, r, n) => {
-  const o = typeof e == "number", t = typeof r == "number";
-  return o && t ? e < r ? n === m.ASC ? -1 : 1 : e > r ? n === m.ASC ? 1 : -1 : 0 : o ? n === m.ASC ? 1 : -1 : t ? n === m.ASC ? -1 : 1 : null;
-}, ee = (e, r, n) => {
-  const o = typeof e == "string", t = typeof r == "string";
-  if (o && (e = F(e.toLocaleLowerCase())), t && (r = F(r.toLocaleLowerCase())), !o && !t)
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { OnLifecycle, LifecycleStages, Inject, Disposable, Rectangle, IUniverInstanceService, ICommandService, CommandType, sequenceExecute, CellValueType, Plugin, UniverInstanceType, Injector } from "@univerjs/core";
+import { getSheetCommandTarget, ReorderRangeCommand } from "@univerjs/sheets";
+import { FormulaDataModel } from "@univerjs/engine-formula";
+var SortType = /* @__PURE__ */ ((SortType2) => (SortType2.DESC = "desc", SortType2.ASC = "asc", SortType2))(SortType || {});
+const removeStringSymbol = /* @__PURE__ */ __name((str) => str.replace(/-/gi, "").replace(/'/gi, ""), "removeStringSymbol"), compareNull = /* @__PURE__ */ __name((a1, a2) => {
+  const isA1Null = a1 === null || a1 === "", isA2Null = a2 === null || a2 === "";
+  return isA1Null && isA2Null ? 0 : isA1Null ? 1 : isA2Null ? -1 : null;
+}, "compareNull"), compareNumber = /* @__PURE__ */ __name((a1, a2, type) => {
+  const isA1Num = typeof a1 == "number", isA2Num = typeof a2 == "number";
+  return isA1Num && isA2Num ? a1 < a2 ? type === SortType.ASC ? -1 : 1 : a1 > a2 ? type === SortType.ASC ? 1 : -1 : 0 : isA1Num ? type === SortType.ASC ? 1 : -1 : isA2Num ? type === SortType.ASC ? -1 : 1 : null;
+}, "compareNumber"), compareString = /* @__PURE__ */ __name((a1, a2, type) => {
+  const isA1Str = typeof a1 == "string", isA2Str = typeof a2 == "string";
+  if (isA1Str && (a1 = removeStringSymbol(a1.toLocaleLowerCase())), isA2Str && (a2 = removeStringSymbol(a2.toLocaleLowerCase())), !isA1Str && !isA2Str)
     return null;
-  if (o && t) {
-    const s = e, u = r;
-    return s < u ? n === m.ASC ? -1 : 1 : s > u ? n === m.ASC ? 1 : -1 : 0;
-  }
-  return o ? n === m.ASC ? 1 : -1 : t ? n === m.ASC ? -1 : 1 : null;
-}, T = (e) => !e || Object.keys(e).length === 0 || (e == null ? void 0 : e.v) == null && (e == null ? void 0 : e.p) == null;
-var re = Object.defineProperty, te = Object.getOwnPropertyDescriptor, ne = (e, r, n, o) => {
-  for (var t = o > 1 ? void 0 : o ? te(r, n) : r, s = e.length - 1, u; s >= 0; s--)
-    (u = e[s]) && (t = (o ? u(r, n, t) : u(t)) || t);
-  return o && t && re(r, n, t), t;
-}, _ = (e, r) => (n, o) => r(n, o, e);
-let d = class extends E {
-  constructor(r, n, o) {
+  if (isA1Str && isA2Str) {
+    const a1AsString = a1, a2AsString = a2;
+    return a1AsString < a2AsString ? type === SortType.ASC ? -1 : 1 : a1AsString > a2AsString ? type === SortType.ASC ? 1 : -1 : 0;
+  }
+  return isA1Str ? type === SortType.ASC ? 1 : -1 : isA2Str ? type === SortType.ASC ? -1 : 1 : null;
+}, "compareString"), isNullValue = /* @__PURE__ */ __name((cell) => !cell || Object.keys(cell).length === 0 || (cell == null ? void 0 : cell.v) == null && (cell == null ? void 0 : cell.p) == null, "isNullValue");
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$2(target, key, result), result;
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a;
+let SheetsSortService = (_a = class extends Disposable {
+  constructor(_univerInstanceService, _commandService, _formulaDataModel) {
     super();
-    v(this, "_compareFns", []);
-    this._univerInstanceService = r, this._commandService = n, this._formulaDataModel = o;
+    __publicField(this, "_compareFns", []);
+    this._univerInstanceService = _univerInstanceService, this._commandService = _commandService, this._formulaDataModel = _formulaDataModel;
   }
-  mergeCheck(r) {
-    var l;
-    const { unitId: n, subUnitId: o, range: t } = r, s = (l = this._univerInstanceService.getUnit(n)) == null ? void 0 : l.getSheetBySheetId(o);
-    if (!s)
+  mergeCheck(location) {
+    var _a4;
+    const { unitId, subUnitId, range } = location, sheet = (_a4 = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _a4.getSheetBySheetId(subUnitId);
+    if (!sheet)
       return !1;
-    const u = s.getMergeData().filter((i) => R.contains(t, i));
-    return u.length === 0 ? !0 : oe(t, u);
+    const mergeDataInRange = sheet.getMergeData().filter((merge) => Rectangle.contains(range, merge));
+    return mergeDataInRange.length === 0 ? !0 : isRangeDividedEqually(range, mergeDataInRange);
   }
-  emptyCheck(r) {
-    var u;
-    const { unitId: n, subUnitId: o, range: t } = r, s = (u = this._univerInstanceService.getUnit(n)) == null ? void 0 : u.getSheetBySheetId(o);
-    if (!s)
+  emptyCheck(location) {
+    var _a4;
+    const { unitId, subUnitId, range } = location, sheet = (_a4 = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _a4.getSheetBySheetId(subUnitId);
+    if (!sheet)
       return !1;
-    for (let l = t.startRow; l <= t.endRow; l++)
-      for (let i = t.startColumn; i <= t.endColumn; i++)
-        if (!T(s.getCellRaw(l, i)))
+    for (let row = range.startRow; row <= range.endRow; row++)
+      for (let col = range.startColumn; col <= range.endColumn; col++)
+        if (!isNullValue(sheet.getCellRaw(row, col)))
           return !0;
     return !1;
   }
-  singleCheck(r) {
-    return r.range.startRow !== r.range.endRow;
-  }
-  formulaCheck(r) {
-    var u, l;
-    const { unitId: n, subUnitId: o, range: t } = r, s = (l = (u = this._formulaDataModel.getArrayFormulaRange()) == null ? void 0 : u[n]) == null ? void 0 : l[o];
-    for (const i in s) {
-      const a = s[Number(i)];
-      for (const f in a) {
-        const g = a[Number(f)];
-        if (g && R.intersects(t, g))
+  singleCheck(location) {
+    return location.range.startRow !== location.range.endRow;
+  }
+  formulaCheck(location) {
+    var _a4, _b;
+    const { unitId, subUnitId, range } = location, arrayFormulaRange = (_b = (_a4 = this._formulaDataModel.getArrayFormulaRange()) == null ? void 0 : _a4[unitId]) == null ? void 0 : _b[subUnitId];
+    for (const row in arrayFormulaRange) {
+      const rowData = arrayFormulaRange[Number(row)];
+      for (const col in rowData) {
+        const arrayFormula = rowData[Number(col)];
+        if (arrayFormula && Rectangle.intersects(range, arrayFormula))
           return !1;
       }
     }
     return !0;
   }
-  registerCompareFn(r) {
-    this._compareFns.unshift(r);
+  registerCompareFn(fn) {
+    this._compareFns.unshift(fn);
   }
   getAllCompareFns() {
     return this._compareFns;
   }
-  applySort(r, n, o) {
-    var u;
-    const { unitId: t, subUnitId: s } = M(this._univerInstanceService) || {};
-    this._commandService.executeCommand($.id, {
-      orderRules: r.orderRules,
-      range: r.range,
-      hasTitle: (u = r.hasTitle) != null ? u : !1,
-      unitId: n || t,
-      subUnitId: o || s
+  applySort(sortOption, unitId, subUnitId) {
+    var _a4;
+    const { unitId: _unitId, subUnitId: _subUnitId } = getSheetCommandTarget(this._univerInstanceService) || {};
+    this._commandService.executeCommand(SortRangeCommand.id, {
+      orderRules: sortOption.orderRules,
+      range: sortOption.range,
+      hasTitle: (_a4 = sortOption.hasTitle) != null ? _a4 : !1,
+      unitId: unitId || _unitId,
+      subUnitId: subUnitId || _subUnitId
     });
   }
-};
-d = ne([
-  O(P.Ready, d),
-  _(0, U),
-  _(1, w),
-  _(2, I(Y))
-], d);
-function oe(e, r) {
-  const n = e.endRow - e.startRow + 1, o = e.endColumn - e.startColumn + 1;
-  let t = null, s = null;
-  const u = n * o;
-  let l = 0;
-  for (const i of r)
-    if (i.startRow >= e.startRow && i.endRow <= e.endRow && i.startColumn >= e.startColumn && i.endColumn <= e.endColumn) {
-      const a = i.endRow - i.startRow + 1, f = i.endColumn - i.startColumn + 1;
-      if (t === null && s === null)
-        t = a, s = f;
-      else if (a !== t || f !== s)
+}, __name(_a, "SheetsSortService"), _a);
+SheetsSortService = __decorateClass$2([
+  OnLifecycle(LifecycleStages.Ready, SheetsSortService),
+  __decorateParam$2(0, IUniverInstanceService),
+  __decorateParam$2(1, ICommandService),
+  __decorateParam$2(2, Inject(FormulaDataModel))
+], SheetsSortService);
+function isRangeDividedEqually(range, merges) {
+  const rangeRows = range.endRow - range.startRow + 1, rangeCols = range.endColumn - range.startColumn + 1;
+  let mergeRows = null, mergeCols = null;
+  const totalArea = rangeRows * rangeCols;
+  let totalMergeArea = 0;
+  for (const merge of merges)
+    if (merge.startRow >= range.startRow && merge.endRow <= range.endRow && merge.startColumn >= range.startColumn && merge.endColumn <= range.endColumn) {
+      const currentMergeRows = merge.endRow - merge.startRow + 1, currentMergeCols = merge.endColumn - merge.startColumn + 1;
+      if (mergeRows === null && mergeCols === null)
+        mergeRows = currentMergeRows, mergeCols = currentMergeCols;
+      else if (currentMergeRows !== mergeRows || currentMergeCols !== mergeCols)
         return !1;
-      l += a * f;
+      totalMergeArea += currentMergeRows * currentMergeCols;
     }
-  return l === u;
+  return totalMergeArea === totalArea;
 }
-const $ = {
+__name(isRangeDividedEqually, "isRangeDividedEqually");
+const SortRangeCommand = {
   id: "sheet.command.sort-range",
-  type: W.COMMAND,
-  handler: (e, r) => {
-    const { range: n, orderRules: o, hasTitle: t, unitId: s, subUnitId: u } = r, l = e.get(d), i = e.get(U), { worksheet: a } = M(i, r) || {};
-    if (!a)
+  type: CommandType.COMMAND,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const { range, orderRules, hasTitle, unitId, subUnitId } = params, sortService = accessor.get(SheetsSortService), univerInstanceService = accessor.get(IUniverInstanceService), { worksheet } = getSheetCommandTarget(univerInstanceService, params) || {};
+    if (!worksheet)
       return !1;
-    const f = a.getMergeData().filter((c) => R.contains(n, c)), g = f.map((c) => c.startRow), { startRow: b, endRow: x } = n, j = t ? b + 1 : b, S = [], A = [];
-    for (let c = j; c <= x; c++)
-      a.getRowFiltered(c) || a.getRowRawVisible(c) !== !1 && (f.length && !g.includes(c) || (S.push({
-        index: c,
-        value: se(a, c, o)
-      }), A.push(c)));
-    const V = l.getAllCompareFns();
-    S.sort(ie(o, ue(V)));
-    const D = {};
-    S.forEach(({ index: c, value: he }, G) => {
-      D[A[G]] = c;
+    const mergeDataInRange = worksheet.getMergeData().filter((mergeData) => Rectangle.contains(range, mergeData)), mergeMainRowIndexes = mergeDataInRange.map((mergeData) => mergeData.startRow), { startRow: rangeStartRow, endRow } = range, startRow = hasTitle ? rangeStartRow + 1 : rangeStartRow, toReorder = [], oldOrder = [];
+    for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++)
+      worksheet.getRowFiltered(rowIndex) || worksheet.getRowRawVisible(rowIndex) !== !1 && (mergeDataInRange.length && !mergeMainRowIndexes.includes(rowIndex) || (toReorder.push({
+        index: rowIndex,
+        value: getRowCellData(worksheet, rowIndex, orderRules)
+      }), oldOrder.push(rowIndex)));
+    const compareFns = sortService.getAllCompareFns();
+    toReorder.sort(reorderFnGenerator(orderRules, combineCompareFnsAsOne(compareFns)));
+    const order = {};
+    toReorder.forEach(({ index, value }, oldIndex) => {
+      order[oldOrder[oldIndex]] = index;
     });
-    const L = {
-      id: X.id,
+    const reorderRangeCommand = {
+      id: ReorderRangeCommand.id,
       params: {
-        unitId: s,
-        subUnitId: u,
-        range: n,
-        order: D
+        unitId,
+        subUnitId,
+        range,
+        order
       }
-    }, B = e.get(w);
-    return z([L], B).result;
-  }
+    }, commandService = accessor.get(ICommandService);
+    return sequenceExecute([reorderRangeCommand], commandService).result;
+  }, "handler")
 };
-function se(e, r, n) {
-  const o = [];
-  return n.forEach(({ colIndex: t }) => {
-    o.push(e.getCellRaw(r, t));
-  }), o;
+function getRowCellData(worksheet, rowIndex, orderRules) {
+  const result = [];
+  return orderRules.forEach(({ colIndex }) => {
+    result.push(worksheet.getCellRaw(rowIndex, colIndex));
+  }), result;
 }
-function ue(e) {
-  return (r, n, o) => {
-    for (let t = 0; t < e.length; t++) {
-      const s = e[t](r, n, o);
-      if (s != null)
-        return s;
+__name(getRowCellData, "getRowCellData");
+function combineCompareFnsAsOne(compareFns) {
+  return (type, a, b) => {
+    for (let i = 0; i < compareFns.length; i++) {
+      const res = compareFns[i](type, a, b);
+      if (res != null)
+        return res;
     }
     return 0;
   };
 }
-function ie(e, r) {
-  return function(n, o) {
-    let t = null;
-    for (let s = 0; s < e.length; s++) {
-      const u = n.value[s], l = o.value[s];
-      if (t = r(e[s].type, u, l), t !== 0 && t !== null && t !== void 0)
-        return t;
+__name(combineCompareFnsAsOne, "combineCompareFnsAsOne");
+function reorderFnGenerator(orderRules, valueCompare) {
+  return function(a, b) {
+    let ret = null;
+    for (let index = 0; index < orderRules.length; index++) {
+      const aCellData = a.value[index], bCellData = b.value[index];
+      if (ret = valueCompare(orderRules[index].type, aCellData, bCellData), ret !== 0 && ret !== null && ret !== void 0)
+        return ret;
     }
     return 0;
   };
 }
-var le = Object.defineProperty, ce = Object.getOwnPropertyDescriptor, ae = (e, r, n, o) => {
-  for (var t = o > 1 ? void 0 : o ? ce(r, n) : r, s = e.length - 1, u; s >= 0; s--)
-    (u = e[s]) && (t = (o ? u(r, n, t) : u(t)) || t);
-  return o && t && le(r, n, t), t;
-}, N = (e, r) => (n, o) => r(n, o, e);
-let p = class extends E {
-  constructor(e, r) {
-    super(), this._commandService = e, this._sortService = r, this._initCommands(), this._registerCompareFns();
+__name(reorderFnGenerator, "reorderFnGenerator");
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a2;
+let SheetsSortController = (_a2 = class extends Disposable {
+  constructor(_commandService, _sortService) {
+    super(), this._commandService = _commandService, this._sortService = _sortService, this._initCommands(), this._registerCompareFns();
   }
   _initCommands() {
     [
-      $
-    ].forEach((e) => this.disposeWithMe(this._commandService.registerCommand(e)));
+      SortRangeCommand
+    ].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
   }
   _registerCompareFns() {
-    const e = (r, n, o) => {
-      const t = this._getCommonValue(n), s = this._getCommonValue(o), u = [
-        Z,
-        ee,
-        k
+    const commonFn = /* @__PURE__ */ __name((type, a, b) => {
+      const valueA = this._getCommonValue(a), valueB = this._getCommonValue(b), compareTypeFns = [
+        compareNull,
+        compareString,
+        compareNumber
       ];
-      for (let l = 0; l < u.length; l++) {
-        const i = u[l](t, s, r);
-        if (i !== null)
-          return i;
+      for (let i = 0; i < compareTypeFns.length; i++) {
+        const res = compareTypeFns[i](valueA, valueB, type);
+        if (res !== null)
+          return res;
       }
       return null;
-    };
-    this._sortService.registerCompareFn(e);
+    }, "commonFn");
+    this._sortService.registerCompareFn(commonFn);
   }
-  _getCommonValue(e) {
-    var n, o;
-    if (T(e))
+  _getCommonValue(a) {
+    var _a4, _b;
+    if (isNullValue(a))
       return null;
-    const r = (o = (n = e == null ? void 0 : e.p) == null ? void 0 : n.body) == null ? void 0 : o.dataStream;
-    return r || ((e == null ? void 0 : e.t) === C.NUMBER ? Number.parseFloat(`${e.v}`) : (e == null ? void 0 : e.t) === C.STRING ? typeof e.v == "number" ? e.v : `${e.v}` : (e == null ? void 0 : e.t) === C.BOOLEAN ? `${e.v}` : (e == null ? void 0 : e.t) === C.FORCE_STRING ? Number.parseFloat(`${e.v}`) : `${e == null ? void 0 : e.v}`);
-  }
-};
-p = ae([
-  O(P.Ready, p),
-  N(0, w),
-  N(1, I(d))
-], p);
-var me = Object.defineProperty, fe = Object.getOwnPropertyDescriptor, de = (e, r, n, o) => {
-  for (var t = o > 1 ? void 0 : o ? fe(r, n) : r, s = e.length - 1, u; s >= 0; s--)
-    (u = e[s]) && (t = (o ? u(r, n, t) : u(t)) || t);
-  return o && t && me(r, n, t), t;
-}, ge = (e, r) => (n, o) => r(n, o, e);
-const ve = "UNIVER_SHEETS_SORT_PLUGIN";
-var h;
-let y = (h = class extends J {
-  constructor(e, r) {
-    super(), this._injector = r;
-  }
-  onStarting(e) {
+    const richTextValue = (_b = (_a4 = a == null ? void 0 : a.p) == null ? void 0 : _a4.body) == null ? void 0 : _b.dataStream;
+    return richTextValue || ((a == null ? void 0 : a.t) === CellValueType.NUMBER ? Number.parseFloat(`${a.v}`) : (a == null ? void 0 : a.t) === CellValueType.STRING ? typeof a.v == "number" ? a.v : `${a.v}` : (a == null ? void 0 : a.t) === CellValueType.BOOLEAN ? `${a.v}` : (a == null ? void 0 : a.t) === CellValueType.FORCE_STRING ? Number.parseFloat(`${a.v}`) : `${a == null ? void 0 : a.v}`);
+  }
+}, __name(_a2, "SheetsSortController"), _a2);
+SheetsSortController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Ready, SheetsSortController),
+  __decorateParam$1(0, ICommandService),
+  __decorateParam$1(1, Inject(SheetsSortService))
+], SheetsSortController);
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam");
+const NAME = "UNIVER_SHEETS_SORT_PLUGIN";
+var _a3;
+let UniverSheetsSortPlugin = (_a3 = class extends Plugin {
+  constructor(_config, _injector) {
+    super(), this._injector = _injector;
+  }
+  onStarting() {
     [
-      [p],
-      [d]
-    ].forEach((r) => e.add(r));
-  }
-}, v(h, "type", K.UNIVER_SHEET), v(h, "pluginName", ve), h);
-y = de([
-  ge(1, I(Q))
-], y);
+      [SheetsSortController],
+      [SheetsSortService]
+    ].forEach((d) => this._injector.add(d));
+  }
+}, __name(_a3, "UniverSheetsSortPlugin"), __publicField(_a3, "type", UniverInstanceType.UNIVER_SHEET), __publicField(_a3, "pluginName", NAME), _a3);
+UniverSheetsSortPlugin = __decorateClass([
+  __decorateParam(1, Inject(Injector))
+], UniverSheetsSortPlugin);
 export {
-  d as SheetsSortService,
-  $ as SortRangeCommand,
-  m as SortType,
-  y as UniverSheetsSortPlugin
+  SheetsSortService,
+  SortRangeCommand,
+  SortType,
+  UniverSheetsSortPlugin
 };

package/lib/types/commands/commands/__tests__/create-command-test-bed.d.ts

@@ -1,5 +1,4 @@
-import { IWorkbookData, Univer, Workbook } from '@univerjs/core';
-import { Dependency, Injector } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Workbook, Injector, Univer } from '@univerjs/core';
 
 export interface ITestBed {
     univer: Univer;

package/lib/types/plugin.d.ts

@@ -1,10 +1,9 @@
-import { Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export declare class UniverSheetsSortPlugin extends Plugin {
     protected readonly _injector: Injector;
     static type: UniverInstanceType;
     static pluginName: string;
     constructor(_config: unknown, _injector: Injector);
-    onStarting(injector: Injector): void;
+    onStarting(): void;
 }

package/lib/umd/index.js

@@ -1 +1 @@
-(function(l,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("@univerjs/core"),require("@wendellhu/redi"),require("@univerjs/sheets"),require("@univerjs/engine-formula")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@wendellhu/redi","@univerjs/sheets","@univerjs/engine-formula"],i):(l=typeof globalThis<"u"?globalThis:l||self,i(l.UniverSheetsSort={},l.UniverCore,l["@wendellhu/redi"],l.UniverSheets,l.UniverEngineFormula))})(this,function(l,i,S,p,P){"use strict";var te=Object.defineProperty;var re=(l,i,S)=>i in l?te(l,i,{enumerable:!0,configurable:!0,writable:!0,value:S}):l[i]=S;var _=(l,i,S)=>re(l,typeof i!="symbol"?i+"":i,S);var C;var d=(e=>(e.DESC="desc",e.ASC="asc",e))(d||{});const b=e=>e.replace(/-/gi,"").replace(/'/gi,""),N=(e,s)=>{const t=e===null||e==="",n=s===null||s==="";return t&&n?0:t?1:n?-1:null},O=(e,s,t)=>{const n=typeof e=="number",r=typeof s=="number";return n&&r?e<s?t===d.ASC?-1:1:e>s?t===d.ASC?1:-1:0:n?t===d.ASC?1:-1:r?t===d.ASC?-1:1:null},T=(e,s,t)=>{const n=typeof e=="string",r=typeof s=="string";if(n&&(e=b(e.toLocaleLowerCase())),r&&(s=b(s.toLocaleLowerCase())),!n&&!r)return null;if(n&&r){const o=e,u=s;return o<u?t===d.ASC?-1:1:o>u?t===d.ASC?1:-1:0}return n?t===d.ASC?1:-1:r?t===d.ASC?-1:1:null},A=e=>!e||Object.keys(e).length===0||(e==null?void 0:e.v)==null&&(e==null?void 0:e.p)==null;var j=Object.defineProperty,E=Object.getOwnPropertyDescriptor,M=(e,s,t,n)=>{for(var r=n>1?void 0:n?E(s,t):s,o=e.length-1,u;o>=0;o--)(u=e[o])&&(r=(n?u(s,t,r):u(r))||r);return n&&r&&j(s,t,r),r},R=(e,s)=>(t,n)=>s(t,n,e);l.SheetsSortService=class extends i.Disposable{constructor(t,n,r){super();_(this,"_compareFns",[]);this._univerInstanceService=t,this._commandService=n,this._formulaDataModel=r}mergeCheck(t){var a;const{unitId:n,subUnitId:r,range:o}=t,u=(a=this._univerInstanceService.getUnit(n))==null?void 0:a.getSheetBySheetId(r);if(!u)return!1;const c=u.getMergeData().filter(f=>i.Rectangle.contains(o,f));return c.length===0?!0:$(o,c)}emptyCheck(t){var c;const{unitId:n,subUnitId:r,range:o}=t,u=(c=this._univerInstanceService.getUnit(n))==null?void 0:c.getSheetBySheetId(r);if(!u)return!1;for(let a=o.startRow;a<=o.endRow;a++)for(let f=o.startColumn;f<=o.endColumn;f++)if(!A(u.getCellRaw(a,f)))return!0;return!1}singleCheck(t){return t.range.startRow!==t.range.endRow}formulaCheck(t){var c,a;const{unitId:n,subUnitId:r,range:o}=t,u=(a=(c=this._formulaDataModel.getArrayFormulaRange())==null?void 0:c[n])==null?void 0:a[r];for(const f in u){const v=u[Number(f)];for(const I in v){const g=v[Number(I)];if(g&&i.Rectangle.intersects(o,g))return!1}}return!0}registerCompareFn(t){this._compareFns.unshift(t)}getAllCompareFns(){return this._compareFns}applySort(t,n,r){var c;const{unitId:o,subUnitId:u}=p.getSheetCommandTarget(this._univerInstanceService)||{};this._commandService.executeCommand(w.id,{orderRules:t.orderRules,range:t.range,hasTitle:(c=t.hasTitle)!=null?c:!1,unitId:n||o,subUnitId:r||u})}},l.SheetsSortService=M([i.OnLifecycle(i.LifecycleStages.Ready,l.SheetsSortService),R(0,i.IUniverInstanceService),R(1,i.ICommandService),R(2,S.Inject(P.FormulaDataModel))],l.SheetsSortService);function $(e,s){const t=e.endRow-e.startRow+1,n=e.endColumn-e.startColumn+1;let r=null,o=null;const u=t*n;let c=0;for(const a of s)if(a.startRow>=e.startRow&&a.endRow<=e.endRow&&a.startColumn>=e.startColumn&&a.endColumn<=e.endColumn){const f=a.endRow-a.startRow+1,v=a.endColumn-a.startColumn+1;if(r===null&&o===null)r=f,o=v;else if(f!==r||v!==o)return!1;c+=f*v}return c===u}const w={id:"sheet.command.sort-range",type:i.CommandType.COMMAND,handler:(e,s)=>{const{range:t,orderRules:n,hasTitle:r,unitId:o,subUnitId:u}=s,c=e.get(l.SheetsSortService),a=e.get(i.IUniverInstanceService),{worksheet:f}=p.getSheetCommandTarget(a,s)||{};if(!f)return!1;const v=f.getMergeData().filter(m=>i.Rectangle.contains(t,m)),I=v.map(m=>m.startRow),{startRow:g,endRow:Q}=t,X=r?g+1:g,y=[],D=[];for(let m=X;m<=Q;m++)f.getRowFiltered(m)||f.getRowRawVisible(m)!==!1&&(v.length&&!I.includes(m)||(y.push({index:m,value:V(f,m,n)}),D.push(m)));const Y=c.getAllCompareFns();y.sort(q(n,L(Y)));const F={};y.forEach(({index:m,value:se},ee)=>{F[D[ee]]=m});const Z={id:p.ReorderRangeCommand.id,params:{unitId:o,subUnitId:u,range:t,order:F}},k=e.get(i.ICommandService);return i.sequenceExecute([Z],k).result}};function V(e,s,t){const n=[];return t.forEach(({colIndex:r})=>{n.push(e.getCellRaw(s,r))}),n}function L(e){return(s,t,n)=>{for(let r=0;r<e.length;r++){const o=e[r](s,t,n);if(o!=null)return o}return 0}}function q(e,s){return function(t,n){let r=null;for(let o=0;o<e.length;o++){const u=t.value[o],c=n.value[o];if(r=s(e[o].type,u,c),r!==0&&r!==null&&r!==void 0)return r}return 0}}var B=Object.defineProperty,G=Object.getOwnPropertyDescriptor,H=(e,s,t,n)=>{for(var r=n>1?void 0:n?G(s,t):s,o=e.length-1,u;o>=0;o--)(u=e[o])&&(r=(n?u(s,t,r):u(r))||r);return n&&r&&B(s,t,r),r},U=(e,s)=>(t,n)=>s(t,n,e);let h=class extends i.Disposable{constructor(e,s){super(),this._commandService=e,this._sortService=s,this._initCommands(),this._registerCompareFns()}_initCommands(){[w].forEach(e=>this.disposeWithMe(this._commandService.registerCommand(e)))}_registerCompareFns(){const e=(s,t,n)=>{const r=this._getCommonValue(t),o=this._getCommonValue(n),u=[N,T,O];for(let c=0;c<u.length;c++){const a=u[c](r,o,s);if(a!==null)return a}return null};this._sortService.registerCompareFn(e)}_getCommonValue(e){var t,n;if(A(e))return null;const s=(n=(t=e==null?void 0:e.p)==null?void 0:t.body)==null?void 0:n.dataStream;return s||((e==null?void 0:e.t)===i.CellValueType.NUMBER?Number.parseFloat(`${e.v}`):(e==null?void 0:e.t)===i.CellValueType.STRING?typeof e.v=="number"?e.v:`${e.v}`:(e==null?void 0:e.t)===i.CellValueType.BOOLEAN?`${e.v}`:(e==null?void 0:e.t)===i.CellValueType.FORCE_STRING?Number.parseFloat(`${e.v}`):`${e==null?void 0:e.v}`)}};h=H([i.OnLifecycle(i.LifecycleStages.Ready,h),U(0,i.ICommandService),U(1,S.Inject(l.SheetsSortService))],h);var x=Object.defineProperty,W=Object.getOwnPropertyDescriptor,z=(e,s,t,n)=>{for(var r=n>1?void 0:n?W(s,t):s,o=e.length-1,u;o>=0;o--)(u=e[o])&&(r=(n?u(s,t,r):u(r))||r);return n&&r&&x(s,t,r),r},J=(e,s)=>(t,n)=>s(t,n,e);const K="UNIVER_SHEETS_SORT_PLUGIN";l.UniverSheetsSortPlugin=(C=class extends i.Plugin{constructor(s,t){super(),this._injector=t}onStarting(s){[[h],[l.SheetsSortService]].forEach(t=>s.add(t))}},_(C,"type",i.UniverInstanceType.UNIVER_SHEET),_(C,"pluginName",K),C),l.UniverSheetsSortPlugin=z([J(1,S.Inject(S.Injector))],l.UniverSheetsSortPlugin),l.SortRangeCommand=w,l.SortType=d,Object.defineProperty(l,Symbol.toStringTag,{value:"Module"})});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?factory(exports,require("@univerjs/core"),require("@univerjs/sheets"),require("@univerjs/engine-formula")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@univerjs/sheets","@univerjs/engine-formula"],factory):(global=typeof globalThis<"u"?globalThis:global||self,factory(global.UniverSheetsSort={},global.UniverCore,global.UniverSheets,global.UniverEngineFormula))})(this,function(exports2,core,sheets,engineFormula){"use strict";var __defProp=Object.defineProperty;var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value;var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __publicField=(obj,key,value)=>__defNormalProp(obj,typeof key!="symbol"?key+"":key,value);var _a,_b,_c;var SortType=(SortType2=>(SortType2.DESC="desc",SortType2.ASC="asc",SortType2))(SortType||{});const removeStringSymbol=__name(str=>str.replace(/-/gi,"").replace(/'/gi,""),"removeStringSymbol"),compareNull=__name((a1,a2)=>{const isA1Null=a1===null||a1==="",isA2Null=a2===null||a2==="";return isA1Null&&isA2Null?0:isA1Null?1:isA2Null?-1:null},"compareNull"),compareNumber=__name((a1,a2,type)=>{const isA1Num=typeof a1=="number",isA2Num=typeof a2=="number";return isA1Num&&isA2Num?a1<a2?type===SortType.ASC?-1:1:a1>a2?type===SortType.ASC?1:-1:0:isA1Num?type===SortType.ASC?1:-1:isA2Num?type===SortType.ASC?-1:1:null},"compareNumber"),compareString=__name((a1,a2,type)=>{const isA1Str=typeof a1=="string",isA2Str=typeof a2=="string";if(isA1Str&&(a1=removeStringSymbol(a1.toLocaleLowerCase())),isA2Str&&(a2=removeStringSymbol(a2.toLocaleLowerCase())),!isA1Str&&!isA2Str)return null;if(isA1Str&&isA2Str){const a1AsString=a1,a2AsString=a2;return a1AsString<a2AsString?type===SortType.ASC?-1:1:a1AsString>a2AsString?type===SortType.ASC?1:-1:0}return isA1Str?type===SortType.ASC?1:-1:isA2Str?type===SortType.ASC?-1:1:null},"compareString"),isNullValue=__name(cell=>!cell||Object.keys(cell).length===0||(cell==null?void 0:cell.v)==null&&(cell==null?void 0:cell.p)==null,"isNullValue");var __defProp$2=Object.defineProperty,__getOwnPropDesc$2=Object.getOwnPropertyDescriptor,__decorateClass$2=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc$2(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp$2(target,key,result),result},"__decorateClass$2"),__decorateParam$2=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam$2");exports2.SheetsSortService=(_a=class extends core.Disposable{constructor(_univerInstanceService,_commandService,_formulaDataModel){super();__publicField(this,"_compareFns",[]);this._univerInstanceService=_univerInstanceService,this._commandService=_commandService,this._formulaDataModel=_formulaDataModel}mergeCheck(location){var _a2;const{unitId,subUnitId,range}=location,sheet=(_a2=this._univerInstanceService.getUnit(unitId))==null?void 0:_a2.getSheetBySheetId(subUnitId);if(!sheet)return!1;const mergeDataInRange=sheet.getMergeData().filter(merge=>core.Rectangle.contains(range,merge));return mergeDataInRange.length===0?!0:isRangeDividedEqually(range,mergeDataInRange)}emptyCheck(location){var _a2;const{unitId,subUnitId,range}=location,sheet=(_a2=this._univerInstanceService.getUnit(unitId))==null?void 0:_a2.getSheetBySheetId(subUnitId);if(!sheet)return!1;for(let row=range.startRow;row<=range.endRow;row++)for(let col=range.startColumn;col<=range.endColumn;col++)if(!isNullValue(sheet.getCellRaw(row,col)))return!0;return!1}singleCheck(location){return location.range.startRow!==location.range.endRow}formulaCheck(location){var _a2,_b2;const{unitId,subUnitId,range}=location,arrayFormulaRange=(_b2=(_a2=this._formulaDataModel.getArrayFormulaRange())==null?void 0:_a2[unitId])==null?void 0:_b2[subUnitId];for(const row in arrayFormulaRange){const rowData=arrayFormulaRange[Number(row)];for(const col in rowData){const arrayFormula=rowData[Number(col)];if(arrayFormula&&core.Rectangle.intersects(range,arrayFormula))return!1}}return!0}registerCompareFn(fn){this._compareFns.unshift(fn)}getAllCompareFns(){return this._compareFns}applySort(sortOption,unitId,subUnitId){var _a2;const{unitId:_unitId,subUnitId:_subUnitId}=sheets.getSheetCommandTarget(this._univerInstanceService)||{};this._commandService.executeCommand(SortRangeCommand.id,{orderRules:sortOption.orderRules,range:sortOption.range,hasTitle:(_a2=sortOption.hasTitle)!=null?_a2:!1,unitId:unitId||_unitId,subUnitId:subUnitId||_subUnitId})}},__name(_a,"SheetsSortService"),_a),exports2.SheetsSortService=__decorateClass$2([core.OnLifecycle(core.LifecycleStages.Ready,exports2.SheetsSortService),__decorateParam$2(0,core.IUniverInstanceService),__decorateParam$2(1,core.ICommandService),__decorateParam$2(2,core.Inject(engineFormula.FormulaDataModel))],exports2.SheetsSortService);function isRangeDividedEqually(range,merges){const rangeRows=range.endRow-range.startRow+1,rangeCols=range.endColumn-range.startColumn+1;let mergeRows=null,mergeCols=null;const totalArea=rangeRows*rangeCols;let totalMergeArea=0;for(const merge of merges)if(merge.startRow>=range.startRow&&merge.endRow<=range.endRow&&merge.startColumn>=range.startColumn&&merge.endColumn<=range.endColumn){const currentMergeRows=merge.endRow-merge.startRow+1,currentMergeCols=merge.endColumn-merge.startColumn+1;if(mergeRows===null&&mergeCols===null)mergeRows=currentMergeRows,mergeCols=currentMergeCols;else if(currentMergeRows!==mergeRows||currentMergeCols!==mergeCols)return!1;totalMergeArea+=currentMergeRows*currentMergeCols}return totalMergeArea===totalArea}__name(isRangeDividedEqually,"isRangeDividedEqually");const SortRangeCommand={id:"sheet.command.sort-range",type:core.CommandType.COMMAND,handler:__name((accessor,params)=>{const{range,orderRules,hasTitle,unitId,subUnitId}=params,sortService=accessor.get(exports2.SheetsSortService),univerInstanceService=accessor.get(core.IUniverInstanceService),{worksheet}=sheets.getSheetCommandTarget(univerInstanceService,params)||{};if(!worksheet)return!1;const mergeDataInRange=worksheet.getMergeData().filter(mergeData=>core.Rectangle.contains(range,mergeData)),mergeMainRowIndexes=mergeDataInRange.map(mergeData=>mergeData.startRow),{startRow:rangeStartRow,endRow}=range,startRow=hasTitle?rangeStartRow+1:rangeStartRow,toReorder=[],oldOrder=[];for(let rowIndex=startRow;rowIndex<=endRow;rowIndex++)worksheet.getRowFiltered(rowIndex)||worksheet.getRowRawVisible(rowIndex)!==!1&&(mergeDataInRange.length&&!mergeMainRowIndexes.includes(rowIndex)||(toReorder.push({index:rowIndex,value:getRowCellData(worksheet,rowIndex,orderRules)}),oldOrder.push(rowIndex)));const compareFns=sortService.getAllCompareFns();toReorder.sort(reorderFnGenerator(orderRules,combineCompareFnsAsOne(compareFns)));const order={};toReorder.forEach(({index,value},oldIndex)=>{order[oldOrder[oldIndex]]=index});const reorderRangeCommand={id:sheets.ReorderRangeCommand.id,params:{unitId,subUnitId,range,order}},commandService=accessor.get(core.ICommandService);return core.sequenceExecute([reorderRangeCommand],commandService).result},"handler")};function getRowCellData(worksheet,rowIndex,orderRules){const result=[];return orderRules.forEach(({colIndex})=>{result.push(worksheet.getCellRaw(rowIndex,colIndex))}),result}__name(getRowCellData,"getRowCellData");function combineCompareFnsAsOne(compareFns){return(type,a,b)=>{for(let i=0;i<compareFns.length;i++){const res=compareFns[i](type,a,b);if(res!=null)return res}return 0}}__name(combineCompareFnsAsOne,"combineCompareFnsAsOne");function reorderFnGenerator(orderRules,valueCompare){return function(a,b){let ret=null;for(let index=0;index<orderRules.length;index++){const aCellData=a.value[index],bCellData=b.value[index];if(ret=valueCompare(orderRules[index].type,aCellData,bCellData),ret!==0&&ret!==null&&ret!==void 0)return ret}return 0}}__name(reorderFnGenerator,"reorderFnGenerator");var __defProp$1=Object.defineProperty,__getOwnPropDesc$1=Object.getOwnPropertyDescriptor,__decorateClass$1=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc$1(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp$1(target,key,result),result},"__decorateClass$1"),__decorateParam$1=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam$1");let SheetsSortController=(_b=class extends core.Disposable{constructor(_commandService,_sortService){super(),this._commandService=_commandService,this._sortService=_sortService,this._initCommands(),this._registerCompareFns()}_initCommands(){[SortRangeCommand].forEach(command=>this.disposeWithMe(this._commandService.registerCommand(command)))}_registerCompareFns(){const commonFn=__name((type,a,b)=>{const valueA=this._getCommonValue(a),valueB=this._getCommonValue(b),compareTypeFns=[compareNull,compareString,compareNumber];for(let i=0;i<compareTypeFns.length;i++){const res=compareTypeFns[i](valueA,valueB,type);if(res!==null)return res}return null},"commonFn");this._sortService.registerCompareFn(commonFn)}_getCommonValue(a){var _a2,_b2;if(isNullValue(a))return null;const richTextValue=(_b2=(_a2=a==null?void 0:a.p)==null?void 0:_a2.body)==null?void 0:_b2.dataStream;return richTextValue||((a==null?void 0:a.t)===core.CellValueType.NUMBER?Number.parseFloat(`${a.v}`):(a==null?void 0:a.t)===core.CellValueType.STRING?typeof a.v=="number"?a.v:`${a.v}`:(a==null?void 0:a.t)===core.CellValueType.BOOLEAN?`${a.v}`:(a==null?void 0:a.t)===core.CellValueType.FORCE_STRING?Number.parseFloat(`${a.v}`):`${a==null?void 0:a.v}`)}},__name(_b,"SheetsSortController"),_b);SheetsSortController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Ready,SheetsSortController),__decorateParam$1(0,core.ICommandService),__decorateParam$1(1,core.Inject(exports2.SheetsSortService))],SheetsSortController);var __defProp2=Object.defineProperty,__getOwnPropDesc=Object.getOwnPropertyDescriptor,__decorateClass=__name((decorators,target,key,kind)=>{for(var result=kind>1?void 0:kind?__getOwnPropDesc(target,key):target,i=decorators.length-1,decorator;i>=0;i--)(decorator=decorators[i])&&(result=(kind?decorator(target,key,result):decorator(result))||result);return kind&&result&&__defProp2(target,key,result),result},"__decorateClass"),__decorateParam=__name((index,decorator)=>(target,key)=>decorator(target,key,index),"__decorateParam");const NAME="UNIVER_SHEETS_SORT_PLUGIN";exports2.UniverSheetsSortPlugin=(_c=class extends core.Plugin{constructor(_config,_injector){super(),this._injector=_injector}onStarting(){[[SheetsSortController],[exports2.SheetsSortService]].forEach(d=>this._injector.add(d))}},__name(_c,"UniverSheetsSortPlugin"),__publicField(_c,"type",core.UniverInstanceType.UNIVER_SHEET),__publicField(_c,"pluginName",NAME),_c),exports2.UniverSheetsSortPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector))],exports2.UniverSheetsSortPlugin),exports2.SortRangeCommand=SortRangeCommand,exports2.SortType=SortType,Object.defineProperty(exports2,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-sort",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "private": false,
   "description": "A library for sorting data in Univer Sheet",
   "author": "DreamNum <developer@univer.ai>",
@@ -45,21 +45,19 @@
     "lib"
   ],
   "peerDependencies": {
-    "@wendellhu/redi": "0.16.0",
-    "@univerjs/core": "0.2.4",
-    "@univerjs/engine-formula": "0.2.4",
-    "@univerjs/sheets": "0.2.4"
+    "@univerjs/engine-formula": "0.2.6",
+    "@univerjs/sheets": "0.2.6",
+    "@univerjs/core": "0.2.6"
   },
   "devDependencies": {
-    "@wendellhu/redi": "0.16.0",
     "rxjs": "^7.8.1",
-    "typescript": "^5.5.3",
-    "vite": "^5.3.4",
-    "vitest": "^2.0.3",
-    "@univerjs/engine-formula": "0.2.4",
-    "@univerjs/core": "0.2.4",
-    "@univerjs/shared": "0.2.4",
-    "@univerjs/sheets": "0.2.4"
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5",
+    "vitest": "^2.0.4",
+    "@univerjs/engine-formula": "0.2.6",
+    "@univerjs/core": "0.2.6",
+    "@univerjs/shared": "0.2.6",
+    "@univerjs/sheets": "0.2.6"
   },
   "univerSpace": {
     ".": {