@stacksjs/defaults 0.70.355 → 0.70.356

package/app/Actions/Teams/AcceptInvitationAction.ts

@@ -13,6 +13,7 @@ import {
   sqlTimestamp,
 } from '../Dashboard/Teams/team-records'
 import { syncTeamMemberCount } from '../Dashboard/Teams/team-member-count'
+import { teamOperationalError } from './team-response'
 
 export default new Action({
   name: 'Accept Team Invitation',
@@ -25,23 +26,38 @@ export default new Action({
     if (!token || token.length > 200)
       return response.json({ message: 'Invitation not found.' }, 404)
 
-    const authenticated = await resolveAuthenticatedUser(request as any)
+    let authenticated
+    try {
+      authenticated = await resolveAuthenticatedUser(request as any)
+    }
+    catch (error) {
+      return teamOperationalError(error, 'Authentication could not be verified.', 'AcceptInvitationAction.auth')
+    }
     if (!authenticated?.id)
       return response.json({ message: 'Sign in to accept this invitation.' }, 401)
 
-    const user = await db
-      .selectFrom('users')
-      .where('id', '=', authenticated.id)
-      .select(['id', 'email'])
-      .executeTakeFirst()
+    const tokenHash = hashInvitationToken(token)
+    let user
+    let invitation
+    try {
+      [user, invitation] = await Promise.all([
+        db
+          .selectFrom('users')
+          .where('id', '=', authenticated.id)
+          .select(['id', 'email'])
+          .executeTakeFirst(),
+        (db as any)
+          .selectFrom('team_invitations')
+          .where('token_hash', '=', tokenHash)
+          .select(['id', 'team_id', 'email', 'role', 'status', 'expires_at'])
+          .executeTakeFirst(),
+      ])
+    }
+    catch (error) {
+      return teamOperationalError(error, 'Invitation acceptance could not be prepared.', 'AcceptInvitationAction.lookup')
+    }
     if (!user)
       return response.json({ message: 'Authenticated user not found.' }, 401)
-
-    const invitation = await (db as any)
-      .selectFrom('team_invitations')
-      .where('token_hash', '=', hashInvitationToken(token))
-      .select(['id', 'team_id', 'email', 'role', 'status', 'expires_at'])
-      .executeTakeFirst()
     if (!invitation)
       return response.json({ message: 'Invitation not found.' }, 404)
 
@@ -58,49 +74,56 @@ export default new Action({
     const userId = Number(user.id)
     const now = sqlTimestamp()
 
-    const accepted = await db.transaction(async (rawTrx) => {
-      const trx = rawTrx as unknown as typeof db
-      const claim = await (trx as any)
-        .updateTable('team_invitations')
-        .set({
-          status: 'accepted',
-          token_hash: hashInvitationToken(generateInvitationToken()),
-          accepted_by_user_id: userId,
-          accepted_at: now,
-          updated_at: now,
-        })
-        .where('id', '=', Number(invitation.id))
-        .where('token_hash', '=', hashInvitationToken(token))
-        .where('status', '=', 'pending')
-        .executeTakeFirst()
+    let accepted
+    try {
+      accepted = await db.transaction(async (rawTrx) => {
+        const trx = rawTrx as unknown as typeof db
+        const claim = await (trx as any)
+          .updateTable('team_invitations')
+          .set({
+            status: 'accepted',
+            token_hash: hashInvitationToken(generateInvitationToken()),
+            pending_key: null,
+            accepted_by_user_id: userId,
+            accepted_at: now,
+            updated_at: now,
+          })
+          .where('id', '=', Number(invitation.id))
+          .where('token_hash', '=', tokenHash)
+          .where('status', '=', 'pending')
+          .executeTakeFirst()
 
-      if (changedRows(claim) !== 1)
-        return null
+        if (changedRows(claim) !== 1)
+          return null
 
-      const existing = await (trx as any)
-        .selectFrom('team_members')
-        .where('team_id', '=', teamId)
-        .where('user_id', '=', userId)
-        .select(['id'])
-        .executeTakeFirst()
+        const existing = await (trx as any)
+          .selectFrom('team_members')
+          .where('team_id', '=', teamId)
+          .where('user_id', '=', userId)
+          .select(['id'])
+          .executeTakeFirst()
 
-      if (!existing) {
-        await (trx as any)
-          .insertInto('team_members')
-          .values({
-            team_id: teamId,
-            user_id: userId,
-            role: String(invitation.role),
-            status: 'active',
-            created_at: now,
-            uuid: randomUUID(),
-          })
-          .execute()
-      }
+        if (!existing) {
+          await (trx as any)
+            .insertInto('team_members')
+            .values({
+              team_id: teamId,
+              user_id: userId,
+              role: String(invitation.role),
+              status: 'active',
+              created_at: now,
+              uuid: randomUUID(),
+            })
+            .execute()
+        }
 
-      await syncTeamMemberCount(teamId, trx)
-      return { alreadyMember: Boolean(existing) }
-    })
+        await syncTeamMemberCount(teamId, trx)
+        return { alreadyMember: Boolean(existing) }
+      })
+    }
+    catch (error) {
+      return teamOperationalError(error, 'The invitation could not be accepted.', 'AcceptInvitationAction.accept', 500)
+    }
 
     if (!accepted)
       return response.json({ message: 'This invitation is no longer available.' }, 409)

package/app/Actions/Teams/ShowInvitationAction.ts

@@ -3,6 +3,7 @@ import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
 import { response } from '@stacksjs/router'
 import { hashInvitationToken, invitationStatus } from '../Dashboard/Teams/team-records'
+import { teamOperationalError } from './team-response'
 
 export default new Action({
   name: 'Show Team Invitation',
@@ -15,20 +16,26 @@ export default new Action({
     if (!token || token.length > 200)
       return response.json({ message: 'Invitation not found.' }, 404)
 
-    const invitation = await (db as any)
-      .selectFrom('team_invitations')
-      .innerJoin('teams', 'teams.id', '=', 'team_invitations.team_id')
-      .where('team_invitations.token_hash', '=', hashInvitationToken(token))
-      .select([
-        'team_invitations.id as id',
-        'team_invitations.team_id as team_id',
-        'team_invitations.email as email',
-        'team_invitations.role as role',
-        'team_invitations.status as status',
-        'team_invitations.expires_at as expires_at',
-        'teams.name as team_name',
-      ])
-      .executeTakeFirst()
+    let invitation
+    try {
+      invitation = await (db as any)
+        .selectFrom('team_invitations')
+        .innerJoin('teams', 'teams.id', '=', 'team_invitations.team_id')
+        .where('team_invitations.token_hash', '=', hashInvitationToken(token))
+        .select([
+          'team_invitations.id as id',
+          'team_invitations.team_id as team_id',
+          'team_invitations.email as email',
+          'team_invitations.role as role',
+          'team_invitations.status as status',
+          'team_invitations.expires_at as expires_at',
+          'teams.name as team_name',
+        ])
+        .executeTakeFirst()
+    }
+    catch (error) {
+      return teamOperationalError(error, 'Invitation details could not be loaded.', 'ShowInvitationAction')
+    }
     if (!invitation)
       return response.json({ message: 'Invitation not found.' }, 404)
 

package/app/Actions/Teams/team-response.ts

@@ -0,0 +1,23 @@
+import { response } from '@stacksjs/router'
+
+export class TeamStateConflictError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'TeamStateConflictError'
+  }
+}
+
+export function teamOperationalError(
+  error: unknown,
+  message: string,
+  action: string,
+  status = 503,
+): Response {
+  console.error(`[teams/api] ${action} failed:`, error)
+  return response.json({ message }, status)
+}
+
+export function teamOperationalIssue(error: unknown, message: string, action: string): string {
+  console.error(`[teams/api] ${action} failed:`, error)
+  return message
+}

package/app/Mail/OrderConfirmation.ts

@@ -48,7 +48,7 @@ export async function sendOrderConfirmation(options: OrderConfirmationOptions):
     subject: `Your ${appName} order #${options.orderId} is confirmed`,
   })
 
-  await mail.send({
+  await mail.sendOrFail({
     to: [options.to],
     from: { name: appName, address: fromAddress },
     subject: `Your ${appName} order #${options.orderId} is confirmed`,

package/app/Mail/SubscriptionConfirmation.ts

@@ -26,7 +26,7 @@ export async function sendSubscriptionConfirmation(options: SubscriptionConfirma
     subject: `Welcome to ${appName}!`,
   })
 
-  await mail.send({
+  await mail.sendOrFail({
     to: [to],
     from: {
       name: config.email.from?.name || appName,

package/app/Mail/TeamInvitation.ts

@@ -23,7 +23,7 @@ export async function sendTeamInvitation(options: TeamInvitationMailOptions): Pr
     subject,
   })
 
-  await mail.send({
+  await mail.sendOrFail({
     to: [options.to],
     from: {
       name: config.email.from?.name || appName,

package/app/Models/EmailIdempotency.ts

@@ -0,0 +1,64 @@
+import { defineModel } from '@stacksjs/orm'
+import { schema } from '@stacksjs/validation'
+
+export default defineModel({
+  name: 'EmailIdempotency',
+  table: 'email_idempotency',
+  primaryKey: 'id',
+  autoIncrement: true,
+
+  traits: {
+    useTimestamps: true,
+    useApi: {
+      uri: 'email-idempotency',
+      routes: ['index', 'show', 'destroy'],
+      middleware: ['auth'],
+    },
+  },
+
+  attributes: {
+    idempotencyKey: {
+      required: true,
+      hidden: true,
+      unique: true,
+      validation: {
+        rule: schema.string().required().max(255),
+      },
+    },
+    messageId: {
+      required: false,
+      validation: {
+        rule: schema.string().max(512),
+      },
+    },
+    recipient: {
+      required: false,
+      hidden: true,
+      validation: {
+        rule: schema.string().max(2000),
+      },
+    },
+    subject: {
+      required: false,
+      hidden: true,
+      validation: {
+        rule: schema.string().max(998),
+      },
+    },
+    provider: {
+      required: false,
+      validation: {
+        rule: schema.string().max(100),
+      },
+    },
+    success: {
+      required: true,
+      default: true,
+      validation: {
+        rule: schema.boolean(),
+      },
+    },
+  },
+
+  dashboard: { enabled: false },
+} as const)

package/app/Models/EmailSuppression.ts

@@ -0,0 +1,52 @@
+import { defineModel } from '@stacksjs/orm'
+import { schema } from '@stacksjs/validation'
+
+export default defineModel({
+  name: 'EmailSuppression',
+  table: 'email_suppressions',
+  primaryKey: 'id',
+  autoIncrement: true,
+
+  indexes: [
+    {
+      name: 'email_suppressions_email_type_unique',
+      columns: ['email', 'type'],
+      unique: true,
+    },
+  ],
+
+  traits: {
+    useTimestamps: true,
+    useApi: {
+      uri: 'email-suppressions',
+      routes: ['index', 'show', 'destroy'],
+      middleware: ['auth'],
+    },
+  },
+
+  attributes: {
+    email: {
+      required: true,
+      fillable: true,
+      validation: {
+        rule: schema.string().email().required().max(320),
+      },
+    },
+    type: {
+      required: true,
+      fillable: true,
+      validation: {
+        rule: schema.enum(['bounce', 'complaint', 'unsubscribe', 'manual']),
+      },
+    },
+    reason: {
+      required: false,
+      fillable: true,
+      validation: {
+        rule: schema.string().max(2000),
+      },
+    },
+  },
+
+  dashboard: { enabled: false },
+} as const)

package/app/Models/EmailWebhookEvent.ts

@@ -0,0 +1,51 @@
+import { defineModel } from '@stacksjs/orm'
+import { schema } from '@stacksjs/validation'
+
+export default defineModel({
+  name: 'EmailWebhookEvent',
+  table: 'email_webhook_events',
+  primaryKey: 'id',
+  autoIncrement: true,
+
+  indexes: [
+    {
+      name: 'email_webhook_events_provider_event_unique',
+      columns: ['provider', 'event_id'],
+      unique: true,
+    },
+  ],
+
+  traits: {
+    useTimestamps: true,
+    useApi: {
+      uri: 'email-webhook-events',
+      routes: ['index', 'show', 'destroy'],
+      middleware: ['auth'],
+    },
+  },
+
+  attributes: {
+    provider: {
+      required: true,
+      fillable: true,
+      validation: {
+        rule: schema.enum(['mailgun', 'postmark', 'ses', 'sendgrid']),
+      },
+    },
+    eventId: {
+      required: true,
+      hidden: true,
+      validation: {
+        rule: schema.string().required().max(512),
+      },
+    },
+    processedAt: {
+      required: true,
+      validation: {
+        rule: schema.timestamp().required(),
+      },
+    },
+  },
+
+  dashboard: { enabled: false },
+} as const)

package/app/Models/TeamInvitation.ts

@@ -20,6 +20,11 @@ export default defineModel({
       columns: ['token_hash'],
       unique: true,
     },
+    {
+      name: 'team_invitations_pending_key_unique',
+      columns: ['pending_key'],
+      unique: true,
+    },
     {
       name: 'team_invitations_team_email_status_index',
       columns: ['team_id', 'email', 'status'],
@@ -79,6 +84,14 @@ export default defineModel({
       },
     },
 
+    pendingKey: {
+      required: false,
+      hidden: true,
+      validation: {
+        rule: schema.string().max(384),
+      },
+    },
+
     invitedByUserId: {
       required: false,
       validation: {

package/functions/data.ts

@@ -45,7 +45,6 @@ export interface DashboardSubscriber {
 
 export interface DashboardDataResponse<T> {
   stats: DataStats
-  error?: string
   activities?: T[]
   users?: T[]
   teams?: T[]

package/functions/jobs.ts

@@ -52,7 +52,6 @@ export interface JobListFilters {
 
 export interface JobShowResponse {
   job: DashboardJob | null
-  error?: string
 }
 
 export async function fetchJobs(filters: JobListFilters = {}): Promise<JobListResponse> {

package/ide/vscode/package.json

@@ -2,7 +2,7 @@
   "publisher": "Stacks",
   "name": "vscode-stacks",
   "displayName": "Stacks",
-  "version": "0.70.355",
+  "version": "0.70.356",
   "description": "A modern Stacks development environment.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/defaults",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.355",
+  "version": "0.70.356",
   "description": "The complete managed Stacks application scaffold, including runtime defaults, AI guidance, editor metadata, and npm-backed project support files.",
   "author": "Chris Breuer",
   "license": "MIT",

package/resources/components/Dashboard/Data/DataRecords.stx

@@ -98,25 +98,21 @@ async function loadRecords(): Promise<void> {
       const response = await fetchDashboardData<DashboardActivity>('activity')
       records.set(response.activities || [])
       stats.set(response.stats)
-      loadError.set(response.error || '')
     }
     else if (mode() === 'users') {
       const response = await fetchDashboardData<DashboardUser>('users')
       records.set(response.users || [])
       stats.set(response.stats)
-      loadError.set(response.error || '')
     }
     else if (mode() === 'teams') {
       const response = await fetchDashboardData<DashboardTeam>('teams')
       records.set(response.teams || [])
       stats.set(response.stats)
-      loadError.set(response.error || '')
     }
     else {
       const response = await fetchDashboardData<DashboardSubscriber>('subscribers')
       records.set(response.subscribers || [])
       stats.set(response.stats)
-      loadError.set(response.error || '')
     }
   }
   catch (error) {

package/resources/components/Dashboard/Jobs/JobDetail.stx

@@ -1,5 +1,6 @@
 <script client>
 import type { DashboardJob } from '../../../../functions/jobs'
+import { DashboardApiError } from '../../../../functions/dashboard-api'
 import { fetchJob, retryJob } from '../../../../functions/jobs'
 import { pushToast } from '../../../../functions/toasts'
 
@@ -53,11 +54,11 @@ async function loadJob(): Promise<void> {
   try {
     const response = await fetchJob(jobId())
     job.set(response.job)
-    loadError.set(response.error || '')
   }
   catch (error) {
     job.set(null)
-    loadError.set(error instanceof Error ? error.message : 'Job could not be loaded.')
+    if (!(error instanceof DashboardApiError && error.status === 404))
+      loadError.set(error instanceof Error ? error.message : 'Job could not be loaded.')
   }
   finally {
     isLoading.set(false)

package/resources/components/Dashboard/Models/ModelRecordsDashboard.stx

@@ -7,7 +7,7 @@
 // works the same on a table with 10 rows and one with a million. Rows and
 // writes go through the model, so scopes, casts and observers apply.
 import { useNavigation } from '~/storage/framework/defaults/views/dashboard/composables/useNavigation'
-import { dashboardApi } from '~/storage/framework/defaults/functions/dashboard-api'
+import { DashboardApiError, dashboardApi } from '~/storage/framework/defaults/functions/dashboard-api'
 import { pushToast } from '~/storage/framework/defaults/functions/toasts'
 
 interface ColumnMeta {
@@ -46,7 +46,6 @@ interface ResponseShape {
   writable: boolean
   writeCapabilities: WriteCapabilities
   createFields: CreateField[]
-  source: 'orm' | 'sqlite-fallback'
   error: string | null
 }
 
@@ -67,7 +66,6 @@ const search = state(navigation.urlQuery('q') || '')
 const filters = state<Record<string, string>>({})
 const writeCapabilities = state<WriteCapabilities>({ create: false, update: false, destroy: false })
 const createFields = state<CreateField[]>([])
-const source = state<'orm' | 'sqlite-fallback'>('orm')
 const error = state<string | null>(null)
 const loading = state(true)
 const showFilters = state(false)
@@ -86,14 +84,6 @@ const createErrors = state<Record<string, string[]>>({})
 
 const slug = derived(() => navigation.urlSegment(-1) || '')
 
-const sourceLabel = derived(() => {
-  if (source() === 'orm')
-    return 'via Stacks ORM'
-  return Object.values(writeCapabilities()).some(Boolean)
-    ? 'SQLite query, ORM writes'
-    : 'raw SQLite, read-only'
-})
-
 const recordLabel = derived(() => {
   const n = totalCount()
   return `${n.toLocaleString()} ${n === 1 ? 'record' : 'records'}`
@@ -223,7 +213,6 @@ async function load() {
     sort.set(data.sort ?? '')
     writeCapabilities.set(data.writeCapabilities ?? { create: false, update: false, destroy: false })
     createFields.set(data.createFields ?? [])
-    source.set(data.source ?? 'orm')
     error.set(data.error ?? null)
   }
   catch (e) {
@@ -319,6 +308,11 @@ async function createRecord(fields: Record<string, unknown>): Promise<void> {
   }
   catch (reason) {
     createError.set(reason instanceof Error ? reason.message : String(reason))
+    if (reason instanceof DashboardApiError && reason.fields) {
+      createErrors.set(Object.fromEntries(
+        Object.entries(reason.fields).map(([field, message]) => [field, [message]]),
+      ))
+    }
   }
   finally {
     creating.set(false)
@@ -402,7 +396,7 @@ void load()
   <div class="flex flex-wrap gap-4 items-start justify-between">
     <div class="min-w-0">
       <h1 class="font-semibold text-2xl text-neutral-900 truncate dark:text-white" :text="modelName()"></h1>
-      <p class="mt-1 text-[13px] text-neutral-500 dark:text-neutral-400" :text="recordLabel() + ' · ' + tableName() + ' · ' + sourceLabel()"></p>
+      <p class="mt-1 text-[13px] text-neutral-500 dark:text-neutral-400" :text="recordLabel() + ' · ' + tableName() + ' · via Stacks ORM'"></p>
     </div>
     <div class="flex gap-2 items-center">
       <Button

package/resources/components/Dashboard/Models/ModelsOverview.stx

@@ -129,7 +129,7 @@ onMount(() => {
 
   <div :if="!loadError() && unavailableModels() > 0" role="status" class="flex gap-3 items-start px-4 py-3 text-amber-800 text-sm dark:text-amber-200 bg-amber-50 dark:bg-amber-950/40 border border-amber-200 rounded-lg dark:border-amber-900">
     <span class="flex-none mt-0.5 h-4 w-4 i-hugeicons-alert-02"></span>
-    <span>{{ unavailableModels() }} model {{ unavailableModels() === 1 ? 'count is' : 'counts are' }} unavailable. Affected cards show the query error instead of reporting zero records.</span>
+    <span>{{ unavailableModels() }} model {{ unavailableModels() === 1 ? 'count is' : 'counts are' }} unavailable. Affected cards remain unavailable instead of reporting zero records.</span>
   </div>
 
   <Card padding="none">

package/views/dashboard/.discovered-models.json

@@ -185,6 +185,16 @@
       "hasDedicatedPage": false,
       "category": "commerce"
     },
+    {
+      "id": "email-idempotency",
+      "name": "EmailIdempotency",
+      "icon": "tablecells.fill",
+      "hasDedicatedPage": false,
+      "category": "data",
+      "dashboard": {
+        "enabled": false
+      }
+    },
     {
       "id": "email-list",
       "name": "EmailList",
@@ -199,6 +209,26 @@
       "hasDedicatedPage": false,
       "category": "data"
     },
+    {
+      "id": "email-suppression",
+      "name": "EmailSuppression",
+      "icon": "tablecells.fill",
+      "hasDedicatedPage": false,
+      "category": "data",
+      "dashboard": {
+        "enabled": false
+      }
+    },
+    {
+      "id": "email-webhook-event",
+      "name": "EmailWebhookEvent",
+      "icon": "tablecells.fill",
+      "hasDedicatedPage": false,
+      "category": "data",
+      "dashboard": {
+        "enabled": false
+      }
+    },
     {
       "id": "gift-card",
       "name": "GiftCard",