workspace: use esnext set operations

This commit is contained in:
undefined committed 2026-04-05 23:12:48 +08:00
1 parent bf5533040e
commit 9c10219ecb
12 files changed
+28 -43

No files matched your search

+1 -1
View File
@@ -88,7 +88,7 @@ export class ContestDetailBaseHandler extends Handler {
]);
if (this.tdoc.assign?.length && !this.user.own(this.tdoc) && !this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST)) {
const groups = await user.listGroup(domainId, this.user._id);
if (!Set.intersection(this.tdoc.assign, groups.map((i) => i.name)).size) {
if (!new Set(this.tdoc.assign).intersection(new Set(groups.map((i) => i.name))).size) {
throw new NotAssignedError('contest', tid);
}
}
+1 -1
View File
@@ -261,7 +261,7 @@ class DomainRoleHandler extends ManageHandler {
@requireSudo
@param('roles', Types.ArrayOf(Types.Role))
async postDelete(domainId: string, roles: string[]) {
if (Set.intersection(roles, ['root', 'default', 'guest']).size > 0) {
if (new Set(roles).intersection(new Set(['root', 'default', 'guest'])).size > 0) {
throw new ValidationError('role', null, 'You cannot delete root, default or guest roles');
}
await Promise.all([
+1 -1
View File
@@ -84,7 +84,7 @@ class HomeworkDetailHandler extends Handler {
this.tdoc = await contest.get(domainId, tid);
if (this.tdoc.rule !== 'homework') throw new ContestNotFoundError(domainId, tid);
if (this.tdoc.assign?.length && !this.user.own(this.tdoc) && !this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_HOMEWORK)) {
if (!Set.intersection(this.tdoc.assign, this.user.group).size) {
if (!new Set(this.tdoc.assign).intersection(new Set(this.user.group)).size) {
throw new NotAssignedError('homework', this.tdoc.docId);
}
}
+1 -1
View File
@@ -418,7 +418,7 @@ export class ProblemDetailHandler extends ContestDetailBaseHandler {
contest.getRelated(this.args.domainId, this.pdoc.docId),
contest.getRelated(this.args.domainId, this.pdoc.docId, 'homework'),
])).map((tdocs) => tdocs.filter((tdoc) =>
this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST) || !tdoc.assign?.length || Set.intersection(tdoc.assign, this.user.group).size,
this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST) || !tdoc.assign?.length || new Set(tdoc.assign).intersection(new Set(this.user.group)).size,
));
}
}
+1 -1
View File
@@ -138,7 +138,7 @@ class TrainingDetailHandler extends Handler {
for (const node of tdoc.dag) {
ndict[node._id] = node;
const totalCount = node.pids.length;
const doneCount = Set.intersection(node.pids, donePids).size;
const doneCount = new Set(node.pids).intersection(new Set(donePids)).size;
const nsdoc = {
progress: totalCount ? Math.floor(100 * (doneCount / totalCount)) : 100,
isDone: training.isDone(node, doneNids, donePids),
+2 -2
View File
@@ -313,7 +313,7 @@ export async function getListVnodes(domainId: string, ddocs: any, getHidden = fa
const vnode = await getVnode(domainId, ddoc.parentType, ddoc.parentId.toString());
res[ddoc.parentType] ||= {};
if (!getHidden && vnode.hidden) return;
if (vnode.assign?.length && Set.intersection(vnode.assign, assign).size) return;
if (vnode.assign?.length && new Set(vnode.assign).intersection(new Set(assign)).size) return;
res[ddoc.parentType][ddoc.parentId] = vnode;
}
await Promise.all(ddocs.map((ddoc) => task(ddoc)));
@@ -325,7 +325,7 @@ export function checkVNodeVisibility(type: number, vnode: any, user: User) {
if (vnode.hidden && !user.own(vnode) && !user.hasPerm(PERM.PERM_VIEW_PROBLEM_HIDDEN)) return false;
}
if ([document.TYPE_CONTEST, document.TYPE_TRAINING].includes(type as any)) {
if (!user.own(vnode) && vnode.assign?.length && !Set.intersection(vnode.assign, user.group).size) return false;
if (!user.own(vnode) && vnode.assign?.length && !new Set(vnode.assign).intersection(new Set(user.group)).size) return false;
}
return true;
}
+9 -15
View File
@@ -63,30 +63,24 @@ export function getPids(dag: TrainingNode[]) {
}
export function isDone(node: TrainingNode, doneNids: Set<number> | number[], donePids: Set<number> | number[]) {
return (Set.isSuperset(new Set(doneNids), new Set(node.requireNids))
&& Set.isSuperset(new Set(donePids), new Set(node.pids)));
return new Set(doneNids).isSupersetOf(new Set(node.requireNids))
&& new Set(donePids).isSupersetOf(new Set(node.pids));
}
export function isProgress(node: TrainingNode, doneNids: Set<number> | number[], donePids: Set<number> | number[], progPids: Set<number> | number[]) {
return (Set.isSuperset(new Set(doneNids), new Set(node.requireNids))
&& !Set.isSuperset(new Set(donePids), new Set(node.pids))
&& Set.intersection(
Set.union(new Set(donePids), new Set(progPids)),
new Set(node.pids),
).size);
return new Set(doneNids).isSupersetOf(new Set(node.requireNids))
&& !new Set(donePids).isSupersetOf(new Set(node.pids))
&& new Set(donePids).union(new Set(progPids)).intersection(new Set(node.pids)).size;
}
export function isOpen(node: TrainingNode, doneNids: Set<number> | number[], donePids: Set<number> | number[], progPids: Set<number> | number[]) {
return (Set.isSuperset(new Set(doneNids), new Set(node.requireNids))
&& !Set.isSuperset(new Set(donePids), new Set(node.pids))
&& !Set.intersection(
Set.union(new Set(donePids), new Set(progPids)),
new Set(node.pids),
).size);
return new Set(doneNids).isSupersetOf(new Set(node.requireNids))
&& !new Set(donePids).isSupersetOf(new Set(node.pids))
&& !new Set(donePids).union(new Set(progPids)).intersection(new Set(node.pids)).size;
}
export const isInvalid = (node: TrainingNode, doneNids: Set<number> | number[]) =>
!Set.isSuperset(new Set(doneNids), new Set(node.requireNids));
!new Set(doneNids).isSupersetOf(new Set(node.requireNids));
export async function count(domainId: string, query: Filter<TrainingDoc>) {
return await document.count(domainId, document.TYPE_TRAINING, query);