refactor: extract @packrat/db and @packrat/schemas from @packrat/api

apps/admin/lib/api.ts

@@ -1,28 +1,28 @@
 import { treaty } from '@elysiajs/eden';
 import type { App } from '@packrat/api';
-import type {
-  ActiveUsersSchema,
-  ActivityPointSchema,
-  AdminCatalogItemSchema,
-  AdminPackItemSchema,
-  AdminUserItemSchema,
-  BrandRowSchema,
-  BreakdownItemSchema,
-  CatalogOverviewSchema,
-  EmbeddingStatsSchema,
-  EtlFailureSummarySchema,
-  EtlJobFailuresSchema,
-  EtlJobSchema,
-  EtlResponseSchema,
-  GrowthPointSchema,
-  PriceBucketSchema,
-  TrailConditionReportSchema,
-  TrailGeometrySchema,
-  TrailSearchItemSchema,
-  TrailSearchResultSchema,
-} from '@packrat/api/schemas/admin';
 import { isObject } from '@packrat/guards';
-import type { Static } from '@sinclair/typebox';
+import type {
+  ActiveUsers,
+  ActivityPoint,
+  AdminCatalogItem,
+  AdminPackItem,
+  AdminStats,
+  AdminTrailConditionReport,
+  AdminUserItem,
+  BrandRow,
+  BreakdownItem,
+  CatalogOverview,
+  EmbeddingStats,
+  EtlFailureSummary,
+  EtlJob,
+  EtlJobFailures,
+  EtlResponse,
+  GrowthPoint,
+  PriceBucket,
+  TrailGeometry,
+  TrailSearchItem,
+  TrailSearchResult as TrailSearchResultList,
+} from '@packrat/schemas/admin';
 import { clearToken, getAuthHeader } from './auth';
 import { adminEnv } from './env';
 
