Browse Source

consistent imports

pull/1697/head
Bernd Storath 5 months ago
parent
commit
8eabc6cc65
  1. 6
      src/eslint.config.mjs
  2. 1
      src/package.json
  3. 932
      src/pnpm-lock.yaml
  4. 4
      src/server/database/repositories/client/service.ts
  5. 2
      src/server/database/repositories/general/service.ts
  6. 2
      src/server/database/repositories/general/types.ts
  7. 2
      src/server/database/repositories/hooks/service.ts
  8. 2
      src/server/database/repositories/hooks/types.ts
  9. 4
      src/server/database/repositories/interface/service.ts
  10. 2
      src/server/database/repositories/interface/types.ts
  11. 4
      src/server/database/repositories/oneTimeLink/service.ts
  12. 2
      src/server/database/repositories/oneTimeLink/types.ts
  13. 2
      src/server/database/repositories/user/service.ts
  14. 2
      src/server/database/repositories/user/types.ts
  15. 2
      src/server/database/repositories/userConfig/service.ts
  16. 2
      src/server/database/repositories/userConfig/types.ts
  17. 2
      src/server/utils/wgHelper.ts

6
src/eslint.config.mjs

@ -1,6 +1,10 @@
import { createConfigForNuxt } from '@nuxt/eslint-config/flat'; import { createConfigForNuxt } from '@nuxt/eslint-config/flat';
import eslintConfigPrettier from 'eslint-config-prettier'; import eslintConfigPrettier from 'eslint-config-prettier';
export default createConfigForNuxt().append(eslintConfigPrettier); export default createConfigForNuxt().append({
rules: {
'import/order': 'warn',
}
}).append(eslintConfigPrettier);
// TODO: add typescript-eslint, import/order, ban raw defineEventHandler // TODO: add typescript-eslint, import/order, ban raw defineEventHandler

1
src/package.json

@ -55,6 +55,7 @@
"drizzle-kit": "^0.30.5", "drizzle-kit": "^0.30.5",
"eslint": "^9.21.0", "eslint": "^9.21.0",
"eslint-config-prettier": "^10.0.2", "eslint-config-prettier": "^10.0.2",
"eslint-plugin-import": "^2.31.0",
"prettier": "^3.5.3", "prettier": "^3.5.3",
"prettier-plugin-tailwindcss": "^0.6.11", "prettier-plugin-tailwindcss": "^0.6.11",
"typescript": "^5.8.2", "typescript": "^5.8.2",

932
src/pnpm-lock.yaml

File diff suppressed because it is too large

4
src/server/database/repositories/client/service.ts

@ -1,13 +1,13 @@
import type { DBType } from '#db/sqlite';
import { eq, sql } from 'drizzle-orm'; import { eq, sql } from 'drizzle-orm';
import { parseCidr } from 'cidr-tools';
import { client } from './schema'; import { client } from './schema';
import type { import type {
ClientCreateFromExistingType, ClientCreateFromExistingType,
ClientCreateType, ClientCreateType,
UpdateClientType, UpdateClientType,
} from './types'; } from './types';
import type { DBType } from '#db/sqlite';
import { wgInterface, userConfig } from '#db/schema'; import { wgInterface, userConfig } from '#db/schema';
import { parseCidr } from 'cidr-tools';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/general/service.ts

@ -1,7 +1,7 @@
import type { DBType } from '#db/sqlite';
import { sql } from 'drizzle-orm'; import { sql } from 'drizzle-orm';
import { general } from './schema'; import { general } from './schema';
import type { GeneralUpdateType } from './types'; import type { GeneralUpdateType } from './types';
import type { DBType } from '#db/sqlite';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/general/types.ts

@ -1,6 +1,6 @@
import type { InferSelectModel } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm';
import type { general } from './schema';
import z from 'zod'; import z from 'zod';
import type { general } from './schema';
export type GeneralType = InferSelectModel<typeof general>; export type GeneralType = InferSelectModel<typeof general>;

2
src/server/database/repositories/hooks/service.ts

@ -1,7 +1,7 @@
import type { DBType } from '#db/sqlite';
import { eq, sql } from 'drizzle-orm'; import { eq, sql } from 'drizzle-orm';
import { hooks } from './schema'; import { hooks } from './schema';
import type { HooksUpdateType } from './types'; import type { HooksUpdateType } from './types';
import type { DBType } from '#db/sqlite';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/hooks/types.ts

@ -1,6 +1,6 @@
import type { InferSelectModel } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm';
import type { hooks } from './schema';
import z from 'zod'; import z from 'zod';
import type { hooks } from './schema';
export type HooksType = InferSelectModel<typeof hooks>; export type HooksType = InferSelectModel<typeof hooks>;

