workspace: upgrade deps & sort imports

packages/hydrooj/src/model/blacklist.ts

@@ -1,7 +1,7 @@
 import moment from 'moment';
-import { ArgMethod } from '../utils';
-import db from '../service/db';
 import * as bus from '../service/bus';
+import db from '../service/db';
+import { ArgMethod } from '../utils';
 
 const coll = db.collection('blacklist');
 

packages/hydrooj/src/model/builtin.ts

@@ -7,10 +7,10 @@
  * e.g.: object?.property
  */
 import {
-    STATUS, STATUS_TEXTS, STATUS_CODES,
-    USER_GENDER_MALE, USER_GENDER_FEMALE, USER_GENDER_OTHER,
-    USER_GENDER_ICONS, USER_GENDERS, USER_GENDER_RANGE,
-} from '@hydrooj/utils/lib/status';
+    STATUS, STATUS_CODES,
+    STATUS_TEXTS, USER_GENDER_FEMALE,     USER_GENDER_ICONS,     USER_GENDER_MALE, USER_GENDER_OTHER,
+    USER_GENDER_RANGE,
+    USER_GENDERS } from '@hydrooj/utils/lib/status';
 
 export * from '@hydrooj/utils/lib/status';
 

packages/hydrooj/src/model/contest.ts

@@ -1,20 +1,20 @@
-import { ObjectID, FilterQuery } from 'mongodb';
-import user from './user';
-import problem from './problem';
-import * as document from './document';
-import { PERM, STATUS } from './builtin';
+import { FilterQuery, ObjectID } from 'mongodb';
 import {
-    ValidationError, ContestNotFoundError, ContestAlreadyAttendedError,
-    ContestNotAttendedError, ContestScoreboardHiddenError,
-} from '../error';
+    ContestAlreadyAttendedError,
+    ContestNotAttendedError, ContestNotFoundError, ContestScoreboardHiddenError,
+    ValidationError } from '../error';
 import {
-    ProblemId, ContestRule, ContestRules, ProblemDict,
-    ScoreboardNode, ScoreboardRow, Tdoc,
+    ContestRule, ContestRules, ProblemDict,
+    ProblemId,     ScoreboardNode, ScoreboardRow, Tdoc,
     Udict,
 } from '../interface';
-import * as bus from '../service/bus';
 import * as misc from '../lib/misc';
 import ranked from '../lib/rank';
+import * as bus from '../service/bus';
+import { PERM, STATUS } from './builtin';
+import * as document from './document';
+import problem from './problem';
+import user from './user';
 
 type Type = 30 | 60;
 

packages/hydrooj/src/model/discussion.ts

@@ -1,16 +1,16 @@
-import { FilterQuery, ObjectID } from 'mongodb';
 import { omit } from 'lodash';
 import moment from 'moment';
-import problem from './problem';
-import * as contest from './contest';
-import * as training from './training';
-import * as document from './document';
-import TaskModel from './task';
+import { FilterQuery, ObjectID } from 'mongodb';
 import { DiscussionNodeNotFoundError, DocumentNotFoundError } from '../error';
 import { DiscussionReplyDoc, DiscussionTailReplyDoc, Document } from '../interface';
-import { buildProjection } from '../utils';
-import { NumberKeys } from '../typeutils';
 import * as bus from '../service/bus';
+import { NumberKeys } from '../typeutils';
+import { buildProjection } from '../utils';
+import * as contest from './contest';
+import * as document from './document';
+import problem from './problem';
+import TaskModel from './task';
+import * as training from './training';
 
 export interface DiscussionDoc extends Document { }
 export namespace DiscussionDoc {

packages/hydrooj/src/model/document.ts

@@ -1,16 +1,16 @@
 /* eslint-disable object-curly-newline */
 import assert from 'assert';
 import {
-    ObjectID, Cursor, FilterQuery, UpdateQuery, OnlyFieldsOfType,
-} from 'mongodb';
+    Cursor, FilterQuery,     ObjectID, OnlyFieldsOfType,
+    UpdateQuery } from 'mongodb';
 import {
-    ProblemDoc, DiscussionDoc, DiscussionReplyDoc, Tdoc, TrainingDoc,
-    ProblemStatusDoc, Content,
+    Content,
+    DiscussionDoc, DiscussionReplyDoc,     ProblemDoc,     ProblemStatusDoc, Tdoc, TrainingDoc,
 } from '../interface';
