firstly 0.10.4 → 0.10.6

package/esm/sqlAdmin/ui/SqlDrift.svelte

@@ -8,6 +8,7 @@
 	import { onMount } from 'svelte'
 	import { SvelteSet } from 'svelte/reactivity'
 
+	import { errorMessage } from '../../core/helper.js'
 	import { SqlDriftController, type SqlDriftFlag } from '../SqlDriftController'
 
 	// Inferred from the BackendMethods, so this never imports from `server/`.
@@ -22,7 +23,7 @@
 		try {
 			flags = await SqlDriftController.driftFlags()
 		} catch (e) {
-			flagsError = e instanceof Error ? e.message : String(e)
+			flagsError = errorMessage(e)
 		}
 	})
 
@@ -31,14 +32,15 @@
 	let pkError = $state('')
 	let pkResult = $state<PkResult | null>(null)
 
+	const PK_ORDER = { migrate: 0, create: 0, missing: 1, ok: 2 } as const
 	const pkPlans = $derived(
-		(pkResult?.plans ?? []).toSorted((a, b) => {
-			if (a.action === 'ok' && b.action !== 'ok') return 1
-			if (a.action !== 'ok' && b.action === 'ok') return -1
-			return a.table.localeCompare(b.table)
-		}),
+		(pkResult?.plans ?? []).toSorted(
+			(a, b) => PK_ORDER[a.action] - PK_ORDER[b.action] || a.table.localeCompare(b.table),
+		),
+	)
+	const pkDrift = $derived(
+		pkPlans.filter((p) => p.action === 'migrate' || p.action === 'create').length,
 	)
-	const pkDrift = $derived(pkPlans.filter((p) => p.action !== 'ok').length)
 
 	async function runPk(apply: boolean) {
 		if (
@@ -52,7 +54,7 @@
 			pkResult = await SqlDriftController.primaryKeys({ apply })
 			console.info('for AI:', JSON.stringify(pkResult))
 		} catch (e) {
-			pkError = e instanceof Error ? e.message : String(e)
+			pkError = errorMessage(e)
 		} finally {
 			pkLoading = false
 		}
@@ -63,12 +65,11 @@
 	let relError = $state('')
 	let relResult = $state<RelResult | null>(null)
 
+	const REL_ORDER = { create: 0, missing: 1, ok: 2 } as const
 	const relPlans = $derived(
-		(relResult?.plans ?? []).toSorted((a, b) => {
-			if (a.action === 'ok' && b.action !== 'ok') return 1
-			if (a.action !== 'ok' && b.action === 'ok') return -1
-			return a.name.localeCompare(b.name)
-		}),
+		(relResult?.plans ?? []).toSorted(
+			(a, b) => REL_ORDER[a.action] - REL_ORDER[b.action] || a.name.localeCompare(b.name),
+		),
 	)
 	const relMissing = $derived(relPlans.filter((p) => p.action === 'create').length)
 
@@ -80,7 +81,7 @@
 			relResult = await SqlDriftController.relationIndexes({ apply })
 			console.info('for AI:', JSON.stringify(relResult))
 		} catch (e) {
-			relError = e instanceof Error ? e.message : String(e)
+			relError = errorMessage(e)
 		} finally {
 			relLoading = false
 		}
@@ -127,7 +128,7 @@
 			selected.clear()
 			console.info('for AI:', JSON.stringify(dropResult))
 		} catch (e) {
-			dropError = e instanceof Error ? e.message : String(e)
+			dropError = errorMessage(e)
 		} finally {
 			dropLoading = false
 		}
@@ -175,7 +176,7 @@
 			nullSelected.clear()
 			console.info('for AI:', JSON.stringify(nullResult))
 		} catch (e) {
-			nullError = e instanceof Error ? e.message : String(e)
+			nullError = errorMessage(e)
 		} finally {
 			nullLoading = false
 		}
@@ -282,9 +283,10 @@
 							</td>
 							<td
 								class="border-border border-b px-3 py-2 font-mono"
-								class:text-primary={p.action !== 'ok'}
+								class:text-primary={p.action === 'migrate' || p.action === 'create'}
+								class:text-muted-foreground={p.action === 'missing'}
 							>
-								{p.action}
+								{p.action === 'missing' ? 'table missing · run migrations first' : p.action}
 							</td>
 						</tr>
 					{/each}
@@ -339,7 +341,11 @@
 								class="border-border border-b px-3 py-2 font-mono"
 								class:text-primary={p.action === 'create'}
 							>
-								{p.action === 'create' ? 'create' : `covered · ${p.coveredBy}`}
+								{p.action === 'ok'
+									? `covered · ${p.coveredBy}`
+									: p.action === 'missing'
+										? 'table missing · run migrations first'
+										: 'create'}
 							</td>
 						</tr>
 					{/each}

package/esm/sqlAdmin/ui/SqlTokens.svelte

@@ -6,6 +6,7 @@
 	 */
 	import { repo } from 'remult'
 
+	import { errorMessage } from '../../core/helper.js'
 	import { log } from '../index'
 	import { SqlAdminController } from '../SqlAdminController'
 	import {
@@ -73,7 +74,7 @@
 			name = ''
 			await refresh()
 		} catch (err) {
-			error = err instanceof Error ? err.message : String(err)
+			error = errorMessage(err)
 		} finally {
 			busy = false
 		}
@@ -86,7 +87,7 @@
 			await repo(SqlToken).update(t.id, { revokedAt: new Date() })
 			await refresh()
 		} catch (err) {
-			error = err instanceof Error ? err.message : String(err)
+			error = errorMessage(err)
 		} finally {
 			busy = false
 		}
@@ -100,7 +101,7 @@
 			await repo(SqlToken).delete(t)
 			await refresh()
 		} catch (err) {
-			error = err instanceof Error ? err.message : String(err)
+			error = errorMessage(err)
 		} finally {
 			busy = false
 		}
@@ -114,7 +115,7 @@
 			await SqlAdminController.purgeTokens()
 			await refresh()
 		} catch (err) {
-			error = err instanceof Error ? err.message : String(err)
+			error = errorMessage(err)
 		} finally {
 			busy = false
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firstly",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "type": "module",
   "description": "Firstly, an opinionated Remult setup!",
   "bin": {
@@ -41,7 +41,7 @@
     "clsx": "2.1.1",
     "cron": "4.4.0",
     "esm-env": "1.2.2",
-    "nodemailer": "8.0.5",
+    "nodemailer": "10.0.10",
     "svelte-sonner": "1.2.1",
     "tailwind-merge": "3.7.0",
     "tailwindcss": "4.3.0",