@stacksjs/defaults 0.75.317 → 0.75.320

package/app/Models/commerce/Cart.ts

@@ -136,9 +136,90 @@ export default defineModel({
       order: 10,
       fillable: true,
       validation: {
-        rule: schema.string().required(),
+        // Optional: a cart without a coupon is the common case.
+        rule: schema.string(),
+      },
+      // Stored and shown, never resolved: nothing redeems or joins on it yet,
+      // so what it holds is left to the feature that does. No factory, so a
+      // seed does not invent one (stacksjs/stacks#3002).
+    },
+
+    // The storefront's anonymous cart: the shopper's signed stacks_cart cookie
+    // carries this token, checkout records its progress and the address, and
+    // the order is placed from them (stacksjs/stacks#3017). A cart made any
+    // other way has none of them.
+
+    /** Bearer for an anonymous cart, so never returned by the API. No factory: a seeded cart is no shopper's. */
+    sessionToken: {
+      order: 11,
+      unique: true,
+      hidden: true,
+      validation: {
+        rule: schema.string().max(255),
+      },
+    },
+
+    checkoutStep: {
+      default: 'cart',
+      order: 12,
+      fillable: true,
+      validation: {
+        rule: schema.enum(['cart', 'shipping', 'payment', 'placed']),
+      },
+    },
+
+    email: {
+      personal: true,
+      order: 13,
+      fillable: true,
+      validation: {
+        rule: schema.string().email().max(255),
+      },
+    },
+
+    shippingName: {
+      personal: true,
+      order: 14,
+      fillable: true,
+      validation: {
+        rule: schema.string().max(255),
+      },
+    },
+
+    shippingAddress: {
+      personal: true,
+      order: 15,
+      fillable: true,
+      validation: {
+        rule: schema.string().max(255),
+      },
+    },
+
+    shippingCity: {
+      personal: true,
+      order: 16,
+      fillable: true,
+      validation: {
+        rule: schema.string().max(255),
+      },
+    },
+
+    shippingState: {
+      personal: true,
+      order: 17,
+      fillable: true,
+      validation: {
+        rule: schema.string().max(100),
+      },
+    },
+
+    shippingZip: {
+      personal: true,
+      order: 18,
+      fillable: true,
+      validation: {
+        rule: schema.string().max(20),
       },
-      factory: () => 'test-coupon-id',
     },
   },
 

package/app/Models/commerce/Category.ts

