Fix circular deps (#306)

## Изменения
<!-- Опишите здесь на языке, понятном каждому, изменения, сделанные в
исходном коде по пунктам. -->

## Детали реализации
<!-- Здесь можно описать технические детали по пунктам. -->

## Check-List
<!-- После сохранения у следующих полей появятся галочки, которые нужно
проставить мышкой -->
- [ ] Вы проверили свой код перед отправкой запроса?
- [ ] Вы написали тесты к реализованным функциям?
- [ ] Вы не забыли применить форматирование `black` и `isort` для
_Back-End_ или `Prettier` для _Front-End_?

---------

Co-authored-by: Artem Netsvetaev <[email protected]>

Author: netsvetoch

package.json

@@ -12,11 +12,13 @@
 		"test": "vitest",
 		"lint": "eslint \"**/*.{vue,ts}\"",
 		"lint:fix": "eslint \"**/*.{vue,ts}\" --fix",
+		"lint:deadcode": "knip --exclude binaries,dependencies,unlisted",
+		"lint:circular": "dpdm --exit-code circular:1 --no-tree --no-warning --progress false --transform './src/main.ts'",
 		"prettier": "prettier . --check",
 		"prettier:write": "prettier . --write",
 		"stylelint": "stylelint \"**/*.{vue,css}\"",
 		"stylelint:fix": "stylelint \"**/*.{vue,css}\" --fix",
-		"format": "pnpm run lint:fix && pnpm run prettier:write && pnpm run stylelint:fix",
+		"format": "vue-tsc && pnpm run lint:fix && pnpm run prettier:write && pnpm run stylelint:fix",
 		"check": "vue-tsc && pnpm run lint && pnpm run prettier && pnpm run stylelint"
 	},
 	"dependencies": {
@@ -41,11 +43,13 @@
 		"@typescript-eslint/parser": "^8.15.0",
 		"@vitejs/plugin-vue": "^5.2.0",
 		"@vue/eslint-config-typescript": "^14.1.3",
+		"dpdm": "^3.14.0",
 		"eslint": "^9.15.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-prettier": "^5.2.1",
 		"eslint-plugin-vue": "^9.31.0",
 		"globals": "^15.12.0",
+		"knip": "^5.45.0",
 		"openapi-typescript": "^7.4.3",
 		"postcss": "^8.4.49",
 		"postcss-html": "^1.7.0",
@@ -55,6 +59,7 @@
 		"stylelint-config-recommended-vue": "^1.5.0",
 		"stylelint-config-standard": "^36.0.1",
 		"typescript": "5.6.3",
+		"typescript-eslint": "^8.26.0",
 		"vite": "^5.4.11",
 		"vite-plugin-eslint": "^1.8.1",
 		"vite-plugin-pwa": "^0.21.0",

pnpm-lock.yaml

@@ -8,7 +8,7 @@ import IrdomToastList from './components/IrdomToastList.vue';
 import { useToolbar } from './store/toolbar';
 import IrdomToolbar from './components/IrdomToolbar.vue';
 import CalendarDropdown from './views/timetable/CalendarDropdown.vue';
-import apiClient from '@/api/';
+import { apiClient } from '@/api/';
 
 const profileStore = useProfileStore();
 const toolbar = useToolbar();

src/App.vue

@@ -0,0 +1,34 @@
+import { createClient } from '@profcomff/api-uilib';
+import { type Middleware } from 'openapi-fetch';
+import { ApiError, ErrorInfo } from './types';
+
+export function recordError(url: string, status: number, error: ApiError | undefined) {
+	if (error) {
+		const errorInfo: ErrorInfo = {
+			url,
+			status,
+			message: error.message,
+		};
+		apiClient.POST('/marketing/v1/action', {
+			body: {
+				action: 'error',
+				additional_data: JSON.stringify(errorInfo),
+			},
+		});
+	}
+}
+
+const errorMiddleware: Middleware = {
+	async onResponse({ response }) {
+		const data = await response.clone();
+		if (!response.ok) {
+			const error = await data.json();
+			recordError(response.url, response.status, await error);
+			return undefined;
+		}
+		return response;
+	},
+};
+
+export const apiClient = createClient(import.meta.env.VITE_API_URL);
+apiClient.use(errorMiddleware);

src/api/client.ts

@@ -1,6 +1,6 @@
 import { stringifyDate, getDateWithDayOffset } from './../../utils/date';
 import { useTimetableStore } from './../../store/timetable';
-import apiClient from '@/api/';
+import { apiClient } from '../client';
 
 interface GetLecturersParams {
 	query?: string;

src/api/controllers/TimetableApi.ts

@@ -1,6 +1,6 @@
 import { apply, checkToken, showErrorToast } from './auth/decorators';
 import { UserdataUpdateUser } from '@/models';
-import apiClient from '@/api/';
+import { apiClient } from '../client';
 
 export class UserdataApi {
 	static getUser = apply(

src/api/controllers/UserdataApi.ts

@@ -7,7 +7,7 @@ import { LocalStorage, LocalStorageItem } from '@/models/LocalStorage';
 import { UNKNOWN_DEVICE } from '@/models';
 
 import router from '@/router';
-import apiClient from '@/api/';
+import { apiClient } from '../../client';
 
 export enum UserInfo {
 	Groups = 'groups',

src/api/controllers/auth/AuthApi.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import apiClient from '@/api/';
+import { ApiError } from '@/api';
+import { apiClient } from '../../client';
 import { ToastType } from '@/models';
 import router from '@/router';
 import { useProfileStore } from '@/store/profile';
 import { useToastStore } from '@/store/toast';
-import { apiError } from '@/utils/errorHandler';
 
 export type Func<R = any, FuncArgs extends any[] = any[]> = (...args: FuncArgs) => R;
 type Decorator<F extends Func = Func, DecoratorArgs extends any[] = any[]> = Func<
@@ -44,7 +44,7 @@ export function showErrorToast<F extends Func>(
 			const response = await method(...args);
 			return response;
 		} catch (err) {
-			const error = err as apiError;
+			const error = err as ApiError;
 			if (error) {
 				toastStore.push({
 					title: error.ru ?? error.message,

src/api/controllers/auth/decorators.ts

@@ -1,20 +1,3 @@
-export * from './controllers';
-import { recordError } from '@/utils/errorHandler';
-import { createClient } from '@profcomff/api-uilib';
-import { type Middleware } from 'openapi-fetch';
-
-const errorMiddleware: Middleware = {
-	async onResponse({ response }) {
-		const data = await response.clone();
-		if (!response.ok) {
-			const error = await data.json();
-			recordError(response.url, response.status, await error);
-			return undefined;
-		}
-		return response;
-	},
-};
-
-const apiClient = createClient(import.meta.env.VITE_API_URL);
-apiClient.use(errorMiddleware);
-export default apiClient;
+export { apiClient } from './client';
+export * from './types';
+export * from './controllers';

src/api/index.ts

@@ -0,0 +1,11 @@
+export type ApiError = {
+	status: string;
+	message: string;
+	ru: string;
+};
+
+export interface ErrorInfo {
+	url: string;
+	status: number;
+	message: string;
+}