Skip to content

Commit 69cbbe4

Browse files
authored
refactor(contracts / schemas): move schemas into their own package (@Miodec) (monkeytypegame#6754)
1 parent 92790f3 commit 69cbbe4

File tree

183 files changed

+411
-506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+411
-506
lines changed

backend/__tests__/__testData__/auth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Configuration } from "@monkeytype/contracts/schemas/configuration";
1+
import { Configuration } from "@monkeytype/schemas/configuration";
22
import { randomBytes } from "crypto";
33
import { hash } from "bcrypt";
44
import { ObjectId } from "mongodb";

backend/__tests__/api/controllers/configuration.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
CONFIGURATION_FORM_SCHEMA,
66
} from "../../../src/constants/base-configuration";
77
import * as Configuration from "../../../src/init/configuration";
8-
import type { Configuration as ConfigurationType } from "@monkeytype/contracts/schemas/configuration";
8+
import type { Configuration as ConfigurationType } from "@monkeytype/schemas/configuration";
99
import { ObjectId } from "mongodb";
1010
import * as Misc from "../../../src/utils/misc";
1111
import * as AdminUuids from "../../../src/dal/admin-uids";

backend/__tests__/api/controllers/leaderboard.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
mockAuthenticateWithApeKey,
1111
mockBearerAuthentication,
1212
} from "../../__testData__/auth";
13-
import { XpLeaderboardEntry } from "@monkeytype/contracts/schemas/leaderboards";
13+
import { XpLeaderboardEntry } from "@monkeytype/schemas/leaderboards";
1414

1515
const mockApp = request(app);
1616
const configuration = Configuration.getCachedConfiguration();

backend/__tests__/api/controllers/quotes.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as ReportDal from "../../../src/dal/report";
99
import * as Captcha from "../../../src/utils/captcha";
1010
import { ObjectId } from "mongodb";
1111
import _ from "lodash";
12-
import { ApproveQuote } from "@monkeytype/contracts/schemas/quotes";
12+
import { ApproveQuote } from "@monkeytype/schemas/quotes";
1313
import { mockBearerAuthentication } from "../../__testData__/auth";
1414

1515
const mockApp = request(app);

backend/__tests__/api/controllers/user.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ import { FirebaseError } from "firebase-admin";
1919
import * as ApeKeysDal from "../../../src/dal/ape-keys";
2020
import * as LogDal from "../../../src/dal/logs";
2121
import { ObjectId } from "mongodb";
22-
import { PersonalBest } from "@monkeytype/contracts/schemas/shared";
22+
import { PersonalBest } from "@monkeytype/schemas/shared";
2323
import { pb } from "../../dal/leaderboards.spec";
2424
import {
2525
mockAuthenticateWithApeKey,
2626
mockBearerAuthentication,
2727
} from "../../__testData__/auth";
2828
import { randomUUID } from "node:crypto";
2929
import _ from "lodash";
30-
import { MonkeyMail, UserStreak } from "@monkeytype/contracts/schemas/users";
30+
import { MonkeyMail, UserStreak } from "@monkeytype/schemas/users";
3131
import MonkeyError, { isFirebaseError } from "../../../src/utils/error";
32-
import { LeaderboardEntry } from "@monkeytype/contracts/schemas/leaderboards";
32+
import { LeaderboardEntry } from "@monkeytype/schemas/leaderboards";
3333
import * as WeeklyXpLeaderboard from "../../../src/services/weekly-xp-leaderboard";
3434

3535
const mockApp = request(app);

backend/__tests__/dal/leaderboards.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as LeaderboardsDal from "../../src/dal/leaderboards";
55
import * as PublicDal from "../../src/dal/public";
66
import * as Configuration from "../../src/init/configuration";
77
import type { DBLeaderboardEntry } from "../../src/dal/leaderboards";
8-
import type { PersonalBest } from "@monkeytype/contracts/schemas/shared";
8+
import type { PersonalBest } from "@monkeytype/schemas/shared";
99
const configuration = Configuration.getCachedConfiguration();
1010

1111
import * as DB from "../../src/init/db";

backend/__tests__/dal/user.spec.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ import _ from "lodash";
22
import * as UserDAL from "../../src/dal/user";
33
import * as UserTestData from "../__testData__/users";
44
import { ObjectId } from "mongodb";
5-
import { MonkeyMail, ResultFilters } from "@monkeytype/contracts/schemas/users";
6-
import {
7-
PersonalBest,
8-
PersonalBests,
9-
} from "@monkeytype/contracts/schemas/shared";
10-
import { CustomThemeColors } from "@monkeytype/contracts/schemas/configs";
5+
import { MonkeyMail, ResultFilters } from "@monkeytype/schemas/users";
6+
import { PersonalBest, PersonalBests } from "@monkeytype/schemas/shared";
7+
import { CustomThemeColors } from "@monkeytype/schemas/configs";
118

129
const mockPersonalBest = {
1310
acc: 1,

backend/__tests__/middlewares/auth.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import crypto from "crypto";
1212
import {
1313
EndpointMetadata,
1414
RequestAuthenticationOptions,
15-
} from "@monkeytype/contracts/schemas/api";
15+
} from "@monkeytype/schemas/api";
1616
import * as Prometheus from "../../src/utils/prometheus";
1717
import { TsRestRequestWithContext } from "../../src/api/types";
1818

backend/__tests__/middlewares/configuration.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RequireConfiguration } from "@monkeytype/contracts/require-configuration/index";
22
import { verifyRequiredConfiguration } from "../../src/middlewares/configuration";
3-
import { Configuration } from "@monkeytype/contracts/schemas/configuration";
3+
import { Configuration } from "@monkeytype/schemas/configuration";
44
import { Response } from "express";
55
import MonkeyError from "../../src/utils/error";
66
import { TsRestRequest } from "../../src/api/types";

backend/__tests__/middlewares/permission.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Response } from "express";
22
import { verifyPermissions } from "../../src/middlewares/permission";
3-
import { EndpointMetadata } from "@monkeytype/contracts/schemas/api";
3+
import { EndpointMetadata } from "@monkeytype/schemas/api";
44
import * as Misc from "../../src/utils/misc";
55
import * as AdminUids from "../../src/dal/admin-uids";
66
import * as UserDal from "../../src/dal/user";

0 commit comments

Comments
 (0)