@univerjs/thread-comment 0.2.4 → 0.2.6

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var j=Object.defineProperty;var L=(a,r,t)=>r in a?j(a,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):a[r]=t;var C=(a,r,t)=>L(a,typeof r!="symbol"?r+"":r,t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("rxjs"),i=require("@univerjs/core"),f=require("@wendellhu/redi");class $ extends i.Disposable{constructor(){super();C(this,"_dataSource",null);C(this,"syncUpdateMutationToColla",!0)}set dataSource(t){this._dataSource=t}get dataSource(){return this._dataSource}async getThreadComment(t,n,e){return this._dataSource?(await this._dataSource.listComments(t,n,[e]))[0]:null}async addComment(t){return this._dataSource?this._dataSource.addComment(t):t}async updateComment(t){return this._dataSource?this._dataSource.updateComment(t):!0}async resolveComment(t){return this._dataSource?this._dataSource.resolveComment(t):!0}async deleteComment(t,n,e,o){return this._dataSource?this._dataSource.deleteComment(t,n,e,o):!0}async listThreadComments(t,n,e){return this.dataSource?this.dataSource.listComments(t,n,e):[]}saveToSnapshot(t,n){if(this._dataSource){const e={};return Object.keys(t).forEach(o=>{const m=t[o];e[o]=m.map(this.dataSource.saveCommentToSnapshot)}),e}return t}}const p=f.createIdentifier("univer.thread-comment.data-source-service");var V=Object.defineProperty,W=Object.getOwnPropertyDescriptor,J=(a,r,t,n)=>{for(var e=n>1?void 0:n?W(r,t):r,o=a.length-1,m;o>=0;o--)(m=a[o])&&(e=(n?m(r,t,e):m(e))||e);return n&&e&&V(r,t,e),e},R=(a,r)=>(t,n)=>r(t,n,a);exports.ThreadCommentModel=class extends i.Disposable{constructor(t,n){super();C(this,"_commentsMap",{});C(this,"_commentsTreeMap",new Map);C(this,"_threadMap",new Map);C(this,"_commentUpdate$",new S.Subject);C(this,"_commentsMap$",new S.BehaviorSubject({}));C(this,"commentUpdate$",this._commentUpdate$.asObservable());C(this,"commentMap$",this._commentsMap$.asObservable());this._dataSourceService=t,this._commandService=n,this.disposeWithMe(()=>{this._commentUpdate$.complete(),this._commentsMap$.complete()})}_ensureCommentMap(t,n){let e=this._commentsMap[t];e||(e={},this._commentsMap[t]=e);let o=e[n];return o||(o={},e[n]=o),o}_ensureCommentChildrenMap(t,n){let e=this._commentsTreeMap.get(t);e||(e=new Map,this._commentsTreeMap.set(t,e));let o=e.get(n);return o||(o=new Map,e.set(n,o)),o}_ensureThreadMap(t){let n=this._threadMap.get(t);return n||(n=new Map,this._threadMap.set(t,n)),n}_refreshCommentsMap$(){this._commentsMap$.next({...this._commentsMap})}ensureMap(t,n){const e=this._ensureCommentMap(t,n),o=this._ensureCommentChildrenMap(t,n);return{commentMap:e,commentChildrenMap:o}}_replaceComment(t,n,e){var d;const{commentMap:o,commentChildrenMap:m}=this.ensureMap(t,n),s=o[e.id];if(s){const c={...e,ref:s.ref};o[e.id]=c,(d=e.children)==null||d.forEach(h=>{o[h.id]={...h,ref:""}}),m.set(e.id,c),this._commentUpdate$.next({unitId:t,subUnitId:n,type:"syncUpdate",payload:c}),!!e.resolved!=!!s.resolved&&this._commentUpdate$.next({unitId:t,subUnitId:n,type:"resolve",payload:{commentId:e.id,resolved:!!e.resolved}})}}async syncThreadComments(t,n,e){const o=await this._dataSourceService.listThreadComments(t,n,e);if(!o.length)return;const m=new Set(e);o.forEach(s=>{this._replaceComment(t,n,s),m.delete(s.threadId)}),m.forEach(s=>{const d=this.getThread(t,s);d&&this.deleteComment(d.unitId,d.subUnitId,d.id)}),this._refreshCommentsMap$()}addComment(t,n,e,o){var l,M;const{commentMap:m,commentChildrenMap:s}=this.ensureMap(t,n),d=e,c=u=>{m[u.id]=u,this._commentUpdate$.next({unitId:t,subUnitId:n,type:"add",payload:u,isRoot:!u.parentId})},h=d.parentId;if(h){const u=m[h];u.children=[...(l=u.children)!=null?l:[],d],c(d)}else s.set(d.id,d),this._ensureThreadMap(t).set(d.threadId,d),c(d),(M=d.children)==null||M.forEach(_=>c({..._,ref:""}));return this._refreshCommentsMap$(),o&&this.syncThreadComments(t,n,[d.threadId]),!0}updateComment(t,n,e,o){const{commentMap:m}=this.ensureMap(t,n),s=m[e.commentId];return s?(s.updated=!0,s.text=e.text,s.attachments=e.attachments,s.updateT=e.updateT,this._commentUpdate$.next({unitId:t,subUnitId:n,type:"update",payload:e,silent:o}),this._refreshCommentsMap$(),!0):!1}updateCommentRef(t,n,e,o){const{commentMap:m}=this.ensureMap(t,n),s=m[e.commentId];return s?(s.ref=e.ref,this._commentUpdate$.next({unitId:t,subUnitId:n,type:"updateRef",payload:e,silent:o}),this._refreshCommentsMap$(),!0):!1}resolveComment(t,n,e,o){const{commentMap:m}=this.ensureMap(t,n),s=m[e];return s?(s.resolved=o,this._commentUpdate$.next({unitId:t,subUnitId:n,type:"resolve",payload:{commentId:e,resolved:o}}),this._refreshCommentsMap$(),!0):!1}getComment(t,n,e){const{commentMap:o}=this.ensureMap(t,n);return o[e]}getComment$(t,n,e){return this._commentsMap$.pipe(S.map(o=>o[t][n][e]))}getCommentWithChildren(t,n,e){var h,l;const{commentMap:o,commentChildrenMap:m}=this.ensureMap(t,n),s=o[e];if(!s)return;const d=new Set,c=m.get(e);if(c)return[c,...(h=c.children)!=null?h:[]].forEach(M=>{var u;d.add(M.personId),(u=M.text.customRanges)==null||u.forEach(_=>{_.rangeType===i.CustomRangeType.MENTION&&d.add(_.rangeId)})}),{root:s,children:(l=c.children)!=null?l:[],relativeUsers:d}}deleteComment(t,n,e){var d;const{commentMap:o,commentChildrenMap:m}=this.ensureMap(t,n),s=o[e];if(!s)return!0;if(s.parentId){const c=m.get(s.parentId);if(c&&c.children){const h=c.children.findIndex(l=>l.id=e);c.children.splice(h,1)}delete o[e]}else{delete o[e];const c=m.get(e);m.delete(e),this._ensureThreadMap(t).delete(s.threadId),(d=c==null?void 0:c.children)==null||d.forEach(l=>{delete o[l.id],this._commentUpdate$.next({unitId:t,subUnitId:n,type:"delete",payload:{commentId:l.id,isRoot:!1,comment:l}})})}return this._commentUpdate$.next({unitId:t,subUnitId:n,type:"delete",payload:{commentId:e,isRoot:!s.parentId,comment:s}}),this._refreshCommentsMap$(),!0}getUnit(t){const n=this._commentsMap[t];return n?Array.from(Object.entries(n)).map(([e,o])=>[e,Array.from(Object.values(o))]):[]}deleteUnit(t){const n=this._commentsMap[t];n&&Object.entries(n).forEach(([e,o])=>{Object.values(o).forEach(m=>{this.deleteComment(t,e,m.id)})})}getRootCommentIds(t,n){const e=this._ensureCommentChildrenMap(t,n);return Array.from(e.keys())}getAll(){return this._commentsMap}getThread(t,n){return this._ensureThreadMap(t).get(n)}};exports.ThreadCommentModel=J([R(0,f.Inject(p)),R(1,i.ICommandService)],exports.ThreadCommentModel);var g=(a=>(a[a.UNIVER_UNKNOWN=0]="UNIVER_UNKNOWN",a[a.UNIVER_DOC=1]="UNIVER_DOC",a[a.UNIVER_SHEET=2]="UNIVER_SHEET",a[a.UNIVER_SLIDE=3]="UNIVER_SLIDE",a[a.UNRECOGNIZED=-1]="UNRECOGNIZED",a))(g||{});const U="THREAD_COMMENT_PLUGIN";var G=Object.defineProperty,H=Object.getOwnPropertyDescriptor,B=(a,r,t,n)=>{for(var e=n>1?void 0:n?H(r,t):r,o=a.length-1,m;o>=0;o--)(m=a[o])&&(e=(n?m(r,t,e):m(e))||e);return n&&e&&G(r,t,e),e},y=(a,r)=>(t,n)=>r(t,n,a);exports.ThreadCommentResourceController=class extends i.Disposable{constructor(r,t,n){super(),this._resourceManagerService=r,this._threadCommentModel=t,this._threadCommentDataSourceService=n,this._initSnapshot()}_initSnapshot(){const r=n=>{const e=this._threadCommentModel.getUnit(n),o={};return e?(e.forEach(([m,s])=>{o[m]=s}),JSON.stringify(this._threadCommentDataSourceService.saveToSnapshot(o,n))):""},t=n=>{if(!n)return{};try{return JSON.parse(n)}catch{return{}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:`SHEET_${U}`,businesses:[g.UNIVER_SHEET,g.UNIVER_DOC],toJson:n=>r(n),parseJson:n=>t(n),onUnLoad:n=>{this._threadCommentModel.deleteUnit(n)},onLoad:async(n,e)=>{Object.keys(e).forEach(o=>{const m=e[o];m.forEach(s=>{this._threadCommentModel.addComment(n,o,s)}),this._threadCommentModel.syncThreadComments(n,o,m.map(s=>s.threadId))})}}))}};exports.ThreadCommentResourceController=B([i.OnLifecycle(i.LifecycleStages.Starting,exports.ThreadCommentResourceController),y(0,i.IResourceManagerService),y(1,f.Inject(exports.ThreadCommentModel)),y(2,p)],exports.ThreadCommentResourceController);const I={id:"thread-comment.mutation.add-comment",type:i.CommandType.MUTATION,handler(a,r,t){if(!r)return!1;const n=a.get(exports.ThreadCommentModel),{unitId:e,subUnitId:o,comment:m,sync:s}=r,d=s||(t==null?void 0:t.fromChangeset)&&!m.parentId;return n.addComment(e,o,m,d)}},N={id:"thread-comment.mutation.update-comment",type:i.CommandType.MUTATION,handler(a,r){if(!r)return!1;const t=a.get(exports.ThreadCommentModel),{unitId:n,subUnitId:e,payload:o,silent:m}=r;return t.updateComment(n,e,o,m)}},D={id:"thread-comment.mutation.update-comment-ref",type:i.CommandType.MUTATION,handler(a,r){if(!r)return!1;const t=a.get(exports.ThreadCommentModel),{unitId:n,subUnitId:e,payload:o,silent:m}=r;return t.updateCommentRef(n,e,o,m)}},O={id:"thread-comment.mutation.resolve-comment",type:i.CommandType.MUTATION,handler(a,r){if(!r)return!1;const t=a.get(exports.ThreadCommentModel),{unitId:n,subUnitId:e,resolved:o,commentId:m}=r;return t.resolveComment(n,e,m,o)}},v={id:"thread-comment.mutation.delete-comment",type:i.CommandType.MUTATION,handler(a,r){if(!r)return!1;const t=a.get(exports.ThreadCommentModel),{unitId:n,subUnitId:e,commentId:o}=r;return t.deleteComment(n,e,o)}},w={id:"thread-comment.command.add-comment",type:i.CommandType.COMMAND,async handler(a,r){if(!r)return!1;const t=a.get(i.ICommandService),n=a.get(p),{comment:e}=r,o=await n.addComment(e),m=n.syncUpdateMutationToColla,s=!e.parentId,d={id:I.id,params:{...r,comment:o}};return s?await t.executeCommand(d.id,d.params):t.executeCommand(d.id,d.params,{onlyLocal:!m})}},x={id:"thread-comment.command.update-comment",type:i.CommandType.COMMAND,async handler(a,r){if(!r)return!1;const{unitId:t,subUnitId:n,payload:e}=r,o=a.get(i.ICommandService),m=a.get(exports.ThreadCommentModel),s=a.get(p),d=s.syncUpdateMutationToColla,c=m.getComment(t,n,e.commentId);if(!c)return!1;const{children:h,...l}=c;if(!await s.updateComment({...l,...e}))return!1;const u={id:N.id,params:r};return o.executeCommand(u.id,u.params,{onlyLocal:!d}),!0}},P={id:"thread-comment.command.resolve-comment",type:i.CommandType.COMMAND,async handler(a,r){if(!r)return!1;const{unitId:t,subUnitId:n,resolved:e,commentId:o}=r,m=a.get(p),d=a.get(exports.ThreadCommentModel).getComment(t,n,o),c=m.syncUpdateMutationToColla;return!d||!await m.resolveComment({...d,resolved:e})?!1:a.get(i.ICommandService).executeCommand(O.id,r,{onlyLocal:!c})}},A={id:"thread-comment.command.delete-comment",type:i.CommandType.COMMAND,async handler(a,r){if(!r)return!1;const t=a.get(exports.ThreadCommentModel),n=a.get(p),e=a.get(i.ICommandService),{unitId:o,subUnitId:m,commentId:s}=r,d=n.syncUpdateMutationToColla,c=t.getComment(o,m,s);if(!c||!await n.deleteComment(o,m,c.threadId,s))return!1;const h={id:v.id,params:r};return e.executeCommand(h.id,h.params,{onlyLocal:!d})}},b={id:"thread-comment.command.delete-comment-tree",type:i.CommandType.COMMAND,async handler(a,r){if(!r)return!1;const t=a.get(exports.ThreadCommentModel),n=a.get(i.ICommandService),e=a.get(p),{unitId:o,subUnitId:m,commentId:s}=r,d=t.getCommentWithChildren(o,m,s);return!d||!await e.deleteComment(o,m,d.root.threadId,s)?!1:await n.executeCommand(v.id,{unitId:o,subUnitId:m,commentId:d.root.id})}};var q=Object.defineProperty,K=Object.getOwnPropertyDescriptor,Z=(a,r,t,n)=>{for(var e=n>1?void 0:n?K(r,t):r,o=a.length-1,m;o>=0;o--)(m=a[o])&&(e=(n?m(r,t,e):m(e))||e);return n&&e&&q(r,t,e),e},E=(a,r)=>(t,n)=>r(t,n,a),T;exports.UniverThreadCommentPlugin=(T=class extends i.Plugin{constructor(t,n,e){super();C(this,"_config");this._injector=n,this._commandService=e,this._config=t}onStarting(t){var n;i.mergeOverrideWithDependencies([[p,{useClass:$}],[exports.ThreadCommentModel],[exports.ThreadCommentResourceController]],(n=this._config)==null?void 0:n.overrides).forEach(e=>{t.add(e)}),[w,x,A,P,b,I,N,D,v,O].forEach(e=>{this._commandService.registerCommand(e)})}},C(T,"pluginName",U),C(T,"type",i.UniverInstanceType.UNIVER_UNKNOWN),T);exports.UniverThreadCommentPlugin=Z([E(1,f.Inject(f.Injector)),E(2,i.ICommandService)],exports.UniverThreadCommentPlugin);exports.AddCommentCommand=w;exports.AddCommentMutation=I;exports.DeleteCommentCommand=A;exports.DeleteCommentMutation=v;exports.DeleteCommentTreeCommand=b;exports.IThreadCommentDataSourceService=p;exports.ResolveCommentCommand=P;exports.ResolveCommentMutation=O;exports.TC_PLUGIN_NAME=U;exports.ThreadCommentDataSourceService=$;exports.UpdateCommentCommand=x;exports.UpdateCommentMutation=N;exports.UpdateCommentRefMutation=D;
+"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 rxjs=require("rxjs"),core=require("@univerjs/core"),_ThreadCommentDataSourceService=class _ThreadCommentDataSourceService extends core.Disposable{constructor(){super();__publicField(this,"_dataSource",null);__publicField(this,"syncUpdateMutationToColla",!0)}set dataSource(dataSource){this._dataSource=dataSource}get dataSource(){return this._dataSource}async getThreadComment(unitId,subUnitId,threadId){return this._dataSource?(await this._dataSource.listComments(unitId,subUnitId,[threadId]))[0]:null}async addComment(comment){return this._dataSource?this._dataSource.addComment(comment):comment}async updateComment(comment){return this._dataSource?this._dataSource.updateComment(comment):!0}async resolveComment(comment){return this._dataSource?this._dataSource.resolveComment(comment):!0}async deleteComment(unitId,subUnitId,threadId,commentId){return this._dataSource?this._dataSource.deleteComment(unitId,subUnitId,threadId,commentId):!0}async listThreadComments(unitId,subUnitId,threadIds){return this.dataSource?this.dataSource.listComments(unitId,subUnitId,threadIds):[]}saveToSnapshot(unitComments,unitId){if(this._dataSource){const map={};return Object.keys(unitComments).forEach(subUnitId=>{const comments=unitComments[subUnitId];map[subUnitId]=comments.map(this.dataSource.saveCommentToSnapshot)}),map}return unitComments}};__name(_ThreadCommentDataSourceService,"ThreadCommentDataSourceService");let ThreadCommentDataSourceService=_ThreadCommentDataSourceService;const IThreadCommentDataSourceService=core.createIdentifier("univer.thread-comment.data-source-service");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.ThreadCommentModel=(_a=class extends core.Disposable{constructor(_dataSourceService,_commandService){super();__publicField(this,"_commentsMap",{});__publicField(this,"_commentsTreeMap",new Map);__publicField(this,"_threadMap",new Map);__publicField(this,"_commentUpdate$",new rxjs.Subject);__publicField(this,"_commentsMap$",new rxjs.BehaviorSubject({}));__publicField(this,"commentUpdate$",this._commentUpdate$.asObservable());__publicField(this,"commentMap$",this._commentsMap$.asObservable());this._dataSourceService=_dataSourceService,this._commandService=_commandService,this.disposeWithMe(()=>{this._commentUpdate$.complete(),this._commentsMap$.complete()})}_ensureCommentMap(unitId,subUnitId){let unitMap=this._commentsMap[unitId];unitMap||(unitMap={},this._commentsMap[unitId]=unitMap);let subUnitMap=unitMap[subUnitId];return subUnitMap||(subUnitMap={},unitMap[subUnitId]=subUnitMap),subUnitMap}_ensureCommentChildrenMap(unitId,subUnitId){let unitMap=this._commentsTreeMap.get(unitId);unitMap||(unitMap=new Map,this._commentsTreeMap.set(unitId,unitMap));let subUnitMap=unitMap.get(subUnitId);return subUnitMap||(subUnitMap=new Map,unitMap.set(subUnitId,subUnitMap)),subUnitMap}_ensureThreadMap(unitId){let unitMap=this._threadMap.get(unitId);return unitMap||(unitMap=new Map,this._threadMap.set(unitId,unitMap)),unitMap}_refreshCommentsMap$(){this._commentsMap$.next({...this._commentsMap})}ensureMap(unitId,subUnitId){const commentMap=this._ensureCommentMap(unitId,subUnitId),commentChildrenMap=this._ensureCommentChildrenMap(unitId,subUnitId);return{commentMap,commentChildrenMap}}_replaceComment(unitId,subUnitId,comment){var _a4;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),currentComment=commentMap[comment.id];if(currentComment){const newComment={...comment,ref:currentComment.ref};commentMap[comment.id]=newComment,(_a4=comment.children)==null||_a4.forEach(child=>{commentMap[child.id]={...child,ref:""}}),commentChildrenMap.set(comment.id,newComment),this._commentUpdate$.next({unitId,subUnitId,type:"syncUpdate",payload:newComment}),!!comment.resolved!=!!currentComment.resolved&&this._commentUpdate$.next({unitId,subUnitId,type:"resolve",payload:{commentId:comment.id,resolved:!!comment.resolved}})}}async syncThreadComments(unitId,subUnitId,threadIds){const comments=await this._dataSourceService.listThreadComments(unitId,subUnitId,threadIds);if(!comments.length)return;const deleteThreads=new Set(threadIds);comments.forEach(comment=>{this._replaceComment(unitId,subUnitId,comment),deleteThreads.delete(comment.threadId)}),deleteThreads.forEach(id=>{const thread=this.getThread(unitId,id);thread&&this.deleteComment(thread.unitId,thread.subUnitId,thread.id)}),this._refreshCommentsMap$()}addComment(unitId,subUnitId,origin,shouldSync){var _a4,_b;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),comment=origin,addCommentItem=__name(item=>{commentMap[item.id]=item,this._commentUpdate$.next({unitId,subUnitId,type:"add",payload:item,isRoot:!item.parentId})},"addCommentItem"),parentId=comment.parentId;if(parentId){const parent=commentMap[parentId];parent.children=[...(_a4=parent.children)!=null?_a4:[],comment],addCommentItem(comment)}else commentChildrenMap.set(comment.id,comment),this._ensureThreadMap(unitId).set(comment.threadId,comment),addCommentItem(comment),(_b=comment.children)==null||_b.forEach(child=>addCommentItem({...child,ref:""}));return this._refreshCommentsMap$(),shouldSync&&this.syncThreadComments(unitId,subUnitId,[comment.threadId]),!0}updateComment(unitId,subUnitId,payload,silent){const{commentMap}=this.ensureMap(unitId,subUnitId),oldComment=commentMap[payload.commentId];return oldComment?(oldComment.updated=!0,oldComment.text=payload.text,oldComment.attachments=payload.attachments,oldComment.updateT=payload.updateT,this._commentUpdate$.next({unitId,subUnitId,type:"update",payload,silent}),this._refreshCommentsMap$(),!0):!1}updateCommentRef(unitId,subUnitId,payload,silent){const{commentMap}=this.ensureMap(unitId,subUnitId),oldComment=commentMap[payload.commentId];return oldComment?(oldComment.ref=payload.ref,this._commentUpdate$.next({unitId,subUnitId,type:"updateRef",payload,silent}),this._refreshCommentsMap$(),!0):!1}resolveComment(unitId,subUnitId,commentId,resolved){const{commentMap}=this.ensureMap(unitId,subUnitId),oldComment=commentMap[commentId];return oldComment?(oldComment.resolved=resolved,this._commentUpdate$.next({unitId,subUnitId,type:"resolve",payload:{commentId,resolved}}),this._refreshCommentsMap$(),!0):!1}getComment(unitId,subUnitId,commentId){const{commentMap}=this.ensureMap(unitId,subUnitId);return commentMap[commentId]}getComment$(unitId,subUnitId,commentId){return this._commentsMap$.pipe(rxjs.map(records=>records[unitId][subUnitId][commentId]))}getCommentWithChildren(unitId,subUnitId,commentId){var _a4,_b;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),current=commentMap[commentId];if(!current)return;const relativeUsers=new Set,root=commentChildrenMap.get(commentId);if(root)return[root,...(_a4=root.children)!=null?_a4:[]].forEach(comment=>{var _a5;relativeUsers.add(comment.personId),(_a5=comment.text.customRanges)==null||_a5.forEach(range=>{range.rangeType===core.CustomRangeType.MENTION&&relativeUsers.add(range.rangeId)})}),{root:current,children:(_b=root.children)!=null?_b:[],relativeUsers}}deleteComment(unitId,subUnitId,commentId){var _a4;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),current=commentMap[commentId];if(!current)return!0;if(current.parentId){const root=commentChildrenMap.get(current.parentId);if(root&&root.children){const index=root.children.findIndex(comment=>comment.id=commentId);root.children.splice(index,1)}delete commentMap[commentId]}else{delete commentMap[commentId];const comment=commentChildrenMap.get(commentId);commentChildrenMap.delete(commentId),this._ensureThreadMap(unitId).delete(current.threadId),(_a4=comment==null?void 0:comment.children)==null||_a4.forEach(child=>{delete commentMap[child.id],this._commentUpdate$.next({unitId,subUnitId,type:"delete",payload:{commentId:child.id,isRoot:!1,comment:child}})})}return this._commentUpdate$.next({unitId,subUnitId,type:"delete",payload:{commentId,isRoot:!current.parentId,comment:current}}),this._refreshCommentsMap$(),!0}getUnit(unitId){const unitMap=this._commentsMap[unitId];return unitMap?Array.from(Object.entries(unitMap)).map(([subUnitId,subUnitMap])=>[subUnitId,Array.from(Object.values(subUnitMap))]):[]}deleteUnit(unitId){const unitMap=this._commentsMap[unitId];unitMap&&Object.entries(unitMap).forEach(([subUnitId,subUnitMap])=>{Object.values(subUnitMap).forEach(comment=>{this.deleteComment(unitId,subUnitId,comment.id)})})}getRootCommentIds(unitId,subUnitId){const commentChildrenMap=this._ensureCommentChildrenMap(unitId,subUnitId);return Array.from(commentChildrenMap.keys())}getAll(){return this._commentsMap}getThread(unitId,threadId){return this._ensureThreadMap(unitId).get(threadId)}},__name(_a,"ThreadCommentModel"),_a);exports.ThreadCommentModel=__decorateClass$2([__decorateParam$2(0,core.Inject(IThreadCommentDataSourceService)),__decorateParam$2(1,core.ICommandService)],exports.ThreadCommentModel);var I=(E=>(E[E.UNIVER_UNKNOWN=0]="UNIVER_UNKNOWN",E[E.UNIVER_DOC=1]="UNIVER_DOC",E[E.UNIVER_SHEET=2]="UNIVER_SHEET",E[E.UNIVER_SLIDE=3]="UNIVER_SLIDE",E[E.UNRECOGNIZED=-1]="UNRECOGNIZED",E))(I||{});const TC_PLUGIN_NAME="THREAD_COMMENT_PLUGIN";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;exports.ThreadCommentResourceController=(_a2=class extends core.Disposable{constructor(_resourceManagerService,_threadCommentModel,_threadCommentDataSourceService){super(),this._resourceManagerService=_resourceManagerService,this._threadCommentModel=_threadCommentModel,this._threadCommentDataSourceService=_threadCommentDataSourceService,this._initSnapshot()}_initSnapshot(){const toJson=__name(unitID=>{const map=this._threadCommentModel.getUnit(unitID),resultMap={};return map?(map.forEach(([key,v])=>{resultMap[key]=v}),JSON.stringify(this._threadCommentDataSourceService.saveToSnapshot(resultMap,unitID))):""},"toJson"),parseJson=__name(json=>{if(!json)return{};try{return JSON.parse(json)}catch{return{}}},"parseJson");this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:`SHEET_${TC_PLUGIN_NAME}`,businesses:[I.UNIVER_SHEET,I.UNIVER_DOC],toJson:__name(unitID=>toJson(unitID),"toJson"),parseJson:__name(json=>parseJson(json),"parseJson"),onUnLoad:__name(unitID=>{this._threadCommentModel.deleteUnit(unitID)},"onUnLoad"),onLoad:__name(async(unitID,value)=>{Object.keys(value).forEach(subunitId=>{const commentList=value[subunitId];commentList.forEach(comment=>{this._threadCommentModel.addComment(unitID,subunitId,comment)}),this._threadCommentModel.syncThreadComments(unitID,subunitId,commentList.map(i=>i.threadId))})},"onLoad")}))}},__name(_a2,"ThreadCommentResourceController"),_a2);exports.ThreadCommentResourceController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Starting,exports.ThreadCommentResourceController),__decorateParam$1(0,core.IResourceManagerService),__decorateParam$1(1,core.Inject(exports.ThreadCommentModel)),__decorateParam$1(2,IThreadCommentDataSourceService)],exports.ThreadCommentResourceController);const AddCommentMutation={id:"thread-comment.mutation.add-comment",type:core.CommandType.MUTATION,handler(accessor,params,options){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),{unitId,subUnitId,comment,sync}=params,shouldSync=sync||(options==null?void 0:options.fromChangeset)&&!comment.parentId;return threadCommentModel.addComment(unitId,subUnitId,comment,shouldSync)}},UpdateCommentMutation={id:"thread-comment.mutation.update-comment",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),{unitId,subUnitId,payload,silent}=params;return threadCommentModel.updateComment(unitId,subUnitId,payload,silent)}},UpdateCommentRefMutation={id:"thread-comment.mutation.update-comment-ref",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),{unitId,subUnitId,payload,silent}=params;return threadCommentModel.updateCommentRef(unitId,subUnitId,payload,silent)}},ResolveCommentMutation={id:"thread-comment.mutation.resolve-comment",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),{unitId,subUnitId,resolved,commentId}=params;return threadCommentModel.resolveComment(unitId,subUnitId,commentId,resolved)}},DeleteCommentMutation={id:"thread-comment.mutation.delete-comment",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),{unitId,subUnitId,commentId}=params;return threadCommentModel.deleteComment(unitId,subUnitId,commentId)}},AddCommentCommand={id:"thread-comment.command.add-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const commandService=accessor.get(core.ICommandService),dataSourceService=accessor.get(IThreadCommentDataSourceService),{comment:originComment}=params,comment=await dataSourceService.addComment(originComment),syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla,isRoot=!originComment.parentId,redo={id:AddCommentMutation.id,params:{...params,comment}};return isRoot?await commandService.executeCommand(redo.id,redo.params):commandService.executeCommand(redo.id,redo.params,{onlyLocal:!syncUpdateMutationToColla})}},UpdateCommentCommand={id:"thread-comment.command.update-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const{unitId,subUnitId,payload}=params,commandService=accessor.get(core.ICommandService),threadCommentModel=accessor.get(exports.ThreadCommentModel),dataSourceService=accessor.get(IThreadCommentDataSourceService),syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla,current=threadCommentModel.getComment(unitId,subUnitId,payload.commentId);if(!current)return!1;const{children,...currentComment}=current;if(!await dataSourceService.updateComment({...currentComment,...payload}))return!1;const redo={id:UpdateCommentMutation.id,params};return commandService.executeCommand(redo.id,redo.params,{onlyLocal:!syncUpdateMutationToColla}),!0}},ResolveCommentCommand={id:"thread-comment.command.resolve-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const{unitId,subUnitId,resolved,commentId}=params,dataSourceService=accessor.get(IThreadCommentDataSourceService),currentComment=accessor.get(exports.ThreadCommentModel).getComment(unitId,subUnitId,commentId),syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla;return!currentComment||!await dataSourceService.resolveComment({...currentComment,resolved})?!1:accessor.get(core.ICommandService).executeCommand(ResolveCommentMutation.id,params,{onlyLocal:!syncUpdateMutationToColla})}},DeleteCommentCommand={id:"thread-comment.command.delete-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),dataSourceService=accessor.get(IThreadCommentDataSourceService),commandService=accessor.get(core.ICommandService),{unitId,subUnitId,commentId}=params,syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla,comment=threadCommentModel.getComment(unitId,subUnitId,commentId);if(!comment||!await dataSourceService.deleteComment(unitId,subUnitId,comment.threadId,commentId))return!1;const redo={id:DeleteCommentMutation.id,params};return commandService.executeCommand(redo.id,redo.params,{onlyLocal:!syncUpdateMutationToColla})}},DeleteCommentTreeCommand={id:"thread-comment.command.delete-comment-tree",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports.ThreadCommentModel),commandService=accessor.get(core.ICommandService),dataSourceService=accessor.get(IThreadCommentDataSourceService),{unitId,subUnitId,commentId}=params,commentWithChildren=threadCommentModel.getCommentWithChildren(unitId,subUnitId,commentId);return!commentWithChildren||!await dataSourceService.deleteComment(unitId,subUnitId,commentWithChildren.root.threadId,commentId)?!1:await commandService.executeCommand(DeleteCommentMutation.id,{unitId,subUnitId,commentId:commentWithChildren.root.id})}};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"),_a3;exports.UniverThreadCommentPlugin=(_a3=class extends core.Plugin{constructor(config,_injector,_commandService){super();__publicField(this,"_config");this._injector=_injector,this._commandService=_commandService,this._config=config}onStarting(){var _a4;core.mergeOverrideWithDependencies([[IThreadCommentDataSourceService,{useClass:ThreadCommentDataSourceService}],[exports.ThreadCommentModel],[exports.ThreadCommentResourceController]],(_a4=this._config)==null?void 0:_a4.overrides).forEach(d=>{this._injector.add(d)}),[AddCommentCommand,UpdateCommentCommand,DeleteCommentCommand,ResolveCommentCommand,DeleteCommentTreeCommand,AddCommentMutation,UpdateCommentMutation,UpdateCommentRefMutation,DeleteCommentMutation,ResolveCommentMutation].forEach(command=>{this._commandService.registerCommand(command)})}},__name(_a3,"UniverThreadCommentPlugin"),__publicField(_a3,"pluginName",TC_PLUGIN_NAME),__publicField(_a3,"type",core.UniverInstanceType.UNIVER_UNKNOWN),_a3);exports.UniverThreadCommentPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector)),__decorateParam(2,core.ICommandService)],exports.UniverThreadCommentPlugin);exports.AddCommentCommand=AddCommentCommand;exports.AddCommentMutation=AddCommentMutation;exports.DeleteCommentCommand=DeleteCommentCommand;exports.DeleteCommentMutation=DeleteCommentMutation;exports.DeleteCommentTreeCommand=DeleteCommentTreeCommand;exports.IThreadCommentDataSourceService=IThreadCommentDataSourceService;exports.ResolveCommentCommand=ResolveCommentCommand;exports.ResolveCommentMutation=ResolveCommentMutation;exports.TC_PLUGIN_NAME=TC_PLUGIN_NAME;exports.ThreadCommentDataSourceService=ThreadCommentDataSourceService;exports.UpdateCommentCommand=UpdateCommentCommand;exports.UpdateCommentMutation=UpdateCommentMutation;exports.UpdateCommentRefMutation=UpdateCommentRefMutation;

