@jasonshimmy/vite-plugin-cer-app 0.1.0 → 0.1.2

package/src/__tests__/plugin/virtual/server-middleware.test.ts

@@ -0,0 +1,102 @@
+import { vi, describe, it, expect, beforeEach } from 'vitest'
+
+vi.mock('node:fs', () => ({ existsSync: vi.fn() }))
+vi.mock('../../../plugin/scanner.js', () => ({ scanDirectory: vi.fn() }))
+
+import { existsSync } from 'node:fs'
+import { scanDirectory } from '../../../plugin/scanner.js'
+import { generateServerMiddlewareCode } from '../../../plugin/virtual/server-middleware.js'
+
+const MIDDLEWARE_DIR = '/project/server/middleware'
+
+describe('generateServerMiddlewareCode', () => {
+  beforeEach(() => {
+    vi.mocked(existsSync).mockReturnValue(true)
+    vi.mocked(scanDirectory).mockResolvedValue([])
+  })
+
+  it('returns empty serverMiddleware when directory does not exist', async () => {
+    vi.mocked(existsSync).mockReturnValue(false)
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('export const serverMiddleware = []')
+    expect(code).toContain('export default serverMiddleware')
+  })
+
+  it('returns empty serverMiddleware when no files found', async () => {
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('export const serverMiddleware = []')
+    expect(code).toContain('export default serverMiddleware')
+  })
+
+  it('includes AUTO-GENERATED comment', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/logger.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('AUTO-GENERATED by @jasonshimmy/vite-plugin-cer-app')
+  })
+
+  it('generates import for a middleware file', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/logger.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain(`import _sm_logger from "${MIDDLEWARE_DIR}/logger.ts"`)
+  })
+
+  it('registers middleware with its name and handler', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/logger.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('name: "logger"')
+    expect(code).toContain('handler: _sm_logger?.default ?? _sm_logger')
+  })
+
+  it('exports serverMiddleware as both named and default export', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/logger.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('export const serverMiddleware = [')
+    expect(code).toContain('export default serverMiddleware')
+  })
+
+  it('replaces dashes with underscores in the alias identifier', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/check-auth.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('_sm_check_auth')
+    expect(code).toContain('name: "check-auth"')
+  })
+
+  it('prepends underscore to identifiers starting with a digit', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/1first.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('_sm__1first')
+  })
+
+  it('handles multiple middleware files', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([
+      `${MIDDLEWARE_DIR}/logger.ts`,
+      `${MIDDLEWARE_DIR}/auth.ts`,
+    ])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('name: "auth"')
+    expect(code).toContain('name: "logger"')
+  })
+
+  it('sorts middleware files alphabetically', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([
+      `${MIDDLEWARE_DIR}/zz-last.ts`,
+      `${MIDDLEWARE_DIR}/aa-first.ts`,
+    ])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    const authIdx = code.indexOf('aa-first')
+    const loggerIdx = code.indexOf('zz-last')
+    expect(authIdx).toBeLessThan(loggerIdx)
+  })
+
+  it('ends with a newline', async () => {
+    vi.mocked(scanDirectory).mockResolvedValue([`${MIDDLEWARE_DIR}/logger.ts`])
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code.endsWith('\n')).toBe(true)
+  })
+
+  it('returns AUTO-GENERATED comment even when directory is missing', async () => {
+    vi.mocked(existsSync).mockReturnValue(false)
+    const code = await generateServerMiddlewareCode(MIDDLEWARE_DIR)
+    expect(code).toContain('AUTO-GENERATED by @jasonshimmy/vite-plugin-cer-app')
+  })
+})

package/src/__tests__/runtime/use-page-data.test.ts

