npm - create-fullstack-scaffold - Versions diffs - 0.4.25 → 0.5.1 - Mend

create-fullstack-scaffold 0.4.25 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (137) hide show

package/template/src/server/core/__tests__/isr-renderer.test.ts ADDED Viewed

@@ -0,0 +1,121 @@
+/**
+ * @framework-baseline b75ca79fd266283d
+ *
+ * @framework-modify
+ * @reason 断言对齐实现：generator meta 值为 ISR-SSG（isr-renderer.ts:65）
+ * @impact 仅测试断言，无运行时影响
+ */
+import { describe, it, expect } from 'vitest'
+import { renderISRPage, escapeHtml } from '@server/core/isr-renderer'
+describe('ISR Renderer', () => {
+  describe('escapeHtml', () => {
+    it('should escape & < > "', () => {
+      expect(escapeHtml('a&b<c>d"e')).toBe('a&amp;b&lt;c&gt;d&quot;e')
+    })
+    it('should escape empty string', () => {
+      expect(escapeHtml('')).toBe('')
+    })
+    it('should escape multiple occurrences', () => {
+      expect(escapeHtml('<<>>')).toBe('&lt;&lt;&gt;&gt;')
+    })
+    it('should not alter plain text', () => {
+      expect(escapeHtml('hello world')).toBe('hello world')
+    })
+  })
+  describe('renderISRPage — with template', () => {
+    const template = `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Original Title</title>
+    <meta name="description" content="original desc" />
+    <meta property="og:title" content="original" />
+    <meta property="og:description" content="original" />
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>`
+    it('should inject title', () => {
+      const html = renderISRPage({
+        template,
+        meta: { title: 'New Title', description: 'new desc' },
+      })
+      expect(html).toContain('<title>New Title</title>')
+      expect(html).not.toContain('Original Title')
+    })
+    it('should inject meta description', () => {
+      const html = renderISRPage({
+        template,
+        meta: { title: 'T', description: 'New Description' },
+      })
+      expect(html).toContain('name="description" content="New Description"')
+      expect(html).not.toContain('content="original desc"')
+    })
+    it('should inject og:title and og:description', () => {
+      const html = renderISRPage({
+        template,
+        meta: { title: 'OG Title', description: 'OG Desc' },
+      })
+      expect(html).toContain('property="og:title" content="OG Title"')
+      expect(html).toContain('property="og:description" content="OG Desc"')
+    })
+    it('should inject generator=ISR', () => {
+      const html = renderISRPage({
+        template,
+        meta: { title: 'T', description: 'D' },
+      })
+      expect(html).toContain('name="generator" content="ISR-SSG"')
+    })
+    it('should keep root div empty (meta-only)', () => {
+      const html = renderISRPage({
+        template,
+        meta: { title: 'T', description: 'D' },
+      })
+      expect(html).toContain('<div id="root"></div>')
+    })
+    it('should escape HTML in meta values', () => {
+      const html = renderISRPage({
+        template,
+        meta: { title: '<script>alert(1)</script>', description: '<b>bold</b>' },
+      })
+      expect(html).not.toContain('<script>alert(1)</script>')
+      expect(html).toContain('&lt;script&gt;alert(1)&lt;/script&gt;')
+    })
+  })
+  describe('renderISRPage — no template (fallback)', () => {
+    it('should generate standalone HTML', () => {
+      const html = renderISRPage({
+        template: null,
+        meta: { title: 'Standalone', description: 'Fallback mode' },
+      })
+      expect(html).toContain('<!DOCTYPE html>')
+      expect(html).toContain('<title>Standalone</title>')
+      expect(html).toContain('<div id="root"></div>')
+    })
+    it('should include all meta tags in fallback', () => {
+      const html = renderISRPage({
+        template: null,
+        meta: { title: 'T', description: 'D' },
+      })
+      expect(html).toContain('name="description"')
+      expect(html).toContain('property="og:title"')
+      expect(html).toContain('property="og:description"')
+      expect(html).toContain('name="generator" content="ISR-SSG"')
+    })
+  })
+})

package/template/src/server/core/isr-cache.ts CHANGED Viewed

@@ -5,10 +5,12 @@
  * Supports Cloudflare Cache API and in-memory fallback.
  *
  * @framework-modify
