create-fullstack-scaffold 0.4.25 → 0.5.1

package/template/src/server/db/schema/orders.ts

@@ -1,4 +1,4 @@
-import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core'
+import { sqliteTable, integer, text, index } from 'drizzle-orm/sqlite-core'
 import { sql } from 'drizzle-orm'
 
 export const orderStatuses = [
@@ -10,21 +10,28 @@ export const orderStatuses = [
 ] as const
 export type OrderStatus = (typeof orderStatuses)[number]
 
-export const orders = sqliteTable('orders', {
-  id: integer('id').primaryKey({ autoIncrement: true }),
-  orderNo: text('order_no').notNull(),
-  customerName: text('customer_name').notNull(),
-  customerEmail: text('customer_email').notNull(),
-  productName: text('product_name').notNull(),
-  amount: integer('amount').notNull(),
-  status: text('status', { enum: orderStatuses }).notNull().default('pending'),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const orders = sqliteTable(
+  'orders',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    orderNo: text('order_no').notNull(),
+    customerName: text('customer_name').notNull(),
+    customerEmail: text('customer_email').notNull(),
+    productName: text('product_name').notNull(),
+    amount: integer('amount').notNull(),
+    status: text('status', { enum: orderStatuses }).notNull().default('pending'),
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+    updatedAt: integer('updated_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    statusIdx: index('orders_status_idx').on(table.status),
+    createdAtIdx: index('orders_created_at_idx').on(table.createdAt),
+  })
+)
 
 export type OrderTable = typeof orders.$inferSelect
 export type NewOrder = typeof orders.$inferInsert

package/template/src/server/db/schema/plugins.ts

@@ -1,38 +1,47 @@
-import { sqliteTable, text, integer, uniqueIndex } from 'drizzle-orm/sqlite-core'
+import { sqliteTable, text, integer, uniqueIndex, index } from 'drizzle-orm/sqlite-core'
 import { sql } from 'drizzle-orm'
 
 export const pluginStatus = ['pending', 'approved', 'rejected'] as const
 export type PluginStatus = (typeof pluginStatus)[number]
 
-export const plugins = sqliteTable('plugins', {
-  id: text('id').primaryKey(),
-  name: text('name').notNull(),
-  slug: text('slug').notNull().unique(),
-  description: text('description').notNull().default(''),
-  readme: text('readme'),
-  authorId: text('author_id').notNull(),
-  authorName: text('author_name').notNull(),
-  repositoryUrl: text('repository_url'),
-  homepageUrl: text('homepage_url'),
-  npmPackage: text('npm_package'),
-  license: text('license'),
-  version: text('version').notNull().default('0.0.1'),
-  status: text('status', { enum: pluginStatus }).notNull().default('pending'),
-  downloadCount: integer('download_count').notNull().default(0),
-  viewCount: integer('view_count').notNull().default(0),
-  featured: integer('featured', { mode: 'boolean' }).notNull().default(false),
-  screenshotUrl: text('screenshot_url'),
-  siteUrls: text('site_urls'),
-  tags: text('tags'),
-  commands: text('commands'),
-  rejectReason: text('reject_reason'),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const plugins = sqliteTable(
+  'plugins',
+  {
+    id: text('id').primaryKey(),
+    name: text('name').notNull(),
+    slug: text('slug').notNull().unique(),
+    description: text('description').notNull().default(''),
+    readme: text('readme'),
+    authorId: text('author_id').notNull(),
+    authorName: text('author_name').notNull(),
+    repositoryUrl: text('repository_url'),
+    homepageUrl: text('homepage_url'),
+    npmPackage: text('npm_package'),
+    license: text('license'),
+    version: text('version').notNull().default('0.0.1'),
+    status: text('status', { enum: pluginStatus }).notNull().default('pending'),
+    downloadCount: integer('download_count').notNull().default(0),
+    viewCount: integer('view_count').notNull().default(0),
+    featured: integer('featured', { mode: 'boolean' }).notNull().default(false),
+    screenshotUrl: text('screenshot_url'),
+    siteUrls: text('site_urls'),
+    tags: text('tags'),
+    commands: text('commands'),
+    rejectReason: text('reject_reason'),
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+    updatedAt: integer('updated_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    statusIdx: index('plugins_status_idx').on(table.status),
+    slugIdx: index('plugins_slug_idx').on(table.slug),
+    authorIdIdx: index('plugins_author_id_idx').on(table.authorId),
+    createdAtIdx: index('plugins_created_at_idx').on(table.createdAt),
+  })
+)
 
 export const pluginVersions = sqliteTable(
   'plugin_versions',
@@ -53,6 +62,7 @@ export const pluginVersions = sqliteTable(
   },
   table => ({
     pluginVersionUnique: uniqueIndex('plugin_version_unique').on(table.pluginId, table.version),
+    pluginIdIdx: index('plugin_versions_plugin_id_idx').on(table.pluginId),
   })
 )
 
@@ -77,14 +87,20 @@ export const pluginReviews = sqliteTable(
   })
 )
 
-export const pluginCategories = sqliteTable('plugin_categories', {
-  id: text('id').primaryKey(),
-  name: text('name').notNull().unique(),
-  slug: text('slug').notNull().unique(),
-  description: text('description'),
-  icon: text('icon'),
-  sortOrder: integer('sort_order').notNull().default(0),
-})
+export const pluginCategories = sqliteTable(
+  'plugin_categories',
+  {
+    id: text('id').primaryKey(),
+    name: text('name').notNull().unique(),
+    slug: text('slug').notNull().unique(),
+    description: text('description'),
+    icon: text('icon'),
+    sortOrder: integer('sort_order').notNull().default(0),
+  },
+  table => ({
+    slugIdx: index('plugin_categories_slug_idx').on(table.slug),
+  })
+)
 
 export const pluginCategoryMappings = sqliteTable(
   'plugin_category_mappings',
@@ -101,6 +117,8 @@ export const pluginCategoryMappings = sqliteTable(
       table.pluginId,
       table.categoryId
     ),
+    categoryIdIdx: index('plugin_category_mappings_category_id_idx').on(table.categoryId),
+    pluginIdIdx: index('plugin_category_mappings_plugin_id_idx').on(table.pluginId),
   })
 )
 

