move delarations to @hydrooj/common

packages/hydrooj/src/model/builtin.ts

@@ -2,9 +2,9 @@ import {
     getScoreColor, STATUS, STATUS_CODES, STATUS_SHORT_TEXTS,
     STATUS_TEXTS, USER_GENDER_FEMALE, USER_GENDER_ICONS, USER_GENDER_MALE,
     USER_GENDER_OTHER, USER_GENDER_RANGE, USER_GENDERS,
-} from '@hydrooj/utils/lib/status';
+} from '@hydrooj/common';
 
-export * from '@hydrooj/utils/lib/status';
+export * from '@hydrooj/common/status';
 
 export const PERM = {
     PERM_NONE: 0n,

packages/hydrooj/src/model/problem.ts

@@ -8,11 +8,12 @@ import yaml from 'js-yaml';
 import { pick } from 'lodash';
 import { Filter, ObjectId } from 'mongodb';
 import type { Readable } from 'stream';
+import { ProblemConfigFile } from '@hydrooj/common';
 import { Logger, size, streamToBuffer } from '@hydrooj/utils/lib/utils';
 import { Context } from '../context';
 import { FileUploadError, ProblemNotFoundError, ValidationError } from '../error';
 import type {
-    Document, ProblemConfigFile, ProblemDict, ProblemStatusDoc, User,
+    Document, ProblemDict, ProblemStatusDoc, User,
 } from '../interface';
 import { parseConfig } from '../lib/testdataConfig';
 import * as bus from '../service/bus';

packages/hydrooj/src/model/record.ts

@@ -5,11 +5,10 @@ import {
     Filter, FindOptions, MatchKeysAndValues,
     ObjectId, OnlyFieldsOfType, PushOperator, UpdateFilter,
 } from 'mongodb';
+import { ProblemConfigFile } from '@hydrooj/common';
 import { Context } from '../context';
 import { ProblemNotFoundError } from '../error';
-import {
-    JudgeMeta, ProblemConfigFile, RecordDoc,
-} from '../interface';
+import { JudgeMeta, RecordDoc } from '../interface';
 import db from '../service/db';
 import { MaybeArray, NumberKeys } from '../typeutils';
 import { ArgMethod, buildProjection, Time } from '../utils';

packages/hydrooj/src/model/setting.ts

@@ -4,8 +4,8 @@ import * as cordis from 'cordis';
 import yaml from 'js-yaml';
 import { Dictionary } from 'lodash';
 import moment from 'moment-timezone';
-import { LangConfig, parseLang } from '@hydrooj/utils/lib/lang';
-import { retry } from '@hydrooj/utils/lib/utils';
+import { LangConfig, parseLang } from '@hydrooj/common';
+import { retry } from '@hydrooj/utils';
 import { Context, Service } from '../context';
 import { Setting as _Setting } from '../interface';
 import { Logger } from '../logger';