Migrate :text/x-text bindings to {⁠{ }} interpolation (stx 0.2.72)

Review threads live on the whole diff, not on one commit, so none are shown here - a thread's line means something in the branch's final form, and painting it into an intermediate step would put it on code it is not about.

app/Actions/Activity/ActivityIndexAction.tsmodified+4-3

Changes to app/Actions/Activity/ActivityIndexAction.ts

		⋯29 linesShow the 29 lines above this hunk@@ -30,13 +30,13 @@ export default new Action({
30	30
31	31	async handle(request) {
32	32	const userId = request.get<number>('user_id')
33		- const limit = Math.min(Math.max(request.get<number>('limit') || 100, 1), 500)
	33	+ const page = readPageParams(request, { defaultLimit: 100, maxLimit: 500 })
34	34
35	35	try {
36	36	const query = userId
37	37	? Activity.where('user_id', '=', userId)
38	38	: Activity.query()
39		- const rows = (await query.orderBy('completed_at', 'desc').limit(limit).get()) ?? []
	39	+ const rows = (await query.orderBy('completed_at', 'desc').get()) ?? []
40	40
41	41	// Batch-load owners + trails so the feed gets names without N+1 lookups.
42	42	const userIds = [...new Set(rows.map((a: any) => a.user_id).filter(Boolean))]
		⋯28 linesShow the 28 lines above this hunk@@ -71,7 +71,8 @@ export default new Action({
71	71	}
72	72	})
73	73
74		- return response.json({ activities, meta: { total: activities.length } })
	74	+ const { items, meta } = paginate(activities, page)
	75	+ return response.json({ activities: items, meta })
75	76	}
76	77	catch (error) {
77	78	console.error('[activities] index failed:', error)

app/Actions/Challenge/ChallengeIndexAction.tsmodified+2-1

Changes to app/Actions/Challenge/ChallengeIndexAction.ts

		⋯32 linesShow the 32 lines above this hunk@@ -33,7 +33,8 @@ export default new Action({
33	33	}))
34	34	.sort((a: any, b: any) => Date.parse(b.createdAt ?? '') - Date.parse(a.createdAt ?? ''))
35	35
36		- return response.json({ success: true, challenges, meta: { total: challenges.length } })
	36	+ const paged = paginate(challenges, readPageParams(request))
	37	+ return response.json({ success: true, challenges: paged.items, meta: paged.meta })
37	38	}
38	39	catch (error) {
39	40	console.error('[challenges] index failed:', error)

app/Actions/Club/ClubIndexAction.tsmodified+2-1

Changes to app/Actions/Club/ClubIndexAction.ts

		⋯72 linesShow the 72 lines above this hunk@@ -73,7 +73,8 @@ export default new Action({
73	73	})
74	74	.sort((a: any, b: any) => b.memberCount - a.memberCount || a.id - b.id)
75	75
76		- return response.json({ success: true, clubs: result, meta: { total: result.length } })
	76	+ const paged = paginate(result, readPageParams(request))
	77	+ return response.json({ success: true, clubs: paged.items, meta: paged.meta })
77	78	}
78	79	catch (error) {
79	80	console.error('[clubs] index failed:', error)

app/Actions/Social/UserSearchAction.tsmodified+2-1

Changes to app/Actions/Social/UserSearchAction.ts

		⋯45 linesShow the 45 lines above this hunk@@ -46,7 +46,8 @@ export default new Action({
46	46	// Discover mode surfaces the most active athletes first.
47	47	.sort((a: any, b: any) => b.activityCount - a.activityCount || b.followerCount - a.followerCount || a.id - b.id)
48	48
49		- return response.json({ success: true, athletes, meta: { total: athletes.length, query: q } })
	49	+ const paged = paginate(athletes, readPageParams(request, { defaultLimit: 20, maxLimit: 50 }))
	50	+ return response.json({ success: true, athletes: paged.items, meta: { ...paged.meta, query: q } })
50	51	}
51	52	catch (error) {
52	53	console.error('[users] search failed:', error)

app/Actions/Trail/SavedTrailIndexAction.tsmodified+2-1

Changes to app/Actions/Trail/SavedTrailIndexAction.ts

		⋯47 linesShow the 47 lines above this hunk@@ -48,7 +48,8 @@ export default new Action({
48	48	}
49	49	})
50	50
51		- return response.json({ success: true, savedTrails, meta: { total: savedTrails.length } })
	51	+ const paged = paginate(savedTrails, readPageParams(request))
	52	+ return response.json({ success: true, savedTrails: paged.items, meta: paged.meta })
52	53	}
53	54	catch (error) {
54	55	console.error('[saved-trails] index failed:', error)

app/Actions/Trail/TrailIndexAction.tsmodified+7-4

Changes to app/Actions/Trail/TrailIndexAction.ts

		⋯3 linesShow the 3 lines above this hunk@@ -4,20 +4,23 @@ export default new Action({
4	4	method: 'GET',
5	5
6	6	async handle(request) {
7		- const limit = Math.min(Math.max(request.get<number>('limit') || 500, 1), 500)
	7	+ const page = readPageParams(request, { defaultLimit: 500, maxLimit: 500 })
8	8
9	9	try {
10		- const rows = await Trail.limit(limit).get()
	10	+ const rows = await Trail.all()
11	11	const trails = (rows ?? []).map((row: Record<string, unknown>) => ({
12	12	...row,
13	13	lat: row.latitude ?? row.lat,
14	14	lng: row.longitude ?? row.lng,
15	15	}))
16		- return response.json(trails)
	16	+ // Wrapped (was a bare array, #978) — the catalog's extractApiTrailRows
	17	+ // already reads `.trails`, so this is backward-compatible.
	18	+ const { items, meta } = paginate(trails, page)
	19	+ return response.json({ success: true, trails: items, meta })
17	20	}
18	21	catch (error) {
19	22	console.error('[trails] index failed:', error)
20		- return response.json([], 200)
	23	+ return response.json({ success: false, trails: [], meta: { offset: 0, limit: 0, total: 0, hasMore: false }, error: 'Failed to fetch trails' }, 500)
21	24	}
22	25	},
23	26	})

app/Actions/Trail/TrailReviewIndexAction.tsmodified+2-1

Changes to app/Actions/Trail/TrailReviewIndexAction.ts

		⋯35 linesShow the 35 lines above this hunk@@ -36,7 +36,8 @@ export default new Action({
36	36	createdAt: r.created_at,
37	37	}))
38	38
39		- return response.json({ success: true, reviews, meta: { total: reviews.length } })
	39	+ const paged = paginate(reviews, readPageParams(request))
	40	+ return response.json({ success: true, reviews: paged.items, meta: paged.meta })
40	41	}
41	42	catch (error) {
42	43	console.error('[trail-reviews] index failed:', error)

resources/functions/pagination.tsadded+36-0

Changes to resources/functions/pagination.ts

		@@ -0,0 +1,36 @@
	1	+/**
	2	+ * Shared list-endpoint pagination (#978). Read `offset`/`limit` from the
	3	+ * request (clamped), then slice a fully-built result array and emit a
	4	+ * consistent `meta: { offset, limit, total, hasMore }`. Auto-imported into the
	5	+ * index actions.
	6	+ *
	7	+ * The actions build + enrich their full result set (joined names, derived
	8	+ * stats) and paginate the mapped array, so `total` reflects the real match
	9	+ * count regardless of the page. Fine for this app's dataset sizes; for very
	10	+ * large tables a DB-level offset/limit + count would be the next step.
	11	+ */
	12	+
	13	+export interface PageParams { offset: number, limit: number }
	14	+export interface PageMeta { offset: number, limit: number, total: number, hasMore: boolean }
	15	+
	16	+export function readPageParams(
	17	+ request: { get: (k: string) => any },
	18	+ opts: { defaultLimit?: number, maxLimit?: number } = {},
	19	+): PageParams {
	20	+ const defaultLimit = opts.defaultLimit ?? 50
	21	+ const maxLimit = opts.maxLimit ?? 200
	22	+ const rawLimit = Number(request.get('limit'))
	23	+ const rawOffset = Number(request.get('offset'))
	24	+ const limit = Number.isFinite(rawLimit) && rawLimit > 0 ? Math.min(Math.floor(rawLimit), maxLimit) : defaultLimit
	25	+ const offset = Number.isFinite(rawOffset) && rawOffset >= 0 ? Math.floor(rawOffset) : 0
	26	+ return { offset, limit }
	27	+}
	28	+
	29	+export function paginate<T>(rows: T[], page: PageParams): { items: T[], meta: PageMeta } {
	30	+ const total = rows.length
	31	+ const items = rows.slice(page.offset, page.offset + page.limit)
	32	+ return {
	33	+ items,
	34	+ meta: { offset: page.offset, limit: page.limit, total, hasMore: page.offset + page.limit < total },
	35	+ }
	36	+}

scripts/verify-pagination.tsadded+93-0

Changes to scripts/verify-pagination.ts

		@@ -0,0 +1,93 @@
	1	+/**
	2	+ * Verification harness for list-endpoint pagination metadata (#978):
	3	+ * offset/limit params + meta { offset, limit, total, hasMore } on the index
	4	+ * endpoints, with correct slicing, total (full match count), and clamping.
	5	+ *
	6	+ * Run after `bun scripts/seed-game-world.ts`.
	7	+ */
	8	+/* eslint-disable ts/no-top-level-await */
	9	+import { existsSync } from 'node:fs'
	10	+import process from 'node:process'
	11	+
	12	+process.on('unhandledRejection', (err) => { console.error('UNHANDLED', err); process.exit(1) })
	13	+
	14	+import { generateAutoImportFiles, injectGlobalAutoImports } from '@stacksjs/server'
	15	+import { path } from '@stacksjs/path'
	16	+import { paginate, readPageParams } from '../resources/functions/pagination'
	17	+
	18	+let failures = 0
	19	+function check(label: string, ok: boolean, detail?: string) {
	20	+ console.log(`${ok ? '✅' : '❌'} ${label}${detail ? ` — ${detail}` : ''}`)
	21	+ if (!ok) failures++
	22	+}
	23	+
	24	+// --- Part 1: pure helper ---------------------------------------------------------
	25	+
	26	+const rows = Array.from({ length: 17 }, (_, i) => i)
	27	+const p1 = paginate(rows, { offset: 0, limit: 5 })
	28	+check('paginate slices the page', p1.items.length === 5 && p1.items[0] === 0)
	29	+check('meta has offset/limit/total/hasMore', p1.meta.offset === 0 && p1.meta.limit === 5 && p1.meta.total === 17 && p1.meta.hasMore === true)
	30	+const p2 = paginate(rows, { offset: 15, limit: 5 })
	31	+check('last page: partial items, hasMore false', p2.items.length === 2 && p2.meta.hasMore === false)
	32	+const p3 = paginate(rows, { offset: 0, limit: 100 })
	33	+check('limit ≥ total: all items, hasMore false', p3.items.length === 17 && p3.meta.hasMore === false)
	34	+
	35	+const req = (q: Record<string, any>) => ({ get: (k: string) => q[k] })
	36	+check('readPageParams defaults', JSON.stringify(readPageParams(req({}))) === JSON.stringify({ offset: 0, limit: 50 }))
	37	+check('readPageParams clamps limit to max', readPageParams(req({ limit: 9999 }), { maxLimit: 200 }).limit === 200)
	38	+check('readPageParams rejects junk/negative', readPageParams(req({ limit: 'x', offset: -3 })).offset === 0
	39	+ && readPageParams(req({ limit: 'x' })).limit === 50)
	40	+
	41	+// --- Part 2: live endpoints ------------------------------------------------------
	42	+
	43	+const modelsIndex = path.storagePath('framework/auto-imports/models.ts')
	44	+if (!existsSync(modelsIndex))
	45	+ await generateAutoImportFiles()
	46	+const RealError = globalThis.Error
	47	+await injectGlobalAutoImports()
	48	+globalThis.Error = RealError
	49	+
	50	+const ActivityIndex = (await import('../app/Actions/Activity/ActivityIndexAction')).default
	51	+const TrailIndex = (await import('../app/Actions/Trail/TrailIndexAction')).default
	52	+const ClubIndex = (await import('../app/Actions/Club/ClubIndexAction')).default
	53	+
	54	+async function call(action: any, body: Record<string, unknown>): Promise<{ status: number, json: any }> {
	55	+ const request = { get: (k: string) => (body as any)[k] }
	56	+ const res = await action.handle(request)
	57	+ let json: any = null
	58	+ try { json = await res.clone().json() }
	59	+ catch { json = res }
	60	+ return { status: res?.status ?? 200, json }
	61	+}
	62	+
	63	+// Activities: full set first to learn the real total.
	64	+const aAll = await call(ActivityIndex, {})
	65	+const total = aAll.json?.meta?.total
	66	+check('ActivityIndex returns full meta', typeof total === 'number'
	67	+ && aAll.json?.meta?.offset === 0 && typeof aAll.json?.meta?.limit === 'number'
	68	+ && typeof aAll.json?.meta?.hasMore === 'boolean', JSON.stringify(aAll.json?.meta))
	69	+check('default page returns all when total < limit', aAll.json?.activities?.length === total && aAll.json?.meta?.hasMore === false)
	70	+
	71	+const aPage = await call(ActivityIndex, { limit: 5, offset: 0 })
	72	+check('limit=5 → 5 items, hasMore true, total unchanged', aPage.json?.activities?.length === Math.min(5, total)
	73	+ && aPage.json?.meta?.total === total && aPage.json?.meta?.hasMore === (total > 5), JSON.stringify(aPage.json?.meta))
	74	+const aPage2 = await call(ActivityIndex, { limit: 5, offset: 5 })
	75	+check('offset=5 returns a different slice', aPage.json?.activities?.[0]?.id !== aPage2.json?.activities?.[0]?.id || total <= 5)
	76	+const aLast = await call(ActivityIndex, { limit: 5, offset: total - 2 })
	77	+check('last partial page has hasMore false', aLast.json?.activities?.length === 2 && aLast.json?.meta?.hasMore === false)
	78	+
	79	+// Trails: was a bare array; now wrapped with meta (backward-compatible reader).
	80	+const tAll = await call(TrailIndex, {})
	81	+check('TrailIndex now wrapped { trails, meta }', Array.isArray(tAll.json?.trails) && !!tAll.json?.meta
	82	+ && typeof tAll.json.meta.total === 'number', JSON.stringify(tAll.json?.meta))
	83	+const tPage = await call(TrailIndex, { limit: 5 })
	84	+check('TrailIndex paginates', tPage.json?.trails?.length === Math.min(5, tAll.json.meta.total)
	85	+ && tPage.json?.meta?.hasMore === (tAll.json.meta.total > 5))
	86	+
	87	+// Clubs (anonymous): meta present.
	88	+const cAll = await call(ClubIndex, {})
	89	+check('ClubIndex has pagination meta', typeof cAll.json?.meta?.offset === 'number'
	90	+ && typeof cAll.json?.meta?.hasMore === 'boolean')
	91	+
	92	+console.log(failures === 0 ? '\n✅ all pagination checks passed' : `\n❌ ${failures} check(s) failed`)
	93	+process.exit(failures === 0 ? 0 : 1)

storage/framework/auto-imports/functions.tsmodified+2-0

Changes to storage/framework/auto-imports/functions.ts

		⋯4 linesShow the 4 lines above this hunk@@ -5,6 +5,8 @@ export type { TerritoryRankStatsRow, TerritoryGainEvent, TerritoryRankAssignment
5	5	export { increment, count } from '../../../resources/functions/counter'
6	6	export { shapeChallenge } from '../../../resources/functions/challenges'
7	7	export type { ChallengeNames } from '../../../resources/functions/challenges'
	8	+export { readPageParams, paginate } from '../../../resources/functions/pagination'
	9	+export type { PageParams, PageMeta } from '../../../resources/functions/pagination'
8	10	export { longestDayStreak, hasSubSevenMile, computeAchievementProgress } from '../../../resources/functions/achievements'
9	11	export type { AchievementDefinitionRow, AchievementProgressEntry } from '../../../resources/functions/achievements'
10	12	export { extractMentionQuery, mentionCandidates, applyMention, parseMentions } from '../../../resources/functions/mentions'

storage/framework/auto-imports/globals.tsmodified+2-0

Changes to storage/framework/auto-imports/globals.ts

		⋯13 linesShow the 13 lines above this hunk@@ -14,6 +14,8 @@ declare global {
14	14	const increment: typeof autoImports.increment
15	15	const count: typeof autoImports.count
16	16	const shapeChallenge: typeof autoImports.shapeChallenge
	17	+ const readPageParams: typeof autoImports.readPageParams
	18	+ const paginate: typeof autoImports.paginate
17	19	const longestDayStreak: typeof autoImports.longestDayStreak
18	20	const hasSubSevenMile: typeof autoImports.hasSubSevenMile
19	21	const computeAchievementProgress: typeof autoImports.computeAchievementProgress