create-fullstack-scaffold 0.5.7 → 0.6.0

package/template/src/tenant/stores/tenantStore.ts

@@ -6,32 +6,44 @@ import type {
   CreateTodoInput,
   UpdateTodoInput,
   Topic,
+  TenantMember,
+  TenantRole,
 } from '@shared/schemas'
+import { api, setToken, setSlug, getToken } from '../services/tenantApi'
 
 interface TenantState {
   isAuthenticated: boolean
   currentTenant: Tenant | null
   loading: boolean
-  users: unknown[]
+  users: TenantMember[]
+  roles: TenantRole[]
   todos: Todo[]
   topics: Topic[]
   stats: TenantStats
-  subscription: unknown
+  subscription: TenantSubscription | null
 
+  login: (
+    account: string,
+    password: string
+  ) => Promise<{ ok: boolean; hasTenant: boolean; error?: string }>
+  /** 有 token 无租户上下文时（如邀请接受后）从 /tenants/mine 恢复 */
+  restoreFromToken: () => Promise<void>
+  logout: () => void
   setCurrentTenant: (tenant: Tenant | null) => void
   fetchCurrentTenant: (slug: string) => Promise<void>
   fetchUsers: () => Promise<void>
-  createUser: (data: unknown) => Promise<boolean>
-  updateUser: (userId: number, data: unknown) => Promise<boolean>
-  deleteUser: (userId: number) => Promise<boolean>
+  inviteUser: (email: string, roleId: string) => Promise<boolean>
+  updateUser: (userId: string, data: { roleId: string }) => Promise<boolean>
+  deleteUser: (userId: string) => Promise<boolean>
+  fetchRoles: () => Promise<void>
   fetchTodos: () => Promise<void>
   createTodo: (data: CreateTodoInput) => Promise<boolean>
   updateTodo: (todoId: number, data: UpdateTodoInput) => Promise<boolean>
   deleteTodo: (todoId: number) => Promise<boolean>
   fetchTopics: () => Promise<void>
   createTopic: (data: unknown) => Promise<boolean>
-  updateTopic: (topicId: number, data: unknown) => Promise<boolean>
-  deleteTopic: (topicId: number) => Promise<boolean>
+  updateTopic: (topicId: string | number, data: unknown) => Promise<boolean>
+  deleteTopic: (topicId: string | number) => Promise<boolean>
   fetchSubscription: () => Promise<void>
   updateTenant: (tenantId: number, data: UpdateTenantInput) => Promise<boolean>
   fetchStats: () => Promise<void>
@@ -47,11 +59,19 @@ interface TenantStats {
   monthlyRevenue: number
 }
 
-export const useTenantStore = create<TenantState>(set => ({
-  isAuthenticated: !!localStorage.getItem('tenant-token'),
+/** 订阅信息由租户 plan/maxUsers 派生（P4 在服务端执行配额） */
+interface TenantSubscription {
+  plan: string
+  maxUsers: number
+  currentUsers: number
+}
+
+export const useTenantStore = create<TenantState>((set, getState) => ({
+  isAuthenticated: !!getToken(),
   currentTenant: null,
   loading: false,
   users: [],
+  roles: [],
   todos: [],
   topics: [],
   stats: {
@@ -62,82 +82,185 @@ export const useTenantStore = create<TenantState>(set => ({
   },
   subscription: null,
 
-  setCurrentTenant: tenant => set({ currentTenant: tenant }),
+  // 登录 = 平台认证 + mine 选定租户（取第一个成员租户）
+  login: async (account, password) => {
+    set({ loading: true })
+    try {
+      const loginRes = await api<{ token: string }>('/auth/login', {
+        method: 'POST',
+        body: { account, password },
+      })
+      if (!loginRes.success || !loginRes.data?.token) {
+        return { ok: false, hasTenant: false, error: 'Invalid credentials' }
+      }
+      setToken(loginRes.data.token)
 
-  setLoading: loading => set({ loading }),
+      const mineRes = await api<Tenant[]>('/tenants/mine')
+      // 认证已成功——无租户账号保留 token（受邀新用户需登录态接受邀请），
+      // 由调用方引导回邀请落地页而非硬拒
+      if (!mineRes.success || !mineRes.data || mineRes.data.length === 0) {
+        return { ok: true, hasTenant: false }
+      }
 
-  fetchUsers: async () => {
-    console.warn('User management not implemented for tenant module')
+      const tenant = mineRes.data[0]
+      setSlug(tenant.slug)
+      set({ isAuthenticated: true, currentTenant: tenant })
+      return { ok: true, hasTenant: true }
+    } finally {
+      set({ loading: false })
+    }
   },
 
-  createUser: async () => {
-    console.warn('User creation not implemented for tenant module')
-    return false
+  restoreFromToken: async () => {
+    if (!getToken()) return
+    const mineRes = await api<Tenant[]>('/tenants/mine')
+    if (mineRes.success && mineRes.data && mineRes.data.length > 0) {
+      const tenant = mineRes.data[0]
+      setSlug(tenant.slug)
+      set({ isAuthenticated: true, currentTenant: tenant })
+    }
   },
 
-  updateUser: async () => {
-    console.warn('User update not implemented for tenant module')
-    return false
+  logout: () => {
+    setToken(null)
+    setSlug(null)
+    set({ isAuthenticated: false, currentTenant: null, users: [], todos: [] })
   },
 
-  deleteUser: async () => {
-    console.warn('User deletion not implemented for tenant module')
-    return false
+  setCurrentTenant: tenant => set({ currentTenant: tenant }),
+
+  setLoading: loading => set({ loading }),
+
+  fetchCurrentTenant: async slug => {
+    if (!getToken()) {
+      set({ isAuthenticated: false })
+      return
+    }
+    const res = await api<Tenant>(`/tenants/slug/${slug}`)
+    if (res.success && res.data) {
+      set({ isAuthenticated: true, currentTenant: res.data })
+      return
+    }
+    // 仅认证确实失效（401）才回登录；429/网络错误按瞬态跳过，
+    // 否则限流抖动会把已登录用户弹出去
+    if (res.status === 401) {
+      set({ isAuthenticated: false })
+    }
   },
 
-  createTopic: async () => {
-    console.warn('Topic creation not implemented for tenant module')
-    return false
+  fetchRoles: async () => {
+    const tenant = getState().currentTenant
+    if (!tenant) return
+    const res = await api<TenantRole[]>(`/tenants/${tenant.id}/roles`)
+    if (res.success && res.data) set({ roles: res.data })
   },
 
-  updateTopic: async () => {
-    console.warn('Topic update not implemented for tenant module')
-    return false
+  fetchUsers: async () => {
+    const tenant = getState().currentTenant
+    if (!tenant) return
+    const res = await api<TenantMember[]>(`/tenants/${tenant.id}/members`)
+    if (res.success && res.data) set({ users: res.data })
   },
 
-  deleteTopic: async () => {
-    console.warn('Topic deletion not implemented for tenant module')
-    return false
+  inviteUser: async (email, roleId) => {
+    const tenant = getState().currentTenant
+    if (!tenant) return false
+    const res = await api(`/tenants/${tenant.id}/members/invite`, {
+      method: 'POST',
+      body: { email, roleId },
+    })
+    return res.success
   },
 
-  fetchSubscription: async () => {
-    console.warn('Subscription management not implemented for tenant module')
+  updateUser: async (memberId, data) => {
+    const tenant = getState().currentTenant
+    if (!tenant) return false
+    const res = await api(`/tenants/${tenant.id}/members/${memberId}`, {
+      method: 'PUT',
+      body: data,
+    })
+    return res.success
   },
 
-  fetchCurrentTenant: async (_slug: string) => {
-    console.warn('Tenant routes not registered - tenant module not active')
+  deleteUser: async memberId => {
+    const tenant = getState().currentTenant
+    if (!tenant) return false
+    const res = await api(`/tenants/${tenant.id}/members/${memberId}`, { method: 'DELETE' })
+    return res.success
   },
 
   fetchTodos: async () => {
-    console.warn('Tenant routes not registered - tenant module not active')
+    const res = await api<{ todos: Todo[]; total: number }>('/todos?limit=100')
+    if (res.success && res.data) set({ todos: res.data.todos })
   },
 
-  createTodo: async () => {
-    console.warn('Tenant routes not registered - tenant module not active')
-    return false
+  createTodo: async data => {
+    const res = await api<Todo>('/todos', { method: 'POST', body: data })
+    if (res.success) await getState().fetchTodos()
+    return res.success
   },
 
-  updateTodo: async () => {
-    console.warn('Tenant routes not registered - tenant module not active')
-    return false
+  updateTodo: async (todoId, data) => {
+    const res = await api<Todo>(`/todos/${todoId}`, { method: 'PUT', body: data })
+    if (res.success) await getState().fetchTodos()
+    return res.success
   },
 
-  deleteTodo: async () => {
-    console.warn('Tenant routes not registered - tenant module not active')
-    return false
+  deleteTodo: async todoId => {
+    const res = await api(`/todos/${todoId}`, { method: 'DELETE' })
+    if (res.success) await getState().fetchTodos()
+    return res.success
   },
 
   fetchTopics: async () => {
-    console.warn('Tenant routes not registered - tenant module not active')
+    const res = await api<Topic[]>('/public/topics?limit=50')
+    if (res.success && res.data) set({ topics: res.data })
+  },
+
+  createTopic: async () => false,
+
+  updateTopic: async () => false,
+
+  deleteTopic: async () => false,
+
+  fetchSubscription: async () => {
+    const tenant = getState().currentTenant
+    if (!tenant) return
+    const members = await api<TenantMember[]>(`/tenants/${tenant.id}/members`)
+    set({
+      subscription: {
+        plan: tenant.plan,
+        maxUsers: tenant.maxUsers,
+        currentUsers: members.data?.length ?? 0,
+      },
+    })
   },
 
-  updateTenant: async () => {
-    console.warn('Tenant routes not registered - tenant module not active')
+  updateTenant: async (tenantId, data) => {
+    const res = await api<Tenant>(`/tenants/${tenantId}`, { method: 'PUT', body: data })
+    if (res.success && res.data) {
+      set({ currentTenant: res.data })
+      return true
+    }
     return false
   },
 
   fetchStats: async () => {
-    console.warn('Stats endpoint not implemented for tenant module')
+    const tenant = getState().currentTenant
+    if (!tenant) return
+    const [members, todos] = await Promise.all([
+      api<TenantMember[]>(`/tenants/${tenant.id}/members`),
+      api<{ todos: Todo[]; total: number }>('/todos?limit=100'),
+    ])
+    const activeTodos = (todos.data?.todos ?? []).filter(t => t.status !== 'completed').length
+    set({
+      stats: {
+        totalUsers: members.data?.length ?? 0,
+        activeTodos,
+        contentCount: 0,
+        monthlyRevenue: 0,
+      },
+    })
   },
 
   startLoading: (_text?: string) => {

package/template/src/test/setup-db-path.ts

@@ -0,0 +1,20 @@
+/**
+ * vitest setupFile：把测试库从 :memory: 换成每进程独立的临时文件。
+ *
+ * 为什么不能用 :memory:——@libsql/client 的 transaction() 会置空内部连接
+ * （#db = null，事务跑在旧连接上），下一次普通查询惰性新建连接；文件库
+ * 会重开同一文件，而 :memory: 会得到一个全新的空库（后续所有查询
+ * "no such table"）。租户开通等真实事务依赖此修正。
+ */
+import { tmpdir } from 'os'
+import { join } from 'path'
+import { existsSync, rmSync } from 'fs'
+
+if (!process.env.SQLITE_PATH || process.env.SQLITE_PATH === ':memory:') {
+  const dbPath = join(tmpdir(), `cfs-test-${process.pid}.db`)
+  // 旧运行可能残留旧 DDL 的库（IF NOT EXISTS 不会升级表结构）——先删干净
+  for (const f of [dbPath, `${dbPath}-journal`, `${dbPath}-wal`, `${dbPath}-shm`]) {
+    if (existsSync(f)) rmSync(f)
+  }
+  process.env.SQLITE_PATH = dbPath
+}

package/template/vitest.config.ts

@@ -23,7 +23,6 @@ export default defineConfig({
         return 'node'
       }
     })(),
-    setupFiles: ['./vitest.setup.ts'],
     include: [
       '**/__tests__/**/*.test.ts',
       '**/__tests__/**/*.test.tsx',
@@ -32,6 +31,9 @@ export default defineConfig({
     exclude: ['**/node_modules/**', '**/dist/**'],
     testTimeout: 60000,
     hookTimeout: 60000,
+    // setup-db-path 必须在前：把 :memory: 换成临时文件（libsql 事务与
+    // :memory: 不兼容），vitest.setup 再注册 jest-dom 等
+    setupFiles: ['./src/test/setup-db-path.ts', './vitest.setup.ts'],
     env: {
       NODE_ENV: 'test',
       SQLITE_PATH: ':memory:',