package/template/src/server/db/schema/products.ts

@@ -1,25 +1,32 @@
-import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core'
+import { sqliteTable, integer, text, index } from 'drizzle-orm/sqlite-core'
 import { sql } from 'drizzle-orm'
 
 export const productStatuses = ['active', 'inactive', 'out_of_stock'] as const
 export type ProductStatus = (typeof productStatuses)[number]
 
-export const products = sqliteTable('products', {
-  id: text('id').primaryKey(),
-  name: text('name').notNull(),
-  description: text('description'),
-  price: integer('price').notNull(), // 单位：分
-  status: text('status', { enum: productStatuses }).notNull().default('active'),
-  stock: integer('stock').notNull().default(0),
-  imageUrl: text('image_url'),
-  merchantId: integer('merchant_id').notNull(), // Changed to integer to match merchants.id
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const products = sqliteTable(
+  'products',
+  {
+    id: text('id').primaryKey(),
+    name: text('name').notNull(),
+    description: text('description'),
+    price: integer('price').notNull(), // 单位：分
+    status: text('status', { enum: productStatuses }).notNull().default('active'),
+    stock: integer('stock').notNull().default(0),
+    imageUrl: text('image_url'),
+    merchantId: integer('merchant_id').notNull(), // Changed to integer to match merchants.id
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+    updatedAt: integer('updated_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    statusIdx: index('products_status_idx').on(table.status),
+    merchantIdIdx: index('products_merchant_id_idx').on(table.merchantId),
+  })
+)
 
 export type Product = typeof products.$inferSelect
 export type NewProduct = typeof products.$inferInsert

package/template/src/server/db/schema/tickets.ts

@@ -1,4 +1,4 @@
-import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core'
+import { sqliteTable, integer, text, index } from 'drizzle-orm/sqlite-core'
 import { sql } from 'drizzle-orm'
 
 export const ticketStatuses = [
@@ -24,37 +24,50 @@ export type TicketCategory = (typeof ticketCategories)[number]
 
 export const ticketReplyAuthorRoles = ['customer', 'admin', 'system'] as const
 
-export const tickets = sqliteTable('tickets', {
-  id: integer('id').primaryKey({ autoIncrement: true }),
-  ticketNo: text('ticket_no').notNull(),
-  customerName: text('customer_name').notNull(),
-  customerEmail: text('customer_email').notNull(),
-  subject: text('subject').notNull(),
-  description: text('description').notNull(),
-  status: text('status', { enum: ticketStatuses }).notNull().default('open'),
-  priority: text('priority', { enum: ticketPriorities }).notNull().default('medium'),
-  category: text('category', { enum: ticketCategories }).notNull(),
-  assignedTo: text('assigned_to'),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const tickets = sqliteTable(
+  'tickets',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    ticketNo: text('ticket_no').notNull(),
+    customerName: text('customer_name').notNull(),
+    customerEmail: text('customer_email').notNull(),
+    subject: text('subject').notNull(),
+    description: text('description').notNull(),
+    status: text('status', { enum: ticketStatuses }).notNull().default('open'),
+    priority: text('priority', { enum: ticketPriorities }).notNull().default('medium'),
+    category: text('category', { enum: ticketCategories }).notNull(),
+    assignedTo: text('assigned_to'),
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+    updatedAt: integer('updated_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    statusIdx: index('tickets_status_idx').on(table.status),
+    createdAtIdx: index('tickets_created_at_idx').on(table.createdAt),
+  })
+)
 
-export const ticketReplies = sqliteTable('ticket_replies', {
-  id: integer('id').primaryKey({ autoIncrement: true }),
-  ticketId: integer('ticket_id')
-    .notNull()
-    .references(() => tickets.id, { onDelete: 'cascade' }),
-  content: text('content').notNull(),
-  author: text('author').notNull(),
-  isCustomer: integer('is_customer', { mode: 'boolean' }).notNull().default(false),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const ticketReplies = sqliteTable(
+  'ticket_replies',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    ticketId: integer('ticket_id')
+      .notNull()
+      .references(() => tickets.id, { onDelete: 'cascade' }),
+    content: text('content').notNull(),
+    author: text('author').notNull(),
+    isCustomer: integer('is_customer', { mode: 'boolean' }).notNull().default(false),
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    ticketIdIdx: index('ticket_replies_ticket_id_idx').on(table.ticketId),
+  })
+)
 
 export type TicketTable = typeof tickets.$inferSelect
 export type NewTicket = typeof tickets.$inferInsert

package/template/src/server/db/schema/todos.ts

@@ -1,21 +1,29 @@
-import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core';
-import { sql } from 'drizzle-orm';
+import { sqliteTable, integer, text, index } from 'drizzle-orm/sqlite-core'
+import { sql } from 'drizzle-orm'
 
-export const todoStatus = ['pending', 'in_progress', 'completed'] as const;
-export type TodoStatus = (typeof todoStatus)[number];
+export const todoStatus = ['pending', 'in_progress', 'completed'] as const
+export type TodoStatus = (typeof todoStatus)[number]
 
-export const todos = sqliteTable('todos', {
-  id: integer('id').primaryKey({ autoIncrement: true }),
-  title: text('title').notNull(),
-  description: text('description'),
-  status: text('status', { enum: todoStatus }).notNull().default('pending'),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-});
+export const todos = sqliteTable(
+  'todos',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    title: text('title').notNull(),
+    description: text('description'),
+    status: text('status', { enum: todoStatus }).notNull().default('pending'),
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+    updatedAt: integer('updated_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    statusIdx: index('todos_status_idx').on(table.status),
+    createdAtIdx: index('todos_created_at_idx').on(table.createdAt),
+    updatedAtIdx: index('todos_updated_at_idx').on(table.updatedAt),
+  })
+)
 
-export type TodoTable = typeof todos.$inferSelect;
-export type NewTodo = typeof todos.$inferInsert;
+export type TodoTable = typeof todos.$inferSelect
+export type NewTodo = typeof todos.$inferInsert

package/template/src/server/entries/cloudflare.ts

@@ -1,12 +1,8 @@
 /**
  * @framework-baseline e350401421193896
  * @framework-modify
- * @reason 集成 ISR 缓存层，为页面路由提供增量静态再生能力
- * @impact 影响 Cloudflare Workers 环境的页面响应流程，新增 ISR 缓存查找/存储/失效逻辑
- *
- * Note: In Cloudflare Workers, each request runs in its own isolate,
- * so globalThis is request-scoped and there's no race condition risk.
- * The middleware sets the DB binding for each request.
+ * @reason 模块化 ISR 改造 + SSR 渲染：调用 renderSSR 生成 React body，注入到 ISR 模板
+ * @impact CF 入口集成 React SSR，ISR 同时负责 SEO meta 标签和 body 渲染
  */
 
 import { createApp } from '../app'
@@ -16,8 +12,15 @@ import { RealtimeDurableObject } from '@server/core'
 import { setRuntimeAdapter } from '@server/core/runtime'
 import { getCloudflareRuntimeAdapter } from '@server/core/runtime-cloudflare'
 import { createISRCache, isISRRoute } from '@server/core/isr-cache'
-import { renderPage } from '@server/core/ssr-renderer'
 import { setISRCache } from '@server/core/isr-invalidation'
+import { isrRegistry, type ISRRouterContext } from '@server/core/isr-registry'
+import { renderISRPage } from '@server/core/isr-renderer'
+import { renderSSR } from '@client/entry-server'
+
+// Import module ISR registrations (side-effect: registers routes).
+// 由 CLI 按 preset 生成的汇总文件（src/server/isr-modules.ts），
+// 避免 content 等模块被裁剪后悬空导入导致 CF 构建/tsc 失败。
+import '@server/isr-modules'
 
 export interface CloudflareBindings extends AppBindings {
   DB: D1Database
@@ -36,6 +39,8 @@ const app = createApp<CloudflareBindings>()
 const isrCache = createISRCache()
 setISRCache(isrCache)
 
+let cachedTemplate: string | null = null
+
 const wrappedApp = app
   .use('*', async (c, next) => {
     ;(globalThis as unknown as { DB: D1Database }).DB = c.env.DB
@@ -102,19 +107,20 @@ export default {
       }
 
       if (result.status === 'stale' && result.html) {
-        ctx.waitUntil(regeneratePage(pathname, env))
+        ctx.waitUntil(regeneratePage(pathname, env, request))
         return new Response(result.html, {
           headers: { 'Content-Type': 'text/html;charset=UTF-8', 'X-ISR-Status': 'stale' },
         })
       }
 
-      const rendered = await renderPage(pathname)
-
-      ctx.waitUntil(isrCache.store(pathname, rendered.html))
-
-      return new Response(rendered.html, {
-        status: rendered.status,
-        headers: { ...rendered.headers, 'X-ISR-Status': 'miss' },
+      const html = await renderISRForRoute(pathname, env, request)
+      ctx.waitUntil(isrCache.store(pathname, html))
+      return new Response(html, {
+        headers: {
+          'Content-Type': 'text/html;charset=UTF-8',
+          'X-ISR-Status': 'miss',
+          'X-ISR-Rendered': 'true',
+        },
       })
     }
 
@@ -129,15 +135,85 @@ export default {
   },
 }
 
-async function regeneratePage(pathname: string, _env: CloudflareBindings): Promise<void> {
+// 单飞：同 isolate 内并发 stale 请求共享同一次重建，防缓存击穿
+const inflightRevalidations = new Map<string, Promise<void>>()
+
+function regeneratePage(
+  pathname: string,
+  env: CloudflareBindings,
+  request: Request
+): Promise<void> {
+  const existing = inflightRevalidations.get(pathname)
+  if (existing) return existing
+
+  const task = (async () => {
+    try {
+      const html = await renderISRForRoute(pathname, env, request)
+      await isrCache.store(pathname, html)
+    } catch (error) {
+      console.error('ISR regeneration failed:', error)
+    } finally {
+      inflightRevalidations.delete(pathname)
+    }
+  })()
+
+  inflightRevalidations.set(pathname, task)
+  return task
+}
+
+async function renderISRForRoute(
+  pathname: string,
+  env: CloudflareBindings,
+  request: Request
+): Promise<string> {
+  const entry = isrRegistry.match(pathname)
+  if (!entry) {
+    throw new Error(`No ISR handler for ${pathname}`)
+  }
+
+  const ctx: ISRRouterContext = { db: env.DB, env }
+  let data: unknown = {}
+  let meta = { title: 'Biomimic App', description: 'A full-stack application template' }
+
+  try {
+    data = await entry.fetch(pathname, ctx)
+    meta = entry.meta(data, pathname)
+  } catch {
+    // DB error — fall through with default meta
+  }
+
+  if (!cachedTemplate && env.ASSETS) {
+    try {
+      const indexUrl = new URL('/index.html', request.url).href
+      const resp = await env.ASSETS.fetch(new Request(indexUrl))
+      if (resp.ok) {
+        cachedTemplate = await resp.text()
+      }
+    } catch {
+      // fallback below
+    }
+  }
+
+  // Render React SSR body
+  let body = ''
   try {
-    const rendered = await renderPage(pathname)
-    await isrCache.store(pathname, rendered.html)
-  } catch (error) {
-    console.error('ISR regeneration failed:', error)
+    const ssrResult = renderSSR(pathname, data as Parameters<typeof renderSSR>[1])
+    body = ssrResult.html
+    // Helmet takes priority for title/meta
+    const helmetTitle = ssrResult.helmet.title
+      ?.replace(/<title[^>]*>/, '')
+      ?.replace(/<\/title>/, '')
+      ?.trim()
+    if (helmetTitle) {
+      meta = { ...meta, title: helmetTitle }
+    }
+  } catch (e) {
+    console.error('SSR render failed:', e)
+    // Fallback: empty body, SPA will hydrate
   }
+
+  return renderISRPage({ template: cachedTemplate, body, meta })
 }
 
 export { isrCache }
 export { RealtimeDurableObject, getDb }
-export type AppType = typeof wrappedApp

package/template/src/server/entries/node.ts

@@ -168,8 +168,6 @@ app.onError((err, c) => {
 })
 
 export default app
-export type AppType = typeof app
-
 export async function createServer() {
   const server = serve({
     fetch: app.fetch,

package/template/src/server/index.ts

@@ -59,4 +59,3 @@ export { createApp } from './app'
 export { type AppBindings, type CreateAppOptions } from './types/bindings'
 export { getAppConfig, getDatabaseConfig, type AppConfig, type DatabaseConfig } from './config'
 export { createServer, startServer } from './entries/node'
-export type { ClientApiType, AdminApiType, AppType } from './app'

package/template/src/server/isr-modules.ts

@@ -0,0 +1,10 @@
+/**
+ * ISR 模块注册汇总（单一入口，供 entries/cloudflare.ts 引用）。
+ *
+ * 本文件在模板仓库中为全量版本；CLI 脚手架时会按 preset 重新生成
+ * （src/generators/isr-modules.ts），只保留选中模块的导入，
+ * 避免 content 等模块被裁剪后悬空导入导致 CF 构建/tsc 失败。
+ */
+
+import '@server/module-todos/isr'
+import '@server/module-content/isr'