@stacksjs/defaults 0.75.318 → 0.75.321

package/app/Actions/Dashboard/Commerce/review-records.ts

@@ -3,6 +3,7 @@ import {
   commerceEmail,
   commerceIdentifier,
   commerceNumber,
+  commerceOptionalNumber,
   commerceOptionalIdentifier,
   commerceOptionalString,
   commerceRequiredString,
@@ -17,7 +18,8 @@ export interface ReviewRecord {
   customerId: string
   customerName: string
   customerEmail: string
-  rating: number
+  /** Null for a review that is words without stars. */
+  rating: number | null
   title: string
   content: string
   approved: boolean
@@ -73,7 +75,7 @@ export function normalizeReviewRecord(
     customerId,
     customerName: customer?.name || '',
     customerEmail: customer?.email || '',
-    rating: commerceNumber(commerceValue(review, 'rating'), source, 'rating', {
+    rating: commerceOptionalNumber(commerceValue(review, 'rating'), source, 'rating', {
       min: 1,
       max: 5,
       integer: true,
@@ -135,15 +137,18 @@ export function normalizeReviewCustomerContext(customer: any): {
 }
 
 export function summarizeReviews(records: ReviewRecord[]): ReviewSummary {
-  const totalRating = records.reduce((sum, review) => sum + review.rating, 0)
+  // An unrated review is a review, not a 0-star one, so the average is taken
+  // over the rated reviews only.
+  const ratings = records.flatMap(review => review.rating === null ? [] : [review.rating])
+  const totalRating = ratings.reduce((sum, rating) => sum + rating, 0)
   return {
     total: records.length,
     approved: records.filter(review => review.approved).length,
     pending: records.filter(review => !review.approved).length,
     featured: records.filter(review => review.featured).length,
     verified: records.filter(review => review.verifiedPurchase).length,
-    averageRating: records.length > 0
-      ? Math.round(totalRating / records.length * 10) / 10
+    averageRating: ratings.length > 0
+      ? Math.round(totalRating / ratings.length * 10) / 10
       : 0,
   }
 }

package/app/Actions/Dashboard/Content/AuthorStoreAction.ts

@@ -52,6 +52,8 @@ export default new Action({
             created_at: now,
             updated_at: now,
           } as any)
+          // PostgreSQL reports no insert id without RETURNING (#3004).
+          .returningAll()
           .executeTakeFirst()
 
         const id = insertedId(result)

package/app/Actions/Dashboard/Content/CategoryStoreAction.ts

@@ -53,11 +53,14 @@ export default new Action({
             name,
             slug,
             description,
-            is_active: 1,
+            // A real boolean: on PostgreSQL the column is boolean and refuses 1.
+            is_active: true,
             display_order: Number(displayOrder?.max_display_order || 0) + 1,
             created_at: now,
             updated_at: now,
           } as any)
+          // PostgreSQL reports no insert id without RETURNING (#3004).
+          .returningAll()
           .executeTakeFirst()
 
         const id = insertedId(result)

package/app/Actions/Dashboard/Content/PageStoreAction.ts

@@ -41,6 +41,8 @@ export default new Action({
             created_at: now,
             updated_at: now,
           } as any)
+          // PostgreSQL reports no insert id without RETURNING (#3004).
+          .returningAll()
           .executeTakeFirst()
 
         const id = insertedId(result)

package/app/Actions/Dashboard/Content/PostStoreAction.ts

@@ -50,6 +50,8 @@ export default new Action({
             created_at: now,
             updated_at: now,
           } as any)
+          // PostgreSQL reports no insert id without RETURNING (#3004).
+          .returningAll()
           .executeTakeFirst()
 
         const id = insertedId(insertResult)

package/app/Actions/Dashboard/Content/TagStoreAction.ts

@@ -53,6 +53,8 @@ export default new Action({
             created_at: now,
             updated_at: now,
           } as any)
+          // PostgreSQL reports no insert id without RETURNING (#3004).
+          .returningAll()
           .executeTakeFirst()
 
         const id = insertedId(result)

package/app/Actions/Dashboard/Content/content-input.ts

@@ -20,11 +20,16 @@ export function timestamp(): string {
   return new Date().toISOString().slice(0, 19).replace('T', ' ')
 }
 
-/** The new row's id, across the driver shapes we may get back from an insert. */
+/**
+ * The new row's id, across the driver shapes an insert answers with: the row
+ * itself from `returningAll()` (PostgreSQL, which reports no id at all without
+ * RETURNING, and gives a BIGSERIAL id back as a string), `lastInsertRowid`
+ * (SQLite) or `insertId` (MySQL). 0 when none of them names a row.
+ */
 export function insertedId(result: unknown): number {
-  const row = result as { lastInsertRowid?: number | bigint, insertId?: number | bigint } | undefined
-
-  return Number(row?.lastInsertRowid ?? row?.insertId ?? 0)
+  const answer = (Array.isArray(result) ? result[0] : result) as { id?: unknown, lastInsertRowid?: unknown, insertId?: unknown } | undefined
+  const id = Number(answer?.id ?? answer?.lastInsertRowid ?? answer?.insertId ?? 0)
+  return Number.isSafeInteger(id) && id > 0 ? id : 0
 }
 
 /** The `{id}` route param, or 0 when it is not a usable row id. */

package/app/Actions/Dashboard/Content/content-record-input.test.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { describe, expect, test } from 'bun:test'
-import { rowId } from './content-input'
+import { insertedId, rowId } from './content-input'
 import { parseAuthorInput } from './author-input'
 import { parsePageInput, parsePublished } from './page-input'
 
@@ -50,3 +50,22 @@ test('content identifiers use the shared safe-integer contract', () => {
   for (const value of [true, {}, [], Number.MAX_SAFE_INTEGER + 1]) expect(rowId({ getParam: () => value } as unknown as RequestInstance)).toBe(0)
   expect(rowId({ getParam: () => '42' } as unknown as RequestInstance)).toBe(42)
 })
+
+// What an insert answers with on each driver (stacksjs/stacks#3004).
+describe('the id of an inserted content row', () => {
+  test('reads the row returningAll() gives back, with PostgreSQL\'s string id', () => {
+    expect(insertedId({ id: '64', name: 'Example' })).toBe(64)
+    expect(insertedId([{ id: 7 }])).toBe(7)
+  })
+
+  test('reads SQLite\'s and MySQL\'s insert reports', () => {
+    expect(insertedId({ changes: 1, lastInsertRowid: 12 })).toBe(12)
+    expect(insertedId({ insertId: 9n })).toBe(9)
+  })
+
+  test('is 0 when nothing names a row, as PostgreSQL answers without RETURNING', () => {
+    expect(insertedId([])).toBe(0)
+    expect(insertedId(undefined)).toBe(0)
+    expect(insertedId({ id: 'not-an-id' })).toBe(0)
+  })
+})

package/app/Actions/Dashboard/Marketing/CampaignIndexAction.ts

@@ -32,7 +32,7 @@ export default new Action({
         db
           .selectFrom('campaign_sends')
           .select(['campaign_id', 'status', db.fn.count('id').as('count')])
-          .groupBy(['campaign_id', 'status'])
+          .groupBy('campaign_id', 'status')
           .execute(),
         db
           .selectFrom('campaign_sends')

package/app/Actions/Dashboard/Marketing/ListIndexAction.ts

@@ -22,7 +22,7 @@ export default new Action({
         db
           .selectFrom('email_list_subscribers')
           .select(['email_list_id', 'status', db.fn.count('id').as('count')])
-          .groupBy(['email_list_id', 'status'])
+          .groupBy('email_list_id', 'status')
           .execute(),
         db
           .selectFrom('email_list_subscribers')

package/app/Actions/Dashboard/Models/ModelStoreAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions/runtime'
-import { toSnakeCaseKeys } from '@stacksjs/orm'
+import { ModelValidationError, toSnakeCaseKeys } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
 import { dashboardOperationalError } from '../dashboard-response'
 import { prepareModelFields, resolveWritableModel } from './model-write'
@@ -35,6 +35,10 @@ export default new Action({
       return { ok: true, id }
     }
     catch (error) {
+      // The model's own rules rejected the row: the caller's mistake, named
+      // field by field, not a server failure (stacksjs/stacks#3007).
+      if (error instanceof ModelValidationError)
+        return response.json({ message: 'Validation failed.', errors: error.errors }, 422)
       return dashboardOperationalError(error, 'The model record could not be created.', 'ModelStoreAction', 500)
     }
   },

package/app/Actions/Dashboard/Models/ModelUpdateAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions/runtime'
-import { toSnakeCaseKeys } from '@stacksjs/orm'
+import { ModelValidationError, toSnakeCaseKeys } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
 import { dashboardOperationalError } from '../dashboard-response'
 import { parseRowId, prepareModelFields, resolveWritableModel } from './model-write'
@@ -55,6 +55,10 @@ export default new Action({
       return { ok: true, id, changed: Object.keys(changes) }
     }
     catch (error) {
+      // The model's own rules rejected the row: the caller's mistake, named
+      // field by field, not a server failure (stacksjs/stacks#3007).
+      if (error instanceof ModelValidationError)
+        return response.json({ message: 'Validation failed.', errors: error.errors }, 422)
       return dashboardOperationalError(error, 'The model record could not be updated.', 'ModelUpdateAction', 500)
     }
   },

package/app/Actions/Dashboard/Notifications/NotificationDeliveryOverviewAction.ts

@@ -42,7 +42,7 @@ async function notificationDeliveryOverview() {
     db
       .selectFrom('notification_deliveries')
       .select(['channel', 'status', db.fn.count('id').as('count')])
-      .groupBy(['channel', 'status'])
+      .groupBy('channel', 'status')
       .execute() as unknown as Promise<ChannelStatusCountRow[]>,
     db
       .selectFrom('notification_deliveries')

package/app/Actions/Storefront/AddToCartAction.ts

@@ -1,6 +1,6 @@
 import { Action } from '@stacksjs/actions/runtime'
 import { config } from '@stacksjs/config'
-import { db } from '@stacksjs/database/runtime'
+import { db, sqlDateTime } from '@stacksjs/database/runtime'
 import { response } from '@stacksjs/router'
 import { randomUUIDv7 } from 'bun'
 import { readCartCookie, writeCartCookie } from '../../Storefront/CartCookie'
@@ -41,7 +41,8 @@ export default new Action({
     const product = await (db as any)
       .selectFrom('products')
       .where('slug', '=', slug)
-      .where('is_available', '=', 1)
+      // A boolean, not 1: PostgreSQL has no boolean = integer (#3005).
+      .where('is_available', '=', true)
       .selectAll()
       .executeTakeFirst()
 
@@ -70,6 +71,8 @@ export default new Action({
           currency: storefrontCurrency(config.commerce?.currency),
           session_token: token,
           checkout_step: 'cart',
+          // The cart lasts as long as the cookie that finds it (#3017).
+          expires_at: sqlDateTime(new Date(Date.now() + COOKIE_OPTS.maxAge * 1000)),
         })
         .execute()
       // Re-read by session_token: bun-query-builder's `returningAll()`

package/app/Actions/Storefront/PlaceOrderAction.ts

@@ -1,4 +1,6 @@
+import { randomUUIDv7 } from 'bun'
 import { Action } from '@stacksjs/actions/runtime'
+import { customers } from '@stacksjs/commerce'
 import { config } from '@stacksjs/config'
 import { db } from '@stacksjs/database/runtime'
 import { response } from '@stacksjs/router'
@@ -62,17 +64,10 @@ export default new Action({
       .selectAll()
       .executeTakeFirst()
 
-    if (!customer) {
-      await (db as any)
-        .insertInto('customers')
-        .values({ name: cart.shipping_name, email: cart.email })
-        .execute()
-      customer = await (db as any)
-        .selectFrom('customers')
-        .where('email', '=', cart.email)
-        .selectAll()
-        .executeTakeFirst()
-    }
+    // Through commerce's store, which fills what the table requires and the
+    // checkout does not ask for, such as the avatar (#3017).
+    if (!customer)
+      customer = await customers.store({ name: cart.shipping_name, email: cart.email, uuid: randomUUIDv7() } as never)
 
     // Integer minor units of the cart's currency, like every amount here.
     const currency = storefrontCurrency(cart.currency)

package/app/Actions/Storefront/SubmitReviewAction.ts

@@ -14,9 +14,9 @@ const CART_COOKIE = 'stacks_cart'
  *     `email` on the order against the `email` they're posting with,
  *     and additionally accepts a still-valid cart cookie path for
  *     guest shoppers who haven't enrolled in account auth.
- *   - Marks `is_verified_purchase=1` only when that email-on-order
+ *   - Marks `is_verified_purchase` true only when that email-on-order
  *     check passes.
- *   - Always inserts with `is_approved=0`. The dashboard's reviews
+ *   - Always inserts with `is_approved` false. The dashboard's reviews
  *     index shows pending entries to admins for moderation.
  *
  * Spam handling: rate-limit per IP (5/min) so a hostile actor can't
@@ -123,9 +123,10 @@ export default new Action({
         rating,
         title,
         content,
-        is_verified_purchase: 1,
-        is_approved: 0,
-        is_featured: 0,
+        // Booleans, which PostgreSQL requires of these columns (#3005).
+        is_verified_purchase: true,
+        is_approved: false,
+        is_featured: false,
         helpful_votes: 0,
         unhelpful_votes: 0,
         purchase_date: order.created_at || new Date().toISOString(),

package/app/Models/Activity.ts

@@ -78,6 +78,7 @@ export default defineModel({
     properties: {
       required: false,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },

package/app/Models/AnalyticsEvent.ts

@@ -67,6 +67,7 @@ export default defineModel({
 
     properties: {
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },

package/app/Models/AutomationRun.ts

@@ -21,6 +21,6 @@ export default defineModel({
     idempotencyKey: { required: true, fillable: true, validation: { rule: schema.string().max(255) }, factory: faker => faker.string.uuid() },
     startedAt: { required: false, fillable: true, validation: { rule: schema.timestamp() }, factory: () => null },
     finishedAt: { required: false, fillable: true, validation: { rule: schema.timestamp() }, factory: () => null },
-    error: { required: false, fillable: true, validation: { rule: schema.string() }, factory: () => null },
+    error: { type: 'text', required: false, fillable: true, validation: { rule: schema.string() }, factory: () => null },
   },
 } as const)

package/app/Models/BoardColumn.ts

@@ -50,7 +50,6 @@ export default defineModel({
       order: 1,
       fillable: true,
       validation: { rule: schema.number().required() },
-      factory: () => 1,
     },
 
     name: {

package/app/Models/Campaign.ts

@@ -103,6 +103,7 @@ export default defineModel({
     text: {
       required: false,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },
@@ -197,7 +198,6 @@ export default defineModel({
       validation: {
         rule: schema.number(),
       },
-      factory: faker => faker.number.int({ min: 1, max: 8 }),
     },
 
     scheduledAt: {

package/app/Models/CampaignSend.ts

@@ -17,6 +17,8 @@ export default defineModel({
   ],
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 20 },
     gdpr: { subject: { via: 'Subscriber' }, erasure: 'anonymize', basis: 'legitimate_interests', purpose: 'Campaign delivery statistics' },
     useUuid: true,
     useTimestamps: true,
@@ -37,7 +39,6 @@ export default defineModel({
       validation: {
         rule: schema.number(),
       },
-      factory: faker => faker.number.int({ min: 1, max: 10 }),
     },
 
     subscriberId: {
@@ -46,7 +47,6 @@ export default defineModel({
       validation: {
         rule: schema.number(),
       },
-      factory: () => null,
     },
 
     emailListId: {
@@ -55,7 +55,6 @@ export default defineModel({
       validation: {
         rule: schema.number(),
       },
-      factory: () => null,
     },
 
     status: {
@@ -112,6 +111,7 @@ export default defineModel({
     error: {
       required: false,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },

package/app/Models/Card.ts

@@ -62,7 +62,6 @@ export default defineModel({
       // query stays single-table. The kanban API keeps it in sync on
       // card create/move (Phase 2).
       validation: { rule: schema.number().required() },
-      factory: () => 1,
     },
 
     title: {

package/app/Models/CardComment.ts

@@ -47,14 +47,12 @@ export default defineModel({
       order: 1,
       fillable: true,
       validation: { rule: schema.number().required() },
-      factory: () => 1,
     },
 
     userId: {
       order: 2,
       fillable: true,
       validation: { rule: schema.number() },
-      factory: () => null,
     },
 
     body: {

package/app/Models/Content/Author.ts

@@ -16,6 +16,8 @@ export default defineModel({
   ],
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 5 },
     gdpr: { erasure: 'anonymize', basis: 'legitimate_interests', purpose: 'Byline on published content' },
     useAuth: {
       usePasskey: true,

package/app/Models/Content/Categorizable.ts

@@ -47,6 +47,7 @@ export default defineModel({
       required: false,
       nullable: true,
       fillable: true,
+      type: 'text',
       validation: { rule: schema.string() },
     },
     isActive: {

package/app/Models/Content/Menu.ts

@@ -25,6 +25,8 @@ export default defineModel({
   ownership: siteOwnership(),
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 3 },
     useTimestamps: true,
     useApi: {
       middleware: ['auth'],

package/app/Models/Content/MenuItem.ts

@@ -17,6 +17,8 @@ export default defineModel({
   ownership: parentOwnership('Menu', 'menu_id'),
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 10 },
     useTimestamps: true,
     useApi: {
       middleware: ['auth'],

package/app/Models/Content/PageRevision.ts

@@ -25,6 +25,8 @@ export default defineModel({
   ],
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 10 },
     useTimestamps: true,
   },
 

package/app/Models/Content/Post.ts

@@ -12,6 +12,8 @@ export default defineModel({
   ownership: siteOwnership(),
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 10 },
     useUuid: true,
     useTimestamps: true,
     useSearch: {

package/app/Models/Content/Redirect.ts

@@ -26,6 +26,8 @@ export default defineModel({
   ownership: siteOwnership(),
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 5 },
     useTimestamps: true,
     useApi: {
       middleware: ['auth'],

package/app/Models/EmailListSubscriber.ts

@@ -18,6 +18,8 @@ export default defineModel({
   belongsTo: ['EmailList', 'Subscriber'],
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 20 },
     gdpr: { subject: { via: 'Subscriber' }, erasure: 'delete', basis: 'consent', purpose: 'Mailing list membership' },
     useUuid: true,
     useTimestamps: true,
@@ -39,7 +41,6 @@ export default defineModel({
       validation: {
         rule: schema.number(),
       },
-      factory: faker => faker.number.int({ min: 1, max: 8 }),
     },
 
     subscriberId: {
@@ -48,7 +49,6 @@ export default defineModel({
       validation: {
         rule: schema.number(),
       },
-      factory: faker => faker.number.int({ min: 1, max: 100 }),
     },
 
     status: {

package/app/Models/Error.ts

@@ -15,6 +15,8 @@ export default defineModel({
   ],
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 10 },
     useTimestamps: true,
   },
 
@@ -32,6 +34,7 @@ export default defineModel({
 
     message: {
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string().required(),
         message: {
@@ -43,6 +46,7 @@ export default defineModel({
 
     stack: {
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
         message: {
@@ -86,6 +90,7 @@ export default defineModel({
 
     additional_info: {
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
         message: {

package/app/Models/Forms/Form.ts

@@ -28,6 +28,8 @@ export default defineModel({
   ownership: siteOwnership(),
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 3 },
     useUuid: true,
     useTimestamps: true,
     useApi: {

package/app/Models/Forms/FormField.ts

@@ -27,6 +27,8 @@ export default defineModel({
   ownership: parentOwnership('Form', 'form_id'),
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 10 },
     useTimestamps: true,
     useApi: {
       middleware: ['auth'],

package/app/Models/Forms/FormSubmission.ts

@@ -18,6 +18,8 @@ export default defineModel({
   autoIncrement: true,
 
   traits: {
+    // So a fresh seed fills its dashboard page (stacksjs/stacks#3000).
+    useSeeder: { count: 10 },
     gdpr: { subject: { email: 'email' }, erasure: 'anonymize', basis: 'consent', purpose: 'Form submissions' },
     useUuid: true,
     useTimestamps: true,

package/app/Models/Label.ts

@@ -47,7 +47,6 @@ export default defineModel({
       order: 1,
       fillable: true,
       validation: { rule: schema.number().required() },
-      factory: () => 1,
     },
 
     name: {

package/app/Models/Log.ts

@@ -49,7 +49,9 @@ export default defineModel({
       order: 1,
       fillable: true,
       validation: {
-        rule: schema.number().required(),
+        // Milliseconds since the epoch, so a bigint column, as on Websocket.time
+        // (stacksjs/stacks#2996).
+        rule: schema.unix().required(),
         message: {
           date: 'Timestamp must be a valid date',
         },

package/app/Models/MagicLinkToken.ts

@@ -15,13 +15,6 @@ export default defineModel({
   primaryKey: 'id',
   autoIncrement: true,
 
-  indexes: [
-    {
-      name: 'magic_link_tokens_token_unique',
-      columns: ['token'],
-      unique: true,
-    },
-  ],
 
   traits: {
     gdpr: { erasure: 'delete', basis: 'contract', purpose: 'Passwordless sign-in links' },

package/app/Models/PaymentProduct.ts

@@ -28,6 +28,7 @@ export default defineModel({
 
     description: {
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
         message: {

package/app/Models/PaymentTransaction.ts

@@ -32,6 +32,7 @@ export default defineModel({
 
     description: {
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
         message: {