@@ -64,6 +64,7 @@ export default defineModel({
     description: {
       order: 2,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },
@@ -101,7 +102,10 @@ export default defineModel({
       order: 5,
       fillable: true,
       validation: {
-        rule: schema.string(),
+        // Another category's id, so a number like the id it points at. As a
+        // string it was a text column, and joining it to categories.id failed
+        // on PostgreSQL with "text = bigint" (stacksjs/stacks#3002).
+        rule: schema.number(),
       },
       factory: () => null, // Most categories won't have a parent
     },

package/app/Models/commerce/Coupon.ts

@@ -55,6 +55,7 @@ export default defineModel({
     description: {
       order: 2,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },
@@ -145,7 +146,9 @@ export default defineModel({
       validation: {
         rule: schema.string(),
       },
-      factory: faker => faker.string.uuid(),
+      // Stored and shown, never resolved: nothing redeems or joins on it yet,
+      // so what it holds is left to the feature that does. No factory, so a
+      // seed does not invent one (stacksjs/stacks#3002).
     },
 
     usageLimit: {

package/app/Models/commerce/DigitalDelivery.ts

@@ -56,6 +56,7 @@ export default defineModel({
     description: {
       order: 3,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string().required(),
       },

package/app/Models/commerce/GiftCard.ts

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

package/app/Models/commerce/LoyaltyPoint.ts

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

package/app/Models/commerce/LoyaltyReward.ts

@@ -98,7 +98,9 @@ export default defineModel({
       validation: {
         rule: schema.string(),
       },
-      factory: faker => faker.helpers.maybe(() => faker.string.uuid(), { probability: 0.4 }),
+      // Stored and shown, never resolved: nothing redeems or joins on it yet,
+      // so what it holds is left to the feature that does. No factory, so a
+      // seed does not invent one (stacksjs/stacks#3002).
     },
 
     isActive: {

package/app/Models/commerce/Order.ts

@@ -142,6 +142,7 @@ export default defineModel({
       personal: true,
       order: 11,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },
@@ -199,7 +200,9 @@ export default defineModel({
       validation: {
         rule: schema.string(),
       },
-      factory: faker => faker.helpers.maybe(() => faker.string.uuid(), { probability: 0.2 }),
+      // Stored and shown, never resolved: nothing redeems or joins on it yet,
+      // so what it holds is left to the feature that does. No factory, so a
+      // seed does not invent one (stacksjs/stacks#3002).
     },
   },
 

package/app/Models/commerce/OrderItem.ts

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

package/app/Models/commerce/Payment.ts

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

package/app/Models/commerce/Product.ts

@@ -1,4 +1,5 @@
 import { defineModel } from '@stacksjs/orm'
+import { slug } from '@stacksjs/strings'
 import { schema } from '@stacksjs/validation/runtime'
 
 export default defineModel({
@@ -56,9 +57,22 @@ export default defineModel({
       factory: faker => faker.commerce.productName(),
     },
 
+    // The storefront's address for a product: /products/{slug}, and what a
+    // cart line keeps in product_sku (stacksjs/stacks#3005).
+    slug: {
+      order: 1,
+      unique: true,
+      fillable: true,
+      validation: {
+        rule: schema.string().required().max(255),
+      },
+      factory: (_faker, attributes) => slug(String(attributes.name)),
+    },
+
     description: {
       order: 2,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },
@@ -139,6 +153,7 @@ export default defineModel({
     nutritionalInfo: {
       order: 10,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },

package/app/Models/commerce/ProductVariant.ts

@@ -77,6 +77,7 @@ export default defineModel({
     description: {
       order: 5,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },
@@ -86,6 +87,7 @@ export default defineModel({
     options: {
       order: 6,
       fillable: true,
+      type: 'text',
       validation: {
         rule: schema.string(),
       },

package/app/Models/commerce/Receipt.ts

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

package/app/Models/commerce/Review.ts

@@ -34,7 +34,9 @@ export default defineModel({
     observe: true,
   },
 
-  belongsTo: ['Product', 'Customer'],
+  // The order a storefront review was left for: one review per product per
+  // order, and the proof the reviewer bought it (stacksjs/stacks#3017).
+  belongsTo: ['Product', 'Customer', 'Order'],
 
   attributes: {
     /**

package/app/Models/commerce/Transaction.ts

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

package/app/Models/realtime/Websocket.ts

@@ -72,7 +72,10 @@ export default defineModel({
       order: 4,
       fillable: true,
       validation: {
-        rule: schema.number(),
+        // A Unix timestamp in milliseconds, so a bigint column: `number()`
+        // generated a 32-bit integer that Date.now() overflows on PostgreSQL
+        // and MySQL (stacksjs/stacks#2996).
+        rule: schema.unix(),
         message: {
           date: 'Time must be a valid timestamp',
         },

package/functions/dashboard-form.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'bun:test'
-import { formErrorMessages } from './dashboard-form'
+import { formErrorMessages, slugify } from './dashboard-form'
 
 /**
  * stacksjs/stacks#2918 — this was duplicated across fourteen dialogs. The
@@ -39,3 +39,12 @@ describe('formErrorMessages', () => {
     expect(formErrorMessages({ Name: 'is required' })).toEqual(['Name: is required'])
   })
 })
+
+describe('slugify', () => {
+  it('turns a name into the slug a dialog proposes', () => {
+    expect(slugify('Trail Runner')).toBe('trail-runner')
+    expect(slugify('  Café & Bar  ')).toBe('cafe-bar')
+    expect(slugify('50% off: Summer!')).toBe('50-off-summer')
+    expect(slugify('---')).toBe('')
+  })
+})

package/functions/dashboard-form.ts

@@ -28,3 +28,20 @@ export function formErrorMessages(errors: Record<string, string>): string[] {
     return `${label.charAt(0).toUpperCase()}${label.slice(1)}: ${message}`
   })
 }
+
+/**
+ * A slug a dialog proposes from a name: accents folded, lowercase, and every
+ * run of anything but a letter or digit one hyphen.
+ *
+ * The category dialog defined this inline; the product dialog needs the same
+ * rule (stacksjs/stacks#3005), so it lives here once.
+ */
+export function slugify(value: string): string {
+  return value
+    .normalize('NFKD')
+    .replace(/[̀-ͯ]/g, '')
+    .toLowerCase()
+    .trim()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+}

package/ide/vscode/package.json

@@ -2,7 +2,7 @@
   "publisher": "Stacks",
   "name": "vscode-stacks",
   "displayName": "Stacks",
-  "version": "0.75.317",
+  "version": "0.75.320",
   "description": "Stacks, built into VS Code: stx templates, pickier linting and formatting, encrypted env files, the dev server preview and every buddy command. No other extensions required.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/defaults",
   "type": "module",
   "sideEffects": false,
-  "version": "0.75.317",
+  "version": "0.75.320",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/stacksjs/stacks.git",
@@ -45,9 +45,9 @@
   "dependencies": {
     "@iconify-json/f7": "^1.2.2",
     "@iconify-json/hugeicons": "^1.2.35",
-    "@stacksjs/mobile": "0.75.317",
-    "@stacksjs/sanitizer": "0.2.691",
-    "@stacksjs/stx": "0.2.691",
+    "@stacksjs/mobile": "0.75.320",
+    "@stacksjs/sanitizer": "0.2.711",
+    "@stacksjs/stx": "0.2.711",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",
     "ts-qr-codes": "^0.1.8"

package/resources/components/Dashboard/Analytics/AnalyticsPageHeader.stx

@@ -4,7 +4,7 @@ const description = useReactiveProp('description', '')
 const dateRange = useReactiveProp('dateRange', '')
 const range = useReactiveProp('range', 'month')
 const loading = useReactiveProp('loading', false)
-const emit = defineEmits()
+const emit = defineEmits(['range-change', 'refresh'])
 const selectedRange = state('month')
 
 effect(() => {

package/resources/components/Dashboard/App/RequestDetailsDialog.stx

@@ -13,7 +13,7 @@ interface RequestRow {
 }
 
 const request = useReactiveProp('request', null as RequestRow | null)
-const emit = defineEmits()
+const emit = defineEmits(['close'])
 
 function formatDate(value: string | undefined): string {
   if (!value)

package/resources/components/Dashboard/Auth/AccessTokenCreateDialog.stx

@@ -28,7 +28,7 @@ const expiryMinutes = state('10080')
 const selectedScopes = state<string[]>(['read'])
 const localError = state('')
 const copied = state(false)
-const emit = defineEmits()
+const emit = defineEmits(['submit', 'close'])
 let wasOpen = false
 
 effect(() => {

package/resources/components/Dashboard/Auth/ForgotPassword.stx

@@ -1,7 +1,7 @@
 @import('../UI/Input', '../UI/Button')
 
 <script client>
-const emit = defineEmits()
+const emit = defineEmits(['submit', 'retry'])
 const title = useReactiveProp<string>('title', 'Forgot password?')
 const subtitle = useReactiveProp<string>('subtitle', 'Enter your email and we\'ll send you a reset link')
 const isLoading = useReactiveProp<boolean>('isLoading', false)

package/resources/components/Dashboard/Auth/Login.stx

@@ -1,7 +1,7 @@
 @import('../UI/Input', '../UI/Button')
 
 <script client>
-const emit = defineEmits()
+const emit = defineEmits(['submit'])
 const title = useReactiveProp<string>('title', 'Welcome back')
 const subtitle = useReactiveProp<string>('subtitle', 'Sign in to your account')
 const isLoading = useReactiveProp<boolean>('isLoading', false)

package/resources/components/Dashboard/Auth/Register.stx

@@ -1,7 +1,7 @@
 @import('../UI/Input', '../UI/Button')
 
 <script client>
-const emit = defineEmits()
+const emit = defineEmits(['submit'])
 const title = useReactiveProp<string>('title', 'Create an account')
 const subtitle = useReactiveProp<string>('subtitle', 'Get started with your free account')
 const isLoading = useReactiveProp<boolean>('isLoading', false)

package/resources/components/Dashboard/Auth/ResetPassword.stx

@@ -13,7 +13,7 @@
 --}}
 
 <script client>
-const emit = defineEmits()
+const emit = defineEmits(['submit'])
 const title = useReactiveProp<string>('title', 'Choose a new password')
 const subtitle = useReactiveProp<string>('subtitle', 'Set the password you will use to sign in')
 const isLoading = useReactiveProp<boolean>('isLoading', false)

package/resources/components/Dashboard/Auth/TwoFactorLogin.stx

@@ -1,7 +1,7 @@
 @import('../UI/Input', '../UI/Button')
 
 <script client>
-const emit = defineEmits()
+const emit = defineEmits(['submit', 'restart'])
 const isLoading = useReactiveProp<boolean>('isLoading', false)
 const error = useReactiveProp<string>('error', '')
 const code = state('')

package/resources/components/Dashboard/CodeEditor.stx

@@ -6,7 +6,7 @@ const liveLanguage = useReactiveProp('language', 'text' as CodeEditorLanguage)
 const liveLabel = useReactiveProp('label', 'Code editor')
 const liveLoading = useReactiveProp('loading', false)
 const liveReadonly = useReactiveProp('readonly', false)
-const emit = defineEmits()
+const emit = defineEmits(['update:value', 'input', 'save', 'format'])
 
 const lineCount = derived(() => Math.max(1, liveValue().split('\n').length))
 const characterCount = derived(() => liveValue().length)

package/resources/components/Dashboard/Commerce/CommerceCategoriesDashboard.stx

@@ -17,7 +17,7 @@ interface CategoryWritePayload {
   slug: string
   imageUrl: string
   isActive: boolean
-  parentCategoryId: string
+  parentCategoryId: number | null
   displayOrder: number
 }
 

package/resources/components/Dashboard/Commerce/CommerceCategoriesTable.stx

@@ -10,7 +10,7 @@ const loading = useReactiveProp('loading', false)
 const sortResetKey = useReactiveProp<unknown>('sortResetKey', '')
 /** The parent's search and filters: a change returns to the first page. */
 const pageResetKey = useReactiveProp<unknown>('pageResetKey', '')
-const emit = defineEmits()
+const emit = defineEmits(['view', 'edit', 'delete'])
 
 function parentName(record: CommerceCategoryRecord): string {
   if (!record.parentCategoryId)

package/resources/components/Dashboard/Commerce/CommerceCategoryDeleteDialog.stx

@@ -4,7 +4,7 @@ import type { CommerceCategoryRecord } from '../../../../app/Actions/Dashboard/C
 const open = useReactiveProp('open', false)
 const record = useReactiveProp('record', null as CommerceCategoryRecord | null)
 const busy = useReactiveProp('busy', false)
-const emit = defineEmits()
+const emit = defineEmits(['close', 'confirm'])
 const description = derived(() => `Delete "${record()?.name || 'Unnamed category'}" permanently? Linked products and child categories may prevent deletion.`)
 </script>
 

package/resources/components/Dashboard/Commerce/CommerceCategoryDetailsDialog.stx

@@ -4,7 +4,7 @@ import type { CommerceCategoryRecord } from '../../../../app/Actions/Dashboard/C
 const open = useReactiveProp('open', false)
 const record = useReactiveProp('record', null as CommerceCategoryRecord | null)
 const records = useReactiveProp('records', [] as CommerceCategoryRecord[])
-const emit = defineEmits()
+const emit = defineEmits(['edit', 'close', 'delete'])
 
 function parentName(): string {
   const parentId = record()?.parentCategoryId

package/resources/components/Dashboard/Commerce/CommerceCategoryDialog.stx

@@ -1,6 +1,6 @@
 <script client>
 import type { CommerceCategoryRecord } from '../../../../app/Actions/Dashboard/Commerce/commerce-category-records'
-import { formErrorMessages } from '../../../../functions/dashboard-form'
+import { formErrorMessages, slugify } from '../../../../functions/dashboard-form'
 
 const open = useReactiveProp('open', false)
 const mode = useReactiveProp('mode', 'add')
@@ -8,7 +8,7 @@ const record = useReactiveProp('record', null as CommerceCategoryRecord | null)
 const records = useReactiveProp('records', [] as CommerceCategoryRecord[])
 const busy = useReactiveProp('busy', false)
 const errors = useReactiveProp('errors', {} as Record<string, string>)
-const emit = defineEmits()
+const emit = defineEmits(['submit', 'close'])
 const name = state('')
 const description = state('')
 const slug = state('')
@@ -19,16 +19,6 @@ const displayOrder = state('0')
 let hydrationKey = ''
 let slugTouched = false
 
-function slugify(value: string): string {
-  return value
-    .normalize('NFKD')
-    .replace(/[\u0300-\u036F]/g, '')
-    .toLowerCase()
-    .trim()
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/^-+|-+$/g, '')
-}
-
 effect(() => {
   if (!open()) {
     hydrationKey = ''
@@ -108,7 +98,8 @@ function submit(): void {
     slug: slugify(slug()),
     imageUrl: imageUrl().trim(),
     isActive: isActive(),
-    parentCategoryId: parentCategoryId(),
+    // The select holds the id as text; the model declares a number (#3013).
+    parentCategoryId: parentCategoryId() ? Number(parentCategoryId()) : null,
     displayOrder: Number(displayOrder()),
   })
 }

package/resources/components/Dashboard/Commerce/CommerceCouponDeleteDialog.stx

@@ -4,7 +4,7 @@ import type { CouponRecord } from '../../../../app/Actions/Dashboard/Commerce/co
 const open = useReactiveProp('open', false)
 const record = useReactiveProp('record', null as CouponRecord | null)
 const busy = useReactiveProp('busy', false)
-const emit = defineEmits()
+const emit = defineEmits(['close', 'confirm'])
 const description = derived(() => `Delete "${record()?.code || 'Unnamed coupon'}" permanently? Recorded order relationships may prevent deletion.`)
 </script>
 

package/resources/components/Dashboard/Commerce/CommerceCouponDetailsDialog.stx

@@ -5,7 +5,7 @@ import { formatCurrency } from '@stacksjs/commerce/money'
 const open = useReactiveProp('open', false)
 const record = useReactiveProp('record', null as CouponRecord | null)
 const currency = useReactiveProp('currency', 'USD')
-const emit = defineEmits()
+const emit = defineEmits(['edit', 'close', 'delete'])
 
 // Fixed discounts and order thresholds are integer minor units.
 function money(value: number): string {

package/resources/components/Dashboard/Commerce/CommerceCouponDialog.stx

@@ -13,7 +13,7 @@ const record = useReactiveProp('record', null as CouponRecord | null)
 const currency = useReactiveProp('currency', 'USD')
 const busy = useReactiveProp('busy', false)
 const errors = useReactiveProp('errors', {} as Record<string, string>)
-const emit = defineEmits()
+const emit = defineEmits(['submit', 'close'])
 const code = state('')
 const description = state('')
 const status = state<CouponStatus>('Active')

package/resources/components/Dashboard/Commerce/CommerceCouponsTable.stx

@@ -11,7 +11,7 @@ const sortResetKey = useReactiveProp<unknown>('sortResetKey', '')
 /** The parent's search and filters: a change returns to the first page. */
 const pageResetKey = useReactiveProp<unknown>('pageResetKey', '')
 const currency = useReactiveProp('currency', 'USD')
-const emit = defineEmits()
+const emit = defineEmits(['view', 'edit', 'delete'])
 
 // A percentage is a rate, not money; a fixed amount is integer minor units.
 function discount(record: CouponRecord): string {

package/resources/components/Dashboard/Commerce/CommerceCustomerDeleteDialog.stx

@@ -4,7 +4,7 @@ import type { CommerceCustomerRecord } from '../../../../app/Actions/Dashboard/C
 const open = useReactiveProp('open', false)
 const record = useReactiveProp('record', null as CommerceCustomerRecord | null)
 const busy = useReactiveProp('busy', false)
-const emit = defineEmits()
+const emit = defineEmits(['close', 'confirm'])
 const description = derived(() => `Delete "${record()?.name || 'Unnamed customer'}" permanently? Linked orders, reviews, payments, and gift cards may prevent deletion.`)
 </script>
 

package/resources/components/Dashboard/Commerce/CommerceCustomerDetailsDialog.stx

@@ -5,7 +5,7 @@ import { formatCurrency } from '@stacksjs/commerce/money'
 const open = useReactiveProp('open', false)
 const record = useReactiveProp('record', null as CommerceCustomerRecord | null)
 const currency = useReactiveProp('currency', 'USD')
-const emit = defineEmits()
+const emit = defineEmits(['edit', 'close', 'delete'])
 
 function formatMoney(value: number): string {
   return formatCurrency(value, currency())

package/resources/components/Dashboard/Commerce/CommerceCustomerDialog.stx

@@ -9,7 +9,7 @@ const record = useReactiveProp('record', null as CommerceCustomerRecord | null)
 const currency = useReactiveProp('currency', 'USD')
 const busy = useReactiveProp('busy', false)
 const errors = useReactiveProp('errors', {} as Record<string, string>)
-const emit = defineEmits()
+const emit = defineEmits(['submit', 'close'])
 const name = state('')
 const email = state('')
 const phone = state('')

package/resources/components/Dashboard/Commerce/CommerceCustomersTable.stx

@@ -10,7 +10,7 @@ const sortResetKey = useReactiveProp<unknown>('sortResetKey', '')
 /** The parent's search and filters: a change returns to the first page. */
 const pageResetKey = useReactiveProp<unknown>('pageResetKey', '')
 const currency = useReactiveProp('currency', 'USD')
-const emit = defineEmits()
+const emit = defineEmits(['view', 'edit', 'delete'])
 
 /** Only the customer cell is slotted, for its initial. */
 const COLUMNS = [