- * @reason 移除未使用的 fullOptions 变量，修复 TypeScript strict 检查
- * @impact 不影响功能，仅清理代码
+ * @reason 模块化改造：移除硬编码路由，路由判断委托给 isrRegistry
+ * @impact isr-invalidation 也需要同步改造
  */
+import { isrRegistry } from './isr-registry'
 export interface ISRCacheEntry {
   html: string
   createdAt: number
@@ -29,16 +31,8 @@ export interface ISRCacheOptions {
 const DEFAULT_MAX_AGE = 60
 const DEFAULT_STALE_WHILE_REVALIDATE = 300
-const ISR_ROUTES = ['/', '/todos', '/content', '/notifications', '/websocket']
-const ISR_ROUTE_PREFIXES = ['/content/']
 export function isISRRoute(pathname: string): boolean {
-  if (ISR_ROUTES.includes(pathname)) return true
-  for (const prefix of ISR_ROUTE_PREFIXES) {
-    if (pathname.startsWith(prefix)) return true
-  }
-  return false
+  return isrRegistry.isISRRoute(pathname)
 }
 export function generateCacheKey(pathname: string): string {
@@ -110,7 +104,7 @@ class MemoryCacheStore implements ISRCacheStore {
 class CloudflareCacheStore implements ISRCacheStore {
   private cache: Cache | null = null
-  private origin = 'https://isr.local'
+  private origin = 'https://isr-v7.local'
   private async getCache(): Promise<Cache> {
     if (!this.cache) {
@@ -136,6 +130,33 @@ class CloudflareCacheStore implements ISRCacheStore {
     return { html, createdAt, revalidateAt }
   }
+  // Cache API 没有 list()：用专用索引键记录所有已缓存 pathname（JSON 数组），
+  // purgePattern 据此清剿。跨 isolate 各自记账，最终一致（各自清理各自的键，
+  // 键相同即覆盖，无重复副作用）。
+  private static readonly INDEX_KEY = 'isr:__index__'
+  private async readIndex(): Promise<string[]> {
+    const cache = await this.getCache()
+    const res = await cache.match(this.toUrl(CloudflareCacheStore.INDEX_KEY))
+    if (!res) return []
+    try {
+      const parsed = JSON.parse(await res.text())
+      return Array.isArray(parsed) ? parsed : []
+    } catch {
+      return []
+    }
+  }
+  private async writeIndex(keys: string[]): Promise<void> {
+    const cache = await this.getCache()
+    // 索引不必常驻新鲜——purge 类操作低频，短 TTL 控制体积
+    const body = JSON.stringify([...new Set(keys)])
+    await cache.put(
+      this.toUrl(CloudflareCacheStore.INDEX_KEY),
+      new Response(body, { headers: { 'Content-Type': 'application/json' } })
+    )
+  }
   async set(key: string, html: string, options: Required<ISRCacheOptions>): Promise<void> {
     const cache = await this.getCache()
     const url = this.toUrl(key)
@@ -153,26 +174,48 @@ class CloudflareCacheStore implements ISRCacheStore {
     })
     await cache.put(url, response)
+    const index = await this.readIndex()
+    if (!index.includes(key)) {
+      index.push(key)
+      await this.writeIndex(index)
+    }
   }
   async purge(key: string): Promise<void> {
     const cache = await this.getCache()
     const url = this.toUrl(key)
     await cache.delete(url)
+    const index = await this.readIndex()
+    if (index.includes(key)) {
+      await this.writeIndex(index.filter(k => k !== key))
+    }
   }
   async purgePattern(pattern: string): Promise<void> {
+    // 此前为永远不执行的死代码（allKeys 恒空）——CF 上内容更新后
+    // 陈旧详情页会一直服务到自然过期。现按索引清单真清剿。
+    const regex = new RegExp('^' + this.escapeForPattern(pattern).replace(/\*/g, '.*') + '$')
+    const index = await this.readIndex()
     const cache = await this.getCache()
-    const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
-    const allKeys: Request[] = []
+    const survivors: string[] = []
-    for (const request of allKeys) {
-      const url = new URL(request.url)
-      const key = `isr:${url.pathname}`
+    for (const key of index) {
       if (regex.test(key)) {
-        await cache.delete(request)
+        await cache.delete(this.toUrl(key))
+      } else {
+        survivors.push(key)
       }
     }
+    if (survivors.length !== index.length) {
+      await this.writeIndex(survivors)
+    }
+  }
+  private escapeForPattern(pattern: string): string {
+    // 转义除 * 外的正则元字符，防 'content/1+2' 之类键名误匹配
+    return pattern.replace(/[.+?^${}()|[\]]/g, '\\$&')
   }
 }

package/template/src/server/core/isr-invalidation.ts CHANGED Viewed

@@ -2,16 +2,12 @@
  * @framework-baseline a124c5bce28416ca
  *
  * @framework-modify
- * @reason 自动生成的基准更新
- * @impact 无功能影响
- */
-/**
- * ISR cache invalidation utilities.
- * Call these from service layer when content changes.
+ * @reason 模块化改造：purgeAllPages 改为遍历注册表
+ * @impact 不再硬编码路由列表
  */
 import type { ISRCache } from './isr-cache'
+import { isrRegistry } from './isr-registry'
 let _cache: ISRCache | null = null
@@ -36,10 +32,8 @@ export async function purgeContentPages(): Promise<void> {
 export async function purgeAllPages(): Promise<void> {
   if (!_cache) return
-  await _cache.purge('/')
-  await _cache.purge('/todos')
-  await _cache.purge('/content')
-  await _cache.purge('/notifications')
-  await _cache.purge('/websocket')
+  for (const path of isrRegistry.getExactPaths()) {
+    await _cache.purge(path)
+  }
   await _cache.purgePattern('isr:/content/*')
 }

package/template/src/server/core/isr-registry.ts ADDED Viewed

@@ -0,0 +1,104 @@
+/**
+ * @framework-baseline faa47d8c6e71847d
+ *
+ *
+ * @framework-modify
+ * @reason prettier 格式化与注释结构整理（无逻辑改动）
+ * @impact 框架文件维护性修改，行为见测试
+ */
+/**
+ * ISR Route Registry — modules register their ISR routes here.
+ * Full SSG mode: fetches data for meta tags AND pre-populates stores for React SSR.
+ * The CF entry and ISR cache use this to discover which routes need ISR.
+ */
+export type ISRMatcher = string | ((pathname: string) => boolean)
+export interface ISRRouterContext {
+  /** D1 database binding (Cloudflare) or null (Node.js / test) */
+  db?: unknown
+  /** Raw env object (for module-specific needs) */
+  env?: unknown
+}
+export interface ISRRouteEntry {
+  /** Module name that owns this route */
+  module: string
+  /**
+   * Path matcher: exact string or function.
+   * String starting with '/' and ending with '/' = prefix match.
+   * String starting with '/' = exact match.
+   * Function = custom matcher.
+   */
+  match: ISRMatcher
+  /** Fetch data needed for SSR rendering and meta tags */
+  fetch: (pathname: string, ctx: ISRRouterContext) => Promise<unknown>
+  /** Generate meta tags from fetched data */
+  meta: (data: unknown, pathname: string) => { title: string; description: string }
+  /** Max age in seconds (optional, per-route override) */
+  maxAge?: number
+}
+class ISRRegistry {
+  private entries: ISRRouteEntry[] = []
+  register(entry: ISRRouteEntry): void {
+    const idx = this.entries.findIndex(e => e.module === entry.module && e.match === entry.match)
+    if (idx >= 0) {
+      this.entries[idx] = entry
+    } else {
+      this.entries.push(entry)
+    }
+  }
+  registerMany(entries: ISRRouteEntry[]): void {
+    for (const entry of entries) {
+      this.register(entry)
+    }
+  }
+  match(pathname: string): ISRRouteEntry | null {
+    for (const entry of this.entries) {
+      if (typeof entry.match === 'string' && !entry.match.endsWith('/')) {
+        if (pathname === entry.match) return entry
+      }
+    }
+    for (const entry of this.entries) {
+      if (typeof entry.match === 'string' && entry.match.endsWith('/') && entry.match !== '/') {
+        if (pathname.startsWith(entry.match)) return entry
+      }
+    }
+    for (const entry of this.entries) {
+      if (typeof entry.match === 'function') {
+        if (entry.match(pathname)) return entry
+      }
+    }
+    for (const entry of this.entries) {
+      if (entry.match === '/' && pathname === '/') return entry
+    }
+    return null
+  }
+  isISRRoute(pathname: string): boolean {
+    return this.match(pathname) !== null
+  }
+  getExactPaths(): string[] {
+    return this.entries.filter(e => typeof e.match === 'string').map(e => e.match as string)
+  }
+  getAll(): ISRRouteEntry[] {
+    return [...this.entries]
+  }
+  clear(): void {
+    this.entries = []
+  }
+}
+export const isrRegistry = new ISRRegistry()
+export function createISRRegistry(): ISRRegistry {
+  return new ISRRegistry()
+}

package/template/src/server/core/isr-renderer.ts ADDED Viewed

@@ -0,0 +1,75 @@
+/**
+ * @framework-baseline cec621fae360ba2b
+ *
+ *
+ * @framework-modify
+ * @reason prettier 格式化与注释结构整理；body 改为可选字段
+ * @impact 框架文件维护性修改，行为见测试
+ */
+/**
+ * ISR HTML renderer — injects SSR body content AND meta tags into HTML template.
+ * Full SSG mode: combines React SSR output with SEO meta tags.
+ */
+export function escapeHtml(str: string): string {
+  return str
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+}
+export interface ISRPageMeta {
+  title: string
+  description: string
+}
+export interface ISRRenderOptions {
+  /** Pre-built HTML template (from ASSETS or readFileSync) */
+  template: string | null
+  /** SSR body content (React renderToString output); omitted in meta-only mode */
+  body?: string
+  /** Meta tags */
+  meta: ISRPageMeta
+}
+/**
+ * Inject ISR content (SSR body + meta tags) into an HTML template.
+ * If template is null, generates a minimal standalone HTML.
+ */
+export function renderISRPage(opts: ISRRenderOptions): string {
+  const { template, body = '', meta } = opts
+  const safeTitle = escapeHtml(meta.title)
+  const safeDesc = escapeHtml(meta.description)
+  if (template) {
+    let html = template
+    html = html.replace(/<title>[^<]*<\/title>/, `<title>${safeTitle}</title>`)
+    html = html.replace(/<meta\s+name="description"[^>]*>/, '')
+    html = html.replace(/<meta\s+property="og:title"[^>]*>/, '')
+    html = html.replace(/<meta\s+property="og:description"[^>]*>/, '')
+    html = html.replace(
+      '</head>',
+      `    <meta name="description" content="${safeDesc}" />\n    <meta property="og:title" content="${safeTitle}" />\n    <meta property="og:description" content="${safeDesc}" />\n    <meta name="generator" content="ISR-SSG" />\n  </head>`
+    )
+    html = html.replace('<div id="root"></div>', `<div id="root">${body}</div>`)
+    return html
+  }
+  return `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>${safeTitle}</title>
+    <meta name="description" content="${safeDesc}" />
+    <meta property="og:title" content="${safeTitle}" />
+    <meta property="og:description" content="${safeDesc}" />
+    <meta name="generator" content="ISR-SSG" />
+  </head>
+  <body>
+    <div id="root">${body}</div>
+  </body>
+</html>`
+}

package/template/src/server/db/schema/contents.ts CHANGED Viewed

@@ -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 contentStatuses = ['draft', 'published', 'archived'] as const
@@ -7,25 +7,33 @@ export type ContentStatus = (typeof contentStatuses)[number]
 export const contentCategories = ['article', 'announcement', 'tutorial', 'news', 'policy'] as const
 export type ContentCategory = (typeof contentCategories)[number]
-export const contents = sqliteTable('contents', {
-  id: integer('id').primaryKey({ autoIncrement: true }),
-  title: text('title').notNull(),
-  body: text('body').notNull(),
-  excerpt: text('excerpt'),
-  category: text('category', { enum: contentCategories }).notNull(),
-  tags: text('tags'),
-  status: text('status', { enum: contentStatuses }).notNull().default('draft'),
-  author: text('author').notNull(),
-  viewCount: integer('view_count').notNull().default(0),
-  likeCount: integer('like_count').notNull().default(0),
-  publishedAt: integer('published_at', { mode: 'timestamp' }),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const contents = sqliteTable(
+  'contents',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    title: text('title').notNull(),
+    body: text('body').notNull(),
+    excerpt: text('excerpt'),
+    category: text('category', { enum: contentCategories }).notNull(),
+    tags: text('tags'),
+    status: text('status', { enum: contentStatuses }).notNull().default('draft'),
+    author: text('author').notNull(),
+    viewCount: integer('view_count').notNull().default(0),
+    likeCount: integer('like_count').notNull().default(0),
+    publishedAt: integer('published_at', { mode: 'timestamp' }),
+    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('contents_status_idx').on(table.status),
+    categoryIdx: index('contents_category_idx').on(table.category),
+    createdAtIdx: index('contents_created_at_idx').on(table.createdAt),
+  })
+)
 export type ContentTable = typeof contents.$inferSelect
 export type NewContent = typeof contents.$inferInsert

package/template/src/server/db/schema/disputes.ts CHANGED Viewed

@@ -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 disputeTypes = [
@@ -13,27 +13,35 @@ export type DisputeType = (typeof disputeTypes)[number]
 export const disputeStatuses = ['pending', 'investigating', 'resolved', 'rejected'] as const
 export type DisputeStatus = (typeof disputeStatuses)[number]
-export const disputes = sqliteTable('disputes', {
-  id: integer('id').primaryKey({ autoIncrement: true }),
-  disputeNo: text('dispute_no').notNull(),
-  orderId: text('order_id').notNull(),
-  orderNo: text('order_no').notNull(),
-  customerName: text('customer_name').notNull(),
-  customerEmail: text('customer_email').notNull(),
-  type: text('type', { enum: disputeTypes }).notNull(),
-  status: text('status', { enum: disputeStatuses }).notNull().default('pending'),
-  description: text('description').notNull(),
-  resolution: text('resolution'),
-  amount: integer('amount').notNull(),
-  resolvedAt: integer('resolved_at', { mode: 'timestamp' }),
-  resolvedBy: text('resolved_by'),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-  updatedAt: integer('updated_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-})
+export const disputes = sqliteTable(
+  'disputes',
+  {
+    id: integer('id').primaryKey({ autoIncrement: true }),
+    disputeNo: text('dispute_no').notNull(),
+    orderId: text('order_id').notNull(),
+    orderNo: text('order_no').notNull(),
+    customerName: text('customer_name').notNull(),
+    customerEmail: text('customer_email').notNull(),
+    type: text('type', { enum: disputeTypes }).notNull(),
+    status: text('status', { enum: disputeStatuses }).notNull().default('pending'),
+    description: text('description').notNull(),
+    resolution: text('resolution'),
+    amount: integer('amount').notNull(),
+    resolvedAt: integer('resolved_at', { mode: 'timestamp' }),
+    resolvedBy: text('resolved_by'),
+    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('disputes_status_idx').on(table.status),
+    orderIdIdx: index('disputes_order_id_idx').on(table.orderId),
+    createdAtIdx: index('disputes_created_at_idx').on(table.createdAt),
+  })
+)
 export type DisputeTable = typeof disputes.$inferSelect
 export type NewDispute = typeof disputes.$inferInsert

package/template/src/server/db/schema/notifications.ts CHANGED Viewed

@@ -1,16 +1,22 @@
-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 notifications = sqliteTable('notifications', {
-  id: text('id').primaryKey(),
-  type: text('type').notNull(),
-  title: text('title').notNull(),
-  message: text('message').notNull(),
-  read: integer('read', { mode: 'boolean' }).notNull().default(false),
-  createdAt: integer('created_at', { mode: 'timestamp' })
-    .notNull()
-    .default(sql`(unixepoch() * 1000)`),
-});
+export const notifications = sqliteTable(
+  'notifications',
+  {
+    id: text('id').primaryKey(),
+    type: text('type').notNull(),
+    title: text('title').notNull(),
+    message: text('message').notNull(),
+    read: integer('read', { mode: 'boolean' }).notNull().default(false),
+    createdAt: integer('created_at', { mode: 'timestamp' })
+      .notNull()
+      .default(sql`(unixepoch() * 1000)`),
+  },
+  table => ({
+    createdAtIdx: index('notifications_created_at_idx').on(table.createdAt),
+  })
+)
-export type NotificationTable = typeof notifications.$inferSelect;
-export type NewNotification = typeof notifications.$inferInsert;
+export type NotificationTable = typeof notifications.$inferSelect
+export type NewNotification = typeof notifications.$inferInsert