4
src/server/database/repositories/interface/service.ts

@ -1,10 +1,10 @@
import type { DBType } from '#db/sqlite';
import isCidr from 'is-cidr'; import isCidr from 'is-cidr';
import { eq, sql } from 'drizzle-orm'; import { eq, sql } from 'drizzle-orm';
import { parseCidr } from 'cidr-tools';
import { wgInterface } from './schema'; import { wgInterface } from './schema';
import type { InterfaceCidrUpdateType, InterfaceUpdateType } from './types'; import type { InterfaceCidrUpdateType, InterfaceUpdateType } from './types';
import { client as clientSchema } from '#db/schema'; import { client as clientSchema } from '#db/schema';
import { parseCidr } from 'cidr-tools'; import type { DBType } from '#db/sqlite';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/interface/types.ts

@ -1,6 +1,6 @@
import type { InferSelectModel } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm';
import type { wgInterface } from './schema';
import z from 'zod'; import z from 'zod';
import type { wgInterface } from './schema';
export type InterfaceType = InferSelectModel<typeof wgInterface>; export type InterfaceType = InferSelectModel<typeof wgInterface>;

4
src/server/database/repositories/oneTimeLink/service.ts

@ -1,7 +1,7 @@
import type { DBType } from '#db/sqlite';
import { eq, sql } from 'drizzle-orm'; import { eq, sql } from 'drizzle-orm';
import { oneTimeLink } from './schema';
import CRC32 from 'crc-32'; import CRC32 from 'crc-32';
import { oneTimeLink } from './schema';
import type { DBType } from '#db/sqlite';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/oneTimeLink/types.ts

@ -1,6 +1,6 @@
import type { InferSelectModel } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm';
import type { oneTimeLink } from './schema';
import { z } from 'zod'; import { z } from 'zod';
import type { oneTimeLink } from './schema';
export type OneTimeLinkType = InferSelectModel<typeof oneTimeLink>; export type OneTimeLinkType = InferSelectModel<typeof oneTimeLink>;

2
src/server/database/repositories/user/service.ts

@ -1,6 +1,6 @@
import type { DBType } from '#db/sqlite';
import { eq, sql } from 'drizzle-orm'; import { eq, sql } from 'drizzle-orm';
import { user } from './schema'; import { user } from './schema';
import type { DBType } from '#db/sqlite';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/user/types.ts

@ -1,6 +1,6 @@
import type { InferSelectModel } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm';
import type { user } from './schema';
import z from 'zod'; import z from 'zod';
import type { user } from './schema';
export type UserType = InferSelectModel<typeof user>; export type UserType = InferSelectModel<typeof user>;

2
src/server/database/repositories/userConfig/service.ts

@ -1,7 +1,7 @@
import type { DBType } from '#db/sqlite';
import { eq, sql } from 'drizzle-orm'; import { eq, sql } from 'drizzle-orm';
import { userConfig } from './schema'; import { userConfig } from './schema';
import type { UserConfigUpdateType } from './types'; import type { UserConfigUpdateType } from './types';
import type { DBType } from '#db/sqlite';
function createPreparedStatement(db: DBType) { function createPreparedStatement(db: DBType) {
return { return {

2
src/server/database/repositories/userConfig/types.ts

@ -1,6 +1,6 @@
import type { InferSelectModel } from 'drizzle-orm'; import type { InferSelectModel } from 'drizzle-orm';
import type { userConfig } from './schema';
import z from 'zod'; import z from 'zod';
import type { userConfig } from './schema';
export type UserConfigType = InferSelectModel<typeof userConfig>; export type UserConfigType = InferSelectModel<typeof userConfig>;

2
src/server/utils/wgHelper.ts

@ -1,7 +1,7 @@
import { parseCidr } from 'cidr-tools'; import { parseCidr } from 'cidr-tools';
import { stringifyIp } from 'ip-bigint';
import type { ClientType } from '#db/repositories/client/types'; import type { ClientType } from '#db/repositories/client/types';
import type { InterfaceType } from '#db/repositories/interface/types'; import type { InterfaceType } from '#db/repositories/interface/types';
import { stringifyIp } from 'ip-bigint';
import type { UserConfigType } from '#db/repositories/userConfig/types'; import type { UserConfigType } from '#db/repositories/userConfig/types';
import type { HooksType } from '#db/repositories/hooks/types'; import type { HooksType } from '#db/repositories/hooks/types';

Loading…
Cancel
Save