@etus/bhono-app 0.1.5 → 0.1.6

package/templates/base/{src → tests/unit}/server/middleware/account.test.ts

@@ -1,28 +1,27 @@
 // src/server/middleware/account.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import { accountMiddleware } from './account'
-import { createUserFixture, createSuperAdminFixture } from '../__tests__/fixtures'
+import type { HonoEnv } from '@server/types'
+import { accountMiddleware } from '@server/middleware/account'
+import { createUserFixture, createSuperAdminFixture } from '@tests/fixtures/server'
+import { createMockEnv, setMockQueryResult } from '@tests/helpers/server'
 
 describe('accountMiddleware', () => {
-  // Create mock database
-  let mockDb: any
+  let env: ReturnType<typeof createMockEnv>
+  let mockDb: ReturnType<typeof createMockEnv>['DB']['_mock']
 
   beforeEach(() => {
     vi.clearAllMocks()
-    mockDb = {
-      select: vi.fn().mockReturnThis(),
-      from: vi.fn().mockReturnThis(),
-      where: vi.fn().mockReturnThis(),
-      limit: vi.fn(),
-    }
+    env = createMockEnv()
+    mockDb = env.DB._mock
   })
 
   const createApp = (setupUser?: (app: Hono) => void) => {
-    const app = new Hono()
-    // Setup mock db in context
+    const app = new Hono<HonoEnv>()
+    // Setup mock db in context + env
     app.use('*', async (c, next) => {
-      c.set('db', mockDb)
+      ;(c as any).env = env
+      c.set('db', env.DB)
       await next()
     })
     // Setup user if provided
@@ -119,9 +118,7 @@ describe('accountMiddleware', () => {
     })
 
     // Mock membership exists
-    mockDb.limit.mockResolvedValue([
-      { userId: 'user-123', accountId: 'account-123', role: 'VIEWER' },
-    ])
+    setMockQueryResult(mockDb, ['user-123', 'account-123'], { role: 'VIEWER' })
 
     const res = await app.request('/test', {
       headers: { 'account-id': 'account-123' },
@@ -143,9 +140,7 @@ describe('accountMiddleware', () => {
     })
 
     // Mock membership with ADMIN role
-    mockDb.limit.mockResolvedValue([
-      { userId: 'user-123', accountId: 'account-123', role: 'ADMIN' },
-    ])
+    setMockQueryResult(mockDb, ['user-123', 'account-123'], { role: 'ADMIN' })
 
     const res = await app.request('/test', {
       headers: { 'account-id': 'account-123' },
@@ -167,9 +162,7 @@ describe('accountMiddleware', () => {
     })
 
     // Mock membership with VIEWER role
-    mockDb.limit.mockResolvedValue([
-      { userId: 'user-123', accountId: 'account-123', role: 'VIEWER' },
-    ])
+    setMockQueryResult(mockDb, ['user-123', 'account-123'], { role: 'VIEWER' })
 
     const res = await app.request('/test', {
       headers: { 'account-id': 'account-123' },
@@ -189,8 +182,7 @@ describe('accountMiddleware', () => {
       })
     })
 
-    // Mock no membership found
-    mockDb.limit.mockResolvedValue([])
+    // No query result -> no membership
 
     const res = await app.request('/test', {
       headers: { 'account-id': 'account-123' },

package/templates/base/{src → tests/unit}/server/middleware/auth.test.ts

@@ -1,11 +1,13 @@
 // src/server/middleware/auth.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import { sessionAuth, jwtAuth } from './auth'
-import { createUserFixture, createInactiveUserFixture } from '../__tests__/fixtures'
+import type { HonoEnv } from '@server/types'
+import { sessionAuth, jwtAuth } from '@server/middleware/auth'
+import { createUserFixture, createInactiveUserFixture } from '@tests/fixtures/server'
+import { createMockEnv, setMockQueryResult } from '@tests/helpers/server'
 
 // Mock the session module
-vi.mock('../lib/session', () => ({
+vi.mock('@server/lib/session', () => ({
   getSession: vi.fn(),
 }))
 
@@ -14,19 +16,25 @@ vi.mock('hono/jwt', () => ({
   verify: vi.fn(),
 }))
 
-import { getSession } from '../lib/session'
+import { getSession } from '@server/lib/session'
 import { verify } from 'hono/jwt'
 
 describe('sessionAuth', () => {
+  let env: ReturnType<typeof createMockEnv>
+  let mockDb: ReturnType<typeof createMockEnv>['DB']['_mock']
+
   beforeEach(() => {
     vi.clearAllMocks()
+    env = createMockEnv()
+    mockDb = env.DB._mock
   })
 
   const createApp = () => {
-    const app = new Hono()
-    // Setup mock db in context
+    const app = new Hono<HonoEnv>()
+    // Setup mock db in context + env
     app.use('*', async (c, next) => {
-      c.set('db', mockDb)
+      ;(c as any).env = env
+      c.set('db', env.DB)
       await next()
     })
     app.use('*', sessionAuth)
@@ -37,16 +45,16 @@ describe('sessionAuth', () => {
     return app
   }
 
-  // Create mock database
-  let mockDb: any
-
-  beforeEach(() => {
-    mockDb = {
-      select: vi.fn().mockReturnThis(),
-      from: vi.fn().mockReturnThis(),
-      where: vi.fn().mockReturnThis(),
-      limit: vi.fn(),
-    }
+  const toUserRow = (user: ReturnType<typeof createUserFixture>) => ({
+    id: user.id,
+    email: user.email,
+    name: user.name,
+    status: user.status,
+    providerIds: user.providerIds,
+    isSuperAdmin: user.isSuperAdmin,
+    createdAt: user.createdAt,
+    updatedAt: user.updatedAt,
+    deletedAt: user.deletedAt,
   })
 
   it('calls next() when valid session exists', async () => {
@@ -61,7 +69,7 @@ describe('sessionAuth', () => {
     })
 
     // Mock db returns user
-    mockDb.limit.mockResolvedValue([testUser])
+    setMockQueryResult(mockDb, ['user-123'], toUserRow(testUser))
 
     const app = createApp()
     const res = await app.request('/test')
@@ -89,8 +97,7 @@ describe('sessionAuth', () => {
       isSuperAdmin: false,
     })
 
-    // Mock db returns empty array (user not found)
-    mockDb.limit.mockResolvedValue([])
+    // No query result -> user not found
 
     const app = createApp()
     const res = await app.request('/test')
@@ -109,7 +116,7 @@ describe('sessionAuth', () => {
     })
 
     // Mock db returns inactive user
-    mockDb.limit.mockResolvedValue([inactiveUser])
+    setMockQueryResult(mockDb, ['user-123'], toUserRow(inactiveUser))
 
     const app = createApp()
     const res = await app.request('/test')
@@ -134,7 +141,7 @@ describe('sessionAuth', () => {
       isSuperAdmin: true,
     })
 
-    mockDb.limit.mockResolvedValue([testUser])
+    setMockQueryResult(mockDb, ['user-123'], toUserRow(testUser))
 
     const app = createApp()
     const res = await app.request('/test')
@@ -153,28 +160,21 @@ describe('sessionAuth', () => {
 })
 
 describe('jwtAuth', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  // Create mock database
-  let mockDb: any
+  let env: ReturnType<typeof createMockEnv>
+  let mockDb: ReturnType<typeof createMockEnv>['DB']['_mock']
 
   beforeEach(() => {
-    mockDb = {
-      select: vi.fn().mockReturnThis(),
-      from: vi.fn().mockReturnThis(),
-      where: vi.fn().mockReturnThis(),
-      limit: vi.fn(),
-    }
+    vi.clearAllMocks()
+    env = createMockEnv()
+    mockDb = env.DB._mock
   })
 
   const createApp = () => {
-    const app = new Hono<{ Bindings: { JWT_SECRET: string } }>()
+    const app = new Hono<HonoEnv>()
     // Setup mock db and env in context
     app.use('*', async (c, next) => {
-      c.set('db', mockDb)
-      ;(c.env as any) = { JWT_SECRET: 'test-secret' }
+      ;(c as any).env = env
+      c.set('db', env.DB)
       await next()
     })
     app.use('*', jwtAuth)
@@ -197,7 +197,17 @@ describe('jwtAuth', () => {
     })
 
     // Mock db returns user
-    mockDb.limit.mockResolvedValue([testUser])
+    setMockQueryResult(mockDb, ['user-123'], {
+      id: testUser.id,
+      email: testUser.email,
+      name: testUser.name,
+      status: testUser.status,
+      providerIds: testUser.providerIds,
+      isSuperAdmin: testUser.isSuperAdmin,
+      createdAt: testUser.createdAt,
+      updatedAt: testUser.updatedAt,
+      deletedAt: testUser.deletedAt,
+    })
 
     const app = createApp()
     const res = await app.request('/test', {
@@ -275,8 +285,7 @@ describe('jwtAuth', () => {
       exp: Date.now() + 3600000,
     })
 
-    // Mock db returns empty array
-    mockDb.limit.mockResolvedValue([])
+    // No query result -> user not found
 
     const app = createApp()
     const res = await app.request('/test', {
@@ -297,7 +306,17 @@ describe('jwtAuth', () => {
     })
 
     // Mock db returns inactive user
-    mockDb.limit.mockResolvedValue([inactiveUser])
+    setMockQueryResult(mockDb, ['user-123'], {
+      id: inactiveUser.id,
+      email: inactiveUser.email,
+      name: inactiveUser.name,
+      status: inactiveUser.status,
+      providerIds: inactiveUser.providerIds,
+      isSuperAdmin: inactiveUser.isSuperAdmin,
+      createdAt: inactiveUser.createdAt,
+      updatedAt: inactiveUser.updatedAt,
+      deletedAt: inactiveUser.deletedAt,
+    })
 
     const app = createApp()
     const res = await app.request('/test', {
@@ -324,7 +343,17 @@ describe('jwtAuth', () => {
       exp: Date.now() + 3600000,
     })
 
-    mockDb.limit.mockResolvedValue([testUser])
+    setMockQueryResult(mockDb, ['user-123'], {
+      id: testUser.id,
+      email: testUser.email,
+      name: testUser.name,
+      status: testUser.status,
+      providerIds: testUser.providerIds,
+      isSuperAdmin: testUser.isSuperAdmin,
+      createdAt: testUser.createdAt,
+      updatedAt: testUser.updatedAt,
+      deletedAt: testUser.deletedAt,
+    })
 
     const app = createApp()
     const res = await app.request('/test', {

package/templates/base/{src → tests/unit}/server/middleware/cors.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import { Hono } from 'hono'
-import { configurableCors } from './cors'
+import { configurableCors } from '@server/middleware/cors'
 
 describe('configurableCors', () => {
   it('allows origin from CORS_ORIGINS list', async () => {

package/templates/base/{src → tests/unit}/server/middleware/error-handler.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import { Hono } from 'hono'
-import { errorHandler } from './error-handler'
-import { ValidationError, NotFoundError, InternalError } from '../lib/errors'
+import { errorHandler } from '@server/middleware/error-handler'
+import { ValidationError, NotFoundError, InternalError } from '@server/lib/errors'
 
 describe('errorHandler', () => {
   const createApp = () => {

package/templates/base/{src → tests/unit}/server/middleware/rate-limit.test.ts

@@ -1,13 +1,13 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../types'
+import type { HonoEnv } from '@server/types'
 import {
   RateLimitStore,
   globalStore,
   rateLimit,
   authRateLimit,
   rateLimitWithStore,
-} from './rate-limit'
+} from '@server/middleware/rate-limit'
 
 describe('RateLimitStore', () => {
   let store: RateLimitStore
@@ -76,6 +76,7 @@ describe('RateLimitStore', () => {
   describe('destroy', () => {
     it('stops cleanup interval', () => {
       const clearIntervalSpy = vi.spyOn(global, 'clearInterval')
+      store.startPeriodicCleanup()
       store.destroy()
       expect(clearIntervalSpy).toHaveBeenCalled()
       clearIntervalSpy.mockRestore()

package/templates/base/{src → tests/unit}/server/middleware/request-context.test.ts

@@ -1,7 +1,7 @@
 // src/server/middleware/request-context.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import { requestContext } from './request-context'
+import { requestContext } from '@server/middleware/request-context'
 
 // Mock uuidv7
 vi.mock('uuidv7', () => ({

package/templates/base/{src → tests/unit}/server/middleware/request-logger.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { Hono } from 'hono'
-import { requestLogger } from './request-logger'
+import { requestLogger } from '@server/middleware/request-logger'
 
 describe('requestLogger', () => {
   let consoleSpy: ReturnType<typeof vi.spyOn>

package/templates/base/{src/server/__tests__/mocks/__tests__ → tests/unit/server/mocks}/db.test.ts

@@ -6,7 +6,7 @@ import {
   setMockDefaultResult,
   clearMockQueryResults,
   type MockD1Database,
-} from '../db'
+} from '@tests/mocks/db'
 
 describe('MockD1Database', () => {
   let db: MockD1Database

package/templates/base/{src/server/__tests__/mocks/__tests__ → tests/unit/server/mocks}/kv.test.ts

@@ -1,6 +1,6 @@
 // src/server/__tests__/mocks/__tests__/kv.test.ts
 import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { createMockKV, seedMockKV, clearMockKV, type MockKVNamespace } from '../kv'
+import { createMockKV, seedMockKV, clearMockKV, type MockKVNamespace } from '@tests/mocks/kv'
 
 describe('MockKVNamespace', () => {
   let kv: MockKVNamespace

package/templates/base/{src/server/__tests__/mocks/__tests__ → tests/unit/server/mocks}/r2.test.ts

@@ -1,6 +1,6 @@
 // src/server/__tests__/mocks/__tests__/r2.test.ts
 import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { createMockR2, seedMockR2, clearMockR2, type MockR2Bucket } from '../r2'
+import { createMockR2, seedMockR2, clearMockR2, type MockR2Bucket } from '@tests/mocks/r2'
 
 describe('MockR2Bucket', () => {
   let r2: MockR2Bucket

package/templates/base/{src/server/routes/accounts/__tests__ → tests/unit/server/routes/accounts}/handlers.test.ts

@@ -1,14 +1,14 @@
 // src/server/routes/accounts/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { accounts } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
+import type { HonoEnv } from '@server/types'
+import { accounts } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
 import {
   createUserFixture,
   createAccountFixture,
-} from '../../../__tests__/fixtures'
-import { NotFoundError } from '../../../lib/errors'
+} from '@tests/fixtures/server'
+import { NotFoundError } from '@server/lib/errors'
 
 // Test UUIDs
 const TEST_ACCOUNT_ID = '550e8400-e29b-41d4-a716-446655440001'
@@ -17,7 +17,7 @@ const TEST_USER_ID = '550e8400-e29b-41d4-a716-446655440101'
 const NON_EXISTENT_ID = '550e8400-e29b-41d4-a716-446655440999'
 
 // Mock the accounts service
-vi.mock('../../../services', () => ({
+vi.mock('@server/services', () => ({
   accountsService: {
     findAll: vi.fn(),
     findById: vi.fn(),
@@ -28,7 +28,7 @@ vi.mock('../../../services', () => ({
   },
 }))
 
-import { accountsService } from '../../../services'
+import { accountsService } from '@server/services'
 
 describe('Accounts Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -139,7 +139,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(200)
       expect(accountsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),
@@ -174,7 +174,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(200)
       expect(accountsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           query: 'search',
@@ -232,7 +232,7 @@ describe('Accounts Routes', () => {
       })
 
       expect(accountsService.findById).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
           user: expect.objectContaining({ id: testUser.id }),
@@ -295,7 +295,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(201)
       expect(accountsService.create).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           name: 'Domain Account',
@@ -389,7 +389,7 @@ describe('Accounts Routes', () => {
 
       expect(res.status).toBe(204)
       expect(accountsService.delete).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         TEST_ACCOUNT_ID
       )

package/templates/base/{src/server/routes/audits/__tests__ → tests/unit/server/routes/audits}/handlers.test.ts

@@ -1,23 +1,23 @@
 // src/server/routes/audits/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { audits } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
-import { createUserFixture, createAccountFixture } from '../../../__tests__/fixtures'
+import type { HonoEnv } from '@server/types'
+import { audits } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
+import { createUserFixture, createAccountFixture } from '@tests/fixtures/server'
 
 // Test UUIDs
 const TEST_USER_ID = '550e8400-e29b-41d4-a716-446655440001'
 const TEST_ACCOUNT_ID = '550e8400-e29b-41d4-a716-446655440101'
 
 // Mock the audits service
-vi.mock('../../../services/audits', () => ({
+vi.mock('@server/services/audits', () => ({
   auditsService: {
     findAll: vi.fn(),
   },
 }))
 
-import { auditsService } from '../../../services/audits'
+import { auditsService } from '@server/services/audits'
 
 describe('Audits Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>
@@ -149,7 +149,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),
@@ -192,7 +192,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),
@@ -230,7 +230,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           page: 1,
@@ -263,7 +263,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.anything(),
         expect.objectContaining({
           page: 2,
@@ -310,7 +310,7 @@ describe('Audits Routes', () => {
 
       expect(res.status).toBe(200)
       expect(auditsService.findAll).toHaveBeenCalledWith(
-        mockDb,
+        mockEnv.DB,
         expect.objectContaining({
           accountId: testAccount.id,
         }),

package/templates/base/{src/server/routes/auth/__tests__ → tests/unit/server/routes/auth}/handlers.test.ts

@@ -1,16 +1,16 @@
 // src/server/routes/auth/__tests__/handlers.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import type { HonoEnv } from '../../../types'
-import { auth } from '../index'
-import { createMockEnv } from '../../../__tests__/setup'
+import type { HonoEnv } from '@server/types'
+import { auth } from '@server/routes/index'
+import { createMockEnv } from '@tests/helpers/server'
 import {
   createUserFixture,
   createSessionFixture,
-} from '../../../__tests__/fixtures'
+} from '@tests/fixtures/server'
 
 // Mock the session module
-vi.mock('../../../lib/session', async (importOriginal) => {
+vi.mock('@server/lib/session', async (importOriginal) => {
   const original = await importOriginal<typeof import('../../../lib/session')>()
   return {
     ...original,
@@ -21,7 +21,7 @@ vi.mock('../../../lib/session', async (importOriginal) => {
 })
 
 // Mock the oauth module
-vi.mock('../../../lib/oauth', () => ({
+vi.mock('@server/lib/oauth', () => ({
   generateCodeVerifier: vi.fn(() => 'test-code-verifier'),
   generateCodeChallenge: vi.fn(async () => 'test-code-challenge'),
   generateState: vi.fn(() => 'test-state'),
@@ -31,12 +31,12 @@ vi.mock('../../../lib/oauth', () => ({
 }))
 
 // Mock audit module
-vi.mock('../../../lib/audit', () => ({
+vi.mock('@server/lib/audit', () => ({
   logAuthEvent: vi.fn().mockResolvedValue(),
 }))
 
 // Mock auth service
-vi.mock('../../../services/auth', () => ({
+vi.mock('@server/services/auth', () => ({
   authService: {
     findOrCreateUser: vi.fn(),
     refreshAccessToken: vi.fn(),
@@ -44,20 +44,20 @@ vi.mock('../../../services/auth', () => ({
 }))
 
 // Mock invitations service
-vi.mock('../../../services/invitations', () => ({
+vi.mock('@server/services/invitations', () => ({
   invitationsService: {
     getByToken: vi.fn(),
     accept: vi.fn(),
   },
 }))
 
-import { getSession, destroySession } from '../../../lib/session'
-import { authService } from '../../../services/auth'
-import { invitationsService } from '../../../services/invitations'
+import { getSession, destroySession } from '@server/lib/session'
+import { authService } from '@server/services/auth'
+import { invitationsService } from '@server/services/invitations'
 import {
   exchangeCodeForTokens,
   decodeIdToken,
-} from '../../../lib/oauth'
+} from '@server/lib/oauth'
 
 describe('Auth Routes', () => {
   let mockEnv: ReturnType<typeof createMockEnv>