@etus/bhono-app 0.1.5 → 0.1.7

package/templates/base/{src/client/components/ui/__tests__ → tests/unit/client/components/ui}/sonner.test.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest"
-import { render, screen } from "../../../__tests__/test-utils"
+import { render, screen } from "@tests/helpers/client-test-utils"
 import { Toaster } from "../sonner"
 
 describe("Toaster", () => {

package/templates/base/{src/client/components/ui/__tests__ → tests/unit/client/components/ui}/tabs.test.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from "vitest"
-import { render, screen } from "../../../__tests__/test-utils"
+import { render, screen } from "@tests/helpers/client-test-utils"
 import userEvent from "@testing-library/user-event"
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "../tabs"
 

package/templates/base/{src/client/routes/_authenticated/__tests__ → tests/unit/client/routes/_authenticated}/account.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor, fireEvent } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../../../__tests__/test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/routes/_authenticated/__tests__ → tests/unit/client/routes/_authenticated}/integrations.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../../../__tests__/test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/routes/_authenticated/__tests__ → tests/unit/client/routes/_authenticated}/settings.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../../../__tests__/test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/routes/_authenticated/__tests__ → tests/unit/client/routes/_authenticated}/team.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../../../__tests__/test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/__tests__ → tests/unit/client}/routes/authenticated-layout.test.tsx

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { screen, waitFor, act } from '@testing-library/react'
-import { renderRoute } from '../test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/__tests__ → tests/unit/client}/routes/dashboard.test.tsx

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
-import { renderRoute } from '../test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/routes/__tests__ → tests/unit/client/routes}/invite.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../../__tests__/test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 describe('Invite Token Page', () => {
   beforeEach(() => {

package/templates/base/{src/client/__tests__ → tests/unit/client}/routes/login.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 describe('Login Page', () => {
   beforeEach(() => {

package/templates/base/{src/client/__tests__ → tests/unit/client}/routes/navigation.test.tsx

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { renderRoute } from '../test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 // Mock user for authenticated tests
 const mockUser = {

package/templates/base/{src/client/__tests__ → tests/unit/client}/routes/root-layout.test.tsx

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { screen, waitFor } from '@testing-library/react'
-import { renderRoute } from '../test-utils'
+import { renderRoute } from '@tests/helpers/client-test-utils'
 
 describe('Root Layout', () => {
   beforeEach(() => {

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

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import { Hono } from 'hono'
-import { requireRole, requirePermission } from '../guards'
-import type { HonoEnv } from '../../types'
+import { requireRole, requirePermission } from '@server/auth/guards'
+import type { HonoEnv } from '@server/types'
 
 describe('guards', () => {
   describe('requireRole', () => {

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

@@ -1,6 +1,6 @@
 // src/auth/permissions.test.ts
 import { describe, it, expect } from 'vitest'
-import { Permission, hasPermission, hasAnyPermission, hasAllPermissions } from './permissions'
+import { Permission, hasPermission, hasAnyPermission, hasAllPermissions } from '@server/auth/permissions'
 
 describe('permissions', () => {
   describe('hasPermission', () => {

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

@@ -9,7 +9,7 @@ import {
   getAllRoles,
   compareRoles,
   isRoleHigherThan,
-} from './roles'
+} from '@server/auth/roles'
 
 describe('roles', () => {
   describe('hasMinimumRole', () => {

package/templates/base/tests/unit/server/db/sql.test.ts

@@ -0,0 +1,68 @@
+import { describe, it, expect } from 'vitest'
+import { createMockEnv, setMockQueryResult } from '@tests/helpers/server'
+import { queryAll, queryOne, queryValue, execute } from '@server/db/sql'
+
+describe('sql helper', () => {
+  it('returns all rows with optional mapper', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+
+    setMockQueryResult(mockDb, [1], [
+      { id: '1', name: 'Alice' },
+      { id: '2', name: 'Bob' },
+    ])
+
+    const rows = await queryAll(env.DB, 'SELECT id, name FROM users WHERE id = ?', [1])
+    expect(rows).toEqual([
+      { id: '1', name: 'Alice' },
+      { id: '2', name: 'Bob' },
+    ])
+
+    const mapped = await queryAll(env.DB, 'SELECT id FROM users WHERE id = ?', [1], (row) => ({
+      id: String(row.id),
+    }))
+    expect(mapped).toEqual([{ id: '1' }, { id: '2' }])
+  })
+
+  it('returns one row or null', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+
+    setMockQueryResult(mockDb, [], [{ ok: 1 }])
+
+    const row = await queryOne(env.DB, 'SELECT 1 AS ok')
+    expect(row).toEqual({ ok: 1 })
+
+    const empty = await queryOne(env.DB, 'SELECT 1 AS ok', [999])
+    expect(empty).toBeNull()
+  })
+
+  it('returns a single value', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+
+    setMockQueryResult(mockDb, [], [{ count: 42 }])
+
+    const value = await queryValue<number>(env.DB, 'SELECT count(*) AS count FROM users')
+    expect(value).toBe(42)
+  })
+
+  it('normalizes params (boolean/date/undefined)', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+    const date = new Date('2025-01-01T00:00:00.000Z')
+
+    setMockQueryResult(mockDb, [1, date.toISOString(), null], [{ ok: 1 }])
+
+    const row = await queryOne(env.DB, 'SELECT 1 AS ok WHERE a = ? AND b = ? AND c IS ?', [true, date, undefined])
+    expect(row).toEqual({ ok: 1 })
+  })
+
+  it('executes statements and returns meta', async () => {
+    const env = createMockEnv()
+
+    const result = await execute(env.DB, 'UPDATE users SET name = ? WHERE id = ?', ['Alice', '1'])
+    expect(result).toHaveProperty('meta')
+    expect(result.meta.changes).toBe(1)
+  })
+})

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

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { getEnv, type Env } from './env'
+import { getEnv, type Env } from '@server/env'
 
 // Note: The old process.env-based tests were removed as the env module
 // now uses Cloudflare Workers bindings (passed to getEnv function)

package/templates/base/tests/unit/server/lib/audited-db.test.ts

@@ -0,0 +1,78 @@
+// src/server/lib/audited-db.test.ts
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { auditedInsert, auditedUpdate, auditedDelete } from '@server/lib/audited-db'
+import type { ServiceContext } from '@server/types'
+import { createMockEnv, setMockQueryResult } from '@tests/helpers/server'
+
+const mockCtx: ServiceContext = {
+  accountId: 'account-123',
+  user: {
+    id: 'user-123',
+    email: 'test@example.com',
+    name: 'Test User',
+    status: 'active',
+    providerIds: [],
+    isSuperAdmin: false,
+    createdAt: '2024-01-01',
+    updatedAt: '2024-01-01',
+    deletedAt: null,
+  },
+  transactionId: 'tx-123',
+  ip: '127.0.0.1',
+  userAgent: 'test-agent',
+}
+
+describe('audited-db (sql)', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('auditedInsert inserts and returns rows with SQL', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+
+    setMockQueryResult(mockDb, ['user-1', 'Alice'], [{ id: 'user-1', name: 'Alice' }])
+
+    const result = await auditedInsert(env.DB, mockCtx, 'users', { id: 'user-1', name: 'Alice' })
+
+    expect(result).toEqual([{ id: 'user-1', name: 'Alice' }])
+  })
+
+  it('auditedUpdate updates and returns rows with SQL', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+
+    setMockQueryResult(mockDb, ['user-1'], [{ id: 'user-1', name: 'Old' }])
+    setMockQueryResult(mockDb, ['Updated', 'user-1'], [{ id: 'user-1', name: 'Updated' }])
+
+    const result = await auditedUpdate(
+      env.DB,
+      mockCtx,
+      'users',
+      { name: 'Updated' },
+      { clause: 'id = ?', params: ['user-1'] }
+    )
+
+    expect(result).toEqual([{ id: 'user-1', name: 'Updated' }])
+  })
+
+  it('auditedDelete soft deletes and logs with SQL', async () => {
+    const env = createMockEnv()
+    const mockDb = env.DB._mock
+    const fixedNow = '2025-01-01T00:00:00.000Z'
+
+    setMockQueryResult(
+      mockDb,
+      [fixedNow, mockCtx.user.id, fixedNow, mockCtx.user.id, 'user-1'],
+      [{ id: 'user-1', name: 'Alice' }]
+    )
+
+    await auditedDelete(
+      env.DB,
+      mockCtx,
+      'users',
+      { clause: 'id = ?', params: ['user-1'] },
+      { now: () => fixedNow }
+    )
+  })
+})

package/templates/base/{src → tests/unit}/server/lib/email.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { sendInvitationEmail } from './email'
+import { sendInvitationEmail } from '@server/lib/email'
 
 const mockFetch = vi.fn()
 vi.stubGlobal('fetch', mockFetch)

package/templates/base/{src → tests/unit}/server/lib/errors.test.ts

@@ -7,7 +7,7 @@ import {
   ConflictError,
   InternalError,
   getErrorCode,
-} from './errors'
+} from '@server/lib/errors'
 
 describe('Error Classes', () => {
   describe('getErrorCode', () => {

package/templates/base/{src → tests/unit}/server/lib/oauth.test.ts

@@ -7,7 +7,7 @@ import {
   exchangeCodeForTokens,
   getGoogleUserInfo,
   decodeIdToken,
-} from './oauth'
+} from '@server/lib/oauth'
 
 // Mock fetch globally
 const mockFetch = vi.fn()

package/templates/base/{src → tests/unit}/server/lib/pagination.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { createPaginationMeta, PaginationQuerySchema } from './pagination'
+import { createPaginationMeta, PaginationQuerySchema } from '@server/lib/pagination'
 
 describe('pagination', () => {
   describe('createPaginationMeta', () => {

package/templates/base/{src → tests/unit}/server/lib/password.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
-import { generateStrongPassword, isStrongPassword } from './password'
+import { generateStrongPassword, isStrongPassword } from '@server/lib/password'
 
 // Store original crypto.getRandomValues
 const originalGetRandomValues = crypto.getRandomValues.bind(crypto)

package/templates/base/{src → tests/unit}/server/lib/providers.test.ts

@@ -6,7 +6,7 @@ import {
   addProvider,
   removeProvider,
   parseProviderId,
-} from './providers'
+} from '@server/lib/providers'
 
 describe('providers', () => {
   describe('SUPPORTED_PROVIDERS', () => {

package/templates/base/{src → tests/unit}/server/lib/r2-storage.test.ts

@@ -6,8 +6,8 @@ import {
   deleteFile,
   getFileMetadata,
   listFiles,
-} from './r2-storage'
-import { createMockR2, type MockR2Bucket } from '../__tests__/mocks/r2'
+} from '@server/lib/r2-storage'
+import { createMockR2, type MockR2Bucket } from '@tests/mocks/r2'
 
 describe('r2-storage', () => {
   let mockR2: MockR2Bucket

package/templates/base/{src → tests/unit}/server/lib/session.test.ts

@@ -7,8 +7,8 @@ import {
   isAuthenticated,
   sessionMiddleware,
   type SessionData,
-} from './session'
-import { createMockKV, type MockKVNamespace } from '../__tests__/mocks/kv'
+} from '@server/lib/session'
+import { createMockKV, type MockKVNamespace } from '@tests/mocks/kv'
 
 /**
  * Create a mock Hono context for testing session functions

package/templates/base/{src → tests/unit}/server/lib/tokens.test.ts

@@ -7,7 +7,7 @@ import {
   getRefreshTokenExpiry,
   setCookieOptions,
   setOAuthStateCookieOptions,
-} from './tokens'
+} from '@server/lib/tokens'
 
 const mockEnv = {
   JWT_SECRET: 'test-secret-key',

package/templates/base/{src → tests/unit}/server/lib/transaction.test.ts

@@ -1,25 +1,19 @@
 import { describe, it, expect, vi } from 'vitest'
-import { withTransaction } from './transaction'
+import { withTransaction } from '@server/lib/transaction'
 
 describe('withTransaction', () => {
   it('returns result from successful callback', async () => {
-    const mockTx = { insert: vi.fn(), update: vi.fn() }
-    const mockDb = {
-      transaction: vi.fn(async (cb) => cb(mockTx)),
-    }
+    const mockDb = { prepare: vi.fn() }
 
     const result = await withTransaction(mockDb as any, async (tx) => {
       return { id: '123', name: 'Test' }
     })
 
     expect(result).toEqual({ id: '123', name: 'Test' })
-    expect(mockDb.transaction).toHaveBeenCalledTimes(1)
   })
 
   it('propagates errors from callback', async () => {
-    const mockDb = {
-      transaction: vi.fn(async (cb) => cb({})),
-    }
+    const mockDb = { prepare: vi.fn() }
 
     await expect(
       withTransaction(mockDb as any, async () => {
@@ -29,10 +23,7 @@ describe('withTransaction', () => {
   })
 
   it('passes transaction to callback', async () => {
-    const mockTx = { insert: vi.fn(), update: vi.fn() }
-    const mockDb = {
-      transaction: vi.fn(async (cb) => cb(mockTx)),
-    }
+    const mockDb = { prepare: vi.fn() }
 
     let receivedTx: any
     await withTransaction(mockDb as any, async (tx) => {
@@ -40,6 +31,6 @@ describe('withTransaction', () => {
       return null
     })
 
-    expect(receivedTx).toBe(mockTx)
+    expect(receivedTx).toBe(mockDb)
   })
 })

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' },