-import { buildProjection } from '../utils';
-import { NumberKeys, ArrayKeys, Projection, MaybeArray } from '../typeutils';
-import db from '../service/db';
 import * as bus from '../service/bus';
+import db from '../service/db';
+import { ArrayKeys, MaybeArray, NumberKeys, Projection } from '../typeutils';
+import { buildProjection } from '../utils';
 
 type DocID = ObjectID | string | number;
 
@@ -234,7 +234,7 @@ export async function setSub<T extends keyof DocType, K extends ArrayKeys<DocTyp
     domainId: string, docType: T, docId: DocType[T]['docId'],
     key: K, subId: DocType[T][K][0]['_id'], args: Partial<DocType[T][K][0]>,
 ): Promise<DocType[T]> {
-    const $set = {};
+    const $set: Record<string, any> = {};
     for (const k in args) $set[`${key}.$.${k}`] = args[k];
     const res = await coll.findOneAndUpdate(
         {

packages/hydrooj/src/model/domain.ts

@@ -1,11 +1,11 @@
 import { Dictionary } from 'lodash';
 import { FilterQuery } from 'mongodb';
-import { BUILTIN_ROLES, PRIV } from './builtin';
 import { DomainDoc } from '../interface';
-import { ArgMethod } from '../utils';
-import { MaybeArray, NumberKeys } from '../typeutils';
 import * as bus from '../service/bus';
 import db from '../service/db';
+import { MaybeArray, NumberKeys } from '../typeutils';
+import { ArgMethod } from '../utils';
+import { BUILTIN_ROLES, PRIV } from './builtin';
 import UserModel, { deleteUserCache } from './user';
 
 const coll = db.collection('domain');

packages/hydrooj/src/model/message.ts

@@ -1,9 +1,9 @@
 import { FilterQuery, ObjectID } from 'mongodb';
-import user from './user';
 import { MessageDoc } from '../interface';
-import { ArgMethod } from '../utils';
-import db from '../service/db';
 import * as bus from '../service/bus';
+import db from '../service/db';
+import { ArgMethod } from '../utils';
+import user from './user';
 
 const coll = db.collection('message');
 

packages/hydrooj/src/model/problem.ts

@@ -1,23 +1,23 @@
-import { ObjectID, FilterQuery } from 'mongodb';
 import {
     Dictionary, escapeRegExp, flatten, groupBy, pick,
 } from 'lodash';
-import { streamToBuffer } from '@hydrooj/utils/lib/utils';
+import { FilterQuery, ObjectID } from 'mongodb';
 import type { Readable } from 'stream';
-import * as document from './document';
-import { STATUS } from './builtin';
-import domain from './domain';
-import storage from './storage';
-import { buildProjection } from '../utils';
+import { streamToBuffer } from '@hydrooj/utils/lib/utils';
+import { ProblemNotFoundError, ValidationError } from '../error';
 import type {
-    ProblemStatusDoc, ProblemDict, Document, ProblemId, DomainDoc,
-} from '../interface';
+    Document, DomainDoc,
+    ProblemDict, ProblemId,     ProblemStatusDoc } from '../interface';
+import { parseConfig } from '../lib/testdataConfig';
+import * as bus from '../service/bus';
 import {
     ArrayKeys, MaybeArray, NumberKeys, Projection,
 } from '../typeutils';
-import { ProblemNotFoundError, ValidationError } from '../error';
-import * as bus from '../service/bus';
-import { parseConfig } from '../lib/testdataConfig';
+import { buildProjection } from '../utils';
+import { STATUS } from './builtin';
+import * as document from './document';
+import domain from './domain';
+import storage from './storage';
 
 export interface ProblemDoc extends Document { }
 export type Field = keyof ProblemDoc;

packages/hydrooj/src/model/record.ts

@@ -1,22 +1,22 @@
 /* eslint-disable object-curly-newline */
-import {
-    ObjectID, Collection, UpdateQuery,
-    PushOperator, MatchKeysAndValues, OnlyFieldsOfType,
-    FilterQuery,
-} from 'mongodb';
 import { omit, sum } from 'lodash';
 import moment from 'moment';
-import { STATUS } from './builtin';
-import task from './task';
-import problem from './problem';
 import {
-    RecordDoc, ContestInfo, ProblemConfigFile, ExternalProblemId, FileInfo,
-} from '../interface';
+    Collection,     FilterQuery,
+    MatchKeysAndValues,     ObjectID, OnlyFieldsOfType,
+    PushOperator, UpdateQuery,
+} from 'mongodb';
 import { ProblemNotFoundError } from '../error';
-import { ArgMethod, buildProjection, Time } from '../utils';
-import { MaybeArray } from '../typeutils';
+import {
+    ContestInfo, ExternalProblemId, FileInfo,
+    ProblemConfigFile,     RecordDoc } from '../interface';
 import * as bus from '../service/bus';
 import db from '../service/db';
+import { MaybeArray } from '../typeutils';
+import { ArgMethod, buildProjection, Time } from '../utils';
+import { STATUS } from './builtin';
+import problem from './problem';
+import task from './task';
 
 class RecordModel {
     static coll: Collection<RecordDoc> = db.collection('record');

packages/hydrooj/src/model/setting.ts

@@ -1,14 +1,14 @@
 /* eslint-disable max-len */
 /* eslint-disable no-await-in-loop */
-import moment from 'moment-timezone';
-import { Dictionary } from 'lodash';
 import yaml from 'js-yaml';
-import { retry } from '@hydrooj/utils/lib/utils';
+import { Dictionary } from 'lodash';
+import moment from 'moment-timezone';
 import { parseLang } from '@hydrooj/utils/lib/lang';
-import * as builtin from './builtin';
+import { retry } from '@hydrooj/utils/lib/utils';
 import { Setting as _Setting } from '../interface';
 import { Logger } from '../logger';
 import * as bus from '../service/bus';
+import * as builtin from './builtin';
 
 type SettingDict = Dictionary<_Setting>;
 
@@ -208,7 +208,6 @@ SystemSetting(
     Setting('setting_storage', 'installid', String.random(64), 'text', 'installid', 'Installation ID', FLAG_HIDDEN | FLAG_DISABLED),
 );
 
-// eslint-disable-next-line import/no-mutable-exports
 export let langs = {};
 
 bus.once('app/started', async () => {

packages/hydrooj/src/model/solution.ts

@@ -1,7 +1,7 @@
 import { ObjectID } from 'mongodb';
-import * as document from './document';
 import { SolutionNotFoundError } from '../error';
 import * as bus from '../service/bus';
+import * as document from './document';
 
 class SolutionModel {
     static add(domainId: string, pid: number, owner: number, content: string) {

packages/hydrooj/src/model/storage.ts

@@ -1,14 +1,14 @@
-import { escapeRegExp } from 'lodash';
-import { ItemBucketMetadata } from 'minio';
-import { nanoid } from 'nanoid';
-import { lookup } from 'mime-types';
-import moment from 'moment';
 import { extname } from 'path';
+import { escapeRegExp } from 'lodash';
+import { lookup } from 'mime-types';
+import { ItemBucketMetadata } from 'minio';
+import moment from 'moment';
+import { nanoid } from 'nanoid';
 import type { Readable } from 'stream';
-import TaskModel from './task';
-import storage from '../service/storage';
 import * as bus from '../service/bus';
 import db from '../service/db';
+import storage from '../service/storage';
+import TaskModel from './task';
 
 export class StorageModel {
     static coll = db.collection('storage');

packages/hydrooj/src/model/system.ts

@@ -1,8 +1,8 @@
-import { SYSTEM_SETTINGS } from './setting';
-import { NumberKeys } from '../typeutils';
 import { SystemKeys } from '../interface';
-import db from '../service/db';
 import * as bus from '../service/bus';
+import db from '../service/db';
+import { NumberKeys } from '../typeutils';
+import { SYSTEM_SETTINGS } from './setting';
 
 const coll = db.collection('system');
 const cache: Record<string, any> = {};

packages/hydrooj/src/model/task.ts

@@ -1,11 +1,11 @@
-import moment from 'moment-timezone';
 import { hostname } from 'os';
+import moment from 'moment-timezone';
 import { FilterQuery, ObjectID } from 'mongodb';
 import { sleep } from '@hydrooj/utils/lib/utils';
 import { BaseService, Task } from '../interface';
 import { Logger } from '../logger';
-import db from '../service/db';
 import * as bus from '../service/bus';
+import db from '../service/db';
 
 const logger = new Logger('model/task');
 const coll = db.collection('task');

packages/hydrooj/src/model/token.ts

@@ -1,8 +1,8 @@
 import { FilterQuery } from 'mongodb';
-import { ArgMethod } from '../utils';
 import { TokenDoc } from '../interface';
-import db from '../service/db';
 import * as bus from '../service/bus';
+import db from '../service/db';
+import { ArgMethod } from '../utils';
 
 class TokenModel {
     static coll = db.collection('token');

packages/hydrooj/src/model/training.ts

@@ -1,8 +1,8 @@
-import { FilterQuery, ObjectID } from 'mongodb';
 import { flatten } from 'lodash';
-import * as document from './document';
-import { TrainingNotFoundError, TrainingAlreadyEnrollError } from '../error';
+import { FilterQuery, ObjectID } from 'mongodb';
+import { TrainingAlreadyEnrollError, TrainingNotFoundError } from '../error';
 import { TrainingDoc, TrainingNode } from '../interface';
+import * as document from './document';
 
 export function getStatus(domainId: string, tid: ObjectID, uid: number) {
     return document.getStatus(domainId, document.TYPE_TRAINING, tid, uid);

packages/hydrooj/src/model/user.ts

@@ -1,21 +1,21 @@
-import { Collection } from 'mongodb';
-import LRU from 'lru-cache';
 import { escapeRegExp, pick } from 'lodash';
+import LRU from 'lru-cache';
+import { Collection } from 'mongodb';
+import { LoginError, UserAlreadyExistError, UserNotFoundError } from '../error';
+import {
+    FileInfo,
+    Udict, Udoc,     User as _User } from '../interface';
+import pwhash from '../lib/hash.hydro';
+import { Logger } from '../logger';
+import * as bus from '../service/bus';
+import db from '../service/db';
+import { Value } from '../typeutils';
+import { ArgMethod } from '../utils';
+import { PERM, PRIV } from './builtin';
+import domain from './domain';
+import * as setting from './setting';
 import * as system from './system';
 import token from './token';
-import * as setting from './setting';
-import domain from './domain';
-import { PERM, PRIV } from './builtin';
-import { ArgMethod } from '../utils';
-import { UserNotFoundError, UserAlreadyExistError, LoginError } from '../error';
-import {
-    User as _User, Udoc, Udict, FileInfo,
-} from '../interface';
-import { Value } from '../typeutils';
-import { Logger } from '../logger';
-import pwhash from '../lib/hash.hydro';
-import db from '../service/db';
-import * as bus from '../service/bus';
 
 const coll: Collection<Udoc> = db.collection('user');
 const logger = new Logger('model/user');