@univerjs/sheets-sort 0.5.4 → 0.5.5-experimental.20250122-3362a4a

package/lib/cjs/facade.js

@@ -1 +1 @@
-"use strict";const r=require("@univerjs/sheets-sort"),h=require("@univerjs/sheets/facade"),c=require("@univerjs/core");class l extends h.FRange{sort(o){const e=this._range.startColumn,s=(Array.isArray(o)?o:[o]).map(n=>typeof n=="number"?{colIndex:n+e,type:r.SortType.ASC}:{colIndex:n.column+e,type:n.ascending?r.SortType.ASC:r.SortType.DESC});return this._commandService.syncExecuteCommand(r.SortRangeCommand.id,{orderRules:s,range:this._range,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}}h.FRange.extend(l);class R extends h.FWorksheet{sort(o,e=!0){const t=[{colIndex:o,type:e?r.SortType.ASC:r.SortType.DESC}],s={startRow:0,startColumn:0,endRow:this._worksheet.getRowCount()-1,endColumn:this._worksheet.getColumnCount()-1,rangeType:c.RANGE_TYPE.ALL};return this._commandService.syncExecuteCommand(r.SortRangeCommand.id,{orderRules:t,range:s,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}}h.FWorksheet.extend(R);c.FEventName.extend(h.FSheetEventName);class C extends c.FUniver{_initialize(o){const e=o.get(c.ICommandService);this.disposeWithMe(e.beforeCommandExecuted(t=>{switch(t.id){case r.SortRangeCommand.id:this._beforeRangeSort(t);break}})),this.disposeWithMe(e.onCommandExecuted(t=>{switch(t.id){case r.SortRangeCommand.id:this._onRangeSorted(t);break}}))}_beforeRangeSort(o){const e=o.params,t=this.getUniverSheet(e.unitId),s=t.getSheetBySheetId(e.subUnitId),{startColumn:n,endColumn:m,startRow:a,endRow:S}=e.range,g=s.getRange(a,n,S-a+1,m-n+1),i={workbook:t,worksheet:s,range:g,sortColumn:e.orderRules.map(d=>({column:d.colIndex-n,ascending:d.type===r.SortType.ASC}))};if(this.fireEvent(this.Event.SheetBeforeRangeSort,i),i.cancel)throw new Error("SortRangeCommand canceled.")}_onRangeSorted(o){const e=o.params,t=this.getUniverSheet(e.unitId),s=t.getSheetBySheetId(e.subUnitId),{startColumn:n,endColumn:m,startRow:a,endRow:S}=e.range,g=s.getRange(a,n,S-a+1,m-n+1),i={workbook:t,worksheet:s,range:g,sortColumn:e.orderRules.map(d=>({column:d.colIndex-n,ascending:d.type===r.SortType.ASC}))};if(this.fireEvent(this.Event.SheetRangeSorted,i),i.cancel)throw new Error("SortRangeCommand canceled.")}}c.FUniver.extend(C);
+"use strict";var __defProp=Object.defineProperty;var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});const sheetsSort=require("@univerjs/sheets-sort"),facade=require("@univerjs/sheets/facade"),core=require("@univerjs/core"),_FRangeSort=class _FRangeSort extends facade.FRange{sort(column){const columnBase=this._range.startColumn,orderRules=(Array.isArray(column)?column:[column]).map(c=>typeof c=="number"?{colIndex:c+columnBase,type:sheetsSort.SortType.ASC}:{colIndex:c.column+columnBase,type:c.ascending?sheetsSort.SortType.ASC:sheetsSort.SortType.DESC});return this._commandService.syncExecuteCommand(sheetsSort.SortRangeCommand.id,{orderRules,range:this._range,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}};__name(_FRangeSort,"FRangeSort");let FRangeSort=_FRangeSort;facade.FRange.extend(FRangeSort);const _FWorksheetSort=class _FWorksheetSort extends facade.FWorksheet{sort(colIndex,asc=!0){const orderRules=[{colIndex,type:asc?sheetsSort.SortType.ASC:sheetsSort.SortType.DESC}],range={startRow:0,startColumn:0,endRow:this._worksheet.getRowCount()-1,endColumn:this._worksheet.getColumnCount()-1,rangeType:core.RANGE_TYPE.ALL};return this._commandService.syncExecuteCommand(sheetsSort.SortRangeCommand.id,{orderRules,range,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}};__name(_FWorksheetSort,"FWorksheetSort");let FWorksheetSort=_FWorksheetSort;facade.FWorksheet.extend(FWorksheetSort);core.FEventName.extend(facade.FSheetEventName);const _FUniverSheetsSortEventMixin=class _FUniverSheetsSortEventMixin extends core.FUniver{_initialize(injector){const commandService=injector.get(core.ICommandService);this.disposeWithMe(commandService.beforeCommandExecuted(commandInfo=>{switch(commandInfo.id){case sheetsSort.SortRangeCommand.id:this._beforeRangeSort(commandInfo);break}})),this.disposeWithMe(commandService.onCommandExecuted(commandInfo=>{switch(commandInfo.id){case sheetsSort.SortRangeCommand.id:this._onRangeSorted(commandInfo);break}}))}_beforeRangeSort(commandInfo){const params=commandInfo.params,fWorkbook=this.getUniverSheet(params.unitId),fWorksheet=fWorkbook.getSheetBySheetId(params.subUnitId),{startColumn,endColumn,startRow,endRow}=params.range,fRange=fWorksheet.getRange(startRow,startColumn,endRow-startRow+1,endColumn-startColumn+1),eventParams={workbook:fWorkbook,worksheet:fWorksheet,range:fRange,sortColumn:params.orderRules.map(rule=>({column:rule.colIndex-startColumn,ascending:rule.type===sheetsSort.SortType.ASC}))};if(this.fireEvent(this.Event.SheetBeforeRangeSort,eventParams),eventParams.cancel)throw new Error("SortRangeCommand canceled.")}_onRangeSorted(commandInfo){const params=commandInfo.params,fWorkbook=this.getUniverSheet(params.unitId),fWorksheet=fWorkbook.getSheetBySheetId(params.subUnitId),{startColumn,endColumn,startRow,endRow}=params.range,fRange=fWorksheet.getRange(startRow,startColumn,endRow-startRow+1,endColumn-startColumn+1),eventParams={workbook:fWorkbook,worksheet:fWorksheet,range:fRange,sortColumn:params.orderRules.map(rule=>({column:rule.colIndex-startColumn,ascending:rule.type===sheetsSort.SortType.ASC}))};if(this.fireEvent(this.Event.SheetRangeSorted,eventParams),eventParams.cancel)throw new Error("SortRangeCommand canceled.")}};__name(_FUniverSheetsSortEventMixin,"FUniverSheetsSortEventMixin");let FUniverSheetsSortEventMixin=_FUniverSheetsSortEventMixin;core.FUniver.extend(FUniverSheetsSortEventMixin);

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var M=Object.defineProperty;var $=(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)=>$(e,typeof r!="symbol"?r+"":r,t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@univerjs/core"),R=require("@univerjs/sheets"),V=require("@univerjs/engine-formula"),x="sheets-sort.config",A={};var m=(e=>(e.DESC="desc",e.ASC="asc",e))(m||{});const P=e=>e.replace(/-/gi,"").replace(/'/gi,""),L=(e,r)=>{const t=e===null||e==="",o=r===null||r==="";return t&&o?0:t?1:o?-1:null},G=(e,r,t)=>{const o=typeof e=="number",n=typeof r=="number";return o&&n?e<r?t===m.ASC?-1:1:e>r?t===m.ASC?1:-1:0:o?t===m.ASC?1:-1:n?t===m.ASC?-1:1:null},q=(e,r,t)=>{const o=typeof e=="string",n=typeof r=="string";if(o&&(e=P(e.toLocaleLowerCase())),n&&(r=P(r.toLocaleLowerCase())),!o&&!n)return null;if(o&&n){const s=e,i=r;return s<i?t===m.ASC?-1:1:s>i?t===m.ASC?1:-1:0}return o?t===m.ASC?1:-1:n?t===m.ASC?-1:1:null},D=e=>!e||Object.keys(e).length===0||(e==null?void 0:e.v)==null&&(e==null?void 0:e.p)==null;var B=Object.defineProperty,H=Object.getOwnPropertyDescriptor,K=(e,r,t,o)=>{for(var n=o>1?void 0:o?H(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&&B(r,t,n),n},p=(e,r)=>(t,o)=>r(t,o,e);exports.SheetsSortService=class extends u.Disposable{constructor(t,o,n){super();d(this,"_compareFns",[]);this._univerInstanceService=t,this._commandService=o,this._formulaDataModel=n}mergeCheck(t){var c;const{unitId:o,subUnitId:n,range:s}=t,i=(c=this._univerInstanceService.getUnit(o))==null?void 0:c.getSheetBySheetId(n);if(!i)return!1;const l=i.getMergeData().filter(a=>u.Rectangle.contains(s,a));return l.length===0?!0:W(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 c=s.startRow;c<=s.endRow;c++)for(let a=s.startColumn;a<=s.endColumn;a++)if(!D(i.getCellRaw(c,a)))return!0;return!1}singleCheck(t){return t.range.startRow!==t.range.endRow}formulaCheck(t){var l,c;const{unitId:o,subUnitId:n,range:s}=t,i=(c=(l=this._formulaDataModel.getArrayFormulaRange())==null?void 0:l[o])==null?void 0:c[n];for(const a in i){const g=i[Number(a)];for(const C in g){const S=g[Number(C)];if(S&&u.Rectangle.intersects(s,S))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}=R.getSheetCommandTarget(this._univerInstanceService)||{};this._commandService.executeCommand(I.id,{orderRules:t.orderRules,range:t.range,hasTitle:(l=t.hasTitle)!=null?l:!1,unitId:o||s,subUnitId:n||i})}};exports.SheetsSortService=K([p(0,u.IUniverInstanceService),p(1,u.ICommandService),p(2,u.Inject(V.FormulaDataModel))],exports.SheetsSortService);function W(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 c of r)if(c.startRow>=e.startRow&&c.endRow<=e.endRow&&c.startColumn>=e.startColumn&&c.endColumn<=e.endColumn){const a=c.endRow-c.startRow+1,g=c.endColumn-c.startColumn+1;if(n===null&&s===null)n=a,s=g;else if(a!==n||g!==s)return!1;l+=a*g}return l===i}const I={id:"sheet.command.sort-range",type:u.CommandType.COMMAND,handler:(e,r)=>{const{range:t,orderRules:o,hasTitle:n,unitId:s,subUnitId:i}=r,l=e.get(exports.SheetsSortService),c=e.get(u.IUniverInstanceService),{worksheet:a}=R.getSheetCommandTarget(c,r)||{};if(!a)return!1;const g=a.getMergeData().filter(f=>u.Rectangle.contains(t,f)),C=g.map(f=>f.startRow),{startRow:S,endRow:N}=t,O=n?S+1:S,_=[],w=[];for(let f=O;f<=N;f++)a.getRowFiltered(f)||a.getRowRawVisible(f)!==!1&&(g.length&&!C.includes(f)||(_.push({index:f,value:Y(a,f,o)}),w.push(f)));const T=l.getAllCompareFns();_.sort(J(o,z(T)));const b={};_.forEach(({index:f,value:oe},j)=>{b[w[j]]=f});const U={id:R.ReorderRangeCommand.id,params:{unitId:s,subUnitId:i,range:t,order:b}},E=e.get(u.ICommandService);return u.sequenceExecute([U],E).result}};function Y(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 Q=Object.defineProperty,X=Object.getOwnPropertyDescriptor,Z=(e,r,t,o)=>{for(var n=o>1?void 0:o?X(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},y=(e,r)=>(t,o)=>r(t,o,e);let v=class extends u.Disposable{constructor(e,r){super(),this._commandService=e,this._sortService=r,this._initCommands(),this._registerCompareFns()}_initCommands(){[I].forEach(e=>this.disposeWithMe(this._commandService.registerCommand(e)))}_registerCompareFns(){const e=(r,t,o)=>{const n=this._getCommonValue(t),s=this._getCommonValue(o),i=[L,q,G];for(let l=0;l<i.length;l++){const c=i[l](n,s,r);if(c!==null)return c}return null};this._sortService.registerCompareFn(e)}_getCommonValue(e){var t,o;if(D(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)===u.CellValueType.NUMBER?Number.parseFloat(`${e.v}`):(e==null?void 0:e.t)===u.CellValueType.STRING?typeof e.v=="number"?e.v:`${e.v}`:(e==null?void 0:e.t)===u.CellValueType.BOOLEAN?`${e.v}`:(e==null?void 0:e.t)===u.CellValueType.FORCE_STRING?Number.parseFloat(`${e.v}`):`${e==null?void 0:e.v}`)}};v=Z([y(0,u.ICommandService),y(1,u.Inject(exports.SheetsSortService))],v);var k=Object.defineProperty,ee=Object.getOwnPropertyDescriptor,te=(e,r,t,o)=>{for(var n=o>1?void 0:o?ee(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},F=(e,r)=>(t,o)=>r(t,o,e);const re="SHEET_SORT_PLUGIN";var h;exports.UniverSheetsSortPlugin=(h=class extends u.Plugin{constructor(r=A,t,o){super(),this._config=r,this._injector=t,this._configService=o;const{...n}=u.merge({},A,this._config);this._configService.setConfig(x,n)}onStarting(){[[v],[exports.SheetsSortService]].forEach(r=>this._injector.add(r))}onReady(){this._injector.get(v)}},d(h,"type",u.UniverInstanceType.UNIVER_SHEET),d(h,"pluginName",re),h);exports.UniverSheetsSortPlugin=te([F(1,u.Inject(u.Injector)),F(2,u.IConfigService)],exports.UniverSheetsSortPlugin);exports.SortRangeCommand=I;exports.SortType=m;
+"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"),SHEETS_SORT_PLUGIN_CONFIG_KEY="sheets-sort.config",defaultPluginConfig={};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([__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([__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="SHEET_SORT_PLUGIN";var _a3;exports.UniverSheetsSortPlugin=(_a3=class extends core.Plugin{constructor(_config=defaultPluginConfig,_injector,_configService){super(),this._config=_config,this._injector=_injector,this._configService=_configService;const{...rest}=core.merge({},defaultPluginConfig,this._config);this._configService.setConfig(SHEETS_SORT_PLUGIN_CONFIG_KEY,rest)}onStarting(){[[SheetsSortController],[exports.SheetsSortService]].forEach(d=>this._injector.add(d))}onReady(){this._injector.get(SheetsSortController)}},__name(_a3,"UniverSheetsSortPlugin"),__publicField(_a3,"type",core.UniverInstanceType.UNIVER_SHEET),__publicField(_a3,"pluginName",NAME),_a3);exports.UniverSheetsSortPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector)),__decorateParam(2,core.IConfigService)],exports.UniverSheetsSortPlugin);exports.SortRangeCommand=SortRangeCommand;exports.SortType=SortType;

package/lib/cjs/locale/en-US.js

@@ -1 +1 @@
-"use strict";const o={sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}};module.exports=o;
+"use strict";const locale={sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}};module.exports=locale;

package/lib/cjs/locale/fa-IR.js

@@ -1 +1 @@
-"use strict";const t={sheetsSort:{title:"مرتب‌سازی",toolbar:{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"},"context-menu":{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"}}};module.exports=t;
+"use strict";const locale={sheetsSort:{title:"مرتب‌سازی",toolbar:{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"},"context-menu":{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"}}};module.exports=locale;

package/lib/cjs/locale/fr-FR.js

@@ -1 +1 @@
-"use strict";const r={sheetsSort:{title:"Trier",toolbar:{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"},"context-menu":{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"}}};module.exports=r;
+"use strict";const locale={sheetsSort:{title:"Trier",toolbar:{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"},"context-menu":{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"}}};module.exports=locale;

package/lib/cjs/locale/ru-RU.js

@@ -1 +1 @@
-"use strict";const o={sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}};module.exports=o;
+"use strict";const locale={sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}};module.exports=locale;

package/lib/cjs/locale/vi-VN.js

@@ -1 +1 @@
-"use strict";const o={sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}};module.exports=o;
+"use strict";const locale={sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}};module.exports=locale;