@@ -64,7 +64,7 @@ function unwrap<T>(data: T | null | undefined, name: string): T {
 
 // ─── Stats ────────────────────────────────────────────────────────────────────
 
-export type AdminStats = { users: number; packs: number; items: number };
+export type { AdminStats };
 
 export async function getStats(): Promise<AdminStats> {
   const { data, error } = await adminClient.stats.get();
@@ -74,7 +74,7 @@ export async function getStats(): Promise<AdminStats> {
 
 // ─── Users ────────────────────────────────────────────────────────────────────
 
-export type AdminUser = Static<typeof AdminUserItemSchema>;
+export type AdminUser = AdminUserItem;
 
 export interface PaginatedResponse<T> {
   data: T[];
@@ -124,7 +124,7 @@ export async function restoreUser(id: string): Promise<{ success: boolean }> {
 
 // ─── Packs ────────────────────────────────────────────────────────────────────
 
-export type AdminPack = Static<typeof AdminPackItemSchema>;
+export type AdminPack = AdminPackItem;
 
 export async function getPacks({
   limit = 100,
@@ -152,7 +152,7 @@ export async function deletePack(id: string): Promise<{ success: boolean }> {
 
 // ─── Catalog Items ────────────────────────────────────────────────────────────
 
-export type AdminCatalogItem = Static<typeof AdminCatalogItemSchema>;
+export type { AdminCatalogItem };
 
 export interface UpdateCatalogItemInput {
   name?: string;
@@ -197,10 +197,7 @@ export async function updateCatalogItem(
 
 // ─── Analytics — Platform ─────────────────────────────────────────────────────
 
-export type GrowthPoint = Static<typeof GrowthPointSchema>;
-export type ActivityPoint = Static<typeof ActivityPointSchema>;
-export type BreakdownItem = Static<typeof BreakdownItemSchema>;
-export type ActiveUsers = Static<typeof ActiveUsersSchema>;
+export type { GrowthPoint, ActivityPoint, BreakdownItem, ActiveUsers };
 export type AnalyticsPeriod = 'day' | 'week' | 'month';
 
 export async function getPlatformGrowth(
@@ -233,12 +230,7 @@ export async function getPlatformBreakdown(): Promise<BreakdownItem[]> {
 
 // ─── Analytics — Catalog ─────────────────────────────────────────────────────
 
-export type CatalogOverview = Static<typeof CatalogOverviewSchema>;
-export type BrandRow = Static<typeof BrandRowSchema>;
-export type PriceBucket = Static<typeof PriceBucketSchema>;
-export type EtlJob = Static<typeof EtlJobSchema>;
-export type EtlResponse = Static<typeof EtlResponseSchema>;
-export type EmbeddingStats = Static<typeof EmbeddingStatsSchema>;
+export type { CatalogOverview, BrandRow, PriceBucket, EtlJob, EtlResponse, EmbeddingStats };
 
 export async function getCatalogOverview(): Promise<CatalogOverview> {
   const { data, error } = await adminClient.analytics.catalog.overview.get();
@@ -276,10 +268,10 @@ export async function getCatalogEmbeddings(): Promise<EmbeddingStats> {
 
 // ─── Admin Trails ─────────────────────────────────────────────────────────────
 
-export type TrailSearchResult = Static<typeof TrailSearchItemSchema>;
-export type TrailGeometry = Static<typeof TrailGeometrySchema>;
-export type TrailSearchPage = Static<typeof TrailSearchResultSchema>;
-export type TrailConditionReport = Static<typeof TrailConditionReportSchema>;
+export type TrailSearchResult = TrailSearchItem;
+export type TrailSearchPage = TrailSearchResultList;
+export type { TrailGeometry };
+export type TrailConditionReport = AdminTrailConditionReport;
 
 export async function searchTrails({
   q,
@@ -345,8 +337,7 @@ export function resetStuckEtlJobs(): Promise<{ reset: number; ids: string[] }> {
   return adminFetch('/analytics/catalog/etl/reset-stuck', { method: 'POST' });
 }
 
-export type EtlFailureSummary = Static<typeof EtlFailureSummarySchema>;
-export type EtlJobFailures = Static<typeof EtlJobFailuresSchema>;
+export type { EtlFailureSummary, EtlJobFailures };
 
 export function getEtlFailureSummary(limit = 20): Promise<EtlFailureSummary> {
   return adminFetch(`/analytics/catalog/etl/failure-summary?limit=${limit}`);

apps/admin/lib/queryKeys.ts

@@ -39,9 +39,9 @@ export const queryKeys = {
 
   osm: {
     all: () => ['osm'] as const,
-    search: (q: string, sport?: string) => [...queryKeys.osm.all(), 'search', q, sport] as const,
+    search: (q?: string, sport?: string) => [...queryKeys.osm.all(), 'search', q, sport] as const,
     trail: (osmId: string) => [...queryKeys.osm.all(), 'trail', osmId] as const,
-    conditions: (search?: string) => [...queryKeys.osm.all(), 'conditions', search] as const,
+    conditions: (q?: string) => [...queryKeys.osm.all(), 'conditions', q] as const,
   },
 
   catalogAnalytics: {

apps/admin/package.json

@@ -15,6 +15,7 @@
     "@packrat/api-client": "workspace:*",
     "@packrat/app": "workspace:*",
     "@packrat/guards": "workspace:*",
+    "@packrat/schemas": "workspace:*",
     "@packrat/web-ui": "workspace:*",
     "@radix-ui/react-alert-dialog": "catalog:",
     "@radix-ui/react-avatar": "catalog:",

apps/expo/app/(app)/current-pack/[id].tsx

@@ -1,3 +1,4 @@
+import type { PackItem } from '@packrat/types';
 import {
   Avatar,
   AvatarFallback,
@@ -12,7 +13,6 @@ import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { getRelativeTime } from 'expo-app/lib/utils/getRelativeTime';
-import type { PackItem } from 'expo-app/types';
 import { useLocalSearchParams } from 'expo-router';
 import type React from 'react';
 import { ScrollView, View } from 'react-native';

apps/expo/components/initial/UserAvatar.tsx

@@ -1,8 +1,8 @@
-import type { User } from 'expo-app/types';
+import type { MockUser } from 'expo-app/data/mockData';
 import { Image, Text, View } from 'react-native';
 
 type UserAvatarProps = {
-  user: User;
+  user: Pick<MockUser, 'name' | 'avatarUrl'>;
   size?: 'sm' | 'md' | 'lg';
   showName?: boolean;
 };
@@ -20,11 +20,13 @@ export function UserAvatar({ user, size = 'md', showName = false }: UserAvatarPr
     lg: 'text-base',
   }[size];
 
+  const avatarUri = user.avatarUrl || null;
+
   return (
     <View className="flex-row items-center">
       <View className={`${sizeClass} overflow-hidden rounded-full bg-gray-200`}>
-        {user.avatar ? (
-          <Image source={{ uri: user.avatar }} className="h-full w-full" resizeMode="cover" />
+        {avatarUri ? (
+          <Image source={{ uri: avatarUri }} className="h-full w-full" resizeMode="cover" />
         ) : (
           <View className="h-full w-full items-center justify-center bg-blue-500">
             <Text className="font-bold text-white">{user.name.substring(0, 2).toUpperCase()}</Text>

apps/expo/components/initial/WeightBadge.tsx

@@ -1,6 +1,6 @@
+import type { WeightUnit } from '@packrat/constants';
 import { isString } from '@packrat/guards';
 import { cn } from 'expo-app/lib/cn';
-import type { WeightUnit } from 'expo-app/types';
 import { formatWeight } from 'expo-app/utils/weight';
 import { Text, View } from 'react-native';
 

apps/expo/data/mockData.ts

@@ -1,12 +1,20 @@
-import type { User } from 'expo-app/types';
+export type MockUser = {
+  id: string;
+  name: string;
+  email: string;
+  avatarUrl: string;
+  experience: string;
+  joinedAt: string;
+  bio: string;
+};
 
 // --- Users ---
-export const mockUsers: [User, ...User[]] = [
+export const mockUsers: [MockUser, ...MockUser[]] = [
   {
     id: '1',
     name: 'Alex Hiker',
     email: 'alex@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=1',
+    avatarUrl: 'https://i.pravatar.cc/150?img=1',
     experience: 'expert',
     joinedAt: '2023-01-15T00:00:00.000Z',
     bio: 'Thru-hiker with 5,000+ miles under my feet. PCT, AT, and CDT completed.',
@@ -15,7 +23,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '2',
     name: 'Sam Backpacker',
     email: 'sam@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=2',
+    avatarUrl: 'https://i.pravatar.cc/150?img=2',
     experience: 'intermediate',
     joinedAt: '2023-03-22T00:00:00.000Z',
     bio: 'Weekend warrior trying to lighten my load.',
@@ -24,7 +32,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '3',
     name: 'Jamie Newbie',
     email: 'jamie@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=3',
+    avatarUrl: 'https://i.pravatar.cc/150?img=3',
     experience: 'beginner',
     joinedAt: '2023-06-10T00:00:00.000Z',
     bio: 'Just getting started with hiking and camping.',
@@ -33,7 +41,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '4',
     name: 'Taylor Trailblazer',
     email: 'taylor@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=4',
+    avatarUrl: 'https://i.pravatar.cc/150?img=4',
     experience: 'expert',
     joinedAt: '2022-11-05T00:00:00.000Z',
     bio: 'Explorer with a passion for the unbeaten path.',
@@ -42,7 +50,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '5',
     name: 'Chris Camper',
     email: 'chris@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=5',
+    avatarUrl: 'https://i.pravatar.cc/150?img=5',
     experience: 'intermediate',
     joinedAt: '2023-02-28T00:00:00.000Z',
     bio: 'Camping enthusiast and nature lover.',
@@ -51,7 +59,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '6',
     name: 'Morgan Mountaineer',
     email: 'morgan@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=6',
+    avatarUrl: 'https://i.pravatar.cc/150?img=6',
     experience: 'expert',
     joinedAt: '2023-01-20T00:00:00.000Z',
     bio: 'Scaling peaks and chasing horizons.',
@@ -60,7 +68,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '7',
     name: 'Jordan Explorer',
     email: 'jordan@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=7',
+    avatarUrl: 'https://i.pravatar.cc/150?img=7',
     experience: 'beginner',
     joinedAt: '2023-04-15T00:00:00.000Z',
     bio: 'New to outdoor adventures, learning every step.',
@@ -69,7 +77,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '8',
     name: 'Riley Ranger',
     email: 'riley@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=8',
+    avatarUrl: 'https://i.pravatar.cc/150?img=8',
     experience: 'intermediate',
     joinedAt: '2023-03-30T00:00:00.000Z',
     bio: 'Always ready for a spontaneous trip.',
@@ -78,7 +86,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '9',
     name: 'Casey Climber',
     email: 'casey@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=9',
+    avatarUrl: 'https://i.pravatar.cc/150?img=9',
     experience: 'expert',
     joinedAt: '2022-12-10T00:00:00.000Z',
     bio: 'Rock climbing is life.',
@@ -87,7 +95,7 @@ export const mockUsers: [User, ...User[]] = [
     id: '10',
     name: 'Peyton Paddler',
     email: 'peyton@example.com',
-    avatar: 'https://i.pravatar.cc/150?img=10',
+    avatarUrl: 'https://i.pravatar.cc/150?img=10',
     experience: 'intermediate',
     joinedAt: '2023-05-01T00:00:00.000Z',
     bio: 'Loves exploring rivers and lakes.',

apps/expo/features/auth/hooks/useAuthActions.ts

@@ -1,4 +1,4 @@
-import { clientEnvs } from '@packrat/env/expo-client';
+import { asBoolean, asString } from '@packrat/guards';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import {
   GoogleSignin,
@@ -33,18 +33,18 @@ function redirect(route: string) {
 }
 
 function mapToUser(raw: Record<string, unknown>): User {
-  const name = String(raw.name ?? '');
+  const name = asString(raw.name) ?? '';
   const spaceIdx = name.indexOf(' ');
   return {
-    id: String(raw.id ?? ''),
-    email: String(raw.email ?? ''),
+    id: asString(raw.id) ?? '',
+    email: asString(raw.email) ?? '',
     firstName: spaceIdx >= 0 ? name.slice(0, spaceIdx) : name,
     lastName: spaceIdx >= 0 ? name.slice(spaceIdx + 1) : '',
-    role: (raw.role as 'USER' | 'ADMIN') ?? 'USER',
-    emailVerified: (raw.emailVerified as boolean | null) ?? null,
-    avatarUrl: (raw.image as string | null) ?? null,
-    createdAt: (raw.createdAt as string | null) ?? null,
-    updatedAt: (raw.updatedAt as string | null) ?? null,
+    role: asString(raw.role) ?? 'USER',
+    emailVerified: asBoolean(raw.emailVerified) ?? null,
+    avatarUrl: asString(raw.image) ?? null,
+    createdAt: asString(raw.createdAt) ?? null,
+    updatedAt: asString(raw.updatedAt) ?? null,
     preferredWeightUnit: (raw.preferredWeightUnit as User['preferredWeightUnit']) ?? 'g',
   };
 }
@@ -188,27 +188,19 @@ export function useAuthActions() {
   };
 
   const forgotPassword = async (email: string) => {
-    const res = await fetch(`${clientEnvs.EXPO_PUBLIC_API_URL}/api/password-reset/request`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ email }),
+    const { error } = await authClient.requestPasswordReset({
+      email,
+      redirectTo: 'packrat://reset-password',
     });
-    if (!res.ok) {
-      const data = (await res.json()) as { error?: string };
-      throw new Error(data.error ?? 'Forgot password failed');
-    }
+    if (error) throw new Error(error.message ?? 'Forgot password failed');
   };
 
-  const resetPassword = async (email: string, opts: { token: string; newPassword: string }) => {
-    const res = await fetch(`${clientEnvs.EXPO_PUBLIC_API_URL}/api/password-reset/verify`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ email, code: opts.token, newPassword: opts.newPassword }),
+  const resetPassword = async (_email: string, opts: { token: string; newPassword: string }) => {
+    const { error } = await authClient.resetPassword({
+      token: opts.token,
+      newPassword: opts.newPassword,
     });
-    if (!res.ok) {
-      const data = (await res.json()) as { error?: string };
-      throw new Error(data.error ?? 'Reset password failed');
-    }
+    if (error) throw new Error(error.message ?? 'Reset password failed');
   };
 
   const verifyEmail = async (_email: string, token: string) => {