Browse Source

fix imports

pull/2672/head
Bernd Storath 3 weeks ago
parent
commit
6846744f62
  1. 3
      src/cli/tsconfig.json
  2. 5
      src/nuxt.config.ts
  3. 2
      src/server/database/repositories/client/schema.ts
  4. 2
      src/server/database/repositories/hooks/schema.ts
  5. 2
      src/server/database/repositories/interface/schema.ts
  6. 2
      src/server/database/repositories/oneTimeLink/schema.ts
  7. 3
      src/server/database/repositories/user/schema.ts
  8. 2
      src/server/database/repositories/userConfig/schema.ts
  9. 14
      src/server/database/schema.ts

3
src/cli/tsconfig.json

@ -9,7 +9,8 @@
"moduleResolution": "bundler",
"paths": {
"#cli/*": ["./*"],
"#server/*": ["../server/*"]
"#server/*": ["../server/*"],
"#db/*": ["../server/database/*"]
}
},
"include": ["./**/*.ts"]

5
src/nuxt.config.ts

@ -169,15 +169,12 @@ export default defineNuxtConfig({
target: 'node20',
},
},
alias: {
'#db': fileURLToPath(new URL('./server/database/', import.meta.url)),
},
externals: {
traceInclude: [fileURLToPath(new URL('./cli/index.ts', import.meta.url))],
},
},
alias: {
// for typecheck reasons (https://github.com/nuxt/cli/issues/323)
'#db': fileURLToPath(new URL('./server/database/', import.meta.url)),
'#cli': fileURLToPath(new URL('./cli', import.meta.url)),
},
});

2
src/server/database/repositories/client/schema.ts

@ -1,7 +1,7 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { oneTimeLink, user, wgInterface } from '../../schema';
import { oneTimeLink, user, wgInterface } from '#db/schema';
/** null means use value from userConfig */

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

@ -1,7 +1,7 @@
import { sql } from 'drizzle-orm';
import { sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { wgInterface } from '../../schema';
import { wgInterface } from '#db/schema';
export const hooks = sqliteTable('hooks_table', {
/** same as `wgInterface.name` */

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

@ -1,7 +1,7 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { userConfig, hooks } from '../../schema';
import { userConfig, hooks } from '#db/schema';
// maybe support multiple interfaces in the future
export const wgInterface = sqliteTable('interfaces_table', {

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

@ -1,7 +1,7 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { client } from '../../schema';
import { client } from '#db/schema';
export const oneTimeLink = sqliteTable('one_time_links_table', {
/** same as `client.id` */

3
src/server/database/repositories/user/schema.ts

@ -1,8 +1,7 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text, uniqueIndex } from 'drizzle-orm/sqlite-core';
import { client } from '../../schema';
import { client } from '#db/schema';
import type { Role } from '#shared/utils/permissions';
import type { OAUTH_PROVIDER } from '#server/utils/oauth';

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

@ -1,7 +1,7 @@
import { sql } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { wgInterface } from '../../schema';
import { wgInterface } from '#db/schema';
// default* means clients store it themselves
export const userConfig = sqliteTable('user_configs_table', {

14
src/server/database/schema.ts

@ -1,8 +1,8 @@
// Make sure to not use any Path Aliases in these files
export * from './repositories/client/schema';
export * from './repositories/general/schema';
export * from './repositories/hooks/schema';
export * from './repositories/interface/schema';
export * from './repositories/oneTimeLink/schema';
export * from './repositories/user/schema';
export * from './repositories/userConfig/schema';
export * from '#db/repositories/client/schema';
export * from '#db/repositories/general/schema';
export * from '#db/repositories/hooks/schema';
export * from '#db/repositories/interface/schema';
export * from '#db/repositories/oneTimeLink/schema';
export * from '#db/repositories/user/schema';
export * from '#db/repositories/userConfig/schema';

Loading…
Cancel
Save