package/lib/es/index.js

@@ -1,527 +1,529 @@
-var x = Object.defineProperty;
-var P = (a, t, e) => t in a ? x(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
-var h = (a, t, e) => P(a, typeof t != "symbol" ? t + "" : t, e);
-import { Subject as A, BehaviorSubject as b, map as j } from "rxjs";
-import { Disposable as T, CustomRangeType as L, ICommandService as _, OnLifecycle as V, LifecycleStages as W, IResourceManagerService as J, CommandType as p, Plugin as H, UniverInstanceType as B, mergeOverrideWithDependencies as G } from "@univerjs/core";
-import { createIdentifier as K, Inject as U, Injector as Z } from "@wendellhu/redi";
-class q extends T {
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { Subject, BehaviorSubject, map } from "rxjs";
+import { Disposable, createIdentifier, CustomRangeType, Inject, ICommandService, OnLifecycle, LifecycleStages, IResourceManagerService, CommandType, Plugin, UniverInstanceType, mergeOverrideWithDependencies, Injector } from "@univerjs/core";
+const _ThreadCommentDataSourceService = class _ThreadCommentDataSourceService extends Disposable {
   constructor() {
     super();
-    h(this, "_dataSource", null);
-    h(this, "syncUpdateMutationToColla", !0);
+    __publicField(this, "_dataSource", null);
+    __publicField(this, "syncUpdateMutationToColla", !0);
   }
-  set dataSource(e) {
-    this._dataSource = e;
+  set dataSource(dataSource) {
+    this._dataSource = dataSource;
   }
   get dataSource() {
     return this._dataSource;
   }
-  async getThreadComment(e, n, r) {
-    return this._dataSource ? (await this._dataSource.listComments(e, n, [r]))[0] : null;
+  async getThreadComment(unitId, subUnitId, threadId) {
+    return this._dataSource ? (await this._dataSource.listComments(unitId, subUnitId, [threadId]))[0] : null;
   }
-  async addComment(e) {
-    return this._dataSource ? this._dataSource.addComment(e) : e;
+  async addComment(comment) {
+    return this._dataSource ? this._dataSource.addComment(comment) : comment;
   }
-  async updateComment(e) {
-    return this._dataSource ? this._dataSource.updateComment(e) : !0;
+  async updateComment(comment) {
+    return this._dataSource ? this._dataSource.updateComment(comment) : !0;
   }
-  async resolveComment(e) {
-    return this._dataSource ? this._dataSource.resolveComment(e) : !0;
+  async resolveComment(comment) {
+    return this._dataSource ? this._dataSource.resolveComment(comment) : !0;
   }
-  async deleteComment(e, n, r, m) {
-    return this._dataSource ? this._dataSource.deleteComment(e, n, r, m) : !0;
+  async deleteComment(unitId, subUnitId, threadId, commentId) {
+    return this._dataSource ? this._dataSource.deleteComment(unitId, subUnitId, threadId, commentId) : !0;
   }
-  async listThreadComments(e, n, r) {
-    return this.dataSource ? this.dataSource.listComments(e, n, r) : [];
+  async listThreadComments(unitId, subUnitId, threadIds) {
+    return this.dataSource ? this.dataSource.listComments(unitId, subUnitId, threadIds) : [];
   }
-  saveToSnapshot(e, n) {
+  saveToSnapshot(unitComments, unitId) {
     if (this._dataSource) {
-      const r = {};
-      return Object.keys(e).forEach((m) => {
-        const o = e[m];
-        r[m] = o.map(this.dataSource.saveCommentToSnapshot);
-      }), r;
+      const map2 = {};
+      return Object.keys(unitComments).forEach((subUnitId) => {
+        const comments = unitComments[subUnitId];
+        map2[subUnitId] = comments.map(this.dataSource.saveCommentToSnapshot);
+      }), map2;
     }
-    return e;
-  }
-}
-const f = K("univer.thread-comment.data-source-service");
-var z = Object.defineProperty, F = Object.getOwnPropertyDescriptor, Q = (a, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? F(t, e) : t, m = a.length - 1, o; m >= 0; m--)
-    (o = a[m]) && (r = (n ? o(t, e, r) : o(r)) || r);
-  return n && r && z(t, e, r), r;
-}, O = (a, t) => (e, n) => t(e, n, a);
-let u = class extends T {
-  constructor(t, e) {
+    return unitComments;
+  }
+};
+__name(_ThreadCommentDataSourceService, "ThreadCommentDataSourceService");
+let ThreadCommentDataSourceService = _ThreadCommentDataSourceService;
+const IThreadCommentDataSourceService = createIdentifier("univer.thread-comment.data-source-service");
+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 ThreadCommentModel = (_a = class extends Disposable {
+  constructor(_dataSourceService, _commandService) {
     super();
-    h(this, "_commentsMap", {});
-    h(this, "_commentsTreeMap", /* @__PURE__ */ new Map());
-    h(this, "_threadMap", /* @__PURE__ */ new Map());
-    h(this, "_commentUpdate$", new A());
-    h(this, "_commentsMap$", new b({}));
-    h(this, "commentUpdate$", this._commentUpdate$.asObservable());
-    h(this, "commentMap$", this._commentsMap$.asObservable());
-    this._dataSourceService = t, this._commandService = e, this.disposeWithMe(() => {
+    __publicField(this, "_commentsMap", {});
+    __publicField(this, "_commentsTreeMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_threadMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_commentUpdate$", new Subject());
+    __publicField(this, "_commentsMap$", new BehaviorSubject({}));
+    __publicField(this, "commentUpdate$", this._commentUpdate$.asObservable());
+    __publicField(this, "commentMap$", this._commentsMap$.asObservable());
+    this._dataSourceService = _dataSourceService, this._commandService = _commandService, this.disposeWithMe(() => {
       this._commentUpdate$.complete(), this._commentsMap$.complete();
     });
   }
-  _ensureCommentMap(t, e) {
-    let n = this._commentsMap[t];
-    n || (n = {}, this._commentsMap[t] = n);
-    let r = n[e];
-    return r || (r = {}, n[e] = r), r;
+  _ensureCommentMap(unitId, subUnitId) {
+    let unitMap = this._commentsMap[unitId];
+    unitMap || (unitMap = {}, this._commentsMap[unitId] = unitMap);
+    let subUnitMap = unitMap[subUnitId];
+    return subUnitMap || (subUnitMap = {}, unitMap[subUnitId] = subUnitMap), subUnitMap;
   }
-  _ensureCommentChildrenMap(t, e) {
-    let n = this._commentsTreeMap.get(t);
-    n || (n = /* @__PURE__ */ new Map(), this._commentsTreeMap.set(t, n));
-    let r = n.get(e);
-    return r || (r = /* @__PURE__ */ new Map(), n.set(e, r)), r;
+  _ensureCommentChildrenMap(unitId, subUnitId) {
+    let unitMap = this._commentsTreeMap.get(unitId);
+    unitMap || (unitMap = /* @__PURE__ */ new Map(), this._commentsTreeMap.set(unitId, unitMap));
+    let subUnitMap = unitMap.get(subUnitId);
+    return subUnitMap || (subUnitMap = /* @__PURE__ */ new Map(), unitMap.set(subUnitId, subUnitMap)), subUnitMap;
   }
-  _ensureThreadMap(t) {
-    let e = this._threadMap.get(t);
-    return e || (e = /* @__PURE__ */ new Map(), this._threadMap.set(t, e)), e;
+  _ensureThreadMap(unitId) {
+    let unitMap = this._threadMap.get(unitId);
+    return unitMap || (unitMap = /* @__PURE__ */ new Map(), this._threadMap.set(unitId, unitMap)), unitMap;
   }
   _refreshCommentsMap$() {
     this._commentsMap$.next({
       ...this._commentsMap
     });
   }
-  ensureMap(t, e) {
-    const n = this._ensureCommentMap(t, e), r = this._ensureCommentChildrenMap(t, e);
+  ensureMap(unitId, subUnitId) {
+    const commentMap = this._ensureCommentMap(unitId, subUnitId), commentChildrenMap = this._ensureCommentChildrenMap(unitId, subUnitId);
     return {
-      commentMap: n,
-      commentChildrenMap: r
+      commentMap,
+      commentChildrenMap
     };
   }
-  _replaceComment(t, e, n) {
-    var s;
-    const { commentMap: r, commentChildrenMap: m } = this.ensureMap(t, e), o = r[n.id];
-    if (o) {
-      const c = {
-        ...n,
-        ref: o.ref
+  _replaceComment(unitId, subUnitId, comment) {
+    var _a4;
+    const { commentMap, commentChildrenMap } = this.ensureMap(unitId, subUnitId), currentComment = commentMap[comment.id];
+    if (currentComment) {
+      const newComment = {
+        ...comment,
+        ref: currentComment.ref
       };
-      r[n.id] = c, (s = n.children) == null || s.forEach((d) => {
-        r[d.id] = {
-          ...d,
+      commentMap[comment.id] = newComment, (_a4 = comment.children) == null || _a4.forEach((child) => {
+        commentMap[child.id] = {
+          ...child,
           ref: ""
         };
-      }), m.set(n.id, c), this._commentUpdate$.next({
-        unitId: t,
-        subUnitId: e,
+      }), commentChildrenMap.set(comment.id, newComment), this._commentUpdate$.next({
+        unitId,
+        subUnitId,
         type: "syncUpdate",
-        payload: c
-      }), !!n.resolved != !!o.resolved && this._commentUpdate$.next({
-        unitId: t,
-        subUnitId: e,
+        payload: newComment
+      }), !!comment.resolved != !!currentComment.resolved && this._commentUpdate$.next({
+        unitId,
+        subUnitId,
         type: "resolve",
         payload: {
-          commentId: n.id,
-          resolved: !!n.resolved
+          commentId: comment.id,
+          resolved: !!comment.resolved
         }
       });
     }
   }
-  async syncThreadComments(t, e, n) {
-    const r = await this._dataSourceService.listThreadComments(t, e, n);
-    if (!r.length)
+  async syncThreadComments(unitId, subUnitId, threadIds) {
+    const comments = await this._dataSourceService.listThreadComments(unitId, subUnitId, threadIds);
+    if (!comments.length)
       return;
-    const m = new Set(n);
-    r.forEach((o) => {
-      this._replaceComment(t, e, o), m.delete(o.threadId);
-    }), m.forEach((o) => {
-      const s = this.getThread(t, o);
-      s && this.deleteComment(s.unitId, s.subUnitId, s.id);
+    const deleteThreads = new Set(threadIds);
+    comments.forEach((comment) => {
+      this._replaceComment(unitId, subUnitId, comment), deleteThreads.delete(comment.threadId);
+    }), deleteThreads.forEach((id) => {
+      const thread = this.getThread(unitId, id);
+      thread && this.deleteComment(thread.unitId, thread.subUnitId, thread.id);
     }), this._refreshCommentsMap$();
   }
-  addComment(t, e, n, r) {
-    var i, C;
-    const { commentMap: m, commentChildrenMap: o } = this.ensureMap(t, e), s = n, c = (l) => {
-      m[l.id] = l, this._commentUpdate$.next({
-        unitId: t,
-        subUnitId: e,
+  addComment(unitId, subUnitId, origin, shouldSync) {
+    var _a4, _b;
+    const { commentMap, commentChildrenMap } = this.ensureMap(unitId, subUnitId), comment = origin, addCommentItem = /* @__PURE__ */ __name((item) => {
+      commentMap[item.id] = item, this._commentUpdate$.next({
+        unitId,
+        subUnitId,
         type: "add",
-        payload: l,
-        isRoot: !l.parentId
+        payload: item,
+        isRoot: !item.parentId
       });
-    }, d = s.parentId;
-    if (d) {
-      const l = m[d];
-      l.children = [
-        ...(i = l.children) != null ? i : [],
-        s
-      ], c(s);
+    }, "addCommentItem"), parentId = comment.parentId;
+    if (parentId) {
+      const parent = commentMap[parentId];
+      parent.children = [
+        ...(_a4 = parent.children) != null ? _a4 : [],
+        comment
+      ], addCommentItem(comment);
     } else
-      o.set(s.id, s), this._ensureThreadMap(t).set(s.threadId, s), c(s), (C = s.children) == null || C.forEach((M) => c({
-        ...M,
+      commentChildrenMap.set(comment.id, comment), this._ensureThreadMap(unitId).set(comment.threadId, comment), addCommentItem(comment), (_b = comment.children) == null || _b.forEach((child) => addCommentItem({
+        ...child,
         ref: ""
       }));
-    return this._refreshCommentsMap$(), r && this.syncThreadComments(t, e, [s.threadId]), !0;
+    return this._refreshCommentsMap$(), shouldSync && this.syncThreadComments(unitId, subUnitId, [comment.threadId]), !0;
   }
-  updateComment(t, e, n, r) {
-    const { commentMap: m } = this.ensureMap(t, e), o = m[n.commentId];
-    return o ? (o.updated = !0, o.text = n.text, o.attachments = n.attachments, o.updateT = n.updateT, this._commentUpdate$.next({
-      unitId: t,
-      subUnitId: e,
+  updateComment(unitId, subUnitId, payload, silent) {
+    const { commentMap } = this.ensureMap(unitId, subUnitId), oldComment = commentMap[payload.commentId];
+    return oldComment ? (oldComment.updated = !0, oldComment.text = payload.text, oldComment.attachments = payload.attachments, oldComment.updateT = payload.updateT, this._commentUpdate$.next({
+      unitId,
+      subUnitId,
       type: "update",
-      payload: n,
-      silent: r
+      payload,
+      silent
     }), this._refreshCommentsMap$(), !0) : !1;
   }
-  updateCommentRef(t, e, n, r) {
-    const { commentMap: m } = this.ensureMap(t, e), o = m[n.commentId];
-    return o ? (o.ref = n.ref, this._commentUpdate$.next({
-      unitId: t,
-      subUnitId: e,
+  updateCommentRef(unitId, subUnitId, payload, silent) {
+    const { commentMap } = this.ensureMap(unitId, subUnitId), oldComment = commentMap[payload.commentId];
+    return oldComment ? (oldComment.ref = payload.ref, this._commentUpdate$.next({
+      unitId,
+      subUnitId,
       type: "updateRef",
-      payload: n,
-      silent: r
+      payload,
+      silent
     }), this._refreshCommentsMap$(), !0) : !1;
   }
-  resolveComment(t, e, n, r) {
-    const { commentMap: m } = this.ensureMap(t, e), o = m[n];
-    return o ? (o.resolved = r, this._commentUpdate$.next({
-      unitId: t,
-      subUnitId: e,
+  resolveComment(unitId, subUnitId, commentId, resolved) {
+    const { commentMap } = this.ensureMap(unitId, subUnitId), oldComment = commentMap[commentId];
+    return oldComment ? (oldComment.resolved = resolved, this._commentUpdate$.next({
+      unitId,
+      subUnitId,
       type: "resolve",
       payload: {
-        commentId: n,
-        resolved: r
+        commentId,
+        resolved
       }
     }), this._refreshCommentsMap$(), !0) : !1;
   }
-  getComment(t, e, n) {
-    const { commentMap: r } = this.ensureMap(t, e);
-    return r[n];
+  getComment(unitId, subUnitId, commentId) {
+    const { commentMap } = this.ensureMap(unitId, subUnitId);
+    return commentMap[commentId];
   }
-  getComment$(t, e, n) {
-    return this._commentsMap$.pipe(j((r) => r[t][e][n]));
+  getComment$(unitId, subUnitId, commentId) {
+    return this._commentsMap$.pipe(map((records) => records[unitId][subUnitId][commentId]));
   }
-  getCommentWithChildren(t, e, n) {
-    var d, i;
-    const { commentMap: r, commentChildrenMap: m } = this.ensureMap(t, e), o = r[n];
-    if (!o)
+  getCommentWithChildren(unitId, subUnitId, commentId) {
+    var _a4, _b;
+    const { commentMap, commentChildrenMap } = this.ensureMap(unitId, subUnitId), current = commentMap[commentId];
+    if (!current)
       return;
-    const s = /* @__PURE__ */ new Set(), c = m.get(n);
-    if (c)
-      return [c, ...(d = c.children) != null ? d : []].forEach((C) => {
-        var l;
-        s.add(C.personId), (l = C.text.customRanges) == null || l.forEach((M) => {
-          M.rangeType === L.MENTION && s.add(M.rangeId);
+    const relativeUsers = /* @__PURE__ */ new Set(), root = commentChildrenMap.get(commentId);
+    if (root)
+      return [root, ...(_a4 = root.children) != null ? _a4 : []].forEach((comment) => {
+        var _a5;
+        relativeUsers.add(comment.personId), (_a5 = comment.text.customRanges) == null || _a5.forEach((range) => {
+          range.rangeType === CustomRangeType.MENTION && relativeUsers.add(range.rangeId);
         });
       }), {
-        root: o,
-        children: (i = c.children) != null ? i : [],
-        relativeUsers: s
+        root: current,
+        children: (_b = root.children) != null ? _b : [],
+        relativeUsers
       };
   }
-  deleteComment(t, e, n) {
-    var s;
-    const { commentMap: r, commentChildrenMap: m } = this.ensureMap(t, e), o = r[n];
-    if (!o)
+  deleteComment(unitId, subUnitId, commentId) {
+    var _a4;
+    const { commentMap, commentChildrenMap } = this.ensureMap(unitId, subUnitId), current = commentMap[commentId];
+    if (!current)
       return !0;
-    if (o.parentId) {
-      const c = m.get(o.parentId);
-      if (c && c.children) {
-        const d = c.children.findIndex((i) => i.id = n);
-        c.children.splice(d, 1);
+    if (current.parentId) {
+      const root = commentChildrenMap.get(current.parentId);
+      if (root && root.children) {
+        const index = root.children.findIndex((comment) => comment.id = commentId);
+        root.children.splice(index, 1);
       }
-      delete r[n];
+      delete commentMap[commentId];
     } else {
-      delete r[n];
-      const c = m.get(n);
-      m.delete(n), this._ensureThreadMap(t).delete(o.threadId), (s = c == null ? void 0 : c.children) == null || s.forEach((i) => {
-        delete r[i.id], this._commentUpdate$.next({
-          unitId: t,
-          subUnitId: e,
+      delete commentMap[commentId];
+      const comment = commentChildrenMap.get(commentId);
+      commentChildrenMap.delete(commentId), this._ensureThreadMap(unitId).delete(current.threadId), (_a4 = comment == null ? void 0 : comment.children) == null || _a4.forEach((child) => {
+        delete commentMap[child.id], this._commentUpdate$.next({
+          unitId,
+          subUnitId,
           type: "delete",
           payload: {
-            commentId: i.id,
+            commentId: child.id,
             isRoot: !1,
-            comment: i
+            comment: child
           }
         });
       });
     }
     return this._commentUpdate$.next({
-      unitId: t,
-      subUnitId: e,
+      unitId,
+      subUnitId,
       type: "delete",
       payload: {
-        commentId: n,
-        isRoot: !o.parentId,
-        comment: o
+        commentId,
+        isRoot: !current.parentId,
+        comment: current
       }
     }), this._refreshCommentsMap$(), !0;
   }
-  getUnit(t) {
-    const e = this._commentsMap[t];
-    return e ? Array.from(Object.entries(e)).map(([n, r]) => [n, Array.from(Object.values(r))]) : [];
+  getUnit(unitId) {
+    const unitMap = this._commentsMap[unitId];
+    return unitMap ? Array.from(Object.entries(unitMap)).map(([subUnitId, subUnitMap]) => [subUnitId, Array.from(Object.values(subUnitMap))]) : [];
   }
-  deleteUnit(t) {
-    const e = this._commentsMap[t];
-    e && Object.entries(e).forEach(([n, r]) => {
-      Object.values(r).forEach((m) => {
-        this.deleteComment(t, n, m.id);
+  deleteUnit(unitId) {
+    const unitMap = this._commentsMap[unitId];
+    unitMap && Object.entries(unitMap).forEach(([subUnitId, subUnitMap]) => {
+      Object.values(subUnitMap).forEach((comment) => {
+        this.deleteComment(unitId, subUnitId, comment.id);
       });
     });
   }
-  getRootCommentIds(t, e) {
-    const n = this._ensureCommentChildrenMap(t, e);
-    return Array.from(n.keys());
+  getRootCommentIds(unitId, subUnitId) {
+    const commentChildrenMap = this._ensureCommentChildrenMap(unitId, subUnitId);
+    return Array.from(commentChildrenMap.keys());
   }
   getAll() {
     return this._commentsMap;
   }
-  getThread(t, e) {
-    return this._ensureThreadMap(t).get(e);
-  }
-};
-u = Q([
-  O(0, U(f)),
-  O(1, _)
-], u);
-var g = /* @__PURE__ */ ((a) => (a[a.UNIVER_UNKNOWN = 0] = "UNIVER_UNKNOWN", a[a.UNIVER_DOC = 1] = "UNIVER_DOC", a[a.UNIVER_SHEET = 2] = "UNIVER_SHEET", a[a.UNIVER_SLIDE = 3] = "UNIVER_SLIDE", a[a.UNRECOGNIZED = -1] = "UNRECOGNIZED", a))(g || {});
-const E = "THREAD_COMMENT_PLUGIN";
-var X = Object.defineProperty, Y = Object.getOwnPropertyDescriptor, k = (a, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Y(t, e) : t, m = a.length - 1, o; m >= 0; m--)
-    (o = a[m]) && (r = (n ? o(t, e, r) : o(r)) || r);
-  return n && r && X(t, e, r), r;
-}, y = (a, t) => (e, n) => t(e, n, a);
-let S = class extends T {
-  constructor(a, t, e) {
-    super(), this._resourceManagerService = a, this._threadCommentModel = t, this._threadCommentDataSourceService = e, this._initSnapshot();
+  getThread(unitId, threadId) {
+    return this._ensureThreadMap(unitId).get(threadId);
+  }
+}, __name(_a, "ThreadCommentModel"), _a);
+ThreadCommentModel = __decorateClass$2([
+  __decorateParam$2(0, Inject(IThreadCommentDataSourceService)),
+  __decorateParam$2(1, ICommandService)
+], ThreadCommentModel);
+var I = /* @__PURE__ */ ((E) => (E[E.UNIVER_UNKNOWN = 0] = "UNIVER_UNKNOWN", E[E.UNIVER_DOC = 1] = "UNIVER_DOC", E[E.UNIVER_SHEET = 2] = "UNIVER_SHEET", E[E.UNIVER_SLIDE = 3] = "UNIVER_SLIDE", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(I || {});
+const TC_PLUGIN_NAME = "THREAD_COMMENT_PLUGIN";
+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 ThreadCommentResourceController = (_a2 = class extends Disposable {
+  constructor(_resourceManagerService, _threadCommentModel, _threadCommentDataSourceService) {
+    super(), this._resourceManagerService = _resourceManagerService, this._threadCommentModel = _threadCommentModel, this._threadCommentDataSourceService = _threadCommentDataSourceService, this._initSnapshot();
   }
   _initSnapshot() {
-    const a = (e) => {
-      const n = this._threadCommentModel.getUnit(e), r = {};
-      return n ? (n.forEach(([m, o]) => {
-        r[m] = o;
-      }), JSON.stringify(this._threadCommentDataSourceService.saveToSnapshot(r, e))) : "";
-    }, t = (e) => {
-      if (!e)
+    const toJson = /* @__PURE__ */ __name((unitID) => {
+      const map2 = this._threadCommentModel.getUnit(unitID), resultMap = {};
+      return map2 ? (map2.forEach(([key, v]) => {
+        resultMap[key] = v;
+      }), JSON.stringify(this._threadCommentDataSourceService.saveToSnapshot(resultMap, unitID))) : "";
+    }, "toJson"), parseJson = /* @__PURE__ */ __name((json) => {
+      if (!json)
         return {};
       try {
-        return JSON.parse(e);
+        return JSON.parse(json);
       } catch {
         return {};
       }
-    };
+    }, "parseJson");
     this.disposeWithMe(
       this._resourceManagerService.registerPluginResource({
-        pluginName: `SHEET_${E}`,
-        businesses: [g.UNIVER_SHEET, g.UNIVER_DOC],
-        toJson: (e) => a(e),
-        parseJson: (e) => t(e),
-        onUnLoad: (e) => {
-          this._threadCommentModel.deleteUnit(e);
-        },
-        onLoad: async (e, n) => {
-          Object.keys(n).forEach((r) => {
-            const m = n[r];
-            m.forEach((o) => {
-              this._threadCommentModel.addComment(e, r, o);
-            }), this._threadCommentModel.syncThreadComments(e, r, m.map((o) => o.threadId));
+        pluginName: `SHEET_${TC_PLUGIN_NAME}`,
+        businesses: [I.UNIVER_SHEET, I.UNIVER_DOC],
+        toJson: /* @__PURE__ */ __name((unitID) => toJson(unitID), "toJson"),
+        parseJson: /* @__PURE__ */ __name((json) => parseJson(json), "parseJson"),
+        onUnLoad: /* @__PURE__ */ __name((unitID) => {
+          this._threadCommentModel.deleteUnit(unitID);
+        }, "onUnLoad"),
+        onLoad: /* @__PURE__ */ __name(async (unitID, value) => {
+          Object.keys(value).forEach((subunitId) => {
+            const commentList = value[subunitId];
+            commentList.forEach((comment) => {
+              this._threadCommentModel.addComment(unitID, subunitId, comment);
+            }), this._threadCommentModel.syncThreadComments(unitID, subunitId, commentList.map((i) => i.threadId));
           });
-        }
+        }, "onLoad")
       })
     );
   }
-};
-S = k([
-  V(W.Starting, S),
-  y(0, J),
-  y(1, U(u)),
-  y(2, f)
-], S);
-const R = {
+}, __name(_a2, "ThreadCommentResourceController"), _a2);
+ThreadCommentResourceController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Starting, ThreadCommentResourceController),
+  __decorateParam$1(0, IResourceManagerService),
+  __decorateParam$1(1, Inject(ThreadCommentModel)),
+  __decorateParam$1(2, IThreadCommentDataSourceService)
+], ThreadCommentResourceController);
+const AddCommentMutation = {
   id: "thread-comment.mutation.add-comment",
-  type: p.MUTATION,
-  handler(a, t, e) {
-    if (!t)
+  type: CommandType.MUTATION,
+  handler(accessor, params, options) {
+    if (!params)
       return !1;
-    const n = a.get(u), { unitId: r, subUnitId: m, comment: o, sync: s } = t, c = s || (e == null ? void 0 : e.fromChangeset) && !o.parentId;
-    return n.addComment(r, m, o, c);
+    const threadCommentModel = accessor.get(ThreadCommentModel), { unitId, subUnitId, comment, sync } = params, shouldSync = sync || (options == null ? void 0 : options.fromChangeset) && !comment.parentId;
+    return threadCommentModel.addComment(unitId, subUnitId, comment, shouldSync);
   }
-}, D = {
+}, UpdateCommentMutation = {
   id: "thread-comment.mutation.update-comment",
-  type: p.MUTATION,
-  handler(a, t) {
-    if (!t)
+  type: CommandType.MUTATION,
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(u), { unitId: n, subUnitId: r, payload: m, silent: o } = t;
-    return e.updateComment(n, r, m, o);
+    const threadCommentModel = accessor.get(ThreadCommentModel), { unitId, subUnitId, payload, silent } = params;
+    return threadCommentModel.updateComment(unitId, subUnitId, payload, silent);
   }
-}, ee = {
+}, UpdateCommentRefMutation = {
   id: "thread-comment.mutation.update-comment-ref",
-  type: p.MUTATION,
-  handler(a, t) {
-    if (!t)
+  type: CommandType.MUTATION,
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(u), { unitId: n, subUnitId: r, payload: m, silent: o } = t;
-    return e.updateCommentRef(n, r, m, o);
+    const threadCommentModel = accessor.get(ThreadCommentModel), { unitId, subUnitId, payload, silent } = params;
+    return threadCommentModel.updateCommentRef(unitId, subUnitId, payload, silent);
   }
-}, w = {
+}, ResolveCommentMutation = {
   id: "thread-comment.mutation.resolve-comment",
-  type: p.MUTATION,
-  handler(a, t) {
-    if (!t)
+  type: CommandType.MUTATION,
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(u), { unitId: n, subUnitId: r, resolved: m, commentId: o } = t;
-    return e.resolveComment(n, r, o, m);
+    const threadCommentModel = accessor.get(ThreadCommentModel), { unitId, subUnitId, resolved, commentId } = params;
+    return threadCommentModel.resolveComment(unitId, subUnitId, commentId, resolved);
   }
-}, N = {
+}, DeleteCommentMutation = {
   id: "thread-comment.mutation.delete-comment",
-  type: p.MUTATION,
-  handler(a, t) {
-    if (!t)
+  type: CommandType.MUTATION,
+  handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(u), { unitId: n, subUnitId: r, commentId: m } = t;
-    return e.deleteComment(n, r, m);
+    const threadCommentModel = accessor.get(ThreadCommentModel), { unitId, subUnitId, commentId } = params;
+    return threadCommentModel.deleteComment(unitId, subUnitId, commentId);
   }
-}, te = {
+}, AddCommentCommand = {
   id: "thread-comment.command.add-comment",
-  type: p.COMMAND,
-  async handler(a, t) {
-    if (!t)
+  type: CommandType.COMMAND,
+  async handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(_), n = a.get(f), { comment: r } = t, m = await n.addComment(r), o = n.syncUpdateMutationToColla, s = !r.parentId, c = {
-      id: R.id,
+    const commandService = accessor.get(ICommandService), dataSourceService = accessor.get(IThreadCommentDataSourceService), { comment: originComment } = params, comment = await dataSourceService.addComment(originComment), syncUpdateMutationToColla = dataSourceService.syncUpdateMutationToColla, isRoot = !originComment.parentId, redo = {
+      id: AddCommentMutation.id,
       params: {
-        ...t,
-        comment: m
+        ...params,
+        comment
       }
     };
-    return s ? await e.executeCommand(c.id, c.params) : e.executeCommand(c.id, c.params, {
-      onlyLocal: !o
+    return isRoot ? await commandService.executeCommand(redo.id, redo.params) : commandService.executeCommand(redo.id, redo.params, {
+      onlyLocal: !syncUpdateMutationToColla
     });
   }
-}, ne = {
+}, UpdateCommentCommand = {
   id: "thread-comment.command.update-comment",
-  type: p.COMMAND,
-  async handler(a, t) {
-    if (!t)
+  type: CommandType.COMMAND,
+  async handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: n, payload: r } = t, m = a.get(_), o = a.get(u), s = a.get(f), c = s.syncUpdateMutationToColla, d = o.getComment(
-      e,
-      n,
-      r.commentId
+    const { unitId, subUnitId, payload } = params, commandService = accessor.get(ICommandService), threadCommentModel = accessor.get(ThreadCommentModel), dataSourceService = accessor.get(IThreadCommentDataSourceService), syncUpdateMutationToColla = dataSourceService.syncUpdateMutationToColla, current = threadCommentModel.getComment(
+      unitId,
+      subUnitId,
+      payload.commentId
     );
-    if (!d)
+    if (!current)
       return !1;
-    const { children: i, ...C } = d;
-    if (!await s.updateComment({
-      ...C,
-      ...r
+    const { children, ...currentComment } = current;
+    if (!await dataSourceService.updateComment({
+      ...currentComment,
+      ...payload
     }))
       return !1;
-    const M = {
-      id: D.id,
-      params: t
+    const redo = {
+      id: UpdateCommentMutation.id,
+      params
     };
-    return m.executeCommand(M.id, M.params, { onlyLocal: !c }), !0;
+    return commandService.executeCommand(redo.id, redo.params, { onlyLocal: !syncUpdateMutationToColla }), !0;
   }
-}, re = {
+}, ResolveCommentCommand = {
   id: "thread-comment.command.resolve-comment",
-  type: p.COMMAND,
-  async handler(a, t) {
-    if (!t)
+  type: CommandType.COMMAND,
+  async handler(accessor, params) {
+    if (!params)
       return !1;
-    const { unitId: e, subUnitId: n, resolved: r, commentId: m } = t, o = a.get(f), c = a.get(u).getComment(e, n, m), d = o.syncUpdateMutationToColla;
-    return !c || !await o.resolveComment({
-      ...c,
-      resolved: r
-    }) ? !1 : a.get(_).executeCommand(
-      w.id,
-      t,
-      { onlyLocal: !d }
+    const { unitId, subUnitId, resolved, commentId } = params, dataSourceService = accessor.get(IThreadCommentDataSourceService), currentComment = accessor.get(ThreadCommentModel).getComment(unitId, subUnitId, commentId), syncUpdateMutationToColla = dataSourceService.syncUpdateMutationToColla;
+    return !currentComment || !await dataSourceService.resolveComment({
+      ...currentComment,
+      resolved
+    }) ? !1 : accessor.get(ICommandService).executeCommand(
+      ResolveCommentMutation.id,
+      params,
+      { onlyLocal: !syncUpdateMutationToColla }
     );
   }
-}, oe = {
+}, DeleteCommentCommand = {
   id: "thread-comment.command.delete-comment",
-  type: p.COMMAND,
-  async handler(a, t) {
-    if (!t)
+  type: CommandType.COMMAND,
+  async handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(u), n = a.get(f), r = a.get(_), { unitId: m, subUnitId: o, commentId: s } = t, c = n.syncUpdateMutationToColla, d = e.getComment(m, o, s);
-    if (!d || !await n.deleteComment(m, o, d.threadId, s))
+    const threadCommentModel = accessor.get(ThreadCommentModel), dataSourceService = accessor.get(IThreadCommentDataSourceService), commandService = accessor.get(ICommandService), { unitId, subUnitId, commentId } = params, syncUpdateMutationToColla = dataSourceService.syncUpdateMutationToColla, comment = threadCommentModel.getComment(unitId, subUnitId, commentId);
+    if (!comment || !await dataSourceService.deleteComment(unitId, subUnitId, comment.threadId, commentId))
       return !1;
-    const i = {
-      id: N.id,
-      params: t
+    const redo = {
+      id: DeleteCommentMutation.id,
+      params
     };
-    return r.executeCommand(i.id, i.params, { onlyLocal: !c });
+    return commandService.executeCommand(redo.id, redo.params, { onlyLocal: !syncUpdateMutationToColla });
   }
-}, ae = {
+}, DeleteCommentTreeCommand = {
   id: "thread-comment.command.delete-comment-tree",
-  type: p.COMMAND,
-  async handler(a, t) {
-    if (!t)
+  type: CommandType.COMMAND,
+  async handler(accessor, params) {
+    if (!params)
       return !1;
-    const e = a.get(u), n = a.get(_), r = a.get(f), { unitId: m, subUnitId: o, commentId: s } = t, c = e.getCommentWithChildren(m, o, s);
-    return !c || !await r.deleteComment(m, o, c.root.threadId, s) ? !1 : await n.executeCommand(N.id, {
-      unitId: m,
-      subUnitId: o,
-      commentId: c.root.id
+    const threadCommentModel = accessor.get(ThreadCommentModel), commandService = accessor.get(ICommandService), dataSourceService = accessor.get(IThreadCommentDataSourceService), { unitId, subUnitId, commentId } = params, commentWithChildren = threadCommentModel.getCommentWithChildren(unitId, subUnitId, commentId);
+    return !commentWithChildren || !await dataSourceService.deleteComment(unitId, subUnitId, commentWithChildren.root.threadId, commentId) ? !1 : await commandService.executeCommand(DeleteCommentMutation.id, {
+      unitId,
+      subUnitId,
+      commentId: commentWithChildren.root.id
     });
   }
 };
-var me = Object.defineProperty, se = Object.getOwnPropertyDescriptor, ce = (a, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? se(t, e) : t, m = a.length - 1, o; m >= 0; m--)
-    (o = a[m]) && (r = (n ? o(t, e, r) : o(r)) || r);
-  return n && r && me(t, e, r), r;
-}, I = (a, t) => (e, n) => t(e, n, a), v;
-let $ = (v = class extends H {
-  constructor(t, e, n) {
+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"), _a3;
+let UniverThreadCommentPlugin = (_a3 = class extends Plugin {
+  constructor(config, _injector, _commandService) {
     super();
-    h(this, "_config");
-    this._injector = e, this._commandService = n, this._config = t;
-  }
-  onStarting(t) {
-    var e;
-    G([
-      [f, { useClass: q }],
-      [u],
-      [S]
-    ], (e = this._config) == null ? void 0 : e.overrides).forEach(
-      (n) => {
-        t.add(n);
+    __publicField(this, "_config");
+    this._injector = _injector, this._commandService = _commandService, this._config = config;
+  }
+  onStarting() {
+    var _a4;
+    mergeOverrideWithDependencies([
+      [IThreadCommentDataSourceService, { useClass: ThreadCommentDataSourceService }],
+      [ThreadCommentModel],
+      [ThreadCommentResourceController]
+    ], (_a4 = this._config) == null ? void 0 : _a4.overrides).forEach(
+      (d) => {
+        this._injector.add(d);
       }
     ), [
-      te,
-      ne,
-      oe,
-      re,
-      ae,
-      R,
-      D,
-      ee,
-      N,
-      w
-    ].forEach((n) => {
-      this._commandService.registerCommand(n);
+      AddCommentCommand,
+      UpdateCommentCommand,
+      DeleteCommentCommand,
+      ResolveCommentCommand,
+      DeleteCommentTreeCommand,
+      AddCommentMutation,
+      UpdateCommentMutation,
+      UpdateCommentRefMutation,
+      DeleteCommentMutation,
+      ResolveCommentMutation
+    ].forEach((command) => {
+      this._commandService.registerCommand(command);
     });
   }
-}, h(v, "pluginName", E), h(v, "type", B.UNIVER_UNKNOWN), v);
-$ = ce([
-  I(1, U(Z)),
-  I(2, _)
-], $);
+}, __name(_a3, "UniverThreadCommentPlugin"), __publicField(_a3, "pluginName", TC_PLUGIN_NAME), __publicField(_a3, "type", UniverInstanceType.UNIVER_UNKNOWN), _a3);
+UniverThreadCommentPlugin = __decorateClass([
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, ICommandService)
+], UniverThreadCommentPlugin);
 export {
-  te as AddCommentCommand,
-  R as AddCommentMutation,
-  oe as DeleteCommentCommand,
-  N as DeleteCommentMutation,
-  ae as DeleteCommentTreeCommand,
-  f as IThreadCommentDataSourceService,
-  re as ResolveCommentCommand,
-  w as ResolveCommentMutation,
-  E as TC_PLUGIN_NAME,
-  q as ThreadCommentDataSourceService,
-  u as ThreadCommentModel,
-  S as ThreadCommentResourceController,
-  $ as UniverThreadCommentPlugin,
-  ne as UpdateCommentCommand,
-  D as UpdateCommentMutation,
-  ee as UpdateCommentRefMutation
+  AddCommentCommand,
+  AddCommentMutation,
+  DeleteCommentCommand,
+  DeleteCommentMutation,
+  DeleteCommentTreeCommand,
+  IThreadCommentDataSourceService,
+  ResolveCommentCommand,
+  ResolveCommentMutation,
+  TC_PLUGIN_NAME,
+  ThreadCommentDataSourceService,
+  ThreadCommentModel,
+  ThreadCommentResourceController,
+  UniverThreadCommentPlugin,
+  UpdateCommentCommand,
+  UpdateCommentMutation,
+  UpdateCommentRefMutation
 };

package/lib/types/plugin.d.ts

@@ -1,5 +1,4 @@
-import { DependencyOverride, ICommandService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { DependencyOverride, ICommandService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export interface IUniverThreadCommentConfig {
     overrides?: DependencyOverride;
@@ -11,5 +10,5 @@ export declare class UniverThreadCommentPlugin extends Plugin {
     static type: UniverInstanceType;
     private _config;
     constructor(config: IUniverThreadCommentConfig, _injector: Injector, _commandService: ICommandService);
-    onStarting(injector: Injector): void;
+    onStarting(): void;
 }

package/lib/types/services/tc-datasource.service.d.ts

@@ -1,4 +1,4 @@
-import { Nullable, Disposable } from '@univerjs/core';
+import { Disposable, Nullable } from '@univerjs/core';
 import { IBaseComment, IThreadComment } from '../types/interfaces/i-thread-comment';
 
 export type ThreadCommentJSON = {
@@ -70,5 +70,5 @@ export declare class ThreadCommentDataSourceService extends Disposable implement
     listThreadComments(unitId: string, subUnitId: string, threadIds: string[]): Promise<IBaseComment[]>;
     saveToSnapshot(unitComments: Record<string, IThreadComment[]>, unitId: string): Record<string, ThreadCommentJSON[]>;
 }
-export declare const IThreadCommentDataSourceService: import('@wendellhu/redi').IdentifierDecorator<IThreadCommentDataSourceService>;
+export declare const IThreadCommentDataSourceService: import('@univerjs/core').IdentifierDecorator<IThreadCommentDataSourceService>;
 export {};

package/lib/umd/index.js

@@ -1 +1 @@
-(function(s,l){typeof exports=="object"&&typeof module<"u"?l(exports,require("rxjs"),require("@univerjs/core"),require("@wendellhu/redi")):typeof define=="function"&&define.amd?define(["exports","rxjs","@univerjs/core","@wendellhu/redi"],l):(s=typeof globalThis<"u"?globalThis:s||self,l(s.UniverThreadComment={},s.rxjs,s.UniverCore,s["@wendellhu/redi"]))})(this,function(s,l,i,v){"use strict";var z=Object.defineProperty;var F=(s,l,i)=>l in s?z(s,l,{enumerable:!0,configurable:!0,writable:!0,value:i}):s[l]=i;var M=(s,l,i)=>F(s,typeof l!="symbol"?l+"":l,i);var S;class E extends i.Disposable{constructor(){super();M(this,"_dataSource",null);M(this,"syncUpdateMutationToColla",!0)}set dataSource(n){this._dataSource=n}get dataSource(){return this._dataSource}async getThreadComment(n,t,e){return this._dataSource?(await this._dataSource.listComments(n,t,[e]))[0]:null}async addComment(n){return this._dataSource?this._dataSource.addComment(n):n}async updateComment(n){return this._dataSource?this._dataSource.updateComment(n):!0}async resolveComment(n){return this._dataSource?this._dataSource.resolveComment(n):!0}async deleteComment(n,t,e,o){return this._dataSource?this._dataSource.deleteComment(n,t,e,o):!0}async listThreadComments(n,t,e){return this.dataSource?this.dataSource.listComments(n,t,e):[]}saveToSnapshot(n,t){if(this._dataSource){const e={};return Object.keys(n).forEach(o=>{const r=n[o];e[o]=r.map(this.dataSource.saveCommentToSnapshot)}),e}return n}}const f=v.createIdentifier("univer.thread-comment.data-source-service");var V=Object.defineProperty,W=Object.getOwnPropertyDescriptor,J=(a,m,n,t)=>{for(var e=t>1?void 0:t?W(m,n):m,o=a.length-1,r;o>=0;o--)(r=a[o])&&(e=(t?r(m,n,e):r(e))||e);return t&&e&&V(m,n,e),e},$=(a,m)=>(n,t)=>m(n,t,a);s.ThreadCommentModel=class extends i.Disposable{constructor(n,t){super();M(this,"_commentsMap",{});M(this,"_commentsTreeMap",new Map);M(this,"_threadMap",new Map);M(this,"_commentUpdate$",new l.Subject);M(this,"_commentsMap$",new l.BehaviorSubject({}));M(this,"commentUpdate$",this._commentUpdate$.asObservable());M(this,"commentMap$",this._commentsMap$.asObservable());this._dataSourceService=n,this._commandService=t,this.disposeWithMe(()=>{this._commentUpdate$.complete(),this._commentsMap$.complete()})}_ensureCommentMap(n,t){let e=this._commentsMap[n];e||(e={},this._commentsMap[n]=e);let o=e[t];return o||(o={},e[t]=o),o}_ensureCommentChildrenMap(n,t){let e=this._commentsTreeMap.get(n);e||(e=new Map,this._commentsTreeMap.set(n,e));let o=e.get(t);return o||(o=new Map,e.set(t,o)),o}_ensureThreadMap(n){let t=this._threadMap.get(n);return t||(t=new Map,this._threadMap.set(n,t)),t}_refreshCommentsMap$(){this._commentsMap$.next({...this._commentsMap})}ensureMap(n,t){const e=this._ensureCommentMap(n,t),o=this._ensureCommentChildrenMap(n,t);return{commentMap:e,commentChildrenMap:o}}_replaceComment(n,t,e){var c;const{commentMap:o,commentChildrenMap:r}=this.ensureMap(n,t),d=o[e.id];if(d){const h={...e,ref:d.ref};o[e.id]=h,(c=e.children)==null||c.forEach(u=>{o[u.id]={...u,ref:""}}),r.set(e.id,h),this._commentUpdate$.next({unitId:n,subUnitId:t,type:"syncUpdate",payload:h}),!!e.resolved!=!!d.resolved&&this._commentUpdate$.next({unitId:n,subUnitId:t,type:"resolve",payload:{commentId:e.id,resolved:!!e.resolved}})}}async syncThreadComments(n,t,e){const o=await this._dataSourceService.listThreadComments(n,t,e);if(!o.length)return;const r=new Set(e);o.forEach(d=>{this._replaceComment(n,t,d),r.delete(d.threadId)}),r.forEach(d=>{const c=this.getThread(n,d);c&&this.deleteComment(c.unitId,c.subUnitId,c.id)}),this._refreshCommentsMap$()}addComment(n,t,e,o){var C,_;const{commentMap:r,commentChildrenMap:d}=this.ensureMap(n,t),c=e,h=p=>{r[p.id]=p,this._commentUpdate$.next({unitId:n,subUnitId:t,type:"add",payload:p,isRoot:!p.parentId})},u=c.parentId;if(u){const p=r[u];p.children=[...(C=p.children)!=null?C:[],c],h(c)}else d.set(c.id,c),this._ensureThreadMap(n).set(c.threadId,c),h(c),(_=c.children)==null||_.forEach(y=>h({...y,ref:""}));return this._refreshCommentsMap$(),o&&this.syncThreadComments(n,t,[c.threadId]),!0}updateComment(n,t,e,o){const{commentMap:r}=this.ensureMap(n,t),d=r[e.commentId];return d?(d.updated=!0,d.text=e.text,d.attachments=e.attachments,d.updateT=e.updateT,this._commentUpdate$.next({unitId:n,subUnitId:t,type:"update",payload:e,silent:o}),this._refreshCommentsMap$(),!0):!1}updateCommentRef(n,t,e,o){const{commentMap:r}=this.ensureMap(n,t),d=r[e.commentId];return d?(d.ref=e.ref,this._commentUpdate$.next({unitId:n,subUnitId:t,type:"updateRef",payload:e,silent:o}),this._refreshCommentsMap$(),!0):!1}resolveComment(n,t,e,o){const{commentMap:r}=this.ensureMap(n,t),d=r[e];return d?(d.resolved=o,this._commentUpdate$.next({unitId:n,subUnitId:t,type:"resolve",payload:{commentId:e,resolved:o}}),this._refreshCommentsMap$(),!0):!1}getComment(n,t,e){const{commentMap:o}=this.ensureMap(n,t);return o[e]}getComment$(n,t,e){return this._commentsMap$.pipe(l.map(o=>o[n][t][e]))}getCommentWithChildren(n,t,e){var u,C;const{commentMap:o,commentChildrenMap:r}=this.ensureMap(n,t),d=o[e];if(!d)return;const c=new Set,h=r.get(e);if(h)return[h,...(u=h.children)!=null?u:[]].forEach(_=>{var p;c.add(_.personId),(p=_.text.customRanges)==null||p.forEach(y=>{y.rangeType===i.CustomRangeType.MENTION&&c.add(y.rangeId)})}),{root:d,children:(C=h.children)!=null?C:[],relativeUsers:c}}deleteComment(n,t,e){var c;const{commentMap:o,commentChildrenMap:r}=this.ensureMap(n,t),d=o[e];if(!d)return!0;if(d.parentId){const h=r.get(d.parentId);if(h&&h.children){const u=h.children.findIndex(C=>C.id=e);h.children.splice(u,1)}delete o[e]}else{delete o[e];const h=r.get(e);r.delete(e),this._ensureThreadMap(n).delete(d.threadId),(c=h==null?void 0:h.children)==null||c.forEach(C=>{delete o[C.id],this._commentUpdate$.next({unitId:n,subUnitId:t,type:"delete",payload:{commentId:C.id,isRoot:!1,comment:C}})})}return this._commentUpdate$.next({unitId:n,subUnitId:t,type:"delete",payload:{commentId:e,isRoot:!d.parentId,comment:d}}),this._refreshCommentsMap$(),!0}getUnit(n){const t=this._commentsMap[n];return t?Array.from(Object.entries(t)).map(([e,o])=>[e,Array.from(Object.values(o))]):[]}deleteUnit(n){const t=this._commentsMap[n];t&&Object.entries(t).forEach(([e,o])=>{Object.values(o).forEach(r=>{this.deleteComment(n,e,r.id)})})}getRootCommentIds(n,t){const e=this._ensureCommentChildrenMap(n,t);return Array.from(e.keys())}getAll(){return this._commentsMap}getThread(n,t){return this._ensureThreadMap(n).get(t)}},s.ThreadCommentModel=J([$(0,v.Inject(f)),$(1,i.ICommandService)],s.ThreadCommentModel);var g=(a=>(a[a.UNIVER_UNKNOWN=0]="UNIVER_UNKNOWN",a[a.UNIVER_DOC=1]="UNIVER_DOC",a[a.UNIVER_SHEET=2]="UNIVER_SHEET",a[a.UNIVER_SLIDE=3]="UNIVER_SLIDE",a[a.UNRECOGNIZED=-1]="UNRECOGNIZED",a))(g||{});const U="THREAD_COMMENT_PLUGIN";var G=Object.defineProperty,H=Object.getOwnPropertyDescriptor,B=(a,m,n,t)=>{for(var e=t>1?void 0:t?H(m,n):m,o=a.length-1,r;o>=0;o--)(r=a[o])&&(e=(t?r(m,n,e):r(e))||e);return t&&e&&G(m,n,e),e},I=(a,m)=>(n,t)=>m(n,t,a);s.ThreadCommentResourceController=class extends i.Disposable{constructor(m,n,t){super(),this._resourceManagerService=m,this._threadCommentModel=n,this._threadCommentDataSourceService=t,this._initSnapshot()}_initSnapshot(){const m=t=>{const e=this._threadCommentModel.getUnit(t),o={};return e?(e.forEach(([r,d])=>{o[r]=d}),JSON.stringify(this._threadCommentDataSourceService.saveToSnapshot(o,t))):""},n=t=>{if(!t)return{};try{return JSON.parse(t)}catch{return{}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:`SHEET_${U}`,businesses:[g.UNIVER_SHEET,g.UNIVER_DOC],toJson:t=>m(t),parseJson:t=>n(t),onUnLoad:t=>{this._threadCommentModel.deleteUnit(t)},onLoad:async(t,e)=>{Object.keys(e).forEach(o=>{const r=e[o];r.forEach(d=>{this._threadCommentModel.addComment(t,o,d)}),this._threadCommentModel.syncThreadComments(t,o,r.map(d=>d.threadId))})}}))}},s.ThreadCommentResourceController=B([i.OnLifecycle(i.LifecycleStages.Starting,s.ThreadCommentResourceController),I(0,i.IResourceManagerService),I(1,v.Inject(s.ThreadCommentModel)),I(2,f)],s.ThreadCommentResourceController);const N={id:"thread-comment.mutation.add-comment",type:i.CommandType.MUTATION,handler(a,m,n){if(!m)return!1;const t=a.get(s.ThreadCommentModel),{unitId:e,subUnitId:o,comment:r,sync:d}=m,c=d||(n==null?void 0:n.fromChangeset)&&!r.parentId;return t.addComment(e,o,r,c)}},O={id:"thread-comment.mutation.update-comment",type:i.CommandType.MUTATION,handler(a,m){if(!m)return!1;const n=a.get(s.ThreadCommentModel),{unitId:t,subUnitId:e,payload:o,silent:r}=m;return n.updateComment(t,e,o,r)}},D={id:"thread-comment.mutation.update-comment-ref",type:i.CommandType.MUTATION,handler(a,m){if(!m)return!1;const n=a.get(s.ThreadCommentModel),{unitId:t,subUnitId:e,payload:o,silent:r}=m;return n.updateCommentRef(t,e,o,r)}},R={id:"thread-comment.mutation.resolve-comment",type:i.CommandType.MUTATION,handler(a,m){if(!m)return!1;const n=a.get(s.ThreadCommentModel),{unitId:t,subUnitId:e,resolved:o,commentId:r}=m;return n.resolveComment(t,e,r,o)}},T={id:"thread-comment.mutation.delete-comment",type:i.CommandType.MUTATION,handler(a,m){if(!m)return!1;const n=a.get(s.ThreadCommentModel),{unitId:t,subUnitId:e,commentId:o}=m;return n.deleteComment(t,e,o)}},w={id:"thread-comment.command.add-comment",type:i.CommandType.COMMAND,async handler(a,m){if(!m)return!1;const n=a.get(i.ICommandService),t=a.get(f),{comment:e}=m,o=await t.addComment(e),r=t.syncUpdateMutationToColla,d=!e.parentId,c={id:N.id,params:{...m,comment:o}};return d?await n.executeCommand(c.id,c.params):n.executeCommand(c.id,c.params,{onlyLocal:!r})}},P={id:"thread-comment.command.update-comment",type:i.CommandType.COMMAND,async handler(a,m){if(!m)return!1;const{unitId:n,subUnitId:t,payload:e}=m,o=a.get(i.ICommandService),r=a.get(s.ThreadCommentModel),d=a.get(f),c=d.syncUpdateMutationToColla,h=r.getComment(n,t,e.commentId);if(!h)return!1;const{children:u,...C}=h;if(!await d.updateComment({...C,...e}))return!1;const p={id:O.id,params:m};return o.executeCommand(p.id,p.params,{onlyLocal:!c}),!0}},j={id:"thread-comment.command.resolve-comment",type:i.CommandType.COMMAND,async handler(a,m){if(!m)return!1;const{unitId:n,subUnitId:t,resolved:e,commentId:o}=m,r=a.get(f),c=a.get(s.ThreadCommentModel).getComment(n,t,o),h=r.syncUpdateMutationToColla;return!c||!await r.resolveComment({...c,resolved:e})?!1:a.get(i.ICommandService).executeCommand(R.id,m,{onlyLocal:!h})}},A={id:"thread-comment.command.delete-comment",type:i.CommandType.COMMAND,async handler(a,m){if(!m)return!1;const n=a.get(s.ThreadCommentModel),t=a.get(f),e=a.get(i.ICommandService),{unitId:o,subUnitId:r,commentId:d}=m,c=t.syncUpdateMutationToColla,h=n.getComment(o,r,d);if(!h||!await t.deleteComment(o,r,h.threadId,d))return!1;const u={id:T.id,params:m};return e.executeCommand(u.id,u.params,{onlyLocal:!c})}},b={id:"thread-comment.command.delete-comment-tree",type:i.CommandType.COMMAND,async handler(a,m){if(!m)return!1;const n=a.get(s.ThreadCommentModel),t=a.get(i.ICommandService),e=a.get(f),{unitId:o,subUnitId:r,commentId:d}=m,c=n.getCommentWithChildren(o,r,d);return!c||!await e.deleteComment(o,r,c.root.threadId,d)?!1:await t.executeCommand(T.id,{unitId:o,subUnitId:r,commentId:c.root.id})}};var q=Object.defineProperty,K=Object.getOwnPropertyDescriptor,Z=(a,m,n,t)=>{for(var e=t>1?void 0:t?K(m,n):m,o=a.length-1,r;o>=0;o--)(r=a[o])&&(e=(t?r(m,n,e):r(e))||e);return t&&e&&q(m,n,e),e},L=(a,m)=>(n,t)=>m(n,t,a);s.UniverThreadCommentPlugin=(S=class extends i.Plugin{constructor(n,t,e){super();M(this,"_config");this._injector=t,this._commandService=e,this._config=n}onStarting(n){var t;i.mergeOverrideWithDependencies([[f,{useClass:E}],[s.ThreadCommentModel],[s.ThreadCommentResourceController]],(t=this._config)==null?void 0:t.overrides).forEach(e=>{n.add(e)}),[w,P,A,j,b,N,O,D,T,R].forEach(e=>{this._commandService.registerCommand(e)})}},M(S,"pluginName",U),M(S,"type",i.UniverInstanceType.UNIVER_UNKNOWN),S),s.UniverThreadCommentPlugin=Z([L(1,v.Inject(v.Injector)),L(2,i.ICommandService)],s.UniverThreadCommentPlugin),s.AddCommentCommand=w,s.AddCommentMutation=N,s.DeleteCommentCommand=A,s.DeleteCommentMutation=T,s.DeleteCommentTreeCommand=b,s.IThreadCommentDataSourceService=f,s.ResolveCommentCommand=j,s.ResolveCommentMutation=R,s.TC_PLUGIN_NAME=U,s.ThreadCommentDataSourceService=E,s.UpdateCommentCommand=P,s.UpdateCommentMutation=O,s.UpdateCommentRefMutation=D,Object.defineProperty(s,Symbol.toStringTag,{value:"Module"})});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?factory(exports,require("rxjs"),require("@univerjs/core")):typeof define=="function"&&define.amd?define(["exports","rxjs","@univerjs/core"],factory):(global=typeof globalThis<"u"?globalThis:global||self,factory(global.UniverThreadComment={},global.rxjs,global.UniverCore))})(this,function(exports2,rxjs,core){"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 _ThreadCommentDataSourceService=class _ThreadCommentDataSourceService extends core.Disposable{constructor(){super();__publicField(this,"_dataSource",null);__publicField(this,"syncUpdateMutationToColla",!0)}set dataSource(dataSource){this._dataSource=dataSource}get dataSource(){return this._dataSource}async getThreadComment(unitId,subUnitId,threadId){return this._dataSource?(await this._dataSource.listComments(unitId,subUnitId,[threadId]))[0]:null}async addComment(comment){return this._dataSource?this._dataSource.addComment(comment):comment}async updateComment(comment){return this._dataSource?this._dataSource.updateComment(comment):!0}async resolveComment(comment){return this._dataSource?this._dataSource.resolveComment(comment):!0}async deleteComment(unitId,subUnitId,threadId,commentId){return this._dataSource?this._dataSource.deleteComment(unitId,subUnitId,threadId,commentId):!0}async listThreadComments(unitId,subUnitId,threadIds){return this.dataSource?this.dataSource.listComments(unitId,subUnitId,threadIds):[]}saveToSnapshot(unitComments,unitId){if(this._dataSource){const map={};return Object.keys(unitComments).forEach(subUnitId=>{const comments=unitComments[subUnitId];map[subUnitId]=comments.map(this.dataSource.saveCommentToSnapshot)}),map}return unitComments}};__name(_ThreadCommentDataSourceService,"ThreadCommentDataSourceService");let ThreadCommentDataSourceService=_ThreadCommentDataSourceService;const IThreadCommentDataSourceService=core.createIdentifier("univer.thread-comment.data-source-service");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.ThreadCommentModel=(_a=class extends core.Disposable{constructor(_dataSourceService,_commandService){super();__publicField(this,"_commentsMap",{});__publicField(this,"_commentsTreeMap",new Map);__publicField(this,"_threadMap",new Map);__publicField(this,"_commentUpdate$",new rxjs.Subject);__publicField(this,"_commentsMap$",new rxjs.BehaviorSubject({}));__publicField(this,"commentUpdate$",this._commentUpdate$.asObservable());__publicField(this,"commentMap$",this._commentsMap$.asObservable());this._dataSourceService=_dataSourceService,this._commandService=_commandService,this.disposeWithMe(()=>{this._commentUpdate$.complete(),this._commentsMap$.complete()})}_ensureCommentMap(unitId,subUnitId){let unitMap=this._commentsMap[unitId];unitMap||(unitMap={},this._commentsMap[unitId]=unitMap);let subUnitMap=unitMap[subUnitId];return subUnitMap||(subUnitMap={},unitMap[subUnitId]=subUnitMap),subUnitMap}_ensureCommentChildrenMap(unitId,subUnitId){let unitMap=this._commentsTreeMap.get(unitId);unitMap||(unitMap=new Map,this._commentsTreeMap.set(unitId,unitMap));let subUnitMap=unitMap.get(subUnitId);return subUnitMap||(subUnitMap=new Map,unitMap.set(subUnitId,subUnitMap)),subUnitMap}_ensureThreadMap(unitId){let unitMap=this._threadMap.get(unitId);return unitMap||(unitMap=new Map,this._threadMap.set(unitId,unitMap)),unitMap}_refreshCommentsMap$(){this._commentsMap$.next({...this._commentsMap})}ensureMap(unitId,subUnitId){const commentMap=this._ensureCommentMap(unitId,subUnitId),commentChildrenMap=this._ensureCommentChildrenMap(unitId,subUnitId);return{commentMap,commentChildrenMap}}_replaceComment(unitId,subUnitId,comment){var _a2;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),currentComment=commentMap[comment.id];if(currentComment){const newComment={...comment,ref:currentComment.ref};commentMap[comment.id]=newComment,(_a2=comment.children)==null||_a2.forEach(child=>{commentMap[child.id]={...child,ref:""}}),commentChildrenMap.set(comment.id,newComment),this._commentUpdate$.next({unitId,subUnitId,type:"syncUpdate",payload:newComment}),!!comment.resolved!=!!currentComment.resolved&&this._commentUpdate$.next({unitId,subUnitId,type:"resolve",payload:{commentId:comment.id,resolved:!!comment.resolved}})}}async syncThreadComments(unitId,subUnitId,threadIds){const comments=await this._dataSourceService.listThreadComments(unitId,subUnitId,threadIds);if(!comments.length)return;const deleteThreads=new Set(threadIds);comments.forEach(comment=>{this._replaceComment(unitId,subUnitId,comment),deleteThreads.delete(comment.threadId)}),deleteThreads.forEach(id=>{const thread=this.getThread(unitId,id);thread&&this.deleteComment(thread.unitId,thread.subUnitId,thread.id)}),this._refreshCommentsMap$()}addComment(unitId,subUnitId,origin,shouldSync){var _a2,_b2;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),comment=origin,addCommentItem=__name(item=>{commentMap[item.id]=item,this._commentUpdate$.next({unitId,subUnitId,type:"add",payload:item,isRoot:!item.parentId})},"addCommentItem"),parentId=comment.parentId;if(parentId){const parent=commentMap[parentId];parent.children=[...(_a2=parent.children)!=null?_a2:[],comment],addCommentItem(comment)}else commentChildrenMap.set(comment.id,comment),this._ensureThreadMap(unitId).set(comment.threadId,comment),addCommentItem(comment),(_b2=comment.children)==null||_b2.forEach(child=>addCommentItem({...child,ref:""}));return this._refreshCommentsMap$(),shouldSync&&this.syncThreadComments(unitId,subUnitId,[comment.threadId]),!0}updateComment(unitId,subUnitId,payload,silent){const{commentMap}=this.ensureMap(unitId,subUnitId),oldComment=commentMap[payload.commentId];return oldComment?(oldComment.updated=!0,oldComment.text=payload.text,oldComment.attachments=payload.attachments,oldComment.updateT=payload.updateT,this._commentUpdate$.next({unitId,subUnitId,type:"update",payload,silent}),this._refreshCommentsMap$(),!0):!1}updateCommentRef(unitId,subUnitId,payload,silent){const{commentMap}=this.ensureMap(unitId,subUnitId),oldComment=commentMap[payload.commentId];return oldComment?(oldComment.ref=payload.ref,this._commentUpdate$.next({unitId,subUnitId,type:"updateRef",payload,silent}),this._refreshCommentsMap$(),!0):!1}resolveComment(unitId,subUnitId,commentId,resolved){const{commentMap}=this.ensureMap(unitId,subUnitId),oldComment=commentMap[commentId];return oldComment?(oldComment.resolved=resolved,this._commentUpdate$.next({unitId,subUnitId,type:"resolve",payload:{commentId,resolved}}),this._refreshCommentsMap$(),!0):!1}getComment(unitId,subUnitId,commentId){const{commentMap}=this.ensureMap(unitId,subUnitId);return commentMap[commentId]}getComment$(unitId,subUnitId,commentId){return this._commentsMap$.pipe(rxjs.map(records=>records[unitId][subUnitId][commentId]))}getCommentWithChildren(unitId,subUnitId,commentId){var _a2,_b2;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),current=commentMap[commentId];if(!current)return;const relativeUsers=new Set,root=commentChildrenMap.get(commentId);if(root)return[root,...(_a2=root.children)!=null?_a2:[]].forEach(comment=>{var _a3;relativeUsers.add(comment.personId),(_a3=comment.text.customRanges)==null||_a3.forEach(range=>{range.rangeType===core.CustomRangeType.MENTION&&relativeUsers.add(range.rangeId)})}),{root:current,children:(_b2=root.children)!=null?_b2:[],relativeUsers}}deleteComment(unitId,subUnitId,commentId){var _a2;const{commentMap,commentChildrenMap}=this.ensureMap(unitId,subUnitId),current=commentMap[commentId];if(!current)return!0;if(current.parentId){const root=commentChildrenMap.get(current.parentId);if(root&&root.children){const index=root.children.findIndex(comment=>comment.id=commentId);root.children.splice(index,1)}delete commentMap[commentId]}else{delete commentMap[commentId];const comment=commentChildrenMap.get(commentId);commentChildrenMap.delete(commentId),this._ensureThreadMap(unitId).delete(current.threadId),(_a2=comment==null?void 0:comment.children)==null||_a2.forEach(child=>{delete commentMap[child.id],this._commentUpdate$.next({unitId,subUnitId,type:"delete",payload:{commentId:child.id,isRoot:!1,comment:child}})})}return this._commentUpdate$.next({unitId,subUnitId,type:"delete",payload:{commentId,isRoot:!current.parentId,comment:current}}),this._refreshCommentsMap$(),!0}getUnit(unitId){const unitMap=this._commentsMap[unitId];return unitMap?Array.from(Object.entries(unitMap)).map(([subUnitId,subUnitMap])=>[subUnitId,Array.from(Object.values(subUnitMap))]):[]}deleteUnit(unitId){const unitMap=this._commentsMap[unitId];unitMap&&Object.entries(unitMap).forEach(([subUnitId,subUnitMap])=>{Object.values(subUnitMap).forEach(comment=>{this.deleteComment(unitId,subUnitId,comment.id)})})}getRootCommentIds(unitId,subUnitId){const commentChildrenMap=this._ensureCommentChildrenMap(unitId,subUnitId);return Array.from(commentChildrenMap.keys())}getAll(){return this._commentsMap}getThread(unitId,threadId){return this._ensureThreadMap(unitId).get(threadId)}},__name(_a,"ThreadCommentModel"),_a),exports2.ThreadCommentModel=__decorateClass$2([__decorateParam$2(0,core.Inject(IThreadCommentDataSourceService)),__decorateParam$2(1,core.ICommandService)],exports2.ThreadCommentModel);var I=(E=>(E[E.UNIVER_UNKNOWN=0]="UNIVER_UNKNOWN",E[E.UNIVER_DOC=1]="UNIVER_DOC",E[E.UNIVER_SHEET=2]="UNIVER_SHEET",E[E.UNIVER_SLIDE=3]="UNIVER_SLIDE",E[E.UNRECOGNIZED=-1]="UNRECOGNIZED",E))(I||{});const TC_PLUGIN_NAME="THREAD_COMMENT_PLUGIN";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");exports2.ThreadCommentResourceController=(_b=class extends core.Disposable{constructor(_resourceManagerService,_threadCommentModel,_threadCommentDataSourceService){super(),this._resourceManagerService=_resourceManagerService,this._threadCommentModel=_threadCommentModel,this._threadCommentDataSourceService=_threadCommentDataSourceService,this._initSnapshot()}_initSnapshot(){const toJson=__name(unitID=>{const map=this._threadCommentModel.getUnit(unitID),resultMap={};return map?(map.forEach(([key,v])=>{resultMap[key]=v}),JSON.stringify(this._threadCommentDataSourceService.saveToSnapshot(resultMap,unitID))):""},"toJson"),parseJson=__name(json=>{if(!json)return{};try{return JSON.parse(json)}catch{return{}}},"parseJson");this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:`SHEET_${TC_PLUGIN_NAME}`,businesses:[I.UNIVER_SHEET,I.UNIVER_DOC],toJson:__name(unitID=>toJson(unitID),"toJson"),parseJson:__name(json=>parseJson(json),"parseJson"),onUnLoad:__name(unitID=>{this._threadCommentModel.deleteUnit(unitID)},"onUnLoad"),onLoad:__name(async(unitID,value)=>{Object.keys(value).forEach(subunitId=>{const commentList=value[subunitId];commentList.forEach(comment=>{this._threadCommentModel.addComment(unitID,subunitId,comment)}),this._threadCommentModel.syncThreadComments(unitID,subunitId,commentList.map(i=>i.threadId))})},"onLoad")}))}},__name(_b,"ThreadCommentResourceController"),_b),exports2.ThreadCommentResourceController=__decorateClass$1([core.OnLifecycle(core.LifecycleStages.Starting,exports2.ThreadCommentResourceController),__decorateParam$1(0,core.IResourceManagerService),__decorateParam$1(1,core.Inject(exports2.ThreadCommentModel)),__decorateParam$1(2,IThreadCommentDataSourceService)],exports2.ThreadCommentResourceController);const AddCommentMutation={id:"thread-comment.mutation.add-comment",type:core.CommandType.MUTATION,handler(accessor,params,options){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),{unitId,subUnitId,comment,sync}=params,shouldSync=sync||(options==null?void 0:options.fromChangeset)&&!comment.parentId;return threadCommentModel.addComment(unitId,subUnitId,comment,shouldSync)}},UpdateCommentMutation={id:"thread-comment.mutation.update-comment",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),{unitId,subUnitId,payload,silent}=params;return threadCommentModel.updateComment(unitId,subUnitId,payload,silent)}},UpdateCommentRefMutation={id:"thread-comment.mutation.update-comment-ref",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),{unitId,subUnitId,payload,silent}=params;return threadCommentModel.updateCommentRef(unitId,subUnitId,payload,silent)}},ResolveCommentMutation={id:"thread-comment.mutation.resolve-comment",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),{unitId,subUnitId,resolved,commentId}=params;return threadCommentModel.resolveComment(unitId,subUnitId,commentId,resolved)}},DeleteCommentMutation={id:"thread-comment.mutation.delete-comment",type:core.CommandType.MUTATION,handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),{unitId,subUnitId,commentId}=params;return threadCommentModel.deleteComment(unitId,subUnitId,commentId)}},AddCommentCommand={id:"thread-comment.command.add-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const commandService=accessor.get(core.ICommandService),dataSourceService=accessor.get(IThreadCommentDataSourceService),{comment:originComment}=params,comment=await dataSourceService.addComment(originComment),syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla,isRoot=!originComment.parentId,redo={id:AddCommentMutation.id,params:{...params,comment}};return isRoot?await commandService.executeCommand(redo.id,redo.params):commandService.executeCommand(redo.id,redo.params,{onlyLocal:!syncUpdateMutationToColla})}},UpdateCommentCommand={id:"thread-comment.command.update-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const{unitId,subUnitId,payload}=params,commandService=accessor.get(core.ICommandService),threadCommentModel=accessor.get(exports2.ThreadCommentModel),dataSourceService=accessor.get(IThreadCommentDataSourceService),syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla,current=threadCommentModel.getComment(unitId,subUnitId,payload.commentId);if(!current)return!1;const{children,...currentComment}=current;if(!await dataSourceService.updateComment({...currentComment,...payload}))return!1;const redo={id:UpdateCommentMutation.id,params};return commandService.executeCommand(redo.id,redo.params,{onlyLocal:!syncUpdateMutationToColla}),!0}},ResolveCommentCommand={id:"thread-comment.command.resolve-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const{unitId,subUnitId,resolved,commentId}=params,dataSourceService=accessor.get(IThreadCommentDataSourceService),currentComment=accessor.get(exports2.ThreadCommentModel).getComment(unitId,subUnitId,commentId),syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla;return!currentComment||!await dataSourceService.resolveComment({...currentComment,resolved})?!1:accessor.get(core.ICommandService).executeCommand(ResolveCommentMutation.id,params,{onlyLocal:!syncUpdateMutationToColla})}},DeleteCommentCommand={id:"thread-comment.command.delete-comment",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),dataSourceService=accessor.get(IThreadCommentDataSourceService),commandService=accessor.get(core.ICommandService),{unitId,subUnitId,commentId}=params,syncUpdateMutationToColla=dataSourceService.syncUpdateMutationToColla,comment=threadCommentModel.getComment(unitId,subUnitId,commentId);if(!comment||!await dataSourceService.deleteComment(unitId,subUnitId,comment.threadId,commentId))return!1;const redo={id:DeleteCommentMutation.id,params};return commandService.executeCommand(redo.id,redo.params,{onlyLocal:!syncUpdateMutationToColla})}},DeleteCommentTreeCommand={id:"thread-comment.command.delete-comment-tree",type:core.CommandType.COMMAND,async handler(accessor,params){if(!params)return!1;const threadCommentModel=accessor.get(exports2.ThreadCommentModel),commandService=accessor.get(core.ICommandService),dataSourceService=accessor.get(IThreadCommentDataSourceService),{unitId,subUnitId,commentId}=params,commentWithChildren=threadCommentModel.getCommentWithChildren(unitId,subUnitId,commentId);return!commentWithChildren||!await dataSourceService.deleteComment(unitId,subUnitId,commentWithChildren.root.threadId,commentId)?!1:await commandService.executeCommand(DeleteCommentMutation.id,{unitId,subUnitId,commentId:commentWithChildren.root.id})}};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");exports2.UniverThreadCommentPlugin=(_c=class extends core.Plugin{constructor(config,_injector,_commandService){super();__publicField(this,"_config");this._injector=_injector,this._commandService=_commandService,this._config=config}onStarting(){var _a2;core.mergeOverrideWithDependencies([[IThreadCommentDataSourceService,{useClass:ThreadCommentDataSourceService}],[exports2.ThreadCommentModel],[exports2.ThreadCommentResourceController]],(_a2=this._config)==null?void 0:_a2.overrides).forEach(d=>{this._injector.add(d)}),[AddCommentCommand,UpdateCommentCommand,DeleteCommentCommand,ResolveCommentCommand,DeleteCommentTreeCommand,AddCommentMutation,UpdateCommentMutation,UpdateCommentRefMutation,DeleteCommentMutation,ResolveCommentMutation].forEach(command=>{this._commandService.registerCommand(command)})}},__name(_c,"UniverThreadCommentPlugin"),__publicField(_c,"pluginName",TC_PLUGIN_NAME),__publicField(_c,"type",core.UniverInstanceType.UNIVER_UNKNOWN),_c),exports2.UniverThreadCommentPlugin=__decorateClass([__decorateParam(1,core.Inject(core.Injector)),__decorateParam(2,core.ICommandService)],exports2.UniverThreadCommentPlugin),exports2.AddCommentCommand=AddCommentCommand,exports2.AddCommentMutation=AddCommentMutation,exports2.DeleteCommentCommand=DeleteCommentCommand,exports2.DeleteCommentMutation=DeleteCommentMutation,exports2.DeleteCommentTreeCommand=DeleteCommentTreeCommand,exports2.IThreadCommentDataSourceService=IThreadCommentDataSourceService,exports2.ResolveCommentCommand=ResolveCommentCommand,exports2.ResolveCommentMutation=ResolveCommentMutation,exports2.TC_PLUGIN_NAME=TC_PLUGIN_NAME,exports2.ThreadCommentDataSourceService=ThreadCommentDataSourceService,exports2.UpdateCommentCommand=UpdateCommentCommand,exports2.UpdateCommentMutation=UpdateCommentMutation,exports2.UpdateCommentRefMutation=UpdateCommentRefMutation,Object.defineProperty(exports2,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/thread-comment",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "private": false,
   "description": "Univer thread comment core plugin",
   "author": "DreamNum <developer@univer.ai>",
@@ -47,21 +47,19 @@
     "lib"
   ],
   "peerDependencies": {
-    "@wendellhu/redi": "0.16.0",
     "rxjs": ">=7.0.0",
-    "@univerjs/core": "0.2.4"
+    "@univerjs/core": "0.2.6"
   },
   "dependencies": {
     "@univerjs/protocol": "0.1.38-alpha.23"
   },
   "devDependencies": {
-    "@wendellhu/redi": "0.16.0",
     "rxjs": "^7.8.1",
-    "typescript": "^5.5.3",
-    "vite": "^5.3.4",
-    "vitest": "^2.0.3",
-    "@univerjs/shared": "0.2.4",
-    "@univerjs/core": "0.2.4"
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5",
+    "vitest": "^2.0.4",
+    "@univerjs/core": "0.2.6",
+    "@univerjs/shared": "0.2.6"
   },
   "univerSpace": {
     ".": {