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

create-fullstack-scaffold 0.4.25 → 0.5.0

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 (135) hide show

package/template/src/server/app.ts CHANGED Viewed

@@ -42,7 +42,11 @@ export function createApp<T extends AppBindings = AppBindings>(_options: CreateA
         return c.json({ status: 'ok', timestamp: new Date().toISOString(), db: 'not configured' })
       }
     })
-    .post('/api/__test__/cleanup', async c => {
+  // 测试辅助端点：仅开发/测试环境注册。生产（含 Cloudflare 构建——tsup 将
+  // process.env.NODE_ENV 静态替换为 "production"）不暴露这个清库端点。
+  if (process.env.NODE_ENV !== 'production') {
+    app.post('/api/__test__/cleanup', async c => {
       try {
         const { cleanupTestDatabase } = await import('./db/test-setup')
         await cleanupTestDatabase()
@@ -52,6 +56,7 @@ export function createApp<T extends AppBindings = AppBindings>(_options: CreateA
         return c.json({ success: false as const, message: 'Failed to cleanup database' }, 500)
       }
     })
+  }
   autoRegisterRealtime(app as unknown as Parameters<typeof autoRegisterRealtime>[0])
@@ -100,6 +105,3 @@ export function createApp<T extends AppBindings = AppBindings>(_options: CreateA
   return app
 }
-export type AdminApiType = typeof adminApiRoutes
-export type ClientApiType = typeof clientApiRoutes
-export type AppType = ReturnType<typeof createApp>

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

@@ -1,117 +1,121 @@
 /**
- * @framework-baseline dd5cd4fe46320b03
- * @framework-modify
- * @reason 移除未使用的 vi import，修复 TypeScript strict 检查
- * @impact 不影响功能，仅清理代码
+ * @framework-baseline 68a6e13bffb67f13
  */
 import { describe, it, expect, beforeEach } from 'vitest'
-import { isISRRoute, generateCacheKey, createISRCache, type ISRCache } from '@server/core/isr-cache'
-describe('isISRRoute', () => {
-  it('matches static ISR routes', () => {
-    expect(isISRRoute('/')).toBe(true)
-    expect(isISRRoute('/todos')).toBe(true)
-    expect(isISRRoute('/content')).toBe(true)
-    expect(isISRRoute('/notifications')).toBe(true)
-    expect(isISRRoute('/websocket')).toBe(true)
-  })
-  it('matches dynamic content routes', () => {
-    expect(isISRRoute('/content/123')).toBe(true)
-    expect(isISRRoute('/content/content-456')).toBe(true)
-    expect(isISRRoute('/content/abc-def')).toBe(true)
-  })
-  it('does not match non-ISR routes', () => {
-    expect(isISRRoute('/api/todos')).toBe(false)
-    expect(isISRRoute('/api/health')).toBe(false)
-    expect(isISRRoute('/assets/main.js')).toBe(false)
-    expect(isISRRoute('/admin/dashboard')).toBe(false)
-    expect(isISRRoute('/health')).toBe(false)
-    expect(isISRRoute('/vite.svg')).toBe(false)
-  })
-})
-describe('generateCacheKey', () => {
-  it('normalizes root path', () => {
-    expect(generateCacheKey('/')).toBe('isr:/index')
-  })
-  it('generates keys for regular paths', () => {
-    expect(generateCacheKey('/todos')).toBe('isr:/todos')
-    expect(generateCacheKey('/content/123')).toBe('isr:/content/123')
-  })
+import { createISRCache } from '@server/core/isr-cache'
-  it('removes trailing slash', () => {
-    expect(generateCacheKey('/todos/')).toBe('isr:/todos')
-  })
-})
-describe('ISRCache (memory)', () => {
-  let cache: ISRCache
+describe('ISR Cache', () => {
+  let cache: ReturnType<typeof createISRCache>
   beforeEach(() => {
-    cache = createISRCache({ maxAge: 1, staleWhileRevalidate: 1 })
+    cache = createISRCache({ maxAge: 1, staleWhileRevalidate: 2 })
   })
-  it('returns miss for uncached routes', async () => {
-    const result = await cache.lookup('/todos')
-    expect(result.status).toBe('miss')
-    expect(result.html).toBeNull()
+  describe('lookup — no cache', () => {
+    it('should return miss for uncached path', async () => {
+      const result = await cache.lookup('/todos')
+      expect(result.status).toBe('miss')
+      expect(result.html).toBeNull()
+    })
   })
-  it('stores and retrieves pages', async () => {
-    await cache.store('/todos', '<html>todos</html>')
-    const result = await cache.lookup('/todos')
-    expect(result.status).toBe('fresh')
-    expect(result.html).toBe('<html>todos</html>')
+  describe('store → lookup fresh', () => {
+    it('should return fresh after store', async () => {
+      await cache.store('/todos', '<html>todos</html>')
+      const result = await cache.lookup('/todos')
+      expect(result.status).toBe('fresh')
+      expect(result.html).toBe('<html>todos</html>')
+    })
   })
-  it('serves stale content after maxAge', async () => {
-    cache = createISRCache({ maxAge: 0, staleWhileRevalidate: 60 })
-    await cache.store('/todos', '<html>todos</html>')
-    await new Promise(resolve => setTimeout(resolve, 10))
+  describe('store → wait → lookup stale', () => {
+    it('should return stale after maxAge', async () => {
+      await cache.store('/todos', '<html>todos</html>')
+      // Wait beyond maxAge (1s) but within staleWhileRevalidate (1+2=3s)
+      await new Promise(r => setTimeout(r, 1200))
+      const result = await cache.lookup('/todos')
+      expect(result.status).toBe('stale')
+      expect(result.html).toBe('<html>todos</html>')
+    })
+  })
-    const result = await cache.lookup('/todos')
-    expect(result.status).toBe('stale')
-    expect(result.html).toBe('<html>todos</html>')
+  describe('store → wait → lookup miss (expired)', () => {
+    it('should return miss after maxAge + staleWhileRevalidate', async () => {
+      await cache.store('/todos', '<html>todos</html>')
+      // Wait beyond both maxAge and staleWhileRevalidate
+      await new Promise(r => setTimeout(r, 3500))
+      const result = await cache.lookup('/todos')
+      expect(result.status).toBe('miss')
+      expect(result.html).toBeNull()
+    })
   })
-  it('returns miss after maxAge + staleWhileRevalidate', async () => {
-    cache = createISRCache({ maxAge: 0, staleWhileRevalidate: 0 })
+  describe('purge', () => {
+    it('should purge specific path', async () => {
+      await cache.store('/todos', '<html>todos</html>')
+      await cache.store('/content', '<html>content</html>')
-    await cache.store('/todos', '<html>todos</html>')
+      await cache.purge('/todos')
-    await new Promise(resolve => setTimeout(resolve, 10))
+      expect((await cache.lookup('/todos')).status).toBe('miss')
+      expect((await cache.lookup('/content')).status).toBe('fresh')
+    })
-    const result = await cache.lookup('/todos')
-    expect(result.status).toBe('miss')
+    it('should not error on purge of uncached path', async () => {
+      await expect(cache.purge('/never-cached')).resolves.not.toThrow()
+    })
   })
-  it('purges specific pages', async () => {
-    await cache.store('/todos', '<html>todos</html>')
-    await cache.store('/content', '<html>content</html>')
-    await cache.purge('/todos')
-    expect((await cache.lookup('/todos')).status).toBe('miss')
-    expect((await cache.lookup('/content')).status).toBe('fresh')
+  describe('purgePattern', () => {
+    it('should purge matching pattern', async () => {
+      await cache.store('/content', '<html>list</html>')
+      await cache.store('/content/article-1', '<html>a1</html>')
+      await cache.store('/content/article-2', '<html>a2</html>')
+      await cache.store('/todos', '<html>todos</html>')
+      await cache.purgePattern('isr:/content/*')
+      // /content (exact) should still be cached
+      expect((await cache.lookup('/content')).status).toBe('fresh')
+      // /content/* should be purged
+      expect((await cache.lookup('/content/article-1')).status).toBe('miss')
+      expect((await cache.lookup('/content/article-2')).status).toBe('miss')
+      // /todos should be unaffected
+      expect((await cache.lookup('/todos')).status).toBe('fresh')
+    })
   })
-  it('purges by pattern', async () => {
-    await cache.store('/content', '<html>list</html>')
-    await cache.store('/content/123', '<html>detail 123</html>')
-    await cache.store('/content/456', '<html>detail 456</html>')
-    await cache.store('/todos', '<html>todos</html>')
-    await cache.purgePattern('isr:/content/*')
-    expect((await cache.lookup('/content')).status).toBe('fresh')
-    expect((await cache.lookup('/content/123')).status).toBe('miss')
-    expect((await cache.lookup('/content/456')).status).toBe('miss')
-    expect((await cache.lookup('/todos')).status).toBe('fresh')
+  describe('full lifecycle', () => {
+    it('miss → store → fresh → purge → miss', async () => {
+      // Step 1: Initial miss
+      let result = await cache.lookup('/todos')
+      expect(result.status).toBe('miss')
+      // Step 2: Store
+      await cache.store('/todos', '<html>todos v1</html>')
+      // Step 3: Fresh hit
+      result = await cache.lookup('/todos')
+      expect(result.status).toBe('fresh')
+      expect(result.html).toBe('<html>todos v1</html>')
+      // Step 4: Purge
+      await cache.purge('/todos')
+      // Step 5: Miss again
+      result = await cache.lookup('/todos')
+      expect(result.status).toBe('miss')
+    })
+    it('store v1 → purge → store v2 → returns v2', async () => {
+      await cache.store('/todos', '<html>v1</html>')
+      await cache.purge('/todos')
+      await cache.store('/todos', '<html>v2</html>')
+      const result = await cache.lookup('/todos')
+      expect(result.status).toBe('fresh')
+      expect(result.html).toBe('<html>v2</html>')
+    })
   })
 })

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

@@ -15,6 +15,25 @@ import {
 } from '@server/core/isr-invalidation'
 import { createISRCache } from '@server/core/isr-cache'
+// Side-effect: 注册 ISR 路由到全局 registry（purgeAllPages 遍历它）。
+// todos/content 在部分 preset 中不存在 —— 均为可选导入
+const todosIsrModule = '@server/module-todos/isr'
+let hasTodosModule = false
+try {
+  await import(/* @vite-ignore */ todosIsrModule)
+  hasTodosModule = true
+} catch {
+  // preset 无 todos 模块（forum/xbrowser 等）
+}
+const contentIsrModule = '@server/module-content/isr'
+let hasContentModule = false
+try {
+  await import(/* @vite-ignore */ contentIsrModule)
+  hasContentModule = true
+} catch {
+  // preset 无 content 模块
+}
 describe('isr-invalidation', () => {
   it('returns null cache when not set', () => {
     expect(getISRCache()).toBeNull()
@@ -63,10 +82,16 @@ describe('isr-invalidation', () => {
       await purgeAllPages()
-      expect((await cache.lookup('/')).status).toBe('miss')
-      expect((await cache.lookup('/todos')).status).toBe('miss')
-      expect((await cache.lookup('/content')).status).toBe('miss')
-      expect((await cache.lookup('/content/123')).status).toBe('miss')
+      if (hasTodosModule) {
+        // '/' 与 '/todos' 路由由 todos 模块注册，仅含 todos 的 preset 可断言
+        expect((await cache.lookup('/')).status).toBe('miss')
+        expect((await cache.lookup('/todos')).status).toBe('miss')
+      }
+      if (hasContentModule) {
+        // content 相关页仅在 preset 含 content 模块时被注册、才可被清理
+        expect((await cache.lookup('/content')).status).toBe('miss')
+        expect((await cache.lookup('/content/123')).status).toBe('miss')
+      }
     })
   })
 })

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

@@ -0,0 +1,215 @@
+/**
+ * @framework-baseline 560bce7dbeafc84a
+ *
+ * @framework-modify
+ * @reason prettier 格式化导致内容哈希与初始基准漂移，补记说明
+ * @impact 仅格式，无逻辑改动
+ */
+import { describe, it, expect, beforeEach } from 'vitest'
+import { createISRRegistry } from '@server/core/isr-registry'
+describe('ISR Registry', () => {
+  let registry: ReturnType<typeof createISRRegistry>
+  beforeEach(() => {
+    registry = createISRRegistry()
+  })
+  describe('register', () => {
+    it('should register a single route', () => {
+      registry.register({
+        module: 'todos',
+        match: '/todos',
+        fetch: async () => ({}),
+        meta: () => ({ title: 'Todos', description: 'Todo list' }),
+      })
+      expect(registry.getAll()).toHaveLength(1)
+    })
+    it('should register multiple routes', () => {
+      registry.registerMany([
+        {
+          module: 'todos',
+          match: '/todos',
+          fetch: async () => ({}),
+          meta: () => ({ title: 'Todos', description: '' }),
+        },
+        {
+          module: 'content',
+          match: '/content',
+          fetch: async () => ({}),
+          meta: () => ({ title: 'Content', description: '' }),
+        },
+      ])
+      expect(registry.getAll()).toHaveLength(2)
+    })
+    it('should update existing entry on re-register', () => {
+      registry.register({
+        module: 'todos',
+        match: '/todos',
+        fetch: async () => ({}),
+        meta: () => ({ title: 'v1', description: '' }),
+      })
+      registry.register({
+        module: 'todos',
+        match: '/todos',
+        fetch: async () => ({}),
+        meta: () => ({ title: 'v2', description: '' }),
+      })
+      expect(registry.getAll()).toHaveLength(1)
+      expect(registry.getAll()[0].meta({}, '')).toEqual({ title: 'v2', description: '' })
+    })
+  })
+  describe('match — exact paths', () => {
+    it('should match exact path', () => {
+      registry.register({
+        module: 'todos',
+        match: '/todos',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      const entry = registry.match('/todos')
+      expect(entry).not.toBeNull()
+      expect(entry!.module).toBe('todos')
+    })
+    it('should not match wrong exact path', () => {
+      registry.register({
+        module: 'todos',
+        match: '/todos',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      expect(registry.match('/orders')).toBeNull()
+    })
+    it('should match root /', () => {
+      registry.register({
+        module: 'home',
+        match: '/',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      expect(registry.match('/')).not.toBeNull()
+      expect(registry.match('/todos')).toBeNull()
+    })
+  })
+  describe('match — prefix paths', () => {
+    it('should match prefix /content/', () => {
+      registry.register({
+        module: 'content',
+        match: '/content/',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      expect(registry.match('/content/content-1')).not.toBeNull()
+      expect(registry.match('/content/any-id')).not.toBeNull()
+    })
+    it('should not match prefix for unrelated path', () => {
+      registry.register({
+        module: 'content',
+        match: '/content/',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      expect(registry.match('/todos')).toBeNull()
+    })
+    it('should prefer exact match over prefix', () => {
+      registry.register({
+        module: 'content-detail',
+        match: '/content/',
+        fetch: async () => ({}),
+        meta: () => ({ title: 'detail', description: '' }),
+      })
+      registry.register({
+        module: 'content-list',
+        match: '/content',
+        fetch: async () => ({}),
+        meta: () => ({ title: 'list', description: '' }),
+      })
+      const exact = registry.match('/content')
+      const prefix = registry.match('/content/article-1')
+      expect(exact!.module).toBe('content-list')
+      expect(prefix!.module).toBe('content-detail')
+    })
+  })
+  describe('match — function matchers', () => {
+    it('should match via function', () => {
+      registry.register({
+        module: 'custom',
+        match: pathname => pathname.startsWith('/shop/'),
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      expect(registry.match('/shop/product-1')).not.toBeNull()
+      expect(registry.match('/shop/')).not.toBeNull()
+      expect(registry.match('/other')).toBeNull()
+    })
+  })
+  describe('isISRRoute', () => {
+    it('should return true for registered routes', () => {
+      registry.register({
+        module: 'todos',
+        match: '/todos',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      expect(registry.isISRRoute('/todos')).toBe(true)
+    })
+    it('should return false for unregistered routes', () => {
+      expect(registry.isISRRoute('/unknown')).toBe(false)
+    })
+  })
+  describe('getExactPaths', () => {
+    it('should return all exact path strings', () => {
+      registry.registerMany([
+        {
+          module: 'a',
+          match: '/a',
+          fetch: async () => ({}),
+          meta: () => ({ title: '', description: '' }),
+        },
+        {
+          module: 'b',
+          match: '/b/',
+          fetch: async () => ({}),
+          meta: () => ({ title: '', description: '' }),
+        },
+        {
+          module: 'c',
+          match: '/c',
+          fetch: async () => ({}),
+          meta: () => ({ title: '', description: '' }),
+        },
+      ])
+      const paths = registry.getExactPaths()
+      expect(paths).toContain('/a')
+      expect(paths).toContain('/b/')
+      expect(paths).toContain('/c')
+      expect(paths).toHaveLength(3)
+    })
+  })
+  describe('clear', () => {
+    it('should remove all entries', () => {
+      registry.register({
+        module: 'a',
+        match: '/a',
+        fetch: async () => ({}),
+        meta: () => ({ title: '', description: '' }),
+      })
+      registry.clear()
+      expect(registry.getAll()).toHaveLength(0)
+    })
+  })
+})

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) {