@stacksjs/defaults 0.70.229 → 0.70.231

package/app/Actions/Dashboard/Kanban/BoardsReorderAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 interface ReorderInput {
   /**
@@ -35,13 +36,13 @@ export default new Action({
   async handle(request) {
     const body = (request as any).jsonBody as ReorderInput | undefined ?? {}
     if (!Array.isArray(body.order) || body.order.length === 0) {
-      return { error: '`order` must be a non-empty array of board ids.', status: 400 }
+      return kanbanError('`order` must be a non-empty array of board ids.', 400)
     }
     const ids: number[] = []
     for (const v of body.order) {
       const n = Number(v)
       if (!Number.isFinite(n) || n <= 0) {
-        return { error: '`order` contains an invalid id.', status: 400 }
+        return kanbanError('`order` contains an invalid id.', 400)
       }
       ids.push(n)
     }
@@ -49,32 +50,24 @@ export default new Action({
     // multiple times with the LAST index winning, which silently
     // contradicts the visible order.
     if (new Set(ids).size !== ids.length) {
-      return { error: '`order` contains duplicate ids.', status: 400 }
+      return kanbanError('`order` contains duplicate ids.', 400)
     }
 
     try {
-      const txOps = async (qb: any) => {
+      await db.transaction(async (rawTrx) => {
+        const qb = rawTrx as unknown as typeof db
         for (let i = 0; i < ids.length; i++) {
           await qb.updateTable('boards')
             .set({ position: i })
             .where('id', '=', ids[i])
             .execute()
         }
-      }
-      try {
-        await (db as any).transaction(txOps)
-      }
-      catch {
-        // Same fallback rationale as BoardDestroyAction — UPDATE is
-        // idempotent for `position` (setting it twice to the same
-        // value is a no-op), so a partial run + retry recovers.
-        await txOps(db)
-      }
+      })
       return { reordered: ids.length }
     }
     catch (err) {
       console.error('[dashboard/kanban] BoardsReorderAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardAssigneesSyncAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 interface SyncInput {
   userIds?: unknown
@@ -31,17 +32,17 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const cardId = Number(rawId)
     if (!Number.isFinite(cardId) || cardId <= 0)
-      return { error: 'Invalid card id', status: 400 }
+      return kanbanError('Invalid card id', 400)
 
     const body = (request as any).jsonBody as SyncInput | undefined ?? {}
     if (!Array.isArray(body.userIds))
-      return { error: '`userIds` must be an array of user ids (possibly empty).', status: 400 }
+      return kanbanError('`userIds` must be an array of user ids (possibly empty).', 400)
 
     const userIds: number[] = []
     for (const v of body.userIds) {
       const n = Number(v)
       if (!Number.isFinite(n) || n <= 0)
-        return { error: '`userIds` contains an invalid id.', status: 400 }
+        return kanbanError('`userIds` contains an invalid id.', 400)
       userIds.push(n)
     }
     const uniqueUserIds = Array.from(new Set(userIds))
@@ -49,7 +50,7 @@ export default new Action({
     try {
       const cardRows = await db.unsafe('SELECT id FROM cards WHERE id = ? LIMIT 1', [cardId]).execute() as Array<{ id: number }>
       if (!cardRows?.length)
-        return { error: 'Card not found.', status: 404 }
+        return kanbanError('Card not found.', 404)
 
       // Validate user ids exist.
       if (uniqueUserIds.length > 0) {
@@ -59,13 +60,14 @@ export default new Action({
           uniqueUserIds,
         ).execute() as Array<{ id: number }>
         if (userRows.length !== uniqueUserIds.length)
-          return { error: 'One or more user ids do not exist.', status: 400 }
+          return kanbanError('One or more user ids do not exist.', 400)
       }
 
       const requester = (request as any).user ?? (request as any)._authenticatedUser ?? null
       const assignedByUserId = requester && typeof requester.id === 'number' ? requester.id : null
 
-      const txOps = async (qb: any) => {
+      await db.transaction(async (rawTrx) => {
+        const qb = rawTrx as unknown as typeof db
         await qb.deleteFrom('card_assignees').where('card_id', '=', cardId).execute()
         if (uniqueUserIds.length > 0) {
           const rows = uniqueUserIds.map(userId => ({
@@ -75,13 +77,7 @@ export default new Action({
           }))
           await qb.insertInto('card_assignees').values(rows).execute()
         }
-      }
-      try {
-        await (db as any).transaction(txOps)
-      }
-      catch {
-        await txOps(db)
-      }
+      })
 
       // Return the resolved user rows for the optimistic UI to confirm.
       let assignees: Array<{ userId: number, name: string | null, email: string | null }> = []
@@ -97,7 +93,7 @@ export default new Action({
     }
     catch (err) {
       console.error('[dashboard/kanban] CardAssigneesSyncAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardCommentDestroyAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 /**
  * `DELETE /api/dashboard/kanban/comments/:id` (stacksjs/stacks#1846 Phase 3).
@@ -19,7 +20,7 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const id = Number(rawId)
     if (!Number.isFinite(id) || id <= 0)
-      return { error: 'Invalid comment id', status: 400 }
+      return kanbanError('Invalid comment id', 400)
 
     try {
       await db.deleteFrom('card_comments').where('id', '=', id).execute()
@@ -27,7 +28,7 @@ export default new Action({
     }
     catch (err) {
       console.error('[dashboard/kanban] CardCommentDestroyAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardCommentStoreAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 interface CommentInput {
   body?: unknown
@@ -25,17 +26,17 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const cardId = Number(rawId)
     if (!Number.isFinite(cardId) || cardId <= 0)
-      return { error: 'Invalid card id', status: 400 }
+      return kanbanError('Invalid card id', 400)
 
     const body = (request as any).jsonBody as CommentInput | undefined ?? {}
     const text = typeof body.body === 'string' ? body.body.trim() : ''
     if (!text || text.length > 10000)
-      return { error: '`body` is required and must be 1-10000 characters.', status: 400 }
+      return kanbanError('`body` is required and must be 1-10000 characters.', 400)
 
     try {
       const cardRows = await db.unsafe('SELECT id FROM cards WHERE id = ? LIMIT 1', [cardId]).execute() as Array<{ id: number }>
       if (!cardRows?.length)
-        return { error: 'Card not found.', status: 404 }
+        return kanbanError('Card not found.', 404)
 
       const user = (request as any).user ?? (request as any)._authenticatedUser ?? null
       const userId = user && typeof user.id === 'number' ? user.id : null
@@ -59,7 +60,7 @@ export default new Action({
       ).execute() as Array<{ id: number, uuid: string | null, user_id: number | null, body: string, created_at: string | null, updated_at: string | null, name: string | null, email: string | null }>
       const r = rows?.[0]
       if (!r)
-        return { error: 'Comment insert succeeded but follow-up read returned nothing.', status: 500 }
+        return kanbanError('Comment insert succeeded but follow-up read returned nothing.', 500)
 
       return {
         comment: {
@@ -76,7 +77,7 @@ export default new Action({
     }
     catch (err) {
       console.error('[dashboard/kanban] CardCommentStoreAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardDestroyAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 /**
  * `DELETE /api/dashboard/kanban/cards/:id` (stacksjs/stacks#1846 Phase 2).
@@ -21,28 +22,23 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const id = Number(rawId)
     if (!Number.isFinite(id) || id <= 0) {
-      return { error: 'Invalid card id', status: 400 }
+      return kanbanError('Invalid card id', 400)
     }
 
     try {
-      const txOps = async (qb: any) => {
+      await db.transaction(async (rawTrx) => {
+        const qb = rawTrx as unknown as typeof db
         await qb.deleteFrom('card_labels').where('card_id', '=', id).execute()
         await qb.deleteFrom('card_assignees').where('card_id', '=', id).execute()
         // Card comments (Phase 3, stacksjs/stacks#1846).
         await qb.deleteFrom('card_comments').where('card_id', '=', id).execute()
         await qb.deleteFrom('cards').where('id', '=', id).execute()
-      }
-      try {
-        await (db as any).transaction(txOps)
-      }
-      catch {
-        await txOps(db)
-      }
+      })
       return { deleted: true, id }
     }
     catch (err) {
       console.error('[dashboard/kanban] CardDestroyAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardLabelsSyncAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 interface SyncInput {
   labelIds?: unknown
@@ -29,17 +30,17 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const cardId = Number(rawId)
     if (!Number.isFinite(cardId) || cardId <= 0)
-      return { error: 'Invalid card id', status: 400 }
+      return kanbanError('Invalid card id', 400)
 
     const body = (request as any).jsonBody as SyncInput | undefined ?? {}
     if (!Array.isArray(body.labelIds))
-      return { error: '`labelIds` must be an array of label ids (possibly empty).', status: 400 }
+      return kanbanError('`labelIds` must be an array of label ids (possibly empty).', 400)
 
     const labelIds: number[] = []
     for (const v of body.labelIds) {
       const n = Number(v)
       if (!Number.isFinite(n) || n <= 0)
-        return { error: '`labelIds` contains an invalid id.', status: 400 }
+        return kanbanError('`labelIds` contains an invalid id.', 400)
       labelIds.push(n)
     }
     const uniqueLabelIds = Array.from(new Set(labelIds))
@@ -52,7 +53,7 @@ export default new Action({
       ).execute() as Array<{ id: number, board_id: number }>
       const card = cardRows?.[0]
       if (!card)
-        return { error: 'Card not found.', status: 404 }
+        return kanbanError('Card not found.', 404)
 
       // Every label must belong to the same board (labels are
       // board-scoped per Phase 1's `labels.board_id` design).
@@ -63,25 +64,20 @@ export default new Action({
           [...uniqueLabelIds, card.board_id],
         ).execute() as Array<{ id: number }>
         if (labelRows.length !== uniqueLabelIds.length)
-          return { error: 'One or more label ids do not belong to this card\'s board.', status: 400 }
+          return kanbanError('One or more label ids do not belong to this card\'s board.', 400)
       }
 
       // Sync: drop all current pivot rows for this card, insert the
       // new set. Cheaper than diffing for the typical "user picked a
       // few labels" use case (single-digit label counts per card).
-      const txOps = async (qb: any) => {
+      await db.transaction(async (rawTrx) => {
+        const qb = rawTrx as unknown as typeof db
         await qb.deleteFrom('card_labels').where('card_id', '=', cardId).execute()
         if (uniqueLabelIds.length > 0) {
           const rows = uniqueLabelIds.map(labelId => ({ card_id: cardId, label_id: labelId }))
           await qb.insertInto('card_labels').values(rows).execute()
         }
-      }
-      try {
-        await (db as any).transaction(txOps)
-      }
-      catch {
-        await txOps(db)
-      }
+      })
 
       // Return the resolved label rows so the optimistic UI can
       // confirm its in-flight state matches what the server stored.
@@ -97,7 +93,7 @@ export default new Action({
     }
     catch (err) {
       console.error('[dashboard/kanban] CardLabelsSyncAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardShowAction.ts

@@ -1,5 +1,6 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { kanbanError } from './kanban-response'
 
 interface CardRow {
   id: number
@@ -40,7 +41,7 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const id = Number(rawId)
     if (!Number.isFinite(id) || id <= 0) {
-      return { error: 'Invalid card id', status: 400 }
+      return kanbanError('Invalid card id', 400)
     }
 
     try {
@@ -50,7 +51,7 @@ export default new Action({
       ).execute() as CardRow[]
       const card = cardRows?.[0]
       if (!card) {
-        return { error: 'Card not found', status: 404 }
+        return kanbanError('Card not found', 404)
       }
 
       const [labels, assignees, comments] = await Promise.all([
@@ -116,7 +117,7 @@ export default new Action({
     }
     catch (err) {
       console.error('[dashboard/kanban] CardShowAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardStoreAction.ts

@@ -1,5 +1,7 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
+import { BoardColumn, Card } from '@stacksjs/orm'
+import { kanbanError } from './kanban-response'
 
 interface CardInput {
   columnId?: unknown
@@ -31,28 +33,23 @@ export default new Action({
 
     const columnId = Number(body.columnId)
     if (!Number.isFinite(columnId) || columnId <= 0) {
-      return { error: '`columnId` is required and must be a positive integer.', status: 400 }
+      return kanbanError('`columnId` is required and must be a positive integer.', 400)
     }
     const title = typeof body.title === 'string' ? body.title.trim() : ''
     if (!title || title.length > 300) {
-      return { error: '`title` is required and must be 1-300 characters.', status: 400 }
+      return kanbanError('`title` is required and must be 1-300 characters.', 400)
     }
     const description = typeof body.description === 'string' ? body.description.trim() : null
     const dueDate = typeof body.dueDate === 'string' && body.dueDate ? body.dueDate : null
 
     try {
-      // Resolve the column → board_id so we can denormalise. Same trip
-      // also validates that the column exists; an orphan column id
-      // rejects up front rather than inserting a card with a dangling
-      // FK that no query would ever surface.
-      const cols = await db.unsafe(
-        'SELECT id, board_id FROM board_columns WHERE id = ? LIMIT 1',
-        [columnId],
-      ).execute() as Array<{ id: number, board_id: number }>
-      const col = cols?.[0]
-      if (!col) {
-        return { error: 'Column not found.', status: 404 }
+      const column = await BoardColumn.find(columnId)
+      if (!column) {
+        return kanbanError('Column not found.', 404)
       }
+      const boardId = Number(column.get('boardId') ?? column.get('board_id'))
+      if (!Number.isFinite(boardId) || boardId <= 0)
+        return kanbanError('Column is not attached to a valid board.', 409)
 
       const maxRow = await db.unsafe(
         'SELECT COALESCE(MAX(position), -1) AS m FROM cards WHERE column_id = ?',
@@ -63,50 +60,37 @@ export default new Action({
       const user = (request as any).user ?? (request as any)._authenticatedUser ?? null
       const createdByUserId = user && typeof user.id === 'number' ? user.id : null
 
-      await db.insertInto('cards').values({
-        column_id: columnId,
-        board_id: col.board_id,
+      const card = await Card.create({
+        columnId,
+        boardId,
         title,
         description,
         position: nextPosition,
-        created_by_user_id: createdByUserId,
-        due_date: dueDate,
-        archived: 0,
-      }).execute()
-
-      const rows = await db.unsafe(
-        `SELECT id, uuid, column_id, board_id, title, description, position,
-                created_by_user_id, due_date, archived, created_at, updated_at
-        FROM cards
-        WHERE column_id = ? AND title = ? AND position = ?
-        ORDER BY id DESC LIMIT 1`,
-        [columnId, title, nextPosition],
-      ).execute() as Array<Record<string, unknown>>
-      const r = rows?.[0]
-      if (!r) {
-        return { error: 'Card insert succeeded but follow-up read returned nothing.', status: 500 }
-      }
+        createdByUserId,
+        dueDate,
+        archived: false,
+      })
 
       return {
         card: {
-          id: Number(r.id),
-          uuid: r.uuid == null ? null : String(r.uuid),
-          columnId: Number(r.column_id),
-          boardId: Number(r.board_id),
-          title: String(r.title),
-          description: r.description == null ? null : String(r.description),
-          position: Number(r.position),
-          createdByUserId: r.created_by_user_id == null ? null : Number(r.created_by_user_id),
-          dueDate: r.due_date == null ? null : String(r.due_date),
-          archived: Number(r.archived) === 1,
-          createdAt: r.created_at == null ? null : String(r.created_at),
-          updatedAt: r.updated_at == null ? null : String(r.updated_at),
+          id: Number(card.get('id')),
+          uuid: card.get('uuid') == null ? null : String(card.get('uuid')),
+          columnId,
+          boardId,
+          title,
+          description,
+          position: nextPosition,
+          createdByUserId,
+          dueDate,
+          archived: false,
+          createdAt: card.get('createdAt') ?? card.get('created_at') ?? null,
+          updatedAt: card.get('updatedAt') ?? card.get('updated_at') ?? null,
         },
       }
     }
     catch (err) {
       console.error('[dashboard/kanban] CardStoreAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })

package/app/Actions/Dashboard/Kanban/CardUpdateAction.ts

@@ -1,5 +1,7 @@
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database'
+import { Card } from '@stacksjs/orm'
+import { modelBoolean, modelNullableString, modelNumber, modelString, modelValue, refreshModel } from './kanban-model'
+import { kanbanError } from './kanban-response'
 
 interface CardInput {
   title?: unknown
@@ -27,7 +29,7 @@ export default new Action({
     const rawId = (request as any)?.params?.id ?? (request as any)?.param?.('id') ?? null
     const id = Number(rawId)
     if (!Number.isFinite(id) || id <= 0) {
-      return { error: 'Invalid card id', status: 400 }
+      return kanbanError('Invalid card id', 400)
     }
 
     const body = (request as any).jsonBody as CardInput | undefined ?? {}
@@ -36,7 +38,7 @@ export default new Action({
     if (typeof body.title === 'string') {
       const title = body.title.trim()
       if (!title || title.length > 300) {
-        return { error: '`title` must be 1-300 characters.', status: 400 }
+        return kanbanError('`title` must be 1-300 characters.', 400)
       }
       set.title = title
     }
@@ -44,48 +46,43 @@ export default new Action({
       set.description = typeof body.description === 'string' ? body.description.trim() : null
     }
     if (typeof body.dueDate === 'string' || body.dueDate === null) {
-      set.due_date = typeof body.dueDate === 'string' && body.dueDate ? body.dueDate : null
+      set.dueDate = typeof body.dueDate === 'string' && body.dueDate ? body.dueDate : null
     }
     if (typeof body.archived === 'boolean')
-      set.archived = body.archived ? 1 : 0
+      set.archived = body.archived
 
     if (Object.keys(set).length === 0) {
-      return { error: 'No updatable fields provided.', status: 400 }
+      return kanbanError('No updatable fields provided.', 400)
     }
 
     try {
-      await db.updateTable('cards').set(set as any).where('id', '=', id).execute()
+      const card = await Card.find(id)
+      if (!card)
+        return kanbanError('Card not found', 404)
+      const updated = await refreshModel(await card.update(set))
 
-      const rows = await db.unsafe(
-        `SELECT id, uuid, column_id, board_id, title, description, position,
-                created_by_user_id, due_date, archived, created_at, updated_at
-        FROM cards WHERE id = ? LIMIT 1`,
-        [id],
-      ).execute() as Array<Record<string, unknown>>
-      const r = rows?.[0]
-      if (!r) {
-        return { error: 'Card not found', status: 404 }
-      }
       return {
         card: {
-          id: Number(r.id),
-          uuid: r.uuid == null ? null : String(r.uuid),
-          columnId: Number(r.column_id),
-          boardId: Number(r.board_id),
-          title: String(r.title),
-          description: r.description == null ? null : String(r.description),
-          position: Number(r.position),
-          createdByUserId: r.created_by_user_id == null ? null : Number(r.created_by_user_id),
-          dueDate: r.due_date == null ? null : String(r.due_date),
-          archived: Number(r.archived) === 1,
-          createdAt: r.created_at == null ? null : String(r.created_at),
-          updatedAt: r.updated_at == null ? null : String(r.updated_at),
+          id: modelNumber(updated, 'id'),
+          uuid: modelNullableString(updated, 'uuid'),
+          columnId: modelNumber(updated, 'columnId', 'column_id'),
+          boardId: modelNumber(updated, 'boardId', 'board_id'),
+          title: modelString(updated, 'title'),
+          description: modelNullableString(updated, 'description'),
+          position: modelNumber(updated, 'position'),
+          createdByUserId: modelValue(updated, 'createdByUserId', 'created_by_user_id') == null
+            ? null
+            : modelNumber(updated, 'createdByUserId', 'created_by_user_id'),
+          dueDate: modelNullableString(updated, 'dueDate', 'due_date'),
+          archived: modelBoolean(updated, 'archived'),
+          createdAt: modelNullableString(updated, 'createdAt', 'created_at'),
+          updatedAt: modelNullableString(updated, 'updatedAt', 'updated_at'),
         },
       }
     }
     catch (err) {
       console.error('[dashboard/kanban] CardUpdateAction failed:', err)
-      return { error: err instanceof Error ? err.message : 'unknown error', status: 500 }
+      return kanbanError(err instanceof Error ? err.message : 'unknown error', 500)
     }
   },
 })