workspace: upgrade deps

packages/hydrooj/src/interface.ts

@@ -594,28 +594,30 @@ export interface OauthMap {
     uid: number;
 }
 
-export interface Collections {
-    'blacklist': BlacklistDoc;
-    'domain': DomainDoc;
-    'domain.user': any;
-    'record': RecordDoc;
-    'document': any;
-    'document.status': StatusDocBase;
-    'user': Udoc;
-    'user.preference': UserPreferenceDoc;
-    'vuser': VUdoc;
-    'user.group': GDoc;
-    'check': System;
-    'message': MessageDoc;
-    'token': TokenDoc;
-    'status': any;
-    'oauth': OauthMap;
-    'system': System;
-    'task': Task;
-    'storage': FileNode;
-    'oplog': OplogDoc;
-    'event': EventDoc;
-    'opcount': OpCountDoc;
+declare module './service/db' {
+    interface Collections {
+        'blacklist': BlacklistDoc;
+        'domain': DomainDoc;
+        'domain.user': any;
+        'record': RecordDoc;
+        'document': any;
+        'document.status': StatusDocBase;
+        'user': Udoc;
+        'user.preference': UserPreferenceDoc;
+        'vuser': VUdoc;
+        'user.group': GDoc;
+        'check': System;
+        'message': MessageDoc;
+        'token': TokenDoc;
+        'status': any;
+        'oauth': OauthMap;
+        'system': System;
+        'task': Task;
+        'storage': FileNode;
+        'oplog': OplogDoc;
+        'event': EventDoc;
+        'opcount': OpCountDoc;
+    }
 }
 
 export interface Model {
@@ -646,7 +648,7 @@ export interface Model {
 export interface HydroService {
     /** @deprecated */
     bus: Context,
-    db: typeof import('./service/db'),
+    db: typeof import('./service/db').default,
     monitor: typeof import('./service/monitor'),
     server: typeof import('./service/server'),
     storage: typeof import('./service/storage').default,
@@ -726,7 +728,7 @@ declare global {
             addons: string[],
         }
     }
-    var bus: any; // eslint-disable-line
+    var bus: typeof import('./service/bus'); // eslint-disable-line
     var app: Context; // eslint-disable-line
     var Hydro: HydroGlobal; // eslint-disable-line
     var addons: string[]; // eslint-disable-line

packages/hydrooj/src/plugin-api.ts

@@ -5,7 +5,7 @@ import _ from 'lodash';
 import moment from 'moment-timezone';
 import Schema from 'schemastery';
 import superagent from 'superagent';
-import * as db from './service/db';
+import db from './service/db';
 export { ObjectID, ObjectId, FilterQuery } from 'mongodb';
 export * from './utils';
 export * from './interface';
@@ -37,6 +37,8 @@ export { default as TaskModel } from './model/task';
 export * from './model/builtin';
 export * as JudgeHandler from './handler/judge';
 export { postJudge } from './handler/judge';
+export { Collections } from './service/db';
+// export { Collections } from './interface';
 export { Service, Context } from './context';
 export { buildContent } from './lib/content';
 export * as validator from './lib/validator';

packages/hydrooj/src/service/db.ts

@@ -4,11 +4,10 @@ import {
 } from 'mongodb';
 import { Logger } from '../logger';
 import options from '../options';
-// Note: this might be re-declared so we have to use Collections here
-import type { Collections } from '../plugin-api';
 import * as bus from './bus';
 
 const logger = new Logger('mongo');
+export interface Collections { }
 
 interface MongoConfig {
     protocol?: string,
@@ -92,4 +91,5 @@ class MongoService {
 
 const service = new MongoService();
 global.Hydro.service.db = service;
-export = service;
+export default service;
+export const collection = service.collection.bind(service);