@@ -1,10 +1,16 @@
-import { describe, it, expect, beforeEach } from 'vitest'
+import { describe, it, expect, beforeEach, afterEach } from 'vitest'
+import { AsyncLocalStorage } from 'node:async_hooks'
 import { usePageData } from '../../runtime/composables/use-page-data.js'
 
 describe('usePageData', () => {
   beforeEach(() => {
     // Clean up global state between tests
     delete (globalThis as Record<string, unknown>)['__CER_DATA__']
+    delete (globalThis as Record<string, unknown>)['__CER_DATA_STORE__']
+  })
+
+  afterEach(() => {
+    delete (globalThis as Record<string, unknown>)['__CER_DATA_STORE__']
   })
 
   it('returns null when no SSR data is present', () => {
@@ -17,16 +23,16 @@ describe('usePageData', () => {
     expect(usePageData()).toEqual(data)
   })
 
-  it('clears __CER_DATA__ after the first read', () => {
+  it('does NOT clear __CER_DATA__ on read (cleared by app.ts after router.replace)', () => {
     ;(globalThis as Record<string, unknown>)['__CER_DATA__'] = { title: 'Hello' }
     usePageData()
-    expect((globalThis as Record<string, unknown>)['__CER_DATA__']).toBeUndefined()
+    expect((globalThis as Record<string, unknown>)['__CER_DATA__']).toEqual({ title: 'Hello' })
   })
 
-  it('returns null on subsequent calls after the data has been consumed', () => {
+  it('returns the same data on subsequent calls (not consumed on first read)', () => {
     ;(globalThis as Record<string, unknown>)['__CER_DATA__'] = { title: 'Hello' }
     usePageData()
-    expect(usePageData()).toBeNull()
+    expect(usePageData()).toEqual({ title: 'Hello' })
   })
 
   it('is generic and preserves the typed shape', () => {
@@ -43,3 +49,73 @@ describe('usePageData', () => {
     expect(usePageData()).toBeNull()
   })
 })
+
+describe('usePageData — AsyncLocalStorage (server-side)', () => {
+  let store: AsyncLocalStorage<unknown>
+
+  beforeEach(() => {
+    delete (globalThis as Record<string, unknown>)['__CER_DATA__']
+    store = new AsyncLocalStorage()
+    ;(globalThis as Record<string, unknown>)['__CER_DATA_STORE__'] = store
+  })
+
+  afterEach(() => {
+    delete (globalThis as Record<string, unknown>)['__CER_DATA_STORE__']
+    delete (globalThis as Record<string, unknown>)['__CER_DATA__']
+  })
+
+  it('reads data from the ALS store when available', () => {
+    const data = { title: 'SSR Post', body: 'Hello from ALS' }
+    store.run(data, () => {
+      expect(usePageData()).toEqual(data)
+    })
+  })
+
+  it('returns null when ALS store is empty (null)', () => {
+    store.run(null, () => {
+      expect(usePageData()).toBeNull()
+    })
+  })
+
+  it('prefers ALS store over globalThis.__CER_DATA__', () => {
+    const alsData = { source: 'als' }
+    const globalData = { source: 'global' }
+    ;(globalThis as Record<string, unknown>)['__CER_DATA__'] = globalData
+    store.run(alsData, () => {
+      expect(usePageData()).toEqual(alsData)
+    })
+  })
+
+  it('does NOT delete __CER_DATA__ when returning ALS data', () => {
+    const globalData = { source: 'global' }
+    ;(globalThis as Record<string, unknown>)['__CER_DATA__'] = globalData
+    store.run({ source: 'als' }, () => {
+      usePageData()
+    })
+    // global data should still be present — ALS path doesn't consume it
+    expect((globalThis as Record<string, unknown>)['__CER_DATA__']).toEqual(globalData)
+  })
+
+  it('falls back to __CER_DATA__ when ALS store has no value outside run()', () => {
+    // Outside any store.run() context, getStore() returns undefined
+    const data = { fallback: true }
+    ;(globalThis as Record<string, unknown>)['__CER_DATA__'] = data
+    // store is set but we're outside a run() context → getStore() === undefined
+    expect(usePageData()).toEqual(data)
+  })
+
+  it('returns null when both ALS and __CER_DATA__ are absent', () => {
+    store.run(null, () => {
+      expect(usePageData()).toBeNull()
+    })
+  })
+
+  it('is safe to call multiple times inside same ALS context', () => {
+    const data = { count: 42 }
+    store.run(data, () => {
+      expect(usePageData()).toEqual(data)
+      // ALS data is NOT consumed on read, so a second call still returns it
+      expect(usePageData()).toEqual(data)
+    })
+  })
+})

package/src/__tests__/types/config.test.ts

@@ -0,0 +1,23 @@
+import { describe, it, expect } from 'vitest'
+import { defineConfig } from '../../types/config.js'
+
+describe('defineConfig', () => {
+  it('returns the config object unchanged', () => {
+    const config = { mode: 'spa' as const, port: 4000 }
+    expect(defineConfig(config)).toBe(config)
+  })
+
+  it('accepts an empty config object', () => {
+    expect(defineConfig({})).toEqual({})
+  })
+
+  it('preserves nested ssr config', () => {
+    const config = { ssr: { dsd: false, streaming: true } }
+    expect(defineConfig(config)).toEqual(config)
+  })
+
+  it('preserves nested ssg config', () => {
+    const config = { ssg: { routes: ['/a', '/b'], concurrency: 2 } }
+    expect(defineConfig(config)).toEqual(config)
+  })
+})

package/src/cli/commands/generate.ts

@@ -77,5 +77,7 @@ export function generateCommand(): Command {
       }
 
       await buildSSG(config, viteUserConfig)
+      // Force exit: the SSG path-enumeration Vite server may keep alive Node timers.
+      process.exit(0)
     })
 }

package/src/cli/commands/preview.ts

@@ -95,9 +95,13 @@ export function previewCommand(): Command {
       const distDir = join(root, 'dist')
       const serverBundle = join(distDir, 'server/server.js')
 
-      // Check if SSR server bundle exists
+      // Check if SSR server bundle exists.
+      // An SSG build also produces a server bundle, but previewing SSG means serving
+      // the pre-rendered static HTML — detect the SSG manifest to avoid switching to
+      // live SSR mode for SSG builds.
       const hasServerBundle = existsSync(serverBundle)
-      const useSSR = options.ssr || hasServerBundle
+      const hasSsgManifest = existsSync(join(distDir, 'ssg-manifest.json'))
+      const useSSR = options.ssr || (hasServerBundle && !hasSsgManifest)
 
       if (useSSR && hasServerBundle) {
         console.log('[cer-app] Starting SSR preview server...')
@@ -200,6 +204,21 @@ export function previewCommand(): Command {
         }
 
         const server = createHttpServer((req: IncomingMessage, res: ServerResponse) => {
+          const urlPath = (req.url ?? '/').split('?')[0]
+          // SSG builds put assets in dist/client/ while HTML lives in dist/.
+          // For requests with a non-HTML file extension, check dist/client/ first
+          // so the static server finds the Vite-built JS/CSS bundles.
+          const clientDist = join(distDir, 'client')
+          const ext = extname(urlPath).toLowerCase()
+          if (ext && ext !== '.html' && existsSync(clientDist)) {
+            const assetPath = join(clientDist, urlPath)
+            if (existsSync(assetPath) && !statSync(assetPath).isDirectory()) {
+              res.setHeader('Content-Type', getMimeType(assetPath))
+              res.setHeader('Cache-Control', 'no-cache')
+              createReadStream(assetPath).pipe(res)
+              return
+            }
+          }
           const served = serveStaticFile(req, res, distDir)
           if (!served) {
             res.statusCode = 404

package/src/cli/create/index.ts

@@ -198,7 +198,7 @@ async function generateInlineTemplate(
         },
         devDependencies: {
           vite: '^5.0.0',
-          'vite-plugin-cer-app': '^0.1.0',
+          '@jasonshimmy/vite-plugin-cer-app': '^0.1.0',
           typescript: '^5.4.0',
         },
       },
@@ -211,7 +211,7 @@ async function generateInlineTemplate(
   // cer.config.ts
   await writeFile(
     join(targetDir, 'cer.config.ts'),
-    `import { defineConfig } from 'vite-plugin-cer-app'\n\nexport default defineConfig({\n  mode: '${mode}',\n  autoImports: { components: true, composables: true, directives: true, runtime: true },\n})\n`,
+    `import { defineConfig } from '@jasonshimmy/vite-plugin-cer-app'\n\nexport default defineConfig({\n  mode: '${mode}',\n  autoImports: { components: true, composables: true, directives: true, runtime: true },\n})\n`,
     'utf-8',
   )
 

package/src/cli/create/templates/spa/cer.config.ts.tpl

@@ -1,4 +1,4 @@
-import { defineConfig } from 'vite-plugin-cer-app'
+import { defineConfig } from '@jasonshimmy/vite-plugin-cer-app'
 
 export default defineConfig({
   mode: 'spa',

package/src/cli/create/templates/spa/package.json.tpl

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "vite": "^5.0.0",
-    "vite-plugin-cer-app": "^0.1.0",
+    "@jasonshimmy/vite-plugin-cer-app": "^0.1.0",
     "typescript": "^5.4.0"
   }
 }

package/src/cli/create/templates/ssg/cer.config.ts.tpl

@@ -1,4 +1,4 @@
-import { defineConfig } from 'vite-plugin-cer-app'
+import { defineConfig } from '@jasonshimmy/vite-plugin-cer-app'
 
 export default defineConfig({
   mode: 'ssg',

package/src/cli/create/templates/ssg/package.json.tpl

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "vite": "^5.0.0",
-    "vite-plugin-cer-app": "^0.1.0",
+    "@jasonshimmy/vite-plugin-cer-app": "^0.1.0",
     "typescript": "^5.4.0"
   }
 }

package/src/cli/create/templates/ssr/cer.config.ts.tpl

@@ -1,4 +1,4 @@
-import { defineConfig } from 'vite-plugin-cer-app'
+import { defineConfig } from '@jasonshimmy/vite-plugin-cer-app'
 
 export default defineConfig({
   mode: 'ssr',

package/src/cli/create/templates/ssr/package.json.tpl

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "vite": "^5.0.0",
-    "vite-plugin-cer-app": "^0.1.0",
+    "@jasonshimmy/vite-plugin-cer-app": "^0.1.0",
     "typescript": "^5.4.0"
   }
 }

package/src/cli/index.ts

@@ -17,4 +17,4 @@ program.addCommand(buildCommand())
 program.addCommand(previewCommand())
 program.addCommand(generateCommand())
 
-program.parse(process.argv)
+await program.parseAsync(process.argv)

package/src/plugin/build-ssg.ts

@@ -1,4 +1,4 @@
-import { writeFile, mkdir, readFile } from 'node:fs/promises'
+import { writeFile, mkdir } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import { join } from 'pathe'
 import { createServer, build, type UserConfig } from 'vite'
@@ -101,14 +101,13 @@ let _serverMod: Record<string, unknown> | null = null
 /**
  * Renders a single path using the SSR server bundle and returns the HTML.
  *
- * The server bundle exports `handler` — an Express-style (req, res) middleware
- * produced by createStreamingSSRHandler.  We call it with a mock req/res that
- * captures the final HTML string via res.end().
+ * The server bundle's handler already merges the SSR output with
+ * dist/client/index.html internally (via the _mergeWithClientTemplate helper
+ * it embeds at build time), so this function simply captures the response.
  */
 async function renderPath(
   path: string,
   serverBundlePath: string,
-  clientDistDir: string,
 ): Promise<string> {
   // Load server bundle once
   if (!_serverMod) {
@@ -130,28 +129,17 @@ async function renderPath(
     return ''
   }
 
-  // Mock req/res for the Express-style handler
+  // Mock req/res for the Express-style handler.
+  // The handler internally merges with dist/client/index.html, so we just
+  // capture whatever it ends with.
   const mockReq = { url: path, headers: {} }
-  const html = await new Promise<string>((resolve, reject) => {
+  return new Promise<string>((resolve, reject) => {
     const mockRes = {
       setHeader: () => {},
-      // Intentionally omit write() so the handler uses the non-streaming code path
       end: (body: string) => resolve(body),
     }
     ;(handlerFn as Function)(mockReq, mockRes).catch(reject)
   })
-
-  // Read the client index.html template and inject the server-rendered body
-  const templatePath = join(clientDistDir, 'index.html')
-  if (!existsSync(templatePath)) return html
-
-  const template = await readFile(templatePath, 'utf-8')
-  // The handler already emits a full document; just return it as-is
-  // If it only emits a fragment we fall back to injecting into the template
-  if (html.trimStart().startsWith('<!DOCTYPE') || html.trimStart().startsWith('<html')) {
-    return html
-  }
-  return template.replace('<div id="app"></div>', `<div id="app">${html}</div>`)
 }
 
 /**
@@ -190,7 +178,6 @@ export async function buildSSG(
   viteUserConfig: UserConfig = {},
 ): Promise<void> {
   const distDir = join(config.root, 'dist')
-  const clientDistDir = join(distDir, 'client')
   const serverDistDir = join(distDir, 'server')
   const serverBundlePath = join(serverDistDir, 'server.js')
 
@@ -222,7 +209,7 @@ export async function buildSSG(
     const results = await Promise.allSettled(
       chunk.map(async (path) => {
         console.log(`[cer-app] Generating: ${path}`)
-        const html = await renderPath(path, serverBundlePath, clientDistDir)
+        const html = await renderPath(path, serverBundlePath)
         await writeRenderedPath(path, html, distDir)
         return path
       }),