test: fix imports

rrd108 · rrd108 · commit 224a515cbd1c · 2026-01-06T16:14:54.000+01:00
diff --git a/src/cli/add-google-oauth-fields.ts b/src/cli/add-google-oauth-fields.ts
@@ -1,5 +1,5 @@
 import { defineCommand } from 'citty'
-import { useDb } from '../runtime/server/utils/db'
+import { useDb } from '../runtime/server/utils'
 import { loadOptions } from './utils'
 
 export default defineCommand({
diff --git a/src/cli/project-info.ts b/src/cli/project-info.ts
@@ -1,8 +1,7 @@
 import { defineCommand } from 'citty'
 import { loadNuxt } from '@nuxt/kit'
 import type { ModuleOptions } from 'nuxt-users/utils'
-import { checkTableExists } from '../runtime/server/utils/db'
-import { getAppliedMigrations } from '../runtime/server/utils/migrate'
+import { checkTableExists, getAppliedMigrations } from '../runtime/server/utils'
 
 export default defineCommand({
   meta: {
diff --git a/src/runtime/server/api/nuxt-users/[id].delete.ts b/src/runtime/server/api/nuxt-users/[id].delete.ts
@@ -1,7 +1,7 @@
 import { createError, defineEventHandler } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { deleteUser } from '../../utils/user'
+import { deleteUser } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/[id].get.ts b/src/runtime/server/api/nuxt-users/[id].get.ts
@@ -1,7 +1,7 @@
 import { createError, defineEventHandler } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { findUserById } from '../../utils/user'
+import { findUserById } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/[id].patch.ts b/src/runtime/server/api/nuxt-users/[id].patch.ts
@@ -1,7 +1,7 @@
 import { createError, defineEventHandler, readBody } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { updateUser } from '../../utils/user'
+import { updateUser } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/inactive.get.ts b/src/runtime/server/api/nuxt-users/inactive.get.ts
@@ -1,8 +1,7 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { useDb } from '../../utils/db'
-import { getLastLoginTime } from '../../utils/user'
+import { useDb, getLastLoginTime } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/index.get.ts b/src/runtime/server/api/nuxt-users/index.get.ts
@@ -1,8 +1,7 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { useDb } from '../../utils/db'
-import { getLastLoginTime } from '../../utils/user'
+import { useDb, getLastLoginTime } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/index.post.ts b/src/runtime/server/api/nuxt-users/index.post.ts
@@ -1,7 +1,7 @@
 import { createError, defineEventHandler, readBody } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { createUser } from '../../utils/user'
+import { createUser } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/me.patch.ts b/src/runtime/server/api/nuxt-users/me.patch.ts
@@ -1,7 +1,7 @@
 import { createError, defineEventHandler, readBody } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { updateUser } from '../../utils/user'
+import { updateUser } from '../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/password/index.patch.ts b/src/runtime/server/api/nuxt-users/password/index.patch.ts
@@ -2,7 +2,7 @@ import { createError, defineEventHandler, getCookie, readBody } from 'h3'
 import bcrypt from 'bcrypt'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { getCurrentUserFromToken, updateUserPassword } from '../../../utils/user'
+import { getCurrentUserFromToken, updateUserPassword } from '../../../utils'
 import { validatePassword, getPasswordValidationOptions } from '../../../../../utils'
 
 export default defineEventHandler(async (event) => {
diff --git a/src/runtime/server/api/nuxt-users/session/index.delete.ts b/src/runtime/server/api/nuxt-users/session/index.delete.ts
@@ -1,7 +1,7 @@
 import { defineEventHandler, getCookie, setCookie } from 'h3'
 import type { ModuleOptions } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { useDb } from '../../../utils/db'
+import { useDb } from '../../../utils'
 
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig()
diff --git a/src/runtime/server/api/nuxt-users/session/index.post.ts b/src/runtime/server/api/nuxt-users/session/index.post.ts
@@ -3,7 +3,7 @@ import bcrypt from 'bcrypt'
 import crypto from 'node:crypto'
 import type { ModuleOptions, User } from 'nuxt-users/utils'
 import { useRuntimeConfig } from '#imports'
-import { useDb } from '../../../utils/db'
+import { useDb } from '../../../utils'
 
 export default defineEventHandler(async (event) => {
   const body = await readBody(event)
diff --git a/src/runtime/server/composables/useServerAuth.ts b/src/runtime/server/composables/useServerAuth.ts
@@ -1,4 +1,4 @@
-import { getCurrentUserFromToken } from '../utils/user'
+import { getCurrentUserFromToken } from '../utils'
 import type { ModuleOptions, UserWithoutPassword } from 'nuxt-users/utils'
 
 /**
diff --git a/src/runtime/server/internal/index.ts b/src/runtime/server/internal/index.ts
@@ -1,10 +1,26 @@
 // Internal exports for CLI access
-export { useDb, checkTableExists } from '../utils/db'
-export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers, deleteExpiredPersonalAccessTokens, deleteTokensWithoutExpiration, cleanupPersonalAccessTokens, revokeUserTokens, getLastLoginTime } from '../utils/user'
-export { createUsersTable } from '../utils/create-users-table'
-export { createPersonalAccessTokensTable } from '../utils/create-personal-access-tokens-table'
-export { createPasswordResetTokensTable } from '../utils/create-password-reset-tokens-table'
-export { createMigrationsTable } from '../utils/create-migrations-table'
-export { runMigrations } from '../utils/migrate'
+export {
+  useDb,
+  checkTableExists,
+  createUser,
+  findUserByEmail,
+  updateUserPassword,
+  getCurrentUserFromToken,
+  hasAnyUsers,
+  deleteExpiredPersonalAccessTokens,
+  deleteTokensWithoutExpiration,
+  cleanupPersonalAccessTokens,
+  revokeUserTokens,
+  getLastLoginTime,
+  findUserById,
+  updateUser,
+  deleteUser,
+  createUsersTable,
+  createPersonalAccessTokensTable,
+  createPasswordResetTokensTable,
+  createMigrationsTable,
+  runMigrations,
+  getAppliedMigrations
+} from '../utils'
 export { useNuxtUsersDatabase } from '../composables/useNuxtUsersDatabase'
 export { useServerAuth } from '../composables/useServerAuth'
diff --git a/src/runtime/server/utils/index.ts b/src/runtime/server/utils/index.ts
@@ -1,10 +1,10 @@
 // Internal utils - used by module's API routes, middleware, services, tasks
-export { useDb, checkTableExists } from './db'
+export { useDb, checkTableExists, getConnector, closeAllDbConnections } from './db'
 export { isBuildTime } from './build-time'
-export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers, deleteTokensWithoutExpiration, cleanupPersonalAccessTokens, revokeUserTokens, getLastLoginTime, findUserById, updateUser, deleteUser } from './user'
+export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers, deleteExpiredPersonalAccessTokens, deleteTokensWithoutExpiration, cleanupPersonalAccessTokens, revokeUserTokens, getLastLoginTime, findUserById, updateUser, deleteUser } from './user'
 export { createUsersTable } from './create-users-table'
 export { createPersonalAccessTokensTable } from './create-personal-access-tokens-table'
 export { createPasswordResetTokensTable } from './create-password-reset-tokens-table'
 export { createMigrationsTable } from './create-migrations-table'
-export { runMigrations } from './migrate'
+export { runMigrations, getAppliedMigrations } from './migrate'
 export { createGoogleOAuth2Client, getGoogleAuthUrl, getGoogleUserFromCode, findOrCreateGoogleUser, createAuthTokenForUser, generateSecurePassword } from './google-oauth'
diff --git a/test/unit/build-time-detection.test.ts b/test/unit/build-time-detection.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest'
-import { isBuildTime } from '../../src/runtime/server/utils/build-time'
+import { isBuildTime } from '../../src/runtime/server/utils'
 
 describe('Build-time Detection', () => {
   const originalEnv = process.env
diff --git a/test/utils.db.test.ts b/test/utils.db.test.ts
@@ -1,10 +1,8 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest'
 import type { Database } from 'db0'
-import { getConnector, checkTableExists } from '../src/runtime/server/utils/db'
-import { createUsersTable } from '../src/runtime/server/utils/create-users-table'
+import { getConnector, checkTableExists, createUsersTable, hasAnyUsers } from '../src/runtime/server/utils'
 import { cleanupTestSetup, createTestSetup } from './test-setup'
 import type { DatabaseType, DatabaseConfig, ModuleOptions } from '../src/types'
-import { hasAnyUsers } from '../src/runtime/server/utils/user'
 
 describe('Utils: DB', () => {
   let db: Database
diff --git a/test/utils.user.test.ts b/test/utils.user.test.ts
@@ -2,9 +2,7 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest'
 import type { Database } from 'db0'
 import type { DatabaseType, DatabaseConfig, ModuleOptions } from '../src/types'
 import { cleanupTestSetup, createTestSetup } from './test-setup'
-import { createUsersTable } from '../src/runtime/server/utils/create-users-table'
-import { createPersonalAccessTokensTable } from '../src/runtime/server/utils/create-personal-access-tokens-table'
-import { createUser, findUserByEmail, findUserById, deleteUser, updateUser, updateUserPassword, getLastLoginTime, getCurrentUserFromToken } from '../src/runtime/server/utils/user'
+import { createUsersTable, createPersonalAccessTokensTable, createUser, findUserByEmail, findUserById, deleteUser, updateUser, updateUserPassword, getLastLoginTime, getCurrentUserFromToken } from '../src/runtime/server/utils'
 import { addActiveToUsers } from '../src/runtime/server/utils/add-active-to-users'
 
 describe('User Utilities (src/utils/user.ts)', () => {
