diff --git a/src/server/database/repositories/client/service.ts b/src/server/database/repositories/client/service.ts index e00a3e72..98e033a8 100644 --- a/src/server/database/repositories/client/service.ts +++ b/src/server/database/repositories/client/service.ts @@ -6,7 +6,6 @@ import type { ClientCreateType, UpdateClientType, } from './types'; -import type { ID } from '#db/schema'; import { wgInterface, userConfig } from '#db/schema'; import { parseCidr } from 'cidr-tools'; diff --git a/src/server/database/repositories/oneTimeLink/service.ts b/src/server/database/repositories/oneTimeLink/service.ts index 2854d67a..812a5e61 100644 --- a/src/server/database/repositories/oneTimeLink/service.ts +++ b/src/server/database/repositories/oneTimeLink/service.ts @@ -1,7 +1,6 @@ import type { DBType } from '#db/sqlite'; import { eq, sql } from 'drizzle-orm'; import { oneTimeLink } from './schema'; -import type { ID } from '../../schema'; import CRC32 from 'crc-32'; function createPreparedStatement(db: DBType) { diff --git a/src/server/database/repositories/user/service.ts b/src/server/database/repositories/user/service.ts index dd92287c..99fb2a5f 100644 --- a/src/server/database/repositories/user/service.ts +++ b/src/server/database/repositories/user/service.ts @@ -1,7 +1,6 @@ import type { DBType } from '#db/sqlite'; import { eq, sql } from 'drizzle-orm'; import { user } from './schema'; -import type { ID } from '../../schema'; function createPreparedStatement(db: DBType) { return { diff --git a/src/server/database/schema.ts b/src/server/database/schema.ts index ba56016f..ae12a76c 100644 --- a/src/server/database/schema.ts +++ b/src/server/database/schema.ts @@ -6,6 +6,3 @@ export * from './repositories/interface/schema'; export * from './repositories/oneTimeLink/schema'; export * from './repositories/user/schema'; export * from './repositories/userConfig/schema'; - -// TODO: move to types -export type ID = number; diff --git a/src/server/utils/WireGuard.ts b/src/server/utils/WireGuard.ts index 488ad7aa..7be7ee90 100644 --- a/src/server/utils/WireGuard.ts +++ b/src/server/utils/WireGuard.ts @@ -1,7 +1,6 @@ import fs from 'node:fs/promises'; import debug from 'debug'; import QRCode from 'qrcode'; -import type { ID } from '#db/schema'; import type { InterfaceType } from '#db/repositories/interface/types'; const WG_DEBUG = debug('WireGuard'); diff --git a/src/server/utils/session.ts b/src/server/utils/session.ts index d15f9755..f1b1d128 100644 --- a/src/server/utils/session.ts +++ b/src/server/utils/session.ts @@ -1,5 +1,4 @@ import type { H3Event } from 'h3'; -import type { ID } from '#db/schema'; import type { UserType } from '#db/repositories/user/types'; export type WGSession = Partial<{ diff --git a/src/server/utils/types.ts b/src/server/utils/types.ts index ca9db348..28c257e1 100644 --- a/src/server/utils/types.ts +++ b/src/server/utils/types.ts @@ -2,6 +2,8 @@ import type { ZodSchema } from 'zod'; import z from 'zod'; import type { H3Event, EventHandlerRequest } from 'h3'; +export type ID = number; + /** * return the string as is *