package/lib/cjs/locale/zh-CN.js

@@ -1 +1 @@
-"use strict";const t={sheetsSort:{title:"排序",toolbar:{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"},"context-menu":{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"}}};module.exports=t;
+"use strict";const locale={sheetsSort:{title:"排序",toolbar:{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"},"context-menu":{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"}}};module.exports=locale;

package/lib/cjs/locale/zh-TW.js

@@ -1 +1 @@
-"use strict";const t={sheetsSort:{title:"Sắp xếp",toolbar:{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"},"context-menu":{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"}}};module.exports=t;
+"use strict";const locale={sheetsSort:{title:"Sắp xếp",toolbar:{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"},"context-menu":{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"}}};module.exports=locale;

package/lib/es/facade.js

@@ -1,88 +1,99 @@
-import { SortType as r, SortRangeCommand as c } from "@univerjs/sheets-sort";
-import { FRange as S, FWorksheet as l, FSheetEventName as R } from "@univerjs/sheets/facade";
-import { RANGE_TYPE as k, FEventName as w, FUniver as C, ICommandService as p } from "@univerjs/core";
-class f extends S {
-  sort(o) {
-    const e = this._range.startColumn, s = (Array.isArray(o) ? o : [o]).map((n) => typeof n == "number" ? { colIndex: n + e, type: r.ASC } : {
-      colIndex: n.column + e,
-      type: n.ascending ? r.ASC : r.DESC
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+import { SortType, SortRangeCommand } from "@univerjs/sheets-sort";
+import { FRange, FWorksheet, FSheetEventName } from "@univerjs/sheets/facade";
+import { RANGE_TYPE, FEventName, FUniver, ICommandService } from "@univerjs/core";
+const _FRangeSort = class _FRangeSort extends FRange {
+  sort(column) {
+    const columnBase = this._range.startColumn, orderRules = (Array.isArray(column) ? column : [column]).map((c) => typeof c == "number" ? { colIndex: c + columnBase, type: SortType.ASC } : {
+      colIndex: c.column + columnBase,
+      type: c.ascending ? SortType.ASC : SortType.DESC
     });
-    return this._commandService.syncExecuteCommand(c.id, {
-      orderRules: s,
+    return this._commandService.syncExecuteCommand(SortRangeCommand.id, {
+      orderRules,
       range: this._range,
       hasTitle: !1,
       unitId: this._workbook.getUnitId(),
       subUnitId: this._worksheet.getSheetId()
     }), this;
   }
-}
-S.extend(f);
-class v extends l {
-  sort(o, e = !0) {
-    const t = [{
+};
+__name(_FRangeSort, "FRangeSort");
+let FRangeSort = _FRangeSort;
+FRange.extend(FRangeSort);
+const _FWorksheetSort = class _FWorksheetSort extends FWorksheet {
+  sort(colIndex, asc = !0) {
+    const orderRules = [{
       // real column index should be colIndex - 1.
-      colIndex: o,
-      type: e ? r.ASC : r.DESC
-    }], s = {
+      colIndex,
+      type: asc ? SortType.ASC : SortType.DESC
+    }], range = {
       startRow: 0,
       startColumn: 0,
       endRow: this._worksheet.getRowCount() - 1,
       endColumn: this._worksheet.getColumnCount() - 1,
-      rangeType: k.ALL
+      rangeType: RANGE_TYPE.ALL
     };
-    return this._commandService.syncExecuteCommand(c.id, {
-      orderRules: t,
-      range: s,
+    return this._commandService.syncExecuteCommand(SortRangeCommand.id, {
+      orderRules,
+      range,
       hasTitle: !1,
       unitId: this._workbook.getUnitId(),
       subUnitId: this._worksheet.getSheetId()
     }), this;
   }
-}
-l.extend(v);
-w.extend(R);
-class E extends C {
-  _initialize(o) {
-    const e = o.get(p);
-    this.disposeWithMe(e.beforeCommandExecuted((t) => {
-      switch (t.id) {
-        case c.id:
-          this._beforeRangeSort(t);
+};
+__name(_FWorksheetSort, "FWorksheetSort");
+let FWorksheetSort = _FWorksheetSort;
+FWorksheet.extend(FWorksheetSort);
+FEventName.extend(FSheetEventName);
+const _FUniverSheetsSortEventMixin = class _FUniverSheetsSortEventMixin extends FUniver {
+  /**
+   * @ignore
+   */
+  _initialize(injector) {
+    const commandService = injector.get(ICommandService);
+    this.disposeWithMe(commandService.beforeCommandExecuted((commandInfo) => {
+      switch (commandInfo.id) {
+        case SortRangeCommand.id:
+          this._beforeRangeSort(commandInfo);
           break;
       }
-    })), this.disposeWithMe(e.onCommandExecuted((t) => {
-      switch (t.id) {
-        case c.id:
-          this._onRangeSorted(t);
+    })), this.disposeWithMe(commandService.onCommandExecuted((commandInfo) => {
+      switch (commandInfo.id) {
+        case SortRangeCommand.id:
+          this._onRangeSorted(commandInfo);
           break;
       }
     }));
   }
-  _beforeRangeSort(o) {
-    const e = o.params, t = this.getUniverSheet(e.unitId), s = t.getSheetBySheetId(e.subUnitId), { startColumn: n, endColumn: h, startRow: a, endRow: m } = e.range, g = s.getRange(a, n, m - a + 1, h - n + 1), i = {
-      workbook: t,
-      worksheet: s,
-      range: g,
-      sortColumn: e.orderRules.map((d) => ({
-        column: d.colIndex - n,
-        ascending: d.type === r.ASC
+  _beforeRangeSort(commandInfo) {
+    const params = commandInfo.params, fWorkbook = this.getUniverSheet(params.unitId), fWorksheet = fWorkbook.getSheetBySheetId(params.subUnitId), { startColumn, endColumn, startRow, endRow } = params.range, fRange = fWorksheet.getRange(startRow, startColumn, endRow - startRow + 1, endColumn - startColumn + 1), eventParams = {
+      workbook: fWorkbook,
+      worksheet: fWorksheet,
+      range: fRange,
+      sortColumn: params.orderRules.map((rule) => ({
+        column: rule.colIndex - startColumn,
+        ascending: rule.type === SortType.ASC
       }))
     };
-    if (this.fireEvent(this.Event.SheetBeforeRangeSort, i), i.cancel)
+    if (this.fireEvent(this.Event.SheetBeforeRangeSort, eventParams), eventParams.cancel)
       throw new Error("SortRangeCommand canceled.");
   }
-  _onRangeSorted(o) {
-    const e = o.params, t = this.getUniverSheet(e.unitId), s = t.getSheetBySheetId(e.subUnitId), { startColumn: n, endColumn: h, startRow: a, endRow: m } = e.range, g = s.getRange(a, n, m - a + 1, h - n + 1), i = {
-      workbook: t,
-      worksheet: s,
-      range: g,
-      sortColumn: e.orderRules.map((d) => ({
-        column: d.colIndex - n,
-        ascending: d.type === r.ASC
+  _onRangeSorted(commandInfo) {
+    const params = commandInfo.params, fWorkbook = this.getUniverSheet(params.unitId), fWorksheet = fWorkbook.getSheetBySheetId(params.subUnitId), { startColumn, endColumn, startRow, endRow } = params.range, fRange = fWorksheet.getRange(startRow, startColumn, endRow - startRow + 1, endColumn - startColumn + 1), eventParams = {
+      workbook: fWorkbook,
+      worksheet: fWorksheet,
+      range: fRange,
+      sortColumn: params.orderRules.map((rule) => ({
+        column: rule.colIndex - startColumn,
+        ascending: rule.type === SortType.ASC
       }))
     };
-    if (this.fireEvent(this.Event.SheetRangeSorted, i), i.cancel)
+    if (this.fireEvent(this.Event.SheetRangeSorted, eventParams), eventParams.cancel)
       throw new Error("SortRangeCommand canceled.");
   }
-}
-C.extend(E);
+};
+__name(_FUniverSheetsSortEventMixin, "FUniverSheetsSortEventMixin");
+let FUniverSheetsSortEventMixin = _FUniverSheetsSortEventMixin;
+FUniver.extend(FUniverSheetsSortEventMixin);

package/lib/es/index.js

@@ -1,246 +1,251 @@
-var H = Object.defineProperty;
-var q = (e, t, r) => t in e ? H(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var h = (e, t, r) => q(e, typeof t != "symbol" ? t + "" : t, r);
-import { Inject as w, Disposable as y, Rectangle as R, IUniverInstanceService as U, ICommandService as I, CommandType as K, sequenceExecute as W, CellValueType as C, Plugin as Y, merge as z, UniverInstanceType as J, Injector as Q, IConfigService as X } from "@univerjs/core";
-import { getSheetCommandTarget as T, ReorderRangeCommand as Z } from "@univerjs/sheets";
-import { FormulaDataModel as k } from "@univerjs/engine-formula";
-const ee = "sheets-sort.config", N = {};
-var f = /* @__PURE__ */ ((e) => (e.DESC = "desc", e.ASC = "asc", e))(f || {});
-const D = (e) => e.replace(/-/gi, "").replace(/'/gi, ""), te = (e, t) => {
-  const r = e === null || e === "", o = t === null || t === "";
-  return r && o ? 0 : r ? 1 : o ? -1 : null;
-}, re = (e, t, r) => {
-  const o = typeof e == "number", n = typeof t == "number";
-  return o && n ? e < t ? r === f.ASC ? -1 : 1 : e > t ? r === f.ASC ? 1 : -1 : 0 : o ? r === f.ASC ? 1 : -1 : n ? r === f.ASC ? -1 : 1 : null;
-}, ne = (e, t, r) => {
-  const o = typeof e == "string", n = typeof t == "string";
-  if (o && (e = D(e.toLocaleLowerCase())), n && (t = D(t.toLocaleLowerCase())), !o && !n)
+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 { Inject, Disposable, Rectangle, IUniverInstanceService, ICommandService, CommandType, sequenceExecute, CellValueType, Plugin, merge, UniverInstanceType, Injector, IConfigService } from "@univerjs/core";
+import { getSheetCommandTarget, ReorderRangeCommand } from "@univerjs/sheets";
+import { FormulaDataModel } from "@univerjs/engine-formula";
+const SHEETS_SORT_PLUGIN_CONFIG_KEY = "sheets-sort.config", defaultPluginConfig = {};
+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 && n) {
-    const s = e, i = t;
-    return s < i ? r === f.ASC ? -1 : 1 : s > i ? r === f.ASC ? 1 : -1 : 0;
-  }
-  return o ? r === f.ASC ? 1 : -1 : n ? r === f.ASC ? -1 : 1 : null;
-}, M = (e) => !e || Object.keys(e).length === 0 || (e == null ? void 0 : e.v) == null && (e == null ? void 0 : e.p) == null;
-var oe = Object.defineProperty, se = Object.getOwnPropertyDescriptor, ie = (e, t, r, o) => {
-  for (var n = o > 1 ? void 0 : o ? se(t, r) : t, s = e.length - 1, i; s >= 0; s--)
-    (i = e[s]) && (n = (o ? i(t, r, n) : i(n)) || n);
-  return o && n && oe(t, r, n), n;
-}, p = (e, t) => (r, o) => t(r, o, e);
-let g = class extends y {
-  constructor(t, r, 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();
-    h(this, "_compareFns", []);
-    this._univerInstanceService = t, this._commandService = r, this._formulaDataModel = o;
+    __publicField(this, "_compareFns", []);
+    this._univerInstanceService = _univerInstanceService, this._commandService = _commandService, this._formulaDataModel = _formulaDataModel;
   }
-  mergeCheck(t) {
-    var c;
-    const { unitId: r, subUnitId: o, range: n } = t, s = (c = this._univerInstanceService.getUnit(r)) == null ? void 0 : c.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 i = s.getMergeData().filter((u) => R.contains(n, u));
-    return i.length === 0 ? !0 : ue(n, i);
+    const mergeDataInRange = sheet.getMergeData().filter((merge2) => Rectangle.contains(range, merge2));
+    return mergeDataInRange.length === 0 ? !0 : isRangeDividedEqually(range, mergeDataInRange);
   }
-  emptyCheck(t) {
-    var i;
-    const { unitId: r, subUnitId: o, range: n } = t, s = (i = this._univerInstanceService.getUnit(r)) == null ? void 0 : i.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 c = n.startRow; c <= n.endRow; c++)
-      for (let u = n.startColumn; u <= n.endColumn; u++)
-        if (!M(s.getCellRaw(c, u)))
+    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(t) {
-    return t.range.startRow !== t.range.endRow;
-  }
-  formulaCheck(t) {
-    var i, c;
-    const { unitId: r, subUnitId: o, range: n } = t, s = (c = (i = this._formulaDataModel.getArrayFormulaRange()) == null ? void 0 : i[r]) == null ? void 0 : c[o];
-    for (const u in s) {
-      const a = s[Number(u)];
-      for (const m in a) {
-        const d = a[Number(m)];
-        if (d && R.intersects(n, d))
+  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(t) {
-    this._compareFns.unshift(t);
+  registerCompareFn(fn) {
+    this._compareFns.unshift(fn);
   }
   getAllCompareFns() {
     return this._compareFns;
   }
-  applySort(t, r, o) {
-    var i;
-    const { unitId: n, subUnitId: s } = T(this._univerInstanceService) || {};
-    this._commandService.executeCommand($.id, {
-      orderRules: t.orderRules,
-      range: t.range,
-      hasTitle: (i = t.hasTitle) != null ? i : !1,
-      unitId: r || n,
-      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
     });
   }
-};
-g = ie([
-  p(0, U),
-  p(1, I),
-  p(2, w(k))
-], g);
-function ue(e, t) {
-  const r = e.endRow - e.startRow + 1, o = e.endColumn - e.startColumn + 1;
-  let n = null, s = null;
-  const i = r * o;
-  let c = 0;
-  for (const u of t)
-    if (u.startRow >= e.startRow && u.endRow <= e.endRow && u.startColumn >= e.startColumn && u.endColumn <= e.endColumn) {
-      const a = u.endRow - u.startRow + 1, m = u.endColumn - u.startColumn + 1;
-      if (n === null && s === null)
-        n = a, s = m;
-      else if (a !== n || m !== s)
+}, __name(_a, "SheetsSortService"), _a);
+SheetsSortService = __decorateClass$2([
+  __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 merge2 of merges)
+    if (merge2.startRow >= range.startRow && merge2.endRow <= range.endRow && merge2.startColumn >= range.startColumn && merge2.endColumn <= range.endColumn) {
+      const currentMergeRows = merge2.endRow - merge2.startRow + 1, currentMergeCols = merge2.endColumn - merge2.startColumn + 1;
+      if (mergeRows === null && mergeCols === null)
+        mergeRows = currentMergeRows, mergeCols = currentMergeCols;
+      else if (currentMergeRows !== mergeRows || currentMergeCols !== mergeCols)
         return !1;
-      c += a * m;
+      totalMergeArea += currentMergeRows * currentMergeCols;
     }
-  return c === i;
+  return totalMergeArea === totalArea;
 }
-const $ = {
+__name(isRangeDividedEqually, "isRangeDividedEqually");
+const SortRangeCommand = {
   id: "sheet.command.sort-range",
-  type: K.COMMAND,
-  handler: (e, t) => {
-    const { range: r, orderRules: o, hasTitle: n, unitId: s, subUnitId: i } = t, c = e.get(g), u = e.get(U), { worksheet: a } = T(u, t) || {};
-    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 m = a.getMergeData().filter((l) => R.contains(r, l)), d = m.map((l) => l.startRow), { startRow: b, endRow: j } = r, x = n ? b + 1 : b, S = [], A = [];
-    for (let l = x; l <= j; l++)
-      a.getRowFiltered(l) || a.getRowRawVisible(l) !== !1 && (m.length && !d.includes(l) || (S.push({
-        index: l,
-        value: ce(a, l, o)
-      }), A.push(l)));
-    const V = c.getAllCompareFns();
-    S.sort(ae(o, le(V)));
-    const F = {};
-    S.forEach(({ index: l, value: Se }, B) => {
-      F[A[B]] = l;
+    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: Z.id,
+    const reorderRangeCommand = {
+      id: ReorderRangeCommand.id,
       params: {
-        unitId: s,
-        subUnitId: i,
-        range: r,
-        order: F
+        unitId,
+        subUnitId,
+        range,
+        order
       }
-    }, G = e.get(I);
-    return W([L], G).result;
-  }
+    }, commandService = accessor.get(ICommandService);
+    return sequenceExecute([reorderRangeCommand], commandService).result;
+  }, "handler")
 };
-function ce(e, t, r) {
-  const o = [];
-  return r.forEach(({ colIndex: n }) => {
-    o.push(e.getCellRaw(t, n));
-  }), o;
+function getRowCellData(worksheet, rowIndex, orderRules) {
+  const result = [];
+  return orderRules.forEach(({ colIndex }) => {
+    result.push(worksheet.getCellRaw(rowIndex, colIndex));
+  }), result;
 }
-function le(e) {
-  return (t, r, o) => {
-    for (let n = 0; n < e.length; n++) {
-      const s = e[n](t, r, 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 ae(e, t) {
-  return function(r, o) {
-    let n = null;
-    for (let s = 0; s < e.length; s++) {
-      const i = r.value[s], c = o.value[s];
-      if (n = t(e[s].type, i, c), n !== 0 && n !== null && n !== void 0)
-        return n;
+__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 fe = Object.defineProperty, me = Object.getOwnPropertyDescriptor, ge = (e, t, r, o) => {
-  for (var n = o > 1 ? void 0 : o ? me(t, r) : t, s = e.length - 1, i; s >= 0; s--)
-    (i = e[s]) && (n = (o ? i(t, r, n) : i(n)) || n);
-  return o && n && fe(t, r, n), n;
-}, O = (e, t) => (r, o) => t(r, o, e);
-let v = class extends y {
-  constructor(e, t) {
-    super(), this._commandService = e, this._sortService = t, 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 = (t, r, o) => {
-      const n = this._getCommonValue(r), s = this._getCommonValue(o), i = [
-        te,
-        ne,
-        re
+    const commonFn = /* @__PURE__ */ __name((type, a, b) => {
+      const valueA = this._getCommonValue(a), valueB = this._getCommonValue(b), compareTypeFns = [
+        compareNull,
+        compareString,
+        compareNumber
       ];
-      for (let c = 0; c < i.length; c++) {
-        const u = i[c](n, s, t);
-        if (u !== null)
-          return u;
+      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 r, o;
-    if (M(e))
+  _getCommonValue(a) {
+    var _a4, _b;
+    if (isNullValue(a))
       return null;
-    const t = (o = (r = e == null ? void 0 : e.p) == null ? void 0 : r.body) == null ? void 0 : o.dataStream;
-    return t || ((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}`);
-  }
-};
-v = ge([
-  O(0, I),
-  O(1, w(g))
-], v);
-var de = Object.defineProperty, he = Object.getOwnPropertyDescriptor, Ce = (e, t, r, o) => {
-  for (var n = o > 1 ? void 0 : o ? he(t, r) : t, s = e.length - 1, i; s >= 0; s--)
-    (i = e[s]) && (n = (o ? i(t, r, n) : i(n)) || n);
-  return o && n && de(t, r, n), n;
-}, P = (e, t) => (r, o) => t(r, o, e);
-const _e = "SHEET_SORT_PLUGIN";
-var _;
-let E = (_ = class extends Y {
-  constructor(e = N, t, r) {
-    super(), this._config = e, this._injector = t, this._configService = r;
-    const { ...o } = z(
+    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([
+  __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 = "SHEET_SORT_PLUGIN";
+var _a3;
+let UniverSheetsSortPlugin = (_a3 = class extends Plugin {
+  constructor(_config = defaultPluginConfig, _injector, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._configService = _configService;
+    const { ...rest } = merge(
       {},
-      N,
+      defaultPluginConfig,
       this._config
     );
-    this._configService.setConfig(ee, o);
+    this._configService.setConfig(SHEETS_SORT_PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
-      [v],
-      [g]
-    ].forEach((e) => this._injector.add(e));
+      [SheetsSortController],
+      [SheetsSortService]
+    ].forEach((d) => this._injector.add(d));
   }
   onReady() {
-    this._injector.get(v);
+    this._injector.get(SheetsSortController);
   }
-}, h(_, "type", J.UNIVER_SHEET), h(_, "pluginName", _e), _);
-E = Ce([
-  P(1, w(Q)),
-  P(2, X)
-], E);
+}, __name(_a3, "UniverSheetsSortPlugin"), __publicField(_a3, "type", UniverInstanceType.UNIVER_SHEET), __publicField(_a3, "pluginName", NAME), _a3);
+UniverSheetsSortPlugin = __decorateClass([
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, IConfigService)
+], UniverSheetsSortPlugin);
 export {
-  g as SheetsSortService,
-  $ as SortRangeCommand,
-  f as SortType,
-  E as UniverSheetsSortPlugin
+  SheetsSortService,
+  SortRangeCommand,
+  SortType,
+  UniverSheetsSortPlugin
 };

package/lib/es/locale/en-US.js

@@ -1,4 +1,4 @@
-const o = {
+const locale = {
   sheetsSort: {
     title: "Sort",
     toolbar: {
@@ -14,5 +14,5 @@ const o = {
   }
 };
 export {
-  o as default
+  locale as default
 };

package/lib/es/locale/fa-IR.js

@@ -1,4 +1,4 @@
-const t = {
+const locale = {
   sheetsSort: {
     title: "مرتب‌سازی",
     toolbar: {
@@ -14,5 +14,5 @@ const t = {
   }
 };
 export {
-  t as default
+  locale as default
 };

package/lib/es/locale/fr-FR.js

@@ -1,4 +1,4 @@
-const r = {
+const locale = {
   sheetsSort: {
     title: "Trier",
     toolbar: {
@@ -14,5 +14,5 @@ const r = {
   }
 };
 export {
-  r as default
+  locale as default
 };

package/lib/es/locale/ru-RU.js

@@ -1,4 +1,4 @@
-const o = {
+const locale = {
   sheetsSort: {
     title: "Sort",
     toolbar: {
@@ -14,5 +14,5 @@ const o = {
   }
 };
 export {
-  o as default
+  locale as default
 };

package/lib/es/locale/vi-VN.js

@@ -1,4 +1,4 @@
-const o = {
+const locale = {
   sheetsSort: {
     title: "Sort",
     toolbar: {
@@ -14,5 +14,5 @@ const o = {
   }
 };
 export {
-  o as default
+  locale as default
 };

package/lib/es/locale/zh-CN.js

@@ -1,4 +1,4 @@
-const t = {
+const locale = {
   sheetsSort: {
     title: "排序",
     toolbar: {
@@ -14,5 +14,5 @@ const t = {
   }
 };
 export {
-  t as default
+  locale as default
 };

package/lib/es/locale/zh-TW.js

@@ -1,4 +1,4 @@
-const t = {
+const locale = {
   sheetsSort: {
     title: "Sắp xếp",
     toolbar: {
@@ -14,5 +14,5 @@ const t = {
   }
 };
 export {
-  t as default
+  locale as default
 };

package/lib/types/facade/f-event.d.ts

@@ -4,7 +4,6 @@ export interface IFSheetSortEventMixin {
     /**
      * This event will be emitted when a range on a worksheet is sorted.
      * Type of the event is {@link ISheetRangeSortedParams}.
-     *
      * @example
      * ```typescript
      * const callbackDisposable = univerAPI.addEvent(univerAPI.Event.SheetRangeSorted, (params) => {
@@ -19,7 +18,6 @@ export interface IFSheetSortEventMixin {
     /**
      * This event will be emitted before sorting a range on a worksheet.
      * Type of the event is {@link ISheetRangeSortParams}.
-     *
      * @example
      * ```typescript
      * const callbackDisposable = univerAPI.addEvent(univerAPI.Event.SheetBeforeRangeSort, (params) => {

package/lib/types/facade/f-range.d.ts

@@ -6,11 +6,8 @@ export type SortColumnSpec = {
 export interface IFRangeSort {
     /**
      * Sorts the cells in the given range, by column(s) and order specified.
-     *
      * @param {SortColumnSpec | SortColumnSpec[]} column The column index with order or an array of column indexes with order. The column index starts from 1.
-     *
      * @returns The range itself for chaining.
-     *
      * @example
      * ```typescript
      * const activeSpreadsheet = univerAPI.getActiveWorkbook();

package/lib/types/facade/f-worksheet.d.ts

@@ -2,11 +2,9 @@ import { FWorksheet } from '@univerjs/sheets/facade';
 export interface IFWorksheetSort {
     /**
      * Sort the worksheet by the specified column.
-     *
      * @param {number} colIndex The column index to sort by. which starts from 1.
      * @param {boolean} [asc=true] The sort order. `true` for ascending, `false` for descending.
      * @returns The worksheet itself for chaining.
-     *
      * @example
      * ```typescript
      * const activeSpreadsheet = univerAPI.getActiveWorkbook();

package/lib/umd/facade.js

@@ -1 +1 @@
-(function(e,s){typeof exports=="object"&&typeof module<"u"?s(require("@univerjs/sheets-sort"),require("@univerjs/sheets/facade"),require("@univerjs/core")):typeof define=="function"&&define.amd?define(["@univerjs/sheets-sort","@univerjs/sheets/facade","@univerjs/core"],s):(e=typeof globalThis<"u"?globalThis:e||self,s(e.UniverSheetsSort,e.UniverSheetsFacade,e.UniverCore))})(this,function(e,s,a){"use strict";class C extends s.FRange{sort(r){const t=this._range.startColumn,i=(Array.isArray(r)?r:[r]).map(o=>typeof o=="number"?{colIndex:o+t,type:e.SortType.ASC}:{colIndex:o.column+t,type:o.ascending?e.SortType.ASC:e.SortType.DESC});return this._commandService.syncExecuteCommand(e.SortRangeCommand.id,{orderRules:i,range:this._range,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}}s.FRange.extend(C);class R extends s.FWorksheet{sort(r,t=!0){const n=[{colIndex:r,type:t?e.SortType.ASC:e.SortType.DESC}],i={startRow:0,startColumn:0,endRow:this._worksheet.getRowCount()-1,endColumn:this._worksheet.getColumnCount()-1,rangeType:a.RANGE_TYPE.ALL};return this._commandService.syncExecuteCommand(e.SortRangeCommand.id,{orderRules:n,range:i,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}}s.FWorksheet.extend(R),a.FEventName.extend(s.FSheetEventName);class l extends a.FUniver{_initialize(r){const t=r.get(a.ICommandService);this.disposeWithMe(t.beforeCommandExecuted(n=>{switch(n.id){case e.SortRangeCommand.id:this._beforeRangeSort(n);break}})),this.disposeWithMe(t.onCommandExecuted(n=>{switch(n.id){case e.SortRangeCommand.id:this._onRangeSorted(n);break}}))}_beforeRangeSort(r){const t=r.params,n=this.getUniverSheet(t.unitId),i=n.getSheetBySheetId(t.subUnitId),{startColumn:o,endColumn:m,startRow:d,endRow:u}=t.range,g=i.getRange(d,o,u-d+1,m-o+1),c={workbook:n,worksheet:i,range:g,sortColumn:t.orderRules.map(h=>({column:h.colIndex-o,ascending:h.type===e.SortType.ASC}))};if(this.fireEvent(this.Event.SheetBeforeRangeSort,c),c.cancel)throw new Error("SortRangeCommand canceled.")}_onRangeSorted(r){const t=r.params,n=this.getUniverSheet(t.unitId),i=n.getSheetBySheetId(t.subUnitId),{startColumn:o,endColumn:m,startRow:d,endRow:u}=t.range,g=i.getRange(d,o,u-d+1,m-o+1),c={workbook:n,worksheet:i,range:g,sortColumn:t.orderRules.map(h=>({column:h.colIndex-o,ascending:h.type===e.SortType.ASC}))};if(this.fireEvent(this.Event.SheetRangeSorted,c),c.cancel)throw new Error("SortRangeCommand canceled.")}}a.FUniver.extend(l)});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?factory(require("@univerjs/sheets-sort"),require("@univerjs/sheets/facade"),require("@univerjs/core")):typeof define=="function"&&define.amd?define(["@univerjs/sheets-sort","@univerjs/sheets/facade","@univerjs/core"],factory):(global=typeof globalThis<"u"?globalThis:global||self,factory(global.UniverSheetsSort,global.UniverSheetsFacade,global.UniverCore))})(this,function(sheetsSort,facade,core){"use strict";var __defProp=Object.defineProperty;var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});const _FRangeSort=class _FRangeSort extends facade.FRange{sort(column){const columnBase=this._range.startColumn,orderRules=(Array.isArray(column)?column:[column]).map(c=>typeof c=="number"?{colIndex:c+columnBase,type:sheetsSort.SortType.ASC}:{colIndex:c.column+columnBase,type:c.ascending?sheetsSort.SortType.ASC:sheetsSort.SortType.DESC});return this._commandService.syncExecuteCommand(sheetsSort.SortRangeCommand.id,{orderRules,range:this._range,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}};__name(_FRangeSort,"FRangeSort");let FRangeSort=_FRangeSort;facade.FRange.extend(FRangeSort);const _FWorksheetSort=class _FWorksheetSort extends facade.FWorksheet{sort(colIndex,asc=!0){const orderRules=[{colIndex,type:asc?sheetsSort.SortType.ASC:sheetsSort.SortType.DESC}],range={startRow:0,startColumn:0,endRow:this._worksheet.getRowCount()-1,endColumn:this._worksheet.getColumnCount()-1,rangeType:core.RANGE_TYPE.ALL};return this._commandService.syncExecuteCommand(sheetsSort.SortRangeCommand.id,{orderRules,range,hasTitle:!1,unitId:this._workbook.getUnitId(),subUnitId:this._worksheet.getSheetId()}),this}};__name(_FWorksheetSort,"FWorksheetSort");let FWorksheetSort=_FWorksheetSort;facade.FWorksheet.extend(FWorksheetSort),core.FEventName.extend(facade.FSheetEventName);const _FUniverSheetsSortEventMixin=class _FUniverSheetsSortEventMixin extends core.FUniver{_initialize(injector){const commandService=injector.get(core.ICommandService);this.disposeWithMe(commandService.beforeCommandExecuted(commandInfo=>{switch(commandInfo.id){case sheetsSort.SortRangeCommand.id:this._beforeRangeSort(commandInfo);break}})),this.disposeWithMe(commandService.onCommandExecuted(commandInfo=>{switch(commandInfo.id){case sheetsSort.SortRangeCommand.id:this._onRangeSorted(commandInfo);break}}))}_beforeRangeSort(commandInfo){const params=commandInfo.params,fWorkbook=this.getUniverSheet(params.unitId),fWorksheet=fWorkbook.getSheetBySheetId(params.subUnitId),{startColumn,endColumn,startRow,endRow}=params.range,fRange=fWorksheet.getRange(startRow,startColumn,endRow-startRow+1,endColumn-startColumn+1),eventParams={workbook:fWorkbook,worksheet:fWorksheet,range:fRange,sortColumn:params.orderRules.map(rule=>({column:rule.colIndex-startColumn,ascending:rule.type===sheetsSort.SortType.ASC}))};if(this.fireEvent(this.Event.SheetBeforeRangeSort,eventParams),eventParams.cancel)throw new Error("SortRangeCommand canceled.")}_onRangeSorted(commandInfo){const params=commandInfo.params,fWorkbook=this.getUniverSheet(params.unitId),fWorksheet=fWorkbook.getSheetBySheetId(params.subUnitId),{startColumn,endColumn,startRow,endRow}=params.range,fRange=fWorksheet.getRange(startRow,startColumn,endRow-startRow+1,endColumn-startColumn+1),eventParams={workbook:fWorkbook,worksheet:fWorksheet,range:fRange,sortColumn:params.orderRules.map(rule=>({column:rule.colIndex-startColumn,ascending:rule.type===sheetsSort.SortType.ASC}))};if(this.fireEvent(this.Event.SheetRangeSorted,eventParams),eventParams.cancel)throw new Error("SortRangeCommand canceled.")}};__name(_FUniverSheetsSortEventMixin,"FUniverSheetsSortEventMixin");let FUniverSheetsSortEventMixin=_FUniverSheetsSortEventMixin;core.FUniver.extend(FUniverSheetsSortEventMixin)});

package/lib/umd/index.js

@@ -1 +1 @@
-(function(l,o){typeof exports=="object"&&typeof module<"u"?o(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"],o):(l=typeof globalThis<"u"?globalThis:l||self,o(l.UniverSheetsSort={},l.UniverCore,l.UniverSheets,l.UniverEngineFormula))})(this,function(l,o,g,j){"use strict";var ne=Object.defineProperty;var re=(l,o,g)=>o in l?ne(l,o,{enumerable:!0,configurable:!0,writable:!0,value:g}):l[o]=g;var _=(l,o,g)=>re(l,typeof o!="symbol"?o+"":o,g);var C;const D="sheets-sort.config",b={};var d=(e=>(e.DESC="desc",e.ASC="asc",e))(d||{});const A=e=>e.replace(/-/gi,"").replace(/'/gi,""),N=(e,s)=>{const t=e===null||e==="",r=s===null||s==="";return t&&r?0:t?1:r?-1:null},O=(e,s,t)=>{const r=typeof e=="number",n=typeof s=="number";return r&&n?e<s?t===d.ASC?-1:1:e>s?t===d.ASC?1:-1:0:r?t===d.ASC?1:-1:n?t===d.ASC?-1:1:null},E=(e,s,t)=>{const r=typeof e=="string",n=typeof s=="string";if(r&&(e=A(e.toLocaleLowerCase())),n&&(s=A(s.toLocaleLowerCase())),!r&&!n)return null;if(r&&n){const i=e,u=s;return i<u?t===d.ASC?-1:1:i>u?t===d.ASC?1:-1:0}return r?t===d.ASC?1:-1:n?t===d.ASC?-1:1:null},y=e=>!e||Object.keys(e).length===0||(e==null?void 0:e.v)==null&&(e==null?void 0:e.p)==null;var M=Object.defineProperty,$=Object.getOwnPropertyDescriptor,V=(e,s,t,r)=>{for(var n=r>1?void 0:r?$(s,t):s,i=e.length-1,u;i>=0;i--)(u=e[i])&&(n=(r?u(s,t,n):u(n))||n);return r&&n&&M(s,t,n),n},p=(e,s)=>(t,r)=>s(t,r,e);l.SheetsSortService=class extends o.Disposable{constructor(t,r,n){super();_(this,"_compareFns",[]);this._univerInstanceService=t,this._commandService=r,this._formulaDataModel=n}mergeCheck(t){var a;const{unitId:r,subUnitId:n,range:i}=t,u=(a=this._univerInstanceService.getUnit(r))==null?void 0:a.getSheetBySheetId(n);if(!u)return!1;const c=u.getMergeData().filter(f=>o.Rectangle.contains(i,f));return c.length===0?!0:L(i,c)}emptyCheck(t){var c;const{unitId:r,subUnitId:n,range:i}=t,u=(c=this._univerInstanceService.getUnit(r))==null?void 0:c.getSheetBySheetId(n);if(!u)return!1;for(let a=i.startRow;a<=i.endRow;a++)for(let f=i.startColumn;f<=i.endColumn;f++)if(!y(u.getCellRaw(a,f)))return!0;return!1}singleCheck(t){return t.range.startRow!==t.range.endRow}formulaCheck(t){var c,a;const{unitId:r,subUnitId:n,range:i}=t,u=(a=(c=this._formulaDataModel.getArrayFormulaRange())==null?void 0:c[r])==null?void 0:a[n];for(const f in u){const S=u[Number(f)];for(const I in S){const v=S[Number(I)];if(v&&o.Rectangle.intersects(i,v))return!1}}return!0}registerCompareFn(t){this._compareFns.unshift(t)}getAllCompareFns(){return this._compareFns}applySort(t,r,n){var c;const{unitId:i,subUnitId:u}=g.getSheetCommandTarget(this._univerInstanceService)||{};this._commandService.executeCommand(R.id,{orderRules:t.orderRules,range:t.range,hasTitle:(c=t.hasTitle)!=null?c:!1,unitId:r||i,subUnitId:n||u})}},l.SheetsSortService=V([p(0,o.IUniverInstanceService),p(1,o.ICommandService),p(2,o.Inject(j.FormulaDataModel))],l.SheetsSortService);function L(e,s){const t=e.endRow-e.startRow+1,r=e.endColumn-e.startColumn+1;let n=null,i=null;const u=t*r;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,S=a.endColumn-a.startColumn+1;if(n===null&&i===null)n=f,i=S;else if(f!==n||S!==i)return!1;c+=f*S}return c===u}const R={id:"sheet.command.sort-range",type:o.CommandType.COMMAND,handler:(e,s)=>{const{range:t,orderRules:r,hasTitle:n,unitId:i,subUnitId:u}=s,c=e.get(l.SheetsSortService),a=e.get(o.IUniverInstanceService),{worksheet:f}=g.getSheetCommandTarget(a,s)||{};if(!f)return!1;const S=f.getMergeData().filter(m=>o.Rectangle.contains(t,m)),I=S.map(m=>m.startRow),{startRow:v,endRow:Q}=t,X=n?v+1:v,w=[],F=[];for(let m=X;m<=Q;m++)f.getRowFiltered(m)||f.getRowRawVisible(m)!==!1&&(S.length&&!I.includes(m)||(w.push({index:m,value:G(f,m,r)}),F.push(m)));const Z=c.getAllCompareFns();w.sort(B(r,q(Z)));const T={};w.forEach(({index:m,value:ie},te)=>{T[F[te]]=m});const k={id:g.ReorderRangeCommand.id,params:{unitId:i,subUnitId:u,range:t,order:T}},ee=e.get(o.ICommandService);return o.sequenceExecute([k],ee).result}};function G(e,s,t){const r=[];return t.forEach(({colIndex:n})=>{r.push(e.getCellRaw(s,n))}),r}function q(e){return(s,t,r)=>{for(let n=0;n<e.length;n++){const i=e[n](s,t,r);if(i!=null)return i}return 0}}function B(e,s){return function(t,r){let n=null;for(let i=0;i<e.length;i++){const u=t.value[i],c=r.value[i];if(n=s(e[i].type,u,c),n!==0&&n!==null&&n!==void 0)return n}return 0}}var H=Object.defineProperty,x=Object.getOwnPropertyDescriptor,K=(e,s,t,r)=>{for(var n=r>1?void 0:r?x(s,t):s,i=e.length-1,u;i>=0;i--)(u=e[i])&&(n=(r?u(s,t,n):u(n))||n);return r&&n&&H(s,t,n),n},P=(e,s)=>(t,r)=>s(t,r,e);let h=class extends o.Disposable{constructor(e,s){super(),this._commandService=e,this._sortService=s,this._initCommands(),this._registerCompareFns()}_initCommands(){[R].forEach(e=>this.disposeWithMe(this._commandService.registerCommand(e)))}_registerCompareFns(){const e=(s,t,r)=>{const n=this._getCommonValue(t),i=this._getCommonValue(r),u=[N,E,O];for(let c=0;c<u.length;c++){const a=u[c](n,i,s);if(a!==null)return a}return null};this._sortService.registerCompareFn(e)}_getCommonValue(e){var t,r;if(y(e))return null;const s=(r=(t=e==null?void 0:e.p)==null?void 0:t.body)==null?void 0:r.dataStream;return s||((e==null?void 0:e.t)===o.CellValueType.NUMBER?Number.parseFloat(`${e.v}`):(e==null?void 0:e.t)===o.CellValueType.STRING?typeof e.v=="number"?e.v:`${e.v}`:(e==null?void 0:e.t)===o.CellValueType.BOOLEAN?`${e.v}`:(e==null?void 0:e.t)===o.CellValueType.FORCE_STRING?Number.parseFloat(`${e.v}`):`${e==null?void 0:e.v}`)}};h=K([P(0,o.ICommandService),P(1,o.Inject(l.SheetsSortService))],h);var W=Object.defineProperty,Y=Object.getOwnPropertyDescriptor,z=(e,s,t,r)=>{for(var n=r>1?void 0:r?Y(s,t):s,i=e.length-1,u;i>=0;i--)(u=e[i])&&(n=(r?u(s,t,n):u(n))||n);return r&&n&&W(s,t,n),n},U=(e,s)=>(t,r)=>s(t,r,e);const J="SHEET_SORT_PLUGIN";l.UniverSheetsSortPlugin=(C=class extends o.Plugin{constructor(s=b,t,r){super(),this._config=s,this._injector=t,this._configService=r;const{...n}=o.merge({},b,this._config);this._configService.setConfig(D,n)}onStarting(){[[h],[l.SheetsSortService]].forEach(s=>this._injector.add(s))}onReady(){this._injector.get(h)}},_(C,"type",o.UniverInstanceType.UNIVER_SHEET),_(C,"pluginName",J),C),l.UniverSheetsSortPlugin=z([U(1,o.Inject(o.Injector)),U(2,o.IConfigService)],l.UniverSheetsSortPlugin),l.SortRangeCommand=R,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;const SHEETS_SORT_PLUGIN_CONFIG_KEY="sheets-sort.config",defaultPluginConfig={};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([__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([__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="SHEET_SORT_PLUGIN";exports2.UniverSheetsSortPlugin=(_c=class extends core.Plugin{constructor(_config=defaultPluginConfig,_injector,_configService){super(),this._config=_config,this._injector=_injector,this._configService=_configService;const{...rest}=core.merge({},defaultPluginConfig,this._config);this._configService.setConfig(SHEETS_SORT_PLUGIN_CONFIG_KEY,rest)}onStarting(){[[SheetsSortController],[exports2.SheetsSortService]].forEach(d=>this._injector.add(d))}onReady(){this._injector.get(SheetsSortController)}},__name(_c,"UniverSheetsSortPlugin"),__publicField(_c,"type",core.UniverInstanceType.UNIVER_SHEET),__publicField(_c,"pluginName",NAME),_c),exports2.UniverSheetsSortPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector)),__decorateParam(2,core.IConfigService)],exports2.UniverSheetsSortPlugin),exports2.SortRangeCommand=SortRangeCommand,exports2.SortType=SortType,Object.defineProperty(exports2,Symbol.toStringTag,{value:"Module"})});

package/lib/umd/locale/en-US.js

@@ -1 +1 @@
-(function(e,o){typeof exports=="object"&&typeof module<"u"?module.exports=o():typeof define=="function"&&define.amd?define(o):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortEnUS=o())})(this,function(){"use strict";return{sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortEnUS=factory())})(this,function(){"use strict";return{sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}}});

package/lib/umd/locale/fa-IR.js

@@ -1 +1 @@
-(function(e,t){typeof exports=="object"&&typeof module<"u"?module.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortFaIR=t())})(this,function(){"use strict";return{sheetsSort:{title:"مرتب‌سازی",toolbar:{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"},"context-menu":{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortFaIR=factory())})(this,function(){"use strict";return{sheetsSort:{title:"مرتب‌سازی",toolbar:{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"},"context-menu":{"sort-asc":"ترتیب صعودی","sort-desc":"ترتیب نزولی","sort-custom":"ترتیب سفارشی"}}}});

package/lib/umd/locale/fr-FR.js

@@ -1 +1 @@
-(function(e,o){typeof exports=="object"&&typeof module<"u"?module.exports=o():typeof define=="function"&&define.amd?define(o):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortFrFR=o())})(this,function(){"use strict";return{sheetsSort:{title:"Trier",toolbar:{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"},"context-menu":{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortFrFR=factory())})(this,function(){"use strict";return{sheetsSort:{title:"Trier",toolbar:{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"},"context-menu":{"sort-asc":"ordre croissant","sort-desc":"ordre décroissant","sort-custom":"ordre personnalisé"}}}});

package/lib/umd/locale/ru-RU.js

@@ -1 +1 @@
-(function(e,o){typeof exports=="object"&&typeof module<"u"?module.exports=o():typeof define=="function"&&define.amd?define(o):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortRuRU=o())})(this,function(){"use strict";return{sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortRuRU=factory())})(this,function(){"use strict";return{sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}}});

package/lib/umd/locale/vi-VN.js

@@ -1 +1 @@
-(function(e,o){typeof exports=="object"&&typeof module<"u"?module.exports=o():typeof define=="function"&&define.amd?define(o):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortViVN=o())})(this,function(){"use strict";return{sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortViVN=factory())})(this,function(){"use strict";return{sheetsSort:{title:"Sort",toolbar:{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"},"context-menu":{"sort-asc":"ascending order","sort-desc":"descending order","sort-custom":"custom order"}}}});

package/lib/umd/locale/zh-CN.js

@@ -1 +1 @@
-(function(e,t){typeof exports=="object"&&typeof module<"u"?module.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortZhCN=t())})(this,function(){"use strict";return{sheetsSort:{title:"排序",toolbar:{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"},"context-menu":{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortZhCN=factory())})(this,function(){"use strict";return{sheetsSort:{title:"排序",toolbar:{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"},"context-menu":{"sort-asc":"升序","sort-desc":"降序","sort-custom":"自定义排序"}}}});

package/lib/umd/locale/zh-TW.js

@@ -1 +1 @@
-(function(e,t){typeof exports=="object"&&typeof module<"u"?module.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self,e.UniverSheetsSortZhTW=t())})(this,function(){"use strict";return{sheetsSort:{title:"Sắp xếp",toolbar:{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"},"context-menu":{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"}}}});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?module.exports=factory():typeof define=="function"&&define.amd?define(factory):(global=typeof globalThis<"u"?globalThis:global||self,global.UniverSheetsSortZhTW=factory())})(this,function(){"use strict";return{sheetsSort:{title:"Sắp xếp",toolbar:{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"},"context-menu":{"sort-asc":"Tăng dần","sort-desc":"Giảm dần","sort-custom":"Sắp xếp tùy chỉnh"}}}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-sort",
-  "version": "0.5.4",
+  "version": "0.5.5-experimental.20250122-3362a4a",
   "private": false,
   "description": "A library for sorting data in Univer Sheet",
   "author": "DreamNum <developer@univer.ai>",
@@ -53,15 +53,15 @@
     "lib"
   ],
   "dependencies": {
-    "@univerjs/core": "0.5.4",
-    "@univerjs/engine-formula": "0.5.4",
-    "@univerjs/sheets": "0.5.4"
+    "@univerjs/core": "0.5.5-experimental.20250122-3362a4a",
+    "@univerjs/engine-formula": "0.5.5-experimental.20250122-3362a4a",
+    "@univerjs/sheets": "0.5.5-experimental.20250122-3362a4a"
   },
   "devDependencies": {
     "typescript": "^5.7.2",
     "vite": "^6.0.7",
     "vitest": "^2.1.8",
-    "@univerjs-infra/shared": "0.5.4"
+    "@univerjs-infra/shared": "0.5.5"
   },
   "scripts": {
     "test": "vitest run",

package/LICENSE

@@ -1,176 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS