vasp-cli 0.4.0 → 1.0.0

package/templates/shared/server/middleware/errorHandler.hbs

@@ -0,0 +1,75 @@
+import { Elysia } from 'elysia'
+
+/**
+ * Standard error class for Vasp API routes.
+ * Throw this from any route handler — the errorHandler middleware will
+ * catch it and return a structured `{ ok: false, error: { ... } }` envelope.
+ *
+ * @example throw new VaspError('NOT_FOUND', 'Recipe not found', 404)
+ */
+export class VaspError extends Error {
+  constructor(
+    code{{#if isTypeScript}}: string{{/if}},
+    message{{#if isTypeScript}}: string{{/if}},
+    statusCode{{#if isTypeScript}}: number{{/if}} = 400,
+    hint{{#if isTypeScript}}?: string{{/if}},
+  ) {
+    super(message)
+    this.name = 'VaspError'
+    this.code = code
+    this.statusCode = statusCode
+    this.hint = hint
+  }
+}
+
+/**
+ * Global error handler + response envelope middleware.
+ *
+ * - `onError`       → catches thrown errors and returns `{ ok: false, error: { code, message, hint? } }`
+ * - `onAfterHandle` → wraps successful responses in `{ ok: true, data: ... }`
+ */
+export function errorHandler() {
+  return new Elysia({ name: 'vasp-error-handler' })
+    .onError({ as: 'global' }, ({ code, error, set }) => {
+      // VaspError — structured, expected error
+      if (error instanceof VaspError) {
+        set.status = error.statusCode
+        return {
+          ok: false,
+          error: {
+            code: error.code,
+            message: error.message,
+            ...(error.hint ? { hint: error.hint } : {}),
+          },
+        }
+      }
+
+      // Elysia built-in NOT_FOUND
+      if (code === 'NOT_FOUND') {
+        set.status = 404
+        return { ok: false, error: { code: 'NOT_FOUND', message: 'Not found' } }
+      }
+
+      // Elysia validation error
+      if (code === 'VALIDATION') {
+        set.status = 400
+        return {
+          ok: false,
+          error: { code: 'VALIDATION_FAILED', message: error.message },
+        }
+      }
+
+      // Unexpected error — log and mask
+      console.error('[server error]', error)
+      set.status = 500
+      return {
+        ok: false,
+        error: { code: 'INTERNAL_ERROR', message: 'Internal server error' },
+      }
+    })
+    .onAfterHandle({ as: 'global' }, ({ response }) => {
+      // Already wrapped (e.g. from onError or explicit envelope)
+      if (response && typeof response === 'object' && 'ok' in response) return
+      return { ok: true, data: response }
+    })
+}

package/templates/shared/server/middleware/logger.hbs

@@ -0,0 +1,74 @@
+import { Elysia } from 'elysia'
+import crypto from 'node:crypto'
+
+const isDev = process.env.NODE_ENV !== 'production'
+
+const colors{{#if isTypeScript}}: Record<string, string>{{/if}} = {
+  GET: '\x1b[32m',    // green
+  POST: '\x1b[34m',   // blue
+  PUT: '\x1b[33m',    // yellow
+  PATCH: '\x1b[33m',  // yellow
+  DELETE: '\x1b[31m', // red
+  reset: '\x1b[0m',
+  dim: '\x1b[2m',
+  bold: '\x1b[1m',
+}
+
+function colorMethod(method{{#if isTypeScript}}: string{{/if}}){{#if isTypeScript}}: string{{/if}} {
+  return `${colors[method] ?? ''}${method}${colors.reset}`
+}
+
+function statusColor(status{{#if isTypeScript}}: number{{/if}}){{#if isTypeScript}}: string{{/if}} {
+  if (status < 300) return '\x1b[32m'
+  if (status < 400) return '\x1b[36m'
+  if (status < 500) return '\x1b[33m'
+  return '\x1b[31m'
+}
+
+/**
+ * Request tracing & logging middleware.
+ *
+ * - Assigns a unique `x-request-id` header to every request (UUID v4).
+ * - Logs method, path, status, and duration in dev mode.
+ * - The request ID is available in handlers via `store.requestId`.
+ */
+export function logger() {
+  return new Elysia({ name: 'vasp-logger' })
+    .derive({ as: 'scoped' }, ({ request }) => {
+      const requestId = request.headers.get('x-request-id') || crypto.randomUUID()
+      return { requestId, requestStart: performance.now() }
+    })
+    .onAfterHandle({ as: 'scoped' }, ({ request, requestId, requestStart, set }) => {
+      set.headers['x-request-id'] = requestId
+
+      if (!isDev) return
+
+      const duration = (performance.now() - requestStart).toFixed(1)
+      const url = new URL(request.url)
+      const status = typeof set.status === 'number' ? set.status : 200
+      const sc = statusColor(status)
+      console.log(
+        `${colors.dim}[${new Date().toISOString()}]${colors.reset} ` +
+        `${colorMethod(request.method)} ${url.pathname} ` +
+        `${sc}${status}${colors.reset} ${colors.dim}${duration}ms${colors.reset} ` +
+        `${colors.dim}rid:${requestId.slice(0, 8)}${colors.reset}`,
+      )
+    })
+    .onError({ as: 'scoped' }, ({ request, requestId, requestStart, set, error }) => {
+      set.headers['x-request-id'] = requestId
+
+      if (!isDev) return
+
+      const duration = (performance.now() - requestStart).toFixed(1)
+      const url = new URL(request.url)
+      const status = typeof set.status === 'number' ? set.status : 500
+      const sc = statusColor(status)
+      console.log(
+        `${colors.dim}[${new Date().toISOString()}]${colors.reset} ` +
+        `${colorMethod(request.method)} ${url.pathname} ` +
+        `${sc}${status}${colors.reset} ${colors.dim}${duration}ms${colors.reset} ` +
+        `${colors.dim}rid:${requestId.slice(0, 8)}${colors.reset} ` +
+        `${colors.bold}\x1b[31m${error.message}${colors.reset}`,
+      )
+    })
+}

package/templates/shared/server/middleware/rateLimit.hbs

@@ -1,4 +1,5 @@
 import { Elysia } from 'elysia'
+import { VaspError } from './errorHandler.{{ext}}'
 
 const MAX_REQUESTS = Number(process.env.RATE_LIMIT_MAX) || 100
 const WINDOW_MS = Number(process.env.RATE_LIMIT_WINDOW_MS) || 60_000
@@ -37,8 +38,7 @@ export function rateLimit() {
       set.headers['x-ratelimit-remaining'] = String(Math.max(0, MAX_REQUESTS - entry.count))
 
       if (entry.count > MAX_REQUESTS) {
-        set.status = 429
-        return { error: 'Too many requests. Please try again later.' }
+        throw new VaspError('RATE_LIMITED', 'Too many requests. Please try again later.', 429)
       }
     })
 }

package/templates/shared/server/routes/_vasp.hbs

@@ -0,0 +1,37 @@
+import { Elysia } from 'elysia'
+
+const isDev = process.env.NODE_ENV !== 'production'
+
+/**
+ * Vasp internal diagnostic routes.
+ *
+ * GET /api/_vasp/health — always available; returns uptime and version
+ * GET /api/_vasp/debug  — only in dev (NODE_ENV !== 'production'); returns process info
+ */
+export const vaspDiagnosticRoutes = new Elysia({ prefix: '/api/_vasp' })
+  .get('/health', ({ set }) => {
+    set.headers['cache-control'] = 'no-store'
+    return {
+      ok: true,
+      status: 'healthy',
+      version: '{{vaspVersion}}',
+      uptime: process.uptime(),
+      timestamp: new Date().toISOString(),
+    }
+  })
+  .get('/debug', ({ set }) => {
+    if (!isDev) {
+      set.status = 404
+      return { ok: false, error: { code: 'NOT_FOUND', message: 'Not found' } }
+    }
+
+    set.headers['cache-control'] = 'no-store'
+    return {
+      ok: true,
+      env: process.env.NODE_ENV ?? 'unknown',
+      nodeVersion: process.version,
+      memoryMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024),
+      pid: process.pid,
+      cwd: process.cwd(),
+    }
+  })

package/templates/shared/server/routes/actions/_action.hbs

@@ -1,13 +1,17 @@
 import { Elysia } from 'elysia'
 import { db } from '../../db/client.{{ext}}'
 {{#if requiresAuth}}
-import { requireAuth } from '../../auth/middleware.{{ext}}'
+import { requireAuth{{#if hasRoles}}, requireRole{{/if}} } from '../../auth/middleware.{{ext}}'
 {{/if}}
 import { {{namedExport}} } from '{{importPath fnSource ext}}'
 
 export const {{camelCase name}}Route = new Elysia()
 {{#if requiresAuth}}
+{{#if hasRoles}}
+  .use(requireRole([{{#each roles}}'{{this}}'{{#unless @last}}, {{/unless}}{{/each}}]))
+{{else}}
   .use(requireAuth)
+{{/if}}
   .post('/api/actions/{{camelCase name}}', async ({ body, user }) => {
     const result = await {{namedExport}}({ db, user, args: body })
     return result

package/templates/shared/server/routes/api/_api.hbs

@@ -0,0 +1,24 @@
+import { Elysia } from 'elysia'
+import { db } from '../../db/client.{{ext}}'
+{{#if requiresAuth}}
+import { requireAuth{{#if hasRoles}}, requireRole{{/if}} } from '../../auth/middleware.{{ext}}'
+{{/if}}
+import { {{namedExport}} } from '{{importPath fnSource ext}}'
+
+export const {{camelCase name}}ApiRoute = new Elysia()
+{{#if requiresAuth}}
+{{#if hasRoles}}
+  .use(requireRole([{{#each roles}}'{{this}}'{{#unless @last}}, {{/unless}}{{/each}}]))
+{{else}}
+  .use(requireAuth)
+{{/if}}
+  .{{lowerCase method}}('{{path}}', async ({ params, query, body, request, user, set }) => {
+    const result = await {{namedExport}}({ db, user, args: { params, query, body, request, set } })
+    return result
+  })
+{{else}}
+  .{{lowerCase method}}('{{path}}', async ({ params, query, body, request, set }) => {
+    const result = await {{namedExport}}({ db, args: { params, query, body, request, set } })
+    return result
+  })
+{{/if}}

package/templates/shared/server/routes/crud/_crud.hbs

@@ -1,7 +1,10 @@
 import { Elysia, t } from 'elysia'
 import { db } from '../../db/client.{{ext}}'
-import { eq, sql, asc, desc, and, ilike } from 'drizzle-orm'
+import { safeParse } from 'valibot'
+import { eq, sql, asc, desc, and } from 'drizzle-orm'
 import { {{camelCase entity}}s } from '../../../drizzle/schema.{{ext}}'
+import { Create{{pascalCase entity}}Schema, Update{{pascalCase entity}}Schema } from '../../../shared/validation.{{ext}}'
+import { VaspError } from '../../middleware/errorHandler.{{ext}}'
 {{#if hasAuth}}
 import { requireAuth } from '../../auth/middleware.{{ext}}'
 {{/if}}
@@ -18,6 +21,19 @@ export const {{camelCase entity}}CrudRoutes = new Elysia({ prefix: '/api/crud/{{
     const limit = Math.min(Math.max(Number(query.limit) || 20, 1), 100)
     const offset = Math.max(Number(query.offset) || 0, 0)
 
+{{#if hasRelations}}
+    const items = await db.query.{{camelCase entity}}s.findMany({
+      with: {
+{{#each withRelations}}
+        {{camelCase name}}: true,
+{{/each}}
+      },
+      limit,
+      offset,
+    })
+    const [countResult] = await db.select({ count: sql`count(*)::int` }).from({{camelCase entity}}s)
+    return { items, total: countResult?.count ?? 0, limit, offset }
+{{else}}
     const table = {{camelCase entity}}s
 
     // Multi-column sorting: orderBy=col1,col2 & dir=asc,desc
@@ -47,27 +63,59 @@ export const {{camelCase entity}}CrudRoutes = new Elysia({ prefix: '/api/crud/{{
       where ? countQuery.where(where) : countQuery,
     ])
 
-    return { data, total: countResult[0]?.count ?? 0, limit, offset }
+    return { items: data, total: countResult[0]?.count ?? 0, limit, offset }
+{{/if}}
   })
 {{/if}}
 {{#if (includes operations "create")}}
   .post('/', async ({ body }) => {
-    const [created] = await db.insert({{camelCase entity}}s).values(body).returning()
+    const parsed = safeParse(Create{{pascalCase entity}}Schema, body)
+    if (!parsed.success) {
+      const firstIssue = parsed.issues?.[0]
+      throw new VaspError(
+        'VALIDATION_FAILED',
+        firstIssue?.message ?? 'Invalid request payload',
+        400,
+      )
+    }
+
+    const [created] = await db.insert({{camelCase entity}}s).values(parsed.output).returning()
 {{#if hasRealtime}}
     publish{{pascalCase entity}}('created', created)
 {{/if}}
     return created
   })
 {{/if}}
-  .get('/:id', async ({ params: { id }, set }) => {
+  .get('/:id', async ({ params: { id } }) => {
+{{#if hasRelations}}
+    const item = await db.query.{{camelCase entity}}s.findFirst({
+      where: (t, { eq }) => eq(t.id, Number(id)),
+      with: {
+{{#each withRelations}}
+        {{camelCase name}}: true,
+{{/each}}
+      },
+    })
+{{else}}
     const [item] = await db.select().from({{camelCase entity}}s).where(eq({{camelCase entity}}s.id, Number(id))).limit(1)
-    if (!item) { set.status = 404; return { error: 'Not found' } }
+{{/if}}
+    if (!item) throw new VaspError('NOT_FOUND', '{{pascalCase entity}} not found', 404)
     return item
   })
 {{#if (includes operations "update")}}
-  .put('/:id', async ({ params: { id }, body, set }) => {
-    const [updated] = await db.update({{camelCase entity}}s).set(body).where(eq({{camelCase entity}}s.id, Number(id))).returning()
-    if (!updated) { set.status = 404; return { error: 'Not found' } }
+  .put('/:id', async ({ params: { id }, body }) => {
+    const parsed = safeParse(Update{{pascalCase entity}}Schema, body)
+    if (!parsed.success) {
+      const firstIssue = parsed.issues?.[0]
+      throw new VaspError(
+        'VALIDATION_FAILED',
+        firstIssue?.message ?? 'Invalid request payload',
+        400,
+      )
+    }
+
+    const [updated] = await db.update({{camelCase entity}}s).set(parsed.output).where(eq({{camelCase entity}}s.id, Number(id))).returning()
+    if (!updated) throw new VaspError('NOT_FOUND', '{{pascalCase entity}} not found', 404)
 {{#if hasRealtime}}
     publish{{pascalCase entity}}('updated', updated)
 {{/if}}
@@ -75,9 +123,9 @@ export const {{camelCase entity}}CrudRoutes = new Elysia({ prefix: '/api/crud/{{
   })
 {{/if}}
 {{#if (includes operations "delete")}}
-  .delete('/:id', async ({ params: { id }, set }) => {
+  .delete('/:id', async ({ params: { id } }) => {
     const [deleted] = await db.delete({{camelCase entity}}s).where(eq({{camelCase entity}}s.id, Number(id))).returning()
-    if (!deleted) { set.status = 404; return { error: 'Not found' } }
+    if (!deleted) throw new VaspError('NOT_FOUND', '{{pascalCase entity}} not found', 404)
 {{#if hasRealtime}}
     publish{{pascalCase entity}}('deleted', deleted)
 {{/if}}

package/templates/shared/server/routes/queries/_query.hbs

@@ -1,13 +1,17 @@
 import { Elysia } from 'elysia'
 import { db } from '../../db/client.{{ext}}'
 {{#if requiresAuth}}
-import { requireAuth } from '../../auth/middleware.{{ext}}'
+import { requireAuth{{#if hasRoles}}, requireRole{{/if}} } from '../../auth/middleware.{{ext}}'
 {{/if}}
 import { {{namedExport}} } from '{{importPath fnSource ext}}'
 
 export const {{camelCase name}}Route = new Elysia()
 {{#if requiresAuth}}
+{{#if hasRoles}}
+  .use(requireRole([{{#each roles}}'{{this}}'{{#unless @last}}, {{/unless}}{{/each}}]))
+{{else}}
   .use(requireAuth)
+{{/if}}
   .get('/api/queries/{{camelCase name}}', async ({ query, user }) => {
     const result = await {{namedExport}}({ db, user, args: query })
     return result

package/templates/shared/shared/types.hbs

@@ -0,0 +1,58 @@
+// Auto-generated by Vasp — entity interfaces derived from .vasp schema
+// Re-run `vasp build` or restart `vasp start` to regenerate
+
+{{#each entities}}
+export interface {{pascalCase name}} {
+{{#each fields}}
+{{#if isRelation}}
+{{#if isArray}}
+  {{name}}: {{pascalCase relatedEntity}}[]
+{{else}}
+  {{name}}: {{pascalCase relatedEntity}}{{#if nullable}} | null{{/if}}
+  {{name}}Id: number{{#if nullable}} | null{{/if}}
+{{/if}}
+{{else}}
+  {{name}}: {{tsFieldType type enumValues}}{{#if nullable}} | null{{/if}}
+{{/if}}
+{{/each}}
+  createdAt: Date
+  updatedAt: Date
+}
+
+export interface Create{{pascalCase name}}Input {
+{{#each fields}}
+{{#if isRelation}}
+{{#unless isArray}}
+  {{name}}Id{{#if nullable}}?{{/if}}: number
+{{/unless}}
+{{else}}
+{{#unless (includes modifiers "id")}}
+  {{name}}{{#if nullable}}?{{/if}}: {{tsFieldType type enumValues}}{{#if nullable}} | null{{/if}}
+{{/unless}}
+{{/if}}
+{{/each}}
+}
+
+export interface Update{{pascalCase name}}Input {
+{{#each fields}}
+{{#if isRelation}}
+{{#unless isArray}}
+  {{name}}Id?: number{{#if nullable}} | null{{/if}}
+{{/unless}}
+{{else}}
+{{#unless (includes modifiers "id")}}
+  {{name}}?: {{tsFieldType type enumValues}}{{#if nullable}} | null{{/if}}
+{{/unless}}
+{{/if}}
+{{/each}}
+}
+
+{{/each}}
+{{#each queries}}
+export type {{pascalCase name}}Args = Record<string, unknown>
+export type {{pascalCase name}}Return = unknown
+{{/each}}
+{{#each actions}}
+export type {{pascalCase name}}Args = Record<string, unknown>
+export type {{pascalCase name}}Return = unknown
+{{/each}}

package/templates/shared/shared/validation.hbs

@@ -0,0 +1,20 @@
+import * as v from 'valibot'
+
+{{#each entities}}
+export const Create{{pascalCase name}}Schema = v.object({
+{{#each fields}}
+{{#if isRelation}}
+{{#unless isArray}}
+  {{name}}Id: {{valibotSchema "Int" nullable true}},
+{{/unless}}
+{{else}}
+{{#unless (includes modifiers "id")}}
+  {{name}}: {{valibotSchema type nullable true enumValues}},
+{{/unless}}
+{{/if}}
+{{/each}}
+})
+
+export const Update{{pascalCase name}}Schema = v.partial(Create{{pascalCase name}}Schema)
+
+{{/each}}

package/templates/shared/tests/actions/_action.test.js.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('{{pascalCase name}} action', () => {
+  it('adds generated action test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/actions/_action.test.ts.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('{{pascalCase name}} action', () => {
+  it('adds generated action test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/auth/login.test.js.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('Auth login flow', () => {
+  it('adds generated auth test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/auth/login.test.ts.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('Auth login flow', () => {
+  it('adds generated auth test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/crud/_entity.test.js.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('{{pascalCase entity}} CRUD', () => {
+  it('adds generated CRUD test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/crud/_entity.test.ts.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('{{pascalCase entity}} CRUD', () => {
+  it('adds generated CRUD test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/queries/_query.test.js.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('{{pascalCase name}} query', () => {
+  it('adds generated query test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/queries/_query.test.ts.hbs

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest'
+
+describe('{{pascalCase name}} query', () => {
+  it('adds generated query test scaffold', () => {
+    expect(true).toBe(true)
+  })
+})

package/templates/shared/tests/setup.js.hbs

@@ -0,0 +1,5 @@
+import { beforeEach } from 'vitest'
+
+beforeEach(() => {
+  // Place global test setup here.
+})

package/templates/shared/tests/setup.ts.hbs

@@ -0,0 +1,5 @@
+import { beforeEach } from 'vitest'
+
+beforeEach(() => {
+  // Place global test setup here.
+})

package/templates/shared/tests/vitest.config.js.hbs

@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['tests/**/*.test.js'],
+    setupFiles: ['tests/setup.js'],
+  },
+})

package/templates/shared/tests/vitest.config.ts.hbs

@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['tests/**/*.test.ts'],
+    setupFiles: ['tests/setup.ts'],
+  },
+})

package/templates/shared/tsconfig.json.hbs

@@ -13,9 +13,10 @@
     "jsx": "preserve",
     "paths": {
       "@src/*": ["./src/*"],
+      "@shared/*": ["./shared/*"],
       "@vasp-framework/client": ["./src/vasp/client/index.ts"]
     }
   },
-  "include": ["src/**/*.ts", "src/**/*.vue", "server/**/*.ts", "drizzle/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.vue", "server/**/*.ts", "shared/**/*.ts", "drizzle/**/*.ts"],
   "exclude": ["node_modules", "dist", ".vasp-gen"]
 }

package/templates/spa/js/src/App.vue.hbs

@@ -1,3 +1,11 @@
+<script setup>
+import VaspErrorBoundary from './components/VaspErrorBoundary.vue'
+import VaspNotifications from './components/VaspNotifications.vue'
+</script>
+
 <template>
-  <RouterView />
+  <VaspErrorBoundary>
+    <RouterView />
+  </VaspErrorBoundary>
+  <VaspNotifications />
 </template>

package/templates/spa/js/src/components/VaspErrorBoundary.vue.hbs

@@ -0,0 +1,33 @@
+<script setup>
+import { onErrorCaptured, ref } from 'vue'
+
+const hasError = ref(false)
+const message = ref('Something went wrong')
+
+onErrorCaptured((error) => {
+  hasError.value = true
+  message.value = import.meta.env.DEV && error instanceof Error
+    ? error.message
+    : 'Something went wrong'
+  return false
+})
+</script>
+
+<template>
+  <div v-if="hasError" class="vasp-error-boundary">
+    <h2>Unexpected error</h2>
+    <p>{{ message }}</p>
+  </div>
+  <slot v-else />
+</template>
+
+<style scoped>
+.vasp-error-boundary {
+  margin: 24px;
+  padding: 16px;
+  border: 1px solid #ef4444;
+  border-radius: 8px;
+  background: #fef2f2;
+  color: #991b1b;
+}
+</style>