@etus/bhono-app 0.1.5 → 0.1.7

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

@@ -28,19 +28,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('Invitations CRUD Integration', () => {

package/templates/base/tests/integration/invitations/email.test.ts

@@ -28,15 +28,7 @@ import { sendInvitationEmail } from '../../../src/server/lib/email'
 // ============================================================================
 
 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 Email Integration Tests', () => {

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

@@ -20,19 +20,10 @@ import {
 } from '../setup'
 
 /**
- * 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 as any).run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('Auth Middleware', () => {
@@ -57,7 +48,7 @@ describe('Auth Middleware', () => {
       const env = getEnv()
       ;(c as any).env = env
 
-      // Set up the db for middleware (use the test drizzle instance with proxy)
+      // Set up the db for middleware
       const db = createTestDb()
       c.set('db', db)
 

package/templates/base/tests/integration/middleware/request-logger.test.ts

@@ -21,15 +21,7 @@ import { errorHandler } from '../../../src/server/middleware/error-handler'
  * 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('Request Logger Middleware Integration', () => {

package/templates/base/tests/integration/performance/response-times.test.ts

@@ -36,15 +36,7 @@ const THRESHOLDS = {
  * 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 unknown as Record<string | symbol, unknown>)[prop]
-    },
-  })
+  return getDb()
 }
 
 /**

package/templates/base/tests/integration/security/cookie-security.test.ts

@@ -27,19 +27,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('Session Cookie Security', () => {

package/templates/base/tests/integration/security/csrf-protection.test.ts

@@ -24,19 +24,10 @@ import { configurableCors } from '../../../src/server/middleware/cors'
 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('CSRF Protection', () => {

package/templates/base/tests/integration/security/log-sanitization.test.ts

@@ -30,15 +30,7 @@ import { sessionMiddleware } from '../../../src/server/lib/session'
  * 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('Log Sanitization', () => {

package/templates/base/tests/integration/security/rate-limiting.test.ts

@@ -31,15 +31,7 @@ import {
  * 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('Rate Limiting', () => {

package/templates/base/tests/integration/security/sql-injection.test.ts

@@ -2,18 +2,18 @@
  * SQL Injection Prevention Integration Tests
  *
  * Tests that the API properly prevents SQL injection attacks through:
- * - Parameterized queries via Drizzle ORM
+ * - Parameterized queries via SQL helpers
  * - Zod UUID validation for ID parameters
  * - Safe handling of user input in search queries
  *
- * Since the codebase uses Drizzle ORM with parameterized queries,
- * these tests should PASS - demonstrating that SQL injection protection
- * is already in place by default.
+ * Since the codebase uses parameterized SQL queries,
+ * these tests should PASS - demonstrating SQL injection protection
+ * is in place by default.
  */
 
 import { describe, it, expect, beforeAll } from 'vitest'
 import { Hono } from 'hono'
-import { getEnv, getSqlite, type TestEnv } from '../setup'
+import { getEnv, getDb, getSqlite, type TestEnv } from '../setup'
 import { createTestScenario } from '../fixtures'
 import type { HonoEnv } from '../../../src/server/types'
 import { api } from '../../../src/server/routes'
@@ -21,21 +21,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 sqlite = getSqlite()
-  const { drizzle } = require('drizzle-orm/better-sqlite3')
-  const db = drizzle(sqlite)
-  return new Proxy(db, {
-    get(target, prop) {
-      if (prop === 'execute') {
-        return target.run.bind(target)
-      }
-      return (target as any)[prop]
-    },
-  })
+  return getDb()
 }
 
 describe('SQL Injection Prevention', () => {

package/templates/base/tests/integration/security/xss-prevention.test.ts

@@ -23,19 +23,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('XSS Prevention', () => {

package/templates/base/tests/integration/setup.ts

@@ -10,12 +10,13 @@
  */
 
 import Database from 'better-sqlite3'
-import { drizzle } from 'drizzle-orm/better-sqlite3'
+import { readFileSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { vi, beforeAll, afterAll, beforeEach, afterEach } from 'vitest'
 import { Hono } from 'hono'
 import type { Env } from '../../src/server/env'
 import type { SessionData, HonoEnv } from '../../src/server/types'
-import * as schema from '../../src/server/db/schema'
 
 // ============================================================================
 // TYPES
@@ -50,90 +51,15 @@ export interface MockR2Store {
 // DATABASE SCHEMA SQL
 // ============================================================================
 
-const SCHEMA_SQL = `
--- Users table
-CREATE TABLE IF NOT EXISTS users (
-  id TEXT PRIMARY KEY,
-  google_id TEXT NOT NULL UNIQUE,
-  email TEXT NOT NULL,
-  name TEXT NOT NULL,
-  avatar_url TEXT,
-  status TEXT DEFAULT 'active' NOT NULL CHECK (status IN ('active', 'inactive')),
-  provider_ids TEXT DEFAULT '[]',
-  is_super_admin INTEGER DEFAULT 0 NOT NULL,
-  created_at TEXT DEFAULT (datetime('now')) NOT NULL,
-  updated_at TEXT DEFAULT (datetime('now')) NOT NULL,
-  deleted_at TEXT,
-  created_by_id TEXT REFERENCES users(id),
-  updated_by_id TEXT REFERENCES users(id),
-  deleted_by_id TEXT REFERENCES users(id)
-);
-
--- Accounts table
-CREATE TABLE IF NOT EXISTS accounts (
-  id TEXT PRIMARY KEY,
-  name TEXT NOT NULL,
-  description TEXT,
-  domain TEXT UNIQUE,
-  created_at TEXT DEFAULT (datetime('now')) NOT NULL,
-  updated_at TEXT DEFAULT (datetime('now')) NOT NULL,
-  deleted_at TEXT
-);
-
--- User-Accounts junction table
-CREATE TABLE IF NOT EXISTS user_accounts (
-  user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-  account_id TEXT NOT NULL REFERENCES accounts(id) ON DELETE CASCADE,
-  role TEXT NOT NULL CHECK (role IN ('ADMIN', 'MANAGER', 'EDITOR', 'AUTHOR', 'VIEWER', 'BILLING', 'ANALYTICS')),
-  PRIMARY KEY (user_id, account_id)
-);
-
--- Refresh tokens table
-CREATE TABLE IF NOT EXISTS refresh_tokens (
-  id TEXT PRIMARY KEY,
-  user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-  token_hash TEXT NOT NULL,
-  expires_at INTEGER NOT NULL,
-  created_at INTEGER DEFAULT (unixepoch()) NOT NULL,
-  revoked_at INTEGER
-);
-
--- Invitations table
-CREATE TABLE IF NOT EXISTS invitations (
-  id TEXT PRIMARY KEY,
-  account_id TEXT NOT NULL REFERENCES accounts(id) ON DELETE CASCADE,
-  email TEXT NOT NULL,
-  role TEXT NOT NULL CHECK (role IN ('ADMIN', 'MANAGER', 'EDITOR', 'AUTHOR', 'VIEWER', 'BILLING', 'ANALYTICS')),
-  token TEXT NOT NULL UNIQUE,
-  invited_by_id TEXT NOT NULL REFERENCES users(id),
-  expires_at TEXT NOT NULL,
-  accepted_at TEXT,
-  created_at TEXT DEFAULT (datetime('now')) NOT NULL
-);
-CREATE UNIQUE INDEX IF NOT EXISTS account_email_idx ON invitations(account_id, email);
-
--- Audit logs table
-CREATE TABLE IF NOT EXISTS audit_logs (
-  id TEXT PRIMARY KEY,
-  transaction_id TEXT NOT NULL,
-  account_id TEXT REFERENCES accounts(id),
-  user_id TEXT REFERENCES users(id),
-  entity TEXT NOT NULL,
-  entity_id TEXT NOT NULL,
-  action TEXT NOT NULL CHECK (action IN ('INSERT', 'UPDATE', 'DELETE', 'LOGIN', 'LOGOUT', 'SIGNUP', 'TOKEN_REFRESH', 'LOGIN_FAILED')),
-  changes TEXT,
-  ip_address TEXT,
-  user_agent TEXT,
-  timestamp TEXT DEFAULT (datetime('now')) NOT NULL
-);
-`
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+const SCHEMA_SQL = readFileSync(resolve(__dirname, '..', '..', 'schema.sql'), 'utf8')
 
 // ============================================================================
 // GLOBAL STATE
 // ============================================================================
 
 let sqliteDb: Database.Database | null = null
-let drizzleDb: ReturnType<typeof drizzle> | null = null
 let mockKV: MockKVStore | null = null
 let mockR2: MockR2Store | null = null
 let testEnv: TestEnv | null = null
@@ -144,8 +70,8 @@ let testEnv: TestEnv | null = null
 
 /**
  * Creates a D1-compatible wrapper around better-sqlite3
- * This allows Drizzle ORM to work with our in-memory SQLite database
- * as if it were a Cloudflare D1 database.
+ * This allows our test helpers to use a Cloudflare D1-like API
+ * against an in-memory SQLite database.
  */
 function createD1CompatibleWrapper(db: Database.Database): D1Database {
   return {
@@ -582,13 +508,14 @@ export function getEnv(): TestEnv {
 }
 
 /**
- * Get the Drizzle database instance
+ * Get the D1-compatible database instance
  */
-export function getDb(): ReturnType<typeof drizzle> {
-  if (!drizzleDb) {
+export function getDb(): D1Database {
+  const env = getEnv()
+  if (!env.DB) {
     throw new Error('Database not initialized. Make sure beforeAll has run.')
   }
-  return drizzleDb
+  return env.DB
 }
 
 /**
@@ -764,9 +691,6 @@ beforeAll(() => {
   // Create D1-compatible wrapper
   const d1Wrapper = createD1CompatibleWrapper(sqliteDb)
 
-  // Create Drizzle instance
-  drizzleDb = drizzle(sqliteDb, { schema })
-
   // Create mock stores
   mockKV = createMockKV()
   mockR2 = createMockR2()
@@ -797,7 +721,6 @@ afterAll(() => {
     sqliteDb = null
   }
 
-  drizzleDb = null
   mockKV = null
   mockR2 = null
   testEnv = null

package/templates/base/tests/integration/smoke.test.ts

@@ -55,10 +55,11 @@ describe('Integration Test Infrastructure', () => {
     })
   })
 
-  describe('Drizzle ORM', () => {
-    it('should have initialized Drizzle database instance', () => {
+  describe('D1 Database', () => {
+    it('should have initialized D1 database instance', () => {
       const db = getDb()
       expect(db).toBeDefined()
+      expect(typeof db.prepare).toBe('function')
     })
   })
 

package/templates/base/tests/integration/storage/upload.test.ts

@@ -34,19 +34,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/storage/validation.test.ts

@@ -31,19 +31,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/users/crud.test.ts

@@ -26,19 +26,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('Users CRUD Integration', () => {

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

@@ -29,19 +29,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('Users List Integration', () => {

package/templates/base/tests/integration/vitest.config.ts

@@ -10,6 +10,7 @@ export default defineConfig({
     alias: {
       '@server': `${projectRoot}/src/server`,
       '@shared': `${projectRoot}/src/shared`,
+      '@tests': `${projectRoot}/tests`,
     },
   },
   test: {
@@ -49,17 +50,10 @@ export default defineConfig({
         // Database setup (not business logic)
         'src/server/db/client.ts',
         'src/server/db/seed.ts',
+        'src/server/db/records.ts',
         // Barrel exports (just re-exports, no logic)
-        'src/server/db/schema/index.ts',
         'src/server/services/index.ts',
         'src/server/middleware/index.ts',
-        // Drizzle schema definitions (table structures, not business logic)
-        'src/server/db/schema/users.ts',
-        'src/server/db/schema/accounts.ts',
-        'src/server/db/schema/user-accounts.ts',
-        'src/server/db/schema/audit-logs.ts',
-        'src/server/db/schema/refresh-tokens.ts',
-        'src/server/db/schema/invitations.ts',
         // API documentation (not testable)
         'src/server/routes/api.ts',
         // Dev-only endpoint (tested via E2E)
@@ -67,7 +61,6 @@ export default defineConfig({
         // Hard to test in isolation (require external services/mocking)
         'src/server/lib/providers.ts',
         'src/server/lib/transaction.ts',
-        'src/server/lib/schema-helpers.ts',
       ],
       thresholds: {
         statements: 90,

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

@@ -1,4 +1,4 @@
-// src/server/__tests__/mocks/db.ts
+// tests/mocks/db.ts
 import { vi } from 'vitest'
 
 /**

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

@@ -1,4 +1,4 @@
-// src/server/__tests__/mocks/index.ts
+// tests/mocks/index.ts
 
 // D1 Database mock
 export {

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

@@ -1,4 +1,4 @@
-// src/server/__tests__/mocks/kv.ts
+// tests/mocks/kv.ts
 import { vi } from 'vitest'
 
 /**

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

@@ -1,4 +1,4 @@
-// src/server/__tests__/mocks/r2.ts
+// tests/mocks/r2.ts
 import { vi } from 'vitest'
 
 /**

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

@@ -1,6 +1,6 @@
 import type { Mock } from "vitest";
 import { describe, it, expect, vi, beforeEach } 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 { Sidebar } from "../sidebar"
 

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from "vitest"
-import { render, screen, fireEvent, waitFor } from "../../../__tests__/test-utils"
+import { render, screen, fireEvent, waitFor } from "@tests/helpers/client-test-utils"
 import { createRef } from "react"
 import { Avatar, AvatarImage, AvatarFallback } from "../avatar"
 

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from "vitest"
-import { render, screen } from "./test-utils"
+import { render, screen } from "@tests/helpers/client-test-utils"
 import userEvent from "@testing-library/user-event"
 import { Button } from "@/components/ui/button"
 

package/templates/base/{src/client/components/ui/__tests__ → tests/unit/client/components/ui}/card.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 { createRef } from "react"
 import {
   Card,

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

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

package/templates/base/{src/client/components/ui/__tests__ → tests/unit/client/components/ui}/input.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 { createRef } from "react"
 import { Input } from "../input"

package/templates/base/{src/client/components/ui/__tests__ → tests/unit/client/components/ui}/loading-skeleton.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 {
   DashboardSkeleton,
   TeamSkeleton,

package/templates/base/{src/client/components/ui/__tests__ → tests/unit/client/components/ui}/skeleton.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 { createRef } from "react"
 import { Skeleton } from "../skeleton"