@etus/bhono-app 0.1.5 → 0.1.6

package/templates/base/src/server/types/index.ts

@@ -1,6 +1,5 @@
 import type { Role } from '../auth/roles'
 import type { Env } from '../env'
-import type { Database } from '../db/client'
 
 export interface User {
   id: string
@@ -106,7 +105,7 @@ export interface HonoEnv {
     userRole: Role | null
     isSystemAdminAccess: boolean
     // Set by database middleware (may be undefined before middleware runs or in health checks)
-    db?: Database
+    db?: D1Database
     // Session variables (set by session middleware)
     sessionId?: string
     sessionData?: SessionData

package/templates/base/{src/server/__tests__/fixtures.ts → tests/fixtures/server.ts}

@@ -1,6 +1,6 @@
-// src/server/__tests__/fixtures.ts
-import type { User, Account, SessionData } from '../types'
-import type { Role } from '../auth/roles'
+// tests/fixtures/server.ts
+import type { User, Account, SessionData } from '@server/types'
+import type { Role } from '@server/auth/roles'
 
 /**
  * Counter for generating unique IDs

package/templates/base/{src/client/__tests__/setup-browser.ts → tests/helpers/client-setup-browser.ts}

@@ -1,7 +1,7 @@
-// src/client/__tests__/setup-browser.ts
+// tests/helpers/client-setup-browser.ts
 // Setup file for Vitest Browser Mode (real browser, no mocks needed)
 import "@testing-library/jest-dom/vitest"
-import "../../test/vitest-zod-matcher"
+import "../../src/test/vitest-zod-matcher"
 import { cleanup } from "@testing-library/react"
 import { afterEach, vi } from "vitest"
 

package/templates/base/{src/client/__tests__/setup.ts → tests/helpers/client-setup.ts}

@@ -1,5 +1,5 @@
 import "@testing-library/jest-dom/vitest"
-import "../../test/vitest-zod-matcher"
+import "../../src/test/vitest-zod-matcher"
 import { cleanup } from "@testing-library/react"
 import { afterEach, vi } from "vitest"
 

package/templates/base/{src/client/__tests__/test-utils.tsx → tests/helpers/client-test-utils.tsx}

@@ -6,8 +6,8 @@ import {
   createMemoryHistory,
   createRouter,
 } from "@tanstack/react-router"
-import { routeTree } from "../routeTree.gen"
-import { ThemeProvider } from "../hooks/use-theme"
+import { routeTree } from "@/routeTree.gen"
+import { ThemeProvider } from "@/hooks/use-theme"
 import type { ReactElement, ReactNode } from "react"
 
 // Create a fresh QueryClient for each test

package/templates/base/{src/server/__tests__/setup.ts → tests/helpers/server.ts}

@@ -1,20 +1,20 @@
-// src/server/__tests__/setup.ts
+// tests/helpers/server.ts
 import { vi, beforeEach, afterEach } from 'vitest'
-import type { Env } from '../env'
-import type { SessionData } from '../types'
-import { createMockD1, createMockD1AsD1Database, type MockD1Database } from './mocks/db'
+import type { Env } from '@server/env'
+import type { SessionData } from '@server/types'
+import { createMockD1, createMockD1AsD1Database, type MockD1Database } from '@tests/mocks/db'
 import {
   createMockKV,
   createMockKVAsKVNamespace,
   seedMockKV,
   type MockKVNamespace,
-} from './mocks/kv'
-import { createMockR2, createMockR2AsR2Bucket, type MockR2Bucket } from './mocks/r2'
+} from '@tests/mocks/kv'
+import { createMockR2, createMockR2AsR2Bucket, type MockR2Bucket } from '@tests/mocks/r2'
 
 // Re-export mocks for convenience
-export * from './mocks/db'
-export * from './mocks/kv'
-export * from './mocks/r2'
+export * from '@tests/mocks/db'
+export * from '@tests/mocks/kv'
+export * from '@tests/mocks/r2'
 
 /**
  * Default environment configuration for tests

package/templates/base/tests/integration/accounts/crud.test.ts

@@ -30,19 +30,10 @@ import { errorHandler } from '../../../src/server/middleware/error-handler'
 import { sessionMiddleware } from '../../../src/server/lib/session'
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Accounts CRUD Integration', () => {

package/templates/base/tests/integration/audits/list.test.ts

@@ -22,19 +22,10 @@ import { errorHandler } from '../../../src/server/middleware/error-handler'
 import { sessionMiddleware } from '../../../src/server/lib/session'
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**

package/templates/base/tests/integration/auth/auth-service.test.ts

@@ -15,21 +15,12 @@ import { createUser } from '../fixtures'
 import { authService } from '../../../src/server/services/auth'
 import { generateRefreshToken, hashToken } from '../../../src/server/lib/tokens'
 import type { GoogleUserInfo, AuthEventContext } from '../../../src/server/types/auth'
-import * as schema from '../../../src/server/db/schema'
 
 /**
  * Creates a database wrapper
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  }) as any
+  return getDb()
 }
 
 describe('Auth Service Integration', () => {

package/templates/base/tests/integration/auth/invitation-token.test.ts

@@ -34,19 +34,10 @@ import { sessionMiddleware } from '../../../src/server/lib/session'
 import { errorHandler } from '../../../src/server/middleware/error-handler'
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Invitation Token Authentication Integration', () => {

package/templates/base/tests/integration/auth/logout.test.ts

@@ -24,19 +24,10 @@ import { sessionMiddleware } from '../../../src/server/lib/session'
 import { errorHandler } from '../../../src/server/middleware/error-handler'
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Logout Integration', () => {

package/templates/base/tests/integration/auth/oauth.test.ts

@@ -9,15 +9,13 @@
 
 import { describe, it, expect, beforeAll, vi, beforeEach } from 'vitest'
 import { Hono } from 'hono'
-import { eq } from 'drizzle-orm'
-import { getEnv, getDb, getKV, type TestEnv } from '../setup'
+import { getEnv, getDb, getKV, getSqlite, type TestEnv } from '../setup'
 import { createUser, createUserSession } from '../fixtures'
 import type { HonoEnv } from '../../../src/server/types'
 import { auth } from '../../../src/server/routes/auth'
 import { sessionMiddleware } from '../../../src/server/lib/session'
 import { errorHandler } from '../../../src/server/middleware/error-handler'
 import { createAccount, addUserToAccount } from '../fixtures'
-import { users } from '../../../src/server/db/schema'
 
 // Mock ID token for testing (base64url encoded)
 function createMockIdToken(payload: Record<string, unknown>): string {
@@ -32,15 +30,7 @@ function createMockIdToken(payload: Record<string, unknown>): string {
  * Creates a database wrapper that adds the `execute` method
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('OAuth Authentication Integration', () => {
@@ -353,16 +343,14 @@ describe('OAuth Authentication Integration', () => {
       expect(res.status).toBe(302)
 
       // Verify user was updated in database
-      const db = createTestDb()
-      const result = await (db as any)
-        .select()
-        .from(users)
-        .where(eq(users.id, existingUser.id))
-        .limit(1)
+      const sqlite = getSqlite()
+      const result = sqlite.prepare(
+        'SELECT name, email, avatar_url as avatarUrl FROM users WHERE id = ?'
+      ).get(existingUser.id) as { name: string; email: string; avatarUrl: string } | undefined
 
-      expect(result[0].name).toBe('New Updated Name')
-      expect(result[0].email).toBe('newemail@gmail.com')
-      expect(result[0].avatarUrl).toBe('https://new-avatar.jpg')
+      expect(result?.name).toBe('New Updated Name')
+      expect(result?.email).toBe('newemail@gmail.com')
+      expect(result?.avatarUrl).toBe('https://new-avatar.jpg')
 
       globalThis.fetch = originalFetch
     })
@@ -374,18 +362,16 @@ describe('OAuth Authentication Integration', () => {
       await addUserToAccount(inviter.id, account.id, 'ADMIN')
 
       // Create an invitation in the database
-      const db = createTestDb()
+      const sqlite = getSqlite()
       const invitationId = crypto.randomUUID()
       const invitationToken = crypto.randomUUID()
       const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()
       const inviteeEmail = `pending-invitee-${crypto.randomUUID().slice(0, 8)}@gmail.com`
 
-      ;(db as any).run(
-        require('drizzle-orm').sql`
-          INSERT INTO invitations (id, account_id, email, role, token, invited_by_id, expires_at)
-          VALUES (${invitationId}, ${account.id}, ${inviteeEmail}, ${'EDITOR'}, ${invitationToken}, ${inviter.id}, ${expiresAt})
-        `
-      )
+      sqlite.prepare(
+        `INSERT INTO invitations (id, account_id, email, role, token, invited_by_id, expires_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?)`
+      ).run(invitationId, account.id, inviteeEmail, 'EDITOR', invitationToken, inviter.id, expiresAt)
 
       // Mock Google OAuth response
       const mockIdToken = createMockIdToken({
@@ -433,14 +419,11 @@ describe('OAuth Authentication Integration', () => {
       expect(location).toContain('/dashboard')
 
       // Verify the invitation was accepted (accepted_at should be set)
-      const { invitations } = await import('../../../src/server/db/schema')
-      const invitationResult = await (db as any)
-        .select()
-        .from(invitations)
-        .where(eq(invitations.id, invitationId))
-        .limit(1)
+      const invitationResult = sqlite.prepare(
+        'SELECT accepted_at as acceptedAt FROM invitations WHERE id = ?'
+      ).get(invitationId) as { acceptedAt: string | null } | undefined
 
-      expect(invitationResult[0].acceptedAt).not.toBeNull()
+      expect(invitationResult?.acceptedAt).not.toBeNull()
 
       globalThis.fetch = originalFetch
     })
@@ -567,17 +550,15 @@ describe('OAuth Authentication Integration', () => {
       await addUserToAccount(inviter.id, account.id, 'ADMIN')
 
       // Create invitation directly in the database
-      const db = createTestDb()
+      const sqlite = getSqlite()
       const invitationId = crypto.randomUUID()
       const token = crypto.randomUUID()
       const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()
 
-      ;(db as any).run(
-        require('drizzle-orm').sql`
-          INSERT INTO invitations (id, account_id, email, role, token, invited_by_id, expires_at)
-          VALUES (${invitationId}, ${account.id}, ${'invitee@example.com'}, ${'EDITOR'}, ${token}, ${inviter.id}, ${expiresAt})
-        `
-      )
+      sqlite.prepare(
+        `INSERT INTO invitations (id, account_id, email, role, token, invited_by_id, expires_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?)`
+      ).run(invitationId, account.id, 'invitee@example.com', 'EDITOR', token, inviter.id, expiresAt)
 
       const res = await app.request(`/auth/invite/${token}`, {
         method: 'GET',

package/templates/base/tests/integration/auth/refresh-token.test.ts

@@ -22,15 +22,7 @@ import { hashToken, generateRefreshToken, getRefreshTokenExpiry } from '../../..
  * Creates a database wrapper
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Refresh Token Integration', () => {

package/templates/base/tests/integration/auth/session-expiry.test.ts

@@ -23,15 +23,7 @@ import { hashToken, generateRefreshToken } from '../../../src/server/lib/tokens'
 // ============================================================================
 
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Session Expiry Integration Tests', () => {

package/templates/base/tests/integration/auth/session.test.ts

@@ -24,19 +24,10 @@ import { sessionMiddleware } from '../../../src/server/lib/session'
 import { errorHandler } from '../../../src/server/middleware/error-handler'
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Session Authentication Integration', () => {

package/templates/base/tests/integration/auth/super-admin.test.ts

@@ -30,15 +30,7 @@ import { isSuperAdminEmail } from '../../../src/server/env'
 // ============================================================================
 
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Super Admin Integration Tests', () => {

package/templates/base/tests/integration/authorization/analytics-role.test.ts

@@ -38,19 +38,10 @@ import { hasMinimumRole, isHierarchicalRole, ROLE_HIERARCHY } from '../../../src
 // ============================================================================
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**

package/templates/base/tests/integration/authorization/billing-role.test.ts

@@ -38,19 +38,10 @@ import { hasMinimumRole, isHierarchicalRole, ROLE_HIERARCHY } from '../../../src
 // ============================================================================
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**

package/templates/base/tests/integration/authorization/guards-roles.test.ts

@@ -40,15 +40,7 @@ import {
  * Creates a database wrapper
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Role Utility Functions', () => {

package/templates/base/tests/integration/authorization/multi-tenancy.test.ts

@@ -35,19 +35,10 @@ import { sessionMiddleware } from '../../../src/server/lib/session'
 // ============================================================================
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**

package/templates/base/tests/integration/authorization/roles.test.ts

@@ -49,19 +49,10 @@ import { sessionMiddleware } from '../../../src/server/lib/session'
 // ============================================================================
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**

package/templates/base/tests/integration/config/production-behavior.test.ts

@@ -22,19 +22,10 @@ import { secureHeaders } from 'hono/secure-headers'
 import { uuidv7 } from 'uuidv7'
 
 /**
- * Creates a database wrapper that adds the `execute` method
- * The better-sqlite3 drizzle doesn't have execute, but D1 does
+ * Creates a D1-compatible database instance for tests
  */
 function createTestDb() {
-  const db = getDb()
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**