From 1a7924e700cffd0bb92a6f409124ab05f504c2f7 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Fri, 1 May 2026 00:10:26 -0600 Subject: [PATCH 01/95] =?UTF-8?q?feat(web):=20web=20support=20MVP=20?= =?UTF-8?q?=E2=80=94=20platform=20shims,=20Playwright=20e2e,=20OTP=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Platform shims (lib/*.ts + lib/*.web.ts): - lib/Picker: web onValueChange?.(e.target.value)} + style={{ + display: 'block', + width: '100%', + padding: '8px', + borderRadius: '6px', + border: '1px solid #ccc', + fontSize: '16px', + }} + > + {options.map((opt) => ( + + ))} + + ); +} + +Picker.Item = PickerItem; + +export { Picker }; diff --git a/apps/expo/lib/appleAuthentication.ts b/apps/expo/lib/appleAuthentication.ts new file mode 100644 index 0000000000..ca7ce9cfa4 --- /dev/null +++ b/apps/expo/lib/appleAuthentication.ts @@ -0,0 +1,7 @@ +export { + AppleAuthenticationOperation, + AppleAuthenticationScope, + AppleAuthenticationUserDetectionStatus, + isAvailableAsync, + signInAsync, +} from 'expo-apple-authentication'; diff --git a/apps/expo/lib/appleAuthentication.web.ts b/apps/expo/lib/appleAuthentication.web.ts new file mode 100644 index 0000000000..ec609349f0 --- /dev/null +++ b/apps/expo/lib/appleAuthentication.web.ts @@ -0,0 +1,12 @@ +export const isAvailableAsync = (): Promise => Promise.resolve(false); + +export const signInAsync = (): Promise => + Promise.reject(new Error('Apple Sign-In is not available on web.')); + +export const AppleAuthenticationScope = { FULL_NAME: 0, EMAIL: 1 }; +export const AppleAuthenticationOperation = { LOGIN: 0, REFRESH: 1, LOGOUT: 2, IMPLICIT: 3 }; +export const AppleAuthenticationUserDetectionStatus = { + UNKNOWN: 0, + UNSUPPORTED: 1, + LIKELY_REAL: 2, +}; diff --git a/apps/expo/lib/constants.web.ts b/apps/expo/lib/constants.web.ts new file mode 100644 index 0000000000..5be19f6d0c --- /dev/null +++ b/apps/expo/lib/constants.web.ts @@ -0,0 +1,5 @@ +/** + * Web equivalent of lib/constants.ts. + * There is no filesystem-backed image cache on web; the browser handles caching. + */ +export const IMAGES_DIR = ''; diff --git a/apps/expo/lib/devClient.ts b/apps/expo/lib/devClient.ts new file mode 100644 index 0000000000..15703db6e3 --- /dev/null +++ b/apps/expo/lib/devClient.ts @@ -0,0 +1 @@ +import 'expo-dev-client'; diff --git a/apps/expo/lib/devClient.web.ts b/apps/expo/lib/devClient.web.ts new file mode 100644 index 0000000000..5d7e59fc5c --- /dev/null +++ b/apps/expo/lib/devClient.web.ts @@ -0,0 +1 @@ +// expo-dev-client is not needed on web diff --git a/apps/expo/lib/hooks/useColorScheme.web.tsx b/apps/expo/lib/hooks/useColorScheme.web.tsx new file mode 100644 index 0000000000..971bb9d2c1 --- /dev/null +++ b/apps/expo/lib/hooks/useColorScheme.web.tsx @@ -0,0 +1,37 @@ +import { COLORS } from 'expo-app/theme/colors'; +import { useColorScheme as useNativewindColorScheme } from 'nativewind'; +import * as React from 'react'; + +/** + * Web version of useColorScheme. + * Removes the expo-navigation-bar dependency (Android-only native module). + * Metro automatically picks this file over useColorScheme.tsx for web builds. + */ +function useColorScheme() { + const { colorScheme, setColorScheme: setNativeWindColorScheme } = useNativewindColorScheme(); + + function setColorScheme(scheme: 'light' | 'dark') { + setNativeWindColorScheme(scheme); + } + + function toggleColorScheme() { + return setColorScheme(colorScheme === 'light' ? 'dark' : 'light'); + } + + return { + colorScheme: colorScheme ?? 'light', + isDarkColorScheme: colorScheme === 'dark', + setColorScheme, + toggleColorScheme, + colors: COLORS[colorScheme ?? 'light'], + }; +} + +/** + * No-op on web — Android navigation bar sync is not needed in the browser. + */ +function useInitialAndroidBarSync() { + React.useEffect(() => {}, []); +} + +export { useColorScheme, useInitialAndroidBarSync }; diff --git a/apps/expo/lib/updates.ts b/apps/expo/lib/updates.ts new file mode 100644 index 0000000000..f613d0b7eb --- /dev/null +++ b/apps/expo/lib/updates.ts @@ -0,0 +1,10 @@ +export { + channel, + checkForUpdateAsync, + fetchUpdateAsync, + isEnabled, + reloadAsync, + runtimeVersion, + updateId, + useUpdates, +} from 'expo-updates'; diff --git a/apps/expo/lib/updates.web.ts b/apps/expo/lib/updates.web.ts new file mode 100644 index 0000000000..073468ae4a --- /dev/null +++ b/apps/expo/lib/updates.web.ts @@ -0,0 +1,11 @@ +export const reloadAsync = async () => { + window.location.reload(); +}; + +export const checkForUpdateAsync = async () => ({ isAvailable: false }); +export const fetchUpdateAsync = async () => ({ isNew: false }); +export const useUpdates = () => ({ isUpdateAvailable: false, isUpdatePending: false }); +export const isEnabled = false; +export const channel = 'web'; +export const updateId = null; +export const runtimeVersion = '0.0.0'; diff --git a/apps/expo/lib/utils/ImageCacheManager.web.ts b/apps/expo/lib/utils/ImageCacheManager.web.ts new file mode 100644 index 0000000000..3e71cdcaf9 --- /dev/null +++ b/apps/expo/lib/utils/ImageCacheManager.web.ts @@ -0,0 +1,31 @@ +/** + * Web stub for ImageCacheManager. + * The browser handles HTTP caching natively; no local file cache is needed on web. + * All methods are safe no-ops so that callers compile and run without changes. + */ +class WebImageCacheManager { + public cacheDirectory = ''; + + public async initCacheDirectory(): Promise {} + + public async getCachedImageUri(_fileName: string): Promise { + return null; + } + + public async cacheRemoteImage(_fileName: string, remoteUrl: string): Promise { + return remoteUrl; + } + + public async cacheLocalTempImage(_tempImageUri: string, _fileName: string): Promise {} + + public async clearImage(_fileName: string): Promise {} + + public async clearCache(): Promise {} + + public async getCacheInfo(): Promise<{ size: number; count: number }> { + return { size: 0, count: 0 }; + } +} + +export { WebImageCacheManager as ImageCacheManager }; +export default new WebImageCacheManager(); diff --git a/apps/expo/lib/utils/getRelativeTime.ts b/apps/expo/lib/utils/getRelativeTime.ts index d77644a356..d1dd074b5e 100644 --- a/apps/expo/lib/utils/getRelativeTime.ts +++ b/apps/expo/lib/utils/getRelativeTime.ts @@ -7,7 +7,7 @@ const UNITS: Array<{ key: string; seconds: number }> = [ { key: 'days', seconds: 86400 }, { key: 'hours', seconds: 3600 }, { key: 'minutes', seconds: 60 }, -]; +] as const; function toDate(value: Date | string | null | undefined): Date | null { if (!value) return null; diff --git a/apps/expo/metro.config.js b/apps/expo/metro.config.js index 2613f966d0..a9932c2b58 100644 --- a/apps/expo/metro.config.js +++ b/apps/expo/metro.config.js @@ -24,12 +24,13 @@ const WEB_STUBS = { '@react-native-ai/llama': 'mocks/react-native-ai-llama.ts', 'llama.rn': 'mocks/react-native-ai-llama.ts', '@react-native-ai/apple': 'mocks/react-native-ai-apple.ts', + '@react-native-google-signin/google-signin': 'mocks/react-native-google-signin.ts', 'expo-sqlite/kv-store': 'mocks/expo-sqlite-kv-store.ts', + // Required by lib/persist-plugin.web.ts (ObservablePersistAsyncStorage) + '@react-native-async-storage/async-storage': 'mocks/async-storage.ts', // Keyboard utilities — on web the software keyboard doesn't overlay content 'react-native-keyboard-controller': 'mocks/react-native-keyboard-controller.tsx', - // Google Sign-In and date picker are native-only; web uses password auth - '@react-native-google-signin/google-signin': 'mocks/google-signin.ts', - '@react-native-community/datetimepicker': 'mocks/datetimepicker.tsx', + '@react-native-community/datetimepicker': 'mocks/react-native-community-datetimepicker.tsx', // expo-file-system throws UnavailabilityError on web; stub all ops as no-ops 'expo-file-system/legacy': 'mocks/expo-file-system-legacy.ts', }; diff --git a/apps/expo/mocks/expo-sqlite-kv-store.ts b/apps/expo/mocks/expo-sqlite-kv-store.ts index ea7305a655..0ecd3639e1 100644 --- a/apps/expo/mocks/expo-sqlite-kv-store.ts +++ b/apps/expo/mocks/expo-sqlite-kv-store.ts @@ -2,31 +2,27 @@ import { isFunction } from '@packrat/guards'; type UpdateFn = (prevValue: string | null) => string; -const PREFIX = '__kv__'; - const isClient = typeof window !== 'undefined'; const memFallback = new Map(); const rawGet = (key: string): string | null => - isClient ? window.localStorage.getItem(PREFIX + key) : (memFallback.get(key) ?? null); + isClient ? window.localStorage.getItem(key) : (memFallback.get(key) ?? null); const rawSet = (key: string, value: string): void => { - if (isClient) window.localStorage.setItem(PREFIX + key, value); + if (isClient) window.localStorage.setItem(key, value); else memFallback.set(key, value); }; const rawRemove = (key: string): boolean => { const had = rawGet(key) !== null; - if (isClient) window.localStorage.removeItem(PREFIX + key); + if (isClient) window.localStorage.removeItem(key); else memFallback.delete(key); return had; }; const rawKeys = (): string[] => { if (!isClient) return Array.from(memFallback.keys()); - return Object.keys(window.localStorage) - .filter((k) => k.startsWith(PREFIX)) - .map((k) => k.slice(PREFIX.length)); + return Object.keys(window.localStorage); }; const deepMerge = ( diff --git a/apps/expo/mocks/react-native-community-datetimepicker.tsx b/apps/expo/mocks/react-native-community-datetimepicker.tsx new file mode 100644 index 0000000000..a437cced6a --- /dev/null +++ b/apps/expo/mocks/react-native-community-datetimepicker.tsx @@ -0,0 +1,57 @@ +import type * as React from 'react'; + +type DateTimePickerEvent = { type: string; nativeEvent: { timestamp: number } }; + +type Props = { + value: Date; + mode?: 'date' | 'time' | 'datetime'; + onChange?: (event: DateTimePickerEvent, date?: Date) => void; + display?: string; + minimumDate?: Date; + maximumDate?: Date; + style?: unknown; +}; + +function toInputValue(date: Date, mode: Props['mode']): string { + if (mode === 'time') return date.toTimeString().slice(0, 5); + if (mode === 'datetime') + return new Date(date.getTime() - date.getTimezoneOffset() * 60000).toISOString().slice(0, 16); + return date.toISOString().split('T')[0] ?? ''; +} + +export default function DateTimePicker({ + value, + mode = 'date', + onChange, + minimumDate, + maximumDate, +}: Props) { + const inputType = mode === 'time' ? 'time' : mode === 'datetime' ? 'datetime-local' : 'date'; + + function handleChange(e: React.ChangeEvent) { + if (!onChange) return; + const raw = e.target.value; + if (!raw) return; + const date = new Date(mode === 'time' ? `1970-01-01T${raw}` : raw); + onChange({ type: 'set', nativeEvent: { timestamp: date.getTime() } }, date); + } + + return ( + + ); +} diff --git a/apps/expo/mocks/react-native-google-signin.ts b/apps/expo/mocks/react-native-google-signin.ts new file mode 100644 index 0000000000..8e684c27da --- /dev/null +++ b/apps/expo/mocks/react-native-google-signin.ts @@ -0,0 +1,20 @@ +// Web stub: Google Sign-In is a native-only SDK. On web, sign-in throws immediately. +export const GoogleSignin = { + hasPlayServices: (): Promise => Promise.resolve(true), + signIn: (): Promise => + Promise.reject(new Error('Google Sign-In is not supported on web. Please use email/password.')), + getTokens: (): Promise<{ idToken: string | null; accessToken: string | null }> => + Promise.resolve({ idToken: null, accessToken: null }), + hasPreviousSignIn: (): Promise => Promise.resolve(false), + signOut: (): Promise => Promise.resolve(), + configure: (): void => {}, +}; + +export const isErrorWithCode = (_error: unknown): boolean => false; + +export const statusCodes = { + SIGN_IN_CANCELLED: 'SIGN_IN_CANCELLED', + IN_PROGRESS: 'IN_PROGRESS', + PLAY_SERVICES_NOT_AVAILABLE: 'PLAY_SERVICES_NOT_AVAILABLE', + SIGN_IN_REQUIRED: 'SIGN_IN_REQUIRED', +}; diff --git a/apps/expo/package.json b/apps/expo/package.json index a2f8a08bbc..76094d2001 100644 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -35,6 +35,8 @@ "submit:ios": "eas submit --platform ios", "test": "vitest run", "test:coverage": "vitest run --coverage", + "test:web": "playwright test --config playwright/playwright.config.ts", + "test:web:ui": "playwright test --config playwright/playwright.config.ts --ui", "update:development": "APP_VARIANT=development eas update --branch development --environment development", "update:preview": "APP_VARIANT=preview eas update --branch preview --environment preview", "update:production": "eas update --branch production --environment production", diff --git a/apps/expo/playwright/playwright.config.ts b/apps/expo/playwright/playwright.config.ts new file mode 100644 index 0000000000..30049dc98e --- /dev/null +++ b/apps/expo/playwright/playwright.config.ts @@ -0,0 +1,29 @@ +import { defineConfig, devices } from '@playwright/test'; + +const BASE_URL = process.env.BASE_URL ?? 'http://localhost:8081'; + +export default defineConfig({ + testDir: './tests', + globalSetup: './tests/globalSetup.ts', + timeout: 30_000, + expect: { timeout: 10_000 }, + fullyParallel: false, + forbidOnly: !!process.env.CI, + retries: process.env.CI ? 2 : 0, + workers: 1, + reporter: [['list'], ['html', { open: 'never' }]], + + use: { + baseURL: BASE_URL, + trace: 'on-first-retry', + video: 'on-first-retry', + headless: true, + }, + + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}); diff --git a/apps/expo/playwright/tests/core.spec.ts b/apps/expo/playwright/tests/core.spec.ts new file mode 100644 index 0000000000..a458f48774 --- /dev/null +++ b/apps/expo/playwright/tests/core.spec.ts @@ -0,0 +1,267 @@ +/** + * Web E2E tests for PackRat core functionality. + * + * Each test navigates to a route after seeding auth tokens in localStorage. + * TestIds match the constants in lib/testIds.ts and the Maestro iOS flows. + */ +import { BASE_URL, expect, test } from './fixtures'; + +// ─── Dashboard ────────────────────────────────────────────────────────────── + +test('dashboard loads authenticated', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/`); + // Tab bar must be visible — confirms app rendered past the auth gate + await expect(page.getByRole('tab', { name: /Dashboard/i })).toBeVisible(); + await expect(page.getByRole('tab', { name: /Packs/i })).toBeVisible(); +}); + +// ─── Packs ─────────────────────────────────────────────────────────────────── + +test('packs tab loads and shows create button', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/packs`); + await expect(page.getByTestId('create-pack-button')).toBeVisible(); +}); + +test('create a pack end-to-end', async ({ authedPage: page }) => { + const packName = `E2E-Pack-${Date.now()}`; + + // Use waitForResponse to capture the created pack ID. + // Navigating directly to /pack/new means router.back() fails on submit, + // so we intercept the API response instead of relying on navigation. + const [packResponse] = await Promise.all([ + page.waitForResponse((r) => r.url().includes('/api/packs') && r.request().method() === 'POST'), + (async () => { + await page.goto(`${BASE_URL}/pack/new`); + await page.getByRole('textbox', { name: /Pack Name/i }).fill(packName); + await page.getByTestId('submit-pack-button').click(); + })(), + ]); + + expect(packResponse.ok()).toBeTruthy(); + + // Verify pack appears in the list + await page.goto(`${BASE_URL}/packs`); + await expect(page.getByText(packName)).toBeVisible({ timeout: 10_000 }); +}); + +// ─── Pack Detail — add items ───────────────────────────────────────────────── + +test('add item manually to a pack', async ({ authedPage: page }) => { + const packName = `E2E-AddItem-${Date.now()}`; + + // Create a pack via API and capture the ID + const [packResponse] = await Promise.all([ + page.waitForResponse((r) => r.url().includes('/api/packs') && r.request().method() === 'POST'), + (async () => { + await page.goto(`${BASE_URL}/pack/new`); + await page.getByTestId('packs:name-input').fill(packName); + await page.getByTestId('submit-pack-button').click(); + })(), + ]); + + expect(packResponse.ok()).toBeTruthy(); + const { id: packId } = (await packResponse.json()) as { id: number }; + + // Fill the item creation form using testIds + await page.goto(`${BASE_URL}/item/new?packId=${packId}`); + await page.getByTestId('items:name-input').fill('Test Tent'); + await page.getByTestId('items:weight-input').fill('1200'); + + // Register listener BEFORE clicking — syncedCrud initiates the POST shortly after form submit. + // We must await the response BEFORE page.goto() because a full navigation aborts in-flight requests. + const itemPostPromise = page.waitForResponse( + (r) => + r.url().includes('/api/packs') && + r.url().includes('/items') && + r.request().method() === 'POST', + { timeout: 15_000 }, + ); + + await page.getByTestId('items:submit').click(); + + // Wait for the item to land in the DB before navigating away + await itemPostPromise; + + // Now safe: item is persisted, page.goto() won't abort anything critical + await page.goto(`${BASE_URL}/pack/${packId}`); + await expect(page.getByText('Test Tent')).toBeVisible({ timeout: 15_000 }); +}); + +test('add item from catalog to a pack', async ({ authedPage: page }) => { + const packName = `E2E-Catalog-${Date.now()}`; + + // Create a pack and capture the ID + const [packResponse] = await Promise.all([ + page.waitForResponse((r) => r.url().includes('/api/packs') && r.request().method() === 'POST'), + (async () => { + await page.goto(`${BASE_URL}/pack/new`); + await page.getByRole('textbox', { name: /Pack Name/i }).fill(packName); + await page.getByTestId('submit-pack-button').click(); + })(), + ]); + + const { id: packId } = (await packResponse.json()) as { id: number }; + + // Navigate to pack detail and open "Add from Catalog" sheet + await page.goto(`${BASE_URL}/pack/${packId}`); + await page.getByTestId('add-from-catalog-option').last().click(); + + // Dialog with catalog items should appear + await expect(page.getByText('Browse Catalog').first()).toBeVisible({ timeout: 10_000 }); + + // Wait for catalog items to load, then click the first one + const firstCard = page.getByTestId(/^catalog-item-card-/).first(); + await firstCard.waitFor({ timeout: 15_000 }); + await firstCard.click(); + + // Confirm "Add N item(s)" panel appears and click it + await expect(page.getByText(/Add \d+ item/i)).toBeVisible({ timeout: 5_000 }); + await page.getByText(/Add \d+ item/i).click(); + + // Local store updates synchronously; the pack detail (behind the modal) re-renders. + // A non-zero weight confirms the catalog item was added. + await expect(page.getByText(/[1-9]\d*\.?\d*g/).first()).toBeVisible({ timeout: 10_000 }); +}); + +// ─── Trips ──────────────────────────────────────────────────────────────────── + +test('trips tab loads', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/trips`); + await expect(page.getByText('Create New Trip')).toBeVisible(); +}); + +test('create a trip with dates', async ({ authedPage: page }) => { + test.setTimeout(60_000); + const tripName = `E2E-Trip-${Date.now()}`; + + const postPromise = page.waitForResponse( + (r) => r.url().includes('/api/trips') && r.request().method() === 'POST', + { timeout: 20_000 }, + ); + + await page.goto(`${BASE_URL}/trip/new`); + const nameInput = page.getByTestId('trips:name-input'); + await nameInput.waitFor({ timeout: 10_000 }); + await nameInput.fill(tripName); + + // Open start date picker and set via native input + await page + .getByText(/Start Date/i) + .first() + .click(); + const startInput = page.locator('input[type="date"]').first(); + await startInput.waitFor({ timeout: 5_000 }); + await startInput.fill('2026-08-01'); + + // Open end date picker + await page + .getByText(/End Date/i) + .first() + .click(); + const endInput = page.locator('input[type="date"]').last(); + await endInput.waitFor({ timeout: 5_000 }); + await endInput.fill('2026-08-14'); + + await page.getByTestId('submit-trip-button').click(); + + // Wait for the POST to complete so the trip is persisted before navigating + const response = await postPromise; + expect(response.ok()).toBeTruthy(); + + // Navigate to trips list and verify + await page.goto(`${BASE_URL}/trips`); + await page.waitForLoadState('networkidle'); + await expect(page.getByText(tripName)).toBeVisible({ timeout: 15_000 }); +}); + +// ─── Catalog ────────────────────────────────────────────────────────────────── + +test('catalog tab loads items', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/catalog`); + // Wait for items to load — at least one item name visible + await expect(page.locator('text=/\\d+,?\\d+ items/i').first()).toBeVisible({ timeout: 15_000 }); +}); + +test('catalog search filters results', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/catalog`); + // Wait for initial load + await page.waitForLoadState('networkidle'); + + // The search box is revealed by clicking the search icon + await page.getByText('󰍉').first().click(); + + const searchBox = page.locator('input[placeholder*="Search"]'); + await searchBox.waitFor({ timeout: 5_000 }); + await searchBox.fill('sleeping bag'); + // Results should update — check item names + await expect(page.getByText(/sleeping bag/i).first()).toBeVisible({ timeout: 10_000 }); +}); + +// ─── Profile ────────────────────────────────────────────────────────────────── + +test('profile screen loads user info', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/profile`); + await expect(page.getByText('Account Information')).toBeVisible(); + // User email should be visible + await expect(page.getByText(/@/).first()).toBeVisible(); +}); + +test('profile name edit screen', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/profile/name`); + await expect(page.getByRole('heading', { name: 'Name' })).toBeVisible(); + await expect(page.getByRole('textbox')).toHaveCount(2); // First + Last +}); + +// ─── Settings ───────────────────────────────────────────────────────────────── + +test('settings screen loads', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/settings`); + await expect(page.getByText('AI Models')).toBeVisible(); + await expect(page.getByText('Danger Zone')).toBeVisible(); + await expect(page.getByText(/PackRat v/i)).toBeVisible(); +}); + +// ─── AI Chat ────────────────────────────────────────────────────────────────── + +test('AI chat sends message and gets response', async ({ authedPage: page }) => { + test.setTimeout(60_000); // AI streaming responses can take 20-30s + // Create a pack to chat about first + const packName = `E2E-AI-${Date.now()}`; + + const [packResponse] = await Promise.all([ + page.waitForResponse((r) => r.url().includes('/api/packs') && r.request().method() === 'POST'), + (async () => { + await page.goto(`${BASE_URL}/pack/new`); + await page.getByRole('textbox', { name: /Pack Name/i }).fill(packName); + await page.getByTestId('submit-pack-button').click(); + })(), + ]); + + const { id: packId } = (await packResponse.json()) as { id: number }; + + await page.goto( + `${BASE_URL}/ai-chat?packId=${packId}&packName=${encodeURIComponent(packName)}&contextType=pack`, + ); + + // Greet message should be visible + await expect(page.getByText(/working with your/i).first()).toBeVisible(); + + // Send a message + await page.getByRole('textbox', { name: /Ask about this pack/i }).fill('List 3 essential items.'); + // Send button is icon-only with no accessible name; use the arrow-up icon character + await page.getByText('󰁝').click(); + + // Wait for AI response (streaming may take a while) + await expect(page.getByText(/item/i).nth(1)).toBeVisible({ timeout: 30_000 }); +}); + +// ─── Weather ────────────────────────────────────────────────────────────────── + +test('weather screen loads', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/weather`); + await expect(page.getByText('Weather', { exact: true }).first()).toBeVisible(); + // Empty state or locations list + await expect(page.getByText('No saved locations').or(page.locator('text=/°[FC]/'))).toBeVisible({ + timeout: 10_000, + }); +}); diff --git a/apps/expo/playwright/tests/fixtures.ts b/apps/expo/playwright/tests/fixtures.ts new file mode 100644 index 0000000000..edde2a6f35 --- /dev/null +++ b/apps/expo/playwright/tests/fixtures.ts @@ -0,0 +1,64 @@ +import * as fs from 'node:fs'; +import * as path from 'node:path'; +import { type Browser, type BrowserContext, test as base, type Page } from '@playwright/test'; + +const BASE_URL = process.env.BASE_URL ?? 'http://localhost:8081'; +export const API_URL = process.env.API_URL ?? 'http://localhost:8787'; + +const TOKENS_FILE = path.join(__dirname, '../.auth-tokens.json'); + +interface CachedAuth { + accessToken: string; + refreshToken: string; + user: Record | null; +} + +function loadCachedAuth(): CachedAuth { + if (!fs.existsSync(TOKENS_FILE)) { + throw new Error(`Auth tokens file not found at ${TOKENS_FILE}. Did globalSetup run?`); + } + // safe-cast: JSON.parse result is validated implicitly by the known file format written by globalSetup + return JSON.parse(fs.readFileSync(TOKENS_FILE, 'utf-8')) as CachedAuth; +} + +/** + * Creates a browser context with auth pre-seeded in localStorage: + * - access_token / refresh_token → read by expo-sqlite kv-store stub + tokenAtom + * - user → read by ObservablePersistLocalStorage to hydrate userStore + * (isAuthed is computed from userStore !== null) + * + * Using storageState guarantees the values are present before ANY page JS runs. + */ +async function createAuthedContext(browser: Browser): Promise { + const { accessToken, refreshToken, user } = loadCachedAuth(); + + const localStorage = [ + { name: 'access_token', value: accessToken }, + { name: 'refresh_token', value: refreshToken }, + ]; + + if (user) { + localStorage.push({ name: 'user', value: JSON.stringify(user) }); + } + + return browser.newContext({ + storageState: { + cookies: [], + origins: [{ origin: BASE_URL, localStorage }], + }, + }); +} + +export type AuthFixtures = { authedPage: Page }; + +export const test = base.extend({ + authedPage: async ({ browser }, use) => { + const context = await createAuthedContext(browser); + const page = await context.newPage(); + await use(page); + await context.close(); + }, +}); + +export { expect } from '@playwright/test'; +export { BASE_URL }; diff --git a/apps/expo/playwright/tests/globalSetup.ts b/apps/expo/playwright/tests/globalSetup.ts new file mode 100644 index 0000000000..e41cbd9342 --- /dev/null +++ b/apps/expo/playwright/tests/globalSetup.ts @@ -0,0 +1,116 @@ +/** + * Playwright global setup — runs once before all tests. + * + * Priority order for obtaining auth tokens: + * 1. TEST_ACCESS_TOKEN + TEST_REFRESH_TOKEN — used directly (no API call) + * 2. TEST_EMAIL + TEST_PASSWORD — logs in against the API (matches the + * iOS/Android Maestro pattern: seed the user, then log in with credentials) + * 3. Fallback — registers a fresh ephemeral user, reads the OTP from the DB, + * and verifies email to obtain tokens (useful for local development) + * + * The resulting tokens are written to .auth-tokens.json so the authedPage + * fixture can seed localStorage without hitting auth on every test. + */ +import * as fs from 'node:fs'; +import * as path from 'node:path'; +import { neon } from '@neondatabase/serverless'; + +const API_URL = process.env.API_URL ?? 'http://localhost:8787'; +const DB_URL = + process.env.NEON_DATABASE_URL ?? + 'postgresql://packrat-neon-db_owner:npg_6YTmFJhaSV8d@ep-billowing-rice-a4p2xhgf-pooler.us-east-1.aws.neon.tech/packrat-neon-db?sslmode=require'; + +export const TOKENS_FILE = path.join(__dirname, '../.auth-tokens.json'); + +async function setup() { + // Priority 1: pre-minted tokens provided directly + if (process.env.TEST_ACCESS_TOKEN && process.env.TEST_REFRESH_TOKEN) { + const meRes = await fetch(`${API_URL}/api/auth/me`, { + headers: { Authorization: `Bearer ${process.env.TEST_ACCESS_TOKEN}` }, + }); + const user = meRes.ok ? ((await meRes.json()) as { user: Record }).user : null; + fs.writeFileSync( + TOKENS_FILE, + JSON.stringify({ + accessToken: process.env.TEST_ACCESS_TOKEN, + refreshToken: process.env.TEST_REFRESH_TOKEN, + user, + }), + ); + console.log('[globalSetup] Using tokens from TEST_ACCESS_TOKEN env var'); + return; + } + + // Priority 2: log in with the seeded E2E user (CI path, matches iOS/Android pattern) + if (process.env.TEST_EMAIL && process.env.TEST_PASSWORD) { + const loginRes = await fetch(`${API_URL}/api/auth/login`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email: process.env.TEST_EMAIL, password: process.env.TEST_PASSWORD }), + }); + if (!loginRes.ok) { + const body = await loginRes.text(); + throw new Error(`Login failed ${loginRes.status}: ${body}`); + } + const { accessToken, refreshToken, user } = (await loginRes.json()) as { + accessToken: string; + refreshToken: string; + user: Record; + }; + fs.writeFileSync(TOKENS_FILE, JSON.stringify({ accessToken, refreshToken, user })); + console.log(`[globalSetup] Logged in as ${process.env.TEST_EMAIL}`); + return; + } + + // Priority 3: register a fresh ephemeral user (local dev fallback) + const email = `e2e-${Date.now()}@packrat.test`; + const password = 'E2eTest1!'; + + // 1. Register + const registerRes = await fetch(`${API_URL}/api/auth/register`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email, password, firstName: 'E2E', lastName: 'User' }), + }); + if (!registerRes.ok) { + const body = await registerRes.text(); + throw new Error(`Register failed ${registerRes.status}: ${body}`); + } + console.log(`[globalSetup] Registered ${email}`); + + // 2. Fetch OTP directly from the database + const sql = neon(DB_URL); + const rows = await sql` + SELECT otp.code + FROM one_time_passwords otp + JOIN users u ON u.id = otp.user_id + WHERE u.email = ${email} + ORDER BY otp.expires_at DESC + LIMIT 1 + `; + + const code = (rows[0] as { code: string } | undefined)?.code; + if (!code) throw new Error(`No OTP found in DB for ${email}`); + console.log(`[globalSetup] Got OTP from DB`); + + // 3. Verify email + const verifyRes = await fetch(`${API_URL}/api/auth/verify-email`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email, code }), + }); + if (!verifyRes.ok) { + const body = await verifyRes.text(); + throw new Error(`Verify failed ${verifyRes.status}: ${body}`); + } + const { accessToken, refreshToken, user } = (await verifyRes.json()) as { + accessToken: string; + refreshToken: string; + user: Record; + }; + console.log('[globalSetup] Email verified, tokens obtained'); + + fs.writeFileSync(TOKENS_FILE, JSON.stringify({ accessToken, refreshToken, user })); +} + +export default setup; diff --git a/apps/expo/playwright/tests/packs.spec.ts b/apps/expo/playwright/tests/packs.spec.ts new file mode 100644 index 0000000000..8b2421fa7f --- /dev/null +++ b/apps/expo/playwright/tests/packs.spec.ts @@ -0,0 +1,265 @@ +/** + * Web E2E tests for Pack and Item CRUD functionality. + * + * Covers: + * - Pack create / edit / delete + * - Item add (manually) / edit / delete + * - Validation: empty name on pack and item forms + * + * Auth is pre-seeded via the `authedPage` fixture (storageState). + * Pack IDs are always captured from the POST /api/packs response so that + * tests can navigate directly to detail/edit routes without relying on + * post-submit navigation behaviour. + */ +import { BASE_URL, expect, test } from './fixtures'; + +// ─── Helpers ───────────────────────────────────────────────────────────────── + +/** Create a pack via the UI and return its server-assigned id. */ +async function createPackViaForm( + page: import('@playwright/test').Page, + packName: string, +): Promise { + const [packResponse] = await Promise.all([ + page.waitForResponse((r) => r.url().includes('/api/packs') && r.request().method() === 'POST'), + (async () => { + await page.goto(`${BASE_URL}/pack/new`); + await page.getByTestId('packs:name-input').fill(packName); + await page.getByTestId('submit-pack-button').click(); + })(), + ]); + + expect(packResponse.ok()).toBeTruthy(); + const { id } = (await packResponse.json()) as { id: string }; + return id; +} + +/** Add an item to a pack via the UI, wait for the API to persist it, return item id. */ +async function addItemViaForm( + page: import('@playwright/test').Page, + opts: { packId: string; itemName: string; weight?: string }, +): Promise { + const { packId, itemName, weight = '500' } = opts; + await page.goto(`${BASE_URL}/item/new?packId=${packId}`); + await page.getByTestId('items:name-input').fill(itemName); + await page.getByTestId('items:weight-input').fill(weight); + + const itemPostPromise = page.waitForResponse( + (r) => + r.url().includes('/api/packs') && + r.url().includes('/items') && + r.request().method() === 'POST', + { timeout: 20_000 }, + ); + + await page.getByTestId('items:submit').click(); + const response = await itemPostPromise; + expect(response.ok()).toBeTruthy(); + const body = (await response.json()) as { id: string }; + return body.id; +} + +// ─── Pack CRUD ──────────────────────────────────────────────────────────────── + +test.describe('Pack CRUD', () => { + test('create pack → appears in packs list', async ({ authedPage: page }) => { + test.setTimeout(30_000); + const packName = `E2E-Create-${Date.now()}`; + + await createPackViaForm(page, packName); + + await page.goto(`${BASE_URL}/packs`); + await expect(page.getByText(packName)).toBeVisible({ timeout: 10_000 }); + }); + + test('edit pack name → updated name appears in detail', async ({ authedPage: page }) => { + test.setTimeout(60_000); + const originalName = `E2E-Edit-${Date.now()}`; + const updatedName = `${originalName}-UPDATED`; + + const packId = await createPackViaForm(page, originalName); + + // Use the header edit button (SPA nav) so router.back() stays in-SPA and + // syncedCrud can flush the PUT before the page unloads. + await page.goto(`${BASE_URL}/pack/${packId}`); + await page.waitForLoadState('networkidle'); + await page.getByTestId('packs:edit').click(); + + const nameInput = page.getByTestId('packs:name-input'); + await nameInput.waitFor({ timeout: 10_000 }); + await nameInput.clear(); + await nameInput.fill(updatedName); + + // Register listener before clicking — scoped to this pack's URL + const editPutPromise = page.waitForResponse( + (r) => + r.url().includes(`/api/packs/${packId}`) && + (r.request().method() === 'PUT' || r.request().method() === 'PATCH'), + { timeout: 20_000 }, + ); + + await page.getByTestId('submit-pack-button').click(); + + // SPA router.back() keeps the JS context alive; await the PUT before navigating away + await editPutPromise; + + // Updated name should appear in the pack detail (full reload from API) + await page.goto(`${BASE_URL}/pack/${packId}`); + await expect(page.getByText(updatedName)).toBeVisible({ timeout: 10_000 }); + }); + + test('delete pack → disappears from packs list', async ({ authedPage: page }) => { + test.setTimeout(60_000); + const packName = `E2E-Delete-${Date.now()}`; + const packId = await createPackViaForm(page, packName); + + await page.goto(`${BASE_URL}/pack/${packId}`); + + // Wait for the store to load and the owner check to resolve so header buttons appear + await page.waitForLoadState('networkidle'); + + // Accept any browser-native confirm/alert dialogs before triggering delete + page.on('dialog', (dialog) => dialog.accept()); + + const deleteButton = page.getByTestId('packs:delete'); + await deleteButton.waitFor({ timeout: 15_000 }); + await deleteButton.click(); + + // After deletion the app should navigate away; go to list and confirm pack is gone + await page.goto(`${BASE_URL}/packs`); + await expect(page.getByText(packName)).not.toBeVisible({ timeout: 10_000 }); + }); +}); + +// ─── Item CRUD within a pack ────────────────────────────────────────────────── + +test.describe('Item CRUD within a pack', () => { + // Create a fresh pack before each item test so tests are independent + let sharedPackId: string; + + test.beforeEach(async ({ authedPage: page }) => { + const packName = `E2E-ItemPack-${Date.now()}`; + sharedPackId = await createPackViaForm(page, packName); + }); + + test('add item manually → appears in pack detail', async ({ authedPage: page }) => { + test.setTimeout(60_000); + const itemName = `E2E-Item-${Date.now()}`; + + await addItemViaForm(page, { packId: sharedPackId, itemName, weight: '850' }); + + await page.goto(`${BASE_URL}/pack/${sharedPackId}`); + await expect(page.getByText(itemName)).toBeVisible({ timeout: 15_000 }); + }); + + test('edit item name → updated name appears in pack detail', async ({ authedPage: page }) => { + test.setTimeout(90_000); + const itemName = `E2E-EditItem-${Date.now()}`; + const updatedItemName = `${itemName}-UPDATED`; + + const itemId = await addItemViaForm(page, { packId: sharedPackId, itemName, weight: '500' }); + + // Navigate to pack detail to verify item exists + await page.goto(`${BASE_URL}/pack/${sharedPackId}`); + await expect(page.getByText(itemName)).toBeVisible({ timeout: 15_000 }); + + // Navigate to the item edit form + await page.goto(`${BASE_URL}/item/${itemId}/edit?packId=${sharedPackId}`); + const nameInput = page.getByTestId('items:name-input'); + await nameInput.waitFor({ timeout: 10_000 }); + await nameInput.clear(); + await nameInput.fill(updatedItemName); + + const editPromise = page.waitForResponse( + (r) => + r.url().includes('/api/packs') && + r.url().includes('/items') && + (r.request().method() === 'PUT' || r.request().method() === 'PATCH'), + { timeout: 20_000 }, + ); + + await page.getByTestId('items:submit').click(); + await editPromise.catch(() => null); + + // Updated name should be visible in pack detail + await page.goto(`${BASE_URL}/pack/${sharedPackId}`); + await expect(page.getByText(updatedItemName)).toBeVisible({ timeout: 15_000 }); + }); + + test('delete item via more-actions menu → disappears from pack detail', async ({ + authedPage: page, + }) => { + test.setTimeout(90_000); + const itemName = `E2E-DeleteItem-${Date.now()}`; + + const itemId = await addItemViaForm(page, { packId: sharedPackId, itemName, weight: '300' }); + + // Confirm item is in pack detail + await page.goto(`${BASE_URL}/pack/${sharedPackId}`); + await expect(page.getByTestId(`items:card-${itemId}`)).toBeVisible({ timeout: 15_000 }); + + // Accept dialogs (web confirm) before triggering delete + page.on('dialog', (dialog) => dialog.accept()); + + // Open the more-actions menu for the item + const moreActionsButton = page.getByTestId(`items:more-actions-${itemId}`); + if (await moreActionsButton.isVisible()) { + await moreActionsButton.click(); + const deleteOption = page + .getByText(/delete/i) + .or(page.getByRole('menuitem', { name: /delete/i })) + .first(); + await deleteOption.waitFor({ timeout: 5_000 }); + await deleteOption.click(); + + // Item card should be gone + await expect(page.getByTestId(`items:card-${itemId}`)).not.toBeVisible({ timeout: 10_000 }); + } else { + test.skip(true, 'items:more-actions button not accessible on web'); + } + }); +}); + +// ─── Validation ─────────────────────────────────────────────────────────────── + +test.describe('Validation', () => { + test.setTimeout(30_000); + + test('empty pack name → form does not navigate on submit', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/pack/new`); + + const submitButton = page.getByTestId('submit-pack-button'); + await submitButton.waitFor({ timeout: 10_000 }); + + // Name field starts empty — clicking submit should either be blocked or stay on this page + const formUrl = page.url(); + await submitButton.click(); + + // Wait a moment for any navigation to settle + await page.waitForTimeout(1_000); + + // Should still be on the create form (validation prevented navigation) + expect(page.url()).toBe(formUrl); + }); + + test('empty item name → form does not navigate on submit', async ({ authedPage: page }) => { + const packId = await createPackViaForm(page, `E2E-Validation-${Date.now()}`); + + await page.goto(`${BASE_URL}/item/new?packId=${packId}`); + + const submitButton = page.getByTestId('items:submit'); + await submitButton.waitFor({ timeout: 10_000 }); + + const nameInput = page.getByTestId('items:name-input'); + await nameInput.waitFor({ timeout: 10_000 }); + await nameInput.clear(); + + const formUrl = page.url(); + await submitButton.click(); + + await page.waitForTimeout(1_000); + + // Should still be on the create item form + expect(page.url()).toBe(formUrl); + }); +}); diff --git a/apps/expo/playwright/tests/profile.spec.ts b/apps/expo/playwright/tests/profile.spec.ts new file mode 100644 index 0000000000..c182c6a29e --- /dev/null +++ b/apps/expo/playwright/tests/profile.spec.ts @@ -0,0 +1,132 @@ +/** + * Web E2E tests for PackRat profile functionality. + * + * Tests use the `authedPage` fixture which pre-seeds auth tokens in + * localStorage before any page JS runs. + * + * TestIds match the constants in lib/testIds.ts. + */ +import { testIds } from '../../lib/testIds'; +import { BASE_URL, expect, test } from './fixtures'; + +// ─── Profile name edit ──────────────────────────────────────────────────────── + +test.describe('Profile name edit', () => { + test('both name inputs are visible on /profile/name', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/profile/name`); + + await expect(page.getByTestId(testIds.profile.firstNameInput)).toBeVisible(); + await expect(page.getByTestId(testIds.profile.lastNameInput)).toBeVisible(); + }); + + test('save button is disabled when name is unchanged', async ({ authedPage: page }) => { + await page.goto(`${BASE_URL}/profile/name`); + + const saveBtn = page.getByTestId(testIds.profile.saveBtn); + await saveBtn.waitFor({ state: 'visible' }); + + // NativeWindUI Button renders as
on web, not
diff --git a/apps/admin/hooks/use-catalog-analytics.ts b/apps/admin/hooks/use-catalog-analytics.ts index c45b990897..455c392c41 100644 --- a/apps/admin/hooks/use-catalog-analytics.ts +++ b/apps/admin/hooks/use-catalog-analytics.ts @@ -54,11 +54,17 @@ export function useEtlFailureSummary(limit = 20) { }); } -export function useEtlJobFailures(jobId: string, opts: { enabled?: boolean; limit?: number } = {}) { +export function useEtlJobFailures({ + jobId, + opts = {}, +}: { + jobId: string; + opts?: { enabled?: boolean; limit?: number }; +}) { const { enabled = false, limit = 50 } = opts; return useQuery({ - queryKey: queryKeys.catalogAnalytics.etl.jobFailures(jobId, limit), - queryFn: () => getEtlJobFailures(jobId, limit), + queryKey: queryKeys.catalogAnalytics.etl.jobFailures({ jobId, limit }), + queryFn: () => getEtlJobFailures({ jobId, limit }), enabled, }); } diff --git a/apps/admin/hooks/use-platform-analytics.ts b/apps/admin/hooks/use-platform-analytics.ts index 68f889eea4..de394708dc 100644 --- a/apps/admin/hooks/use-platform-analytics.ts +++ b/apps/admin/hooks/use-platform-analytics.ts @@ -7,14 +7,14 @@ import { queryKeys } from 'admin-app/lib/queryKeys'; export function usePlatformGrowth(period: 'day' | 'week' | 'month') { return useQuery({ queryKey: queryKeys.platform.growth(period), - queryFn: () => getPlatformGrowth(period), + queryFn: () => getPlatformGrowth({ period }), }); } export function usePlatformActivity(period: 'day' | 'week' | 'month') { return useQuery({ queryKey: queryKeys.platform.activity(period), - queryFn: () => getPlatformActivity(period), + queryFn: () => getPlatformActivity({ period }), }); } diff --git a/apps/admin/lib/api.ts b/apps/admin/lib/api.ts index 67527a5699..a67a16efb2 100644 --- a/apps/admin/lib/api.ts +++ b/apps/admin/lib/api.ts @@ -1,30 +1,41 @@ import { treaty } from '@elysiajs/eden'; import type { App } from '@packrat/api'; -import type { - ActiveUsersSchema, - ActivityPointSchema, - BrandRowSchema, - BreakdownItemSchema, - CatalogOverviewSchema, - EmbeddingStatsSchema, - 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'; const API_BASE = adminEnv.NEXT_PUBLIC_API_URL; // Injects admin auth header and redirects to /login on 401. -const adminFetcher = async (input: RequestInfo | URL, init?: RequestInit): Promise => { +const adminFetcher = async ({ + input, + init, +}: { + input: RequestInfo | URL; + init?: RequestInit; +}): Promise => { const authHeader = getAuthHeader(); const headers = new Headers(init?.headers); headers.set('Content-Type', 'application/json'); @@ -41,45 +52,41 @@ const adminFetcher = async (input: RequestInfo | URL, init?: RequestInit): Promi // Pre-drilled into .api.admin so call sites write `adminClient.stats.get()`. const adminClient = treaty(API_BASE, { - fetcher: adminFetcher as unknown as typeof fetch, + fetcher: ((input, init) => adminFetcher({ input, init })) as unknown as typeof fetch, parseDate: false, }).api.admin; -function throwOnError(error: { value?: unknown } | null, fallback = 'Admin API error'): never { +function throwOnError({ + error, + fallback = 'Admin API error', +}: { + error: { value?: unknown } | null; + fallback?: string; +}): never { const val = error?.value; const msg = isObject(val) && 'error' in val ? String((val as { error: unknown }).error) : fallback; throw new Error(msg); } -function unwrap(data: T | null | undefined, name: string): T { +function unwrap({ data, name }: { data: T | null | undefined; name: string }): T { if (data == null) throw new Error(`Admin API returned no data for ${name}`); return data; } // ─── Stats ──────────────────────────────────────────────────────────────────── -export type AdminStats = { users: number; packs: number; items: number }; +export type { AdminStats }; export async function getStats(): Promise { const { data, error } = await adminClient.stats.get(); - if (error) throwOnError(error); - return unwrap(data, 'stats'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'stats' }); } // ─── Users ──────────────────────────────────────────────────────────────────── -export interface AdminUser { - id: number; - email: string; - firstName: string | null; - lastName: string | null; - role: string | null; - emailVerified: boolean | null; - avatarUrl: string | null; - createdAt: string | null; - updatedAt: string | null; -} +export type AdminUser = AdminUserItem; export interface PaginatedResponse { data: T[]; @@ -99,49 +106,44 @@ export async function getUsers({ q?: string; includeDeleted?: boolean; } = {}): Promise> { + // users-list no longer accepts includeDeleted — Better Auth doesn't support + // user soft-delete, so the field was dead code. Caller-supplied value is + // ignored. + void includeDeleted; const { data, error } = await adminClient['users-list'].get({ - query: { limit, offset, q, includeDeleted: includeDeleted ? 'true' : undefined }, + query: { limit, offset, q }, }); - if (error) throwOnError(error); - return unwrap(data, 'users'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'users' }); } -export async function deleteUser(id: number): Promise<{ success: boolean }> { - const { data, error } = await adminClient.users({ id: String(id) }).delete(); - if (error) throwOnError(error); - return unwrap(data, 'deleteUser'); +export async function deleteUser(id: string): Promise<{ success: boolean }> { + const { data, error } = await adminClient.users({ id }).delete(); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'deleteUser' }); } -export async function hardDeleteUser( - id: number, - reason: string, -): Promise<{ success: boolean; purged: boolean }> { - const { data, error } = await adminClient.users({ id: String(id) }).hard.delete({ reason }); - if (error) throwOnError(error); - return unwrap(data, 'hardDeleteUser'); +export async function hardDeleteUser({ + id, + reason, +}: { + id: string; + reason: string; +}): Promise<{ success: boolean; purged: boolean }> { + const { data, error } = await adminClient.users({ id }).hard.delete({ reason }); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'hardDeleteUser' }); } -export async function restoreUser(id: number): Promise<{ success: boolean }> { - const { data, error } = await adminClient.users({ id: String(id) }).restore.post(); - if (error) throwOnError(error); - return unwrap(data, 'restoreUser'); +export async function restoreUser(id: string): Promise<{ success: boolean }> { + const { data, error } = await adminClient.users({ id }).restore.post(); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'restoreUser' }); } // ─── Packs ──────────────────────────────────────────────────────────────────── -export interface AdminPack { - id: string; - name: string; - description: string | null; - category: string; - isPublic: boolean | null; - isAIGenerated: boolean | null; - tags: string[] | null; - image: string | null; - createdAt: string | null; - updatedAt: string | null; - userEmail: string | null; -} +export type AdminPack = AdminPackItem; export async function getPacks({ limit = 100, @@ -155,38 +157,21 @@ export async function getPacks({ includeDeleted?: boolean; } = {}): Promise> { const { data, error } = await adminClient['packs-list'].get({ - query: { limit, offset, q, includeDeleted: includeDeleted ? 'true' : undefined }, + query: { limit, offset, q, includeDeleted }, }); - if (error) throwOnError(error); - return unwrap(data, 'packs'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'packs' }); } export async function deletePack(id: string): Promise<{ success: boolean }> { const { data, error } = await adminClient.packs({ id }).delete(); - if (error) throwOnError(error); - return unwrap(data, 'deletePack'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'deletePack' }); } // ─── Catalog Items ──────────────────────────────────────────────────────────── -export interface AdminCatalogItem { - id: number; - name: string; - description: string | null; - categories: string[] | null; - brand: string | null; - model: string | null; - price: number | null; - currency: string | null; - weight: number; - weightUnit: string; - availability: string | null; - ratingValue: number | null; - reviewCount: number | null; - productUrl: string | null; - images: string[] | null; - createdAt: string | null; -} +export type { AdminCatalogItem }; export interface UpdateCatalogItemInput { name?: string; @@ -210,110 +195,111 @@ export async function getCatalogItems({ const { data, error } = await adminClient['catalog-list'].get({ query: { limit, offset, q }, }); - if (error) throwOnError(error); - return unwrap(data, 'catalog'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'catalog' }); } export async function deleteCatalogItem(id: number): Promise<{ success: boolean }> { const { data, error } = await adminClient.catalog({ id: String(id) }).delete(); - if (error) throwOnError(error); - return unwrap(data, 'deleteCatalogItem'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'deleteCatalogItem' }); } -export async function updateCatalogItem( - id: number, - body: UpdateCatalogItemInput, -): Promise<{ id: number; name: string }> { +export async function updateCatalogItem({ + id, + body, +}: { + id: number; + body: UpdateCatalogItemInput; +}): Promise<{ id: number; name: string }> { const { data, error } = await adminClient.catalog({ id: String(id) }).patch(body); - if (error) throwOnError(error); - return unwrap(data, 'updateCatalogItem'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'updateCatalogItem' }); } // ─── Analytics — Platform ───────────────────────────────────────────────────── -export type GrowthPoint = Static; -export type ActivityPoint = Static; -export type BreakdownItem = Static; -export type ActiveUsers = Static; +export type { GrowthPoint, ActivityPoint, BreakdownItem, ActiveUsers }; export type AnalyticsPeriod = 'day' | 'week' | 'month'; -export async function getPlatformGrowth( - period: AnalyticsPeriod, +export async function getPlatformGrowth({ + period, range = 12, -): Promise { +}: { + period: AnalyticsPeriod; + range?: number; +}): Promise { const { data, error } = await adminClient.analytics.platform.growth.get({ query: { period, range }, }); - if (error) throwOnError(error); - return unwrap(data, 'platformGrowth'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'platformGrowth' }); } -export async function getPlatformActivity( - period: AnalyticsPeriod, +export async function getPlatformActivity({ + period, range = 12, -): Promise { +}: { + period: AnalyticsPeriod; + range?: number; +}): Promise { const { data, error } = await adminClient.analytics.platform.activity.get({ query: { period, range }, }); - if (error) throwOnError(error); - return unwrap(data, 'platformActivity'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'platformActivity' }); } export async function getPlatformBreakdown(): Promise { const { data, error } = await adminClient.analytics.platform.breakdown.get(); - if (error) throwOnError(error); - return unwrap(data, 'platformBreakdown'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'platformBreakdown' }); } // ─── Analytics — Catalog ───────────────────────────────────────────────────── -export type CatalogOverview = Static; -export type BrandRow = Static; -export type PriceBucket = Static; -export type EtlJob = Static; -export type EtlResponse = Static; -export type EmbeddingStats = Static; +export type { CatalogOverview, BrandRow, PriceBucket, EtlJob, EtlResponse, EmbeddingStats }; export async function getCatalogOverview(): Promise { const { data, error } = await adminClient.analytics.catalog.overview.get(); - if (error) throwOnError(error); - return unwrap(data, 'catalogOverview'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'catalogOverview' }); } export async function getCatalogBrands(limit = 20): Promise { const { data, error } = await adminClient.analytics.catalog.brands.get({ query: { limit }, }); - if (error) throwOnError(error); - return unwrap(data, 'catalogBrands'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'catalogBrands' }); } export async function getCatalogPrices(): Promise { const { data, error } = await adminClient.analytics.catalog.prices.get(); - if (error) throwOnError(error); - return unwrap(data, 'catalogPrices'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'catalogPrices' }); } export async function getCatalogEtl(limit = 20): Promise { const { data, error } = await adminClient.analytics.catalog.etl.get({ query: { limit }, }); - if (error) throwOnError(error); - return unwrap(data, 'catalogEtl'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'catalogEtl' }); } export async function getCatalogEmbeddings(): Promise { const { data, error } = await adminClient.analytics.catalog.embeddings.get(); - if (error) throwOnError(error); - return unwrap(data, 'catalogEmbeddings'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'catalogEmbeddings' }); } // ─── Admin Trails ───────────────────────────────────────────────────────────── -export type TrailSearchResult = Static; -export type TrailGeometry = Static; -export type TrailSearchPage = Static; -export type TrailConditionReport = Static; +export type TrailSearchResult = TrailSearchItem; +export type TrailSearchPage = TrailSearchResultList; +export type { TrailGeometry }; +export type TrailConditionReport = AdminTrailConditionReport; export async function searchTrails({ q, @@ -329,20 +315,20 @@ export async function searchTrails({ const { data, error } = await adminClient.trails.search.get({ query: { q, sport, limit, offset }, }); - if (error) throwOnError(error); - return unwrap(data, 'searchTrails'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'searchTrails' }); } export async function getTrailGeometry(osmId: string): Promise { const { data, error } = await adminClient.trails({ osmId }).geometry.get(); - if (error) throwOnError(error); - return unwrap(data, 'trailGeometry'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'trailGeometry' }); } export async function getAdminTrail(osmId: string): Promise { const { data, error } = await adminClient.trails({ osmId }).get(); - if (error) throwOnError(error); - return unwrap(data, 'adminTrail'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'adminTrail' }); } export async function getTrailConditions({ @@ -357,20 +343,20 @@ export async function getTrailConditions({ includeDeleted?: boolean; } = {}): Promise> { const { data, error } = await adminClient.trails.conditions.get({ - query: { q, limit, offset, includeDeleted: includeDeleted ? 'true' : undefined }, + query: { q, limit, offset, includeDeleted }, }); - if (error) throwOnError(error); - return unwrap(data, 'trailConditions'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'trailConditions' }); } export async function deleteTrailCondition(reportId: string): Promise<{ success: boolean }> { const { data, error } = await adminClient.trails.conditions({ reportId }).delete(); - if (error) throwOnError(error); - return unwrap(data, 'deleteTrailCondition'); + if (error) throwOnError({ error }); + return unwrap({ data, name: 'deleteTrailCondition' }); } -async function adminFetch(path: string, init?: RequestInit): Promise { - const res = await adminFetcher(`${API_BASE}/api/admin${path}`, init); +async function adminFetch({ path, init }: { path: string; init?: RequestInit }): Promise { + const res = await adminFetcher({ input: `${API_BASE}/api/admin${path}`, init }); if (!res.ok) { const body = (await res.json().catch(() => ({}))) as { error?: string }; throw new Error(body.error ?? `Admin API error: ${res.status}`); @@ -380,39 +366,32 @@ async function adminFetch(path: string, init?: RequestInit): Promise { } export function resetStuckEtlJobs(): Promise<{ reset: number; ids: string[] }> { - return adminFetch('/analytics/catalog/etl/reset-stuck', { method: 'POST' }); + return adminFetch({ path: '/analytics/catalog/etl/reset-stuck', init: { method: 'POST' } }); } -export type EtlErrorRow = { field: string; reason: string; count: number }; - -export type EtlFailureSummary = { - topErrors: EtlErrorRow[]; - totalInvalidItems: number; -}; - -export type EtlJobFailures = { - jobId: string; - errorBreakdown: EtlErrorRow[]; - samples: Array<{ - rowIndex: number; - errors: Array<{ field: string; reason: string; value?: unknown }>; - rawData: unknown; - }>; - totalShown: number; -}; +export type { EtlFailureSummary, EtlJobFailures }; export function getEtlFailureSummary(limit = 20): Promise { - return adminFetch(`/analytics/catalog/etl/failure-summary?limit=${limit}`); + return adminFetch({ path: `/analytics/catalog/etl/failure-summary?limit=${limit}` }); } -export function getEtlJobFailures(jobId: string, limit = 50): Promise { - return adminFetch(`/analytics/catalog/etl/${encodeURIComponent(jobId)}/failures?limit=${limit}`); +export function getEtlJobFailures({ + jobId, + limit = 50, +}: { + jobId: string; + limit?: number; +}): Promise { + return adminFetch({ + path: `/analytics/catalog/etl/${encodeURIComponent(jobId)}/failures?limit=${limit}`, + }); } export function retryEtlJob( jobId: string, ): Promise<{ success: boolean; newJobId: string; objectKey: string }> { - return adminFetch(`/analytics/catalog/etl/${encodeURIComponent(jobId)}/retry`, { - method: 'POST', + return adminFetch({ + path: `/analytics/catalog/etl/${encodeURIComponent(jobId)}/retry`, + init: { method: 'POST' }, }); } diff --git a/apps/admin/lib/auth.ts b/apps/admin/lib/auth.ts index 76dfee73d5..349d1927a4 100644 --- a/apps/admin/lib/auth.ts +++ b/apps/admin/lib/auth.ts @@ -9,7 +9,7 @@ export function getStoredToken(): string | null { /** Persist a short-lived admin JWT for the session. */ export function storeToken(token: string): void { - safeSessionStorage.setItem(TOKEN_KEY, token); + safeSessionStorage.setItem({ key: TOKEN_KEY, value: token }); } /** Remove the token (logout). */ diff --git a/apps/admin/lib/queryKeys.ts b/apps/admin/lib/queryKeys.ts index b13ccdf3bb..e81ac3b578 100644 --- a/apps/admin/lib/queryKeys.ts +++ b/apps/admin/lib/queryKeys.ts @@ -39,9 +39,10 @@ export const queryKeys = { osm: { all: () => ['osm'] as const, - search: (q: string, sport?: string) => [...queryKeys.osm.all(), 'search', q, sport] as const, + search: ({ q, sport }: { 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: { @@ -56,7 +57,7 @@ export const queryKeys = { list: (limit?: number) => [...queryKeys.catalogAnalytics.etl.all(), limit] as const, failureSummary: (limit?: number) => [...queryKeys.catalogAnalytics.etl.all(), 'failureSummary', limit] as const, - jobFailures: (jobId: string, limit?: number) => + jobFailures: ({ jobId, limit }: { jobId: string; limit?: number }) => [...queryKeys.catalogAnalytics.etl.all(), 'jobFailures', jobId, limit] as const, }, }, diff --git a/apps/admin/package.json b/apps/admin/package.json index 747634eb26..778202037f 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -1,6 +1,6 @@ { "name": "packrat-admin-app", - "version": "2.0.25", + "version": "2.0.26", "private": true, "scripts": { "build": "next build", @@ -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:", @@ -28,29 +29,29 @@ "@radix-ui/react-slot": "catalog:", "@radix-ui/react-tabs": "catalog:", "@radix-ui/react-tooltip": "catalog:", - "@tanstack/react-query": "^5.70.0", - "@types/leaflet": "^1.9.21", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "leaflet": "^1.9.4", - "lucide-react": "^1.8.0", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "@tanstack/react-query": "catalog:", + "@types/leaflet": "catalog:", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "leaflet": "catalog:", + "lucide-react": "catalog:", + "next": "catalog:", + "next-themes": "catalog:", "nuqs": "^2.8.9", "react": "catalog:", "react-dom": "catalog:", "react-error-boundary": "^6.1.1", - "recharts": "3.8.1", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", + "recharts": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", "zod": "catalog:" }, "devDependencies": { - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:" } diff --git a/apps/expo/.gitignore b/apps/expo/.gitignore index f1a3daea2d..742824b0a3 100644 --- a/apps/expo/.gitignore +++ b/apps/expo/.gitignore @@ -38,8 +38,8 @@ android .env.* !.env.example -# Playwright E2E — cached auth state (written by globalSetup, contains real credentials) -playwright/.auth/ +# Playwright E2E — cached auth tokens (written by globalSetup, contain real credentials) +playwright/.auth-tokens.json playwright/playwright-report/ playwright/test-results/ playwright-report/ diff --git a/apps/expo/app.config.ts b/apps/expo/app.config.ts index 66bba184c2..478019087e 100644 --- a/apps/expo/app.config.ts +++ b/apps/expo/app.config.ts @@ -37,7 +37,7 @@ export default (): ExpoConfig => { name: getAppName(), slug: 'packrat', - version: '2.0.25', + version: '2.0.26', scheme: 'packrat', web: { bundler: 'metro', @@ -63,7 +63,7 @@ export default (): ExpoConfig => [ 'llama.rn', { - enableEntitlements: false, + enableEntitlements: true, forceCxx20: true, enableOpenCLAndHexagon: false, }, @@ -146,6 +146,10 @@ export default (): ExpoConfig => }, ], }, + entitlements: { + 'com.apple.developer.kernel.extended-virtual-addressing': true, + 'com.apple.developer.kernel.increased-memory-limit': true, + }, }, android: { adaptiveIcon: { @@ -163,6 +167,7 @@ export default (): ExpoConfig => eas: { projectId: '267945b1-d9ac-4621-8541-826a2c70576d', }, + appVariant: IS_DEV ? 'development' : IS_PREVIEW ? 'preview' : 'production', }, updates: { url: 'https://u.expo.dev/267945b1-d9ac-4621-8541-826a2c70576d', diff --git a/apps/expo/app/(app)/(tabs)/_layout.web.tsx b/apps/expo/app/(app)/(tabs)/_layout.web.tsx new file mode 100644 index 0000000000..880dcd0e14 --- /dev/null +++ b/apps/expo/app/(app)/(tabs)/_layout.web.tsx @@ -0,0 +1,33 @@ +import { featureFlags } from 'expo-app/config'; +import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; +import { Tabs } from 'expo-router'; + +/** + * Web version of the tabs layout. + * Replaces NativeTabs (expo-router/unstable-native-tabs) with standard Expo Router Tabs. + * NativeTabs uses native UITabBarController and cannot run on web. + * Metro automatically picks this file over _layout.tsx for web builds. + */ +export default function TabLayout() { + const { t } = useTranslation(); + + return ( + + + + + + + + + ); +} diff --git a/apps/expo/app/(app)/(tabs)/profile/index.tsx b/apps/expo/app/(app)/(tabs)/profile/index.tsx index ef91c30016..7972ce9a22 100644 --- a/apps/expo/app/(app)/(tabs)/profile/index.tsx +++ b/apps/expo/app/(app)/(tabs)/profile/index.tsx @@ -134,7 +134,7 @@ function Profile() { ); } -export default withAuthWall(Profile, ProfileAuthWall); +export default withAuthWall({ Component: Profile, AuthWall: ProfileAuthWall }); function renderItem(info: ListRenderItemInfo) { return ; @@ -194,7 +194,7 @@ function ListHeaderComponent() { } setIsUploading(true); - const remoteFileName = await uploadImage(image.fileName, image.uri); + const remoteFileName = await uploadImage({ fileName: image.fileName, uri: image.uri }); if (remoteFileName) { const success = await updateProfile({ avatarUrl: remoteFileName }); if (!success) { @@ -303,7 +303,7 @@ function ListFooterComponent() { // dialogs are not surfaced in XCTest/UIAutomator accessibility trees). Alert.alert(t('profile.syncInProgress'), t('profile.syncMessage'), [ { text: t('common.cancel'), style: 'cancel' }, - { text: t('auth.logOut'), style: 'destructive', onPress: handleSignOut }, + { text: t('auth.proceedLogOut'), style: 'destructive', onPress: handleSignOut }, ]); return; } diff --git a/apps/expo/app/(app)/_layout.tsx b/apps/expo/app/(app)/_layout.tsx index a10d95a8eb..9233da5d8e 100644 --- a/apps/expo/app/(app)/_layout.tsx +++ b/apps/expo/app/(app)/_layout.tsx @@ -164,7 +164,6 @@ export default function AppLayout() { diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx index 330257c03f..5464c9ed46 100644 --- a/apps/expo/app/(app)/ai-chat.tsx +++ b/apps/expo/app/(app)/ai-chat.tsx @@ -1,7 +1,11 @@ import { type UIMessage, useChat } from '@ai-sdk/react'; import { clientEnvs } from '@packrat/env/expo-client'; import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui'; -import { DefaultChatTransport, type TextUIPart } from 'ai'; +import { + DefaultChatTransport, + lastAssistantMessageIsCompleteWithToolCalls, + type TextUIPart, +} from 'ai'; import * as Burnt from 'burnt'; import { fetch as expoFetch } from 'expo/fetch'; import { AiChatHeader } from 'expo-app/components/ai-chatHeader'; @@ -18,8 +22,14 @@ import { ChatBubble } from 'expo-app/features/ai/components/ChatBubble'; import { ErrorState } from 'expo-app/features/ai/components/ErrorState'; import { LocationContext } from 'expo-app/features/ai/components/LocationContext'; import { CustomChatTransport } from 'expo-app/features/ai/lib/CustomChatTransport'; -import { getLocalModel, initLocalModel } from 'expo-app/features/ai/lib/localModelManager'; +import { + getLocalModel, + initLocalModel, + releaseLocalModel, +} from 'expo-app/features/ai/lib/localModelManager'; import { createLocalTools } from 'expo-app/features/ai/lib/tools'; +import { getPackItems, packItemsStore } from 'expo-app/features/packs/store/packItems'; +import { packsStore } from 'expo-app/features/packs/store/packs'; import { useActiveLocation } from 'expo-app/features/weather/hooks'; import type { WeatherLocation } from 'expo-app/features/weather/types'; import { authClient } from 'expo-app/lib/auth-client'; @@ -31,6 +41,7 @@ import { Stack, useLocalSearchParams } from 'expo-router'; import { useAtomValue } from 'jotai'; import * as React from 'react'; import { + AppState, Dimensions, type NativeSyntheticEvent, Platform, @@ -90,14 +101,9 @@ export default function AIChat() { const locationRef = React.useRef(context.location); locationRef.current = context.location; - // We deliberately don't read `useSession()` data into the transport - // closure. On first render `data?.session?.token` is null, the transport - // builds with `Authorization: Bearer null`, and the very first send hits - // /api/chat unauthenticated — the API responds 401 and useChat shows the - // generic "something went wrong" UI. Reading the token lazily via - // `authClient.getSession()` at each request (below) avoids that race - // entirely; getSession is cached after the first call so this is cheap. - authClient.useSession(); + const { data: _authSession } = authClient.useSession(); + const token = _authSession?.session?.token ?? null; + const userId = _authSession?.user?.id ?? ''; const [input, setInput] = React.useState(''); const [lastUserMessage, setLastUserMessage] = React.useState(''); const [previousMessages, setPreviousMessages] = React.useState([]); @@ -115,9 +121,33 @@ export default function AIChat() { [context], ); - // Kick off model init check on mount (prepares already-downloaded models) + // Kick off model init check on mount (prepares already-downloaded models). + // Release the model when the app backgrounds so the llama TurboModule can be + // properly invalidated — prevents "Timed out waiting for modules to be + // invalidated" crashes on hot reload and app restart. React.useEffect(() => { - if (featureFlags.enableLocalAI) initLocalModel(); + if (!featureFlags.enableLocalAI) return; + + initLocalModel(); + + const subscription = AppState.addEventListener('change', (nextState) => { + if (nextState === 'background' || nextState === 'inactive') { + releaseLocalModel(); + } else if (nextState === 'active') { + // Re-prepare the model when the app comes back to the foreground. + initLocalModel(); + } + }); + + // In development, release before fast-refresh tears down native modules. + if (__DEV__) { + const devModule = module as unknown as { hot?: { dispose: (cb: () => void) => void } }; + devModule.hot?.dispose(() => releaseLocalModel()); + } + + return () => { + subscription.remove(); + }; }, []); // Keep a ref for context body values so the transport closure stays fresh @@ -129,38 +159,112 @@ export default function AIChat() { const isLocalReady = modelStatus === 'ready'; const tools = React.useMemo(() => createLocalTools(), []); - const transport = React.useMemo(() => { + const { transport, transportKey } = React.useMemo(() => { if (featureFlags.enableLocalAI && aiMode === 'local' && isLocalReady) { const model = getLocalModel(); if (model) { - return new CustomChatTransport(model, tools); + let systemPrompt = `You are PackRat AI, a helpful assistant for hikers and outdoor enthusiasts. + You help users manage their hiking packs and gear efficiently using ultralight principles. + + Guidelines: + - Focus on ultralight hiking principles when appropriate + - For beginners, emphasize safety and comfort over weight savings + - Always consider weather conditions in your recommendations + - Suggest multi-purpose items to reduce pack weight + - Be concise but helpful in your responses + - Use tools proactively to provide accurate, up-to-date information + + Context: + - User id is ${userId} + - Current date is ${new Date().toLocaleString()}`; + + if (contextRef.current.contextType === 'pack' && contextRef.current.packId) { + systemPrompt += `\n- You are currently helping with a pack with ID: ${contextRef.current.packId}.`; + } else if (contextRef.current.contextType === 'item' && contextRef.current.itemId) { + systemPrompt += `\n- You are currently helping with an item with ID: ${contextRef.current.itemId}.`; + } + + if (contextRef.current.location) { + systemPrompt += `\n- The current location of the user is: ${contextRef.current.location}.`; + } + + return { + transport: new CustomChatTransport({ model, tools, systemPrompt }), + transportKey: 'local', + }; } + } else { } - return new DefaultChatTransport({ - fetch: expoFetch as unknown as typeof globalThis.fetch, - api: `${clientEnvs.EXPO_PUBLIC_API_URL}/api/chat`, - headers: async () => { - const { data } = await authClient.getSession(); - const token = data?.session?.token ?? ''; - const headers: Record = {}; - if (token) headers.Authorization = `Bearer ${token}`; - return headers; - }, - body: () => ({ - contextType: contextRef.current.contextType, - itemId: contextRef.current.itemId, - packId: contextRef.current.packId, - location: locationRef.current, - date: new Date().toLocaleString(), + return { + transport: new DefaultChatTransport({ + fetch: expoFetch as unknown as typeof globalThis.fetch, + api: `${clientEnvs.EXPO_PUBLIC_API_URL}/api/chat`, + headers: { + Authorization: `Bearer ${token}`, + }, + body: () => ({ + contextType: contextRef.current.contextType, + itemId: contextRef.current.itemId, + packId: contextRef.current.packId, + location: locationRef.current, + date: new Date().toLocaleString(), + }), }), - }); - }, [aiMode, isLocalReady, tools]); + transportKey: 'remote', + }; + }, [aiMode, isLocalReady, modelStatus, token, tools, userId]); - const { messages, setMessages, error, sendMessage, stop, status } = useChat({ + // transportKey forces useChat to remount when the transport type switches, + // since useChat captures the transport reference on mount and won't update it. + const { messages, setMessages, error, sendMessage, stop, status, addToolOutput } = useChat({ + id: transportKey, transport, onError: (error: Error) => console.log(error, 'ERROR'), experimental_throttle: 200, messages: initialMessages, + sendAutomaticallyWhen: lastAssistantMessageIsCompleteWithToolCalls, + onToolCall: ({ toolCall }) => { + if (toolCall.dynamic) return; + + if (toolCall.toolName === 'getPackDetails') { + const { packId } = toolCall.input as { packId: string }; + const pack = packsStore.get()[packId]; + if (!pack || pack.deleted) { + addToolOutput({ + tool: 'getPackDetails', + toolCallId: toolCall.toolCallId, + output: { success: false, error: 'Pack not found' }, + }); + return; + } + const items = getPackItems(packId); + const categories = Array.from(new Set(items.map((i) => i.category || 'Uncategorized'))); + addToolOutput({ + tool: 'getPackDetails', + toolCallId: toolCall.toolCallId, + output: { success: true, data: { ...pack, items, categories } }, + }); + return; + } + + if (toolCall.toolName === 'getPackItemDetails') { + const { itemId } = toolCall.input as { itemId: string }; + const item = packItemsStore.get()[itemId]; + if (!item || item.deleted) { + addToolOutput({ + tool: 'getPackItemDetails', + toolCallId: toolCall.toolCallId, + output: { success: false, error: 'Item not found' }, + }); + return; + } + addToolOutput({ + tool: 'getPackItemDetails', + toolCallId: toolCall.toolCallId, + output: { success: true, data: item }, + }); + } + }, }); // Load persisted messages on mount and when context changes @@ -195,7 +299,7 @@ export default function AIChat() { } const timeoutId = setTimeout(() => { - saveChatMessages(context, messages); + saveChatMessages({ context, messages }); }, 500); return () => clearTimeout(timeoutId); @@ -214,10 +318,13 @@ export default function AIChat() { // Guard: local mode but model not ready if (featureFlags.enableLocalAI && aiMode === 'local' && modelStatus !== 'ready') { - Burnt.toast({ - title: t('ai.modelNotReady'), - preset: 'error', - }); + const toastTitle = + modelStatus === 'downloading' + ? t('ai.modelStillDownloading') + : modelStatus === 'preparing' || modelStatus === 'checking' + ? t('ai.modelStillLoading') + : t('ai.modelNotReady'); + Burnt.toast({ title: toastTitle, preset: 'error' }); return; } @@ -301,7 +408,11 @@ export default function AIChat() { }} > - + )} - {status === 'error' && handleRetry()} />} + {status === 'error' && ( + handleRetry()} onClear={handleClear} /> + )} {messages.length < 2 && ( {t('ai.suggestions')} diff --git a/apps/expo/app/(app)/current-pack/[id].tsx b/apps/expo/app/(app)/current-pack/[id].tsx index db114c3fe7..8bfaa24636 100644 --- a/apps/expo/app/(app)/current-pack/[id].tsx +++ b/apps/expo/app/(app)/current-pack/[id].tsx @@ -7,12 +7,12 @@ import { } from '@packrat/ui/nativewindui'; import { userStore } from 'expo-app/features/auth/store'; import { usePackDetailsFromStore } from 'expo-app/features/packs/hooks/usePackDetailsFromStore'; +import type { PackItem } from 'expo-app/features/packs/types'; import { type CategorySummary, computeCategorySummaries } from 'expo-app/features/packs/utils'; 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'; @@ -155,7 +155,7 @@ export default function CurrentPackScreen() { {t('packs.lastUpdated', { - time: getRelativeTime(pack.localUpdatedAt ?? pack.updatedAt, t), + time: getRelativeTime({ dateValue: pack.localUpdatedAt ?? pack.updatedAt, t }), })} @@ -192,10 +192,7 @@ export default function CurrentPackScreen() { index.toString()} - renderItem={(item, index) => ( - // safe-cast: Treaty response type has createdAt?: string but PackItem schema requires string - - )} + renderItem={(item, index) => } /> diff --git a/apps/expo/app/(app)/gear-inventory.tsx b/apps/expo/app/(app)/gear-inventory.tsx index f2fa21b2ed..a82128650d 100644 --- a/apps/expo/app/(app)/gear-inventory.tsx +++ b/apps/expo/app/(app)/gear-inventory.tsx @@ -1,15 +1,24 @@ import { assertDefined } from '@packrat/guards'; -import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui'; +import { Text } from '@packrat/ui/nativewindui'; import { PackItemCard } from 'expo-app/features/packs/components/PackItemCard'; import { useUserPackItems } from 'expo-app/features/packs/hooks/useUserPackItems'; import type { PackItem } from 'expo-app/features/packs/types'; import { cn } from 'expo-app/lib/cn'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; +import { useRouter } from 'expo-router'; import { useState } from 'react'; import { Pressable, ScrollView, View } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; -function CategorySection({ category, items }: { category: string; items: PackItem[] }) { +function CategorySection({ + category, + items, + onItemPress, +}: { + category: string; + items: PackItem[]; + onItemPress: (item: PackItem) => void; +}) { return ( @@ -19,7 +28,7 @@ function CategorySection({ category, items }: { category: string; items: PackIte {items.map((item) => ( - {}} /> + ))} @@ -29,6 +38,14 @@ function CategorySection({ category, items }: { category: string; items: PackIte export default function GearInventoryScreen() { const [viewMode, setViewMode] = useState<'all' | 'category'>('all'); const items = useUserPackItems(); + const router = useRouter(); + + const handleItemPress = (item: PackItem) => { + router.push({ + pathname: '/item/[id]', + params: { id: item.id, packId: item.packId }, + }); + }; const { t } = useTranslation(); const groupByCategory = (items: PackItem[]) => { @@ -47,16 +64,23 @@ export default function GearInventoryScreen() { const itemsByCategory = groupByCategory(items); return ( - - - + + + + {t('packs.gearInventory')} + + + {t('packs.itemsInInventory', { count: items?.length })} - + setViewMode('all')} > setViewMode('category')} @@ -88,13 +112,18 @@ export default function GearInventoryScreen() { {viewMode === 'all' ? ( {items.map((item) => ( - {}} /> + ))} ) : ( {Object.entries(itemsByCategory).map(([category, groupedItems]) => ( - + ))} )} diff --git a/apps/expo/app/(app)/pack-stats/[id].tsx b/apps/expo/app/(app)/pack-stats/[id].tsx index 3277f6d134..834927ee70 100644 --- a/apps/expo/app/(app)/pack-stats/[id].tsx +++ b/apps/expo/app/(app)/pack-stats/[id].tsx @@ -1,21 +1,22 @@ -import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui'; +import { Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui'; import { featureFlags } from 'expo-app/config'; import { userStore } from 'expo-app/features/auth/store'; import { usePackDetailsFromStore } from 'expo-app/features/packs/hooks/usePackDetailsFromStore'; import { usePackWeightHistory } from 'expo-app/features/packs/hooks/usePackWeightHistory'; import { computeCategorySummaries } from 'expo-app/features/packs/utils'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; -import { useLocalSearchParams } from 'expo-router'; +import { useLocalSearchParams, useRouter } from 'expo-router'; import { ScrollView, View } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; export default function PackStatsScreen() { const params = useLocalSearchParams(); - const packId = params.id; + const packId = params.id as string; const { t } = useTranslation(); + const router = useRouter(); - const pack = usePackDetailsFromStore(params.id as string); - const weightHistory = usePackWeightHistory(packId as string); + const pack = usePackDetailsFromStore(packId); + const weightHistory = usePackWeightHistory(packId); const categories = computeCategorySummaries(pack); const CATEGORY_DISTRIBUTION = categories.map((category) => ({ @@ -32,62 +33,70 @@ export default function PackStatsScreen() { return ( - - {weightHistory || CATEGORY_DISTRIBUTION ? ( - - {/* Weight History Section */} - {WEIGHT_HISTORY && ( - - - {t('packs.weightHistory')} - + + + {/* Weight History Section */} + + + {t('packs.weightHistory')} + + {WEIGHT_HISTORY && WEIGHT_HISTORY.length > 0 ? ( + <> - {WEIGHT_HISTORY.length ? ( - WEIGHT_HISTORY.map((item) => { - const maxWeight = Math.max(...WEIGHT_HISTORY.map((w) => w.weight)); - const minWeight = Math.min(...WEIGHT_HISTORY.map((w) => w.weight)); - const range = maxWeight - minWeight || 1; - const heightPercentage = ((item.weight - minWeight) / range) * 80 + 20; + {WEIGHT_HISTORY.map((item) => { + const maxWeight = Math.max(...WEIGHT_HISTORY.map((w) => w.weight)); + const minWeight = Math.min(...WEIGHT_HISTORY.map((w) => w.weight)); + const range = maxWeight - minWeight || 1; + const heightPercentage = ((item.weight - minWeight) / range) * 80 + 20; - return ( - - - - {item.month} - - - {item.weight.toFixed(1)} g - - - ); - }) - ) : ( - - N/A - - )} + return ( + + + + {item.month} + + + {item.weight.toFixed(1)} g + + + ); + })} - {t('packs.packWeightOverMonths')} + + ) : ( + + + No weight history yet + + + Add gear to your pack — your pack weight over time will appear here. + + )} + - {/* Category Distribution Section */} - {CATEGORY_DISTRIBUTION && ( - - - {t('packs.categoryDistribution')} - + {/* Category Distribution Section */} + + + {t('packs.categoryDistribution')} + + {CATEGORY_DISTRIBUTION.length > 0 ? ( + <> {CATEGORY_DISTRIBUTION.map((item) => ( @@ -110,54 +119,65 @@ export default function PackStatsScreen() { ))} - {t('packs.weightDistribution')} + + ) : ( + + + No categorized items + + + Add items to your pack and assign categories to see weight distribution. + + )} + - {/* Pack Insights Section */} - {featureFlags.enablePackInsights && ( - - - {t('packs.packInsights')} - + {/* Pack Insights Section */} + {featureFlags.enablePackInsights && ( + + + {t('packs.packInsights')} + - - - {t('packs.lighterThanSimilar')} - - - {t('packs.basedOnData')} - - + + + {t('packs.lighterThanSimilar')} + + + {t('packs.basedOnData')} + + - - - {t('packs.reducedWeight')} - - - {t('packs.weightReduction')} - - + + + {t('packs.reducedWeight')} + + + {t('packs.weightReduction')} + + - - - {t('packs.heaviestCategory')} - - - {t('packs.considerUltralight')} - - + + + {t('packs.heaviestCategory')} + + + {t('packs.considerUltralight')} + - )} - - ) : ( - - {t('packs.noStatsAvailable')} - - )} + + )} + ); } diff --git a/apps/expo/app/(app)/recent-packs.tsx b/apps/expo/app/(app)/recent-packs.tsx index f41803f4bc..f58da2a2fa 100644 --- a/apps/expo/app/(app)/recent-packs.tsx +++ b/apps/expo/app/(app)/recent-packs.tsx @@ -39,7 +39,7 @@ function RecentPackCard({ pack }: { pack: Pack }) { {pack.totalWeight ?? 0} g - {getRelativeTime(pack.localCreatedAt ?? pack.createdAt, t)} + {getRelativeTime({ dateValue: pack.localCreatedAt ?? pack.createdAt, t })} @@ -50,7 +50,7 @@ function RecentPackCard({ pack }: { pack: Pack }) { {t('packs.lastUpdated', { - time: getRelativeTime(pack.localUpdatedAt ?? pack.updatedAt, t), + time: getRelativeTime({ dateValue: pack.localUpdatedAt ?? pack.updatedAt, t }), })} diff --git a/apps/expo/app/(app)/season-suggestions.tsx b/apps/expo/app/(app)/season-suggestions.tsx index fda46f799e..8960d73c47 100644 --- a/apps/expo/app/(app)/season-suggestions.tsx +++ b/apps/expo/app/(app)/season-suggestions.tsx @@ -34,7 +34,13 @@ export default function SeasonSuggestionsScreen() { }); }; - const handleCreatePack = (suggestion: PackSuggestion, index: number) => { + const handleCreatePack = ({ + suggestion, + index, + }: { + suggestion: PackSuggestion; + index: number; + }) => { setCreatingPackIndex(index); // Add a short delay to show the loading state @@ -154,7 +160,7 @@ export default function SeasonSuggestionsScreen() { )} diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx index 3b88042fcd..d1b2b4ed65 100644 --- a/apps/expo/app/auth/one-time-password.tsx +++ b/apps/expo/app/auth/one-time-password.tsx @@ -15,7 +15,6 @@ import { type NativeSyntheticEvent, Platform, Pressable, - type TargetedEvent, type TextInput, type TextInputKeyPressEventData, View, @@ -27,7 +26,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'; const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png'); const COUNTDOWN_SECONDS_TO_RESEND_CODE = 60; -const NUM_OF_CODE_CHARACTERS = 5; +const NUM_OF_CODE_CHARACTERS = 6; const SCREEN_OPTIONS = { headerBackTitle: 'Back', headerTransparent: true, @@ -136,7 +135,7 @@ export default function OneTimePasswordScreen() { params: { email, code }, }); } else { - await verifyEmail(email, code); // Navigation is handled in the function + await verifyEmail({ _email: email, token: code }); // Navigation is handled in the function } } catch (error) { Alert.alert( @@ -159,12 +158,7 @@ export default function OneTimePasswordScreen() { > - + @@ -260,7 +254,7 @@ function OTPField({ const inputRef = React.useRef(null); // Apply keyboard hide blur fix - useKeyboardHideBlur(asNonNullableRef(inputRef)); + useKeyboardHideBlur({ textInputRef: asNonNullableRef(inputRef) }); function onKeyPress({ nativeEvent }: NativeSyntheticEvent) { if (nativeEvent.key === 'Backspace' && value === '') { @@ -271,14 +265,6 @@ function OTPField({ } } - function onFocus(_e: NativeSyntheticEvent) { - if (typeof inputRef.current?.setNativeProps === 'function') { - inputRef.current.setNativeProps({ - selection: { start: 0, end: value?.toString().length }, - }); - } - } - function onChangeText(text: string) { setCodeValues((prev) => { const values = [...prev]; @@ -318,7 +304,6 @@ ios:border ios:border-border ios:rounded-lg " clearButtonMode="never" materialHideActionIcons materialRingColor={hasError ? colors.destructive : undefined} - onFocus={onFocus} onKeyPress={onKeyPress} onChangeText={onChangeText} onSubmitEditing={ diff --git a/apps/expo/atoms/atomWithAsyncStorage.ts b/apps/expo/atoms/atomWithAsyncStorage.ts index 15c69840e8..49060418e7 100644 --- a/apps/expo/atoms/atomWithAsyncStorage.ts +++ b/apps/expo/atoms/atomWithAsyncStorage.ts @@ -2,7 +2,13 @@ import { isFunction } from '@packrat/guards'; import AsyncStorage from '@react-native-async-storage/async-storage'; import { atom } from 'jotai'; -export const atomWithAsyncStorage = (key: string, initialValue: T) => { +export const atomWithAsyncStorage = ({ + key, + initialValue, +}: { + key: string; + initialValue: T; +}) => { const baseAtom = atom(initialValue); baseAtom.onMount = (setValue) => { diff --git a/apps/expo/atoms/atomWithKvStorage.ts b/apps/expo/atoms/atomWithKvStorage.ts index 35d2f1979d..886827e7d7 100644 --- a/apps/expo/atoms/atomWithKvStorage.ts +++ b/apps/expo/atoms/atomWithKvStorage.ts @@ -2,7 +2,7 @@ import { isFunction } from '@packrat/guards'; import Storage from 'expo-sqlite/kv-store'; import { atom } from 'jotai'; -export const atomWithKvStorage = (key: string, initialValue: T) => { +export const atomWithKvStorage = ({ key, initialValue }: { key: string; initialValue: T }) => { const baseAtom = atom(initialValue); baseAtom.onMount = (setValue) => { diff --git a/apps/expo/atoms/atomWithSecureStorage.ts b/apps/expo/atoms/atomWithSecureStorage.ts index c410894c00..b76543d317 100644 --- a/apps/expo/atoms/atomWithSecureStorage.ts +++ b/apps/expo/atoms/atomWithSecureStorage.ts @@ -2,7 +2,13 @@ import { isFunction } from '@packrat/guards'; import * as SecureStore from 'expo-secure-store'; import { atom } from 'jotai'; -export const atomWithSecureStorage = (key: string, initialValue: T) => { +export const atomWithSecureStorage = ({ + key, + initialValue, +}: { + key: string; + initialValue: T; +}) => { const baseAtom = atom(initialValue); baseAtom.onMount = (setValue) => { diff --git a/apps/expo/atoms/atomWithSecureStorage.web.ts b/apps/expo/atoms/atomWithSecureStorage.web.ts new file mode 100644 index 0000000000..f54b9176f3 --- /dev/null +++ b/apps/expo/atoms/atomWithSecureStorage.web.ts @@ -0,0 +1,42 @@ +import { isFunction } from '@packrat/guards'; +import { atom } from 'jotai'; + +/** + * Web (localStorage) equivalent of atomWithSecureStorage. + * Note: localStorage is NOT cryptographically secure. This is a functional + * fallback for web; sensitive flows should use server-side sessions on web. + * Metro automatically picks this file over atomWithSecureStorage.ts for web builds. + */ +export const atomWithSecureStorage = ({ + key, + initialValue, +}: { + key: string; + initialValue: T; +}) => { + const baseAtom = atom(initialValue); + + baseAtom.onMount = (setValue) => { + try { + const item = localStorage.getItem(key); + setValue(item !== null ? JSON.parse(item) : initialValue); + } catch { + setValue(initialValue); + } + }; + + const derivedAtom = atom( + (get) => get(baseAtom), + (get, set, update: T | ((prev: T) => T)) => { + const nextValue = isFunction(update) ? (update as (prev: T) => T)(get(baseAtom)) : update; + set(baseAtom, nextValue); + try { + localStorage.setItem(key, JSON.stringify(nextValue)); + } catch { + // Ignore storage errors + } + }, + ); + + return derivedAtom; +}; diff --git a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts b/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts index 701ccea101..853d2ab559 100644 --- a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts +++ b/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts @@ -3,15 +3,18 @@ import { atomWithAsyncStorage } from './atomWithAsyncStorage'; const MAX_RECENTLY_USED = 10; -export const recentlyUsedCatalogItemsAtom = atomWithAsyncStorage( - 'recentlyUsedCatalogItems', - [], -); +export const recentlyUsedCatalogItemsAtom = atomWithAsyncStorage({ + key: 'recentlyUsedCatalogItems', + initialValue: [], +}); -export function buildUpdatedRecentlyUsed( - current: CatalogItem[], - added: CatalogItem[], -): CatalogItem[] { +export function buildUpdatedRecentlyUsed({ + current, + added, +}: { + current: CatalogItem[]; + added: CatalogItem[]; +}): CatalogItem[] { const addedIds = new Set(added.map((item) => item.id)); const merged = [...added, ...current.filter((item) => !addedIds.has(item.id))]; return merged.slice(0, MAX_RECENTLY_USED); diff --git a/apps/expo/components/Icon/Icon.ios.tsx b/apps/expo/components/Icon/Icon.ios.tsx index 1472ff8ac1..2e3659658f 100644 --- a/apps/expo/components/Icon/Icon.ios.tsx +++ b/apps/expo/components/Icon/Icon.ios.tsx @@ -15,7 +15,7 @@ function Icon({ materialIcon, }: IconProps) { const { useMaterialIcon, ...sfSymbolProps } = ios ?? {}; - const iconNames = useMemo(() => getIconNames(namingScheme, name), [namingScheme, name]); + const iconNames = useMemo(() => getIconNames({ namingScheme, name }), [namingScheme, name]); // Use Material icons on iOS when useMaterialIcon is true if (useMaterialIcon) { diff --git a/apps/expo/components/Icon/Icon.tsx b/apps/expo/components/Icon/Icon.tsx index 7f5accd2ce..4b29bd7bee 100644 --- a/apps/expo/components/Icon/Icon.tsx +++ b/apps/expo/components/Icon/Icon.tsx @@ -12,7 +12,7 @@ function Icon({ size = 27, materialIcon, }: IconProps) { - const iconNames = useMemo(() => getIconNames(namingScheme, name), [namingScheme, name]); + const iconNames = useMemo(() => getIconNames({ namingScheme, name }), [namingScheme, name]); const prefersMaterialIcons = materialIcon?.type === 'MaterialIcons'; const prefersMaterialCommunityIcons = materialIcon?.type === 'MaterialCommunityIcons'; diff --git a/apps/expo/components/Icon/get-icon-names.ts b/apps/expo/components/Icon/get-icon-names.ts index 782683d6b1..a67f2cac99 100644 --- a/apps/expo/components/Icon/get-icon-names.ts +++ b/apps/expo/components/Icon/get-icon-names.ts @@ -12,7 +12,13 @@ type IconMapping = { materialCommunityIcon: MaterialCommunityIconsProps['name'] | null; }; -export function getIconNames(namingScheme: 'sfSymbol' | 'material', name?: string): IconMapping { +export function getIconNames({ + namingScheme, + name, +}: { + namingScheme: 'sfSymbol' | 'material'; + name?: string; +}): IconMapping { if (!name) { return { sfSymbol: null, diff --git a/apps/expo/components/SearchInput.tsx b/apps/expo/components/SearchInput.tsx index a0eda25565..37fded10c8 100644 --- a/apps/expo/components/SearchInput.tsx +++ b/apps/expo/components/SearchInput.tsx @@ -15,7 +15,7 @@ export const SearchInput = forwardRef< const searchInputRef = useRef>(null); // Apply keyboard hide blur fix - useKeyboardHideBlur(asNonNullableRef(searchInputRef)); + useKeyboardHideBlur({ textInputRef: asNonNullableRef(searchInputRef) }); // Forward ref methods to the internal ref useImperativeHandle(ref, () => { diff --git a/apps/expo/components/TextInput.tsx b/apps/expo/components/TextInput.tsx index 8dd0219ed2..12285a5bc1 100644 --- a/apps/expo/components/TextInput.tsx +++ b/apps/expo/components/TextInput.tsx @@ -12,7 +12,7 @@ export const TextInput = forwardRef((props, ref) => const textInputRef = useRef(null); // Apply keyboard hide blur fix - useKeyboardHideBlur(asNonNullableRef(textInputRef)); + useKeyboardHideBlur({ textInputRef: asNonNullableRef(textInputRef) }); // Forward ref methods to the internal ref useImperativeHandle(ref, () => { diff --git a/apps/expo/components/initial/ErrorBoundary.tsx b/apps/expo/components/initial/ErrorBoundary.tsx index 9f9f893418..28b5003ace 100644 --- a/apps/expo/components/initial/ErrorBoundary.tsx +++ b/apps/expo/components/initial/ErrorBoundary.tsx @@ -49,24 +49,20 @@ const DefaultFallback = () => { }; export function ErrorBoundary({ children, fallback, onReset, onError }: ErrorBoundaryProps) { - const handleError = (error: unknown, info: { componentStack: string }) => { - // Log the error to your preferred logging service - console.error('Error caught by ErrorBoundary:', error); - console.error('Component stack:', info.componentStack); - - // Call the custom error handler if provided - if (onError) { - onError(error, info); - } - }; - return ( - handleError(error, { componentStack: componentStack || '' }) - } + beforeCapture={(scope) => { + scope.setTag('error_source', 'error_boundary'); + }} + onError={(error: unknown, componentStack: ErrorInfo['componentStack']) => { + console.error('Error caught by ErrorBoundary:', error); + console.error('Component stack:', componentStack); + if (onError) { + onError(error, { componentStack: componentStack || '' }); + } + }} > {children} diff --git a/apps/expo/components/initial/UserAvatar.tsx b/apps/expo/components/initial/UserAvatar.tsx index 6c4dc8ce57..3991d18e16 100644 --- a/apps/expo/components/initial/UserAvatar.tsx +++ b/apps/expo/components/initial/UserAvatar.tsx @@ -1,8 +1,8 @@ -import type { User } from 'expo-app/types'; -import { Image, Platform, Text, View } from 'react-native'; +import type { MockUser } from 'expo-app/data/mockData'; +import { Image, Text, View } from 'react-native'; type UserAvatarProps = { - user: User; + user: Pick; size?: 'sm' | 'md' | 'lg'; showName?: boolean; }; @@ -20,16 +20,13 @@ export function UserAvatar({ user, size = 'md', showName = false }: UserAvatarPr lg: 'text-base', }[size]; + const avatarUri = user.avatarUrl || null; + return ( - {user.avatar ? ( - + {avatarUri ? ( + ) : ( {user.name.substring(0, 2).toUpperCase()} diff --git a/apps/expo/components/initial/WeightBadge.tsx b/apps/expo/components/initial/WeightBadge.tsx index 83c5326a36..d4cd1c2d17 100644 --- a/apps/expo/components/initial/WeightBadge.tsx +++ b/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'; @@ -32,7 +32,7 @@ export function WeightBadge({ const safeWeight = Number(weight) || 0; const safeUnit = isString(unit) ? unit : 'g'; - const formattedWeight = formatWeight(safeWeight, safeUnit); + const formattedWeight = formatWeight({ weight: safeWeight, unit: safeUnit }); return ( diff --git a/apps/expo/data/mockData.ts b/apps/expo/data/mockData.ts index f39d3619e8..1dcd6fff43 100644 --- a/apps/expo/data/mockData.ts +++ b/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.', diff --git a/apps/expo/eas.json b/apps/expo/eas.json index 38175655af..3ee33efd87 100644 --- a/apps/expo/eas.json +++ b/apps/expo/eas.json @@ -7,17 +7,26 @@ "development": { "developmentClient": true, "distribution": "internal", - "channel": "development" + "channel": "development", + "env": { + "APP_VARIANT": "development" + } }, "preview": { "distribution": "internal", "autoIncrement": true, - "channel": "preview" + "channel": "preview", + "env": { + "APP_VARIANT": "preview" + } }, "e2e": { "environment": "preview", "distribution": "internal", "channel": "preview", + "env": { + "APP_VARIANT": "preview" + }, "ios": { "simulator": true }, @@ -34,7 +43,10 @@ }, "production": { "autoIncrement": true, - "channel": "production" + "channel": "production", + "env": { + "APP_VARIANT": "production" + } } }, "submit": { diff --git a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts b/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts index 2e6c304fac..a19e6b7b47 100644 --- a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts +++ b/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts @@ -21,7 +21,7 @@ export function useGeneratePacks() { const generatedPacksFromStore = use$(() => { if (mutation.data) { - return mutation.data.map((pack) => obs(packsStore, pack.id).get()); + return mutation.data.map((pack) => obs({ store: packsStore, id: pack.id }).get()); } return []; }); diff --git a/apps/expo/features/ai/atoms/aiModeAtoms.ts b/apps/expo/features/ai/atoms/aiModeAtoms.ts index dac4395bcd..ac94dc2feb 100644 --- a/apps/expo/features/ai/atoms/aiModeAtoms.ts +++ b/apps/expo/features/ai/atoms/aiModeAtoms.ts @@ -5,7 +5,7 @@ export type AIMode = 'cloud' | 'local'; export type ModelStatus = 'idle' | 'checking' | 'downloading' | 'preparing' | 'ready' | 'error'; /** Persisted user preference for cloud vs local inference */ -export const aiModeAtom = atomWithAsyncStorage('ai:mode', 'cloud'); +export const aiModeAtom = atomWithAsyncStorage({ key: 'ai:mode', initialValue: 'cloud' }); /** Current status of the local model */ export const localModelStatusAtom = atom('idle'); diff --git a/apps/expo/features/ai/atoms/chatStorageAtoms.ts b/apps/expo/features/ai/atoms/chatStorageAtoms.ts index 2c25cac0e8..7c9a90a856 100644 --- a/apps/expo/features/ai/atoms/chatStorageAtoms.ts +++ b/apps/expo/features/ai/atoms/chatStorageAtoms.ts @@ -82,7 +82,13 @@ export async function loadChatMessages(context: ChatContext): Promise { +export async function saveChatMessages({ + context, + messages, +}: { + context: ChatContext; + messages: UIMessage[]; +}): Promise { try { const key = getChatStorageKey(context); await AsyncStorage.setItem(key, JSON.stringify(messages)); diff --git a/apps/expo/features/ai/components/AIModeSelector.tsx b/apps/expo/features/ai/components/AIModeSelector.tsx index 5a4b819280..c0546ed62c 100644 --- a/apps/expo/features/ai/components/AIModeSelector.tsx +++ b/apps/expo/features/ai/components/AIModeSelector.tsx @@ -6,7 +6,7 @@ import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { useAtomValue } from 'jotai'; import * as React from 'react'; -import { TouchableOpacity } from 'react-native'; +import { Keyboard, TouchableOpacity } from 'react-native'; import { aiModeAtom, localModelStatusAtom } from '../atoms/aiModeAtoms'; import { AIModeSheet } from './AIModeSheet'; @@ -26,7 +26,10 @@ export function AIModeSelector() { return ( <> sheetRef.current?.present()} + onPress={() => { + Keyboard.dismiss(); + sheetRef.current?.present(); + }} className="flex-row items-center gap-1" hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }} > diff --git a/apps/expo/features/ai/components/AIModeSheet.tsx b/apps/expo/features/ai/components/AIModeSheet.tsx index 44cf9ce611..71027f78f6 100644 --- a/apps/expo/features/ai/components/AIModeSheet.tsx +++ b/apps/expo/features/ai/components/AIModeSheet.tsx @@ -21,6 +21,7 @@ import { cancelLocalModelDownload, downloadLocalModel, isAppleIntelligenceAvailable, + isSlowInferenceDevice, } from '../lib/localModelManager'; import { CircularDownloadButton } from './CircularDownloadButton'; @@ -37,6 +38,7 @@ export const AIModeSheet = React.forwardRef( const isModelFileAvailable = useAtomValue(localModelFileAvailableAtom); const isApple = isAppleIntelligenceAvailable(); + const showSlowDeviceWarning = mode === 'local' && !isApple && isSlowInferenceDevice(); const isModelReady = modelStatus === 'ready'; const isDownloading = modelStatus === 'downloading'; const isPreparing = modelStatus === 'preparing' || modelStatus === 'checking'; @@ -56,7 +58,9 @@ export const AIModeSheet = React.forwardRef( return; } setMode(selected); - if (ref && !isFunction(ref)) ref.current?.close(); + // For cloud mode close immediately; for local mode keep the sheet open + // so the user can see the performance warning before dismissing. + if (selected === 'cloud' && ref && !isFunction(ref)) ref.current?.close(); }; const handleDownload = () => { @@ -179,6 +183,15 @@ export const AIModeSheet = React.forwardRef( /> ) : null} + {/* Performance note for llama (non-Apple) devices */} + {showSlowDeviceWarning && ( + + + + {t('ai.localInferenceSlowNote')} + + + )} ); diff --git a/apps/expo/features/ai/components/ErrorState.tsx b/apps/expo/features/ai/components/ErrorState.tsx index b23e4d6049..3fcaaeaf21 100644 --- a/apps/expo/features/ai/components/ErrorState.tsx +++ b/apps/expo/features/ai/components/ErrorState.tsx @@ -7,14 +7,52 @@ import { Pressable, View } from 'react-native'; interface ErrorStateProps { error?: Error; onRetry: () => void; + onClear?: () => void; } -export function ErrorState({ error, onRetry }: ErrorStateProps) { +const CONTEXT_OVERFLOW_PATTERNS = ['Context is full', 'Context limit reached']; + +function isContextOverflow(error: Error): boolean { + return CONTEXT_OVERFLOW_PATTERNS.some((pattern) => error.message.includes(pattern)); +} + +export function ErrorState({ error, onRetry, onClear }: ErrorStateProps) { const { colors } = useColorScheme(); const { t } = useTranslation(); if (!error) return null; + if (isContextOverflow(error)) { + return ( + + + + + + {t('errors.contextOverflow.title')} + + + + {t('errors.contextOverflow.description')} + + + {t('errors.contextOverflow.hint')} + + {onClear && ( + + + {t('errors.contextOverflow.clearChat')} + + + )} + + + ); + } + return ( diff --git a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx b/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx index a8d2f0858f..365e088672 100644 --- a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx +++ b/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx @@ -1,5 +1,5 @@ +import { Text, useColorScheme } from '@packrat/ui/nativewindui'; import { Icon } from 'expo-app/components/Icon'; -import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { useRef, useState } from 'react'; import { @@ -8,7 +8,6 @@ import { type NativeScrollEvent, type NativeSyntheticEvent, ScrollView, - Text, TouchableOpacity, View, } from 'react-native'; @@ -81,7 +80,7 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP .join(' '); }; - const truncateText = (text: string, maxLength = 120) => { + const truncateText = ({ text, maxLength = 120 }: { text: string; maxLength?: number }) => { if (text.length <= maxLength) return text; return `${text.substring(0, maxLength).trim()}...`; }; @@ -95,9 +94,9 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP }; const getRelevanceColor = (score: number) => { - if (score >= 0.7) return 'text-green-600'; - if (score >= 0.5) return 'text-yellow-600'; - return 'text-gray-500'; + if (score >= 0.7) return 'text-green-600 dark:text-green-400'; + if (score >= 0.5) return 'text-yellow-600 dark:text-yellow-400'; + return 'text-gray-500 dark:text-gray-400'; }; const getRelevanceText = (score: number) => { @@ -107,9 +106,11 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP }; const getRelevanceBadgeColor = (score: number) => { - if (score >= 0.7) return 'bg-green-100 border-green-200'; - if (score >= 0.5) return 'bg-yellow-100 border-yellow-200'; - return 'bg-gray-100 border-gray-200'; + if (score >= 0.7) + return 'bg-green-100 dark:bg-green-900/30 border-green-200 dark:border-green-700'; + if (score >= 0.5) + return 'bg-yellow-100 dark:bg-yellow-900/30 border-yellow-200 dark:border-yellow-700'; + return 'bg-gray-100 dark:bg-gray-700 border-gray-200 dark:border-gray-600'; }; const handleScroll = (event: NativeSyntheticEvent) => { @@ -145,11 +146,11 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP - + {t('ai.tools.guideSearchResults')} - + {t('ai.tools.foundGuides', { count: toolInvocation.output.data.data.length, query: toolInvocation.input.query, @@ -182,7 +183,7 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP width: CARD_WIDTH, marginRight: CARD_SPACING, }} - className="rounded-2xl border border-gray-200 bg-white p-4 shadow-sm active:scale-[0.98]" + className="rounded-2xl border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 p-4 shadow-sm active:scale-[0.98]" > {/* Relevance Badge */} @@ -201,7 +202,7 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP {/* Guide Title */} {formatGuideTitle(guide.filename)} @@ -209,8 +210,11 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP {/* Content Preview */} {guide.content[0] && ( - - {truncateText(guide.content[0].text.trim())} + + {truncateText({ text: guide.content[0].text.trim() })} )} @@ -218,10 +222,12 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP - {t('ai.tools.packratGuides')} + + {t('ai.tools.packratGuides')} + - + {t('ai.tools.readMore')} @@ -239,7 +245,9 @@ export function GuidesRAGGenerativeUI({ toolInvocation }: GuidesRAGGenerativeUIP key={item.file_id} onPress={() => scrollToIndex(index)} className={`h-2 rounded-full transition-all duration-200 ${ - index === currentIndex ? 'w-6 bg-blue-600' : 'w-2 bg-gray-300' + index === currentIndex + ? 'w-6 bg-blue-600 dark:bg-blue-400' + : 'w-2 bg-gray-300 dark:bg-gray-600' }`} activeOpacity={0.7} /> diff --git a/apps/expo/features/ai/components/LocationContext.tsx b/apps/expo/features/ai/components/LocationContext.tsx index 0dc79f0cc7..ece2f75b28 100644 --- a/apps/expo/features/ai/components/LocationContext.tsx +++ b/apps/expo/features/ai/components/LocationContext.tsx @@ -19,7 +19,7 @@ export function LocationContext({ location, onSetLocation }: LocationContextProp if (!location) { return ( - + router.push('/weather')} className="bg-muted/30 flex-row items-center gap-2 rounded-full px-3 py-2" @@ -34,7 +34,7 @@ export function LocationContext({ location, onSetLocation }: LocationContextProp return ( <> - + setShowLocationPicker(true)} className="bg-muted/30 flex-row items-center gap-2 rounded-full px-3 py-2" diff --git a/apps/expo/features/ai/components/ToolInvocationRenderer.tsx b/apps/expo/features/ai/components/ToolInvocationRenderer.tsx index ae4746c610..e3b8630816 100644 --- a/apps/expo/features/ai/components/ToolInvocationRenderer.tsx +++ b/apps/expo/features/ai/components/ToolInvocationRenderer.tsx @@ -1,3 +1,4 @@ +import { isString } from '@packrat/guards'; import type { ToolUIPart } from 'ai'; import type { CatalogItemsTool } from './CatalogItemsGenerativeUI'; import { CatalogItemsGenerativeUI } from './CatalogItemsGenerativeUI'; @@ -17,29 +18,36 @@ interface ToolInvocationRendererProps { } export function ToolInvocationRenderer({ toolInvocation }: ToolInvocationRendererProps) { + // On-device AI models may serialize tool output as a JSON string instead of a parsed object. + // Normalize it here once so all GenUI components receive a plain object. + const normalizedInvocation = + toolInvocation.state === 'output-available' && isString(toolInvocation.output) + ? { ...toolInvocation, output: JSON.parse(toolInvocation.output) } + : toolInvocation; + // safe-cast: each case branch narrows toolInvocation.type to the discriminant literal; the // local tool types (WebSearchTool, etc.) extend ToolUIPart with that exact `type` field, so // the cast is verified by the switch guard above each arm. - switch (toolInvocation.type) { + switch (normalizedInvocation.type) { case 'tool-webSearchTool': // safe-cast: case guard narrows type to discriminant; local tool types extend ToolUIPart with that exact `type` field - return ; + return ; case 'tool-getWeatherForLocation': // safe-cast: case guard narrows type to discriminant literal - return ; + return ; case 'tool-getCatalogItems': case 'tool-catalogVectorSearch': // safe-cast: case guard narrows type to discriminant literal - return ; + return ; case 'tool-searchPackratOutdoorGuidesRAG': // safe-cast: case guard narrows type to discriminant literal - return ; + return ; case 'tool-getPackDetails': // safe-cast: case guard narrows type to discriminant literal - return ; + return ; case 'tool-getPackItemDetails': // safe-cast: case guard narrows type to discriminant literal - return ; + return ; default: return null; } diff --git a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx b/apps/expo/features/ai/components/WeatherGenerativeUI.tsx index 210988a136..477d8360da 100644 --- a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx +++ b/apps/expo/features/ai/components/WeatherGenerativeUI.tsx @@ -12,11 +12,15 @@ type WeatherToolOutput = | { success: true; data: { - location: string; + name: string; temperature: number; - conditions: string; - humidity: number; - windSpeed: number; + condition: string; + details: { + humidity: number; + windSpeed: number; + feelsLike: number; + isDay: number; + }; }; } | { @@ -124,7 +128,7 @@ export function WeatherGenerativeUI({ toolInvocation }: WeatherGenerativeUIProps {t('ai.tools.weatherIn', { - location: toolInvocation.output.data.location, + location: toolInvocation.output.data.name, })} @@ -135,7 +139,10 @@ export function WeatherGenerativeUI({ toolInvocation }: WeatherGenerativeUIProps @@ -146,7 +153,7 @@ export function WeatherGenerativeUI({ toolInvocation }: WeatherGenerativeUIProps {toolInvocation.output.data.temperature}° - {toolInvocation.output.data.conditions} + {toolInvocation.output.data.condition} @@ -163,7 +170,7 @@ export function WeatherGenerativeUI({ toolInvocation }: WeatherGenerativeUIProps - {toolInvocation.output.data.humidity}% + {toolInvocation.output.data.details.humidity}% @@ -177,7 +184,7 @@ export function WeatherGenerativeUI({ toolInvocation }: WeatherGenerativeUIProps - {toolInvocation.output.data.windSpeed} mph + {toolInvocation.output.data.details.windSpeed} mph diff --git a/apps/expo/features/ai/lib/CustomChatTransport.ts b/apps/expo/features/ai/lib/CustomChatTransport.ts index 8bc8bb7bf0..de0392d0c1 100644 --- a/apps/expo/features/ai/lib/CustomChatTransport.ts +++ b/apps/expo/features/ai/lib/CustomChatTransport.ts @@ -5,6 +5,7 @@ import { type ChatTransport, convertToModelMessages, type LanguageModel, + stepCountIs, streamText, type ToolSet, type UIMessageChunk, @@ -13,10 +14,16 @@ import { export class CustomChatTransport implements ChatTransport { private model: LanguageModel | undefined; private tools: ToolSet | undefined; + private systemPrompt: string | undefined; - constructor(model?: LanguageModel, tools?: ToolSet) { + constructor({ + model, + tools, + systemPrompt, + }: { model?: LanguageModel; tools?: ToolSet; systemPrompt?: string } = {}) { this.model = model; this.tools = tools; + this.systemPrompt = systemPrompt; } setModel(model: LanguageModel) { @@ -41,6 +48,8 @@ export class CustomChatTransport implements ChatTransport { model: this.model, messages: await convertToModelMessages(options.messages), abortSignal: options.abortSignal, + stopWhen: stepCountIs(5), + ...(this.systemPrompt ? { system: this.systemPrompt } : {}), ...(this.tools ? { tools: this.tools, toolChoice: 'auto' } : {}), }); diff --git a/apps/expo/features/ai/lib/appleModelWrapper.ts b/apps/expo/features/ai/lib/appleModelWrapper.ts new file mode 100644 index 0000000000..842cb1ddfd --- /dev/null +++ b/apps/expo/features/ai/lib/appleModelWrapper.ts @@ -0,0 +1,129 @@ +/** + * Wraps the Apple Foundation Model to fix two defects in its doStream: + * + * 1. **"null" artifact** – Apple's native streaming layer emits `data.content = "null"` + * (the JSON-serialised tool result) on the first update after a tool call fires. + * The accumulative-delta code (`content.slice(previousContent.length)`) then + * enqueues "null" as a visible text-delta before the real response arrives. + * + * 2. **Missing tool parts** – doStream only emits text-* events; it never emits + * `tool-call` or `tool-result` stream parts, so GenUI components never render. + * + * Root cause: the Apple provider's `doStream` ignores tool execution in the stream + * even though `doGenerate` correctly returns `tool-call` / `tool-result` content parts + * (with `providerExecuted: true`). + * + * Fix: override `doStream` to call `doGenerate` and synthesise a proper + * `ReadableStream` from its result, including matched + * tool-call / tool-result pairs so that streamText + toUIMessageStream can emit + * ToolUIParts for GenUI rendering. + * + * Trade-off: the Apple model response arrives all-at-once instead of + * character-by-character. On-device latency is low enough that this is acceptable + * while the upstream provider bug is unresolved. + */ + +import { isString } from '@packrat/guards'; + +// biome-ignore lint/suspicious/noExplicitAny: Apple model type is unknown at this layer +type AnyModel = any; + +let _counter = 0; +function makeId(): string { + _counter += 1; + return `atc_${_counter}_${Math.random().toString(36).slice(2, 8)}`; +} + +export class AppleModelWrapper { + readonly specificationVersion = 'v2' as const; + readonly provider: string; + readonly modelId: string; + readonly supportedUrls: Record; + + constructor(private readonly inner: AnyModel) { + this.provider = inner.provider; + this.modelId = inner.modelId; + this.supportedUrls = inner.supportedUrls ?? {}; + } + + doGenerate(options: AnyModel): Promise { + return this.inner.doGenerate(options); + } + + /** + * Calls `doGenerate` and converts its result into a properly-shaped + * `LanguageModelV2StreamPart` stream. This sidesteps both defects: + * + * - No more "null" delta: we never touch the native streaming path. + * - Tool parts are emitted: doGenerate gives us the full content array + * including tool-call / tool-result pairs. + */ + async doStream(options: AnyModel): Promise { + const result = await this.inner.doGenerate(options); + + // Apple's native bridge inserts a spurious text part with the literal string + // "null" immediately before tool-call parts (a serialization artifact from the + // native tool-execution layer). Strip it when tool calls are present. + const hasToolCalls = result.content.some((p: AnyModel) => p.type === 'tool-call'); + const content: AnyModel[] = hasToolCalls + ? result.content.filter((p: AnyModel) => !(p.type === 'text' && p.text?.trim() === 'null')) + : result.content; + + // Pre-assign IDs so every tool-call/tool-result pair shares the same ID. + // Apple returns them in order: [tool-call₁, tool-result₁, tool-call₂, …, text] + const toolCallIds: string[] = []; + for (const part of content) { + if (part.type === 'tool-call') { + toolCallIds.push(makeId()); + } + } + + const stream = new ReadableStream({ + start(controller) { + let callIdx = 0; + let resultIdx = 0; + + for (const part of content) { + if (part.type === 'text' && part.text) { + const id = makeId(); + controller.enqueue({ type: 'text-start', id }); + controller.enqueue({ type: 'text-delta', id, delta: part.text }); + controller.enqueue({ type: 'text-end', id }); + } else if (part.type === 'tool-call') { + const toolCallId = toolCallIds[callIdx++] ?? makeId(); + controller.enqueue({ + type: 'tool-call', + toolCallId, + toolName: part.toolName, + // Apple may return input as an object; the spec requires a JSON string + input: isString(part.input) ? part.input : JSON.stringify(part.input), + providerExecuted: true, + }); + } else if (part.type === 'tool-result') { + const toolCallId = toolCallIds[resultIdx++] ?? makeId(); + controller.enqueue({ + type: 'tool-result', + toolCallId, + toolName: part.toolName, + result: part.result, + providerExecuted: true, + }); + } + } + + controller.enqueue({ + type: 'finish', + finishReason: result.finishReason ?? 'stop', + usage: result.usage ?? { inputTokens: 0, outputTokens: 0, totalTokens: 0 }, + }); + + controller.close(); + }, + }); + + return { + stream, + rawCall: { rawPrompt: options.prompt, rawSettings: {} }, + }; + } +} diff --git a/apps/expo/features/ai/lib/constants.ts b/apps/expo/features/ai/lib/constants.ts index ce4d1fe96b..ed5df01aa8 100644 --- a/apps/expo/features/ai/lib/constants.ts +++ b/apps/expo/features/ai/lib/constants.ts @@ -1,3 +1,3 @@ -export const LLAMA_MODEL_ID = 'ggml-org/SmolLM3-3B-GGUF/SmolLM3-Q4_K_M.gguf'; -export const LLAMA_MODEL_SIZE = '~1.8 GB'; -export const LLAMA_MODEL_SIZE_BYTES = 1915305312; +export const LLAMA_MODEL_ID = 'Qwen/Qwen2.5-3B-Instruct-GGUF/qwen2.5-3b-instruct-q3_k_m.gguf'; +export const LLAMA_MODEL_SIZE = '~1.7 GB'; +export const LLAMA_MODEL_SIZE_BYTES = 1_724_178_848; diff --git a/apps/expo/features/ai/lib/llamaToolsWrapper.ts b/apps/expo/features/ai/lib/llamaToolsWrapper.ts new file mode 100644 index 0000000000..28f9a8ca4a --- /dev/null +++ b/apps/expo/features/ai/lib/llamaToolsWrapper.ts @@ -0,0 +1,231 @@ +/** + * Wraps LlamaLanguageModel to add proper tool calling support. + * + * @react-native-ai/llama v0.10.0 implements the AI SDK LanguageModelV2 + * interface but its doStream/doGenerate completely ignore options.tools — + * they never reach llama.rn's context.completion(). This wrapper fixes + * that by calling context.completion() directly with the tools and + * message format that llama.rn actually expects. + * + * Note: we avoid importing from the root @ai-sdk/provider because there + * are two installed versions (root + ai/node_modules) and they are not + * assignable to each other in TypeScript even though they're identical at + * runtime. We use inline structural types instead. + */ + +import { generateId } from '@ai-sdk/provider-utils'; +import { isString } from '@packrat/guards'; +import type { LlamaLanguageModel } from '@react-native-ai/llama'; + +// Minimal structural slice of LanguageModelV2CallOptions we need +type Prompt = ReadonlyArray<{ + role: string; + // biome-ignore lint/suspicious/noExplicitAny: mirrors AI SDK union + content: any; + providerOptions?: unknown; +}>; + +type ToolDef = { + type: 'function'; + name: string; + description?: string; + // biome-ignore lint/suspicious/noExplicitAny: JSON schema + inputSchema: any; +}; + +type CallOptions = { + prompt: Prompt; + tools?: ToolDef[] | readonly ToolDef[]; + temperature?: number; + maxOutputTokens?: number; + topP?: number; + topK?: number; +}; + +// llama.rn OAI-compatible message extended with tool calling fields +// that the model's Jinja template understands. +type LlamaMessage = { + role: string; + content?: string; + // biome-ignore lint/suspicious/noExplicitAny: passed through to Jinja template as-is + tool_calls?: any[]; + tool_call_id?: string; + name?: string; +}; + +// biome-ignore lint/suspicious/noExplicitAny: mirrors AI SDK ToolResultOutput union +function toolResultOutputToString(output: any): string { + if (!output) return ''; + if (isString(output)) return output; + switch (output.type) { + case 'text': + case 'error-text': + return String(output.value ?? ''); + case 'json': + case 'error-json': + return JSON.stringify(output.value); + case 'content': + return (output.value ?? []) + .map((p: { type: string; text?: string }) => (p.type === 'text' ? (p.text ?? '') : '')) + .join(''); + default: + return JSON.stringify(output); + } +} + +function convertPromptToLlamaMessages(prompt: Prompt): LlamaMessage[] { + const out: LlamaMessage[] = []; + + for (const msg of prompt) { + if (msg.role === 'system') { + out.push({ role: 'system', content: String(msg.content ?? '') }); + continue; + } + + if (msg.role === 'user') { + const parts: { type: string; text?: string }[] = Array.isArray(msg.content) + ? msg.content + : []; + const text = parts + .filter((p) => p.type === 'text') + .map((p) => p.text ?? '') + .join(''); + out.push({ role: 'user', content: text }); + continue; + } + + if (msg.role === 'assistant') { + const parts: { + type: string; + text?: string; + toolCallId?: string; + toolName?: string; + input?: unknown; + }[] = Array.isArray(msg.content) ? msg.content : []; + const textParts = parts.filter((p) => p.type === 'text'); + const callParts = parts.filter((p) => p.type === 'tool-call'); + + if (callParts.length > 0) { + out.push({ + role: 'assistant', + content: textParts.map((p) => p.text ?? '').join(''), + tool_calls: callParts.map((p) => ({ + type: 'function', + id: p.toolCallId, + function: { + name: p.toolName, + arguments: isString(p.input) ? p.input : JSON.stringify(p.input), + }, + })), + }); + } else { + out.push({ role: 'assistant', content: textParts.map((p) => p.text ?? '').join('') }); + } + continue; + } + + if (msg.role === 'tool') { + const parts: { type: string; toolCallId: string; toolName: string; output: unknown }[] = + Array.isArray(msg.content) ? msg.content : []; + for (const part of parts) { + if (part.type !== 'tool-result') continue; + out.push({ + role: 'tool', + tool_call_id: part.toolCallId, + name: part.toolName, + content: toolResultOutputToString(part.output), + }); + } + } + } + + return out; +} + +function convertTools(tools: CallOptions['tools']): object[] | undefined { + if (!tools?.length) return undefined; + const fns = [...tools].filter((t) => t.type === 'function'); + if (!fns.length) return undefined; + return fns.map((t) => ({ + type: 'function', + function: { name: t.name, description: t.description, parameters: t.inputSchema }, + })); +} + +export class LlamaToolsWrapper { + readonly specificationVersion = 'v2' as const; + readonly supportedUrls = {}; + readonly provider = 'llama'; + + constructor(private readonly inner: LlamaLanguageModel) {} + + get modelId() { + return this.inner.modelId; + } + + async doGenerate(_options: CallOptions): Promise { + throw new Error('LlamaToolsWrapper.doGenerate not implemented'); + } + + async doStream(options: CallOptions): Promise<{ stream: ReadableStream }> { + const context = this.inner.getContext(); + if (!context) throw new Error('Llama model not prepared. Call prepare() first.'); + + const messages = convertPromptToLlamaMessages(options.prompt); + const llamaTools = convertTools(options.tools); + + const stream = new ReadableStream({ + start: async (controller) => { + try { + controller.enqueue({ type: 'stream-start', warnings: [] }); + + const result = await context.completion({ + messages: messages as Parameters[0]['messages'], + tools: llamaTools, + tool_choice: llamaTools ? 'auto' : undefined, + temperature: options.temperature, + n_predict: options.maxOutputTokens, + top_p: options.topP, + top_k: options.topK, + }); + + const usage = { + inputTokens: result.timings?.prompt_n ?? 0, + outputTokens: result.timings?.predicted_n ?? 0, + totalTokens: (result.timings?.prompt_n ?? 0) + (result.timings?.predicted_n ?? 0), + }; + + if (result.tool_calls?.length) { + for (const call of result.tool_calls) { + controller.enqueue({ + type: 'tool-call', + toolCallId: call.id ?? generateId(), + toolName: call.function.name, + input: call.function.arguments, + }); + } + controller.enqueue({ type: 'finish', finishReason: 'tool-calls', usage }); + } else { + const textId = generateId(); + const text = result.content || result.text || ''; + controller.enqueue({ type: 'text-start', id: textId }); + controller.enqueue({ type: 'text-delta', id: textId, delta: text }); + controller.enqueue({ type: 'text-end', id: textId }); + controller.enqueue({ type: 'finish', finishReason: 'stop', usage }); + } + + controller.close(); + } catch (error) { + try { + controller.enqueue({ type: 'error', error }); + controller.close(); + } catch { + // controller already closed + } + } + }, + }); + + return { stream }; + } +} diff --git a/apps/expo/features/ai/lib/localModelManager.ts b/apps/expo/features/ai/lib/localModelManager.ts index a72ca60236..adfa5b824e 100644 --- a/apps/expo/features/ai/lib/localModelManager.ts +++ b/apps/expo/features/ai/lib/localModelManager.ts @@ -2,15 +2,19 @@ * Singleton manager for the on-device AI model. * * - On iOS 26+: uses @react-native-ai/apple (Apple Foundation Models, no download needed) - * - On other devices: uses @react-native-ai/llama with SmolLM3-3B-GGUF + * - On other devices: uses @react-native-ai/llama with Qwen2.5-3B-Instruct Q3_K_M * * Updates Jotai atoms via the global store so download progress is visible * from any component, even while the bottom sheet is closed. */ import { isString } from '@packrat/guards'; -import { type LlamaLanguageModel, llama } from '@react-native-ai/llama'; +import type { LlamaLanguageModel } from '@react-native-ai/llama'; +import { llama } from '@react-native-ai/llama'; +import * as Sentry from '@sentry/react-native'; +import type { LanguageModel } from 'ai'; import { store } from 'expo-app/atoms/store'; +import { activateKeepAwakeAsync, deactivateKeepAwake } from 'expo-keep-awake'; import { Platform } from 'react-native'; import RNBlobUtil from 'react-native-blob-util'; import { @@ -19,12 +23,14 @@ import { localModelProgressAtom, localModelStatusAtom, } from '../atoms/aiModeAtoms'; - +import { AppleModelWrapper } from './appleModelWrapper'; import { LLAMA_MODEL_ID, LLAMA_MODEL_SIZE_BYTES } from './constants'; +import { LlamaToolsWrapper } from './llamaToolsWrapper'; import { createLocalTools } from './tools'; -const LLAMA_MODEL_FILENAME = 'SmolLM3-Q4_K_M.gguf'; +const LLAMA_MODEL_FILENAME = LLAMA_MODEL_ID.split('/').at(-1) ?? 'model.gguf'; const LLAMA_MODELS_DIR = `${RNBlobUtil.fs.dirs.DocumentDir}/llama-models`; +const KEEP_AWAKE_TAG = 'model-download'; function _getLlamaModelPath(): string { return `${LLAMA_MODELS_DIR}/${LLAMA_MODEL_FILENAME}`; @@ -58,9 +64,12 @@ function getAppleModule() { if (appleModule) return appleModule; try { - appleModule = import('@react-native-ai/apple'); + // require() is synchronous — import() returns a Promise, which breaks + // the synchronous callers (isAppleIntelligenceAvailable, etc.) + appleModule = require('@react-native-ai/apple'); return appleModule; - } catch { + } catch (err) { + console.error('Failed to load Apple module:', err); return null; } } @@ -68,6 +77,7 @@ function getAppleModule() { // ─── Singletons ───────────────────────────────────────────────────────────── let llamaModel: LlamaLanguageModel | null = null; +let llamaModelWrapper: LlamaToolsWrapper | null = null; // biome-ignore lint/suspicious/noExplicitAny: Apple module type unknown let appleModel: any = null; // biome-ignore lint/suspicious/noExplicitAny: download task type unknown @@ -97,10 +107,21 @@ export function isAppleIntelligenceAvailable(): boolean { } } +/** + * Returns true when the device will run local inference via llama (not Apple + * Foundation Models). llama inference speed is highly variable and can be + * noticeably slow on older or memory-constrained hardware, so callers use + * this to surface a heads-up to the user before they start a session. + */ +export function isSlowInferenceDevice(): boolean { + return !isAppleIntelligenceAvailable(); +} + /** Returns the ready model instance, or null if not prepared yet. */ -export function getLocalModel(): LlamaLanguageModel | null { +export function getLocalModel(): LanguageModel | null { if (isAppleIntelligenceAvailable()) return appleModel; - return llamaModel; + // safe-cast: LlamaToolsWrapper is structurally a LanguageModel; double-cast through unknown is required because two incompatible @ai-sdk/provider versions are installed + return llamaModelWrapper as unknown as LanguageModel; } /** Check if the local model file is fully present on disk (existence + size). */ @@ -144,7 +165,7 @@ export async function downloadLocalModel(): Promise { store.set(localModelErrorAtom, null); if (!llamaModel) { - llamaModel = llama.languageModel(LLAMA_MODEL_ID, { n_ctx: 2048, n_gpu_layers: 99 }); + llamaModel = llama.languageModel(LLAMA_MODEL_ID, { n_ctx: 4096, n_gpu_layers: 99 }); } const isAvailable = await _isLlamaModelAvailable(); @@ -159,11 +180,30 @@ export async function downloadLocalModel(): Promise { store.set(localModelStatusAtom, 'downloading'); store.set(localModelProgressAtom, 0); + console.log('[KeepAwake] activating'); + await activateKeepAwakeAsync(KEEP_AWAKE_TAG); + console.log('[KeepAwake] activated, _isCancellingDownload=', _isCancellingDownload); + // Guard against cancel arriving during the activateKeepAwakeAsync await + if (_isCancellingDownload) { + console.log('[KeepAwake] early cancel detected — deactivating'); + deactivateKeepAwake(KEEP_AWAKE_TAG); + return; + } try { const dirExists = await RNBlobUtil.fs.exists(LLAMA_MODELS_DIR); if (!dirExists) { await RNBlobUtil.fs.mkdir(LLAMA_MODELS_DIR); } + Sentry.addBreadcrumb({ + category: 'localModel', + message: 'Model download started', + level: 'info', + data: { + modelId: LLAMA_MODEL_ID, + platform: Platform.OS, + osVersion: String(Platform.Version), + }, + }); activeDownloadTask = RNBlobUtil.config({ path: _getLlamaModelPath(), fileCache: true }).fetch( 'GET', _getLlamaDownloadUrl(), @@ -171,14 +211,35 @@ export async function downloadLocalModel(): Promise { activeDownloadTask.progress((received: number, total: number) => { store.set(localModelProgressAtom, Math.round((Number(received) / Number(total)) * 100)); }); - await activeDownloadTask; + const downloadRes = await activeDownloadTask; activeDownloadTask = null; + const httpStatus = downloadRes.respInfo?.status ?? 0; + console.log('[KeepAwake] download finished, httpStatus=', httpStatus); + if (httpStatus < 200 || httpStatus >= 300) { + await RNBlobUtil.fs.unlink(_getLlamaModelPath()).catch(() => {}); + Sentry.captureException(new Error(`Model download failed: HTTP ${httpStatus}`), { + tags: { feature: 'localModel', action: 'download' }, + extra: { httpStatus, modelId: LLAMA_MODEL_ID, osVersion: String(Platform.Version) }, + }); + store.set(localModelStatusAtom, 'error'); + store.set(localModelErrorAtom, `Download failed: HTTP ${httpStatus}`); + return; + } } catch (err) { activeDownloadTask = null; - if (_isCancellingDownload) return; - store.set(localModelStatusAtom, 'error'); - store.set(localModelErrorAtom, err instanceof Error ? err.message : String(err)); + console.log('[KeepAwake] catch, _isCancellingDownload=', _isCancellingDownload, 'err=', err); + if (!_isCancellingDownload) { + Sentry.captureException(err, { + tags: { feature: 'localModel', action: 'download' }, + extra: { modelId: LLAMA_MODEL_ID, osVersion: String(Platform.Version) }, + }); + store.set(localModelStatusAtom, 'error'); + store.set(localModelErrorAtom, err instanceof Error ? err.message : String(err)); + } return; + } finally { + console.log('[KeepAwake] deactivating (finally)'); + deactivateKeepAwake(KEEP_AWAKE_TAG); } } @@ -187,6 +248,10 @@ export async function downloadLocalModel(): Promise { /** Cancel an in-progress llama model download and reset state to idle. */ export async function cancelLocalModelDownload(): Promise { + console.log( + '[KeepAwake] cancelLocalModelDownload called, activeDownloadTask=', + !!activeDownloadTask, + ); _isCancellingDownload = true; if (activeDownloadTask) { activeDownloadTask.cancel(); @@ -208,6 +273,32 @@ export async function cancelLocalModelDownload(): Promise { _isCancellingDownload = false; } +/** + * Unload the active model from memory without deleting the file. + * Use when backgrounding the app or before hot-reload, so native modules + * are cleanly invalidated. Call `initLocalModel` to reload after. + */ +export async function releaseLocalModel(): Promise { + if (appleModel) { + try { + await appleModel.unload?.(); + } catch { + // ignore + } + appleModel = null; + } + if (llamaModel) { + try { + await llamaModel.unload(); + } catch { + // ignore + } + llamaModel = null; + llamaModelWrapper = null; + } + store.set(localModelStatusAtom, 'idle'); +} + /** Delete the downloaded llama model from disk. */ export async function deleteLocalModel(): Promise { if (llamaModel) { @@ -217,6 +308,7 @@ export async function deleteLocalModel(): Promise { // ignore unload errors } llamaModel = null; + llamaModelWrapper = null; } // Direct filesystem deletion — more reliable than the library's remove() @@ -245,8 +337,11 @@ async function _initAppleModel(): Promise { const mod = await getAppleModule(); if (!mod) throw new Error('Apple module not available'); - appleModel = mod.apple(); - appleModel.updateTools(createLocalTools()); + const apple = mod.createAppleProvider({ + availableTools: createLocalTools(), + }); + + appleModel = new AppleModelWrapper(apple()); store.set(localModelStatusAtom, 'ready'); } catch { store.set(localModelStatusAtom, 'error'); @@ -256,7 +351,7 @@ async function _initAppleModel(): Promise { async function _initLlamaModel(): Promise { if (!llamaModel) { - llamaModel = llama.languageModel(LLAMA_MODEL_ID, { n_ctx: 2048, n_gpu_layers: 99 }); + llamaModel = llama.languageModel(LLAMA_MODEL_ID, { n_ctx: 4096, n_gpu_layers: 99 }); } const isAvailable = await _isLlamaModelAvailable(); store.set(localModelFileAvailableAtom, isAvailable); @@ -270,12 +365,23 @@ async function _initLlamaModel(): Promise { async function _prepareLlamaModel(): Promise { store.set(localModelStatusAtom, 'preparing'); + Sentry.addBreadcrumb({ + category: 'localModel', + message: 'Model prepare started', + level: 'info', + data: { modelId: LLAMA_MODEL_ID, platform: Platform.OS, osVersion: String(Platform.Version) }, + }); try { if (!llamaModel) throw new Error('llamaModel is not initialised'); await llamaModel.prepare(); + llamaModelWrapper = new LlamaToolsWrapper(llamaModel); store.set(localModelFileAvailableAtom, true); store.set(localModelStatusAtom, 'ready'); } catch (err) { + Sentry.captureException(err, { + tags: { feature: 'localModel', action: 'prepare' }, + extra: { modelId: LLAMA_MODEL_ID, osVersion: String(Platform.Version) }, + }); store.set(localModelStatusAtom, 'error'); store.set(localModelErrorAtom, err instanceof Error ? err.message : String(err)); } diff --git a/apps/expo/features/ai/lib/tools.ts b/apps/expo/features/ai/lib/tools.ts index fccb336d7a..b66ff14e22 100644 --- a/apps/expo/features/ai/lib/tools.ts +++ b/apps/expo/features/ai/lib/tools.ts @@ -10,14 +10,36 @@ * through authenticated API endpoints. */ +import { isString } from '@packrat/guards'; import * as Sentry from '@sentry/react-native'; import { tool } from 'ai'; import { getPackItems, packItemsStore } from 'expo-app/features/packs/store/packItems'; import { packsStore } from 'expo-app/features/packs/store/packs'; -import { getWeatherData, searchLocations } from 'expo-app/features/weather/lib/weatherService'; +import { + formatWeatherData, + getWeatherData, + searchLocations, +} from 'expo-app/features/weather/lib/weatherService'; import { apiClient } from 'expo-app/lib/api/packrat'; import { z } from 'zod'; +function trimCatalogItem(item: unknown) { + // safe-cast: items originate from the PackRat API which returns typed JSON objects + const obj = item as Record; + const cats = Array.isArray(obj.categories) ? (obj.categories as string[]).slice(0, 2) : []; + return { + id: obj.id, + name: obj.name, + brand: obj.brand, + weight: obj.weight, + weightUnit: obj.weightUnit, + categories: cats, + price: obj.price, + ratingValue: obj.ratingValue, + description: isString(obj.description) ? obj.description.slice(0, 120) : undefined, + }; +} + export function createLocalTools() { return { getPackDetails: tool({ @@ -116,7 +138,7 @@ export function createLocalTools() { return { success: false, error: `No location found for "${location}"` }; } const weatherData = await getWeatherData(first.id); - return { success: true, data: weatherData }; + return { success: true, data: formatWeatherData(weatherData) }; } catch (error) { return { success: false, @@ -135,12 +157,13 @@ export function createLocalTools() { limit: z .number() .min(1) - .max(50) + .max(10) .optional() - .describe('Number of results to return (default 10)'), + .describe('Number of results to return (default 5, max 10)'), offset: z.number().min(0).optional().describe('Offset for pagination'), }), - execute: async ({ query, category, limit = 10, offset: _offset = 0 }) => { + execute: async ({ query, category, limit = 5, offset: _offset = 0 }) => { + console.log('getCatalogItems called with', { query, category, limit, offset: _offset }); const { data, error } = await apiClient.catalog.get({ query: { page: 1, @@ -152,7 +175,10 @@ export function createLocalTools() { if (error) { return { success: false, error: error.value ?? 'Failed to retrieve catalog items' }; } - return { success: true, data }; + const items = Array.isArray(data) ? data : ((data as { items?: unknown[] })?.items ?? []); + const trimmedItems = items.map((item) => trimCatalogItem(item)); + console.log('getCatalogItems returning', { items: trimmedItems }); + return { success: true, data: { items: trimmedItems } }; }, }), @@ -164,19 +190,23 @@ export function createLocalTools() { limit: z .number() .min(1) - .max(100) + .max(10) .optional() - .describe('Number of results to return (default 10)'), + .describe('Number of results to return (default 5, max 10)'), offset: z.number().min(0).optional().describe('Offset for pagination'), }), - execute: async ({ query, limit = 10, offset = 0 }) => { + execute: async ({ query, limit = 5, offset = 0 }) => { const { data, error } = await apiClient.catalog['vector-search'].get({ query: { q: query, limit, offset }, }); if (error) { return { success: false, error: error.value ?? 'Failed to perform vector search' }; } - return { success: true, data }; + const items = Array.isArray(data) ? data : ((data as { items?: unknown[] })?.items ?? []); + return { + success: true, + data: { items: items.map((item) => trimCatalogItem(item)) }, + }; }, }), diff --git a/apps/expo/features/ai/screens/ReportedContentScreen.tsx b/apps/expo/features/ai/screens/ReportedContentScreen.tsx index b7e98df99d..8c4fc83e94 100644 --- a/apps/expo/features/ai/screens/ReportedContentScreen.tsx +++ b/apps/expo/features/ai/screens/ReportedContentScreen.tsx @@ -26,7 +26,7 @@ export default function ReportedContentScreen() { return item.status === selectedFilter; }); - const handleReview = (id: string, status: 'reviewed' | 'dismissed') => { + const handleReview = ({ id, status }: { id: string; status: 'reviewed' | 'dismissed' }) => { updateMutation.mutate({ id, status }); }; @@ -144,7 +144,7 @@ export default function ReportedContentScreen() { + {t('catalog.selectedPack')} + {pack.name} + + + + {pack.items.length}{' '} + {pack.items.length === 1 ? t('catalog.item') : t('catalog.items')} + + + {pack.category} diff --git a/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx b/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx index 2d164b6859..82c09368ff 100644 --- a/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx +++ b/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx @@ -62,7 +62,7 @@ export function CatalogItemDetailScreen() { } return ( - + + + + {t('catalog.noPacksAvailable')} + + + {t('catalog.createPackMessage')} + + + + ); + return ( - - {catalogItem && ( - - - - - {t('catalog.adding')} - - {catalogItem.name} + + {/* Fixed: search + count label always visible */} + + + {filteredPacks.length > 0 && ( + + {t('catalog.selectPack', { count: filteredPacks.length })} + + )} + + + item.id} + ListEmptyComponent={ + searchQuery.trim() !== '' ? ( + + + {t('catalog.noPacksFound')} - - - - {catalogItem.weight} {catalogItem.weightUnit} - - {catalogItem.brand && ( - <> - - {catalogItem.brand} - - )} - - - - )} - - - - - - - {filteredPacks && filteredPacks.length > 0 ? ( - <> - - {t('catalog.selectPack', { count: filteredPacks.length })} - - item.id} - renderItem={({ item }) => ( - handlePackSelect(item.id)} - activeOpacity={0.7} - > - - - - - {item.name} - - - - - - {item.items?.length}{' '} - {item.items?.length === 1 ? t('catalog.item') : t('catalog.items')} - - - - - - {item.baseWeight?.toFixed(2)} g - - - - - - {item.category} - - - - - + ) : ( + EmptyState + ) + } + renderItem={({ item }) => ( + handlePackSelect(item.id)} + activeOpacity={0.7} + > + + + + + {item.name} + + + + + + {item.items?.length}{' '} + {item.items?.length === 1 ? t('catalog.item') : t('catalog.items')} + + + + + + {item.baseWeight?.toFixed(2)} g + + + + + + {item.category} + - - )} - ListEmptyComponent={ - - - {t('catalog.noPacksFound')} - - } - /> - - ) : ( - - - - {t('catalog.noPacksAvailable')} - - - {t('catalog.createPackMessage')} - - - + + + + )} - + contentContainerStyle={{ paddingBottom: 24 }} + /> ); } diff --git a/apps/expo/features/catalog/types.ts b/apps/expo/features/catalog/types.ts index a00dbdf8e8..8b2e07e5a8 100644 --- a/apps/expo/features/catalog/types.ts +++ b/apps/expo/features/catalog/types.ts @@ -1,4 +1,4 @@ -import type { CatalogItemSchema } from '@packrat/api/schemas/catalog'; +import type { CatalogItemSchema } from '@packrat/schemas/catalog'; import type { z } from 'zod'; import type { PackItemInput } from '../packs/input'; diff --git a/apps/expo/features/feed/components/CommentItem.tsx b/apps/expo/features/feed/components/CommentItem.tsx index b3f29b8629..be7c7f282a 100644 --- a/apps/expo/features/feed/components/CommentItem.tsx +++ b/apps/expo/features/feed/components/CommentItem.tsx @@ -30,7 +30,7 @@ export const CommentItem: React.FC = ({ {formatAuthorName(comment)} - {formatRelativeDate(comment.createdAt)} + {formatRelativeDate({ dateValue: comment.createdAt })} {comment.content} diff --git a/apps/expo/features/feed/components/PostCard.tsx b/apps/expo/features/feed/components/PostCard.tsx index 52388de2ee..d732337f08 100644 --- a/apps/expo/features/feed/components/PostCard.tsx +++ b/apps/expo/features/feed/components/PostCard.tsx @@ -49,7 +49,7 @@ export const PostCard: React.FC = ({ post, onLike, onDelete, curr {formatAuthorName(post)} - {formatRelativeDate(post.createdAt)} + {formatRelativeDate({ dateValue: post.createdAt })} diff --git a/apps/expo/features/feed/screens/CreatePostScreen.tsx b/apps/expo/features/feed/screens/CreatePostScreen.tsx index 68fa39c5e1..4af5c4a6fb 100644 --- a/apps/expo/features/feed/screens/CreatePostScreen.tsx +++ b/apps/expo/features/feed/screens/CreatePostScreen.tsx @@ -97,7 +97,7 @@ export const CreatePostScreen = ({ onSuccess }: { onSuccess?: () => void }) => { ? (photo.fileName.split('.').pop()?.toLowerCase() ?? 'jpg') : 'jpg'; const uniqueName = `${nanoid()}.${ext}`; - return uploadImage(uniqueName, photo.uri); + return uploadImage({ fileName: uniqueName, uri: photo.uri }); }), ); diff --git a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts b/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts index 2ad9cd6e15..eaadc862dc 100644 --- a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts +++ b/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts @@ -11,7 +11,8 @@ vi.mock('@packrat/env/expo-client', () => ({ // Also mock getRelativeTime so that formatRelativeDate has a predictable // alias target that does not depend on the current clock. vi.mock('expo-app/lib/utils/getRelativeTime', () => ({ - getRelativeTime: (input: string | Date) => `relative(${String(input)})`, + getRelativeTime: ({ dateValue }: { dateValue: string | Date }) => + `relative(${String(dateValue)})`, })); import type { Comment, Post } from '../../types'; @@ -116,7 +117,7 @@ describe('feed/utils', () => { // --------------------------------------------------------------------------- describe('formatRelativeDate', () => { it('delegates to getRelativeTime', () => { - expect(formatRelativeDate('2024-01-01T00:00:00.000Z')).toBe( + expect(formatRelativeDate({ dateValue: '2024-01-01T00:00:00.000Z' })).toBe( 'relative(2024-01-01T00:00:00.000Z)', ); }); diff --git a/apps/expo/features/guides/types.ts b/apps/expo/features/guides/types.ts index 7bf619f216..f6ac2a5940 100644 --- a/apps/expo/features/guides/types.ts +++ b/apps/expo/features/guides/types.ts @@ -7,7 +7,7 @@ export interface Guide { description: string; content?: string; author?: string; - readingTime?: string; + readingTime?: number; difficulty?: string; createdAt: string; updatedAt: string; diff --git a/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts b/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts index c2134dca2d..a96a9dac46 100644 --- a/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts +++ b/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts @@ -10,7 +10,7 @@ describe('OfflineAI - MockLLMProvider', () => { describe('generate()', () => { it('should return a basic response for simple prompts', async () => { - const response = await provider.generate('Hello'); + const response = await provider.generate({ _prompt: 'Hello' }); expect(response).toBeDefined(); expect(typeof response).toBe('string'); expect(response.length).toBeGreaterThan(0); @@ -26,7 +26,10 @@ describe('OfflineAI - MockLLMProvider', () => { activity: 'hiking', }; - const response = await provider.generate('What gear do I need for this trail?', { context }); + const response = await provider.generate({ + _prompt: 'What gear do I need for this trail?', + options: { context }, + }); expect(response).toContain('Test Trail'); }); @@ -44,7 +47,10 @@ describe('OfflineAI - MockLLMProvider', () => { activity: 'backpacking', }; - const response = await provider.generate('What should I pack?', { context }); + const response = await provider.generate({ + _prompt: 'What should I pack?', + options: { context }, + }); expect(response).toBeDefined(); // Should mention weather-relevant items @@ -52,7 +58,10 @@ describe('OfflineAI - MockLLMProvider', () => { }); it('should handle empty context gracefully', async () => { - const response = await provider.generate('Hello', { context: undefined }); + const response = await provider.generate({ + _prompt: 'Hello', + options: { context: undefined }, + }); expect(response).toBeDefined(); expect(typeof response).toBe('string'); }); @@ -60,8 +69,11 @@ describe('OfflineAI - MockLLMProvider', () => { it('should accept system prompt without error (not applied in mock)', async () => { // systemPrompt is part of the GenerateOptions interface for real providers; // the MockLLMProvider accepts it but does not use it in response generation. - const response = await provider.generate('Hello', { - systemPrompt: 'You are a helpful hiking assistant.', + const response = await provider.generate({ + _prompt: 'Hello', + options: { + systemPrompt: 'You are a helpful hiking assistant.', + }, }); expect(response).toBeDefined(); @@ -75,7 +87,10 @@ describe('OfflineAI - MockLLMProvider', () => { }, }; - const response = await provider.generate('What do I need?', { context }); + const response = await provider.generate({ + _prompt: 'What do I need?', + options: { context }, + }); expect(response).toContain('Lakeside Camp'); }); @@ -89,7 +104,7 @@ describe('OfflineAI - MockLLMProvider', () => { }, }; - const response = await provider.generate('Compare trails', { context }); + const response = await provider.generate({ _prompt: 'Compare trails', options: { context } }); expect(response).toContain('Test Trail'); }); @@ -104,7 +119,7 @@ describe('OfflineAI - MockLLMProvider', () => { // weather is optional }; - const response = await provider.generate('Hello', { context }); + const response = await provider.generate({ _prompt: 'Hello', options: { context } }); expect(response).toContain('Simple Trail'); }); diff --git a/apps/expo/features/offline-ai/lib/MockLLMProvider.ts b/apps/expo/features/offline-ai/lib/MockLLMProvider.ts index 11b26b361d..bb9334f9f4 100644 --- a/apps/expo/features/offline-ai/lib/MockLLMProvider.ts +++ b/apps/expo/features/offline-ai/lib/MockLLMProvider.ts @@ -25,7 +25,13 @@ export interface GenerateOptions { } export class MockLLMProvider { - async generate(_prompt: string, options?: GenerateOptions): Promise { + async generate({ + _prompt, + options, + }: { + _prompt: string; + options?: GenerateOptions; + }): Promise { const context = options?.context; // If no context provided, return default greeting diff --git a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx b/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx index 6700665c15..2750844418 100644 --- a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx +++ b/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx @@ -120,7 +120,7 @@ export default React.forwardRef { trackRecentlyUsed(catalogItems); - await addItemsToPackTemplate(packTemplateId, catalogItems); + await addItemsToPackTemplate({ packTemplateId, catalogItems }); const itemWord = catalogItems.length === 1 ? t('packTemplates.item') : t('packTemplates.items'); Burnt.toast({ diff --git a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx b/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx index ba0af9e6e5..71bce69524 100644 --- a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx +++ b/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx @@ -109,7 +109,7 @@ export function FeaturedPacksSection({ onTemplatePress }: FeaturedPacksSectionPr // Single pass over the items store computes item count + base weight for all // featured templates at once, instead of each card subscribing to the full // details hook and iterating every item in the store on its own. - const summaries = usePackTemplateSummaries(featuredIds); + const summaries = usePackTemplateSummaries({ templateIds: featuredIds }); if (featuredTemplates.length === 0) return null; diff --git a/apps/expo/features/pack-templates/components/PackTemplateForm.tsx b/apps/expo/features/pack-templates/components/PackTemplateForm.tsx index a52eb54cb3..7d4a6a1168 100644 --- a/apps/expo/features/pack-templates/components/PackTemplateForm.tsx +++ b/apps/expo/features/pack-templates/components/PackTemplateForm.tsx @@ -1,5 +1,5 @@ -import { PackCategorySchema } from '@packrat/api/types'; import { fromZod } from '@packrat/guards'; +import { PackCategorySchema } from '@packrat/schemas/constants'; import { Button, createDropdownItem, diff --git a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts b/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts index ffb1e49686..899146e589 100644 --- a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts +++ b/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts @@ -1,5 +1,5 @@ -import { WeightUnitSchema } from '@packrat/api/types'; import { fromZod } from '@packrat/guards'; +import { WeightUnitSchema } from '@packrat/schemas/constants'; import { cacheCatalogItemImage } from 'expo-app/features/catalog/lib/cacheCatalogItemImage'; import type { CatalogItemWithPackItemFields } from 'expo-app/features/catalog/types'; import { useState } from 'react'; @@ -9,10 +9,13 @@ export function useBulkAddCatalogItems() { const [isLoading, setIsLoading] = useState(false); const createItem = useCreatePackTemplateItem(); - const addItemsToPackTemplate = async ( - packTemplateId: string, - catalogItems: CatalogItemWithPackItemFields[], - ) => { + const addItemsToPackTemplate = async ({ + packTemplateId, + catalogItems, + }: { + packTemplateId: string; + catalogItems: CatalogItemWithPackItemFields[]; + }) => { if (catalogItems.length === 0) return; setIsLoading(true); diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts index ea9fbc9155..041e71298d 100644 --- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts +++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts @@ -17,7 +17,7 @@ export function useCreatePackTemplate() { deleted: false, }; - obs(packTemplatesStore, id).set(newTemplate); + obs({ store: packTemplatesStore, id: id }).set(newTemplate); }, []); return createPackTemplate; diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts index 8e4dd5e963..00d9ea9ea4 100644 --- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts +++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts @@ -19,8 +19,10 @@ export function useCreatePackTemplateItem() { deleted: false, }; - obs(packTemplateItemsStore, id).set(newItem); - obs(packTemplatesStore, packTemplateId).localUpdatedAt.set(new Date().toISOString()); + obs({ store: packTemplateItemsStore, id: id }).set(newItem); + obs({ store: packTemplatesStore, id: packTemplateId }).localUpdatedAt.set( + new Date().toISOString(), + ); }, [], ); diff --git a/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts b/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts index 10c9f1f2ba..f5edb59287 100644 --- a/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts +++ b/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts @@ -4,7 +4,7 @@ import { packTemplatesStore } from '../store/packTemplates'; export function useDeletePackTemplate() { const del = useCallback((id: string) => { - obs(packTemplatesStore, id).deleted.set(true); + obs({ store: packTemplatesStore, id: id }).deleted.set(true); }, []); return del; diff --git a/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts index 8c8d4c0b2c..8a0674124e 100644 --- a/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts +++ b/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts @@ -5,7 +5,7 @@ import { packTemplateItemsStore } from '../store/packTemplateItems'; export function useDeletePackTemplateItem() { const deletePackTemplateItem = useCallback((id: string) => { // Soft delete by setting deleted flag - obs(packTemplateItemsStore, id).deleted.set(true); + obs({ store: packTemplateItemsStore, id: id }).deleted.set(true); return Promise.resolve({ id }); }, []); diff --git a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts b/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts index 4276262235..6190e861ab 100644 --- a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts +++ b/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts @@ -79,7 +79,7 @@ export function useGenerateTemplateFromOnlineContent() { }, onSuccess: (data) => { const { items, ...template } = data; - obs(packTemplatesStore, template.id).set(template); + obs({ store: packTemplatesStore, id: template.id }).set(template); for (const item of items) { if (!isWeightUnit(item.weightUnit)) { throw new Error(`Unsupported weightUnit "${item.weightUnit}" for item ${item.id}`); @@ -103,7 +103,7 @@ export function useGenerateTemplateFromOnlineContent() { createdAt: item.createdAt, updatedAt: item.updatedAt, }; - obs(packTemplateItemsStore, item.id).set(storeItem); + obs({ store: packTemplateItemsStore, id: item.id }).set(storeItem); } }, }); diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts b/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts index 56a92edf6a..3ac9b7f52f 100644 --- a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts +++ b/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts @@ -17,10 +17,13 @@ export type PackTemplateSummary = { * allocations that `usePackTemplateDetails` incurs (which spreads the * template and its items on every change). */ -export function usePackTemplateSummary( - templateId: string, - preferredUnit: WeightUnit = 'g', -): PackTemplateSummary { +export function usePackTemplateSummary({ + templateId, + preferredUnit = 'g', +}: { + templateId: string; + preferredUnit?: WeightUnit; +}): PackTemplateSummary { return use$(() => { let itemCount = 0; let baseWeightGrams = 0; @@ -30,7 +33,8 @@ export function usePackTemplateSummary( for (const item of Object.values(items)) { if (item.packTemplateId !== templateId || item.deleted) continue; itemCount++; - const itemWeightInGrams = convertToGrams(item.weight, item.weightUnit) * item.quantity; + const itemWeightInGrams = + convertToGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity; totalWeightGrams += itemWeightInGrams; if (!item.consumable && !item.worn) { baseWeightGrams += itemWeightInGrams; @@ -39,8 +43,12 @@ export function usePackTemplateSummary( return { itemCount, - baseWeight: Number(convertFromGrams(baseWeightGrams, preferredUnit).toFixed(2)), - totalWeight: Number(convertFromGrams(totalWeightGrams, preferredUnit).toFixed(2)), + baseWeight: Number( + convertFromGrams({ grams: baseWeightGrams, unit: preferredUnit }).toFixed(2), + ), + totalWeight: Number( + convertFromGrams({ grams: totalWeightGrams, unit: preferredUnit }).toFixed(2), + ), }; }); } @@ -52,10 +60,13 @@ export function usePackTemplateSummary( * renderers) — it avoids a `store.get()` per id and scales linearly with the * total number of items rather than multiplicatively. */ -export function usePackTemplateSummaries( - templateIds: string[], - preferredUnit: WeightUnit = 'g', -): Record { +export function usePackTemplateSummaries({ + templateIds, + preferredUnit = 'g', +}: { + templateIds: string[]; + preferredUnit?: WeightUnit; +}): Record { return use$(() => { if (templateIds.length === 0) return {}; @@ -72,7 +83,8 @@ export function usePackTemplateSummaries( const bucket = grams[item.packTemplateId]; if (!bucket) continue; bucket.count++; - const itemWeightInGrams = convertToGrams(item.weight, item.weightUnit) * item.quantity; + const itemWeightInGrams = + convertToGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity; bucket.total += itemWeightInGrams; if (!item.consumable && !item.worn) { bucket.base += itemWeightInGrams; @@ -84,8 +96,12 @@ export function usePackTemplateSummaries( const bucket = grams[id] ?? { base: 0, total: 0, count: 0 }; result[id] = { itemCount: bucket.count, - baseWeight: Number(convertFromGrams(bucket.base, preferredUnit).toFixed(2)), - totalWeight: Number(convertFromGrams(bucket.total, preferredUnit).toFixed(2)), + baseWeight: Number( + convertFromGrams({ grams: bucket.base, unit: preferredUnit }).toFixed(2), + ), + totalWeight: Number( + convertFromGrams({ grams: bucket.total, unit: preferredUnit }).toFixed(2), + ), }; } return result; diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts b/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts index df62273388..baf4fa61e1 100644 --- a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts +++ b/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts @@ -7,7 +7,7 @@ import { computePackTemplateWeights } from '../utils/computePacktemplateWeight'; // Hook to get a single pack template export function usePackTemplateDetails(id: string) { const template = use$(() => { - const template = obs(packTemplatesStore, id).get(); + const template = obs({ store: packTemplatesStore, id: id }).get(); const items = getTemplateItems(id); return { ...template, @@ -15,5 +15,5 @@ export function usePackTemplateDetails(id: string) { }; }); - return computePackTemplateWeights(template); + return computePackTemplateWeights({ template }); } diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts index 993ad63919..8ee680fe9f 100644 --- a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts +++ b/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts @@ -7,8 +7,10 @@ import type { PackTemplateItem } from '../types'; export function useUpdatePackTemplateItem() { const updatePackTemplateItem = useCallback((item: PackTemplateItem) => { - obs(packTemplateItemsStore, item.id).set(item); - obs(packTemplatesStore, item.packTemplateId).localUpdatedAt.set(new Date().toISOString()); + obs({ store: packTemplateItemsStore, id: item.id }).set(item); + obs({ store: packTemplatesStore, id: item.packTemplateId }).localUpdatedAt.set( + new Date().toISOString(), + ); }, []); return updatePackTemplateItem; diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts b/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts index 7ac5376c59..99ed26d996 100644 --- a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts +++ b/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts @@ -5,7 +5,7 @@ import type { PackTemplate } from '../types'; export function useUpdatePackTemplate() { const update = useCallback((template: PackTemplate) => { - obs(packTemplatesStore, template.id).set({ + obs({ store: packTemplatesStore, id: template.id }).set({ ...template, localUpdatedAt: new Date().toISOString(), }); diff --git a/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts b/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts index 1e265ed56c..11ad2097f3 100644 --- a/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts +++ b/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts @@ -3,7 +3,7 @@ import { obs } from 'expo-app/lib/store'; import { packTemplatesStore } from '../store'; export function useWritePermissionCheck(id: string) { - const packTemplate = obs(packTemplatesStore, id).get(); + const packTemplate = obs({ store: packTemplatesStore, id: id }).get(); const user = useUser(); return packTemplate.isAppTemplate ? user?.role === 'ADMIN' : true; diff --git a/apps/expo/features/pack-templates/packTemplateListAtoms.ts b/apps/expo/features/pack-templates/packTemplateListAtoms.ts index 293d6d3ce0..beea35f837 100644 --- a/apps/expo/features/pack-templates/packTemplateListAtoms.ts +++ b/apps/expo/features/pack-templates/packTemplateListAtoms.ts @@ -1,4 +1,4 @@ -import type { PackCategory } from 'expo-app/types'; +import type { PackCategory } from '@packrat/constants'; import { atom } from 'jotai'; export const activeTemplateFilterAtom = atom('all'); diff --git a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx b/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx index 615d0d2e98..41cbb60127 100644 --- a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx +++ b/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx @@ -1,6 +1,7 @@ // CreatePackTemplateItemForm.tsx import { useActionSheet } from '@expo/react-native-action-sheet'; +import type { WeightUnit } from '@packrat/constants'; import { safeIndexOf } from '@packrat/guards'; import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui'; import { useForm } from '@tanstack/react-form'; @@ -9,7 +10,6 @@ import { useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager'; -import type { WeightUnit } from 'expo-app/types'; import { useRouter } from 'expo-router'; import { useMemo, useRef, useState } from 'react'; import { Alert, Image, Pressable, Switch, Text, TouchableOpacity, View } from 'react-native'; @@ -294,7 +294,7 @@ export const CreatePackTemplateItemForm = ({ Unit { const selectedUnit = WEIGHT_UNITS[index]; if (selectedUnit) { diff --git a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx b/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx index 2ea880be38..f3b31dd394 100644 --- a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx +++ b/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx @@ -158,7 +158,10 @@ export function ItemsScanScreen() { const handleCatalogItemsSelected = async () => { router.back(); try { - await addItemsToPackTemplate(packTemplateId as string, selectedCatalogItemsList); + await addItemsToPackTemplate({ + packTemplateId: packTemplateId as string, + catalogItems: selectedCatalogItemsList, + }); const itemWord = selectedCatalogItemsList.length === 1 ? t('packTemplates.item') : t('packTemplates.items'); Burnt.toast({ diff --git a/apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx b/apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx index f8815cd6e0..dd225b460a 100644 --- a/apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx +++ b/apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx @@ -3,7 +3,6 @@ import { Button, Text, useColorScheme } from '@packrat/ui/nativewindui'; import { Icon } from 'expo-app/components/Icon'; import { Chip } from 'expo-app/components/initial/Chip'; import { WeightBadge } from 'expo-app/components/initial/WeightBadge'; -import { isAuthed } from 'expo-app/features/auth/store'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { calculateTotalWeight, @@ -40,23 +39,6 @@ export function PackTemplateItemDetailScreen() { const itemNotes = getNotes(item); const navigateToChat = () => { - if (!isAuthed.peek()) { - return router.push({ - pathname: '/auth', - params: { - redirectTo: JSON.stringify({ - pathname: '/ai-chat', - params: { - itemId: item.id, - itemName: item.name, - contextType: 'templateItem', - }, - }), - showSignInCopy: 'true', - }, - }); - } - router.push({ pathname: '/ai-chat', params: { diff --git a/apps/expo/features/pack-templates/store/packTemplateItems.ts b/apps/expo/features/pack-templates/store/packTemplateItems.ts index f942a5e6f4..8ac2fbaef4 100644 --- a/apps/expo/features/pack-templates/store/packTemplateItems.ts +++ b/apps/expo/features/pack-templates/store/packTemplateItems.ts @@ -4,7 +4,7 @@ import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; import { PackTemplateItemSchema, PackTemplateWithItemsSchema, -} from '@packrat/api/schemas/packTemplates'; +} from '@packrat/schemas/packTemplates'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; diff --git a/apps/expo/features/pack-templates/store/packTemplates.ts b/apps/expo/features/pack-templates/store/packTemplates.ts index 8e6afbf641..78d023754b 100644 --- a/apps/expo/features/pack-templates/store/packTemplates.ts +++ b/apps/expo/features/pack-templates/store/packTemplates.ts @@ -1,10 +1,7 @@ import { observable, syncState } from '@legendapp/state'; import { syncObservable } from '@legendapp/state/sync'; import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; -import { - PackTemplateSchema, - PackTemplateWithItemsSchema, -} from '@packrat/api/schemas/packTemplates'; +import { PackTemplateSchema, PackTemplateWithItemsSchema } from '@packrat/schemas/packTemplates'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; diff --git a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts b/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts index c9f4f72480..543433136f 100644 --- a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts +++ b/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts @@ -53,13 +53,16 @@ describe('computePackTemplateWeights', () => { // --------------------------------------------------------------------------- describe('with no items', () => { it('returns 0 for base and total weight (default unit: grams)', () => { - const result = computePackTemplateWeights(makeTemplate([])); + const result = computePackTemplateWeights({ template: makeTemplate([]) }); expect(result.baseWeight).toBe(0); expect(result.totalWeight).toBe(0); }); it('returns 0 regardless of preferred unit', () => { - const result = computePackTemplateWeights(makeTemplate([]), 'kg'); + const result = computePackTemplateWeights({ + template: makeTemplate([]), + preferredUnit: 'kg', + }); expect(result.baseWeight).toBe(0); expect(result.totalWeight).toBe(0); }); @@ -70,22 +73,22 @@ describe('computePackTemplateWeights', () => { // --------------------------------------------------------------------------- describe('with base gear only', () => { it('sums weights into base and total in grams by default', () => { - const result = computePackTemplateWeights( - makeTemplate([ + const result = computePackTemplateWeights({ + template: makeTemplate([ makeItem({ id: 'a', weight: 500, weightUnit: 'g', quantity: 1 }), makeItem({ id: 'b', weight: 1, weightUnit: 'kg', quantity: 2 }), ]), - ); + }); // 500g + 2 * 1000g = 2500g expect(result.baseWeight).toBe(2500); expect(result.totalWeight).toBe(2500); }); it('converts to the preferred unit (kg)', () => { - const result = computePackTemplateWeights( - makeTemplate([makeItem({ weight: 2500, weightUnit: 'g', quantity: 1 })]), - 'kg', - ); + const result = computePackTemplateWeights({ + template: makeTemplate([makeItem({ weight: 2500, weightUnit: 'g', quantity: 1 })]), + preferredUnit: 'kg', + }); // 2500g => 2.5kg, rounded to 2 decimals expect(result.baseWeight).toBe(2.5); expect(result.totalWeight).toBe(2.5); @@ -97,12 +100,12 @@ describe('computePackTemplateWeights', () => { // --------------------------------------------------------------------------- describe('with consumable items', () => { it('excludes consumables from base but includes them in total', () => { - const result = computePackTemplateWeights( - makeTemplate([ + const result = computePackTemplateWeights({ + template: makeTemplate([ makeItem({ id: 'a', weight: 1000, weightUnit: 'g', consumable: false }), makeItem({ id: 'b', weight: 500, weightUnit: 'g', consumable: true }), ]), - ); + }); expect(result.baseWeight).toBe(1000); expect(result.totalWeight).toBe(1500); }); @@ -113,12 +116,12 @@ describe('computePackTemplateWeights', () => { // --------------------------------------------------------------------------- describe('with worn items', () => { it('excludes worn items from base but includes them in total', () => { - const result = computePackTemplateWeights( - makeTemplate([ + const result = computePackTemplateWeights({ + template: makeTemplate([ makeItem({ id: 'a', weight: 800, weightUnit: 'g', worn: false }), makeItem({ id: 'b', weight: 200, weightUnit: 'g', worn: true }), ]), - ); + }); expect(result.baseWeight).toBe(800); expect(result.totalWeight).toBe(1000); }); @@ -129,9 +132,9 @@ describe('computePackTemplateWeights', () => { // --------------------------------------------------------------------------- describe('quantity handling', () => { it('multiplies item weight by quantity', () => { - const result = computePackTemplateWeights( - makeTemplate([makeItem({ weight: 250, weightUnit: 'g', quantity: 4 })]), - ); + const result = computePackTemplateWeights({ + template: makeTemplate([makeItem({ weight: 250, weightUnit: 'g', quantity: 4 })]), + }); expect(result.totalWeight).toBe(1000); expect(result.baseWeight).toBe(1000); }); @@ -142,7 +145,7 @@ describe('computePackTemplateWeights', () => { // --------------------------------------------------------------------------- it('returns the same template metadata alongside computed weights', () => { const template = makeTemplate([makeItem({ weight: 100, weightUnit: 'g', quantity: 1 })]); - const result = computePackTemplateWeights(template); + const result = computePackTemplateWeights({ template: template }); expect(result.id).toBe(template.id); expect(result.name).toBe(template.name); expect(result.items).toHaveLength(1); diff --git a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts b/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts index d4a767465d..cf99ad4670 100644 --- a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts +++ b/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts @@ -2,16 +2,20 @@ import type { WeightUnit } from '@packrat/units'; import { displayWeight, normalize, parseWeightUnit } from '@packrat/units'; import type { PackTemplate } from '../types'; -export const computePackTemplateWeights = ( - template: Omit, - preferredUnit: WeightUnit = 'g', -): PackTemplate => { +export const computePackTemplateWeights = ({ + template, + preferredUnit = 'g', +}: { + template: Omit; + preferredUnit?: WeightUnit; +}): PackTemplate => { let baseWeightGrams = 0; let totalWeightGrams = 0; for (const item of template.items) { const itemWeightInGrams = - normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity; + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity; totalWeightGrams += itemWeightInGrams; if (!item.consumable && !item.worn) { baseWeightGrams += itemWeightInGrams; @@ -20,7 +24,7 @@ export const computePackTemplateWeights = ( return { ...template, - baseWeight: displayWeight(baseWeightGrams, preferredUnit), - totalWeight: displayWeight(totalWeightGrams, preferredUnit), + baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }), + totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }), }; }; diff --git a/apps/expo/features/packs/components/AddPackItemActions.tsx b/apps/expo/features/packs/components/AddPackItemActions.tsx index 67d646cf75..8a05734bc2 100644 --- a/apps/expo/features/packs/components/AddPackItemActions.tsx +++ b/apps/expo/features/packs/components/AddPackItemActions.tsx @@ -109,7 +109,7 @@ export default React.forwardRef( if (catalogItems.length > 0) { trackRecentlyUsed(catalogItems); try { - await addItemsToPack(packId, catalogItems); + await addItemsToPack({ packId, catalogItems }); } catch (error) { console.error('Error adding catalog items to pack:', error); Alert.alert(t('common.error'), t('catalog.somethingWentWrong')); diff --git a/apps/expo/features/packs/components/CachedImage.tsx b/apps/expo/features/packs/components/CachedImage.tsx index 5d12cf739a..890383e8e7 100644 --- a/apps/expo/features/packs/components/CachedImage.tsx +++ b/apps/expo/features/packs/components/CachedImage.tsx @@ -1,7 +1,9 @@ +import * as Sentry from '@sentry/react-native'; +import { Icon } from 'expo-app/components/Icon'; import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager'; import type React from 'react'; -import { useEffect, useState } from 'react'; -import { ActivityIndicator, Image, type ImageProps, View } from 'react-native'; +import { useCallback, useEffect, useRef, useState } from 'react'; +import { ActivityIndicator, Image, type ImageProps, Pressable, View } from 'react-native'; interface CachedImageProps extends Omit { imageObjectKey: string; @@ -9,13 +11,17 @@ interface CachedImageProps extends Omit { placeholderColor?: string; } -/** - * CachedImage - * - * Responsible for displaying user-owned item images. - * Loads from local cache if available, otherwise downloads and caches the image - * before displaying. Shows loading indicator while fetching. - */ +const CLIENT_ERROR_STATUS_RE = /^Failed to download image: 4\d\d/; + +// Errors caused by bad content (wrong content-type, 4xx) are permanent — retrying won't help. +// Network timeouts and 5xx are transient and worth retrying. +function isPermanentDownloadError(error: unknown): boolean { + if (!(error instanceof Error)) return false; + return ( + error.message.startsWith('Invalid content type') || CLIENT_ERROR_STATUS_RE.test(error.message) + ); +} + export const CachedImage: React.FC = ({ imageObjectKey, imageRemoteUrl, @@ -24,41 +30,134 @@ export const CachedImage: React.FC = ({ }) => { const [imageLocalUri, setImageLocalUri] = useState(null); const [loading, setLoading] = useState(true); + const [hasError, setHasError] = useState(false); + const [isPermanentError, setIsPermanentError] = useState(false); + const [retryCount, setRetryCount] = useState(0); + const hasClearedCorruptedCache = useRef(false); + + useEffect(() => { + hasClearedCorruptedCache.current = false; + }, [imageObjectKey]); + + const handleImageError = useCallback(async () => { + if (!hasClearedCorruptedCache.current) { + hasClearedCorruptedCache.current = true; + Sentry.addBreadcrumb({ + category: 'cachedImage', + message: 'Cached image failed to render — clearing corrupted cache entry', + level: 'warning', + data: { imageObjectKey }, + }); + try { + await ImageCacheManager.clearImage(imageObjectKey); + } catch (error) { + Sentry.captureException(error, { + tags: { feature: 'cachedImage', action: 'clearCorruptedCache' }, + extra: { imageObjectKey }, + }); + } + setRetryCount((c) => c + 1); + } else { + // Second failure after auto-heal attempt — the image content itself is broken. + setIsPermanentError(true); + setHasError(true); + } + }, [imageObjectKey]); useEffect(() => { - if (!imageObjectKey) return; + if (!imageObjectKey || !imageRemoteUrl) return; + let cancelled = false; + const loadImage = async () => { + setLoading(true); + setHasError(false); + setIsPermanentError(false); + setImageLocalUri(null); + try { - setLoading(true); + Sentry.addBreadcrumb({ + category: 'cachedImage', + message: 'Loading image', + level: 'info', + data: { imageObjectKey }, + }); - const localUri = await ImageCacheManager.getCachedImageUri(imageObjectKey); - if (localUri) { - setImageLocalUri(localUri); + const cachedUri = await ImageCacheManager.getCachedImageUri(imageObjectKey); + if (cachedUri) { + if (!cancelled) setImageLocalUri(cachedUri); } else { - const localUri = await ImageCacheManager.cacheRemoteImage(imageObjectKey, imageRemoteUrl); - setImageLocalUri(localUri); + Sentry.addBreadcrumb({ + category: 'cachedImage', + message: 'Cache miss — downloading', + level: 'info', + data: { imageObjectKey }, + }); + const downloadedUri = await ImageCacheManager.cacheRemoteImage({ + fileName: imageObjectKey, + remoteUrl: imageRemoteUrl, + }); + if (!cancelled) setImageLocalUri(downloadedUri); } } catch (error) { - console.error('Error loading image:', error); - // TODO: Handle error state if needed + Sentry.captureException(error, { + tags: { feature: 'cachedImage', action: 'loadImage' }, + extra: { imageObjectKey }, + }); + if (!cancelled) { + setIsPermanentError(isPermanentDownloadError(error)); + setHasError(true); + } } finally { - setLoading(false); + if (!cancelled) setLoading(false); } }; loadImage(); - }, [imageObjectKey, imageRemoteUrl]); + return () => { + cancelled = true; + }; + }, [imageObjectKey, imageRemoteUrl, retryCount]); + + const placeholderClass = `items-center justify-center ${props.className ?? ''}`; + const placeholderStyle = [{ backgroundColor: placeholderColor }]; if (loading) { return ( - + ); } - return ; + if (hasError) { + if (isPermanentError) { + return ( + + + + ); + } + return ( + { + hasClearedCorruptedCache.current = false; + setRetryCount((c) => c + 1); + }} + accessibilityLabel="Tap to retry loading image" + accessibilityRole="button" + > + + + ); + } + + return ( + + ); }; diff --git a/apps/expo/features/packs/components/GapSuggestion.tsx b/apps/expo/features/packs/components/GapSuggestion.tsx index 21dd623988..4e8ea30561 100644 --- a/apps/expo/features/packs/components/GapSuggestion.tsx +++ b/apps/expo/features/packs/components/GapSuggestion.tsx @@ -27,11 +27,14 @@ export function GapSuggestion({ gap, packId }: GapSuggestionProps) { }); const handleAddItem = async (item: CatalogItem) => { - await addItemToPack(packId, { - catalogItem: item, - data: { - consumable: gap.consumable, - worn: gap.worn, + await addItemToPack({ + packId, + opts: { + catalogItem: item, + data: { + consumable: gap.consumable, + worn: gap.worn, + }, }, }); setCatalogSuggestionsModalVisible(false); diff --git a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx b/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx index 2fd2002e81..ba6f3f57ed 100644 --- a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx +++ b/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx @@ -3,7 +3,6 @@ import { Icon } from 'expo-app/components/Icon'; import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage'; import type { CatalogItem } from 'expo-app/features/catalog/types'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; -import { testIds } from 'expo-app/lib/testIds'; import { TouchableWithoutFeedback, View } from 'react-native'; type HorizontalCatalogItemCardProps = { @@ -18,12 +17,12 @@ type HorizontalCatalogItemCardProps = { } ); -const formatPrice = (price?: number | null, currency?: string | null) => { +const formatPrice = ({ price, currency }: { price?: number | null; currency?: string | null }) => { if (!price) return ''; return `${currency || '$'}${price.toFixed(2)}`; }; -const formatWeight = (weight?: number | null, unit?: string | null) => { +const formatWeight = ({ weight, unit }: { weight?: number | null; unit?: string | null }) => { if (!weight) return ''; return `${weight}${unit || 'g'}`; }; @@ -37,7 +36,7 @@ export function HorizontalCatalogItemCard({ item, ...restProps }: HorizontalCata onPress={isSelectable ? () => restProps.onSelect(item) : restProps.onPress} > {item.price && ( - {formatPrice(item.price, item.currency)} + {formatPrice({ price: item.price, currency: item.currency })} )} {item.weight && ( - {formatWeight(item.weight, item.weightUnit)} + {formatWeight({ weight: item.weight, unit: item.weightUnit })} )} {item.ratingValue && ( diff --git a/apps/expo/features/packs/components/PackForm.tsx b/apps/expo/features/packs/components/PackForm.tsx index 2b60376d96..f1f8c34966 100644 --- a/apps/expo/features/packs/components/PackForm.tsx +++ b/apps/expo/features/packs/components/PackForm.tsx @@ -1,5 +1,5 @@ -import { PackCategorySchema } from '@packrat/api/types'; import { fromZod } from '@packrat/guards'; +import { PackCategorySchema } from '@packrat/schemas/constants'; import { Button, createDropdownItem, diff --git a/apps/expo/features/packs/components/PackStatsTile.tsx b/apps/expo/features/packs/components/PackStatsTile.tsx index 72259eeebe..701e66e3bc 100644 --- a/apps/expo/features/packs/components/PackStatsTile.tsx +++ b/apps/expo/features/packs/components/PackStatsTile.tsx @@ -1,30 +1,60 @@ import type { AlertMethods } from '@packrat/ui/nativewindui'; -import { Alert, ListItem } from '@packrat/ui/nativewindui'; +import { Alert, ListItem, Text } from '@packrat/ui/nativewindui'; import { Icon } from 'expo-app/components/Icon'; +import { SearchInput } from 'expo-app/components/SearchInput'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; -import { type Href, useRouter } from 'expo-router'; -import { useRef } from 'react'; -import { Platform, View } from 'react-native'; +import { useRouter } from 'expo-router'; +import { useRef, useState } from 'react'; +import { Modal, Platform, Pressable, ScrollView, TouchableOpacity, View } from 'react-native'; +import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'; import { usePacks } from '../hooks'; +import type { PackInStore } from '../types'; + +const CATEGORY_ICONS: Record = { + hiking: 'walk', + backpacking: 'bag-personal', + camping: 'tent', + climbing: 'image-filter-hdr', + winter: 'snowflake', + skiing: 'ski', + 'water sports': 'waves', + desert: 'weather-sunny', + custom: 'cog', +}; export function PackStatsTile() { const { t } = useTranslation(); const router = useRouter(); + const { colors } = useColorScheme(); + const insets = useSafeAreaInsets(); const packs = usePacks(); - const currentPack = packs[0]; - const alertRef = useRef(null); + const [pickerVisible, setPickerVisible] = useState(false); + const [query, setQuery] = useState(''); - const route: Href | null = currentPack ? `/pack-stats/${currentPack.id}` : null; + const filteredPacks = query.trim() + ? packs.filter((p) => p.name.toLowerCase().includes(query.toLowerCase())) + : packs; const handlePress = () => { - if (!route) { + if (packs.length === 0) { alertRef.current?.show(); return; } - router.push(route); + if (packs.length === 1) { + const only = packs[0]; + if (only) router.push(`/pack-stats/${only.id}`); + return; + } + setQuery(''); + setPickerVisible(true); + }; + + const handlePickPack = (pack: PackInStore) => { + setPickerVisible(false); + router.push(`/pack-stats/${pack.id}`); }; return ( @@ -44,27 +74,84 @@ export function PackStatsTile() { } - item={{ - title: t('packs.packStats'), - }} + item={{ title: t('packs.packStats') }} onPress={handlePress} target="Cell" index={0} removeSeparator={Platform.OS === 'ios'} /> + + + setPickerVisible(false)} + > + + {/* Header */} + + setPickerVisible(false)}> + + + {t('packs.selectPack')} + + + {/* Search bar */} + + + + + {/* Pack list */} + + {filteredPacks.length === 0 ? ( + + {t('packs.noPacksFound')} + + ) : ( + filteredPacks.map((pack) => { + const icon = CATEGORY_ICONS[pack.category] ?? 'bag-personal'; + return ( + handlePickPack(pack)} + className="flex-row items-center rounded-xl border border-border bg-card p-4" + style={({ pressed }) => (pressed ? { opacity: 0.7 } : {})} + > + + + + + {pack.name} + {pack.category ? ( + + {pack.category} + + ) : null} + + + + ); + }) + )} + + + + + ); } diff --git a/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx b/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx index 0d4d25aa93..afb39e3822 100644 --- a/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx +++ b/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx @@ -81,9 +81,9 @@ export const SimilarItemsForPackItem: React.FC = ( }) => { const { t } = useTranslation(); const router = useRouter(); - const { data, isLoading, isError } = useSimilarPackItems(packId, { - itemId, - params: { limit, threshold }, + const { data, isLoading, isError } = useSimilarPackItems({ + packId, + opts: { itemId, params: { limit, threshold } }, }); const handleItemPress = (catalogItemId: string) => { diff --git a/apps/expo/features/packs/components/TemplateItemsSection.tsx b/apps/expo/features/packs/components/TemplateItemsSection.tsx index b87a6c90ec..115ed62c35 100644 --- a/apps/expo/features/packs/components/TemplateItemsSection.tsx +++ b/apps/expo/features/packs/components/TemplateItemsSection.tsx @@ -1,10 +1,10 @@ +import type { WeightUnit } from '@packrat/constants'; import { Icon } from 'expo-app/components/Icon'; import { cn } from 'expo-app/lib/cn'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { buildPackTemplateItemImageUrl } from 'expo-app/lib/utils/buildPackTemplateItemImageUrl'; -import type { WeightUnit } from 'expo-app/types'; -import { Image, Platform, ScrollView, Text, View } from 'react-native'; +import { Image, ScrollView, Text, View } from 'react-native'; export interface PackTemplateItem { id: string; @@ -32,7 +32,7 @@ interface TemplateItemsSectionProps { } // Helper function to format weight -const formatWeight = (weight: number, unit: string) => { +const formatWeight = ({ weight, unit }: { weight: number; unit: string }) => { if (weight < 1 && unit === 'kg') { return `${(weight * 1000).toFixed(0)}g`; } @@ -52,12 +52,7 @@ const TemplateItemCard = ({ item }: { item: PackTemplateItem }) => { {imageUrl ? ( - + ) : ( {t('packs.noImage')} @@ -83,7 +78,7 @@ const TemplateItemCard = ({ item }: { item: PackTemplateItem }) => { - {formatWeight(item.weight, item.weightUnit)} + {formatWeight({ weight: item.weight, unit: item.weightUnit })} @@ -127,7 +122,8 @@ export const TemplateItemsSection = ({ templateItems }: TemplateItemsSectionProp Items - {templateStats.totalItems} items • {formatWeight(templateStats.totalWeight, 'kg')} •{' '} + {templateStats.totalItems} items •{' '} + {formatWeight({ weight: templateStats.totalWeight, unit: 'kg' })} •{' '} {templateStats.categories.size} categories diff --git a/apps/expo/features/packs/hooks/useAddCatalogItem.ts b/apps/expo/features/packs/hooks/useAddCatalogItem.ts index d5a27dfbf4..d2e53698da 100644 --- a/apps/expo/features/packs/hooks/useAddCatalogItem.ts +++ b/apps/expo/features/packs/hooks/useAddCatalogItem.ts @@ -1,5 +1,5 @@ -import { WeightUnitSchema } from '@packrat/api/types'; import { fromZod } from '@packrat/guards'; +import { WeightUnitSchema } from '@packrat/schemas/constants'; import * as Burnt from 'burnt'; import { cacheCatalogItemImage } from 'expo-app/features/catalog/lib/cacheCatalogItemImage'; import type { CatalogItem } from 'expo-app/features/catalog/types'; @@ -11,10 +11,13 @@ export function useAddCatalogItem() { const [isLoading, setIsLoading] = useState(false); const createItem = useCreatePackItem(); - const addItemToPack = async ( - packId: string, - opts: { catalogItem: CatalogItem; data?: Partial }, - ) => { + const addItemToPack = async ({ + packId, + opts, + }: { + packId: string; + opts: { catalogItem: CatalogItem; data?: Partial }; + }) => { const { catalogItem, data } = opts; setIsLoading(true); const cachedImageFilename = await cacheCatalogItemImage(catalogItem.images?.[0]); diff --git a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts b/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts index 24a36cd18d..ec97a0e682 100644 --- a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts +++ b/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts @@ -1,5 +1,5 @@ -import { WeightUnitSchema } from '@packrat/api/types'; import { fromZod } from '@packrat/guards'; +import { WeightUnitSchema } from '@packrat/schemas/constants'; import { useState } from 'react'; import { cacheCatalogItemImage } from '../../catalog/lib/cacheCatalogItemImage'; import type { CatalogItemWithPackItemFields } from '../../catalog/types'; @@ -9,7 +9,13 @@ export function useBulkAddCatalogItems() { const [isLoading, setIsLoading] = useState(false); const createItem = useCreatePackItem(); - const addItemsToPack = async (packId: string, catalogItems: CatalogItemWithPackItemFields[]) => { + const addItemsToPack = async ({ + packId, + catalogItems, + }: { + packId: string; + catalogItems: CatalogItemWithPackItemFields[]; + }) => { if (catalogItems.length === 0) return; setIsLoading(true); diff --git a/apps/expo/features/packs/hooks/useCreatePack.ts b/apps/expo/features/packs/hooks/useCreatePack.ts index 38c4a7d918..79f0258917 100644 --- a/apps/expo/features/packs/hooks/useCreatePack.ts +++ b/apps/expo/features/packs/hooks/useCreatePack.ts @@ -18,7 +18,7 @@ export function useCreatePack() { deleted: false, }; - obs(packsStore, id).set(newPack); + obs({ store: packsStore, id: id }).set(newPack); return id; }, []); diff --git a/apps/expo/features/packs/hooks/useCreatePackItem.ts b/apps/expo/features/packs/hooks/useCreatePackItem.ts index 164c2af32d..2fdac28712 100644 --- a/apps/expo/features/packs/hooks/useCreatePackItem.ts +++ b/apps/expo/features/packs/hooks/useCreatePackItem.ts @@ -28,8 +28,8 @@ export function useCreatePackItem() { deleted: false, }; - obs(packItemsStore, id).set(newItem); - obs(packsStore, packId).localUpdatedAt.set(new Date().toISOString()); + obs({ store: packItemsStore, id: id }).set(newItem); + obs({ store: packsStore, id: packId }).localUpdatedAt.set(new Date().toISOString()); recordPackWeight(packId); }, [], diff --git a/apps/expo/features/packs/hooks/useDeletePack.ts b/apps/expo/features/packs/hooks/useDeletePack.ts index 9c69d93d26..19b7a6a1ed 100644 --- a/apps/expo/features/packs/hooks/useDeletePack.ts +++ b/apps/expo/features/packs/hooks/useDeletePack.ts @@ -6,9 +6,9 @@ export function useDeletePack() { const deletePack = useCallback((id: string) => { // Soft delete by setting deleted flag for (const item of getPackItems(id)) { - obs(packItemsStore, item.id).deleted.set(true); + obs({ store: packItemsStore, id: item.id }).deleted.set(true); } - obs(packsStore, id).deleted.set(true); + obs({ store: packsStore, id: id }).deleted.set(true); }, []); return deletePack; diff --git a/apps/expo/features/packs/hooks/useDeletePackItem.ts b/apps/expo/features/packs/hooks/useDeletePackItem.ts index 9e8a35c557..0b7b225d3b 100644 --- a/apps/expo/features/packs/hooks/useDeletePackItem.ts +++ b/apps/expo/features/packs/hooks/useDeletePackItem.ts @@ -5,7 +5,7 @@ import { useCallback } from 'react'; export function useDeletePackItem() { const deletePackItem = useCallback((id: string) => { // Soft delete by setting deleted flag - obs(packItemsStore, id).deleted.set(true); + obs({ store: packItemsStore, id: id }).deleted.set(true); return Promise.resolve({ id }); }, []); diff --git a/apps/expo/features/packs/hooks/useDetailedPacks.ts b/apps/expo/features/packs/hooks/useDetailedPacks.ts index f8ad24344d..cdffed4cac 100644 --- a/apps/expo/features/packs/hooks/useDetailedPacks.ts +++ b/apps/expo/features/packs/hooks/useDetailedPacks.ts @@ -11,7 +11,7 @@ export function useDetailedPacks(): Pack[] { for (const pack of packsArray) { if (pack.deleted) continue; const items = getPackItems(pack.id); - const packWithWeights = computePackWeights({ ...pack, items }); + const packWithWeights = computePackWeights({ pack: { ...pack, items } }); filteredPacks.push(packWithWeights); } diff --git a/apps/expo/features/packs/hooks/useImageDetection.ts b/apps/expo/features/packs/hooks/useImageDetection.ts index 89b0b48ec7..c833a496c2 100644 --- a/apps/expo/features/packs/hooks/useImageDetection.ts +++ b/apps/expo/features/packs/hooks/useImageDetection.ts @@ -29,7 +29,7 @@ export function useImageDetection() { { selectedImage: SelectedImage; matchLimit?: number } >({ mutationFn: async ({ selectedImage, matchLimit = 3 }) => { - const image = await uploadImage(selectedImage.fileName, selectedImage.uri); + const image = await uploadImage({ fileName: selectedImage.fileName, uri: selectedImage.uri }); if (!image) { throw new Error("Couldn't upload image"); } diff --git a/apps/expo/features/packs/hooks/useImagePicker.ts b/apps/expo/features/packs/hooks/useImagePicker.ts index bde40fae25..464f74f987 100644 --- a/apps/expo/features/packs/hooks/useImagePicker.ts +++ b/apps/expo/features/packs/hooks/useImagePicker.ts @@ -96,7 +96,7 @@ export function useImagePicker(selectedImageInit?: SelectedImage) { const fileName = `${nanoid()}.${extension}`; try { - ImageCacheManager.cacheLocalTempImage(imageUri, fileName); + ImageCacheManager.cacheLocalTempImage({ tempImageUri: imageUri, fileName }); return fileName; } catch (err) { console.error('Error saving image locally:', err); diff --git a/apps/expo/features/packs/hooks/usePackDetailsFromApi.ts b/apps/expo/features/packs/hooks/usePackDetailsFromApi.ts index 67714cec3f..8bf90ec97a 100644 --- a/apps/expo/features/packs/hooks/usePackDetailsFromApi.ts +++ b/apps/expo/features/packs/hooks/usePackDetailsFromApi.ts @@ -1,4 +1,4 @@ -import { PackWithWeightsSchema } from '@packrat/api/schemas/packs'; +import { PackWithWeightsSchema } from '@packrat/schemas/packs'; import { useQuery } from '@tanstack/react-query'; import { apiClient } from 'expo-app/lib/api/packrat'; import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit'; diff --git a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts b/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts index 9bdb7bc106..801f2927c6 100644 --- a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts +++ b/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts @@ -14,9 +14,9 @@ import { computePackWeights } from '../utils/computePackWeights'; */ export function usePackDetailsFromStore(id: string) { const pack = use$(() => { - const pack_ = obs(packsStore, id).get(); + const pack_ = obs({ store: packsStore, id: id }).get(); const items = getPackItems(id); - const packWithWeights = computePackWeights({ ...pack_, items }); + const packWithWeights = computePackWeights({ pack: { ...pack_, items } }); return packWithWeights; }); diff --git a/apps/expo/features/packs/hooks/usePackGapAnalysis.ts b/apps/expo/features/packs/hooks/usePackGapAnalysis.ts index 3387d24278..c37cde3b63 100644 --- a/apps/expo/features/packs/hooks/usePackGapAnalysis.ts +++ b/apps/expo/features/packs/hooks/usePackGapAnalysis.ts @@ -4,7 +4,7 @@ import { apiClient } from 'expo-app/lib/api/packrat'; export interface GapAnalysisRequest { destination?: string; tripType?: string; - duration?: string; + duration?: number; startDate?: string; endDate?: string; } @@ -22,10 +22,13 @@ export interface GapAnalysisResponse { summary?: string; } -export const analyzePackGaps = async ( - packId: string, - context?: GapAnalysisRequest, -): Promise => { +export const analyzePackGaps = async ({ + packId, + context, +}: { + packId: string; + context?: GapAnalysisRequest; +}): Promise => { const { data, error } = await apiClient.packs({ packId })['gap-analysis'].post(context ?? {}); if (error) throw new Error(`Failed to analyze pack gaps: ${error.value}`); // safe-cast: treaty response shape matches GapAnalysisResponse as validated by the API schema @@ -35,6 +38,6 @@ export const analyzePackGaps = async ( export function usePackGapAnalysis() { return useMutation({ mutationFn: ({ packId, context }: { packId: string; context?: GapAnalysisRequest }) => - analyzePackGaps(packId, context), + analyzePackGaps({ packId, context }), }); } diff --git a/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts b/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts index 8229888c23..b12f8f829f 100644 --- a/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts +++ b/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts @@ -1,4 +1,4 @@ -import { PackItemSchema } from '@packrat/api/schemas/packs'; +import { PackItemSchema } from '@packrat/schemas/packs'; import { useQuery } from '@tanstack/react-query'; import { apiClient } from 'expo-app/lib/api/packrat'; import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit'; diff --git a/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts b/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts index 563e42f3ce..1459688aa8 100644 --- a/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts +++ b/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts @@ -2,7 +2,7 @@ import { obs } from 'expo-app/lib/store'; import { packItemsStore } from '../store'; export function usePackItemOwnershipCheck(id: string) { - const packItem = obs(packItemsStore, id).peek(); + const packItem = obs({ store: packItemsStore, id: id }).peek(); return !!packItem; } diff --git a/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts b/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts index 43c19f836b..fb17ba50f9 100644 --- a/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts +++ b/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts @@ -3,5 +3,5 @@ import { obs } from 'expo-app/lib/store'; import { packsStore } from '../store'; export function usePackOwnershipCheck(id: string) { - return use$(() => !!obs(packsStore, id).get()); + return use$(() => !!obs({ store: packsStore, id }).get()); } diff --git a/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts b/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts index a9559d0f49..1e34c77982 100644 --- a/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts +++ b/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts @@ -10,7 +10,7 @@ export function usePackWeightAnalysis(packId: string) { .reduce((sum, item) => { const unit = item.weightUnit || 'g'; const weight = item.weight || 0; - return sum + convertToGrams(weight * item.quantity, unit); + return sum + convertToGrams({ weight: weight * item.quantity, unit: unit }); }, 0); const wornWeightInGrams = pack.items @@ -18,7 +18,7 @@ export function usePackWeightAnalysis(packId: string) { .reduce((sum, item) => { const unit = item.weightUnit || 'g'; const weight = item.weight || 0; - return sum + convertToGrams(weight * item.quantity, unit); + return sum + convertToGrams({ weight: weight * item.quantity, unit: unit }); }, 0); const categorySummaries = computeCategorySummaries(pack); @@ -26,11 +26,14 @@ export function usePackWeightAnalysis(packId: string) { return { data: { baseWeight: pack.baseWeight, - consumableWeight: convertFromGrams( - consumableWeightInGrams, - userStore.preferredWeightUnit.peek() ?? 'g', - ), - wornWeight: convertFromGrams(wornWeightInGrams, userStore.preferredWeightUnit.peek() ?? 'g'), + consumableWeight: convertFromGrams({ + grams: consumableWeightInGrams, + unit: userStore.preferredWeightUnit.peek() ?? 'g', + }), + wornWeight: convertFromGrams({ + grams: wornWeightInGrams, + unit: userStore.preferredWeightUnit.peek() ?? 'g', + }), totalWeight: pack.totalWeight, categories: categorySummaries, }, diff --git a/apps/expo/features/packs/hooks/useRecentPacks.ts b/apps/expo/features/packs/hooks/useRecentPacks.ts index c6e3818f34..b70ac28414 100644 --- a/apps/expo/features/packs/hooks/useRecentPacks.ts +++ b/apps/expo/features/packs/hooks/useRecentPacks.ts @@ -18,7 +18,7 @@ export function useRecentPacks() { const sortedPacksWithWeights = sortedPacks.map((pack) => { const items = getPackItems(pack.id); - const packWithWeights = computePackWeights({ ...pack, items }); + const packWithWeights = computePackWeights({ pack: { ...pack, items } }); return packWithWeights; }); diff --git a/apps/expo/features/packs/hooks/useUpdatePack.ts b/apps/expo/features/packs/hooks/useUpdatePack.ts index 638504bc70..b18203e86e 100644 --- a/apps/expo/features/packs/hooks/useUpdatePack.ts +++ b/apps/expo/features/packs/hooks/useUpdatePack.ts @@ -5,7 +5,7 @@ import type { Pack } from '../types'; export function useUpdatePack() { const updatePack = useCallback((pack: Pack) => { - obs(packsStore, pack.id).set({ + obs({ store: packsStore, id: pack.id }).set({ ...pack, localUpdatedAt: new Date().toISOString(), }); diff --git a/apps/expo/features/packs/input.ts b/apps/expo/features/packs/input.ts index 806351be95..2ae602c9b2 100644 --- a/apps/expo/features/packs/input.ts +++ b/apps/expo/features/packs/input.ts @@ -1,4 +1,4 @@ -import type { WeightUnit } from 'expo-app/types'; +import type { WeightUnit } from '@packrat/constants'; export interface PackItemInput { name: string; diff --git a/apps/expo/features/packs/packListAtoms.ts b/apps/expo/features/packs/packListAtoms.ts index daf48bb44b..83d91ef285 100644 --- a/apps/expo/features/packs/packListAtoms.ts +++ b/apps/expo/features/packs/packListAtoms.ts @@ -1,4 +1,4 @@ -import type { PackCategory } from 'expo-app/types'; +import type { PackCategory } from '@packrat/constants'; import { atom } from 'jotai'; export const activeFilterAtom = atom('all'); diff --git a/apps/expo/features/packs/screens/CreatePackItemForm.tsx b/apps/expo/features/packs/screens/CreatePackItemForm.tsx index 9f0dff53d7..518d2ba97c 100644 --- a/apps/expo/features/packs/screens/CreatePackItemForm.tsx +++ b/apps/expo/features/packs/screens/CreatePackItemForm.tsx @@ -1,4 +1,5 @@ import { useActionSheet } from '@expo/react-native-action-sheet'; +import type { WeightUnit } from '@packrat/constants'; import { safeIndexOf } from '@packrat/guards'; import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui'; import { useForm } from '@tanstack/react-form'; @@ -7,7 +8,6 @@ import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { testIds } from 'expo-app/lib/testIds'; import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager'; -import type { WeightUnit } from 'expo-app/types'; import { useRouter } from 'expo-router'; import { useEffect, useMemo, useRef, useState } from 'react'; import { Alert, Image, Pressable, Switch, Text, TouchableOpacity, View } from 'react-native'; @@ -326,7 +326,7 @@ export const CreatePackItemForm = ({ {t('packs.unit')} { const selectedUnit = WEIGHT_UNITS[index]; if (selectedUnit) { diff --git a/apps/expo/features/packs/screens/ItemsScanScreen.tsx b/apps/expo/features/packs/screens/ItemsScanScreen.tsx index 4f6093118f..2edf22ced8 100644 --- a/apps/expo/features/packs/screens/ItemsScanScreen.tsx +++ b/apps/expo/features/packs/screens/ItemsScanScreen.tsx @@ -153,7 +153,7 @@ export function ItemsScanScreen() { const handleCatalogItemsSelected = async () => { router.back(); - await addItemsToPack(packId as string, selectedCatalogItemsList); + await addItemsToPack({ packId: packId as string, catalogItems: selectedCatalogItemsList }); Burnt.toast({ title: `Added ${selectedCatalogItemsList.length} items to your pack`, preset: 'done', diff --git a/apps/expo/features/packs/screens/PackDetailScreen.tsx b/apps/expo/features/packs/screens/PackDetailScreen.tsx index 79f6f7ef94..d1c48ab177 100644 --- a/apps/expo/features/packs/screens/PackDetailScreen.tsx +++ b/apps/expo/features/packs/screens/PackDetailScreen.tsx @@ -40,7 +40,7 @@ export function PackDetailScreen() { const [activeTab, setActiveTab] = useState(DEFAULT_TAB); const [isPackingMode, setIsPackingMode] = useState(false); const [packedItems, setPackedItems] = useState>( - obs(packingModeStore, id).get() || {}, + obs({ store: packingModeStore, id: id }).get() || {}, ); const [isLocationPickerOpen, setIsLocationPickerOpen] = useState(false); @@ -103,7 +103,7 @@ export function PackDetailScreen() { }; const handleSavePackingMode = () => { - obs(packingModeStore, id).set({ ...packedItems }); + obs({ store: packingModeStore, id: id }).set({ ...packedItems }); setIsPackingMode(false); setActiveTab(DEFAULT_TAB); // Reset tab when toggling mode Burnt.toast({ @@ -116,10 +116,10 @@ export function PackDetailScreen() { const exitPackingMode = () => { setIsPackingMode(!isPackingMode); setActiveTab(DEFAULT_TAB); // Reset tab when toggling mode - setPackedItems(obs(packingModeStore, id).get() || {}); + setPackedItems(obs({ store: packingModeStore, id: id }).get() || {}); }; - const packingState = obs(packingModeStore, id).get() || {}; + const packingState = obs({ store: packingModeStore, id: id }).get() || {}; if ( Object.entries(packedItems).every(([key, val]) => @@ -281,22 +281,6 @@ export function PackDetailScreen() { cn(activeTab === tab ? 'text-primary' : 'text-muted-foreground'); const handleAskAI = () => { - if (!isAuthed.peek()) { - return router.push({ - pathname: '/auth', - params: { - redirectTo: JSON.stringify({ - pathname: '/ai-chat', - params: { - packId: id, - packName: pack.name, - contextType: 'pack', - }, - }), - showSignInCopy: 'true', - }, - }); - } router.push({ pathname: '/ai-chat', params: { diff --git a/apps/expo/features/packs/screens/PackItemDetailScreen.tsx b/apps/expo/features/packs/screens/PackItemDetailScreen.tsx index 6182f0982e..103bbfb672 100644 --- a/apps/expo/features/packs/screens/PackItemDetailScreen.tsx +++ b/apps/expo/features/packs/screens/PackItemDetailScreen.tsx @@ -3,7 +3,6 @@ import { ActivityIndicator, Button, Text, useColorScheme } from '@packrat/ui/nat import { Icon } from 'expo-app/components/Icon'; import { Chip } from 'expo-app/components/initial/Chip'; import { WeightBadge } from 'expo-app/components/initial/WeightBadge'; -import { isAuthed } from 'expo-app/features/auth/store'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { calculateTotalWeight, @@ -107,22 +106,6 @@ export function ItemDetailScreen() { const itemNotes = getNotes(item); const navigateToChat = () => { - if (!isAuthed.peek()) { - return router.push({ - pathname: '/auth', - params: { - redirectTo: JSON.stringify({ - pathname: '/ai-chat', - params: { - itemId: item.id, - itemName: item.name, - contextType: 'item', - }, - }), - showSignInCopy: 'true', - }, - }); - } router.push({ pathname: '/ai-chat', params: { diff --git a/apps/expo/features/packs/store/packItems.ts b/apps/expo/features/packs/store/packItems.ts index e8339a567f..4411008df9 100644 --- a/apps/expo/features/packs/store/packItems.ts +++ b/apps/expo/features/packs/store/packItems.ts @@ -1,8 +1,8 @@ import { observable, syncState } from '@legendapp/state'; import { syncObservable } from '@legendapp/state/sync'; import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; -import { PackItemSchema, PackWithWeightsSchema } from '@packrat/api/schemas/packs'; import { isRemoteUrl } from '@packrat/guards'; +import { PackItemSchema, PackWithWeightsSchema } from '@packrat/schemas/packs'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; @@ -23,7 +23,10 @@ const listAllPackItems = async (): Promise => { const createPackItem = async ({ packId, ...data }: PackItem): Promise => { if (data.image && !isRemoteUrl(data.image)) { - await uploadImage(data.image, `${ImageCacheManager.cacheDirectory}${data.image}`); + await uploadImage({ + fileName: data.image, + uri: `${ImageCacheManager.cacheDirectory}${data.image}`, + }); } const { data: result, error } = await apiClient .packs({ packId: String(packId) }) @@ -35,7 +38,10 @@ const createPackItem = async ({ packId, ...data }: PackItem): Promise => { if (data.image && !isRemoteUrl(data.image)) { - await uploadImage(data.image, `${ImageCacheManager.cacheDirectory}${data.image}`); + await uploadImage({ + fileName: data.image, + uri: `${ImageCacheManager.cacheDirectory}${data.image}`, + }); } const { data: result, error } = await apiClient.packs.items({ itemId: String(id) }).patch(data); if (error) throw new Error(`Failed to update pack item: ${error.value}`); diff --git a/apps/expo/features/packs/store/packWeightHistory.ts b/apps/expo/features/packs/store/packWeightHistory.ts index 75dc2f32a1..472c6353cc 100644 --- a/apps/expo/features/packs/store/packWeightHistory.ts +++ b/apps/expo/features/packs/store/packWeightHistory.ts @@ -1,7 +1,7 @@ import { observable, syncState } from '@legendapp/state'; import { syncObservable } from '@legendapp/state/sync'; import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; -import { PackWeightHistoryResponseSchema } from '@packrat/api/schemas/packs'; +import { PackWeightHistoryResponseSchema } from '@packrat/schemas/packs'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; @@ -66,14 +66,14 @@ syncObservable( ); export function recordPackWeight(packId: string) { - const pack = obs(packsStore, packId).peek(); + const pack = obs({ store: packsStore, id: packId }).peek(); const packItems = Object.values(packItemsStore.peek()).filter( (item) => item.packId === packId && !item.deleted, ); - const { totalWeight } = computePackWeights({ ...pack, items: packItems }); + const { totalWeight } = computePackWeights({ pack: { ...pack, items: packItems } }); const id = nanoid(); - obs(packWeigthHistoryStore, id).set({ + obs({ store: packWeigthHistoryStore, id: id }).set({ id, packId, weight: totalWeight, diff --git a/apps/expo/features/packs/store/packs.ts b/apps/expo/features/packs/store/packs.ts index 4cf21b0b8b..f73daf13e3 100644 --- a/apps/expo/features/packs/store/packs.ts +++ b/apps/expo/features/packs/store/packs.ts @@ -1,7 +1,7 @@ import { observable, syncState } from '@legendapp/state'; import { syncObservable } from '@legendapp/state/sync'; import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; -import { PackWithWeightsSchema } from '@packrat/api/schemas/packs'; +import { PackWithWeightsSchema } from '@packrat/schemas/packs'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; diff --git a/apps/expo/features/packs/types.ts b/apps/expo/features/packs/types.ts index 9b6f433895..512988ee48 100644 --- a/apps/expo/features/packs/types.ts +++ b/apps/expo/features/packs/types.ts @@ -1,6 +1,6 @@ +import type { PackCategory, WeightUnit } from '@packrat/constants'; import type { CatalogItem } from 'expo-app/features/catalog/types'; import type { PackTemplateItem } from 'expo-app/features/pack-templates/types'; -import type { PackCategory, WeightUnit } from 'expo-app/types'; export type { PackCategory, WeightUnit }; diff --git a/apps/expo/features/packs/utils/__tests__/computeCategories.test.ts b/apps/expo/features/packs/utils/__tests__/computeCategories.test.ts new file mode 100644 index 0000000000..471639df78 --- /dev/null +++ b/apps/expo/features/packs/utils/__tests__/computeCategories.test.ts @@ -0,0 +1,131 @@ +import type { Pack, PackItem } from 'expo-app/features/packs/types'; +import { describe, expect, it, vi } from 'vitest'; +import { computeCategorySummaries } from '../computeCategories'; + +vi.mock('expo-app/features/auth/store', () => ({ + userStore: { + preferredWeightUnit: { + peek: vi.fn().mockReturnValue('g'), + }, + }, +})); + +function makeItem( + overrides: Partial & Pick, +): PackItem { + return { + id: 'item-1', + name: 'Test Item', + quantity: 1, + category: 'Shelter', + consumable: false, + worn: false, + packId: 'pack-1', + deleted: false, + isAIGenerated: false, + ...overrides, + }; +} + +function makePack(items: PackItem[]): Pack { + return { + id: 'pack-1', + name: 'Test Pack', + category: 'hiking', + isPublic: false, + deleted: false, + items, + baseWeight: 0, + totalWeight: 0, + }; +} + +describe('computeCategorySummaries', () => { + it('returns empty array for a pack with no items', () => { + expect(computeCategorySummaries(makePack([]))).toEqual([]); + }); + + it('groups items under the correct category name', () => { + const items = [ + makeItem({ id: 'i1', weight: 200, weightUnit: 'g', category: 'Shelter' }), + makeItem({ id: 'i2', weight: 300, weightUnit: 'g', category: 'Food' }), + ]; + const result = computeCategorySummaries(makePack(items)); + expect(result).toHaveLength(2); + const names = result.map((c) => c.name); + expect(names).toContain('Shelter'); + expect(names).toContain('Food'); + }); + + it('falls back to "Other" for empty category string', () => { + const items = [makeItem({ id: 'i1', weight: 100, weightUnit: 'g', category: '' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.name).toBe('Other'); + }); + + it('falls back to "Other" for whitespace-only category', () => { + const items = [makeItem({ id: 'i1', weight: 100, weightUnit: 'g', category: ' ' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.name).toBe('Other'); + }); + + it('computes weight in preferred unit (grams)', () => { + const items = [makeItem({ weight: 500, weightUnit: 'g', category: 'Pack' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.weight).toBe(500); + }); + + it('converts weight units before computing (kg → g)', () => { + const items = [makeItem({ weight: 1, weightUnit: 'kg', category: 'Pack' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.weight).toBe(1000); + }); + + it('multiplies weight by quantity', () => { + const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 3, category: 'Food' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.weight).toBe(300); + }); + + it('sets percentage to 100 for a single-category pack', () => { + const items = [makeItem({ weight: 300, weightUnit: 'g', category: 'Electronics' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.percentage).toBe(100); + }); + + it('splits percentage evenly across equal-weight categories', () => { + const items = [ + makeItem({ id: 'i1', weight: 500, weightUnit: 'g', category: 'Shelter' }), + makeItem({ id: 'i2', weight: 500, weightUnit: 'g', category: 'Food' }), + ]; + const result = computeCategorySummaries(makePack(items)); + for (const cat of result) { + expect(cat.percentage).toBe(50); + } + }); + + it('counts item rows (not total quantity) in each category', () => { + const items = [ + makeItem({ id: 'i1', weight: 100, weightUnit: 'g', quantity: 5, category: 'Food' }), + makeItem({ id: 'i2', weight: 200, weightUnit: 'g', quantity: 2, category: 'Food' }), + ]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.items).toBe(2); + }); + + it('merges multiple items in the same category', () => { + const items = [ + makeItem({ id: 'i1', weight: 300, weightUnit: 'g', category: 'Shelter' }), + makeItem({ id: 'i2', weight: 200, weightUnit: 'g', category: 'Shelter' }), + ]; + const result = computeCategorySummaries(makePack(items)); + expect(result).toHaveLength(1); + expect(result[0]?.weight).toBe(500); + }); + + it('sets percentage to 0 when total weight is zero', () => { + const items = [makeItem({ weight: 0, weightUnit: 'g', category: 'Empty' })]; + const result = computeCategorySummaries(makePack(items)); + expect(result[0]?.percentage).toBe(0); + }); +}); diff --git a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts b/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts index 80b1608278..10599e629b 100644 --- a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts +++ b/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts @@ -30,7 +30,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(250); // (100 * 2) + (50 * 1) expect(result.baseWeight).toBe(250); @@ -53,7 +53,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(1000); // 1 kg = 1000 g expect(result.baseWeight).toBe(1000); @@ -87,7 +87,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(1500); // 1000 + 500 expect(result.baseWeight).toBe(1000); // only tent (food is consumable) @@ -128,7 +128,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(4000); // 2000 + (500 * 2) + 1000 expect(result.baseWeight).toBe(2000); // only backpack @@ -162,7 +162,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(1300); // 1000 + 300 expect(result.baseWeight).toBe(1000); // only tent (jacket is worn) @@ -203,7 +203,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(3100); // 2000 + 300 + 800 expect(result.baseWeight).toBe(2000); // only backpack @@ -246,7 +246,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(1800); // 1000 + 500 + 300 expect(result.baseWeight).toBe(1000); // only tent @@ -271,7 +271,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(1000); }); @@ -293,7 +293,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack, 'oz'); + const result = computePackWeights({ pack, preferredUnit: 'oz' }); expect(result.totalWeight).toBeCloseTo(10, 1); }); @@ -315,7 +315,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack, 'kg'); + const result = computePackWeights({ pack, preferredUnit: 'kg' }); expect(result.totalWeight).toBe(2); }); @@ -337,7 +337,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack, 'lb'); + const result = computePackWeights({ pack, preferredUnit: 'lb' }); expect(result.totalWeight).toBeCloseTo(1, 1); }); @@ -351,7 +351,7 @@ describe('computePackWeights', () => { items: [] as PackItem[], } as unknown as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(0); expect(result.baseWeight).toBe(0); @@ -374,7 +374,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(0); expect(result.baseWeight).toBe(0); @@ -397,7 +397,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.totalWeight).toBe(100.12); expect(result.baseWeight).toBe(100.12); @@ -411,7 +411,7 @@ describe('computePackWeights', () => { items: [] as PackItem[], } as unknown as Omit; - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.id).toBe('1'); expect(result.name).toBe('Test Pack'); @@ -473,7 +473,7 @@ describe('computePackWeights', () => { ], } as Omit; - const result = computePackWeights(pack, 'kg'); + const result = computePackWeights({ pack, preferredUnit: 'kg' }); expect(result.totalWeight).toBe(6.4); // 1.5 + 1 + 2.4 + 0.5 + 1 expect(result.baseWeight).toBe(2.5); // 1.5 + 1 (tent + sleeping bag only) diff --git a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts b/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts index 852d0124d9..7cef88a41d 100644 --- a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts +++ b/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts @@ -4,109 +4,109 @@ import { convertFromGrams } from '../convertFromGrams'; describe('convertFromGrams', () => { describe('metric conversions', () => { it('returns same value for grams', () => { - expect(convertFromGrams(100, 'g')).toBe(100); - expect(convertFromGrams(0, 'g')).toBe(0); - expect(convertFromGrams(1, 'g')).toBe(1); + expect(convertFromGrams({ grams: 100, unit: 'g' })).toBe(100); + expect(convertFromGrams({ grams: 0, unit: 'g' })).toBe(0); + expect(convertFromGrams({ grams: 1, unit: 'g' })).toBe(1); }); it('converts grams to kilograms correctly', () => { - expect(convertFromGrams(1000, 'kg')).toBe(1); - expect(convertFromGrams(2500, 'kg')).toBe(2.5); - expect(convertFromGrams(100, 'kg')).toBe(0.1); - expect(convertFromGrams(500, 'kg')).toBe(0.5); + expect(convertFromGrams({ grams: 1000, unit: 'kg' })).toBe(1); + expect(convertFromGrams({ grams: 2500, unit: 'kg' })).toBe(2.5); + expect(convertFromGrams({ grams: 100, unit: 'kg' })).toBe(0.1); + expect(convertFromGrams({ grams: 500, unit: 'kg' })).toBe(0.5); }); }); describe('imperial conversions (NIST avoirdupois values)', () => { it('converts grams to ounces correctly', () => { - expect(convertFromGrams(28.349523125, 'oz')).toBe(1); // exact NIST value - expect(convertFromGrams(56.69904625, 'oz')).toBeCloseTo(2, 10); - expect(convertFromGrams(14.174761562, 'oz')).toBeCloseTo(0.5, 8); + expect(convertFromGrams({ grams: 28.349523125, unit: 'oz' })).toBe(1); // exact NIST value + expect(convertFromGrams({ grams: 56.69904625, unit: 'oz' })).toBeCloseTo(2, 10); + expect(convertFromGrams({ grams: 14.174761562, unit: 'oz' })).toBeCloseTo(0.5, 8); }); it('converts grams to pounds correctly', () => { - expect(convertFromGrams(453.59237, 'lb')).toBe(1); // exact NIST value - expect(convertFromGrams(907.18474, 'lb')).toBeCloseTo(2, 10); - expect(convertFromGrams(226.796185, 'lb')).toBeCloseTo(0.5, 8); + expect(convertFromGrams({ grams: 453.59237, unit: 'lb' })).toBe(1); // exact NIST value + expect(convertFromGrams({ grams: 907.18474, unit: 'lb' })).toBeCloseTo(2, 10); + expect(convertFromGrams({ grams: 226.796185, unit: 'lb' })).toBeCloseTo(0.5, 8); }); }); describe('edge cases', () => { it('handles zero weight', () => { - expect(convertFromGrams(0, 'kg')).toBe(0); - expect(convertFromGrams(0, 'oz')).toBe(0); - expect(convertFromGrams(0, 'lb')).toBe(0); - expect(convertFromGrams(0, 'g')).toBe(0); + expect(convertFromGrams({ grams: 0, unit: 'kg' })).toBe(0); + expect(convertFromGrams({ grams: 0, unit: 'oz' })).toBe(0); + expect(convertFromGrams({ grams: 0, unit: 'lb' })).toBe(0); + expect(convertFromGrams({ grams: 0, unit: 'g' })).toBe(0); }); it('handles very small weights', () => { - expect(convertFromGrams(1, 'kg')).toBe(0.001); - expect(convertFromGrams(1, 'oz')).toBeCloseTo(0.03527, 4); - expect(convertFromGrams(1, 'lb')).toBeCloseTo(0.002205, 4); + expect(convertFromGrams({ grams: 1, unit: 'kg' })).toBe(0.001); + expect(convertFromGrams({ grams: 1, unit: 'oz' })).toBeCloseTo(0.03527, 4); + expect(convertFromGrams({ grams: 1, unit: 'lb' })).toBeCloseTo(0.002205, 4); }); it('handles very large weights', () => { - expect(convertFromGrams(1000000, 'kg')).toBe(1000); + expect(convertFromGrams({ grams: 1000000, unit: 'kg' })).toBe(1000); // 1,000,000 / 28.349523125 ≈ 35273.96 (NIST exact, not the old 35273.37) - expect(convertFromGrams(1000000, 'oz')).toBeCloseTo(35273.96, 1); - expect(convertFromGrams(1000000, 'lb')).toBeCloseTo(2204.62, 0); + expect(convertFromGrams({ grams: 1000000, unit: 'oz' })).toBeCloseTo(35273.96, 1); + expect(convertFromGrams({ grams: 1000000, unit: 'lb' })).toBeCloseTo(2204.62, 0); }); it('handles negative weights', () => { - expect(convertFromGrams(-1000, 'kg')).toBe(-1); - expect(convertFromGrams(-28.349523125, 'oz')).toBeCloseTo(-1, 10); - expect(convertFromGrams(-453.59237, 'lb')).toBeCloseTo(-1, 10); + expect(convertFromGrams({ grams: -1000, unit: 'kg' })).toBe(-1); + expect(convertFromGrams({ grams: -28.349523125, unit: 'oz' })).toBeCloseTo(-1, 10); + expect(convertFromGrams({ grams: -453.59237, unit: 'lb' })).toBeCloseTo(-1, 10); }); }); describe('round-trip conversions (using same factor both ways)', () => { it('maintains exact accuracy when converting to grams and back', () => { - const ozValue = convertFromGrams(100, 'oz'); + const ozValue = convertFromGrams({ grams: 100, unit: 'oz' }); expect(ozValue).toBeCloseTo(3.527, 3); - const lbValue = convertFromGrams(1000, 'lb'); + const lbValue = convertFromGrams({ grams: 1000, unit: 'lb' }); expect(lbValue).toBeCloseTo(2.205, 3); }); }); describe('decimal precision', () => { it('handles decimal weights accurately', () => { - expect(convertFromGrams(1500, 'kg')).toBe(1.5); - expect(convertFromGrams(123.456, 'kg')).toBeCloseTo(0.123456, 6); - expect(convertFromGrams(123.456, 'oz')).toBeCloseTo(4.355, 2); - expect(convertFromGrams(123.456, 'lb')).toBeCloseTo(0.272, 3); + expect(convertFromGrams({ grams: 1500, unit: 'kg' })).toBe(1.5); + expect(convertFromGrams({ grams: 123.456, unit: 'kg' })).toBeCloseTo(0.123456, 6); + expect(convertFromGrams({ grams: 123.456, unit: 'oz' })).toBeCloseTo(4.355, 2); + expect(convertFromGrams({ grams: 123.456, unit: 'lb' })).toBeCloseTo(0.272, 3); }); }); describe('real-world scenarios', () => { it('converts typical camping gear weights correctly', () => { - expect(convertFromGrams(1814.369, 'lb')).toBeCloseTo(4, 1); - expect(convertFromGrams(1133.981, 'lb')).toBeCloseTo(2.5, 1); - expect(convertFromGrams(680.388, 'oz')).toBeCloseTo(24, 0); - expect(convertFromGrams(1500, 'kg')).toBe(1.5); + expect(convertFromGrams({ grams: 1814.369, unit: 'lb' })).toBeCloseTo(4, 1); + expect(convertFromGrams({ grams: 1133.981, unit: 'lb' })).toBeCloseTo(2.5, 1); + expect(convertFromGrams({ grams: 680.388, unit: 'oz' })).toBeCloseTo(24, 0); + expect(convertFromGrams({ grams: 1500, unit: 'kg' })).toBe(1.5); }); it('handles ultralight gear weights', () => { - expect(convertFromGrams(226.796, 'oz')).toBeCloseTo(8, 0); - expect(convertFromGrams(14.1748, 'oz')).toBeCloseTo(0.5, 1); - expect(convertFromGrams(250, 'g')).toBe(250); + expect(convertFromGrams({ grams: 226.796, unit: 'oz' })).toBeCloseTo(8, 0); + expect(convertFromGrams({ grams: 14.1748, unit: 'oz' })).toBeCloseTo(0.5, 1); + expect(convertFromGrams({ grams: 250, unit: 'g' })).toBe(250); }); it('converts between metric and imperial for common weights', () => { // 1 kg in lbs - expect(convertFromGrams(1000, 'lb')).toBeCloseTo(2.20462, 4); + expect(convertFromGrams({ grams: 1000, unit: 'lb' })).toBeCloseTo(2.20462, 4); // 1 oz in kg - expect(convertFromGrams(28.349523125, 'kg')).toBeCloseTo(0.02835, 5); + expect(convertFromGrams({ grams: 28.349523125, unit: 'kg' })).toBeCloseTo(0.02835, 5); }); }); describe('display formatting scenarios', () => { it('provides sensible values for UI display', () => { - const heavyItem = convertFromGrams(1000, 'oz'); // ~35.27 oz + const heavyItem = convertFromGrams({ grams: 1000, unit: 'oz' }); // ~35.27 oz expect(heavyItem).toBeGreaterThan(35); expect(heavyItem).toBeLessThan(36); - const lightKg = convertFromGrams(250, 'kg'); // 0.25 kg + const lightKg = convertFromGrams({ grams: 250, unit: 'kg' }); // 0.25 kg expect(lightKg).toBe(0.25); }); }); diff --git a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts b/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts index 0e392d7368..408e7dc857 100644 --- a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts +++ b/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts @@ -4,85 +4,85 @@ import { convertToGrams } from '../convertToGrams'; describe('convertToGrams', () => { describe('metric conversions', () => { it('returns same value for grams', () => { - expect(convertToGrams(100, 'g')).toBe(100); - expect(convertToGrams(0, 'g')).toBe(0); - expect(convertToGrams(1, 'g')).toBe(1); + expect(convertToGrams({ weight: 100, unit: 'g' })).toBe(100); + expect(convertToGrams({ weight: 0, unit: 'g' })).toBe(0); + expect(convertToGrams({ weight: 1, unit: 'g' })).toBe(1); }); it('converts kilograms to grams correctly', () => { - expect(convertToGrams(1, 'kg')).toBe(1000); - expect(convertToGrams(2.5, 'kg')).toBe(2500); - expect(convertToGrams(0.1, 'kg')).toBe(100); + expect(convertToGrams({ weight: 1, unit: 'kg' })).toBe(1000); + expect(convertToGrams({ weight: 2.5, unit: 'kg' })).toBe(2500); + expect(convertToGrams({ weight: 0.1, unit: 'kg' })).toBe(100); }); }); describe('imperial conversions (NIST avoirdupois values)', () => { it('converts ounces to grams correctly', () => { - expect(convertToGrams(1, 'oz')).toBe(28.349523125); - expect(convertToGrams(16, 'oz')).toBeCloseTo(453.59237, 4); // 1 lb worth - expect(convertToGrams(0.5, 'oz')).toBeCloseTo(14.174761562, 6); + expect(convertToGrams({ weight: 1, unit: 'oz' })).toBe(28.349523125); + expect(convertToGrams({ weight: 16, unit: 'oz' })).toBeCloseTo(453.59237, 4); // 1 lb worth + expect(convertToGrams({ weight: 0.5, unit: 'oz' })).toBeCloseTo(14.174761562, 6); }); it('converts pounds to grams correctly', () => { - expect(convertToGrams(1, 'lb')).toBe(453.59237); - expect(convertToGrams(2, 'lb')).toBeCloseTo(907.18474, 4); - expect(convertToGrams(0.5, 'lb')).toBeCloseTo(226.796185, 4); + expect(convertToGrams({ weight: 1, unit: 'lb' })).toBe(453.59237); + expect(convertToGrams({ weight: 2, unit: 'lb' })).toBeCloseTo(907.18474, 4); + expect(convertToGrams({ weight: 0.5, unit: 'lb' })).toBeCloseTo(226.796185, 4); }); }); describe('edge cases', () => { it('handles zero weight', () => { - expect(convertToGrams(0, 'kg')).toBe(0); - expect(convertToGrams(0, 'oz')).toBe(0); - expect(convertToGrams(0, 'lb')).toBe(0); + expect(convertToGrams({ weight: 0, unit: 'kg' })).toBe(0); + expect(convertToGrams({ weight: 0, unit: 'oz' })).toBe(0); + expect(convertToGrams({ weight: 0, unit: 'lb' })).toBe(0); }); it('handles very small weights', () => { - expect(convertToGrams(0.001, 'kg')).toBe(1); - expect(convertToGrams(0.001, 'oz')).toBeCloseTo(0.028349523125, 8); + expect(convertToGrams({ weight: 0.001, unit: 'kg' })).toBe(1); + expect(convertToGrams({ weight: 0.001, unit: 'oz' })).toBeCloseTo(0.028349523125, 8); }); it('handles very large weights', () => { - expect(convertToGrams(1000, 'kg')).toBe(1000000); - expect(convertToGrams(1000, 'lb')).toBeCloseTo(453592.37, 1); + expect(convertToGrams({ weight: 1000, unit: 'kg' })).toBe(1000000); + expect(convertToGrams({ weight: 1000, unit: 'lb' })).toBeCloseTo(453592.37, 1); }); it('handles negative weights', () => { - expect(convertToGrams(-1, 'kg')).toBe(-1000); - expect(convertToGrams(-1, 'oz')).toBe(-28.349523125); + expect(convertToGrams({ weight: -1, unit: 'kg' })).toBe(-1000); + expect(convertToGrams({ weight: -1, unit: 'oz' })).toBe(-28.349523125); }); it('returns weight unchanged for unknown units (falls back to g)', () => { - expect(convertToGrams(100, 'invalid')).toBe(100); - expect(convertToGrams(100, '')).toBe(100); - expect(convertToGrams(100, 'stone')).toBe(100); + expect(convertToGrams({ weight: 100, unit: 'invalid' })).toBe(100); + expect(convertToGrams({ weight: 100, unit: '' })).toBe(100); + expect(convertToGrams({ weight: 100, unit: 'stone' })).toBe(100); }); }); describe('decimal precision', () => { it('handles decimal weights accurately', () => { - expect(convertToGrams(1.5, 'kg')).toBe(1500); - expect(convertToGrams(2.75, 'oz')).toBeCloseTo(77.961188, 4); - expect(convertToGrams(3.333, 'lb')).toBeCloseTo(1511.82, 2); + expect(convertToGrams({ weight: 1.5, unit: 'kg' })).toBe(1500); + expect(convertToGrams({ weight: 2.75, unit: 'oz' })).toBeCloseTo(77.961188, 4); + expect(convertToGrams({ weight: 3.333, unit: 'lb' })).toBeCloseTo(1511.82, 2); }); it('preserves precision for very precise decimal inputs', () => { - expect(convertToGrams(0.123456, 'kg')).toBeCloseTo(123.456, 3); + expect(convertToGrams({ weight: 0.123456, unit: 'kg' })).toBeCloseTo(123.456, 3); }); }); describe('real-world scenarios', () => { it('converts typical camping gear weights correctly', () => { - expect(convertToGrams(4, 'lb')).toBeCloseTo(1814.369, 2); - expect(convertToGrams(2.5, 'lb')).toBeCloseTo(1133.981, 2); - expect(convertToGrams(24, 'oz')).toBeCloseTo(680.388, 2); - expect(convertToGrams(1.5, 'kg')).toBe(1500); + expect(convertToGrams({ weight: 4, unit: 'lb' })).toBeCloseTo(1814.369, 2); + expect(convertToGrams({ weight: 2.5, unit: 'lb' })).toBeCloseTo(1133.981, 2); + expect(convertToGrams({ weight: 24, unit: 'oz' })).toBeCloseTo(680.388, 2); + expect(convertToGrams({ weight: 1.5, unit: 'kg' })).toBe(1500); }); it('handles ultralight gear weights', () => { - expect(convertToGrams(8, 'oz')).toBeCloseTo(226.796, 2); - expect(convertToGrams(0.5, 'oz')).toBeCloseTo(14.1748, 3); - expect(convertToGrams(250, 'g')).toBe(250); + expect(convertToGrams({ weight: 8, unit: 'oz' })).toBeCloseTo(226.796, 2); + expect(convertToGrams({ weight: 0.5, unit: 'oz' })).toBeCloseTo(14.1748, 3); + expect(convertToGrams({ weight: 250, unit: 'g' })).toBe(250); }); }); }); diff --git a/apps/expo/features/packs/utils/computeCategories.ts b/apps/expo/features/packs/utils/computeCategories.ts index ead666b091..362c0f05bc 100644 --- a/apps/expo/features/packs/utils/computeCategories.ts +++ b/apps/expo/features/packs/utils/computeCategories.ts @@ -11,14 +11,19 @@ export type CategorySummary = { }; export function computeCategorySummaries(pack: Pack): CategorySummary[] { - const preferredUnit = parseWeightUnit(userStore.preferredWeightUnit.peek(), 'g'); + const preferredUnit = parseWeightUnit({ + value: userStore.preferredWeightUnit.peek(), + fallback: 'g', + }); const categoryMap: Record = {}; let totalWeightGrams = 0; for (const item of pack.items) { const category = item.category?.trim() || 'Other'; - const itemGrams = normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity; + const itemGrams = + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity; totalWeightGrams += itemGrams; @@ -34,7 +39,7 @@ export function computeCategorySummaries(pack: Pack): CategorySummary[] { return Object.entries(categoryMap).map(([name, data]) => ({ name, items: data.items, - weight: displayWeight(data.weightInGrams, preferredUnit), + weight: displayWeight({ grams: data.weightInGrams, unit: preferredUnit }), percentage: Number( (totalWeightGrams > 0 ? (data.weightInGrams / totalWeightGrams) * 100 : 0).toFixed(1), ), diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/apps/expo/features/packs/utils/computePackWeights.ts index 396115d900..85c653af8a 100644 --- a/apps/expo/features/packs/utils/computePackWeights.ts +++ b/apps/expo/features/packs/utils/computePackWeights.ts @@ -2,16 +2,20 @@ import type { WeightUnit } from '@packrat/units'; import { displayWeight, normalize, parseWeightUnit } from '@packrat/units'; import type { Pack } from '../types'; -export const computePackWeights = ( - pack: Omit, - preferredUnit: WeightUnit = 'g', -): Pack => { +export const computePackWeights = ({ + pack, + preferredUnit = 'g', +}: { + pack: Omit; + preferredUnit?: WeightUnit; +}): Pack => { let baseWeightGrams = 0; let totalWeightGrams = 0; for (const item of pack.items) { const itemWeightInGrams = - normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity; + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity; totalWeightGrams += itemWeightInGrams; if (!item.consumable && !item.worn) { baseWeightGrams += itemWeightInGrams; @@ -20,7 +24,7 @@ export const computePackWeights = ( return { ...pack, - baseWeight: displayWeight(baseWeightGrams, preferredUnit), - totalWeight: displayWeight(totalWeightGrams, preferredUnit), + baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }), + totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }), }; }; diff --git a/apps/expo/features/packs/utils/convertFromGrams.ts b/apps/expo/features/packs/utils/convertFromGrams.ts index a7fcd200b0..bd54cb3f40 100644 --- a/apps/expo/features/packs/utils/convertFromGrams.ts +++ b/apps/expo/features/packs/utils/convertFromGrams.ts @@ -1,4 +1,5 @@ import type { WeightUnit } from '@packrat/units'; import { fromGrams } from '@packrat/units'; -export const convertFromGrams = (grams: number, unit: WeightUnit): number => fromGrams(grams, unit); +export const convertFromGrams = ({ grams, unit }: { grams: number; unit: WeightUnit }): number => + fromGrams({ grams, unit }); diff --git a/apps/expo/features/packs/utils/convertToGrams.ts b/apps/expo/features/packs/utils/convertToGrams.ts index 15f55700ac..e136bd87e9 100644 --- a/apps/expo/features/packs/utils/convertToGrams.ts +++ b/apps/expo/features/packs/utils/convertToGrams.ts @@ -1,5 +1,5 @@ import { normalize, parseWeightUnit } from '@packrat/units'; -export function convertToGrams(weight: number, unit: string): number { - return normalize(weight, parseWeightUnit(unit)); +export function convertToGrams({ weight, unit }: { weight: number; unit: string }): number { + return normalize({ weight, unit: parseWeightUnit({ value: unit }) }); } diff --git a/apps/expo/features/packs/utils/uploadImage.ts b/apps/expo/features/packs/utils/uploadImage.ts index 384c2bc8a1..a14792a708 100644 --- a/apps/expo/features/packs/utils/uploadImage.ts +++ b/apps/expo/features/packs/utils/uploadImage.ts @@ -2,7 +2,13 @@ import { userStore } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import * as FileSystem from 'expo-file-system/legacy'; -export const uploadImage = async (fileName: string, uri: string): Promise => { +export const uploadImage = async ({ + fileName, + uri, +}: { + fileName: string; + uri: string; +}): Promise => { if (!fileName || fileName.trim() === '') { console.warn('Skipping upload: fileName is empty'); return; @@ -12,7 +18,10 @@ export const uploadImage = async (fileName: string, uri: string): Promise { +const getPresignedUrl = async ({ + fileName, + contentType, +}: { + fileName: string; + contentType: string; +}) => { const { data, error } = await apiClient.upload.presigned.get({ query: { fileName, contentType }, }); diff --git a/apps/expo/features/packs/utils/uploadImage.web.ts b/apps/expo/features/packs/utils/uploadImage.web.ts index bda654704a..82bd91346d 100644 --- a/apps/expo/features/packs/utils/uploadImage.web.ts +++ b/apps/expo/features/packs/utils/uploadImage.web.ts @@ -7,10 +7,13 @@ import { userStore } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; -export const uploadImage = async ( - fileName: string, - blobOrDataUrl: string, -): Promise => { +export const uploadImage = async ({ + fileName, + uri, +}: { + fileName: string; + uri: string; +}): Promise => { if (!fileName || fileName.trim() === '') { console.warn('Skipping upload: fileName is empty'); return; @@ -21,10 +24,13 @@ export const uploadImage = async ( const type = `image/${fileExtension === 'jpg' ? 'jpeg' : fileExtension}`; const remoteFileName = `${userStore.id.peek()}-${fileName}`; - const { url: presignedUrl } = await getPresignedUrl(remoteFileName, type); + const { url: presignedUrl } = await getPresignedUrl({ + fileName: remoteFileName, + contentType: type, + }); // Convert data URL / blob URL to a Blob for upload - const blob = await urlToBlob(blobOrDataUrl, type); + const blob = await urlToBlob({ url: uri, type }); const uploadResponse = await fetch(presignedUrl, { method: 'PUT', @@ -43,10 +49,13 @@ export const uploadImage = async ( } }; -const getPresignedUrl = async ( - fileName: string, - contentType: string, -): Promise<{ url: string; publicUrl: string; objectKey: string }> => { +const getPresignedUrl = async ({ + fileName, + contentType, +}: { + fileName: string; + contentType: string; +}): Promise<{ url: string; publicUrl: string; objectKey: string }> => { const { data, error } = await apiClient.upload.presigned.get({ query: { fileName, contentType }, }); @@ -54,7 +63,7 @@ const getPresignedUrl = async ( return data; }; -async function urlToBlob(url: string, type: string): Promise { +async function urlToBlob({ url, type }: { url: string; type: string }): Promise { if (url.startsWith('data:')) { const arr = url.split(','); const bstr = atob(arr[1] ?? ''); diff --git a/apps/expo/features/profile/components/ProfileAuthWall.tsx b/apps/expo/features/profile/components/ProfileAuthWall.tsx index fee0cdc17f..3c5f03d103 100644 --- a/apps/expo/features/profile/components/ProfileAuthWall.tsx +++ b/apps/expo/features/profile/components/ProfileAuthWall.tsx @@ -1,14 +1,16 @@ import { Button, Text } from '@packrat/ui/nativewindui'; import { Icon, type MaterialIconName } from 'expo-app/components/Icon'; +import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; -import { Stack, usePathname, useRouter } from 'expo-router'; -import { View } from 'react-native'; +import { Link, Stack, usePathname, useRouter } from 'expo-router'; +import { Pressable, View } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; export function ProfileAuthWall() { const router = useRouter(); const currentRoute = usePathname(); const { t } = useTranslation(); + const { colors } = useColorScheme(); const SCREEN_OPTIONS = { title: t('profile.profile'), @@ -19,6 +21,14 @@ export function ProfileAuthWall() { + + + + + + + + diff --git a/apps/expo/features/profile/types.ts b/apps/expo/features/profile/types.ts index 433004df47..00836cd2eb 100644 --- a/apps/expo/features/profile/types.ts +++ b/apps/expo/features/profile/types.ts @@ -1,4 +1,4 @@ -import type { UserSchema } from '@packrat/api/schemas/users'; +import type { UserSchema } from '@packrat/schemas/users'; import type { z } from 'zod'; import type { WeightUnit } from '../packs/types'; diff --git a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts b/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts index bcb16fa563..7b902bf850 100644 --- a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts +++ b/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts @@ -1,3 +1,4 @@ +import { useQueryClient } from '@tanstack/react-query'; import { nanoid } from 'nanoid'; import { useCallback, useEffect, useRef, useState } from 'react'; import { @@ -97,6 +98,7 @@ function waitForSyncDrain(signal: { cancelled: boolean }): Promise(null); const mountedRef = useRef(true); @@ -149,6 +151,9 @@ export function useSubmitTrailConditionReport(): SubmitResult { // the user's perspective — their data is safely persisted locally. await waitForSyncDrain(signal); if (!mountedRef.current || signal.cancelled) return id; + // Invalidate the list query so the screen reflects the new report + // without requiring an app reload. + await queryClient.invalidateQueries({ queryKey: ['trailConditionReports'] }); setIsPending(false); options?.onSuccess?.(id); return id; @@ -162,7 +167,7 @@ export function useSubmitTrailConditionReport(): SubmitResult { throw asError; } }, - [], + [queryClient], ); const reset = useCallback(() => { diff --git a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts b/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts index f0887a9dad..5ac2853fc0 100644 --- a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts +++ b/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts @@ -10,18 +10,24 @@ import type { TrailConditionReport } from '../types'; const CACHE_KEY_PREFIX = 'trail_condition_reports_cache'; -function cacheKey(userId: string, trailName?: string): string { +function cacheKey({ userId, trailName }: { userId: string; trailName?: string }): string { const base = `${CACHE_KEY_PREFIX}:${userId}`; return trailName ? `${base}:${trailName}` : base; } /** Persist fetched reports to AsyncStorage for offline / cold-start access. */ -async function writeCachedReports( - reports: TrailConditionReport[], - opts: { userId: string; trailName?: string }, -) { +async function writeCachedReports({ + reports, + opts, +}: { + reports: TrailConditionReport[]; + opts: { userId: string; trailName?: string }; +}) { try { - await AsyncStorage.setItem(cacheKey(opts.userId, opts.trailName), JSON.stringify(reports)); + await AsyncStorage.setItem( + cacheKey({ userId: opts.userId, trailName: opts.trailName }), + JSON.stringify(reports), + ); } catch { // Best-effort — swallow write errors silently } @@ -33,7 +39,9 @@ async function readCachedReports(opts: { trailName?: string; }): Promise { try { - const raw = await AsyncStorage.getItem(cacheKey(opts.userId, opts.trailName)); + const raw = await AsyncStorage.getItem( + cacheKey({ userId: opts.userId, trailName: opts.trailName }), + ); // safe-cast: JSON.parse returns unknown; data was written as TrailConditionReport[] earlier if (raw) return JSON.parse(raw) as TrailConditionReport[]; } catch { @@ -107,7 +115,7 @@ export function useTrailConditionReports(trailName?: string) { useEffect(() => { if (query.data && query.data !== prevDataRef.current && query.isFetched) { prevDataRef.current = query.data; - writeCachedReports(query.data, { userId: currentUserId, trailName }); + writeCachedReports({ reports: query.data, opts: { userId: currentUserId, trailName } }); } }, [query.data, query.isFetched, currentUserId, trailName]); diff --git a/apps/expo/features/trail-conditions/store/trailConditionReports.ts b/apps/expo/features/trail-conditions/store/trailConditionReports.ts index 0ddc8d5115..c4b8253a98 100644 --- a/apps/expo/features/trail-conditions/store/trailConditionReports.ts +++ b/apps/expo/features/trail-conditions/store/trailConditionReports.ts @@ -1,13 +1,13 @@ import { observable, syncState } from '@legendapp/state'; import { syncObservable } from '@legendapp/state/sync'; import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; -import { TrailConditionReportSchema } from '@packrat/api/schemas/trailConditions'; +import { TrailConditionReportSchema } from '@packrat/schemas/trailConditions'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; import type { TrailConditionReportInStore } from '../types'; -const listMyReports = async (_params: unknown, { lastSync }: { lastSync?: number } = {}) => { +const _listMyReportsImpl = async ({ lastSync }: { lastSync?: number } = {}) => { const { data, error } = await apiClient['trail-conditions'].mine.get({ query: lastSync != null ? { updatedAt: new Date(lastSync + 1).toISOString() } : {}, }); @@ -86,7 +86,7 @@ syncObservable( backoff: 'exponential', maxDelay: 30000, }, - list: listMyReports, + list: (_params: unknown, opts?: { lastSync?: number }) => _listMyReportsImpl(opts), create: createReport, update: updateReport, changesSince: 'last-sync', diff --git a/apps/expo/features/trips/components/TrailConditionsTile.tsx b/apps/expo/features/trips/components/TrailConditionsTile.tsx index ca57e1c64f..ee4971f7b4 100644 --- a/apps/expo/features/trips/components/TrailConditionsTile.tsx +++ b/apps/expo/features/trips/components/TrailConditionsTile.tsx @@ -19,7 +19,7 @@ export function TrailConditionsTile() { router.push('/trail-conditions'); }; - if (!featureFlags.enableTrips) return null; + if (!featureFlags.enableTrailConditions) return null; return ( <> diff --git a/apps/expo/features/trips/components/TripCard.tsx b/apps/expo/features/trips/components/TripCard.tsx index 000ca6c05f..aef934b570 100644 --- a/apps/expo/features/trips/components/TripCard.tsx +++ b/apps/expo/features/trips/components/TripCard.tsx @@ -17,7 +17,13 @@ interface TripCardProps { onPress?: (trip: Trip) => void; } -function getTripDurationDays(startDate?: string, endDate?: string): number | null { +function getTripDurationDays({ + startDate, + endDate, +}: { + startDate?: string; + endDate?: string; +}): number | null { if (!startDate || !endDate) return null; const start = new Date(startDate); const end = new Date(endDate); @@ -41,7 +47,7 @@ export function TripCard({ trip, onPress }: TripCardProps) { const alertRef = useRef(null); const insets = useSafeAreaInsets(); - const durationDays = getTripDurationDays(trip.startDate, trip.endDate); + const durationDays = getTripDurationDays({ startDate: trip.startDate, endDate: trip.endDate }); const handleActionsPress = () => { const options = [ diff --git a/apps/expo/features/trips/hooks/useCreateTrip.ts b/apps/expo/features/trips/hooks/useCreateTrip.ts index 30cf45edbd..3c79492e68 100644 --- a/apps/expo/features/trips/hooks/useCreateTrip.ts +++ b/apps/expo/features/trips/hooks/useCreateTrip.ts @@ -17,7 +17,7 @@ export function useCreateTrip() { localUpdatedAt: timestamp, deleted: false, }; - obs(tripsStore, id).set(newTrip); + obs({ store: tripsStore, id: id }).set(newTrip); return id; }, []); diff --git a/apps/expo/features/trips/hooks/useDeleteTrip.ts b/apps/expo/features/trips/hooks/useDeleteTrip.ts index 147ef9edfd..d67c3db035 100644 --- a/apps/expo/features/trips/hooks/useDeleteTrip.ts +++ b/apps/expo/features/trips/hooks/useDeleteTrip.ts @@ -1,17 +1,14 @@ import { tripsStore } from 'expo-app/features/trips/store/trips'; -import { apiClient } from 'expo-app/lib/api/packrat'; import { obs } from 'expo-app/lib/store'; import { useCallback } from 'react'; export function useDeleteTrip() { - const deleteTrip = useCallback(async (id: string) => { - // Optimistically mark as deleted in the local store so the UI updates immediately - const tripObs = obs(tripsStore, id); + const deleteTrip = useCallback((id: string) => { + // Soft delete by setting deleted flag + const tripObs = obs({ store: tripsStore, id: id }); if (tripObs) { tripObs.deleted.set(true); } - // Hard-delete on the server so the list GET won't return the trip on any subsequent reload - await apiClient.trips({ tripId: id }).delete(); }, []); return deleteTrip; diff --git a/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts b/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts index 8c3909b4b7..f947fa1506 100644 --- a/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts +++ b/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts @@ -11,7 +11,7 @@ import { obs } from 'expo-app/lib/store'; */ export function useTripDetailsFromStore(id: string) { const trip = use$(() => { - const trip_ = obs(tripsStore, id).get(); + const trip_ = obs({ store: tripsStore, id: id }).get(); return trip_; }); diff --git a/apps/expo/features/trips/hooks/useUpdateTrip.ts b/apps/expo/features/trips/hooks/useUpdateTrip.ts index 47c8d8b3e8..c59821b82b 100644 --- a/apps/expo/features/trips/hooks/useUpdateTrip.ts +++ b/apps/expo/features/trips/hooks/useUpdateTrip.ts @@ -5,7 +5,7 @@ import type { Trip } from '../types'; export function useUpdateTrip() { const updateTrip = useCallback((trip: Trip) => { - obs(tripsStore, trip.id).set({ + obs({ store: tripsStore, id: trip.id }).set({ ...trip, localUpdatedAt: new Date().toISOString(), }); diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/apps/expo/features/trips/screens/TripDetailScreen.tsx index 029ba46be4..7a8c9d5bff 100644 --- a/apps/expo/features/trips/screens/TripDetailScreen.tsx +++ b/apps/expo/features/trips/screens/TripDetailScreen.tsx @@ -1,15 +1,21 @@ import { assertDefined } from '@packrat/guards'; -import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui'; +import type { AlertMethods } from '@packrat/ui/nativewindui'; +import { + ActivityIndicator, + Alert as AlertComponent, + Button, + Card, + Text, +} from '@packrat/ui/nativewindui'; import { Icon } from 'expo-app/components/Icon'; import { featureFlags } from 'expo-app/config'; import { SubmitConditionReportForm } from 'expo-app/features/trail-conditions/components/SubmitConditionReportForm'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { testIds } from 'expo-app/lib/testIds'; -import type { Href } from 'expo-router'; import { useLocalSearchParams, useRouter } from 'expo-router'; -import { useMemo, useState } from 'react'; -import { Alert, Modal, Platform, ScrollView, Share, View } from 'react-native'; +import { useMemo, useRef, useState } from 'react'; +import { Modal, ScrollView, Share, View } from 'react-native'; import MapView, { Marker } from 'react-native-maps'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useDetailedPacks } from '../../packs/hooks/useDetailedPacks'; @@ -24,6 +30,7 @@ export function TripDetailScreen() { const { t } = useTranslation(); const [showConditionReport, setShowConditionReport] = useState(false); + const alertRef = useRef(null); // safe-cast: trip may be undefined before the store is hydrated; the guard at line ~38 handles // the undefined case and returns early, ensuring trip is non-null at render time below. @@ -70,6 +77,24 @@ export function TripDetailScreen() { } }; + const handleDeleteTrip = () => { + alertRef.current?.alert({ + title: t('trips.deleteTrip'), + message: t('trips.deleteTripConfirmation'), + buttons: [ + { text: t('common.cancel'), style: 'cancel' }, + { + text: t('common.delete'), + style: 'destructive', + onPress: async () => { + await deleteTrip(id as string); + router.back(); + }, + }, + ], + }); + }; + const handleWeatherPress = () => { if (!trip.location) return; @@ -116,31 +141,7 @@ export function TripDetailScreen() { variant="plain" size="icon" testID={testIds.trips.deleteBtn} - onPress={async () => { - if (Platform.OS === 'web') { - if (window.confirm(t('trips.deleteTripConfirmation'))) { - await deleteTrip(id as string); - if (router.canGoBack()) { - router.back(); - } else { - // safe-cast: '/trips' is a compile-time string literal recognised by expo-router - router.replace('/trips' as Href); - } - } - } else { - Alert.alert(t('trips.deleteTrip'), t('trips.deleteTripConfirmation'), [ - { text: t('common.cancel'), style: 'cancel' }, - { - text: t('common.delete'), - style: 'destructive', - onPress: async () => { - await deleteTrip(id as string); - router.back(); - }, - }, - ]); - } - }} + onPress={handleDeleteTrip} > {/* Dates */} - + {t('trips.dates')} @@ -316,6 +317,7 @@ export function TripDetailScreen() { /> + ); } diff --git a/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx b/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx index bddef8c413..b2aaf741ab 100644 --- a/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx +++ b/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx @@ -1,4 +1,4 @@ -import type { WeatherAPIForecastResponse } from '@packrat/api/schemas/weather'; +import type { WeatherAPIForecastResponse } from '@packrat/schemas/weather'; import { Icon } from 'expo-app/components/Icon'; import { WeatherForecast } from 'expo-app/features/weather/components/WeatherForecast'; import { @@ -43,7 +43,7 @@ export default function TripWeatherDetailsScreen() { setLoading(true); setError(null); - const locations = await searchLocationsByCoordinates(latitude, longitude); + const locations = await searchLocationsByCoordinates({ latitude, longitude }); const first = locations[0]; if (!first) throw new Error('No location found for these coordinates'); const weather = await getWeatherData(first.id); @@ -52,7 +52,7 @@ export default function TripWeatherDetailsScreen() { const weatherCode = weather.current?.condition?.code || 1000; const isNight = weather.current?.is_day === 0; - setGradientColors(getWeatherBackgroundColors(weatherCode, isNight)); + setGradientColors(getWeatherBackgroundColors({ code: weatherCode, isNight })); } catch (e) { console.error(e); setError('Failed to load weather'); diff --git a/apps/expo/features/trips/store/trips.ts b/apps/expo/features/trips/store/trips.ts index 32952f9cdc..719db7dc2a 100644 --- a/apps/expo/features/trips/store/trips.ts +++ b/apps/expo/features/trips/store/trips.ts @@ -1,7 +1,7 @@ import { observable, syncState } from '@legendapp/state'; import { syncObservable } from '@legendapp/state/sync'; import { syncedCrud } from '@legendapp/state/sync-plugins/crud'; -import { TripSchema } from '@packrat/api/schemas/trips'; +import { TripSchema } from '@packrat/schemas/trips'; import { isAuthed } from 'expo-app/features/auth/store'; import { apiClient } from 'expo-app/lib/api/packrat'; import { persistPlugin } from 'expo-app/lib/persist-plugin'; diff --git a/apps/expo/features/weather/components/WeatherAlertsTile.tsx b/apps/expo/features/weather/components/WeatherAlertsTile.tsx index c3f42bfd1f..0a59921fce 100644 --- a/apps/expo/features/weather/components/WeatherAlertsTile.tsx +++ b/apps/expo/features/weather/components/WeatherAlertsTile.tsx @@ -1,16 +1,13 @@ -import type { AlertMethods } from '@packrat/ui/nativewindui'; -import { Alert, ListItem, Text } from '@packrat/ui/nativewindui'; +import { ListItem, Text } from '@packrat/ui/nativewindui'; import { Icon } from 'expo-app/components/Icon'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { useRouter } from 'expo-router'; -import { useRef } from 'react'; import { Platform, View } from 'react-native'; import { useWeatherAlerts } from '../hooks/useWeatherAlert'; export function WeatherAlertsTile() { const router = useRouter(); - const alertRef = useRef(null); const { t } = useTranslation(); const { alerts, loading } = useWeatherAlerts(); @@ -22,47 +19,32 @@ export function WeatherAlertsTile() { }; return ( - <> - - - - + + + - } - rightView={ - - - {loading ? '...' : t('weather.activeCount', { count: weatherAlertCount })} - - - - } - item={{ - title: t('weather.weatherAlerts'), - }} - onPress={handlePress} - target="Cell" - index={0} - removeSeparator={Platform.OS === 'ios'} - /> - - + + } + rightView={ + + + {loading ? '...' : t('weather.activeCount', { count: weatherAlertCount })} + + + + } + item={{ + title: t('weather.weatherAlerts'), + }} + onPress={handlePress} + target="Cell" + index={0} + removeSeparator={Platform.OS === 'ios'} + /> ); } diff --git a/apps/expo/features/weather/components/WeatherIcon.tsx b/apps/expo/features/weather/components/WeatherIcon.tsx index 7cdf6ec53a..bce7995795 100644 --- a/apps/expo/features/weather/components/WeatherIcon.tsx +++ b/apps/expo/features/weather/components/WeatherIcon.tsx @@ -25,10 +25,10 @@ export function WeatherIcon({ if (code !== undefined) { // If we have a code, use that for mapping - iconName = getWeatherIconName(code, isDay); + iconName = getWeatherIconName({ code, isDay }); } else if (condition) { // If we have condition text, use that for mapping - iconName = getWeatherIconByCondition(condition, isDay); + iconName = getWeatherIconByCondition({ condition, isDay }); } else { // Default fallback iconName = isDay ? 'weather-sunny' : 'weather-night'; diff --git a/apps/expo/features/weather/hooks/useLocationRefresh.ts b/apps/expo/features/weather/hooks/useLocationRefresh.ts index c9ad3a8e92..2d1ee35a40 100644 --- a/apps/expo/features/weather/hooks/useLocationRefresh.ts +++ b/apps/expo/features/weather/hooks/useLocationRefresh.ts @@ -18,8 +18,11 @@ export function useLocationRefresh() { if (weatherData) { const formattedData = formatWeatherData(weatherData); - // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure - updateLocation(locationId, formattedData as unknown as Partial); + updateLocation({ + locationId, + // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure + updates: formattedData as unknown as Partial, + }); return true; } @@ -48,8 +51,11 @@ export function useLocationRefresh() { if (weatherData) { const formattedData = formatWeatherData(weatherData); - // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure - updateLocation(location.id, formattedData as unknown as Partial); + updateLocation({ + locationId: location.id, + // safe-cast: formattedData is shaped by weatherService which guarantees WeatherLocation structure + updates: formattedData as unknown as Partial, + }); } } catch (error) { console.error(`Error updating weather for ${location.name}:`, error); diff --git a/apps/expo/features/weather/hooks/useLocationSearch.ts b/apps/expo/features/weather/hooks/useLocationSearch.ts index 36574bf651..fedb6bb835 100644 --- a/apps/expo/features/weather/hooks/useLocationSearch.ts +++ b/apps/expo/features/weather/hooks/useLocationSearch.ts @@ -34,12 +34,18 @@ export function useLocationSearch() { } }; - const searchByCoordinates = async (latitude: number, longitude: number) => { + const searchByCoordinates = async ({ + latitude, + longitude, + }: { + latitude: number; + longitude: number; + }) => { setIsLoading(true); setError(null); try { - const searchResults = await searchLocationsByCoordinates(latitude, longitude); + const searchResults = await searchLocationsByCoordinates({ latitude, longitude }); if (searchResults.length === 0) { setError('No locations found near your current position. Please try searching manually.'); diff --git a/apps/expo/features/weather/hooks/useLocations.ts b/apps/expo/features/weather/hooks/useLocations.ts index 0be9178811..842fbec207 100644 --- a/apps/expo/features/weather/hooks/useLocations.ts +++ b/apps/expo/features/weather/hooks/useLocations.ts @@ -29,7 +29,13 @@ export function useLocations() { setBaseLocations(locations.filter((loc) => loc.id !== locationId)); }; - const updateLocation = (locationId: number, updates: Partial) => { + const updateLocation = ({ + locationId, + updates, + }: { + locationId: number; + updates: Partial; + }) => { if (locationsState.state !== 'hasData') return; const locations = locationsState.data; diff --git a/apps/expo/features/weather/hooks/useWeatherAlert.ts b/apps/expo/features/weather/hooks/useWeatherAlert.ts index 1a462f2ad2..53776636d2 100644 --- a/apps/expo/features/weather/hooks/useWeatherAlert.ts +++ b/apps/expo/features/weather/hooks/useWeatherAlert.ts @@ -1,3 +1,4 @@ +import * as Sentry from '@sentry/react-native'; import { getWeatherData } from 'expo-app/features/weather/lib/weatherService'; import { useAtomValue } from 'jotai'; import { useEffect, useState } from 'react'; @@ -52,10 +53,13 @@ export type WeatherApiData = { type ActiveLocation = { name?: string } | null; -export function generateAlerts( - data: WeatherApiData | undefined, - activeLocation: ActiveLocation, -): WeatherAlert[] { +export function generateAlerts({ + data, + activeLocation, +}: { + data: WeatherApiData | undefined; + activeLocation: ActiveLocation; +}): WeatherAlert[] { const locationName = data?.location?.name || activeLocation?.name || 'Unknown'; const apiAlerts = data?.alerts?.alert; @@ -229,38 +233,64 @@ export function generateAlerts( export function useWeatherAlerts() { const activeLocation = useAtomValue(activeLocationAtom); + // Use primitive values as effect dependencies to avoid re-running on new + // object references emitted by the derived Jotai atom's .find() call. + const locationId = activeLocation?.id; + const locationName = activeLocation?.name; + const [alerts, setAlerts] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); useEffect(() => { - if (!activeLocation?.id) { + if (!locationId) { setLoading(false); return; } - const locationId = activeLocation.id; + const id = locationId; + let cancelled = false; async function fetchAlerts() { setLoading(true); setError(null); + Sentry.addBreadcrumb({ + category: 'weather', + message: 'Fetching weather alerts', + level: 'info', + data: { locationId, locationName }, + }); + try { - const data = await getWeatherData(locationId); - // safe-cast: getWeatherData returns WeatherApiForecastResponse; WeatherApiData is a - // structural subset of that type used only by this alert generator. - const formatted = generateAlerts(data as unknown as WeatherApiData, activeLocation); + const data = await getWeatherData(id); + if (cancelled) return; + + const formatted = generateAlerts({ + // safe-cast: getWeatherData returns WeatherApiForecastResponse; WeatherApiData is a structural subset used only by this alert generator. + data: data as unknown as WeatherApiData, + activeLocation: { name: locationName }, + }); setAlerts(formatted); } catch (err) { + if (cancelled) return; console.error('Weather alerts error:', err); setError('Failed to fetch weather alerts'); + Sentry.captureException(err, { + tags: { feature: 'weatherAlerts', action: 'fetchAlerts' }, + extra: { locationId, locationName }, + }); } finally { - setLoading(false); + if (!cancelled) setLoading(false); } } fetchAlerts(); - }, [activeLocation]); + + return () => { + cancelled = true; + }; + }, [locationId, locationName]); return { alerts, diff --git a/apps/expo/features/weather/lib/weatherIcons.ts b/apps/expo/features/weather/lib/weatherIcons.ts index 29f986d0a7..78b4c09240 100644 --- a/apps/expo/features/weather/lib/weatherIcons.ts +++ b/apps/expo/features/weather/lib/weatherIcons.ts @@ -7,7 +7,13 @@ import type { MaterialIconName } from 'expo-app/components/Icon'; * @returns The icon name to use */ -export function getWeatherIconName(code: number, isDay = 1): MaterialIconName { +export function getWeatherIconName({ + code, + isDay = 1, +}: { + code: number; + isDay?: number; +}): MaterialIconName { // Clear conditions if (code === 1000) { return isDay ? 'weather-sunny' : 'weather-night'; @@ -83,7 +89,13 @@ export function getWeatherIconName(code: number, isDay = 1): MaterialIconName { * @returns The icon name to use */ -export function getWeatherIconByCondition(condition: string, isDay = 1): MaterialIconName { +export function getWeatherIconByCondition({ + condition, + isDay = 1, +}: { + condition: string; + isDay?: number; +}): MaterialIconName { const conditionLower = condition.toLowerCase(); // Clear, sunny @@ -151,7 +163,13 @@ export function getWeatherIconByCondition(condition: string, isDay = 1): Materia * Get background gradient colors based on weather condition */ -export function getWeatherBackgroundColors(code: number, isNight: boolean): string[] { +export function getWeatherBackgroundColors({ + code, + isNight, +}: { + code: number; + isNight: boolean; +}): string[] { if (isNight) { // Night gradients if (code === 1000) return ['#1a2a3a', '#0c1824', '#05101a']; // Clear night diff --git a/apps/expo/features/weather/lib/weatherService.ts b/apps/expo/features/weather/lib/weatherService.ts index 89f4078671..897b0e7801 100644 --- a/apps/expo/features/weather/lib/weatherService.ts +++ b/apps/expo/features/weather/lib/weatherService.ts @@ -1,9 +1,9 @@ +import { assertDefined } from '@packrat/guards'; import { LocationSearchResponseSchema, type WeatherAPIForecastResponse, WeatherAPIForecastResponseSchema, -} from '@packrat/api/schemas/weather'; -import { assertDefined } from '@packrat/guards'; +} from '@packrat/schemas/weather'; import * as Sentry from '@sentry/react-native'; import { apiClient } from 'expo-app/lib/api/packrat'; import { getWeatherIconName as getIconNameFromCode } from './weatherIcons'; @@ -29,7 +29,13 @@ export async function searchLocations(query: string) { /** * Search for locations by coordinates */ -export async function searchLocationsByCoordinates(latitude: number, longitude: number) { +export async function searchLocationsByCoordinates({ + latitude, + longitude, +}: { + latitude: number; + longitude: number; +}) { const { data, error } = await apiClient.weather['search-by-coordinates'].get({ query: { lat: latitude.toFixed(6), lon: longitude.toFixed(6) }, }); @@ -99,7 +105,7 @@ export function formatWeatherData(data: WeatherAPIForecastResponse) { hour12: true, }), temp: Math.round(hour.temp_f), - icon: getIconNameFromCode(hour.condition.code, hour.is_day) as string, + icon: getIconNameFromCode({ code: hour.condition.code, isDay: hour.is_day }) as string, weatherCode: hour.condition.code, isDay: hour.is_day, }; @@ -112,7 +118,7 @@ export function formatWeatherData(data: WeatherAPIForecastResponse) { day: date.toLocaleDateString('en-US', { weekday: 'short' }), high: Math.round(day.day.maxtemp_f), low: Math.round(day.day.mintemp_f), - icon: getIconNameFromCode(day.day.condition.code, 1) as string, // Always use day icon for daily forecast + icon: getIconNameFromCode({ code: day.day.condition.code, isDay: 1 }) as string, // Always use day icon for daily forecast weatherCode: day.day.condition.code, }; }); @@ -151,10 +157,13 @@ export function formatWeatherData(data: WeatherAPIForecastResponse) { /** * Get background gradient colors based on weather condition */ -export function getWeatherBackgroundColors( - code: number, - isNight: boolean, -): [string, string, string] { +export function getWeatherBackgroundColors({ + code, + isNight, +}: { + code: number; + isNight: boolean; +}): [string, string, string] { if (isNight) { if (code === 1000) return ['#1a2a3a', '#0c1824', '#05101a']; if (code >= 1003 && code <= 1009) return ['#2c3e50', '#1a2a3a', '#0c1824']; diff --git a/apps/expo/features/weather/screens/LocationDetailScreen.tsx b/apps/expo/features/weather/screens/LocationDetailScreen.tsx index 7fd6bf7319..2e046aa543 100644 --- a/apps/expo/features/weather/screens/LocationDetailScreen.tsx +++ b/apps/expo/features/weather/screens/LocationDetailScreen.tsx @@ -48,7 +48,7 @@ export default function LocationDetailScreen() { if (location.details) { const weatherCode = location.details.weatherCode || 1000; const isNight = location.details.isDay === 0; - setGradientColors(getWeatherBackgroundColors(weatherCode, isNight)); + setGradientColors(getWeatherBackgroundColors({ code: weatherCode, isNight })); } } }; diff --git a/apps/expo/features/weather/screens/LocationPreviewScreen.tsx b/apps/expo/features/weather/screens/LocationPreviewScreen.tsx index b3ea514a48..264b66a00e 100644 --- a/apps/expo/features/weather/screens/LocationPreviewScreen.tsx +++ b/apps/expo/features/weather/screens/LocationPreviewScreen.tsx @@ -63,7 +63,7 @@ export default function LocationPreviewScreen() { if (formattedData.details) { const weatherCode = formattedData.details.weatherCode || 1000; const isNight = formattedData.details.isDay === 0; - setGradientColors(getWeatherBackgroundColors(weatherCode, isNight)); + setGradientColors(getWeatherBackgroundColors({ code: weatherCode, isNight })); } } else { setError(t('weather.failedToLoadWeather')); diff --git a/apps/expo/features/weather/screens/LocationSearchScreen.tsx b/apps/expo/features/weather/screens/LocationSearchScreen.tsx index 43822e5695..f0365f95a7 100644 --- a/apps/expo/features/weather/screens/LocationSearchScreen.tsx +++ b/apps/expo/features/weather/screens/LocationSearchScreen.tsx @@ -212,7 +212,10 @@ export default function LocationSearchScreen() { ])) as Location.LocationObject; // Search for locations near coordinates - await searchByCoordinates(location.coords.latitude, location.coords.longitude); + await searchByCoordinates({ + latitude: location.coords.latitude, + longitude: location.coords.longitude, + }); // Clear search query since we're showing results based on coordinates setQuery(''); diff --git a/apps/expo/features/weather/screens/LocationsScreen.tsx b/apps/expo/features/weather/screens/LocationsScreen.tsx index 1c48d033b2..0e3584c5b4 100644 --- a/apps/expo/features/weather/screens/LocationsScreen.tsx +++ b/apps/expo/features/weather/screens/LocationsScreen.tsx @@ -251,4 +251,4 @@ function LocationsScreen() { ); } -export default withAuthWall(LocationsScreen, WeatherAuthWall); +export default withAuthWall({ Component: LocationsScreen, AuthWall: WeatherAuthWall }); diff --git a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts b/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts index 0dc6794346..d9095e00ac 100644 --- a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts +++ b/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts @@ -10,7 +10,7 @@ import type { IdentificationResult } from '../types'; const isIdentifyResponse = zodGuard(z.object({ results: z.array(z.unknown()) })); async function identifyOnline(selectedImage: SelectedImage): Promise { - const image = await uploadImage(selectedImage.fileName, selectedImage.uri); + const image = await uploadImage({ fileName: selectedImage.fileName, uri: selectedImage.uri }); if (!image) { throw new Error( `Couldn't upload image${selectedImage.fileName ? ` "${selectedImage.fileName}"` : ' (no filename provided)'}`, diff --git a/apps/expo/lib/api/getBaseUrl.ts b/apps/expo/lib/api/getBaseUrl.ts new file mode 100644 index 0000000000..8196bb0435 --- /dev/null +++ b/apps/expo/lib/api/getBaseUrl.ts @@ -0,0 +1,10 @@ +import { clientEnvs } from '@packrat/env/expo-client'; +import { Platform } from 'react-native'; + +export function getApiBaseUrl(): string { + const url = clientEnvs.EXPO_PUBLIC_API_URL; + if (Platform.OS === 'android') { + return url.split('localhost').join('10.0.2.2'); + } + return url; +} diff --git a/apps/expo/lib/api/packrat.ts b/apps/expo/lib/api/packrat.ts index 05dac97f7a..cf85382b93 100644 --- a/apps/expo/lib/api/packrat.ts +++ b/apps/expo/lib/api/packrat.ts @@ -1,20 +1,48 @@ import { createApiClient } from '@packrat/api-client'; -import { clientEnvs } from '@packrat/env/expo-client'; +import { fromZod } from '@packrat/guards'; import { store } from 'expo-app/atoms/store'; import { needsReauthAtom } from 'expo-app/features/auth/atoms/authAtoms'; +import { getApiBaseUrl } from 'expo-app/lib/api/getBaseUrl'; import { authClient } from 'expo-app/lib/auth-client'; +import * as SecureStore from 'expo-secure-store'; +import { z } from 'zod'; + +// The expoClient plugin serialises all cookies into SecureStore under this key. +// Parsing it locally avoids a network round-trip on every API request. +const COOKIE_STORE_KEY = 'packrat_cookie'; + +const CookieStoreSchema = z.record(z.object({ value: z.string() })); + +// expoClient stores cookies as JSON: { "better-auth.session_token": { value, expires } } +// HTTPS servers (remote dev/prod) prefix the cookie name with __Secure-; HTTP (local) does not. +function parseSessionToken(cookieJson: string | null): string | null { + if (!cookieJson) return null; + const cookies = fromZod(CookieStoreSchema)(JSON.parse(cookieJson)); + if (!cookies) return null; + return ( + cookies['better-auth.session_token']?.value ?? + cookies['__Secure-better-auth.session_token']?.value ?? + null + ); +} export const apiClient = createApiClient({ - baseUrl: clientEnvs.EXPO_PUBLIC_API_URL, + baseUrl: getApiBaseUrl(), auth: { + // Read the token from SecureStore — no network call on every API request. getAccessToken: async () => { - const { data } = await authClient.getSession(); - return data?.session?.token ?? null; + const cookieStr = await SecureStore.getItemAsync(COOKIE_STORE_KEY); + return parseSessionToken(cookieStr); }, - // Better Auth manages session renewal internally — no separate refresh token flow. + // Better Auth has no separate refresh-token endpoint; the 7-day session + // token is the only credential. Returning null here is intentional. getRefreshToken: () => null, onAccessTokenRefreshed: () => {}, - onNeedsReauth: () => { + onNeedsReauth: async () => { + // A 401 can be transient (e.g. the server briefly returned an error). + // Verify the session is actually gone before alarming the user. + const { data } = await authClient.getSession(); + if (data?.session) return; store.set(needsReauthAtom, true); }, }, diff --git a/apps/expo/lib/auth-client.ts b/apps/expo/lib/auth-client.ts index b685923235..f2556aee28 100644 --- a/apps/expo/lib/auth-client.ts +++ b/apps/expo/lib/auth-client.ts @@ -1,10 +1,10 @@ import { expoClient } from '@better-auth/expo/client'; -import { clientEnvs } from '@packrat/env/expo-client'; import { createAuthClient } from 'better-auth/react'; +import { getApiBaseUrl } from 'expo-app/lib/api/getBaseUrl'; import * as SecureStore from 'expo-secure-store'; export const authClient = createAuthClient({ - baseURL: clientEnvs.EXPO_PUBLIC_API_URL, + baseURL: getApiBaseUrl(), plugins: [ expoClient({ scheme: 'packrat', diff --git a/apps/expo/lib/hooks/useColorScheme.tsx b/apps/expo/lib/hooks/useColorScheme.tsx index 3c637c8480..f351657df1 100644 --- a/apps/expo/lib/hooks/useColorScheme.tsx +++ b/apps/expo/lib/hooks/useColorScheme.tsx @@ -18,7 +18,7 @@ function useColorScheme() { } function toggleColorScheme() { - return setColorScheme(colorScheme === 'light' ? 'dark' : 'light'); + return setColorScheme((colorScheme ?? 'light') === 'light' ? 'dark' : 'light'); } return { diff --git a/apps/expo/lib/hooks/useKeyboardHideBlur.tsx b/apps/expo/lib/hooks/useKeyboardHideBlur.tsx index 2f0ef2bf00..e74bc56e6d 100644 --- a/apps/expo/lib/hooks/useKeyboardHideBlur.tsx +++ b/apps/expo/lib/hooks/useKeyboardHideBlur.tsx @@ -9,10 +9,13 @@ import { Keyboard } from 'react-native'; * @param options - Optional configuration * @param options.enabled - Whether the hook should be active (default: true) */ -export function useKeyboardHideBlur( - textInputRef: React.RefObject<{ blur?: () => void } | null>, - options?: { enabled?: boolean }, -) { +export function useKeyboardHideBlur({ + textInputRef, + options, +}: { + textInputRef: React.RefObject<{ blur?: () => void } | null>; + options?: { enabled?: boolean }; +}) { const { enabled = true } = options ?? {}; useEffect(() => { diff --git a/apps/expo/lib/i18n/locales/en.json b/apps/expo/lib/i18n/locales/en.json index e383c554fa..8f960aee78 100644 --- a/apps/expo/lib/i18n/locales/en.json +++ b/apps/expo/lib/i18n/locales/en.json @@ -53,7 +53,13 @@ "tryAgain": "Try again", "tryAgainButton": "Try Again", "unexpectedError": "The application encountered an unexpected error. You can try again or go back to the home screen.", - "error": "Error" + "error": "Error", + "contextOverflow": { + "title": "Conversation too long", + "description": "The on-device model ran out of context window. Local AI can only hold a limited amount of conversation history at once.", + "hint": "Clear the chat to start a fresh conversation, or switch to cloud mode for longer sessions.", + "clearChat": "Clear chat" + } }, "auth": { "signIn": "Sign In", @@ -227,7 +233,7 @@ "createPack": "Create Pack", "editPack": "Edit Pack", "noPacks": "No packs available", - "packName": "Pack Name", + "packName": "Choose a Pack", "packDescription": "Pack Description", "packWeight": "Pack Weight", "packItems": "Pack Items", @@ -260,6 +266,7 @@ "noCategorizedItems": "Either there are no items in this pack or they aren't categorized yet.", "organizeGear": "Organize your gear by functional categories", "packStats": "Pack Stats", + "selectPack": "Select a Pack", "weightHistory": "Weight History", "categoryDistribution": "Category Distribution", "packWeightOverMonths": "Pack weight over the last 6 months (g)", @@ -676,7 +683,9 @@ "downloadModel": "Download Model", "downloadingModel": "Downloading...", "modelReady": "Ready", - "modelNotReady": "Model not ready. Download the local model first.", + "modelNotReady": "Download the local model first.", + "modelStillLoading": "Model is still loading, please wait.", + "modelStillDownloading": "Model is still downloading, please wait.", "modelPreparing": "Loading model...", "modelError": "Model error", "deleteModel": "Delete Model", @@ -684,7 +693,8 @@ "downloadedModels": "Downloaded Models", "noDownloadedModels": "No models downloaded", "appleFoundationModel": "Apple Foundation Model", - "llamaModel": "SmolLM3 3B", + "llamaModel": "Qwen2.5 3B", + "localInferenceSlowNote": "Local AI performance may vary by device.", "generateNewPacks": "Generate New Packs", "enterCount": "Enter count", "numberOfPacksToGenerate": "Number of packs to generate", diff --git a/apps/expo/lib/store.ts b/apps/expo/lib/store.ts index a4bc2c6816..c8efdb1c1b 100644 --- a/apps/expo/lib/store.ts +++ b/apps/expo/lib/store.ts @@ -18,7 +18,13 @@ import { assertDefined } from '@packrat/guards'; * // Use: * obs(packItemsStore, id).deleted.set(true); */ -export function obs(store: Observable>, id: string): Observable { +export function obs({ + store, + id, +}: { + store: Observable>; + id: string; +}): Observable { // safe-cast: Legend-State v3 uses JavaScript Proxy for deep reactive access via store[id]; // TypeScript resolves store[id] to T rather than Observable, so we bridge with a single cast. const observable = (store as unknown as Record>)[id]; diff --git a/apps/expo/lib/utils/ImageCacheManager.ts b/apps/expo/lib/utils/ImageCacheManager.ts index 210066b5b9..2f19a1d7f1 100644 --- a/apps/expo/lib/utils/ImageCacheManager.ts +++ b/apps/expo/lib/utils/ImageCacheManager.ts @@ -40,7 +40,13 @@ export class ImageCacheManager { * Download and cache an image */ - public async cacheRemoteImage(fileName: string, remoteUrl: string): Promise { + public async cacheRemoteImage({ + fileName, + remoteUrl, + }: { + fileName: string; + remoteUrl: string; + }): Promise { await this.initCacheDirectory(); const localUri = `${this.cacheDirectory}${fileName}`; @@ -55,17 +61,44 @@ export class ImageCacheManager { Accept: 'image/webp,image/apng,image/*,*/*;q=0.8', }, }; - const downloadResult = await FileSystem.downloadAsync(remoteUrl, localUri, downloadOptions); - - if (downloadResult.status !== 200) { - throw new Error(`Failed to download image: ${downloadResult.status}`); + const timeout = new Promise((_, reject) => + setTimeout(() => reject(new Error('Image download timed out')), 15_000), + ); + const downloadResult = await Promise.race([ + FileSystem.downloadAsync(remoteUrl, localUri, downloadOptions), + timeout, + ]); + + const contentType = + downloadResult.headers?.['content-type'] ?? downloadResult.headers?.['Content-Type'] ?? ''; + const invalidContent = + downloadResult.status !== 200 || (!contentType.startsWith('image/') && contentType !== ''); + + if (invalidContent) { + // downloadAsync writes the response body to disk even on failure or wrong content type; + // delete it so subsequent getCachedImageUri calls don't treat it as a valid cache hit. + const partialFile = await FileSystem.getInfoAsync(localUri); + if (partialFile.exists) { + await FileSystem.deleteAsync(localUri); + } + throw new Error( + downloadResult.status !== 200 + ? `Failed to download image: ${downloadResult.status}` + : `Invalid content type: ${contentType}`, + ); } } return localUri; } - public async cacheLocalTempImage(tempImageUri: string, fileName: string): Promise { + public async cacheLocalTempImage({ + tempImageUri, + fileName, + }: { + tempImageUri: string; + fileName: string; + }): Promise { await this.initCacheDirectory(); const localUri = `${this.cacheDirectory}${fileName}`; diff --git a/apps/expo/lib/utils/ImageCacheManager.web.ts b/apps/expo/lib/utils/ImageCacheManager.web.ts index 3e71cdcaf9..c6f1a765c8 100644 --- a/apps/expo/lib/utils/ImageCacheManager.web.ts +++ b/apps/expo/lib/utils/ImageCacheManager.web.ts @@ -12,11 +12,16 @@ class WebImageCacheManager { return null; } - public async cacheRemoteImage(_fileName: string, remoteUrl: string): Promise { + public async cacheRemoteImage({ + remoteUrl, + }: { + fileName: string; + remoteUrl: string; + }): Promise { return remoteUrl; } - public async cacheLocalTempImage(_tempImageUri: string, _fileName: string): Promise {} + public async cacheLocalTempImage(_: { tempImageUri: string; fileName: string }): Promise {} public async clearImage(_fileName: string): Promise {} diff --git a/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts b/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts index bc783211a6..2a794dfd3f 100644 --- a/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts +++ b/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts @@ -111,7 +111,10 @@ describe('ImageCacheManager', () => { .mockResolvedValueOnce({ exists: false } as any); // file exists check vi.mocked(FileSystem.downloadAsync).mockResolvedValue({ status: 200 } as any); - const result = await manager.cacheRemoteImage('test.jpg', 'https://example.com/test.jpg'); + const result = await manager.cacheRemoteImage({ + fileName: 'test.jpg', + remoteUrl: 'https://example.com/test.jpg', + }); expect(FileSystem.downloadAsync).toHaveBeenCalledWith( 'https://example.com/test.jpg', @@ -131,7 +134,10 @@ describe('ImageCacheManager', () => { .mockResolvedValueOnce({ exists: true } as any) // initCacheDirectory check .mockResolvedValueOnce({ exists: true } as any); // file exists check - const result = await manager.cacheRemoteImage('cached.jpg', 'https://example.com/cached.jpg'); + const result = await manager.cacheRemoteImage({ + fileName: 'cached.jpg', + remoteUrl: 'https://example.com/cached.jpg', + }); expect(FileSystem.downloadAsync).not.toHaveBeenCalled(); expect(result).toBe('/mock/documents/images/cached.jpg'); @@ -144,7 +150,10 @@ describe('ImageCacheManager', () => { vi.mocked(FileSystem.downloadAsync).mockResolvedValue({ status: 404 } as any); await expect( - manager.cacheRemoteImage('fail.jpg', 'https://example.com/fail.jpg'), + manager.cacheRemoteImage({ + fileName: 'fail.jpg', + remoteUrl: 'https://example.com/fail.jpg', + }), ).rejects.toThrow('Failed to download image: 404'); }); @@ -154,7 +163,10 @@ describe('ImageCacheManager', () => { .mockResolvedValueOnce({ exists: false } as any); vi.mocked(FileSystem.downloadAsync).mockResolvedValue({ status: 200 } as any); - await manager.cacheRemoteImage('test.jpg', 'https://example.com/test.jpg'); + await manager.cacheRemoteImage({ + fileName: 'test.jpg', + remoteUrl: 'https://example.com/test.jpg', + }); expect(FileSystem.makeDirectoryAsync).toHaveBeenCalled(); }); @@ -167,7 +179,7 @@ describe('ImageCacheManager', () => { it('moves temp image to cache', async () => { vi.mocked(FileSystem.getInfoAsync).mockResolvedValue({ exists: true } as any); - await manager.cacheLocalTempImage('/tmp/temp.jpg', 'final.jpg'); + await manager.cacheLocalTempImage({ tempImageUri: '/tmp/temp.jpg', fileName: 'final.jpg' }); expect(FileSystem.moveAsync).toHaveBeenCalledWith({ from: '/tmp/temp.jpg', @@ -178,7 +190,7 @@ describe('ImageCacheManager', () => { it('initializes cache directory before move', async () => { vi.mocked(FileSystem.getInfoAsync).mockResolvedValue({ exists: false } as any); - await manager.cacheLocalTempImage('/tmp/temp.jpg', 'final.jpg'); + await manager.cacheLocalTempImage({ tempImageUri: '/tmp/temp.jpg', fileName: 'final.jpg' }); expect(FileSystem.makeDirectoryAsync).toHaveBeenCalled(); expect(FileSystem.moveAsync).toHaveBeenCalled(); diff --git a/apps/expo/lib/utils/__tests__/compute-pack.test.ts b/apps/expo/lib/utils/__tests__/compute-pack.test.ts index 90825eac36..9816b22cfe 100644 --- a/apps/expo/lib/utils/__tests__/compute-pack.test.ts +++ b/apps/expo/lib/utils/__tests__/compute-pack.test.ts @@ -1,11 +1,10 @@ -import type { Pack, PackItem } from 'expo-app/types'; +import type { PackItem, PackWithItems } from '@packrat/types'; import { describe, expect, it } from 'vitest'; import { computePacksWeights, computePackWeights } from '../compute-pack'; // --------------------------------------------------------------------------- // Minimal factory helpers // --------------------------------------------------------------------------- -// Arbitrary fixed timestamp used only as a required field value, not asserted on const NOW = new Date().toISOString(); function makePackItem( @@ -14,28 +13,44 @@ function makePackItem( return { id: 'item-1', name: 'Test Item', + description: null, quantity: overrides.quantity ?? 1, + category: null, consumable: overrides.consumable ?? false, worn: overrides.worn ?? false, - category: 'tools', + image: null, + notes: null, packId: 'pack-1', + catalogItemId: null, userId: 'user-1', + deleted: false, + isAIGenerated: false, + templateItemId: null, + embedding: null, createdAt: NOW, updatedAt: NOW, ...overrides, - }; + } as PackItem; } -function makePack(items: PackItem[] = [], overrides: Partial = {}): Pack { +function makePack(items: PackItem[] = [], overrides: Partial = {}): PackWithItems { return { id: 'pack-1', name: 'Test Pack', + description: null, category: 'hiking', - items, userId: 'user-1', + templateId: null, + isPublic: false, + image: null, + tags: null, + deleted: false, + isAIGenerated: false, + localCreatedAt: NOW, + localUpdatedAt: NOW, createdAt: NOW, updatedAt: NOW, - isPublic: false, + items, ...overrides, }; } @@ -45,7 +60,7 @@ function makePack(items: PackItem[] = [], overrides: Partial = {}): Pack { // --------------------------------------------------------------------------- describe('computePackWeights', () => { it('returns zero base and total weight for a pack with no items', () => { - const result = computePackWeights(makePack([])); + const result = computePackWeights({ pack: makePack([]) }); expect(result.baseWeight).toBe(0); expect(result.totalWeight).toBe(0); }); @@ -53,8 +68,8 @@ describe('computePackWeights', () => { it('throws when items property is null/undefined', () => { const pack = makePack(); // Force missing items - (pack as Pack & { items: undefined }).items = undefined; - expect(() => computePackWeights(pack)).toThrow('Pack with ID pack-1 has no items'); + (pack as unknown as { items: undefined }).items = undefined; + expect(() => computePackWeights({ pack })).toThrow('Pack with ID pack-1 has no items'); }); it('calculates correct base and total weight in grams', () => { @@ -62,7 +77,7 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 200, weightUnit: 'g' }), makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }), ]; - const result = computePackWeights(makePack(items)); + const result = computePackWeights({ pack: makePack(items) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(300); }); @@ -72,7 +87,7 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', consumable: true }), makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }), ]; - const result = computePackWeights(makePack(items)); + const result = computePackWeights({ pack: makePack(items) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(100); }); @@ -82,14 +97,14 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', worn: true }), makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }), ]; - const result = computePackWeights(makePack(items)); + const result = computePackWeights({ pack: makePack(items) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(100); }); it('multiplies weight by item quantity', () => { const items = [makePackItem({ weight: 100, weightUnit: 'g', quantity: 3 })]; - const result = computePackWeights(makePack(items)); + const result = computePackWeights({ pack: makePack(items) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(300); }); @@ -99,33 +114,33 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 1, weightUnit: 'kg' }), // 1000 g makePackItem({ id: 'i2', weight: 1000, weightUnit: 'g' }), // 1000 g ]; - const result = computePackWeights(makePack(items)); + const result = computePackWeights({ pack: makePack(items) }); expect(result.totalWeight).toBe(2000); expect(result.baseWeight).toBe(2000); }); it('respects the preferredUnit parameter (oz)', () => { const items = [makePackItem({ weight: 28.35, weightUnit: 'g' })]; - const result = computePackWeights(makePack(items), 'oz'); + const result = computePackWeights({ pack: makePack(items), preferredUnit: 'oz' }); expect(result.totalWeight).toBeCloseTo(1, 1); }); it('respects the preferredUnit parameter (kg)', () => { const items = [makePackItem({ weight: 1000, weightUnit: 'g' })]; - const result = computePackWeights(makePack(items), 'kg'); + const result = computePackWeights({ pack: makePack(items), preferredUnit: 'kg' }); expect(result.totalWeight).toBe(1); }); it('preserves all other pack properties', () => { const pack = makePack([], { name: 'My Pack', category: 'backpacking' }); - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.name).toBe('My Pack'); expect(result.category).toBe('backpacking'); }); it('rounds computed weights to 2 decimal places', () => { const items = [makePackItem({ weight: 100, weightUnit: 'g' })]; - const result = computePackWeights(makePack(items), 'oz'); + const result = computePackWeights({ pack: makePack(items), preferredUnit: 'oz' }); const decimals = result.totalWeight?.toString().split('.')[1]; expect(decimals === undefined || decimals.length <= 2).toBe(true); }); @@ -136,7 +151,7 @@ describe('computePackWeights', () => { // --------------------------------------------------------------------------- describe('computePacksWeights', () => { it('returns an empty array when given no packs', () => { - expect(computePacksWeights([])).toEqual([]); + expect(computePacksWeights({ packs: [] })).toEqual([]); }); it('computes weights for multiple packs', () => { @@ -144,7 +159,7 @@ describe('computePacksWeights', () => { makePack([makePackItem({ weight: 500, weightUnit: 'g' })], { id: 'p1' }), makePack([makePackItem({ weight: 1000, weightUnit: 'g' })], { id: 'p2' }), ]; - const results = computePacksWeights(packs); + const results = computePacksWeights({ packs }); expect(results[0]?.totalWeight).toBe(500); expect(results[1]?.totalWeight).toBe(1000); }); diff --git a/apps/expo/lib/utils/__tests__/dateUtils.test.ts b/apps/expo/lib/utils/__tests__/dateUtils.test.ts new file mode 100644 index 0000000000..51ff86223e --- /dev/null +++ b/apps/expo/lib/utils/__tests__/dateUtils.test.ts @@ -0,0 +1,92 @@ +import { describe, expect, it } from 'vitest'; +import { formatLocalDate, parseLocalDate } from '../dateUtils'; + +describe('parseLocalDate', () => { + it('returns null for undefined', () => { + expect(parseLocalDate(undefined)).toBeNull(); + }); + + it('returns null for empty string', () => { + expect(parseLocalDate('')).toBeNull(); + }); + + it('parses YYYY-MM-DD as a local date with correct year, month, and day', () => { + const result = parseLocalDate('2024-01-15'); + expect(result).not.toBeNull(); + expect(result?.getFullYear()).toBe(2024); + expect(result?.getMonth()).toBe(0); // January + expect(result?.getDate()).toBe(15); + }); + + it('parses end-of-year date correctly', () => { + const result = parseLocalDate('2023-12-31'); + expect(result).not.toBeNull(); + expect(result?.getFullYear()).toBe(2023); + expect(result?.getMonth()).toBe(11); // December + expect(result?.getDate()).toBe(31); + }); + + it('returns null for an invalid YYYY-MM-DD date (month 13)', () => { + expect(parseLocalDate('2024-13-01')).toBeNull(); + }); + + it('returns null for an invalid YYYY-MM-DD date (day 32)', () => { + expect(parseLocalDate('2024-01-32')).toBeNull(); + }); + + it('parses ISO datetime strings', () => { + const result = parseLocalDate('2024-06-15T10:30:00Z'); + expect(result).not.toBeNull(); + expect(result?.getUTCFullYear()).toBe(2024); + expect(result?.getUTCMonth()).toBe(5); // June + }); + + it('returns null for completely invalid input', () => { + expect(parseLocalDate('not-a-date')).toBeNull(); + }); + + it('returns null for a non-standard pattern that looks date-like', () => { + expect(parseLocalDate('foo-bar-baz')).toBeNull(); + }); + + it('YYYY-MM-DD parses as local time (not UTC)', () => { + const result = parseLocalDate('2024-03-10'); + expect(result).not.toBeNull(); + // date-fns parse() with 'yyyy-MM-dd' sets hours to 0 in local time + expect(result?.getHours()).toBe(0); + expect(result?.getMinutes()).toBe(0); + }); +}); + +describe('formatLocalDate', () => { + it('returns em dash for undefined', () => { + expect(formatLocalDate(undefined)).toBe('—'); + }); + + it('returns em dash for empty string', () => { + expect(formatLocalDate('')).toBe('—'); + }); + + it('returns a non-empty locale string for a valid YYYY-MM-DD date', () => { + const result = formatLocalDate('2024-01-15'); + expect(result).not.toBe('—'); + expect(typeof result).toBe('string'); + expect(result.length).toBeGreaterThan(0); + }); + + it('returns em dash for a completely invalid date string', () => { + expect(formatLocalDate('not-a-date')).toBe('—'); + }); + + it('returns a formatted string for ISO datetime', () => { + const result = formatLocalDate('2024-06-15T10:30:00Z'); + expect(result).not.toBe('—'); + expect(typeof result).toBe('string'); + }); + + it('returns a formatted string for end-of-year date', () => { + const result = formatLocalDate('2023-12-31'); + expect(result).not.toBe('—'); + expect(typeof result).toBe('string'); + }); +}); diff --git a/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts b/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts index f4cd6edf31..711c648ef5 100644 --- a/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts +++ b/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts @@ -13,70 +13,70 @@ describe('getRelativeTime', () => { it('returns "Just now" for very recent timestamps (< 1 minute ago)', () => { vi.setSystemTime(new Date('2024-01-01T12:00:30Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('Just now'); }); it('returns minutes ago for timestamps 1-59 minutes old', () => { vi.setSystemTime(new Date('2024-01-01T12:05:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('5 minutes ago'); }); it('returns "1 minute ago" (singular) for exactly 1 minute', () => { vi.setSystemTime(new Date('2024-01-01T12:01:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('1 minute ago'); }); it('returns hours ago for timestamps 1-23 hours old', () => { vi.setSystemTime(new Date('2024-01-01T15:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('3 hours ago'); }); it('returns "1 hour ago" (singular) for exactly 1 hour', () => { vi.setSystemTime(new Date('2024-01-01T13:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('1 hour ago'); }); it('returns days ago for timestamps 1-6 days old', () => { vi.setSystemTime(new Date('2024-01-04T12:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('3 days ago'); }); it('returns "1 day ago" (singular) for exactly 1 day', () => { vi.setSystemTime(new Date('2024-01-02T12:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('1 day ago'); }); it('returns weeks ago for timestamps 1-3 weeks old', () => { vi.setSystemTime(new Date('2024-01-15T12:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('2 weeks ago'); }); it('returns months ago for timestamps more than 30 days old', () => { vi.setSystemTime(new Date('2024-03-01T12:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('2 months ago'); }); it('returns "1 month ago" (singular) for exactly 1 month (30 days)', () => { vi.setSystemTime(new Date('2024-02-01T12:00:00Z')); - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('1 month ago'); }); @@ -84,7 +84,7 @@ describe('getRelativeTime', () => { vi.setSystemTime(new Date('2024-01-01T12:00:00Z')); // Timestamp is in the future relative to the mocked "now" - const result = getRelativeTime('2024-01-01T13:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T13:00:00Z' }); expect(result).toBe('Just now'); }); @@ -92,7 +92,28 @@ describe('getRelativeTime', () => { vi.setSystemTime(new Date('2025-01-01T12:00:00Z')); // 12 months = 12 × 2592000 s; function has no year bucket - const result = getRelativeTime('2024-01-01T12:00:00Z'); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z' }); expect(result).toBe('12 months ago'); }); + + it('calls translate with unit key and count when diff >= 1 unit', () => { + vi.setSystemTime(new Date('2024-01-01T12:05:00Z')); + const t = vi.fn((key: string, opts?: Record) => `${key}:${opts?.count}`); + const result = getRelativeTime({ dateValue: '2024-01-01T12:00:00Z', t: t as never }); + expect(t).toHaveBeenCalledWith('common.timeAgo.minutes', { count: 5 }); + expect(result).toBe('common.timeAgo.minutes:5'); + }); + + it('calls translate for justNow when diff is less than 1 minute', () => { + vi.setSystemTime(new Date('2024-01-01T12:00:30Z')); + const t = vi.fn((key: string) => key); + getRelativeTime({ dateValue: '2024-01-01T12:00:00Z', t: t as never }); + expect(t).toHaveBeenCalledWith('common.timeAgo.justNow'); + }); + + it('calls translate for justNow when date is invalid', () => { + const t = vi.fn((key: string) => key); + getRelativeTime({ dateValue: 'not-a-date', t: t as never }); + expect(t).toHaveBeenCalledWith('common.timeAgo.justNow'); + }); }); diff --git a/apps/expo/lib/utils/__tests__/imageUtils.test.ts b/apps/expo/lib/utils/__tests__/imageUtils.test.ts index 9d6a569edb..f4ae871a12 100644 --- a/apps/expo/lib/utils/__tests__/imageUtils.test.ts +++ b/apps/expo/lib/utils/__tests__/imageUtils.test.ts @@ -236,7 +236,7 @@ describe('imageUtils', () => { describe('getImageExtension', () => { it('should return inferred extension immediately if available', async () => { - const result = await getImageExtension('https://example.com/image.jpg'); + const result = await getImageExtension({ url: 'https://example.com/image.jpg' }); expect(result).toBe('jpg'); expect(global.fetch).not.toHaveBeenCalled(); }); @@ -255,7 +255,7 @@ describe('imageUtils', () => { }, } as unknown as Response); - const result = await getImageExtension('https://example.com/image'); + const result = await getImageExtension({ url: 'https://example.com/image' }); expect(result).toBe('jpg'); expect(mockFetch).toHaveBeenCalled(); }); @@ -269,7 +269,10 @@ describe('imageUtils', () => { const mockFetch = global.fetch as MockedFunction; mockFetch.mockRejectedValue(new Error('Network error')); - const result = await getImageExtension('https://example.com/image', 'png'); + const result = await getImageExtension({ + url: 'https://example.com/image', + defaultExt: 'png', + }); expect(result).toBe('png'); }); @@ -282,7 +285,10 @@ describe('imageUtils', () => { const mockFetch = global.fetch as MockedFunction; mockFetch.mockRejectedValue(new Error('Network error')); - const result = await getImageExtension('https://example.com/image', 'webp'); + const result = await getImageExtension({ + url: 'https://example.com/image', + defaultExt: 'webp', + }); expect(result).toBe('webp'); }); @@ -300,7 +306,10 @@ describe('imageUtils', () => { }); }); - const result = await getImageExtension('https://example.com/image', 'gif'); + const result = await getImageExtension({ + url: 'https://example.com/image', + defaultExt: 'gif', + }); expect(result).toBe('gif'); }, 10000); @@ -318,7 +327,10 @@ describe('imageUtils', () => { }, } as unknown as Response); - const result = await getImageExtension('https://example.com/image', 'jpg'); + const result = await getImageExtension({ + url: 'https://example.com/image', + defaultExt: 'jpg', + }); expect(result).toBe('webp'); // Should return fetched, not default }); }); diff --git a/apps/expo/lib/utils/compute-pack.ts b/apps/expo/lib/utils/compute-pack.ts index e1e16c324c..a2428a8a42 100644 --- a/apps/expo/lib/utils/compute-pack.ts +++ b/apps/expo/lib/utils/compute-pack.ts @@ -1,8 +1,19 @@ +import type { PackWithItems } from '@packrat/types'; import type { WeightUnit } from '@packrat/units'; import { displayWeight, normalize, parseWeightUnit } from '@packrat/units'; -import type { Pack } from 'expo-app/types'; -export const computePackWeights = (pack: Pack, preferredUnit: WeightUnit = 'g'): Pack => { +export type ComputedPack = PackWithItems & { + baseWeight: number; + totalWeight: number; +}; + +export const computePackWeights = ({ + pack, + preferredUnit = 'g', +}: { + pack: PackWithItems; + preferredUnit?: WeightUnit; +}): ComputedPack => { if (!pack.items) { throw new Error(`Pack with ID ${pack.id} has no items`); } @@ -12,7 +23,8 @@ export const computePackWeights = (pack: Pack, preferredUnit: WeightUnit = 'g'): for (const item of pack.items) { const itemWeightInGrams = - normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity; + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity; totalWeightGrams += itemWeightInGrams; if (!item.consumable && !item.worn) { baseWeightGrams += itemWeightInGrams; @@ -21,10 +33,15 @@ export const computePackWeights = (pack: Pack, preferredUnit: WeightUnit = 'g'): return { ...pack, - baseWeight: displayWeight(baseWeightGrams, preferredUnit), - totalWeight: displayWeight(totalWeightGrams, preferredUnit), + baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }), + totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }), }; }; -export const computePacksWeights = (packs: Pack[], preferredUnit: WeightUnit = 'g'): Pack[] => - packs.map((pack) => computePackWeights(pack, preferredUnit)); +export const computePacksWeights = ({ + packs, + preferredUnit = 'g', +}: { + packs: PackWithItems[]; + preferredUnit?: WeightUnit; +}): ComputedPack[] => packs.map((pack) => computePackWeights({ pack, preferredUnit })); diff --git a/apps/expo/lib/utils/getRelativeTime.ts b/apps/expo/lib/utils/getRelativeTime.ts index d1dd074b5e..b817cb7716 100644 --- a/apps/expo/lib/utils/getRelativeTime.ts +++ b/apps/expo/lib/utils/getRelativeTime.ts @@ -16,10 +16,13 @@ function toDate(value: Date | string | null | undefined): Date | null { return Number.isNaN(d.getTime()) ? null : d; } -export function getRelativeTime( - dateValue: Date | string | null | undefined, - t?: TranslationFunction, -): string { +export function getRelativeTime({ + dateValue, + t, +}: { + dateValue: Date | string | null | undefined; + t?: TranslationFunction; +}): string { // i18next resolves pluralization via _one/_other suffixes at runtime. // The base keys (e.g. 'common.timeAgo.months') are not in en.json as literals, // so a loose cast is needed for dynamic key construction. diff --git a/apps/expo/lib/utils/imageUtils.ts b/apps/expo/lib/utils/imageUtils.ts index 44cf97dbcd..3fc5ed835d 100644 --- a/apps/expo/lib/utils/imageUtils.ts +++ b/apps/expo/lib/utils/imageUtils.ts @@ -126,7 +126,13 @@ export const fetchImageExtension = async (url: string): Promise = * @returns A promise resolving to the extension */ -export const getImageExtension = async (url: string, defaultExt = 'jpg'): Promise => { +export const getImageExtension = async ({ + url, + defaultExt = 'jpg', +}: { + url: string; + defaultExt?: string; +}): Promise => { // First check if URL already has an extension const inferredExt = inferImageExtension(url); if (inferredExt) return inferredExt; diff --git a/apps/expo/metro.config.js b/apps/expo/metro.config.js index a9932c2b58..426e483c55 100644 --- a/apps/expo/metro.config.js +++ b/apps/expo/metro.config.js @@ -10,6 +10,9 @@ const config = getSentryExpoConfig(__dirname); config.resolver = { ...config.resolver, assetExts: [...(config.resolver?.assetExts ?? []), 'wasm'], + // Enable package.json "exports" field resolution so workspace packages with + // subpath exports (e.g. @packrat/schemas/constants) resolve correctly. + unstable_enablePackageExports: true, // Exclude the ESM "import" condition so packages like Jotai resolve to their // CJS builds instead of .mjs files that contain import.meta (invalid in // Metro's __d() CJS module wrapper). diff --git a/apps/expo/mocks/react-native-community-datetimepicker.tsx b/apps/expo/mocks/react-native-community-datetimepicker.tsx index ff75b393d4..a437cced6a 100644 --- a/apps/expo/mocks/react-native-community-datetimepicker.tsx +++ b/apps/expo/mocks/react-native-community-datetimepicker.tsx @@ -1,5 +1,4 @@ import type * as React from 'react'; -import { useState } from 'react'; type DateTimePickerEvent = { type: string; nativeEvent: { timestamp: number } }; @@ -11,7 +10,6 @@ type Props = { minimumDate?: Date; maximumDate?: Date; style?: unknown; - testID?: string; }; function toInputValue(date: Date, mode: Props['mode']): string { @@ -27,26 +25,21 @@ export default function DateTimePicker({ onChange, minimumDate, maximumDate, - testID, }: Props) { const inputType = mode === 'time' ? 'time' : mode === 'datetime' ? 'datetime-local' : 'date'; - // Controlled state so Playwright's native-setter + event dispatch reliably fires React's onChange. - const [inputValue, setInputValue] = useState(toInputValue(value, mode)); function handleChange(e: React.ChangeEvent) { if (!onChange) return; const raw = e.target.value; if (!raw) return; - setInputValue(raw); const date = new Date(mode === 'time' ? `1970-01-01T${raw}` : raw); onChange({ type: 'set', nativeEvent: { timestamp: date.getTime() } }, date); } return ( {children}; diff --git a/apps/expo/providers/index.web.tsx b/apps/expo/providers/index.web.tsx new file mode 100644 index 0000000000..9d5b4b1bb7 --- /dev/null +++ b/apps/expo/providers/index.web.tsx @@ -0,0 +1,33 @@ +import { PortalHost } from '@rn-primitives/portal'; +import { ErrorBoundary } from 'expo-app/components/initial/ErrorBoundary'; +import type { ReactNode } from 'react'; +import 'expo-app/utils/polyfills'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; +import { SafeAreaProvider } from 'react-native-safe-area-context'; +import { JotaiProvider } from './JotaiProvider'; +import { TanstackProvider } from './TanstackProvider'; + +/** + * Web version of Providers. + * Removes native-only providers: + * - KeyboardProvider (react-native-keyboard-controller — no web support) + * - BottomSheetModalProvider (@gorhom/bottom-sheet — native module dependency) + * - ActionSheetProvider (@expo/react-native-action-sheet uses React.Children.only which breaks on web) + * Metro automatically picks this file over providers/index.tsx for web builds. + */ +export function Providers({ children }: { children: ReactNode }) { + return ( + + + + + + {children} + + + + + + + ); +} diff --git a/apps/expo/types/index.ts b/apps/expo/types/index.ts deleted file mode 100644 index 7e0084add1..0000000000 --- a/apps/expo/types/index.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { ITEM_CATEGORIES, PACK_CATEGORIES, WEIGHT_UNITS } from '@packrat/api/types'; -import { z } from 'zod'; - -// --- User Schema --- -export const UserSchema = z.object({ - id: z.string(), - name: z.string(), - email: z.string().email(), - avatar: z.string().url(), - experience: z.enum(['beginner', 'intermediate', 'expert']), - joinedAt: z.string().datetime(), - bio: z.string().optional(), -}); - -export type User = z.infer; - -// --- Pack Category Enum --- -export const PackCategorySchema = z.enum(PACK_CATEGORIES); -export type PackCategory = z.infer; - -// --- Item Category Enum --- -export const ItemCategorySchema = z.enum(ITEM_CATEGORIES); -export type ItemCategory = z.infer; - -// --- Weight Unit Enum --- -export const WeightUnitSchema = z.enum(WEIGHT_UNITS); -export type WeightUnit = z.infer; - -// --- Pack Item Schema --- -export const PackItemSchema = z.object({ - id: z.string(), - name: z.string(), - description: z.string().optional(), - weight: z.number().nonnegative(), - weightUnit: WeightUnitSchema, - quantity: z.number().int().positive(), - category: z.string(), - consumable: z.boolean(), - worn: z.boolean(), - image: z.string().url().optional(), - notes: z.string().optional(), - packId: z.string(), - catalogItemId: z.string().optional(), // Reference to original catalog item - createdAt: z.string().datetime(), - updatedAt: z.string().datetime(), - userId: z.string(), -}); - -export type PackItem = z.infer; - -// --- Pack Schema --- -export const PackSchema = z.object({ - id: z.string(), - name: z.string(), - description: z.string().optional(), - category: PackCategorySchema, - baseWeight: z.number().nonnegative().optional(), // Weight without consumables (computed) - totalWeight: z.number().nonnegative().optional(), // Total weight including consumables (computed) - items: z.array(PackItemSchema).optional(), - userId: z.string(), - createdAt: z.string().datetime(), - updatedAt: z.string().datetime(), - isPublic: z.boolean(), - image: z.string().url().optional(), - tags: z.array(z.string()).optional(), -}); - -export type Pack = z.infer; - -// --- Arrays for Mock Data Validation --- -export const UsersArraySchema = z.array(UserSchema); -export const PacksArraySchema = z.array(PackSchema); -export const PackItemsArraySchema = z.array(PackItemSchema); diff --git a/apps/expo/utils/__tests__/chatContextHelpers.test.ts b/apps/expo/utils/__tests__/chatContextHelpers.test.ts index f3d2db77ba..b16382b98e 100644 --- a/apps/expo/utils/__tests__/chatContextHelpers.test.ts +++ b/apps/expo/utils/__tests__/chatContextHelpers.test.ts @@ -7,28 +7,39 @@ import { describe('generatePromptWithContext', () => { it('returns the raw message when no context is provided', () => { - expect(generatePromptWithContext('Hello')).toBe('Hello'); + expect(generatePromptWithContext({ userMessage: 'Hello' })).toBe('Hello'); }); it('returns the raw message for a general context', () => { - expect(generatePromptWithContext('Hello', { contextType: 'general' })).toBe('Hello'); + expect( + generatePromptWithContext({ userMessage: 'Hello', context: { contextType: 'general' } }), + ).toBe('Hello'); }); it('prefixes message with item name for item context', () => { - const result = generatePromptWithContext('Tell me more', { - contextType: 'item', - itemName: 'Tent', + const result = generatePromptWithContext({ + userMessage: 'Tell me more', + context: { + contextType: 'item', + itemName: 'Tent', + }, }); expect(result).toBe('[About item: Tent] Tell me more'); }); it('returns raw message for item context without an item name', () => { - const result = generatePromptWithContext('Tell me more', { contextType: 'item' }); + const result = generatePromptWithContext({ + userMessage: 'Tell me more', + context: { contextType: 'item' }, + }); expect(result).toBe('Tell me more'); }); it('prefixes message for pack context', () => { - const result = generatePromptWithContext('Analyze my pack', { contextType: 'pack' }); + const result = generatePromptWithContext({ + userMessage: 'Analyze my pack', + context: { contextType: 'pack' }, + }); expect(result).toBe('[About my pack] Analyze my pack'); }); }); diff --git a/apps/expo/utils/__tests__/weight.test.ts b/apps/expo/utils/__tests__/weight.test.ts index ab4af15c27..36d2cfbc19 100644 --- a/apps/expo/utils/__tests__/weight.test.ts +++ b/apps/expo/utils/__tests__/weight.test.ts @@ -1,4 +1,4 @@ -import type { PackItem } from 'expo-app/types'; +import type { PackItem } from '@packrat/types'; import { describe, expect, it } from 'vitest'; import { calculateBaseWeight, calculateTotalWeight, convertWeight, formatWeight } from '../weight'; @@ -11,16 +11,24 @@ function makeItem( return { id: 'item-1', name: 'Test Item', + description: null, quantity: overrides.quantity ?? 1, + category: null, consumable: overrides.consumable ?? false, worn: overrides.worn ?? false, + image: null, + notes: null, packId: 'pack-1', + catalogItemId: null, userId: 'user-1', - category: 'tools', - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), + deleted: false, + isAIGenerated: false, + templateItemId: null, + embedding: null, + createdAt: new Date(), + updatedAt: new Date(), ...overrides, - }; + } as PackItem; } // --------------------------------------------------------------------------- @@ -28,34 +36,37 @@ function makeItem( // --------------------------------------------------------------------------- describe('convertWeight', () => { it('returns the same value when from === to', () => { - expect(convertWeight(100, 'g', 'g')).toBe(100); - expect(convertWeight(5, 'oz', 'oz')).toBe(5); - expect(convertWeight(2, 'kg', 'kg')).toBe(2); - expect(convertWeight(1, 'lb', 'lb')).toBe(1); + expect(convertWeight({ weight: 100, units: { from: 'g', to: 'g' } })).toBe(100); + expect(convertWeight({ weight: 5, units: { from: 'oz', to: 'oz' } })).toBe(5); + expect(convertWeight({ weight: 2, units: { from: 'kg', to: 'kg' } })).toBe(2); + expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'lb' } })).toBe(1); }); it('converts grams to ounces', () => { - expect(convertWeight(100, 'g', 'oz')).toBeCloseTo(3.53, 1); + expect(convertWeight({ weight: 100, units: { from: 'g', to: 'oz' } })).toBeCloseTo(3.53, 1); }); it('converts ounces to grams', () => { - expect(convertWeight(1, 'oz', 'g')).toBeCloseTo(28.349523125, 8); + expect(convertWeight({ weight: 1, units: { from: 'oz', to: 'g' } })).toBeCloseTo( + 28.349523125, + 8, + ); }); it('converts grams to kilograms', () => { - expect(convertWeight(1000, 'g', 'kg')).toBe(1); + expect(convertWeight({ weight: 1000, units: { from: 'g', to: 'kg' } })).toBe(1); }); it('converts kilograms to grams', () => { - expect(convertWeight(1, 'kg', 'g')).toBe(1000); + expect(convertWeight({ weight: 1, units: { from: 'kg', to: 'g' } })).toBe(1000); }); it('converts grams to pounds', () => { - expect(convertWeight(453.59, 'g', 'lb')).toBeCloseTo(1, 1); + expect(convertWeight({ weight: 453.59, units: { from: 'g', to: 'lb' } })).toBeCloseTo(1, 1); }); it('converts pounds to grams', () => { - expect(convertWeight(1, 'lb', 'g')).toBeCloseTo(453.59237, 4); + expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'g' } })).toBeCloseTo(453.59237, 4); }); }); @@ -64,9 +75,9 @@ describe('convertWeight', () => { // --------------------------------------------------------------------------- describe('formatWeight', () => { it('formats weight with unit suffix', () => { - expect(formatWeight(100, 'g')).toBe('100g'); - expect(formatWeight(3.5, 'oz')).toBe('3.5oz'); - expect(formatWeight(0, 'kg')).toBe('0kg'); + expect(formatWeight({ weight: 100, unit: 'g' })).toBe('100g'); + expect(formatWeight({ weight: 3.5, unit: 'oz' })).toBe('3.5oz'); + expect(formatWeight({ weight: 0, unit: 'kg' })).toBe('0kg'); }); }); @@ -75,12 +86,12 @@ describe('formatWeight', () => { // --------------------------------------------------------------------------- describe('calculateBaseWeight', () => { it('returns 0 for an empty item list', () => { - expect(calculateBaseWeight([])).toBe(0); + expect(calculateBaseWeight({ items: [] })).toBe(0); }); it('sums non-consumable, non-worn items', () => { const items = [makeItem({ weight: 200, weightUnit: 'g' })]; - expect(calculateBaseWeight(items, 'g')).toBe(200); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(200); }); it('excludes consumable items from base weight', () => { @@ -88,7 +99,7 @@ describe('calculateBaseWeight', () => { makeItem({ weight: 200, weightUnit: 'g', consumable: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateBaseWeight(items, 'g')).toBe(100); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100); }); it('excludes worn items from base weight', () => { @@ -96,12 +107,12 @@ describe('calculateBaseWeight', () => { makeItem({ weight: 200, weightUnit: 'g', worn: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateBaseWeight(items, 'g')).toBe(100); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100); }); it('accounts for item quantity', () => { const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 3 })]; - expect(calculateBaseWeight(items, 'g')).toBe(300); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(300); }); it('returns 0 when all items are consumable or worn', () => { @@ -109,7 +120,7 @@ describe('calculateBaseWeight', () => { makeItem({ weight: 200, weightUnit: 'g', consumable: true }), makeItem({ weight: 100, weightUnit: 'g', worn: true }), ]; - expect(calculateBaseWeight(items, 'g')).toBe(0); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(0); }); }); @@ -118,7 +129,7 @@ describe('calculateBaseWeight', () => { // --------------------------------------------------------------------------- describe('calculateTotalWeight', () => { it('returns 0 for an empty item list', () => { - expect(calculateTotalWeight([])).toBe(0); + expect(calculateTotalWeight({ items: [] })).toBe(0); }); it('includes consumable items in total weight', () => { @@ -126,7 +137,7 @@ describe('calculateTotalWeight', () => { makeItem({ weight: 200, weightUnit: 'g', consumable: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateTotalWeight(items, 'g')).toBe(300); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300); }); it('includes worn items in total weight', () => { @@ -134,7 +145,7 @@ describe('calculateTotalWeight', () => { makeItem({ weight: 200, weightUnit: 'g', worn: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateTotalWeight(items, 'g')).toBe(300); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300); }); it('converts mixed weight units correctly', () => { @@ -142,11 +153,11 @@ describe('calculateTotalWeight', () => { makeItem({ id: 'i1', weight: 1000, weightUnit: 'g' }), makeItem({ id: 'i2', weight: 1, weightUnit: 'kg' }), ]; - expect(calculateTotalWeight(items, 'g')).toBe(2000); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(2000); }); it('accounts for item quantity', () => { const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 5 })]; - expect(calculateTotalWeight(items, 'g')).toBe(500); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(500); }); }); diff --git a/apps/expo/utils/chatContextHelpers.ts b/apps/expo/utils/chatContextHelpers.ts index 74aee49b9c..646879b985 100644 --- a/apps/expo/utils/chatContextHelpers.ts +++ b/apps/expo/utils/chatContextHelpers.ts @@ -6,7 +6,13 @@ type ChatContext = { contextType: 'item' | 'pack' | 'general'; }; -export function generatePromptWithContext(userMessage: string, context?: ChatContext): string { +export function generatePromptWithContext({ + userMessage, + context, +}: { + userMessage: string; + context?: ChatContext; +}): string { if (!context || context.contextType === 'general') { return userMessage; } diff --git a/apps/expo/utils/weight.ts b/apps/expo/utils/weight.ts index a915c0f6b5..916c6020e9 100644 --- a/apps/expo/utils/weight.ts +++ b/apps/expo/utils/weight.ts @@ -1,27 +1,44 @@ +import type { PackItem } from '@packrat/types'; import type { WeightUnit } from '@packrat/units'; import { convert, displayWeight, normalize, parseWeightUnit } from '@packrat/units'; -import type { PackItem } from 'expo-app/types'; export { convert as convertWeight }; -export const formatWeight = (weight: number, unit: WeightUnit): string => `${weight}${unit}`; +export const formatWeight = ({ weight, unit }: { weight: number; unit: WeightUnit }): string => + `${weight}${unit}`; -export const calculateBaseWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => { +export const calculateBaseWeight = ({ + items, + unit = 'g', +}: { + items: PackItem[]; + unit?: WeightUnit; +}): number => { const grams = items .filter((item) => !item.consumable && !item.worn) .reduce( (total, item) => - total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity, + total + + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity, 0, ); - return displayWeight(grams, unit); + return displayWeight({ grams, unit }); }; -export const calculateTotalWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => { +export const calculateTotalWeight = ({ + items, + unit = 'g', +}: { + items: PackItem[]; + unit?: WeightUnit; +}): number => { const grams = items.reduce( (total, item) => - total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity, + total + + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity, 0, ); - return displayWeight(grams, unit); + return displayWeight({ grams, unit }); }; diff --git a/apps/expo/vitest.config.ts b/apps/expo/vitest.config.ts index d299ced0f5..ba55ca9031 100644 --- a/apps/expo/vitest.config.ts +++ b/apps/expo/vitest.config.ts @@ -34,9 +34,19 @@ export default defineConfig({ 'features/**/utils/**/*.test.ts', 'utils/polyfills.ts', '**/*.web.ts', // Browser-API files; not runnable in Node vitest environment + // React Native file-system APIs — not runnable in Node environment + 'features/**/utils/uploadImage.ts', + // UI helper files that depend on React Native navigation primitives + 'features/**/utils/getPackDetailOptions.tsx', + 'features/**/utils/getPackItemDetailOptions.tsx', + // Barrel files (just re-exports, no business logic) + 'features/**/utils/index.ts', ], thresholds: { - statements: 75, + statements: 95, + branches: 92, + functions: 97, + lines: 95, }, }, }, diff --git a/apps/guides/README.md b/apps/guides/README.md new file mode 100644 index 0000000000..ac0c2ae065 --- /dev/null +++ b/apps/guides/README.md @@ -0,0 +1,127 @@ +# PackRat Guides + +Next.js 15 static-export site that ships the hiking/outdoor guides corpus. +Deployed to Cloudflare Pages from `apps/guides/out/`. + +## Build pipeline + +The `build` script in `package.json` runs three steps **in this order**: + +``` +bun run build-content → bun run generate-og-images → next build +``` + +### Why order matters + +- `scripts/build-content.ts` reads every `*.mdx` file in `content/posts/` and + writes the array of posts to **`lib/content.ts`** (committed; checked in for + fast cold builds). +- `scripts/generate-og-images.ts` **imports `lib/content.ts`** and renders one + OG PNG per post into `public/og/.png`, plus a root `public/og-image.png`. +- `next build` produces the static export in `out/`. + +If `generate-og-images` runs before `build-content`, it reads the previously +committed (stale) `lib/content.ts` and only generates OG images for that +older post set. That is exactly the bug PR #2436 fixed (39 OG images +generated for a corpus of 504 posts). + +Guards against re-inverting the order: + +1. The build script itself enforces order via `&&`. +2. `scripts/generate-og-images.ts` contains a runtime check + (`assertContentIsFresh`) that throws a clear error if `lib/content.ts` + looks suspiciously small compared to the number of MDX files on disk. +3. `__tests__/og-images.test.ts` exercises the full pipeline end-to-end and + asserts that `public/og/*.png` count equals `lib/content.ts` post count. + Run it with: + + ``` + bun run --cwd apps/guides test:og + ``` + +4. The `Builds` GitHub Actions workflow + (`.github/workflows/builds.yml`) builds the app on every PR and + surfaces the post / OG image counts in the GitHub Step Summary so + regressions are visible without depending on the Cloudflare Pages + dashboard. + +## Useful scripts + +| Script | Purpose | +|---|---| +| `bun run dev` | Local Next.js dev server | +| `bun run build-content` | Regenerate `lib/content.ts` from MDX | +| `bun run generate-og-images` | Render OG PNGs into `public/og/` | +| `bun run build` | Full static build (`out/`) | +| `bun run test` | Lightweight vitest suite | +| `bun run test:og` | End-to-end OG image pipeline test (slow) | +| `bun run test:og-meta` | Parse built `out/**/index.html` and assert OG / Twitter meta tags | +| `bun run lighthouse` | Build + run LHCI assertions | +| `bun run sync-to-r2` | Sync content to `packrat-guides` R2 bucket | + +## Open Graph metadata validation + +All PackRat web apps (`apps/guides`, `apps/landing`) share the same OG +validation pattern, with per-app shapes: + +- **Guides** has per-post images (`/og/.png`) and `og:type=article`. +- **Landing** has a single site-wide image (`/og-image.png`) and + `og:type=website`. + +See [`apps/landing/README.md`](../landing/README.md) for the landing variant. + +We do three layers of OG validation: + +1. **Image generation** — `test:og` verifies one PNG per post in `public/og/`. + This catches the build-order bug (#2436) where OG images get generated + from a stale `lib/content.ts`. +2. **Static meta in built HTML** — `test:og-meta` runs `bun run build` + (if `out/` is missing) and then parses every `out/guide/.html` + plus the root `out/index.html` with cheerio. It asserts the required + tags (`og:title`, `og:description`, `og:image`, `og:image:width`, + `og:image:height`, `og:type`, `og:url`, `og:site_name`, `twitter:card`, + `twitter:title`, `twitter:description`, `twitter:image`) are present + on a 3-post random sample and that **every** post has an absolute + `https://` `og:image` URL pointing at `/og/.png`. The root page + gets the same shape with the site-wide image (`/og-image.png` or the + Next.js auto-generated `/opengraph-image` route — whichever wins). + This step runs in the `Builds` workflow on every PR. +3. **Live OG meta on a deployed URL** — opt-in via + `OG_LIVE_CHECK_URL=https://guides.packratai.com bun run test:og-meta`. + Hits the live origin via [`open-graph-scraper`][ogs] (the same parser + most platforms use under the hood) and asserts the same shape. Useful + after a deploy when you want to confirm CF transforms / caches didn't + eat any meta tags. Skipped by default. + +### Manual validators + +For one-off checks after a deploy, paste the URL into one of these: + +- [opengraph.xyz](https://www.opengraph.xyz/) — quick visual preview +- [microlink.io](https://microlink.io/) — JSON view of every OG / Twitter tag +- [Facebook Sharing Debugger](https://developers.facebook.com/tools/debug/) — also flushes FB's cache for the URL +- [LinkedIn Post Inspector](https://www.linkedin.com/post-inspector/) — also flushes LI's cache + +## Lighthouse CI + +`.lighthouserc.js` (desktop) and `.lighthouserc.mobile.js` (mobile) drive +LHCI against the static `out/` directory. Budgets: + +- Performance ≥ 0.8 +- Accessibility / Best Practices / SEO ≥ 0.9 +- LCP < 2500 ms (desktop) / 4000 ms (mobile) +- CLS < 0.1 +- TBT < 300 ms (desktop) / 600 ms (mobile) + +The `Builds` GitHub Actions workflow runs `lighthouse:ci` after the OG +meta test on every PR and surfaces the scores in the GitHub Step Summary. +The step is marked `continue-on-error: true` so perf regressions appear +as a yellow check on the PR rather than a hard block — keeps the cadence +fast while still surfacing the numbers to reviewers. + +``` +bun run --cwd apps/guides lighthouse # full: build + LHCI +bun run --cwd apps/guides lighthouse:ci # CI mode: requires out/ to exist +``` + +[ogs]: https://github.com/jshemas/openGraphScraper diff --git a/apps/guides/__tests__/layout.metadata.test.ts b/apps/guides/__tests__/layout.metadata.test.ts new file mode 100644 index 0000000000..fb60efe041 --- /dev/null +++ b/apps/guides/__tests__/layout.metadata.test.ts @@ -0,0 +1,20 @@ +import { describe, expect, it } from 'vitest'; +import { siteConfig } from '../lib/config'; +import { guidesMetadata as metadata } from '../lib/metadata'; + +describe('guides metadata', () => { + it('includes absolute Open Graph and Twitter image URLs', () => { + const expectedImageUrl = new URL('/og-image.png', siteConfig.url).toString(); + + expect(metadata.openGraph?.images).toEqual([ + { + url: expectedImageUrl, + width: 1200, + height: 630, + alt: 'PackRat Guides | Hiking & Outdoor Adventures', + }, + ]); + + expect(metadata.twitter?.images).toEqual([new URL('/og-image.png', siteConfig.url).toString()]); + }); +}); diff --git a/apps/guides/__tests__/og-image.test.ts b/apps/guides/__tests__/og-image.test.ts new file mode 100644 index 0000000000..c588b549f7 --- /dev/null +++ b/apps/guides/__tests__/og-image.test.ts @@ -0,0 +1,156 @@ +import { execSync } from 'node:child_process'; +import fs from 'node:fs'; +import path from 'node:path'; +import { beforeAll, describe, expect, it } from 'vitest'; +import { siteConfig } from '../lib/config'; +import { getAllPosts } from '../lib/mdx-static'; +import { guidesMetadata } from '../lib/metadata'; + +const APP_DIR = path.resolve(__dirname, '..'); +const PUBLIC_DIR = path.join(APP_DIR, 'public'); +const OG_DIR = path.join(PUBLIC_DIR, 'og'); +const ROOT_OG_PATH = path.join(PUBLIC_DIR, 'og-image.png'); + +const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); + +const EXPECTED_OG_URL = new URL('/og-image.png', siteConfig.url).toString(); + +/** Read a uint32 big-endian from a buffer at offset. */ +function readUint32BE(buf: Buffer, offset: number): number { + return buf.readUInt32BE(offset); +} + +function assertValidPng(filePath: string): void { + const buf = fs.readFileSync(filePath); + expect(buf.subarray(0, 8), `${path.basename(filePath)} PNG signature`).toEqual(PNG_SIGNATURE); + const width = readUint32BE(buf, 16); + const height = readUint32BE(buf, 20); + expect(width, `${path.basename(filePath)} width`).toBe(1200); + expect(height, `${path.basename(filePath)} height`).toBe(630); + expect(buf.length, `${path.basename(filePath)} size`).toBeGreaterThan(1024); +} + +describe('guides OG image generation', () => { + // Generating per-post PNGs takes ~30-60s for the full set; + // default vitest hook timeout is 5s. + beforeAll(() => { + execSync('bun run scripts/generate-og-images.ts', { + cwd: APP_DIR, + stdio: 'inherit', + }); + }, 180_000); + + it('generates public/og-image.png', () => { + expect(fs.existsSync(ROOT_OG_PATH)).toBe(true); + }); + + it('root og-image.png is a valid 1200×630 PNG', () => { + assertValidPng(ROOT_OG_PATH); + }); + + it('generates public/og/ directory', () => { + expect(fs.existsSync(OG_DIR)).toBe(true); + }); + + it('generates a per-post PNG for every post', () => { + const posts = getAllPosts(); + expect(posts.length).toBeGreaterThan(0); + + for (const post of posts) { + const filePath = path.join(OG_DIR, `${post.slug}.png`); + expect(fs.existsSync(filePath), `missing: og/${post.slug}.png`).toBe(true); + } + }); + + it('every per-post PNG is a valid 1200×630 PNG', () => { + const posts = getAllPosts(); + for (const post of posts) { + assertValidPng(path.join(OG_DIR, `${post.slug}.png`)); + } + }); + + it('metadata.openGraph.images[0].url references the generated file', () => { + const images = (guidesMetadata.openGraph as { images?: unknown })?.images; + const first = Array.isArray(images) ? images[0] : images; + const url = typeof first === 'string' ? first : (first as { url: string })?.url; + // Derive the local path from the URL and assert the file exists. + // This catches the class of bug where metadata points at /opengraph-image.png + // (a Next.js internal route that static export does not expose as a real PNG) + // instead of /og-image.png (the file written by scripts/generate-og-images.ts). + const pathname = new URL(url).pathname; + const filePath = path.resolve(APP_DIR, 'public', pathname.slice(1)); + expect( + fs.existsSync(filePath), + `og:image URL (${url}) → ${filePath} does not exist in public/. ` + + 'Ensure metadata points to a file generated by scripts/generate-og-images.ts.', + ).toBe(true); + }); +}); + +describe('guides layout metadata', () => { + it('openGraph.images[0].url is the absolute og-image.png URL', () => { + const images = (guidesMetadata.openGraph as { images?: unknown })?.images; + expect(images).toBeDefined(); + const first = Array.isArray(images) ? images[0] : images; + const url = typeof first === 'string' ? first : (first as { url: string })?.url; + expect(url).toBe(EXPECTED_OG_URL); + }); + + it('twitter.images[0] is the absolute og-image.png URL', () => { + const images = (guidesMetadata.twitter as { images?: unknown })?.images; + expect(images).toBeDefined(); + const first = Array.isArray(images) ? images[0] : images; + const twitterUrl = + typeof first === 'string' ? first : ((first as { url?: string })?.url ?? first); + expect(twitterUrl).toBe(EXPECTED_OG_URL); + }); +}); + +describe('guides per-slug page metadata', () => { + it('generateMetadata sets openGraph.images to /og/[slug].png', async () => { + // Dynamically import to avoid top-level JSX issues in test runner + const { generateMetadata } = await import('../app/guide/[slug]/page'); + const posts = getAllPosts(); + const post = posts[0]; + if (!post) throw new Error('No posts found'); + + const meta = await generateMetadata({ params: Promise.resolve({ slug: post.slug }) }); + const images = (meta.openGraph as { images?: unknown })?.images; + expect(images).toBeDefined(); + const first = Array.isArray(images) ? images[0] : images; + const url = typeof first === 'string' ? first : (first as { url: string })?.url; + expect(url).toBe(`/og/${post.slug}.png`); + }); + + it('generateMetadata sets twitter.images to /og/[slug].png', async () => { + const { generateMetadata } = await import('../app/guide/[slug]/page'); + const posts = getAllPosts(); + const post = posts[0]; + if (!post) throw new Error('No posts found'); + + const meta = await generateMetadata({ params: Promise.resolve({ slug: post.slug }) }); + const images = (meta.twitter as { images?: unknown })?.images; + expect(images).toBeDefined(); + const first = Array.isArray(images) ? images[0] : images; + expect(first).toBe(`/og/${post.slug}.png`); + }); + + it('generateMetadata per-post og:image file exists in public/og/', async () => { + const { generateMetadata } = await import('../app/guide/[slug]/page'); + const posts = getAllPosts(); + const post = posts[0]; + if (!post) throw new Error('No posts found'); + + const meta = await generateMetadata({ params: Promise.resolve({ slug: post.slug }) }); + const images = (meta.openGraph as { images?: unknown })?.images; + const first = Array.isArray(images) ? images[0] : images; + const url = typeof first === 'string' ? first : (first as { url: string })?.url; + const pathname = new URL(url, siteConfig.url).pathname; + const filePath = path.resolve(APP_DIR, 'public', pathname.replace(/^\//, '')); + expect( + fs.existsSync(filePath), + `per-post og:image points to ${url} but ${filePath} was not generated. ` + + 'Run scripts/generate-og-images.ts first.', + ).toBe(true); + }); +}); diff --git a/apps/guides/__tests__/og-images.test.ts b/apps/guides/__tests__/og-images.test.ts new file mode 100644 index 0000000000..325e9161e0 --- /dev/null +++ b/apps/guides/__tests__/og-images.test.ts @@ -0,0 +1,91 @@ +/** + * End-to-end test for the OG image pipeline. + * + * This is the regression test for PR #2436: the bug was that + * `generate-og-images` ran BEFORE `build-content`, so OG images were generated + * for the 39 posts that happened to be committed in `lib/content.ts` instead + * of the 504 MDX files actually on disk. + * + * What this test does: + * 1. Asserts that the count of files in `public/og/*.png` matches the + * number of posts in `lib/content.ts`, and that the root + * `public/og-image.png` exists. + * 2. Spot-checks PNG validity (magic bytes + non-zero size). + * + * The actual `build-content` + `generate-og-images` pipeline is run by the + * `test:og` package script BEFORE invoking vitest. Doing the heavy work + * outside the test runner keeps vitest's RPC reporter from timing out on the + * ~500 lines of progress output and producing a spurious worker error. + */ + +import fs from 'node:fs'; +import path from 'node:path'; +import { describe, expect, it } from 'vitest'; + +// This suite is gated behind `RUN_OG_PIPELINE_TEST=1` (set by the `test:og` +// script) so it does not bog down the regular `bun run test` flow. +const RUN = process.env.RUN_OG_PIPELINE_TEST === '1'; +const describeOrSkip = RUN ? describe : describe.skip; + +const APP_DIR = path.resolve(__dirname, '..'); +const PUBLIC_DIR = path.join(APP_DIR, 'public'); +const OG_DIR = path.join(PUBLIC_DIR, 'og'); +const ROOT_OG_PATH = path.join(PUBLIC_DIR, 'og-image.png'); +const POSTS_DIR = path.join(APP_DIR, 'content', 'posts'); + +const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); + +function countMdxPosts(): number { + return fs.readdirSync(POSTS_DIR).filter((f) => f.endsWith('.mdx')).length; +} + +function loadPostCountFromContentTs(): number { + // Read the auto-generated content.ts and count slug entries. We avoid + // importing the module here because that would pull in Next.js types via + // the alias chain; counting slug declarations is sufficient. The regex + // tolerates either `slug:` or `"slug":` since build-content has emitted + // both formats over time. + const contentPath = path.join(APP_DIR, 'lib', 'content.ts'); + const src = fs.readFileSync(contentPath, 'utf8'); + return (src.match(/^\s+"?slug"?\s*:/gm) ?? []).length; +} + +function assertPng(filePath: string): void { + const buf = fs.readFileSync(filePath); + expect(buf.length, `${path.basename(filePath)} non-empty`).toBeGreaterThan(0); + expect(buf.subarray(0, 8), `${path.basename(filePath)} PNG signature`).toEqual(PNG_SIGNATURE); +} + +describeOrSkip('OG image pipeline (build-content → generate-og-images)', () => { + it('lib/content.ts post count matches MDX file count', () => { + const mdxCount = countMdxPosts(); + const contentCount = loadPostCountFromContentTs(); + expect(mdxCount, 'no MDX posts found on disk').toBeGreaterThan(0); + expect(contentCount, 'lib/content.ts is stale vs content/posts/').toBe(mdxCount); + }); + + it('generates the root site OG image', () => { + expect(fs.existsSync(ROOT_OG_PATH), `${ROOT_OG_PATH} does not exist`).toBe(true); + assertPng(ROOT_OG_PATH); + }); + + it('generates exactly one PNG per post', () => { + const expectedCount = loadPostCountFromContentTs(); + expect(fs.existsSync(OG_DIR), `${OG_DIR} does not exist`).toBe(true); + + const generatedPngs = fs.readdirSync(OG_DIR).filter((f) => f.endsWith('.png')); + expect( + generatedPngs.length, + `Expected ${expectedCount} per-post OG images (one per post in lib/content.ts), ` + + `got ${generatedPngs.length}. This usually means generate-og-images ran ` + + `before build-content — see PR #2436.`, + ).toBe(expectedCount); + }); + + it('every per-post PNG is non-empty and starts with the PNG magic bytes', () => { + const generatedPngs = fs.readdirSync(OG_DIR).filter((f) => f.endsWith('.png')); + for (const name of generatedPngs) { + assertPng(path.join(OG_DIR, name)); + } + }); +}); diff --git a/apps/guides/__tests__/og-meta.test.ts b/apps/guides/__tests__/og-meta.test.ts new file mode 100644 index 0000000000..6f57a6a7b1 --- /dev/null +++ b/apps/guides/__tests__/og-meta.test.ts @@ -0,0 +1,286 @@ +import { execSync } from 'node:child_process'; +import fs from 'node:fs'; +import path from 'node:path'; +import * as cheerio from 'cheerio'; +import { beforeAll, describe, expect, it } from 'vitest'; + +const APP_DIR = path.resolve(__dirname, '..'); +const OUT_DIR = path.join(APP_DIR, 'out'); +const GUIDE_OUT_DIR = path.join(OUT_DIR, 'guide'); +const ROOT_INDEX = path.join(OUT_DIR, 'index.html'); + +/** + * Required OG / Twitter meta tag names for every guide post HTML page. + * The full set is asserted for a small random sample; the rest of the + * 500+ posts just get a smoke check (presence + absolute og:image). + */ +const REQUIRED_OG_META = [ + 'og:title', + 'og:description', + 'og:image', + 'og:image:width', + 'og:image:height', + 'og:type', + 'og:url', + 'og:site_name', + 'twitter:card', + 'twitter:title', + 'twitter:description', + 'twitter:image', +] as const; + +type MetaMap = Map; + +function parseMeta(html: string): MetaMap { + const $ = cheerio.load(html); + const meta: MetaMap = new Map(); + $('meta').each((_, el) => { + const property = $(el).attr('property') ?? $(el).attr('name'); + const content = $(el).attr('content'); + if (property && content && !meta.has(property)) { + meta.set(property, content); + } + }); + return meta; +} + +/** + * Next.js static export with no `trailingSlash` config writes each guide as + * `out/guide/.html`, not `out/guide//index.html`. We also have + * sibling `out/guide//opengraph-image/route.js` directories — filter + * those out by extension. + */ +function listGuideHtmlFiles(): string[] { + if (!fs.existsSync(GUIDE_OUT_DIR)) return []; + return fs + .readdirSync(GUIDE_OUT_DIR, { withFileTypes: true }) + .filter((entry) => entry.isFile() && entry.name.endsWith('.html')) + .map((entry) => path.join(GUIDE_OUT_DIR, entry.name)); +} + +function slugFromFile(file: string): string { + return path.basename(file, '.html'); +} + +function sampleN(arr: T[], n: number): T[] { + if (arr.length <= n) return [...arr]; + const copy = [...arr]; + const out: T[] = []; + for (let i = 0; i < n; i++) { + const idx = Math.floor(Math.random() * copy.length); + const [picked] = copy.splice(idx, 1); + if (picked !== undefined) out.push(picked); + } + return out; +} + +function isAbsoluteHttps(url: string | undefined): boolean { + return typeof url === 'string' && url.startsWith('https://'); +} + +function escapeRegex(s: string): string { + return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); +} + +describe('guides built HTML OG meta', () => { + // Building the full guides site (build-content + generate-og-images + next build) + // can take 60–180s on cold caches; vitest's default hook timeout is 60s. + beforeAll(() => { + if (!fs.existsSync(ROOT_INDEX)) { + execSync('bun run build', { + cwd: APP_DIR, + stdio: 'inherit', + }); + } + }, 240_000); + + const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); + + it('root out/index.html exists', () => { + expect(fs.existsSync(ROOT_INDEX), 'expected out/index.html to exist after build').toBe(true); + }); + + it('out/og-image.png is present in the static export', () => { + const ogPath = path.join(OUT_DIR, 'og-image.png'); + expect( + fs.existsSync(ogPath), + 'og-image.png must be copied from public/ into the out/ static export by next build. ' + + 'If missing, run scripts/generate-og-images.ts before building.', + ).toBe(true); + }); + + it('out/og-image.png is a valid 1200×630 PNG', () => { + const buf = fs.readFileSync(path.join(OUT_DIR, 'og-image.png')); + expect(buf.subarray(0, 8), 'PNG signature').toEqual(PNG_SIGNATURE); + expect(buf.readUInt32BE(16), 'width').toBe(1200); + expect(buf.readUInt32BE(20), 'height').toBe(630); + expect(buf.length, 'file size').toBeGreaterThan(1024); + }); + + it('root out/index.html has full OG meta with absolute, root-scoped og:image', () => { + const html = fs.readFileSync(ROOT_INDEX, 'utf8'); + const meta = parseMeta(html); + + for (const tag of REQUIRED_OG_META) { + expect(meta.get(tag), `root: missing `).toBeTruthy(); + } + + const ogImage = meta.get('og:image'); + expect( + isAbsoluteHttps(ogImage), + `root og:image must be absolute https URL, got: ${ogImage}`, + ).toBe(true); + + // Root site image must be the static /og-image.png generated by + // scripts/generate-og-images.ts. With `output: 'export'`, the Next.js + // /opengraph-image metadata route does NOT produce a plain PNG that a CDN + // can serve — only og-image.png (pre-generated at build time) is valid. + expect(ogImage, 'root og:image must be the site-wide image, not a per-post one').not.toMatch( + /\/og\/[^/]+\.png/, + ); + expect(ogImage, 'root og:image must be /og-image.png').toMatch(/\/og-image\.png(\?|$)/); + + const twitterImage = meta.get('twitter:image'); + expect( + isAbsoluteHttps(twitterImage), + `root twitter:image must be absolute, got: ${twitterImage}`, + ).toBe(true); + expect(twitterImage, 'root twitter:image must not be a per-post one').not.toMatch( + /\/og\/[^/]+\.png/, + ); + expect(twitterImage, 'root twitter:image must be /og-image.png').toMatch( + /\/og-image\.png(\?|$)/, + ); + + expect(meta.get('twitter:card')).toBe('summary_large_image'); + expect(meta.get('og:type')).toBe('website'); + expect(meta.get('og:site_name')).toBe('PackRat Guides'); + }); + + it('guide post HTML files exist (>=1)', () => { + const files = listGuideHtmlFiles(); + expect(files.length, 'expected at least one out/guide/.html').toBeGreaterThan(0); + }); + + it('every guide post HTML has og:image present and absolute https', () => { + const files = listGuideHtmlFiles(); + const failures: string[] = []; + for (const file of files) { + const meta = parseMeta(fs.readFileSync(file, 'utf8')); + const ogImage = meta.get('og:image'); + if (!ogImage) { + failures.push(`${path.relative(OUT_DIR, file)}: missing og:image`); + continue; + } + if (!isAbsoluteHttps(ogImage)) { + // Relative og:image URLs break OG previews on most platforms. + failures.push(`${path.relative(OUT_DIR, file)}: og:image not absolute (${ogImage})`); + } + } + expect(failures, `OG image issues:\n${failures.join('\n')}`).toEqual([]); + }); + + it('sampled guide posts have full OG meta + per-post /og/.png image', () => { + const files = listGuideHtmlFiles(); + const sample = sampleN(files, 3); + expect(sample.length, 'expected to sample at least 1 guide HTML file').toBeGreaterThan(0); + + for (const file of sample) { + const slug = slugFromFile(file); + const meta = parseMeta(fs.readFileSync(file, 'utf8')); + + for (const tag of REQUIRED_OG_META) { + expect(meta.get(tag), `${slug}: missing `).toBeTruthy(); + } + + const ogImage = meta.get('og:image'); + expect(isAbsoluteHttps(ogImage), `${slug}: og:image must be absolute, got ${ogImage}`).toBe( + true, + ); + expect(ogImage, `${slug}: og:image should point at /og/${slug}.png`).toMatch( + new RegExp(`/og/${escapeRegex(slug)}\\.png$`), + ); + + const twitterImage = meta.get('twitter:image'); + expect( + isAbsoluteHttps(twitterImage), + `${slug}: twitter:image must be absolute, got ${twitterImage}`, + ).toBe(true); + expect(twitterImage, `${slug}: twitter:image should match og:image`).toMatch( + new RegExp(`/og/${escapeRegex(slug)}\\.png$`), + ); + + expect(meta.get('twitter:card'), `${slug}: twitter:card`).toBe('summary_large_image'); + expect(meta.get('og:type'), `${slug}: og:type`).toBe('article'); + expect(meta.get('og:site_name'), `${slug}: og:site_name`).toBe('PackRat Guides'); + + const width = Number(meta.get('og:image:width')); + const height = Number(meta.get('og:image:height')); + expect(width, `${slug}: og:image:width`).toBe(1200); + expect(height, `${slug}: og:image:height`).toBe(630); + } + }); +}); + +/** + * Optional live OG check. + * + * Set OG_LIVE_CHECK_URL to the deployed origin (e.g. + * `https://guides.packratai.com`) to fetch the homepage + a sample guide + * page over the wire and run them through `open-graph-scraper` — the same + * parser most platforms (LinkedIn, FB, microlink) use. This catches + * post-deploy regressions that a built-HTML check can miss (CF transforms, + * cache layers, etc.) but it isn't run by default because it requires + * network + a live deploy. + */ +describe.skipIf(!process.env.OG_LIVE_CHECK_URL)('live OG check', () => { + const liveUrl = (process.env.OG_LIVE_CHECK_URL ?? '').replace(/\/$/, ''); + + it('root URL has valid OG metadata via open-graph-scraper', async () => { + const mod = await import('open-graph-scraper'); + // open-graph-scraper is CJS (`module.exports = run`). After Node's + // interop the callable can be at `.default` or be the module itself + // depending on bundler — pick whichever is a function. + const ogs = + typeof (mod as { default?: unknown }).default === 'function' + ? (mod as { default: typeof mod.default }).default + : (mod as unknown as typeof mod.default); + const { result, error } = await ogs({ url: liveUrl, timeout: 15_000 }); + expect(error, `og fetch failed for ${liveUrl}`).toBeFalsy(); + expect(result.ogTitle, 'ogTitle').toBeTruthy(); + expect(result.ogDescription, 'ogDescription').toBeTruthy(); + expect(result.twitterCard).toBe('summary_large_image'); + const firstImage = result.ogImage?.[0]?.url; + expect(isAbsoluteHttps(firstImage), `root ogImage[0].url absolute (got ${firstImage})`).toBe( + true, + ); + expect(firstImage, 'root ogImage[0].url must not be per-post').not.toMatch(/\/og\/[^/]+\.png/); + }, 30_000); + + it('a sample guide page has valid OG metadata via open-graph-scraper', async () => { + // Pick a sample slug from the built HTML so we don't have to import + // lib/content.ts (which would fail in environments without the build). + const files = listGuideHtmlFiles(); + const first = files[0]; + if (!first) throw new Error('no built guide HTML available to sample a slug from'); + const slug = slugFromFile(first); + const target = `${liveUrl}/guide/${slug}`; + + const mod = await import('open-graph-scraper'); + const ogs = + typeof (mod as { default?: unknown }).default === 'function' + ? (mod as { default: typeof mod.default }).default + : (mod as unknown as typeof mod.default); + const { result, error } = await ogs({ url: target, timeout: 15_000 }); + expect(error, `og fetch failed for ${target}`).toBeFalsy(); + expect(result.ogTitle, 'ogTitle').toBeTruthy(); + expect(result.twitterCard).toBe('summary_large_image'); + const firstImage = result.ogImage?.[0]?.url; + expect(isAbsoluteHttps(firstImage), `guide ogImage[0].url absolute (got ${firstImage})`).toBe( + true, + ); + expect(firstImage, `guide ogImage[0].url should point at /og/${slug}.png`).toMatch( + new RegExp(`/og/${escapeRegex(slug)}\\.png$`), + ); + }, 30_000); +}); diff --git a/apps/guides/app/api/dev/generate-batch/route.ts b/apps/guides/app/api/dev/generate-batch/route.ts index d4b8dc08b5..f54a1dfb55 100644 --- a/apps/guides/app/api/dev/generate-batch/route.ts +++ b/apps/guides/app/api/dev/generate-batch/route.ts @@ -33,7 +33,7 @@ export async function POST(request: Request) { } // Generate the posts - const filePaths = await generatePosts(count, requestData.categories); + const filePaths = await generatePosts({ count, categories: requestData.categories }); if (!filePaths.length) { throw new Error('Failed to generate posts'); diff --git a/apps/guides/app/api/dev/generate-post/route.ts b/apps/guides/app/api/dev/generate-post/route.ts index a07a951dcd..dc234d57fe 100644 --- a/apps/guides/app/api/dev/generate-post/route.ts +++ b/apps/guides/app/api/dev/generate-post/route.ts @@ -39,7 +39,7 @@ export async function POST(request: Request) { } // Generate the post - const filePath = await generatePost(requestData); + const filePath = await generatePost({ request: requestData }); if (!filePath) { throw new Error('Failed to generate post'); diff --git a/apps/guides/app/global-error.tsx b/apps/guides/app/global-error.tsx new file mode 100644 index 0000000000..58346ad357 --- /dev/null +++ b/apps/guides/app/global-error.tsx @@ -0,0 +1,114 @@ +'use client'; + +/** + * Next.js global-error replaces the root layout when an error escapes it, + * so this component renders its own and . Styles are inlined + * so a failed stylesheet can't cascade into a blank page. + */ +export default function GlobalError({ + error: _error, + reset, +}: { + error: Error & { digest?: string }; + reset: () => void; +}) { + return ( + + + Something went wrong + + + + + +
+

+ 500 +

+

+ Something went wrong +

+

+ An unexpected error occurred while loading this page. You can try again, or head back to + all PackRat guides. +

+
+ + + Return to all guides + +
+
+ + + ); +} diff --git a/apps/guides/app/guide/[slug]/opengraph-image.tsx b/apps/guides/app/guide/[slug]/opengraph-image.tsx deleted file mode 100644 index 8c19a53c2b..0000000000 --- a/apps/guides/app/guide/[slug]/opengraph-image.tsx +++ /dev/null @@ -1,110 +0,0 @@ -import { getAllPosts, getPostBySlug } from 'guides-app/lib/mdx-static'; -import { ImageResponse } from 'next/og'; - -export const dynamic = 'force-static'; -export const size = { width: 1200, height: 630 }; -export const contentType = 'image/png'; - -export async function generateStaticParams() { - return getAllPosts().map((post) => ({ slug: post.slug })); -} - -export default async function Image({ params }: { params: Promise<{ slug: string }> }) { - const { slug } = await params; - const post = getPostBySlug(slug); - - const title = post?.title ?? 'PackRat Guides'; - const description = post?.description ?? 'Expert hiking and outdoor guides'; - const categories = post?.categories ?? []; - - return new ImageResponse( -
-
-
🏔️
-
- PackRat Guides -
-
- -
- {categories.length > 0 && ( -
- {categories.slice(0, 3).map((cat) => ( -
- {cat} -
- ))} -
- )} -
50 ? '44px' : '56px', - fontWeight: 700, - color: 'white', - lineHeight: 1.15, - letterSpacing: '-1px', - maxWidth: '900px', - }} - > - {title} -
-
- {description.length > 120 ? `${description.slice(0, 117)}...` : description} -
-
- -
- guides.packratai.com -
-
, - { ...size }, - ); -} diff --git a/apps/guides/app/guide/[slug]/page.tsx b/apps/guides/app/guide/[slug]/page.tsx index e84fd05de4..b36c44bc65 100644 --- a/apps/guides/app/guide/[slug]/page.tsx +++ b/apps/guides/app/guide/[slug]/page.tsx @@ -39,12 +39,14 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str siteName: 'PackRat Guides', publishedTime: post.date, tags: post.categories, + images: [{ url: `/og/${slug}.png`, width: 1200, height: 630, alt: post.title }], }, twitter: { card: 'summary_large_image', title: post.title, description: post.description, creator: '@packratai', + images: [`/og/${slug}.png`], }, }; } @@ -62,7 +64,7 @@ export default async function GuidePage({ params }: { params: Promise<{ slug: st const content = getMdxContent(slug); // Get related posts - const relatedPosts = getRelatedPosts(post, 3); + const relatedPosts = getRelatedPosts({ post, count: 3 }); return (
diff --git a/apps/guides/app/layout.tsx b/apps/guides/app/layout.tsx index eb159f716b..03111135e8 100644 --- a/apps/guides/app/layout.tsx +++ b/apps/guides/app/layout.tsx @@ -3,8 +3,7 @@ import Footer from 'guides-app/components/footer'; import Header from 'guides-app/components/header'; import { QueryProvider } from 'guides-app/components/providers/query-provider'; import { ThemeProvider } from 'guides-app/components/theme-provider'; -import { siteConfig } from 'guides-app/lib/config'; -import type { Metadata } from 'next'; +import { guidesMetadata } from 'guides-app/lib/metadata'; import { Mona_Sans as FontSans } from 'next/font/google'; import type React from 'react'; import './globals.css'; @@ -15,45 +14,7 @@ const fontSans = FontSans({ weight: ['400', '500', '600', '700'], }); -export const metadata: Metadata = { - title: { - default: 'PackRat Guides | Hiking & Outdoor Adventures', - template: '%s | PackRat Guides', - }, - description: 'Expert hiking and outdoor guides to help you prepare for your next adventure', - keywords: [ - 'hiking guides', - 'outdoor adventures', - 'trail guides', - 'camping', - 'backpacking', - 'gear reviews', - 'wilderness skills', - 'outdoor planning', - ], - authors: [{ name: 'PackRat Team', url: 'https://packrat.world' }], - creator: 'PackRat Team', - metadataBase: new URL(siteConfig.url), - openGraph: { - type: 'website', - locale: 'en_US', - url: siteConfig.url, - siteName: 'PackRat Guides', - title: 'PackRat Guides | Hiking & Outdoor Adventures', - description: 'Expert hiking and outdoor guides to help you prepare for your next adventure', - }, - twitter: { - card: 'summary_large_image', - title: 'PackRat Guides | Hiking & Outdoor Adventures', - description: 'Expert hiking and outdoor guides to help you prepare for your next adventure', - creator: '@packratai', - }, - icons: { - icon: [{ url: '/PackRatGuides.ico', type: 'image/x-icon' }], - shortcut: '/favicon-16x16.png', - apple: '/apple-touch-icon.png', - }, -}; +export const metadata = guidesMetadata; export default function RootLayout({ children }: { children: React.ReactNode }) { return ( diff --git a/apps/guides/app/not-found.tsx b/apps/guides/app/not-found.tsx index acd51677b9..8dd4e5590a 100644 --- a/apps/guides/app/not-found.tsx +++ b/apps/guides/app/not-found.tsx @@ -1,15 +1,39 @@ import { Button } from '@packrat/web-ui/components/button'; +import { Compass, Home } from 'lucide-react'; +import type { Metadata } from 'next'; import Link from 'next/link'; +export const metadata: Metadata = { + title: 'Page not found', + description: + "We couldn't find the guide you were looking for. Head back to all PackRat guides or explore a different topic.", + robots: { index: false, follow: false }, +}; + export default function NotFound() { return ( -
-
-

404

-

Page not found

- +
+
+

404

+

Page not found

+

+ The guide you were looking for may have been moved, renamed, or never existed. Try heading + back to all guides or browsing by category. +

+
+ + +
); diff --git a/apps/guides/app/opengraph-image.tsx b/apps/guides/app/opengraph-image.tsx deleted file mode 100644 index ade5c5fcc9..0000000000 --- a/apps/guides/app/opengraph-image.tsx +++ /dev/null @@ -1,93 +0,0 @@ -import { ImageResponse } from 'next/og'; - -export const dynamic = 'force-static'; -export const size = { width: 1200, height: 630 }; -export const contentType = 'image/png'; - -export default function Image() { - return new ImageResponse( -
-
-
- 🏔️ -
-
- PackRat Guides -
-
-
- Expert hiking and outdoor guides for your next adventure -
-
- {['Trail Guides', 'Gear Reviews', 'Survival Skills'].map((tag) => ( -
- {tag} -
- ))} -
-
, - { ...size }, - ); -} diff --git a/apps/guides/app/page.tsx b/apps/guides/app/page.tsx index c61d4e0cdf..2fb1b30dcf 100644 --- a/apps/guides/app/page.tsx +++ b/apps/guides/app/page.tsx @@ -13,7 +13,7 @@ export default function Home() { return (
- {/* Hero Section */} + {/* Hero Section — server-rendered for fast LCP */}
@@ -38,7 +38,7 @@ export default function Home() {
- {/* Features Section */} + {/* Features Section — server-rendered */}
@@ -55,7 +55,7 @@ export default function Home() {
- {/* Featured Guides */} + {/* Featured Guides — server-rendered */}

@@ -65,7 +65,7 @@ export default function Home() {

- {/* Filterable guides grid (client component handles search params) */} + {/* Filterable guides grid — client component for search/filter UI only */}
); diff --git a/apps/guides/app/twitter-image.tsx b/apps/guides/app/twitter-image.tsx deleted file mode 100644 index 61da1f7581..0000000000 --- a/apps/guides/app/twitter-image.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { ImageResponse } from 'next/og'; - -export const dynamic = 'force-static'; -export const size = { width: 1200, height: 630 }; -export const contentType = 'image/png'; - -export default function Image() { - return new ImageResponse( -
-
-
- 🏔️ -
-
- PackRat Guides -
-
-
- Expert hiking and outdoor guides for your next adventure -
-
, - { ...size }, - ); -} diff --git a/apps/guides/bun.lock b/apps/guides/bun.lock deleted file mode 100644 index d605bd76fa..0000000000 --- a/apps/guides/bun.lock +++ /dev/null @@ -1,987 +0,0 @@ -{ - "lockfileVersion": 1, - "workspaces": { - "": { - "name": "my-v0-project", - "dependencies": { - "@ai-sdk/openai": "^1.3.4", - "@hookform/resolvers": "^3.9.1", - "@radix-ui/react-accordion": "^1.2.2", - "@radix-ui/react-alert-dialog": "^1.1.4", - "@radix-ui/react-aspect-ratio": "^1.1.1", - "@radix-ui/react-avatar": "^1.1.2", - "@radix-ui/react-checkbox": "^1.1.3", - "@radix-ui/react-collapsible": "^1.1.2", - "@radix-ui/react-context-menu": "^2.2.4", - "@radix-ui/react-dialog": "^1.1.6", - "@radix-ui/react-dropdown-menu": "^2.1.4", - "@radix-ui/react-hover-card": "^1.1.4", - "@radix-ui/react-label": "^2.1.1", - "@radix-ui/react-menubar": "^1.1.4", - "@radix-ui/react-navigation-menu": "^1.2.3", - "@radix-ui/react-popover": "^1.1.4", - "@radix-ui/react-progress": "^1.1.1", - "@radix-ui/react-radio-group": "^1.2.2", - "@radix-ui/react-scroll-area": "^1.2.2", - "@radix-ui/react-select": "^2.1.4", - "@radix-ui/react-separator": "^1.1.1", - "@radix-ui/react-slider": "^1.2.2", - "@radix-ui/react-slot": "^1.1.1", - "@radix-ui/react-switch": "^1.1.2", - "@radix-ui/react-tabs": "^1.1.2", - "@radix-ui/react-toast": "^1.2.4", - "@radix-ui/react-toggle": "^1.1.1", - "@radix-ui/react-toggle-group": "^1.1.1", - "@radix-ui/react-tooltip": "^1.1.6", - "@tailwindcss/typography": "^0.5.16", - "@tanstack/react-query": "^5.70.0", - "@tanstack/react-query-devtools": "^5.70.0", - "ai": "^4.2.8", - "autoprefixer": "^10.4.20", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "cmdk": "1.0.4", - "date-fns": "^4.1.0", - "embla-carousel-react": "8.5.1", - "fs": "^0.0.1-security", - "gray-matter": "^4.0.3", - "input-otp": "1.4.1", - "lucide-react": "^0.454.0", - "mdx": "^0.3.1", - "next": "15.2.4", - "next-themes": "^0.4.6", - "path": "^0.12.7", - "react": "^19", - "react-day-picker": "8.10.1", - "react-dom": "^19", - "react-hook-form": "^7.54.1", - "react-resizable-panels": "^2.1.7", - "recharts": "2.15.0", - "remark": "^15.0.1", - "remark-html": "^16.0.1", - "slugify": "^1.6.6", - "sonner": "^1.7.1", - "tailwind-merge": "^2.5.5", - "tailwindcss": "^3.4.17", - "tailwindcss-animate": "^1.0.7", - "vaul": "^0.9.6", - "zod": "^3.24.1", - }, - "devDependencies": { - "@types/node": "^22", - "@types/react": "^19", - "@types/react-dom": "^19", - "postcss": "^8.5.3", - "tailwindcss": "^3.4.17", - "typescript": "^5.8.2", - }, - }, - }, - "packages": { - "@ai-sdk/openai": ["@ai-sdk/openai@1.3.4", "", { "dependencies": { "@ai-sdk/provider": "1.1.0", "@ai-sdk/provider-utils": "2.2.1" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-BOw7dQpiTlpaqi1u/NU4Or2+jA6buzl6GOUuYyu/uFI7dxJs1zPkY8IjAp4DQhi+kQGH6GGbEPw0LkIbeK4BVA=="], - - "@ai-sdk/provider": ["@ai-sdk/provider@1.1.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-0M+qjp+clUD0R1E5eWQFhxEvWLNaOtGQRUaBn8CUABnSKredagq92hUS9VjOzGsTm37xLfpaxl97AVtbeOsHew=="], - - "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.1", "", { "dependencies": { "@ai-sdk/provider": "1.1.0", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-BuExLp+NcpwsAVj1F4bgJuQkSqO/+roV9wM7RdIO+NVrcT8RBUTdXzf5arHt5T58VpK7bZyB2V9qigjaPHE+Dg=="], - - "@ai-sdk/react": ["@ai-sdk/react@1.2.3", "", { "dependencies": { "@ai-sdk/provider-utils": "2.2.1", "@ai-sdk/ui-utils": "1.2.2", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.23.8" }, "optionalPeers": ["zod"] }, "sha512-EQ6nmmQBBAal1yg72GB/Q7QnmDXMfgYvCo9Gym2mESXUHTqwpXU0JFHtk5Kq3EEkk7CVMf1oBWlNFNvU5ckQBg=="], - - "@ai-sdk/ui-utils": ["@ai-sdk/ui-utils@1.2.2", "", { "dependencies": { "@ai-sdk/provider": "1.1.0", "@ai-sdk/provider-utils": "2.2.1", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-6rCx2jSEPuiF6fytfMNscSOinHQZp52aFCHyPVpPPkcWnOur1jPWhol+0TFCUruDl7dCfcSIfTexQUq2ioLwaA=="], - - "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="], - - "@babel/runtime": ["@babel/runtime@7.27.0", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw=="], - - "@emnapi/runtime": ["@emnapi/runtime@1.4.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw=="], - - "@floating-ui/core": ["@floating-ui/core@1.6.9", "", { "dependencies": { "@floating-ui/utils": "^0.2.9" } }, "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw=="], - - "@floating-ui/dom": ["@floating-ui/dom@1.6.13", "", { "dependencies": { "@floating-ui/core": "^1.6.0", "@floating-ui/utils": "^0.2.9" } }, "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w=="], - - "@floating-ui/react-dom": ["@floating-ui/react-dom@2.1.2", "", { "dependencies": { "@floating-ui/dom": "^1.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A=="], - - "@floating-ui/utils": ["@floating-ui/utils@0.2.9", "", {}, "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="], - - "@hookform/resolvers": ["@hookform/resolvers@3.10.0", "", { "peerDependencies": { "react-hook-form": "^7.0.0" } }, "sha512-79Dv+3mDF7i+2ajj7SkypSKHhl1cbln1OGavqrsF7p6mbUv11xpqpacPsGDCTRvCSjEEIez2ef1NveSVL3b0Ag=="], - - "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="], - - "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.0.4" }, "os": "darwin", "cpu": "x64" }, "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q=="], - - "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg=="], - - "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ=="], - - "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.0.5", "", { "os": "linux", "cpu": "arm" }, "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g=="], - - "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA=="], - - "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.0.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA=="], - - "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw=="], - - "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA=="], - - "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw=="], - - "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.0.5" }, "os": "linux", "cpu": "arm" }, "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ=="], - - "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA=="], - - "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.0.4" }, "os": "linux", "cpu": "s390x" }, "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q=="], - - "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA=="], - - "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g=="], - - "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw=="], - - "@img/sharp-wasm32": ["@img/sharp-wasm32@0.33.5", "", { "dependencies": { "@emnapi/runtime": "^1.2.0" }, "cpu": "none" }, "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg=="], - - "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.33.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ=="], - - "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="], - - "@isaacs/cliui": ["@isaacs/cliui@8.0.2", "", { "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", "strip-ansi": "^7.0.1", "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", "wrap-ansi": "^8.1.0", "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" } }, "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="], - - "@jridgewell/gen-mapping": ["@jridgewell/gen-mapping@0.3.8", "", { "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA=="], - - "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="], - - "@jridgewell/set-array": ["@jridgewell/set-array@1.2.1", "", {}, "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="], - - "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.0", "", {}, "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="], - - "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="], - - "@next/env": ["@next/env@15.2.4", "", {}, "sha512-+SFtMgoiYP3WoSswuNmxJOCwi06TdWE733D+WPjpXIe4LXGULwEaofiiAy6kbS0+XjM5xF5n3lKuBwN2SnqD9g=="], - - "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.2.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-1AnMfs655ipJEDC/FHkSr0r3lXBgpqKo4K1kiwfUf3iE68rDFXZ1TtHdMvf7D0hMItgDZ7Vuq3JgNMbt/+3bYw=="], - - "@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.2.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-3qK2zb5EwCwxnO2HeO+TRqCubeI/NgCe+kL5dTJlPldV/uwCnUgC7VbEzgmxbfrkbjehL4H9BPztWOEtsoMwew=="], - - "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-HFN6GKUcrTWvem8AZN7tT95zPb0GUGv9v0d0iyuTb303vbXkkbHDp/DxufB04jNVD+IN9yHy7y/6Mqq0h0YVaQ=="], - - "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-Oioa0SORWLwi35/kVB8aCk5Uq+5/ZIumMK1kJV+jSdazFm2NzPDztsefzdmzzpx5oGCJ6FkUC7vkaUseNTStNA=="], - - "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-yb5WTRaHdkgOqFOZiu6rHV1fAEK0flVpaIN2HB6kxHVSy/dIajWbThS7qON3W9/SNOH2JWkVCyulgGYekMePuw=="], - - "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-Dcdv/ix6srhkM25fgXiyOieFUkz+fOYkHlydWCtB0xMST6X9XYI3yPDKBZt1xuhOytONsIFJFB08xXYsxUwJLw=="], - - "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.2.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-dW0i7eukvDxtIhCYkMrZNQfNicPDExt2jPb9AZPpL7cfyUo7QSNl1DjsHjmmKp6qNAqUESyT8YFl/Aw91cNJJg=="], - - "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.2.4", "", { "os": "win32", "cpu": "x64" }, "sha512-SbnWkJmkS7Xl3kre8SdMF6F/XDh1DTFEhp0jRTj/uB8iPKoU2bb2NDfcu+iifv1+mxQEd1g2vvSxcZbXSKyWiQ=="], - - "@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="], - - "@nodelib/fs.stat": ["@nodelib/fs.stat@2.0.5", "", {}, "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="], - - "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="], - - "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="], - - "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="], - - "@radix-ui/number": ["@radix-ui/number@1.1.0", "", {}, "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ=="], - - "@radix-ui/primitive": ["@radix-ui/primitive@1.1.1", "", {}, "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA=="], - - "@radix-ui/react-accordion": ["@radix-ui/react-accordion@1.2.3", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collapsible": "1.1.3", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A=="], - - "@radix-ui/react-alert-dialog": ["@radix-ui/react-alert-dialog@1.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-dialog": "1.1.6", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-slot": "1.1.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-p4XnPqgej8sZAAReCAKgz1REYZEBLR8hU9Pg27wFnCWIMc8g1ccCs0FjBcy05V15VTu8pAePw/VDYeOm/uZ6yQ=="], - - "@radix-ui/react-arrow": ["@radix-ui/react-arrow@1.1.2", "", { "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg=="], - - "@radix-ui/react-aspect-ratio": ["@radix-ui/react-aspect-ratio@1.1.2", "", { "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-TaJxYoCpxJ7vfEkv2PTNox/6zzmpKXT6ewvCuf2tTOIVN45/Jahhlld29Yw4pciOXS2Xq91/rSGEdmEnUWZCqA=="], - - "@radix-ui/react-avatar": ["@radix-ui/react-avatar@1.1.3", "", { "dependencies": { "@radix-ui/react-context": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g=="], - - "@radix-ui/react-checkbox": ["@radix-ui/react-checkbox@1.1.4", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-use-size": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw=="], - - "@radix-ui/react-collapsible": ["@radix-ui/react-collapsible@1.1.3", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw=="], - - "@radix-ui/react-collection": ["@radix-ui/react-collection@1.1.2", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-slot": "1.1.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw=="], - - "@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="], - - "@radix-ui/react-context": ["@radix-ui/react-context@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q=="], - - "@radix-ui/react-context-menu": ["@radix-ui/react-context-menu@2.2.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-menu": "2.1.6", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-aUP99QZ3VU84NPsHeaFt4cQUNgJqFsLLOt/RbbWXszZ6MP0DpDyjkFZORr4RpAEx3sUBk+Kc8h13yGtC5Qw8dg=="], - - "@radix-ui/react-dialog": ["@radix-ui/react-dialog@1.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw=="], - - "@radix-ui/react-direction": ["@radix-ui/react-direction@1.1.0", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg=="], - - "@radix-ui/react-dismissable-layer": ["@radix-ui/react-dismissable-layer@1.1.5", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-escape-keydown": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg=="], - - "@radix-ui/react-dropdown-menu": ["@radix-ui/react-dropdown-menu@2.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-menu": "2.1.6", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA=="], - - "@radix-ui/react-focus-guards": ["@radix-ui/react-focus-guards@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg=="], - - "@radix-ui/react-focus-scope": ["@radix-ui/react-focus-scope@1.1.2", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA=="], - - "@radix-ui/react-hover-card": ["@radix-ui/react-hover-card@1.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-popper": "1.2.2", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-E4ozl35jq0VRlrdc4dhHrNSV0JqBb4Jy73WAhBEK7JoYnQ83ED5r0Rb/XdVKw89ReAJN38N492BAPBZQ57VmqQ=="], - - "@radix-ui/react-id": ["@radix-ui/react-id@1.1.0", "", { "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA=="], - - "@radix-ui/react-label": ["@radix-ui/react-label@2.1.2", "", { "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw=="], - - "@radix-ui/react-menu": ["@radix-ui/react-menu@2.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-popper": "1.2.2", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-roving-focus": "1.1.2", "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-callback-ref": "1.1.0", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg=="], - - "@radix-ui/react-menubar": ["@radix-ui/react-menubar@1.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-menu": "2.1.6", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-roving-focus": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-FHq7+3DlXwh/7FOM4i0G4bC4vPjiq89VEEvNF4VMLchGnaUuUbE5uKXMUCjdKaOghEEMeiKa5XCa2Pk4kteWmg=="], - - "@radix-ui/react-navigation-menu": ["@radix-ui/react-navigation-menu@1.2.5", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-visually-hidden": "1.1.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-myMHHQUZ3ZLTi8W381/Vu43Ia0NqakkQZ2vzynMmTUtQQ9kNkjzhOwkZC9TAM5R07OZUVIQyHC06f/9JZJpvvA=="], - - "@radix-ui/react-popover": ["@radix-ui/react-popover@1.1.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-popper": "1.2.2", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg=="], - - "@radix-ui/react-popper": ["@radix-ui/react-popper@1.2.2", "", { "dependencies": { "@floating-ui/react-dom": "^2.0.0", "@radix-ui/react-arrow": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-rect": "1.1.0", "@radix-ui/react-use-size": "1.1.0", "@radix-ui/rect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA=="], - - "@radix-ui/react-portal": ["@radix-ui/react-portal@1.1.4", "", { "dependencies": { "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA=="], - - "@radix-ui/react-presence": ["@radix-ui/react-presence@1.1.2", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg=="], - - "@radix-ui/react-primitive": ["@radix-ui/react-primitive@2.0.2", "", { "dependencies": { "@radix-ui/react-slot": "1.1.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w=="], - - "@radix-ui/react-progress": ["@radix-ui/react-progress@1.1.2", "", { "dependencies": { "@radix-ui/react-context": "1.1.1", "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA=="], - - "@radix-ui/react-radio-group": ["@radix-ui/react-radio-group@1.2.3", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-roving-focus": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-use-size": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-xtCsqt8Rp09FK50ItqEqTJ7Sxanz8EM8dnkVIhJrc/wkMMomSmXHvYbhv3E7Zx4oXh98aaLt9W679SUYXg4IDA=="], - - "@radix-ui/react-roving-focus": ["@radix-ui/react-roving-focus@1.1.2", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw=="], - - "@radix-ui/react-scroll-area": ["@radix-ui/react-scroll-area@1.2.3", "", { "dependencies": { "@radix-ui/number": "1.1.0", "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-l7+NNBfBYYJa9tNqVcP2AGvxdE3lmE6kFTBXdvHgUaZuy+4wGCL1Cl2AfaR7RKyimj7lZURGLwFO59k4eBnDJQ=="], - - "@radix-ui/react-select": ["@radix-ui/react-select@2.1.6", "", { "dependencies": { "@radix-ui/number": "1.1.0", "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-focus-guards": "1.1.1", "@radix-ui/react-focus-scope": "1.1.2", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-popper": "1.2.2", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-visually-hidden": "1.1.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg=="], - - "@radix-ui/react-separator": ["@radix-ui/react-separator@1.1.2", "", { "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ=="], - - "@radix-ui/react-slider": ["@radix-ui/react-slider@1.2.3", "", { "dependencies": { "@radix-ui/number": "1.1.0", "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-use-size": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-nNrLAWLjGESnhqBqcCNW4w2nn7LxudyMzeB6VgdyAnFLC6kfQgnAjSL2v6UkQTnDctJBlxrmxfplWS4iYjdUTw=="], - - "@radix-ui/react-slot": ["@radix-ui/react-slot@1.1.2", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ=="], - - "@radix-ui/react-switch": ["@radix-ui/react-switch@1.1.3", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-use-size": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-1nc+vjEOQkJVsJtWPSiISGT6OKm4SiOdjMo+/icLxo2G4vxz1GntC5MzfL4v8ey9OEfw787QCD1y3mUv0NiFEQ=="], - - "@radix-ui/react-tabs": ["@radix-ui/react-tabs@1.1.3", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-roving-focus": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-9mFyI30cuRDImbmFF6O2KUJdgEOsGh9Vmx9x/Dh9tOhL7BngmQPQfwW4aejKm5OHpfWIdmeV6ySyuxoOGjtNng=="], - - "@radix-ui/react-toast": ["@radix-ui/react-toast@1.2.6", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-callback-ref": "1.1.0", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-visually-hidden": "1.1.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-gN4dpuIVKEgpLn1z5FhzT9mYRUitbfZq9XqN/7kkBMUgFTzTG8x/KszWJugJXHcwxckY8xcKDZPz7kG3o6DsUA=="], - - "@radix-ui/react-toggle": ["@radix-ui/react-toggle@1.1.2", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-lntKchNWx3aCHuWKiDY+8WudiegQvBpDRAYL8dKLRvKEH8VOpl0XX6SSU/bUBqIRJbcTy4+MW06Wv8vgp10rzQ=="], - - "@radix-ui/react-toggle-group": ["@radix-ui/react-toggle-group@1.1.2", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-direction": "1.1.0", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-roving-focus": "1.1.2", "@radix-ui/react-toggle": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-JBm6s6aVG/nwuY5eadhU2zDi/IwYS0sDM5ZWb4nymv/hn3hZdkw+gENn0LP4iY1yCd7+bgJaCwueMYJIU3vk4A=="], - - "@radix-ui/react-tooltip": ["@radix-ui/react-tooltip@1.1.8", "", { "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", "@radix-ui/react-dismissable-layer": "1.1.5", "@radix-ui/react-id": "1.1.0", "@radix-ui/react-popper": "1.2.2", "@radix-ui/react-portal": "1.1.4", "@radix-ui/react-presence": "1.1.2", "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-slot": "1.1.2", "@radix-ui/react-use-controllable-state": "1.1.0", "@radix-ui/react-visually-hidden": "1.1.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-YAA2cu48EkJZdAMHC0dqo9kialOcRStbtiY4nJPaht7Ptrhcvpo+eDChaM6BIs8kL6a8Z5l5poiqLnXcNduOkA=="], - - "@radix-ui/react-use-callback-ref": ["@radix-ui/react-use-callback-ref@1.1.0", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw=="], - - "@radix-ui/react-use-controllable-state": ["@radix-ui/react-use-controllable-state@1.1.0", "", { "dependencies": { "@radix-ui/react-use-callback-ref": "1.1.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw=="], - - "@radix-ui/react-use-escape-keydown": ["@radix-ui/react-use-escape-keydown@1.1.0", "", { "dependencies": { "@radix-ui/react-use-callback-ref": "1.1.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw=="], - - "@radix-ui/react-use-layout-effect": ["@radix-ui/react-use-layout-effect@1.1.0", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w=="], - - "@radix-ui/react-use-previous": ["@radix-ui/react-use-previous@1.1.0", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og=="], - - "@radix-ui/react-use-rect": ["@radix-ui/react-use-rect@1.1.0", "", { "dependencies": { "@radix-ui/rect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ=="], - - "@radix-ui/react-use-size": ["@radix-ui/react-use-size@1.1.0", "", { "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw=="], - - "@radix-ui/react-visually-hidden": ["@radix-ui/react-visually-hidden@1.1.2", "", { "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q=="], - - "@radix-ui/rect": ["@radix-ui/rect@1.1.0", "", {}, "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg=="], - - "@swc/counter": ["@swc/counter@0.1.3", "", {}, "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="], - - "@swc/helpers": ["@swc/helpers@0.5.15", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g=="], - - "@tailwindcss/typography": ["@tailwindcss/typography@0.5.16", "", { "dependencies": { "lodash.castarray": "^4.4.0", "lodash.isplainobject": "^4.0.6", "lodash.merge": "^4.6.2", "postcss-selector-parser": "6.0.10" }, "peerDependencies": { "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1" } }, "sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA=="], - - "@tanstack/query-core": ["@tanstack/query-core@5.70.0", "", {}, "sha512-ZkkjQAZjI6nS5OyAmaSQafQXK180Xvp0lZYk4BzrnskkTV8On3zSJUxOIXnh0h/8EgqRkCA9i879DiJovA1kGw=="], - - "@tanstack/query-devtools": ["@tanstack/query-devtools@5.67.2", "", {}, "sha512-O4QXFFd7xqp6EX7sdvc9tsVO8nm4lpWBqwpgjpVLW5g7IeOY6VnS/xvs/YzbRhBVkKTMaJMOUGU7NhSX+YGoNg=="], - - "@tanstack/react-query": ["@tanstack/react-query@5.70.0", "", { "dependencies": { "@tanstack/query-core": "5.70.0" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-z0tx1zz2CQ6nTm+fCaOp93FqsFjNgXtOy+4mC5ifQ4B+rJiMD0AGfJrYSGh/OuefhrzTYDAbkGUAGw6JzkWy8g=="], - - "@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.70.0", "", { "dependencies": { "@tanstack/query-devtools": "5.67.2" }, "peerDependencies": { "@tanstack/react-query": "^5.70.0", "react": "^18 || ^19" } }, "sha512-jFtpA3mnUoVn/ic1EVxmA6qG7z8S19nchsHciMCWOvC1Z2Mt8f0wbl1p8hNvrBpzWywZa+Hl0AxMVs48psUvhg=="], - - "@types/d3-array": ["@types/d3-array@3.2.1", "", {}, "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg=="], - - "@types/d3-color": ["@types/d3-color@3.1.3", "", {}, "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="], - - "@types/d3-ease": ["@types/d3-ease@3.0.2", "", {}, "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="], - - "@types/d3-interpolate": ["@types/d3-interpolate@3.0.4", "", { "dependencies": { "@types/d3-color": "*" } }, "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA=="], - - "@types/d3-path": ["@types/d3-path@3.1.1", "", {}, "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg=="], - - "@types/d3-scale": ["@types/d3-scale@4.0.9", "", { "dependencies": { "@types/d3-time": "*" } }, "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw=="], - - "@types/d3-shape": ["@types/d3-shape@3.1.7", "", { "dependencies": { "@types/d3-path": "*" } }, "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg=="], - - "@types/d3-time": ["@types/d3-time@3.0.4", "", {}, "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g=="], - - "@types/d3-timer": ["@types/d3-timer@3.0.2", "", {}, "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="], - - "@types/debug": ["@types/debug@4.1.12", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="], - - "@types/diff-match-patch": ["@types/diff-match-patch@1.0.36", "", {}, "sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg=="], - - "@types/hast": ["@types/hast@3.0.4", "", { "dependencies": { "@types/unist": "*" } }, "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ=="], - - "@types/mdast": ["@types/mdast@4.0.4", "", { "dependencies": { "@types/unist": "*" } }, "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA=="], - - "@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="], - - "@types/node": ["@types/node@22.13.14", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w=="], - - "@types/react": ["@types/react@19.0.12", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-V6Ar115dBDrjbtXSrS+/Oruobc+qVbbUxDFC1RSbRqLt5SYvxxyIDrSC85RWml54g+jfNeEMZhEj7wW07ONQhA=="], - - "@types/react-dom": ["@types/react-dom@19.0.4", "", { "peerDependencies": { "@types/react": "^19.0.0" } }, "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg=="], - - "@types/unist": ["@types/unist@3.0.3", "", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="], - - "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="], - - "ai": ["ai@4.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.0", "@ai-sdk/provider-utils": "2.2.1", "@ai-sdk/react": "1.2.3", "@ai-sdk/ui-utils": "1.2.2", "@opentelemetry/api": "1.9.0", "jsondiffpatch": "0.6.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.23.8" }, "optionalPeers": ["react"] }, "sha512-0gwfPZAuuQ+uTfk/GssrfnNTYxliCFKojbSQoEhzpbpSVaPao9NoU3iuE8vwBjWuDKqILRGzYGFE4+vTak0Oxg=="], - - "ansi-regex": ["ansi-regex@6.1.0", "", {}, "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="], - - "ansi-styles": ["ansi-styles@6.2.1", "", {}, "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="], - - "any-promise": ["any-promise@1.3.0", "", {}, "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="], - - "anymatch": ["anymatch@3.1.3", "", { "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="], - - "arg": ["arg@5.0.2", "", {}, "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="], - - "argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="], - - "aria-hidden": ["aria-hidden@1.2.4", "", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A=="], - - "array-find-index": ["array-find-index@1.0.2", "", {}, "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="], - - "autoprefixer": ["autoprefixer@10.4.21", "", { "dependencies": { "browserslist": "^4.24.4", "caniuse-lite": "^1.0.30001702", "fraction.js": "^4.3.7", "normalize-range": "^0.1.2", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "peerDependencies": { "postcss": "^8.1.0" }, "bin": { "autoprefixer": "bin/autoprefixer" } }, "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ=="], - - "bail": ["bail@2.0.2", "", {}, "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw=="], - - "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - - "binary-extensions": ["binary-extensions@2.3.0", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="], - - "brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], - - "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="], - - "browserslist": ["browserslist@4.24.4", "", { "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" } }, "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A=="], - - "busboy": ["busboy@1.6.0", "", { "dependencies": { "streamsearch": "^1.1.0" } }, "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="], - - "camelcase": ["camelcase@2.1.1", "", {}, "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="], - - "camelcase-css": ["camelcase-css@2.0.1", "", {}, "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="], - - "camelcase-keys": ["camelcase-keys@2.1.0", "", { "dependencies": { "camelcase": "^2.0.0", "map-obj": "^1.0.0" } }, "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ=="], - - "caniuse-lite": ["caniuse-lite@1.0.30001707", "", {}, "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw=="], - - "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="], - - "chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="], - - "character-entities": ["character-entities@2.0.2", "", {}, "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="], - - "character-entities-html4": ["character-entities-html4@2.1.0", "", {}, "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA=="], - - "character-entities-legacy": ["character-entities-legacy@3.0.0", "", {}, "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ=="], - - "chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="], - - "class-variance-authority": ["class-variance-authority@0.7.1", "", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="], - - "client-only": ["client-only@0.0.1", "", {}, "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="], - - "clsx": ["clsx@2.1.1", "", {}, "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA=="], - - "cmdk": ["cmdk@1.0.4", "", { "dependencies": { "@radix-ui/react-dialog": "^1.1.2", "@radix-ui/react-id": "^1.1.0", "@radix-ui/react-primitive": "^2.0.0", "use-sync-external-store": "^1.2.2" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "react-dom": "^18 || ^19 || ^19.0.0-rc" } }, "sha512-AnsjfHyHpQ/EFeAnG216WY7A5LiYCoZzCSygiLvfXC3H3LFGCprErteUcszaVluGOhuOTbJS3jWHrSDYPBBygg=="], - - "color": ["color@4.2.3", "", { "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" } }, "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A=="], - - "color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="], - - "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="], - - "color-string": ["color-string@1.9.1", "", { "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" } }, "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="], - - "comma-separated-tokens": ["comma-separated-tokens@2.0.3", "", {}, "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg=="], - - "commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="], - - "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="], - - "cssesc": ["cssesc@3.0.0", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="], - - "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="], - - "currently-unhandled": ["currently-unhandled@0.4.1", "", { "dependencies": { "array-find-index": "^1.0.1" } }, "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="], - - "d3-array": ["d3-array@3.2.4", "", { "dependencies": { "internmap": "1 - 2" } }, "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg=="], - - "d3-color": ["d3-color@3.1.0", "", {}, "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="], - - "d3-ease": ["d3-ease@3.0.1", "", {}, "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="], - - "d3-format": ["d3-format@3.1.0", "", {}, "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="], - - "d3-interpolate": ["d3-interpolate@3.0.1", "", { "dependencies": { "d3-color": "1 - 3" } }, "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g=="], - - "d3-path": ["d3-path@3.1.0", "", {}, "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="], - - "d3-scale": ["d3-scale@4.0.2", "", { "dependencies": { "d3-array": "2.10.0 - 3", "d3-format": "1 - 3", "d3-interpolate": "1.2.0 - 3", "d3-time": "2.1.1 - 3", "d3-time-format": "2 - 4" } }, "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ=="], - - "d3-shape": ["d3-shape@3.2.0", "", { "dependencies": { "d3-path": "^3.1.0" } }, "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA=="], - - "d3-time": ["d3-time@3.1.0", "", { "dependencies": { "d3-array": "2 - 3" } }, "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q=="], - - "d3-time-format": ["d3-time-format@4.1.0", "", { "dependencies": { "d3-time": "1 - 3" } }, "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg=="], - - "d3-timer": ["d3-timer@3.0.1", "", {}, "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="], - - "date-fns": ["date-fns@4.1.0", "", {}, "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg=="], - - "debug": ["debug@4.4.0", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA=="], - - "decimal.js-light": ["decimal.js-light@2.5.1", "", {}, "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="], - - "decode-named-character-reference": ["decode-named-character-reference@1.1.0", "", { "dependencies": { "character-entities": "^2.0.0" } }, "sha512-Wy+JTSbFThEOXQIR2L6mxJvEs+veIzpmqD7ynWxMXGpnk3smkHQOp6forLdHsKpAMW9iJpaBBIxz285t1n1C3w=="], - - "dequal": ["dequal@2.0.3", "", {}, "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="], - - "detect-libc": ["detect-libc@2.0.3", "", {}, "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw=="], - - "detect-node-es": ["detect-node-es@1.1.0", "", {}, "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="], - - "devlop": ["devlop@1.1.0", "", { "dependencies": { "dequal": "^2.0.0" } }, "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="], - - "didyoumean": ["didyoumean@1.2.2", "", {}, "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="], - - "diff-match-patch": ["diff-match-patch@1.0.5", "", {}, "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="], - - "dlv": ["dlv@1.1.3", "", {}, "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="], - - "dom-helpers": ["dom-helpers@5.2.1", "", { "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" } }, "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="], - - "eastasianwidth": ["eastasianwidth@0.2.0", "", {}, "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="], - - "electron-to-chromium": ["electron-to-chromium@1.5.128", "", {}, "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ=="], - - "embla-carousel": ["embla-carousel@8.5.1", "", {}, "sha512-JUb5+FOHobSiWQ2EJNaueCNT/cQU9L6XWBbWmorWPQT9bkbk+fhsuLr8wWrzXKagO3oWszBO7MSx+GfaRk4E6A=="], - - "embla-carousel-react": ["embla-carousel-react@8.5.1", "", { "dependencies": { "embla-carousel": "8.5.1", "embla-carousel-reactive-utils": "8.5.1" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.1 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-z9Y0K84BJvhChXgqn2CFYbfEi6AwEr+FFVVKm/MqbTQ2zIzO1VQri6w67LcfpVF0AjbhwVMywDZqY4alYkjW5w=="], - - "embla-carousel-reactive-utils": ["embla-carousel-reactive-utils@8.5.1", "", { "peerDependencies": { "embla-carousel": "8.5.1" } }, "sha512-n7VSoGIiiDIc4MfXF3ZRTO59KDp820QDuyBDGlt5/65+lumPHxX2JLz0EZ23hZ4eg4vZGUXwMkYv02fw2JVo/A=="], - - "emoji-regex": ["emoji-regex@9.2.2", "", {}, "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="], - - "error-ex": ["error-ex@1.3.2", "", { "dependencies": { "is-arrayish": "^0.2.1" } }, "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="], - - "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="], - - "esprima": ["esprima@4.0.1", "", { "bin": { "esparse": "./bin/esparse.js", "esvalidate": "./bin/esvalidate.js" } }, "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="], - - "eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="], - - "extend": ["extend@3.0.2", "", {}, "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="], - - "extend-shallow": ["extend-shallow@2.0.1", "", { "dependencies": { "is-extendable": "^0.1.0" } }, "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="], - - "fast-equals": ["fast-equals@5.2.2", "", {}, "sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw=="], - - "fast-glob": ["fast-glob@3.3.3", "", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.8" } }, "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg=="], - - "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="], - - "fill-range": ["fill-range@7.1.1", "", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="], - - "find-up": ["find-up@1.1.2", "", { "dependencies": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" } }, "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="], - - "foreground-child": ["foreground-child@3.3.1", "", { "dependencies": { "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" } }, "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw=="], - - "fraction.js": ["fraction.js@4.3.7", "", {}, "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="], - - "fs": ["fs@0.0.1-security", "", {}, "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w=="], - - "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], - - "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], - - "get-nonce": ["get-nonce@1.0.1", "", {}, "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="], - - "get-stdin": ["get-stdin@4.0.1", "", {}, "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="], - - "glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="], - - "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="], - - "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], - - "gray-matter": ["gray-matter@4.0.3", "", { "dependencies": { "js-yaml": "^3.13.1", "kind-of": "^6.0.2", "section-matter": "^1.0.0", "strip-bom-string": "^1.0.0" } }, "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q=="], - - "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="], - - "hast-util-sanitize": ["hast-util-sanitize@5.0.2", "", { "dependencies": { "@types/hast": "^3.0.0", "@ungap/structured-clone": "^1.0.0", "unist-util-position": "^5.0.0" } }, "sha512-3yTWghByc50aGS7JlGhk61SPenfE/p1oaFeNwkOOyrscaOkMGrcW9+Cy/QAIOBpZxP1yqDIzFMR0+Np0i0+usg=="], - - "hast-util-to-html": ["hast-util-to-html@9.0.5", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/unist": "^3.0.0", "ccount": "^2.0.0", "comma-separated-tokens": "^2.0.0", "hast-util-whitespace": "^3.0.0", "html-void-elements": "^3.0.0", "mdast-util-to-hast": "^13.0.0", "property-information": "^7.0.0", "space-separated-tokens": "^2.0.0", "stringify-entities": "^4.0.0", "zwitch": "^2.0.4" } }, "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw=="], - - "hast-util-whitespace": ["hast-util-whitespace@3.0.0", "", { "dependencies": { "@types/hast": "^3.0.0" } }, "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw=="], - - "hosted-git-info": ["hosted-git-info@2.8.9", "", {}, "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="], - - "html-void-elements": ["html-void-elements@3.0.0", "", {}, "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg=="], - - "indent-string": ["indent-string@2.1.0", "", { "dependencies": { "repeating": "^2.0.0" } }, "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg=="], - - "inherits": ["inherits@2.0.3", "", {}, "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="], - - "input-otp": ["input-otp@1.4.1", "", { "peerDependencies": { "react": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-+yvpmKYKHi9jIGngxagY9oWiiblPB7+nEO75F2l2o4vs+6vpPZZmUl4tBNYuTCvQjhvEIbdNeJu70bhfYP2nbw=="], - - "internmap": ["internmap@2.0.3", "", {}, "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="], - - "is-arrayish": ["is-arrayish@0.3.2", "", {}, "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="], - - "is-binary-path": ["is-binary-path@2.1.0", "", { "dependencies": { "binary-extensions": "^2.0.0" } }, "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="], - - "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], - - "is-extendable": ["is-extendable@0.1.1", "", {}, "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="], - - "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="], - - "is-finite": ["is-finite@1.1.0", "", {}, "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="], - - "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="], - - "is-glob": ["is-glob@4.0.3", "", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="], - - "is-number": ["is-number@7.0.0", "", {}, "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="], - - "is-plain-obj": ["is-plain-obj@4.1.0", "", {}, "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg=="], - - "is-utf8": ["is-utf8@0.2.1", "", {}, "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="], - - "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], - - "jackspeak": ["jackspeak@3.4.3", "", { "dependencies": { "@isaacs/cliui": "^8.0.2" }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="], - - "jiti": ["jiti@1.21.7", "", { "bin": { "jiti": "bin/jiti.js" } }, "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A=="], - - "js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], - - "js-yaml": ["js-yaml@3.14.1", "", { "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="], - - "json-schema": ["json-schema@0.4.0", "", {}, "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="], - - "jsondiffpatch": ["jsondiffpatch@0.6.0", "", { "dependencies": { "@types/diff-match-patch": "^1.0.36", "chalk": "^5.3.0", "diff-match-patch": "^1.0.5" }, "bin": { "jsondiffpatch": "bin/jsondiffpatch.js" } }, "sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ=="], - - "kind-of": ["kind-of@6.0.3", "", {}, "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="], - - "lilconfig": ["lilconfig@3.1.3", "", {}, "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw=="], - - "lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="], - - "load-json-file": ["load-json-file@1.1.0", "", { "dependencies": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", "pify": "^2.0.0", "pinkie-promise": "^2.0.0", "strip-bom": "^2.0.0" } }, "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A=="], - - "lodash": ["lodash@4.17.21", "", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="], - - "lodash.castarray": ["lodash.castarray@4.4.0", "", {}, "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="], - - "lodash.isplainobject": ["lodash.isplainobject@4.0.6", "", {}, "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="], - - "lodash.merge": ["lodash.merge@4.6.2", "", {}, "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="], - - "longest-streak": ["longest-streak@3.1.0", "", {}, "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g=="], - - "loose-envify": ["loose-envify@1.4.0", "", { "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" } }, "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="], - - "loud-rejection": ["loud-rejection@1.6.0", "", { "dependencies": { "currently-unhandled": "^0.4.1", "signal-exit": "^3.0.0" } }, "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ=="], - - "lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="], - - "lucide-react": ["lucide-react@0.454.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc" } }, "sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ=="], - - "map-obj": ["map-obj@1.0.1", "", {}, "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="], - - "mdast-util-from-markdown": ["mdast-util-from-markdown@2.0.2", "", { "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", "decode-named-character-reference": "^1.0.0", "devlop": "^1.0.0", "mdast-util-to-string": "^4.0.0", "micromark": "^4.0.0", "micromark-util-decode-numeric-character-reference": "^2.0.0", "micromark-util-decode-string": "^2.0.0", "micromark-util-normalize-identifier": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0", "unist-util-stringify-position": "^4.0.0" } }, "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA=="], - - "mdast-util-phrasing": ["mdast-util-phrasing@4.1.0", "", { "dependencies": { "@types/mdast": "^4.0.0", "unist-util-is": "^6.0.0" } }, "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w=="], - - "mdast-util-to-hast": ["mdast-util-to-hast@13.2.0", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/mdast": "^4.0.0", "@ungap/structured-clone": "^1.0.0", "devlop": "^1.0.0", "micromark-util-sanitize-uri": "^2.0.0", "trim-lines": "^3.0.0", "unist-util-position": "^5.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0" } }, "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA=="], - - "mdast-util-to-markdown": ["mdast-util-to-markdown@2.1.2", "", { "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", "longest-streak": "^3.0.0", "mdast-util-phrasing": "^4.0.0", "mdast-util-to-string": "^4.0.0", "micromark-util-classify-character": "^2.0.0", "micromark-util-decode-string": "^2.0.0", "unist-util-visit": "^5.0.0", "zwitch": "^2.0.0" } }, "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA=="], - - "mdast-util-to-string": ["mdast-util-to-string@4.0.0", "", { "dependencies": { "@types/mdast": "^4.0.0" } }, "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg=="], - - "mdx": ["mdx@0.3.1", "", { "dependencies": { "meow": "3.6.0", "mustache": "2.2.1", "object-assign": "4.0.1", "read-input": "0.3.1" }, "bin": { "mdx": "./bin/mdx" } }, "sha512-i+oUkB4ntcYVYnjiuktpYP77m/ISDg7z1B2pL+alDNFPgRkXlkYaW6zY03103/88A06E3Pn6x/DL9qB8pT9xWA=="], - - "meow": ["meow@3.6.0", "", { "dependencies": { "camelcase-keys": "^2.0.0", "loud-rejection": "^1.0.0", "minimist": "^1.1.3", "normalize-package-data": "^2.3.4", "object-assign": "^4.0.1", "read-pkg-up": "^1.0.1", "redent": "^1.0.0", "trim-newlines": "^1.0.0" } }, "sha512-1zRGO8C/2QD8uBxZbwwKbIQHrHKANzVnlK/3Gj7xro+ks4HLmayvETy+BnCV+wm68PE6dYcfgyTDMVG2mjlQwg=="], - - "merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="], - - "micromark": ["micromark@4.0.2", "", { "dependencies": { "@types/debug": "^4.0.0", "debug": "^4.0.0", "decode-named-character-reference": "^1.0.0", "devlop": "^1.0.0", "micromark-core-commonmark": "^2.0.0", "micromark-factory-space": "^2.0.0", "micromark-util-character": "^2.0.0", "micromark-util-chunked": "^2.0.0", "micromark-util-combine-extensions": "^2.0.0", "micromark-util-decode-numeric-character-reference": "^2.0.0", "micromark-util-encode": "^2.0.0", "micromark-util-normalize-identifier": "^2.0.0", "micromark-util-resolve-all": "^2.0.0", "micromark-util-sanitize-uri": "^2.0.0", "micromark-util-subtokenize": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA=="], - - "micromark-core-commonmark": ["micromark-core-commonmark@2.0.3", "", { "dependencies": { "decode-named-character-reference": "^1.0.0", "devlop": "^1.0.0", "micromark-factory-destination": "^2.0.0", "micromark-factory-label": "^2.0.0", "micromark-factory-space": "^2.0.0", "micromark-factory-title": "^2.0.0", "micromark-factory-whitespace": "^2.0.0", "micromark-util-character": "^2.0.0", "micromark-util-chunked": "^2.0.0", "micromark-util-classify-character": "^2.0.0", "micromark-util-html-tag-name": "^2.0.0", "micromark-util-normalize-identifier": "^2.0.0", "micromark-util-resolve-all": "^2.0.0", "micromark-util-subtokenize": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg=="], - - "micromark-factory-destination": ["micromark-factory-destination@2.0.1", "", { "dependencies": { "micromark-util-character": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA=="], - - "micromark-factory-label": ["micromark-factory-label@2.0.1", "", { "dependencies": { "devlop": "^1.0.0", "micromark-util-character": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg=="], - - "micromark-factory-space": ["micromark-factory-space@2.0.1", "", { "dependencies": { "micromark-util-character": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg=="], - - "micromark-factory-title": ["micromark-factory-title@2.0.1", "", { "dependencies": { "micromark-factory-space": "^2.0.0", "micromark-util-character": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw=="], - - "micromark-factory-whitespace": ["micromark-factory-whitespace@2.0.1", "", { "dependencies": { "micromark-factory-space": "^2.0.0", "micromark-util-character": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ=="], - - "micromark-util-character": ["micromark-util-character@2.1.1", "", { "dependencies": { "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q=="], - - "micromark-util-chunked": ["micromark-util-chunked@2.0.1", "", { "dependencies": { "micromark-util-symbol": "^2.0.0" } }, "sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA=="], - - "micromark-util-classify-character": ["micromark-util-classify-character@2.0.1", "", { "dependencies": { "micromark-util-character": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q=="], - - "micromark-util-combine-extensions": ["micromark-util-combine-extensions@2.0.1", "", { "dependencies": { "micromark-util-chunked": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg=="], - - "micromark-util-decode-numeric-character-reference": ["micromark-util-decode-numeric-character-reference@2.0.2", "", { "dependencies": { "micromark-util-symbol": "^2.0.0" } }, "sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw=="], - - "micromark-util-decode-string": ["micromark-util-decode-string@2.0.1", "", { "dependencies": { "decode-named-character-reference": "^1.0.0", "micromark-util-character": "^2.0.0", "micromark-util-decode-numeric-character-reference": "^2.0.0", "micromark-util-symbol": "^2.0.0" } }, "sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ=="], - - "micromark-util-encode": ["micromark-util-encode@2.0.1", "", {}, "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw=="], - - "micromark-util-html-tag-name": ["micromark-util-html-tag-name@2.0.1", "", {}, "sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA=="], - - "micromark-util-normalize-identifier": ["micromark-util-normalize-identifier@2.0.1", "", { "dependencies": { "micromark-util-symbol": "^2.0.0" } }, "sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q=="], - - "micromark-util-resolve-all": ["micromark-util-resolve-all@2.0.1", "", { "dependencies": { "micromark-util-types": "^2.0.0" } }, "sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg=="], - - "micromark-util-sanitize-uri": ["micromark-util-sanitize-uri@2.0.1", "", { "dependencies": { "micromark-util-character": "^2.0.0", "micromark-util-encode": "^2.0.0", "micromark-util-symbol": "^2.0.0" } }, "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ=="], - - "micromark-util-subtokenize": ["micromark-util-subtokenize@2.1.0", "", { "dependencies": { "devlop": "^1.0.0", "micromark-util-chunked": "^2.0.0", "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" } }, "sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA=="], - - "micromark-util-symbol": ["micromark-util-symbol@2.0.1", "", {}, "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q=="], - - "micromark-util-types": ["micromark-util-types@2.0.2", "", {}, "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA=="], - - "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="], - - "minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], - - "minimist": ["minimist@1.2.8", "", {}, "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="], - - "minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="], - - "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], - - "mustache": ["mustache@2.2.1", "", { "bin": { "mustache": "./bin/mustache" } }, "sha512-azYRexmi9y6h2lk2JqfBLh1htlDMjKYyEYOkxoGKa0FRdr5aY4f5q8bH4JIecM181DtUEYLSz8PcRO46mgzMNQ=="], - - "mz": ["mz@2.7.0", "", { "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", "thenify-all": "^1.0.0" } }, "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="], - - "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - - "next": ["next@15.2.4", "", { "dependencies": { "@next/env": "15.2.4", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.2.4", "@next/swc-darwin-x64": "15.2.4", "@next/swc-linux-arm64-gnu": "15.2.4", "@next/swc-linux-arm64-musl": "15.2.4", "@next/swc-linux-x64-gnu": "15.2.4", "@next/swc-linux-x64-musl": "15.2.4", "@next/swc-win32-arm64-msvc": "15.2.4", "@next/swc-win32-x64-msvc": "15.2.4", "sharp": "^0.33.5" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-VwL+LAaPSxEkd3lU2xWbgEOtrM8oedmyhBqaVNmgKB+GvZlCy9rgaEc+y2on0wv+l0oSFqLtYD6dcC1eAedUaQ=="], - - "next-themes": ["next-themes@0.4.6", "", { "peerDependencies": { "react": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc", "react-dom": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc" } }, "sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA=="], - - "node-releases": ["node-releases@2.0.19", "", {}, "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="], - - "normalize-package-data": ["normalize-package-data@2.5.0", "", { "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } }, "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="], - - "normalize-path": ["normalize-path@3.0.0", "", {}, "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="], - - "normalize-range": ["normalize-range@0.1.2", "", {}, "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="], - - "object-assign": ["object-assign@4.0.1", "", {}, "sha512-c6legOHWepAbWnp3j5SRUMpxCXBKI4rD7A5Osn9IzZ8w4O/KccXdW0lqdkQKbpk0eHGjNgKihgzY6WuEq99Tfw=="], - - "object-hash": ["object-hash@3.0.0", "", {}, "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="], - - "package-json-from-dist": ["package-json-from-dist@1.0.1", "", {}, "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="], - - "parse-json": ["parse-json@2.2.0", "", { "dependencies": { "error-ex": "^1.2.0" } }, "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="], - - "path": ["path@0.12.7", "", { "dependencies": { "process": "^0.11.1", "util": "^0.10.3" } }, "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q=="], - - "path-exists": ["path-exists@2.1.0", "", { "dependencies": { "pinkie-promise": "^2.0.0" } }, "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ=="], - - "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="], - - "path-parse": ["path-parse@1.0.7", "", {}, "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="], - - "path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="], - - "path-type": ["path-type@1.1.0", "", { "dependencies": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", "pinkie-promise": "^2.0.0" } }, "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg=="], - - "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], - - "picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], - - "pify": ["pify@2.3.0", "", {}, "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="], - - "pinkie": ["pinkie@2.0.4", "", {}, "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="], - - "pinkie-promise": ["pinkie-promise@2.0.1", "", { "dependencies": { "pinkie": "^2.0.0" } }, "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="], - - "pirates": ["pirates@4.0.7", "", {}, "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA=="], - - "postcss": ["postcss@8.5.3", "", { "dependencies": { "nanoid": "^3.3.8", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A=="], - - "postcss-import": ["postcss-import@15.1.0", "", { "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", "resolve": "^1.1.7" }, "peerDependencies": { "postcss": "^8.0.0" } }, "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew=="], - - "postcss-js": ["postcss-js@4.0.1", "", { "dependencies": { "camelcase-css": "^2.0.1" }, "peerDependencies": { "postcss": "^8.4.21" } }, "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw=="], - - "postcss-load-config": ["postcss-load-config@4.0.2", "", { "dependencies": { "lilconfig": "^3.0.0", "yaml": "^2.3.4" }, "peerDependencies": { "postcss": ">=8.0.9", "ts-node": ">=9.0.0" }, "optionalPeers": ["postcss", "ts-node"] }, "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ=="], - - "postcss-nested": ["postcss-nested@6.2.0", "", { "dependencies": { "postcss-selector-parser": "^6.1.1" }, "peerDependencies": { "postcss": "^8.2.14" } }, "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ=="], - - "postcss-selector-parser": ["postcss-selector-parser@6.1.2", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="], - - "postcss-value-parser": ["postcss-value-parser@4.2.0", "", {}, "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="], - - "process": ["process@0.11.10", "", {}, "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="], - - "prop-types": ["prop-types@15.8.1", "", { "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.13.1" } }, "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="], - - "property-information": ["property-information@7.0.0", "", {}, "sha512-7D/qOz/+Y4X/rzSB6jKxKUsQnphO046ei8qxG59mtM3RG3DHgTK81HrxrmoDVINJb8NKT5ZsRbwHvQ6B68Iyhg=="], - - "queue-microtask": ["queue-microtask@1.2.3", "", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="], - - "react": ["react@19.1.0", "", {}, "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg=="], - - "react-day-picker": ["react-day-picker@8.10.1", "", { "peerDependencies": { "date-fns": "^2.28.0 || ^3.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA=="], - - "react-dom": ["react-dom@19.1.0", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.0" } }, "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g=="], - - "react-hook-form": ["react-hook-form@7.55.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-XRnjsH3GVMQz1moZTW53MxfoWN7aDpUg/GpVNc4A3eXRVNdGXfbzJ4vM4aLQ8g6XCUh1nIbx70aaNCl7kxnjog=="], - - "react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="], - - "react-remove-scroll": ["react-remove-scroll@2.6.3", "", { "dependencies": { "react-remove-scroll-bar": "^2.3.7", "react-style-singleton": "^2.2.3", "tslib": "^2.1.0", "use-callback-ref": "^1.3.3", "use-sidecar": "^1.1.3" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ=="], - - "react-remove-scroll-bar": ["react-remove-scroll-bar@2.3.8", "", { "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q=="], - - "react-resizable-panels": ["react-resizable-panels@2.1.7", "", { "peerDependencies": { "react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-JtT6gI+nURzhMYQYsx8DKkx6bSoOGFp7A3CwMrOb8y5jFHFyqwo9m68UhmXRw57fRVJksFn1TSlm3ywEQ9vMgA=="], - - "react-smooth": ["react-smooth@4.0.4", "", { "dependencies": { "fast-equals": "^5.0.1", "prop-types": "^15.8.1", "react-transition-group": "^4.4.5" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q=="], - - "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="], - - "react-transition-group": ["react-transition-group@4.4.5", "", { "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", "loose-envify": "^1.4.0", "prop-types": "^15.6.2" }, "peerDependencies": { "react": ">=16.6.0", "react-dom": ">=16.6.0" } }, "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g=="], - - "read-cache": ["read-cache@1.0.0", "", { "dependencies": { "pify": "^2.3.0" } }, "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="], - - "read-input": ["read-input@0.3.1", "", {}, "sha512-J1ZkWCnB4altU7RTe+62PSfa21FrEtfKyO9fuqR3yP8kZku3nIwaw2Krj383JC7egAIl5Zyz2w+EOu9uXH5HZw=="], - - "read-pkg": ["read-pkg@1.1.0", "", { "dependencies": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", "path-type": "^1.0.0" } }, "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ=="], - - "read-pkg-up": ["read-pkg-up@1.0.1", "", { "dependencies": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" } }, "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A=="], - - "readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="], - - "recharts": ["recharts@2.15.0", "", { "dependencies": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", "lodash": "^4.17.21", "react-is": "^18.3.1", "react-smooth": "^4.0.0", "recharts-scale": "^0.4.4", "tiny-invariant": "^1.3.1", "victory-vendor": "^36.6.8" }, "peerDependencies": { "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw=="], - - "recharts-scale": ["recharts-scale@0.4.5", "", { "dependencies": { "decimal.js-light": "^2.4.1" } }, "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w=="], - - "redent": ["redent@1.0.0", "", { "dependencies": { "indent-string": "^2.1.0", "strip-indent": "^1.0.1" } }, "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g=="], - - "regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="], - - "remark": ["remark@15.0.1", "", { "dependencies": { "@types/mdast": "^4.0.0", "remark-parse": "^11.0.0", "remark-stringify": "^11.0.0", "unified": "^11.0.0" } }, "sha512-Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A=="], - - "remark-html": ["remark-html@16.0.1", "", { "dependencies": { "@types/mdast": "^4.0.0", "hast-util-sanitize": "^5.0.0", "hast-util-to-html": "^9.0.0", "mdast-util-to-hast": "^13.0.0", "unified": "^11.0.0" } }, "sha512-B9JqA5i0qZe0Nsf49q3OXyGvyXuZFDzAP2iOFLEumymuYJITVpiH1IgsTEwTpdptDmZlMDMWeDmSawdaJIGCXQ=="], - - "remark-parse": ["remark-parse@11.0.0", "", { "dependencies": { "@types/mdast": "^4.0.0", "mdast-util-from-markdown": "^2.0.0", "micromark-util-types": "^2.0.0", "unified": "^11.0.0" } }, "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA=="], - - "remark-stringify": ["remark-stringify@11.0.0", "", { "dependencies": { "@types/mdast": "^4.0.0", "mdast-util-to-markdown": "^2.0.0", "unified": "^11.0.0" } }, "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw=="], - - "repeating": ["repeating@2.0.1", "", { "dependencies": { "is-finite": "^1.0.0" } }, "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A=="], - - "resolve": ["resolve@1.22.10", "", { "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w=="], - - "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], - - "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], - - "scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="], - - "section-matter": ["section-matter@1.0.0", "", { "dependencies": { "extend-shallow": "^2.0.1", "kind-of": "^6.0.0" } }, "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA=="], - - "secure-json-parse": ["secure-json-parse@2.7.0", "", {}, "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="], - - "semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], - - "sharp": ["sharp@0.33.5", "", { "dependencies": { "color": "^4.2.3", "detect-libc": "^2.0.3", "semver": "^7.6.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.33.5", "@img/sharp-darwin-x64": "0.33.5", "@img/sharp-libvips-darwin-arm64": "1.0.4", "@img/sharp-libvips-darwin-x64": "1.0.4", "@img/sharp-libvips-linux-arm": "1.0.5", "@img/sharp-libvips-linux-arm64": "1.0.4", "@img/sharp-libvips-linux-s390x": "1.0.4", "@img/sharp-libvips-linux-x64": "1.0.4", "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", "@img/sharp-libvips-linuxmusl-x64": "1.0.4", "@img/sharp-linux-arm": "0.33.5", "@img/sharp-linux-arm64": "0.33.5", "@img/sharp-linux-s390x": "0.33.5", "@img/sharp-linux-x64": "0.33.5", "@img/sharp-linuxmusl-arm64": "0.33.5", "@img/sharp-linuxmusl-x64": "0.33.5", "@img/sharp-wasm32": "0.33.5", "@img/sharp-win32-ia32": "0.33.5", "@img/sharp-win32-x64": "0.33.5" } }, "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw=="], - - "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="], - - "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], - - "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], - - "simple-swizzle": ["simple-swizzle@0.2.2", "", { "dependencies": { "is-arrayish": "^0.3.1" } }, "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="], - - "slugify": ["slugify@1.6.6", "", {}, "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw=="], - - "sonner": ["sonner@1.7.4", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw=="], - - "source-map-js": ["source-map-js@1.2.1", "", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="], - - "space-separated-tokens": ["space-separated-tokens@2.0.2", "", {}, "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q=="], - - "spdx-correct": ["spdx-correct@3.2.0", "", { "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="], - - "spdx-exceptions": ["spdx-exceptions@2.5.0", "", {}, "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="], - - "spdx-expression-parse": ["spdx-expression-parse@3.0.1", "", { "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="], - - "spdx-license-ids": ["spdx-license-ids@3.0.21", "", {}, "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg=="], - - "sprintf-js": ["sprintf-js@1.0.3", "", {}, "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="], - - "streamsearch": ["streamsearch@1.1.0", "", {}, "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="], - - "string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="], - - "string-width-cjs": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - - "stringify-entities": ["stringify-entities@4.0.4", "", { "dependencies": { "character-entities-html4": "^2.0.0", "character-entities-legacy": "^3.0.0" } }, "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg=="], - - "strip-ansi": ["strip-ansi@7.1.0", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="], - - "strip-ansi-cjs": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "strip-bom": ["strip-bom@2.0.0", "", { "dependencies": { "is-utf8": "^0.2.0" } }, "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g=="], - - "strip-bom-string": ["strip-bom-string@1.0.0", "", {}, "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g=="], - - "strip-indent": ["strip-indent@1.0.1", "", { "dependencies": { "get-stdin": "^4.0.1" }, "bin": { "strip-indent": "cli.js" } }, "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA=="], - - "styled-jsx": ["styled-jsx@5.1.6", "", { "dependencies": { "client-only": "0.0.1" }, "peerDependencies": { "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" } }, "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA=="], - - "sucrase": ["sucrase@3.35.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", "glob": "^10.3.10", "lines-and-columns": "^1.1.6", "mz": "^2.7.0", "pirates": "^4.0.1", "ts-interface-checker": "^0.1.9" }, "bin": { "sucrase": "bin/sucrase", "sucrase-node": "bin/sucrase-node" } }, "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA=="], - - "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], - - "swr": ["swr@2.3.3", "", { "dependencies": { "dequal": "^2.0.3", "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-dshNvs3ExOqtZ6kJBaAsabhPdHyeY4P2cKwRCniDVifBMoG/SVI7tfLWqPXriVspf2Rg4tPzXJTnwaihIeFw2A=="], - - "tailwind-merge": ["tailwind-merge@2.6.0", "", {}, "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA=="], - - "tailwindcss": ["tailwindcss@3.4.17", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.6.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.3.2", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.21.6", "lilconfig": "^3.1.3", "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.1.1", "postcss": "^8.4.47", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.2", "postcss-nested": "^6.2.0", "postcss-selector-parser": "^6.1.2", "resolve": "^1.22.8", "sucrase": "^3.35.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og=="], - - "tailwindcss-animate": ["tailwindcss-animate@1.0.7", "", { "peerDependencies": { "tailwindcss": ">=3.0.0 || insiders" } }, "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA=="], - - "thenify": ["thenify@3.3.1", "", { "dependencies": { "any-promise": "^1.0.0" } }, "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="], - - "thenify-all": ["thenify-all@1.6.0", "", { "dependencies": { "thenify": ">= 3.1.0 < 4" } }, "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="], - - "throttleit": ["throttleit@2.1.0", "", {}, "sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw=="], - - "tiny-invariant": ["tiny-invariant@1.3.3", "", {}, "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="], - - "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="], - - "trim-lines": ["trim-lines@3.0.1", "", {}, "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg=="], - - "trim-newlines": ["trim-newlines@1.0.0", "", {}, "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw=="], - - "trough": ["trough@2.2.0", "", {}, "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw=="], - - "ts-interface-checker": ["ts-interface-checker@0.1.13", "", {}, "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="], - - "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], - - "typescript": ["typescript@5.8.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="], - - "undici-types": ["undici-types@6.20.0", "", {}, "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="], - - "unified": ["unified@11.0.5", "", { "dependencies": { "@types/unist": "^3.0.0", "bail": "^2.0.0", "devlop": "^1.0.0", "extend": "^3.0.0", "is-plain-obj": "^4.0.0", "trough": "^2.0.0", "vfile": "^6.0.0" } }, "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA=="], - - "unist-util-is": ["unist-util-is@6.0.0", "", { "dependencies": { "@types/unist": "^3.0.0" } }, "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw=="], - - "unist-util-position": ["unist-util-position@5.0.0", "", { "dependencies": { "@types/unist": "^3.0.0" } }, "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA=="], - - "unist-util-stringify-position": ["unist-util-stringify-position@4.0.0", "", { "dependencies": { "@types/unist": "^3.0.0" } }, "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ=="], - - "unist-util-visit": ["unist-util-visit@5.0.0", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-is": "^6.0.0", "unist-util-visit-parents": "^6.0.0" } }, "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg=="], - - "unist-util-visit-parents": ["unist-util-visit-parents@6.0.1", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-is": "^6.0.0" } }, "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw=="], - - "update-browserslist-db": ["update-browserslist-db@1.1.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw=="], - - "use-callback-ref": ["use-callback-ref@1.3.3", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg=="], - - "use-sidecar": ["use-sidecar@1.1.3", "", { "dependencies": { "detect-node-es": "^1.1.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ=="], - - "use-sync-external-store": ["use-sync-external-store@1.5.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A=="], - - "util": ["util@0.10.4", "", { "dependencies": { "inherits": "2.0.3" } }, "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="], - - "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="], - - "validate-npm-package-license": ["validate-npm-package-license@3.0.4", "", { "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="], - - "vaul": ["vaul@0.9.9", "", { "dependencies": { "@radix-ui/react-dialog": "^1.1.1" }, "peerDependencies": { "react": "^16.8 || ^17.0 || ^18.0", "react-dom": "^16.8 || ^17.0 || ^18.0" } }, "sha512-7afKg48srluhZwIkaU+lgGtFCUsYBSGOl8vcc8N/M3YQlZFlynHD15AE+pwrYdc826o7nrIND4lL9Y6b9WWZZQ=="], - - "vfile": ["vfile@6.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" } }, "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="], - - "vfile-message": ["vfile-message@4.0.2", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0" } }, "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="], - - "victory-vendor": ["victory-vendor@36.9.2", "", { "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-ease": "^3.0.0", "@types/d3-interpolate": "^3.0.1", "@types/d3-scale": "^4.0.2", "@types/d3-shape": "^3.1.0", "@types/d3-time": "^3.0.0", "@types/d3-timer": "^3.0.0", "d3-array": "^3.1.6", "d3-ease": "^3.0.1", "d3-interpolate": "^3.0.1", "d3-scale": "^4.0.2", "d3-shape": "^3.1.0", "d3-time": "^3.0.0", "d3-timer": "^3.0.1" } }, "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ=="], - - "which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], - - "wrap-ansi": ["wrap-ansi@8.1.0", "", { "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } }, "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="], - - "wrap-ansi-cjs": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], - - "yaml": ["yaml@2.7.1", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ=="], - - "zod": ["zod@3.24.2", "", {}, "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="], - - "zod-to-json-schema": ["zod-to-json-schema@3.24.5", "", { "peerDependencies": { "zod": "^3.24.1" } }, "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g=="], - - "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="], - - "@tailwindcss/typography/postcss-selector-parser": ["postcss-selector-parser@6.0.10", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="], - - "chokidar/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], - - "error-ex/is-arrayish": ["is-arrayish@0.2.1", "", {}, "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="], - - "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], - - "foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], - - "meow/object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], - - "mz/object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], - - "next/postcss": ["postcss@8.4.31", "", { "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="], - - "normalize-package-data/semver": ["semver@5.7.2", "", { "bin": { "semver": "bin/semver" } }, "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="], - - "prop-types/object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], - - "prop-types/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="], - - "string-width-cjs/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], - - "string-width-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "strip-ansi-cjs/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - - "wrap-ansi-cjs/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], - - "wrap-ansi-cjs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="], - - "wrap-ansi-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="], - - "string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - - "wrap-ansi-cjs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], - - "wrap-ansi-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="], - } -} diff --git a/apps/guides/components/footer.tsx b/apps/guides/components/footer.tsx index cad9e5bc62..0103181539 100644 --- a/apps/guides/components/footer.tsx +++ b/apps/guides/components/footer.tsx @@ -1,6 +1,3 @@ -'use client'; - -import { useQuery } from '@tanstack/react-query'; import { assertDefined } from 'guides-app/lib/assertDefined'; import { getAllCategories } from 'guides-app/lib/categories'; import { footerConfig, siteConfig } from 'guides-app/lib/config'; @@ -8,11 +5,7 @@ import { Backpack, Globe } from 'lucide-react'; import Link from 'next/link'; export default function Footer() { - // Fetch categories using TanStack Query - const { data: categories = [] } = useQuery({ - queryKey: ['categories'], - queryFn: getAllCategories, - }); + const categories = getAllCategories(); const company = footerConfig.mainSections[1]; assertDefined(company); diff --git a/apps/guides/components/providers/query-provider.tsx b/apps/guides/components/providers/query-provider.tsx index bd57484629..735dff1770 100644 --- a/apps/guides/components/providers/query-provider.tsx +++ b/apps/guides/components/providers/query-provider.tsx @@ -1,7 +1,6 @@ 'use client'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; -import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import { type ReactNode, useState } from 'react'; export function QueryProvider({ children }: { children: ReactNode }) { @@ -17,10 +16,5 @@ export function QueryProvider({ children }: { children: ReactNode }) { }), ); - return ( - - {children} - - - ); + return {children}; } diff --git a/apps/guides/lib/enhanceGuideContent.ts b/apps/guides/lib/enhanceGuideContent.ts index 87f114efa3..0e4dbc3876 100644 --- a/apps/guides/lib/enhanceGuideContent.ts +++ b/apps/guides/lib/enhanceGuideContent.ts @@ -38,10 +38,13 @@ export interface EnhancedContentResult { * This is the main programmatic API for content enhancement */ -export async function enhanceGuideContent( - content: string, - options: ContentEnhancementOptions = {}, -): Promise { +export async function enhanceGuideContent({ + content, + options = {}, +}: { + content: string; + options?: ContentEnhancementOptions; +}): Promise { const { temperature = 0.3, maxSearchResults = 5, @@ -186,16 +189,19 @@ export async function enhanceGuideContent( * Batch enhance multiple content pieces */ -export async function batchEnhanceContent( - contentPieces: Array<{ id: string; content: string }>, - options: ContentEnhancementOptions = {}, -): Promise> { +export async function batchEnhanceContent({ + contentPieces, + options = {}, +}: { + contentPieces: Array<{ id: string; content: string }>; + options?: ContentEnhancementOptions; +}): Promise> { const results: Array<{ id: string; result: EnhancedContentResult }> = []; for (const piece of contentPieces) { try { console.log(`🔄 Enhancing content piece: ${piece.id}`); - const result = await enhanceGuideContent(piece.content, options); + const result = await enhanceGuideContent({ content: piece.content, options }); results.push({ id: piece.id, result }); // Add delay between requests to avoid rate limiting diff --git a/apps/guides/lib/mdx-static.ts b/apps/guides/lib/mdx-static.ts index 8b9f474c76..224087d753 100644 --- a/apps/guides/lib/mdx-static.ts +++ b/apps/guides/lib/mdx-static.ts @@ -14,7 +14,7 @@ export function getMdxContent(slug: string): string { return postContent[slug] || `

Content not found for ${slug}

`; } -export function getRelatedPosts(post: Post, count = 3): Post[] { +export function getRelatedPosts({ post, count = 3 }: { post: Post; count?: number }): Post[] { // Filter out the current post const otherPosts = posts.filter((p) => p.slug !== post.slug); diff --git a/apps/guides/lib/metadata.ts b/apps/guides/lib/metadata.ts new file mode 100644 index 0000000000..056c7f7cbb --- /dev/null +++ b/apps/guides/lib/metadata.ts @@ -0,0 +1,51 @@ +import { siteConfig } from 'guides-app/lib/config'; +import type { Metadata } from 'next'; + +export const guidesMetadata: Metadata = { + title: { + default: 'PackRat Guides | Hiking & Outdoor Adventures', + template: '%s | PackRat Guides', + }, + description: 'Expert hiking and outdoor guides to help you prepare for your next adventure', + keywords: [ + 'hiking guides', + 'outdoor adventures', + 'trail guides', + 'camping', + 'backpacking', + 'gear reviews', + 'wilderness skills', + 'outdoor planning', + ], + authors: [{ name: 'PackRat Team', url: 'https://packrat.world' }], + creator: 'PackRat Team', + metadataBase: new URL(siteConfig.url), + openGraph: { + type: 'website', + locale: 'en_US', + url: siteConfig.url, + siteName: 'PackRat Guides', + title: 'PackRat Guides | Hiking & Outdoor Adventures', + description: 'Expert hiking and outdoor guides to help you prepare for your next adventure', + images: [ + { + url: new URL('/og-image.png', siteConfig.url).toString(), + width: 1200, + height: 630, + alt: 'PackRat Guides | Hiking & Outdoor Adventures', + }, + ], + }, + twitter: { + card: 'summary_large_image', + title: 'PackRat Guides | Hiking & Outdoor Adventures', + description: 'Expert hiking and outdoor guides to help you prepare for your next adventure', + creator: '@packratai', + images: [new URL('/og-image.png', siteConfig.url).toString()], + }, + icons: { + icon: [{ url: '/PackRatGuides.ico', type: 'image/x-icon' }], + shortcut: '/favicon-16x16.png', + apple: '/apple-touch-icon.png', + }, +}; diff --git a/apps/guides/lib/og-image.tsx b/apps/guides/lib/og-image.tsx new file mode 100644 index 0000000000..e705b89d18 --- /dev/null +++ b/apps/guides/lib/og-image.tsx @@ -0,0 +1,242 @@ +import type { ReactElement } from 'react'; + +export const OG_IMAGE_SIZE = { width: 1200, height: 630 } as const; +export const OG_IMAGE_CONTENT_TYPE = 'image/png' as const; + +const MARK = + 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAVBUlEQVR4nO2de5RfVXXH9zn3NxMyCSEQRXkoYkVUpA9FBG1BK/VF6VJ80pfVamutYlHran2s0LWUsrBWqwVRYamLVappsQoq9VGjFsEFQStEkSiQCElISOb9e9x79j6f/nHPnfnNZDL5zWR+v98g+a41ZHF/9567z977nLNf51yRQziERzJcvwlYCAAnJc3tdOOci30i6ZEBwAPZAe7JkoAeVlj2BAOZc85ERG6Glc8QObEu8gQRWTUksieK/HyVcw/Mdf8hHAQAV2n03jw/pQVXKNyrpkYbzJhQuLUFF22G1enZeUfLIRwAgHNOZD34poUPqtFkJgxQILZfDKZbmvCi1MYhISwGSfM9UCuwLwJEIoqFxPg4UxZEtWBmGiilEidzfX1qK2tvdwNkG6HGzL+H5drRNWzYsCETEZk0uzzpegE2m+mzZUAkAqaAmVpswu+KiAArAH+g9yZBHPC+pcaykny1gDYDzz+sJt+OZuqzLJMF0BnFzEuWBYl3bxH/6093rhARGYUjB0ROcmYnOpFHuSxb4aQYjjK4tSnyo6OcG2unoUtdXN6oNLBldmM5tZjOr/lzjIUYUcMAci2+mQe7tFC7sTB9cH/PBLP7c7OPNOGJ/eZB37A+MX8rHJNrMVnOPvvM9x3DbM5pK4KqQSj5jpavSc/AWA7/SDltOZGZ1tivNEgL5jj8dowAFmNcNP8rKCWz97GY9hUMLYAcvrEZBpm1OFMu2Eu+RvR80TkQvMgql3RvCZrLRKSW/p1Pi126BzP7flo3as45Nm6ktgXWOOfUORfTiOjYeiJZdMt+FFXaNQrPVCzGqCzBCFgIDIjB7J7dcJKIyEaoNbB/DmbbWujfj8NT5qDbJWHUNk4Lxqe/AzJ92UgFcM459uxhzZq1evdAVnuMiCGS9XKUIiJOTcctc7f46I4d8P7U6keLsTCRW53nmyrxW4UM/Gytc8PzNTgGzxmK8YWF959a5dyOqp/V730TQKUd7cQANRGJzSgfX+nlLSKmIlmtl3RFEXwbX2I08BlOLPpZtKjoLol+CyJbo/d3BZF7Vog8iMhkEImFyMgqCzcNZgPHN6N9ZSirnccsM7dnAkgM9yIi7QSkqceLiFXCeADWPdb051lWW2sx4p3z4lzPiE1CiCLRiXifBoaICCIxlv/6/a4rCOLEiUX5uoXi59mKwZcGsUtWutrVgO95+Jw5rAdgxYYNM+M1I7C2CW8u4JmjhBeXU3PElGCLt0i7ici0pTXb2lKAhhbv3LSdod5xexZIoQUB14KXFYSrgtomM7tXNdxVYDcU8Le7JzmmbvZBgMJsu4jIsPKnhVkLADNr6+RcMaHlBKOMi4yMwpPK7tPTqTTxvNTwUYrTAnbz/BTb7qZxWSvY1Q2zqyqCRwtOU/jv2fdHwIwY4/KSRUlX6cFPmF3Sd+Y3Ay8MpvVEXzVcre2vugZA07j+HjgitTFQtTcOv9M0uyy38L2A3V1YUADD4nISgKGVObtzjLF1dGiOLjXzS5u+yZPU2FNSpmEeukkRzwCQm359w7Q9vY/DsxFqDxU8szB7AIgHE7JYKkTKmCxmAWACLki86G1eghTP37R9+1CA2wAsLUidwLACoA5/2d4BkrMDZJU0ctMtU4/1ERGI0aZob1n4RFeZz7Q7Xnl8U642ab5rWfhcou8Amj8TlmL6LdM7NsEAs7SfNC1Nml1Z3t+5cLsFixFTLQBy9Po0eruT6JmvUSrmKxeWlNmCmA/Tc3pQzUebPIlSuAMkoYuI1Cn+urw3qMV+LQEx/WGkPHVh9qVfwkq6FUGtGr0LDm+pvqswri/Mrm+ovmMUjhQRGad4rkIBpnbATNYc3YqxnNWBvfD02TSMB15h5e8HinB2F2amplOjr2nhw+vT2kc3mL9+/XoPuD2wRs1unU1Pjv1kG5yi6FYAIyxqbZwKwKlOTCqva8E7A7zkgTHWDRecpVheCnbhwl0CVL7I1JqjsHky8JKK8XTL4iEN/9xsA4CZ5mqmirYAJs0ubypfS2TpYldFKx2umKvd2jL719TJOBns46phZ8kF7arhU00uhplWXu6s16nZT+pw4c2wMvEnk0UwvyMHAag557SB/t2g+FfFGNV7PyjiTERW1C1eX5gfP3JQXhJjNO+zRYcwKfMAPiC3rBQ522Js1aO/ZsjLeZmvPVZEou9ihJT03xiJmfdVnEpwIhblPnzc2NR43Zpa7ZurnAsiB5dHPqAAUuM6QThnUNwHRETFk0WR6MVlzRjvakW+vXZQPhRFzJdELxYx81mWW7xTHbfislfnMf77YT6eVfP+BBExKRMnXQRCdDHzzqvY7TG6r4jX7U0Z/PGIlztOdFlr6s7SzIxdS+KTFpVheHyw8GA1RailGhDVyV3KWwvT7WlYLsokKW0Ji4CqabNRcKaIyDicrWb3Vu9dzHSyYFgKomGf+WSbJ97OdHpRS0RyqDZCrWX59xN5adUvYx2jqu/JjZtKuhfrDMXkxJT+QlOLt4qI7IYnK9wz871dR6qmsFs3wKAr+TAA1Db0uoCLpP1N+JfEg5AoVIAxs6smzD5TXtODYpBZyfyGFVeLiIzBSS2zXjMfSs0KdYrTREQ2srH3QbTE/ExEpAGvToSFMupYan7T+P6eQt9fMs908fZIhMTgltltwOA2ODaY/Qyg3c7uNirFyo2vtvOgH9x3gNu0adNAwO5MXFJNdTZqdv8u5W1qOglqtthMSQQtp/YY0JFR+LUtsKalpY+htrAQxsGg8jwAcvhj2rzuPvC/nOd2wirDHiSFjc2CBbPWbuUi1UpDsbjI3Ihh0UpvjWE4T0QkN/1m2a6FsuWexdgiQIGGsVQRQY/qRPd5iXMOwB/jXD0Xf0t5T8y9r/mW+KsPd+GsLPMnxyjmnXjEy0JTy5SNmvdSq4tcfJRzNxRmnxn02TkWo2bO1/CI71HZUpQyResjjZpIoycvnQ+kJMIIPKEwfpq0ctew6nuT9h7copsW7abZDSIiDeUdUA6zKg7UY5QBQNN8BE6seNALXs/5kiprf6RzW+/3cqaKXNny8m81iWdIWRFwMO+MXrIsxPiLUe9fO05x1qDnwzFGw8cM14diPXDRLNZ8Nojq05neDNhfrG/Tgv+DVYWxvdTgxU3ORoiAFqqNSfiNYTgiN9sJRLODqsU9SMQpP6Qw+6zIMtphQ0oL/hTWBeOhkpGLiETG2OZs5a8XEambXZt+7ZnFMw8iENUY3QPHkRzRbvO3kxfgnLMoMgFxPD228MJZ59SL1HLRy1fWVnxmPHD+kPcXiJhKv0y+mXAiEjMvR6xRvcQ5x+23375sRkEmIlI3rgE6znTFFNitFt3c9H83w+B9sLahdi8QUxXBckJZUqL6h6nv+8SDeg6SAMbgjLQXK9DBhF3WnZTlI2q6axgeLyLSNPsHKKN5XWPjIpE2dmgwq48XnJX63/8RuiEJYQL7QKJ1RmZoP71JtTuajxXFmSIiu+GYYOw1s2iLjJ4eJKaSuXPBgGovsprtGYVniSyHRTnVwYuINI3LpglWTTEbLUPGVhZapcIphZF6yC9uwJmAa5pdBpC2B83HiyXHdNjKMKrw9hzyiEz9Xpjt3VsUz1keQpDpUMU4vDwkJ21/yM1um1DernAzQEN5VaHhfiAy9x6uriEmJgcLuVaCMALzxrLKERxM90zknJL6v6SW0aKcDVIK7j447FEi56+I8SXASQirETdWc9zdjPLlptSydbV4TSZ+yETuzKPcOOTl3RYtZr6nGy+iiDiTuFXFnzsZZM3qTK5a4eXpbb9XJeMuingn4pyIWFTLfC0LMd414P3pUoYqaN/X0BfQwXDcBasbWrxDYbyhXNcMWiZvepXdmkYAaGnxNxVte2BNE7tUsW1zP6JmYGUYPj1vdkWnfe8UB+Vu07bpQsrcKO3Xqlzp3jw/RbPBP1gndnGWZTVKDeslEBHXlHD2Shm46ScitWoD965drB46Ws4YMDlNnJxck3hyFHnigPePaXs+iggWo2+pP231CvdDHi4buoEVIiJNwiXt2thDpJSzFUzX6nvajIrZGIG144FXqOp3MZtI7RQARbBrUxtLMgq6at9SbkjLfwkrfYwXpLHSr62xeaPRmKpoSHO4MT1inZQjJTrnRkXkurrZs2uw28f4rJr3J0iM0dfkXBg9yjk3zBJsN+o2M5yIyMogT6t5/3iZSgX0BTRT2c/FbRedczjnLO0DtjSNZkAWvP9kFHlajPJfZlqI9z4Tv+YhW/3yDTAoVRnRQaDbzPAiIod5OdOnjXhdft98pLh1MuREZgpgLlRz+1rn7ilELnU+nheQD4nITovxR56w7Vlbt/qlsIS6LQBERLyLz+jyew4ML6451LnR4ZwzoHZErXZNEG4b8O619Sj/KV6aa2pZfuKJJ7aWah1YcjB96JLbAFlQuzMtZP0IvFVO1zhwXKKvI8VL/XDbYahJePFknv9WMGsp3DcMR9CP7Uf7IbTapLFP8dIWeHSB7Z3BjN4iFfGzZ3ycRyd6F820CXgNQE64UkRk48Y+BuoS4/fRpg2QbYMjBdwwjROK6f1h/Sopp4D7b4LDE90LEgBt50GITFeIjwV+P/2+6Klo0dKjzREZh6ceJvJ7mcRnR5GTReRoL/GoIsqOBoPv9dOb3Ps2XJ3I5I5FVjy0mawe8Fvr9QuPX7nq7CEXP7EHvicik8w6A6KrqCQ+CqcXZl9qV7dgqqj90mBzA77UUC4wsL4lfFPU1cy+lWg/KMODKjkVwisBWvDZ9utdR9WBuvIXafMCwWxzC33P3oLn7oBHtxMzCuckPvQn85Uq7My4PNF/0HN21UYR+BzACOHl6Xp3hcBUUoYXVN1rKe9KTsk+9wJ+FF5Y3tp7ASTzJxUC8LZ25h0kHzzgH4B1arpdYdfOCY6mq4n8qmYUBlqmtwE00HcngmacIkVbnKUOZ5Ts6P2erkjELMQITIRQHWO5JFpatTNJOBegbsXn0/XuWEVMb9Y4FaDQsGMTDLGf8zara+Pw1DB9gl6Pj8BKBcWqY+PwqETXkhkClRDqZp8GmEBf0369E3Q8XL5ThRVEniYi+Mz/8DTnquTEPgGpi9O/e0VGopfJfpg/PiVZzMlNh4vspbTcltJSiYCf9P4iNdl2WHRX7KF+XHW9Qxo7w/Ok1B4VOUlEJIi/i5n5gBm4OIUh6iLDEmV3utzbLNKUWnBfyfj/WNIRkITpHuPcZD3TN9e8P2pNPOxj1fWleo+ItFk/hd0AkOvUcNvvnMd0Er8vFXBxKvkeaWBXd+sIgaqfrRAuB5iE17VfX4oXeMA92Gw+MZg11Wg2Uo3PfEOtEk5V/dx7AZTnOFS+QG724SVlzHQ/HeB3snNVMLYE09E9dY5P1wfm41GnLxgQEWmlxabFVFZo3oarjg7D2W086akISksomUNEJgJLag3N7usEPA8gV73xoBtdX2r+gIhIU/XPzIgKY2NwMh3YvKShPgbrCtOH+iOEEtN7wPTbibYlt9dJm/oaND8KMKn6hkZRnN0oGr/Tzo8OGpq5R2pS9Y2qpUMzprqg+a26Lze+kXjRl3LEqiLLMB2F0xfSh05BUsr14IPZnWA5QNPyLy7qfbvgsS24supES4sLF9JQdd9koe8zo0E/D1YqS1rTiVz2T4m+JXWaSAt8E/3z6uT3loZfjsG69Pv8I4DkxY7A2pbqu9VsB0DAdo6HcH47UzshRkSkCW8oGWAVG7qFOT9rMuMGC2WRj+kP1x8gmUJbCDr9HbDfTHnH+qaAfSoP9lGAJvrGjnjHlNloXygJtljAJx+g8biFML/qXB2OVbW9lNHQbml/VY/ajvZT03X6RqtKVBrDcELq05z5jE762QkK1TsAto/P7YnPHoKloxT91SrxngnvP3+Uc3ekBzsuRLpYxDvntAV/kmX+KClPV9n/cEdEXCSKmMT0oTbvRSS66Z2SUWJERDIQIfOCRcvKEkcvweweMndHJv6cTOTwmS+IMYo4V9aDRe/9ypUiTxGRbTLLYar6uYtdqw+Xo8/1ITzZex+aMfvOEYPuB3QQ909CzZxzYTTLXrlW5EXHHi4TnfBursYW7LhUWqXwA6ZPl51Ph+Nit9sHuFvhvdvSiV17GzyuBecH7JICvhBMbwFIp2xVBy7RgneRUqmJ5qkA4gjhBQW2T+FxXYuLKp50yIfFOXwVYXMNzw6eLTdzhPDSir37522kYohGpQh2bY5+Q8025yE8UJiNmNmEmU2q2Xih+qBq+Gmh9rUAHwzw/C2p8q793bMxhr49TFdjtwCKYFenZ1Zsaj+fVHlLSKFzIxSkA6lys68ONxonsMBTsdqF3BNUQmuZfg9AzXI1VTWLZVjArDzlztL5ExDMJhtpS1BqxG3exeoJOLoOx9Xh+Ek4ZhiOeNUcTKZtlDJ91ujUWf4iImNwbsB2p2FQmNnW3a1yV7yIyGYYbMKHSpXRqGahWjNa2Mek7ZMmXWbh4lFp4GQoY+Sm81dBa2kof3k459T0fEejrm2EdvoVi5qIyB54aoHdUY04NdubG5/IjQ+0rFws1YJVWTQ1DXXlr1IbPdk1uWhUBG6ArDDbBKCq1gjhilz1f4LpDsW2qfHT3OwrLXj/ZJ7/Ztvz2ay2HODWt32NYqHDvx0bkxDug7W52XVzKUTQ6Q/CBWz3JKH6Kt/D4hMk5RE3qn80reFlIlxE5CE4HBiabeKxn9KWbqD93XXs4somNaxlpladW1SY/XgMnpzo6/8GvQOh0sztMBRM7622/QSzq9Lvh826f9GL/BLRWmbrAucbNlrKQSsv+foRWCsiwsY+Hdi0UExrf/HOkvEaSsPPHtrL9N6qZTOU22Jdw3BqYfwYoG52aXXLUjpjXUWlTSPwhMJUy72pIZA2wgWzHU3VN1Ud6nTh7AUqIfxigqPHW+FlIqVXtn45L7azUU0/e+FxLcK1lbFt5blLUw5YDreOBV7ab3pno30aBLwsE+VYNEZCeH7Avju9EGuhbZmwFlyZqimWR2WxzPSCH7aY0QnnJEdfV8DPmBoRmls6Y6Jh4SPpmYd3p5cjaPvAwmZY3YL3qTFMMvmAXE1HgKPT/ctiFPzKoV27R+DEFnza2j5P2yiK586+7xCWGLPn1jqcrqbfKSzsGIWjqnv6R+EjBOtTgKz6/wcfyR9O7idmmXyHNL8fYLlHFQ/hEA6hh/h/2xWz3sIOgC4AAAAASUVORK5CYII='; + +export function getGuidesOgImageElement(): ReactElement { + return ( +
+ {/* Header: mark + stacked wordmark */} +
+ +
+ + PackRat + + + GUIDES + +
+
+ + {/* Center: headline block */} +
+
+ + Expert hiking + + + & outdoor guides. + +
+ + + Gear tips, trip planning, and trail skills. + +
+ + {/* Footer: tags + domain */} +
+
+ {['Trail Guides', 'Gear Reviews', 'Survival Skills'].map((tag) => ( +
+ {tag} +
+ ))} +
+ + guides.packratai.com + +
+
+ ); +} + +export interface PostOgImageProps { + title: string; + description: string; + categories?: string[]; +} + +export function getPostOgImageElement({ + title, + description, + categories = [], +}: PostOgImageProps): ReactElement { + const titleSize = title.length > 60 ? 46 : title.length > 40 ? 56 : 64; + + return ( +
+ {/* Header: mark + inline wordmark */} +
+ +
+ + PackRat + + + GUIDES + +
+
+ + {/* Post content — vertically centered */} +
+ {categories.length > 0 && ( +
+ {categories.slice(0, 3).map((cat) => ( +
+ {cat} +
+ ))} +
+ )} + + + {title} + + + + {description.length > 120 ? `${description.slice(0, 117)}...` : description} + +
+ + {/* Footer */} +
+ + guides.packratai.com + +
+
+ ); +} diff --git a/apps/guides/package.json b/apps/guides/package.json index b0331cc335..2c48fed8f3 100644 --- a/apps/guides/package.json +++ b/apps/guides/package.json @@ -1,26 +1,31 @@ { "name": "packrat-guides-app", - "version": "2.0.25", + "version": "2.0.26", "private": true, "scripts": { - "build": "bun run build-content && next build", + "build": "bun run build-content && bun run generate-og-images && next build", "build-content": "bun run scripts/build-content.ts", "clean": "bunx rimraf .next node_modules out", "demo-enhancement": "bun run scripts/demo-enhancement.ts", "dev": "next dev", "doctor:react": "bunx react-doctor", "enhance-content": "bun run scripts/enhance-content.ts", + "generate-og-images": "bun run scripts/generate-og-images.ts", "lighthouse": "bun run build && bunx lhci autorun", + "lighthouse:ci": "lhci autorun", "lint": "next lint", "start": "next start", "sync-to-r2": "bun run scripts/sync-to-r2.ts", + "test": "vitest run --config vitest.config.ts", + "test:og": "bun run build-content && bun run generate-og-images && RUN_OG_PIPELINE_TEST=1 vitest run --config vitest.config.ts __tests__/og-images.test.ts", + "test:og-meta": "vitest run --config vitest.config.ts __tests__/og-meta.test.ts", "test-enhancement": "bun run scripts/test-enhancement.ts", "update-authors": "bun run scripts/update-authors.ts" }, "dependencies": { - "@ai-sdk/openai": "^3.0.53", + "@ai-sdk/openai": "catalog:", "@elysiajs/eden": "catalog:", - "@hookform/resolvers": "^5.2.2", + "@hookform/resolvers": "catalog:", "@packrat/api": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", @@ -53,49 +58,52 @@ "@radix-ui/react-toggle-group": "catalog:", "@radix-ui/react-tooltip": "catalog:", "@tailwindcss/typography": "^0.5.16", - "@tanstack/react-query": "^5.70.0", - "@tanstack/react-query-devtools": "^5.70.0", + "@tanstack/react-query": "catalog:", + "@tanstack/react-query-devtools": "catalog:", "ai": "catalog:", - "autoprefixer": "^10.4.21", + "autoprefixer": "catalog:", "chalk": "catalog:", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "cmdk": "1.1.1", - "date-fns": "^4.1.0", - "embla-carousel-react": "8.6.0", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "cmdk": "catalog:", + "date-fns": "catalog:", + "embla-carousel-react": "catalog:", "fs": "^0.0.1-security", - "gray-matter": "^4.0.3", - "input-otp": "1.4.1", - "lucide-react": "^1.8.0", + "gray-matter": "catalog:", + "input-otp": "catalog:", + "lucide-react": "catalog:", "mdx": "^0.3.1", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "next": "catalog:", + "next-themes": "catalog:", "path": "^0.12.7", "react": "catalog:", - "react-day-picker": "9.14.0", + "react-day-picker": "catalog:", "react-dom": "catalog:", - "react-hook-form": "^7.58.1", - "react-resizable-panels": "^4.10.0", + "react-hook-form": "catalog:", + "react-resizable-panels": "catalog:", "remark": "^15.0.1", "remark-gfm": "^4.0.1", "remark-html": "^16.0.1", "remark-parse": "^11.0.0", "slugify": "^1.6.6", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", + "sonner": "catalog:", + "tailwind-merge": "catalog:", "unified": "^11.0.0", - "vaul": "^1.1.2", + "vaul": "catalog:", "zod": "catalog:" }, "devDependencies": { - "@lhci/cli": "^0.14.0", + "@lhci/cli": "catalog:", "@types/mdx": "^2.0.13", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "cheerio": "^1.0.0", + "open-graph-scraper": "^6.10.0", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", - "typescript": "catalog:" + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/apps/guides/pages/404.tsx b/apps/guides/pages/404.tsx index 753a00d67b..b0511c34c9 100644 --- a/apps/guides/pages/404.tsx +++ b/apps/guides/pages/404.tsx @@ -3,68 +3,96 @@ // condition active in the static generation worker, which strips useContext // and causes the build to fail. See apps/landing/pages/404.tsx for context. import { Backpack } from 'lucide-react'; +import Head from 'next/head'; export default function Custom404() { return ( -
-
-
-
- + <> + + Page not found | PackRat Guides + + + +
+
+
+
+
-
-

- 404 -

-

- Guide not found -

-

- Looks like you've wandered off the trail. This guide doesn't exist. -

-
- - Back to guides - + 404 + +

+ Guide not found +

+

+ Looks like you've wandered off the trail. This guide doesn't exist or has + moved. +

+
-
-
+ + ); } diff --git a/apps/guides/pages/500.tsx b/apps/guides/pages/500.tsx index 41dfab9cf8..5b07cc5d67 100644 --- a/apps/guides/pages/500.tsx +++ b/apps/guides/pages/500.tsx @@ -1,5 +1,81 @@ // Overrides Next.js internal _error page for /500 during static export. // See pages/404.tsx for explanation. +import { AlertTriangle } from 'lucide-react'; +import Head from 'next/head'; + export default function Custom500() { - return null; + return ( + <> + + Something went wrong | PackRat Guides + + + +
+
+
+
+
+
+

+ 500 +

+

+ Something went wrong +

+

+ We hit an unexpected snag on our end. Try reloading, or head back to all guides. +

+ +
+
+ + ); } diff --git a/apps/guides/pages/_document.tsx b/apps/guides/pages/_document.tsx new file mode 100644 index 0000000000..3f64cc251e --- /dev/null +++ b/apps/guides/pages/_document.tsx @@ -0,0 +1,16 @@ +// Custom _document so the Pages Router static-exported 404/500 pages get +// `` (Lighthouse "html-has-lang" + accessibility). The App +// Router routes set this via app/layout.tsx; this only affects pages/* output. +import { Head, Html, Main, NextScript } from 'next/document'; + +export default function Document() { + return ( + + + +
+ + + + ); +} diff --git a/apps/guides/scripts/enhance-content.ts b/apps/guides/scripts/enhance-content.ts index 04f4da387d..d856e419b1 100644 --- a/apps/guides/scripts/enhance-content.ts +++ b/apps/guides/scripts/enhance-content.ts @@ -139,10 +139,13 @@ function parseContentFile(filePath: string): { * Write enhanced content back to file */ -function writeEnhancedContent( - filePath: string, - opts: { metadata: Record; enhancedContent: string }, -): void { +function writeEnhancedContent({ + filePath, + opts, +}: { + filePath: string; + opts: { metadata: Record; enhancedContent: string }; +}): void { const { metadata, enhancedContent } = opts; const newFileContent = matter.stringify(enhancedContent, metadata); fs.writeFileSync(filePath, newFileContent, 'utf8'); @@ -152,10 +155,13 @@ function writeEnhancedContent( * Enhance a single content file */ -async function enhanceFile( - filePath: string, - opts: { cliOptions: CliOptions; enhancementOptions: ContentEnhancementOptions }, -): Promise<{ +async function enhanceFile({ + filePath, + opts, +}: { + filePath: string; + opts: { cliOptions: CliOptions; enhancementOptions: ContentEnhancementOptions }; +}): Promise<{ enhanced: boolean; productsAdded: number; error?: string; @@ -182,7 +188,7 @@ async function enhanceFile( console.log(chalk.blue(`🔄 Enhancing: ${fileName}`)); // Enhance the content - const result = await enhanceGuideContent(content, enhancementOptions); + const result = await enhanceGuideContent({ content, options: enhancementOptions }); // Check if enhancement actually added value if (result.productsUsed.length === 0) { @@ -213,7 +219,7 @@ async function enhanceFile( } // Write enhanced content - writeEnhancedContent(filePath, { metadata, enhancedContent: result.content }); + writeEnhancedContent({ filePath, opts: { metadata, enhancedContent: result.content } }); console.log( chalk.green(` ✅ Enhanced ${fileName} with ${result.productsUsed.length} product links`), @@ -283,7 +289,7 @@ async function enhanceContent(cliOptions: CliOptions): Promise { for (const filePath of filesToProcess) { stats.processed++; - const result = await enhanceFile(filePath, { cliOptions, enhancementOptions }); + const result = await enhanceFile({ filePath, opts: { cliOptions, enhancementOptions } }); if (result.error) { stats.errors++; diff --git a/apps/guides/scripts/generate-content.ts b/apps/guides/scripts/generate-content.ts index adbdad28fa..f43a57b881 100644 --- a/apps/guides/scripts/generate-content.ts +++ b/apps/guides/scripts/generate-content.ts @@ -176,10 +176,13 @@ function getExistingContent(): ContentMetadata[] { } // Generate topic ideas based on categories and existing content -async function generateTopicIdeas( - count: number, - opts: { categories?: ContentCategory[]; existingContent?: ContentMetadata[] } = {}, -): Promise { +async function generateTopicIdeas({ + count, + opts = {}, +}: { + count: number; + opts?: { categories?: ContentCategory[]; existingContent?: ContentMetadata[] }; +}): Promise { const { categories, existingContent = [] } = opts; console.log(chalk.blue(`Generating ${count} topic ideas...`)); @@ -300,10 +303,13 @@ async function generateTopicIdeas( } // Generate full MDX content for a topic with awareness of existing content -async function generateMdxContent( - metadata: ContentMetadata, - existingContent: ContentMetadata[] = [], -): Promise { +async function generateMdxContent({ + metadata, + existingContent = [], +}: { + metadata: ContentMetadata; + existingContent?: ContentMetadata[]; +}): Promise { console.log(chalk.blue(`Generating content for: ${metadata.title}`)); const categoryNames = metadata.categories.map((c) => CATEGORY_DISPLAY_NAMES[c]); @@ -367,10 +373,13 @@ async function generateMdxContent( } // Generate a single post -async function generatePost( - request: ContentRequest, - existingContent: ContentMetadata[] = [], -): Promise { +async function generatePost({ + request, + existingContent = [], +}: { + request: ContentRequest; + existingContent?: ContentMetadata[]; +}): Promise { try { // Set defaults for missing fields const metadata: ContentMetadata = { @@ -388,11 +397,11 @@ async function generatePost( // Generate content if requested let content = ''; if (request.generateFullContent) { - content = await generateMdxContent(metadata, existingContent); + content = await generateMdxContent({ metadata, existingContent }); try { console.log(chalk.blue(`🔗 Enhancing ${metadata.title} with catalog items...`)); - const enhancementResult = await enhanceGuideContent(content); + const enhancementResult = await enhanceGuideContent({ content }); content = enhancementResult.content; if (enhancementResult.productsUsed.length > 0) { @@ -426,14 +435,20 @@ async function generatePost( } // Generate multiple posts -async function generatePosts(count: number, categories?: ContentCategory[]): Promise { +async function generatePosts({ + count, + categories, +}: { + count: number; + categories?: ContentCategory[]; +}): Promise { try { // Get existing content first const existingContent = getExistingContent(); console.log(chalk.blue(`Found ${existingContent.length} existing articles`)); // Generate topic ideas with awareness of existing content - const topics = await generateTopicIdeas(count, { categories, existingContent }); + const topics = await generateTopicIdeas({ count, opts: { categories, existingContent } }); console.log(chalk.green(`✓ Generated ${topics.length} topic ideas`)); // Generate content for each topic @@ -453,7 +468,7 @@ async function generatePosts(count: number, categories?: ContentCategory[]): Pro }; // Pass existing content to generatePost for context - const filePath = await generatePost(request, existingContent); + const filePath = await generatePost({ request, existingContent }); if (filePath) { filePaths.push(filePath); @@ -573,7 +588,7 @@ if (require.main === module) { ); } - generatePosts(count, categoryArgs.length > 0 ? categoryArgs : undefined) + generatePosts({ count, categories: categoryArgs.length > 0 ? categoryArgs : undefined }) .then(() => console.log(chalk.green('Generation complete!'))) .catch((err) => console.error(chalk.red('Generation failed:'), err)); } diff --git a/apps/guides/scripts/generate-og-images.ts b/apps/guides/scripts/generate-og-images.ts new file mode 100644 index 0000000000..f57d11cb86 --- /dev/null +++ b/apps/guides/scripts/generate-og-images.ts @@ -0,0 +1,131 @@ +/** + * Pre-build script: generates static Open Graph image PNGs for the guides site. + * + * Static exports (`output: 'export'`) cannot serve Next.js metadata-route images + * (opengraph-image.tsx) correctly from a CDN — the generated .body/.meta files + * are a Next.js-internal format, not plain PNG files. + * + * This script renders the same JSX used in opengraph-image.tsx via ImageResponse + * and writes real .png files to public/ so Cloudflare Workers can serve them with + * the correct Content-Type automatically. + * + * Outputs: + * public/og-image.png — root / site-level OG image + * public/og/[slug].png — per-post OG images + * + * IMPORTANT — build order matters: + * This script reads posts from `lib/content.ts`, which is auto-generated by + * `scripts/build-content.ts` from the MDX files in `content/posts/`. If you + * run this script BEFORE `build-content`, you will generate OG images for + * whatever post set was last committed to `lib/content.ts`, not the current + * set on disk. The `package.json` "build" script must therefore invoke + * `build-content` BEFORE `generate-og-images`. The guard below catches the + * order-inversion bug if it is ever reintroduced. See PR #2436 for context. + * + * Run: `bun run scripts/generate-og-images.ts` + */ + +import fs from 'node:fs'; +import path from 'node:path'; +import { isString } from '@packrat/guards'; +import { ImageResponse } from 'next/og'; +import { createElement } from 'react'; +import { getAllPosts } from '../lib/mdx-static'; +import { getGuidesOgImageElement, getPostOgImageElement, OG_IMAGE_SIZE } from '../lib/og-image'; + +// @vercel/og auto-fetches Google Fonts when it encounters glyphs outside its +// bundled Latin coverage. CF Pages' build network occasionally returns 4xx for +// fonts.googleapis.com, killing the build. Intercept and return an empty 404 +// so loadGoogleFont gives up cleanly and ImageResponse falls back to bundled. +const FONT_HOSTS = new Set(['fonts.googleapis.com', 'fonts.gstatic.com']); +const originalFetch = globalThis.fetch; +globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { + const href = isString(input) ? input : input instanceof URL ? input.href : input.url; + try { + if (FONT_HOSTS.has(new URL(href).hostname)) { + return new Response(null, { status: 404 }); + } + } catch { + // Not a parseable absolute URL — fall through to the real fetch. + } + return originalFetch(input, init); +}) as typeof fetch; + +const PUBLIC_DIR = path.join(import.meta.dir, '..', 'public'); +const OG_DIR = path.join(PUBLIC_DIR, 'og'); +const POSTS_DIR = path.join(import.meta.dir, '..', 'content', 'posts'); + +/** + * Detect the build-order-inversion bug from PR #2436: if there are many MDX + * source files on disk but `lib/content.ts` only reports a small number of + * posts, the caller almost certainly forgot to run `build-content` first. + * Failing fast here is much cheaper than shipping a build with stale OG images. + */ +function assertContentIsFresh(postCount: number): void { + let mdxFileCount = 0; + try { + mdxFileCount = fs.readdirSync(POSTS_DIR).filter((f) => f.endsWith('.mdx')).length; + } catch { + // If the posts directory is missing for some reason, skip the guard rather + // than blocking generation entirely — the build will fail downstream. + return; + } + + // Threshold chosen to be well below the current ~500 posts but well above + // the historical stale value (39). Adjust freely if the corpus shrinks. + const STALE_POST_THRESHOLD = 50; + const MIN_MDX_FILES_FOR_GUARD = 50; + + if (mdxFileCount > MIN_MDX_FILES_FOR_GUARD && postCount < STALE_POST_THRESHOLD) { + throw new Error( + `generate-og-images: only ${postCount} posts found in lib/content.ts but ` + + `${mdxFileCount} MDX files exist in content/posts/. ` + + `Did you forget to run \`bun run build-content\` first? ` + + `The \`build\` script must run build-content BEFORE generate-og-images — see PR #2436.`, + ); + } +} + +async function renderToPng(element: ReturnType): Promise { + const response = new ImageResponse( + createElement(() => element), + OG_IMAGE_SIZE, + ); + return Buffer.from(await response.arrayBuffer()); +} + +async function generateOgImages(): Promise { + // Load posts and assert freshness BEFORE doing any expensive work so that + // the build-order bug surfaces in seconds rather than minutes. + const posts = getAllPosts(); + assertContentIsFresh(posts.length); + + fs.mkdirSync(OG_DIR, { recursive: true }); + + // Root site image + const rootBuffer = await renderToPng(getGuidesOgImageElement()); + const rootPath = path.join(PUBLIC_DIR, 'og-image.png'); + fs.writeFileSync(rootPath, rootBuffer); + console.log(`✓ Generated ${path.relative(process.cwd(), rootPath)} (${rootBuffer.length} bytes)`); + + // Per-post images + for (const post of posts) { + const buffer = await renderToPng( + getPostOgImageElement({ + title: post.title, + description: post.description ?? '', + categories: post.categories ?? [], + }), + ); + const outPath = path.join(OG_DIR, `${post.slug}.png`); + fs.writeFileSync(outPath, buffer); + console.log(`✓ Generated ${path.relative(process.cwd(), outPath)} (${buffer.length} bytes)`); + } + + console.log(`\nDone — generated 1 root + ${posts.length} post OG images.`); +} + +generateOgImages().catch((err) => { + console.error('Failed to generate OG images:', err); + process.exit(1); +}); diff --git a/apps/guides/scripts/update-authors.ts b/apps/guides/scripts/update-authors.ts index 91e7021108..a7657cd8d0 100644 --- a/apps/guides/scripts/update-authors.ts +++ b/apps/guides/scripts/update-authors.ts @@ -57,7 +57,7 @@ function getAllPosts(): PostMetadata[] { } // Update author in a specific post -function updatePostAuthor(post: PostMetadata, newAuthor: string): boolean { +function updatePostAuthor({ post, newAuthor }: { post: PostMetadata; newAuthor: string }): boolean { try { const fileContent = fs.readFileSync(post.filePath, 'utf8'); const { data, content } = matter(fileContent); @@ -116,7 +116,7 @@ function listAvailableAuthors(): void { } // Update a specific post by slug -function updatePostBySlug(slug: string, newAuthor: string): void { +function updatePostBySlug({ slug, newAuthor }: { slug: string; newAuthor: string }): void { const posts = getAllPosts(); const post = posts.find((p) => p.slug === slug); @@ -129,7 +129,7 @@ function updatePostBySlug(slug: string, newAuthor: string): void { return; } - updatePostAuthor(post, newAuthor); + updatePostAuthor({ post, newAuthor }); } // Find posts by title (fuzzy search) @@ -141,7 +141,13 @@ function findPostsByTitle(searchTitle: string): PostMetadata[] { } // Update posts by title search -function updatePostsByTitle(searchTitle: string, newAuthor: string): void { +function updatePostsByTitle({ + searchTitle, + newAuthor, +}: { + searchTitle: string; + newAuthor: string; +}): void { const matchingPosts = findPostsByTitle(searchTitle); if (matchingPosts.length === 0) { @@ -160,11 +166,17 @@ function updatePostsByTitle(searchTitle: string, newAuthor: string): void { const post = matchingPosts[0]; assertDefined(post); - updatePostAuthor(post, newAuthor); + updatePostAuthor({ post, newAuthor }); } // Update all posts by current author name -function updatePostsByAuthor(currentAuthor: string, newAuthor: string): void { +function updatePostsByAuthor({ + currentAuthor, + newAuthor, +}: { + currentAuthor: string; + newAuthor: string; +}): void { const posts = getAllPosts(); const matchingPosts = posts.filter((post) => post.author === currentAuthor); @@ -182,7 +194,7 @@ function updatePostsByAuthor(currentAuthor: string, newAuthor: string): void { let updatedCount = 0; for (const post of matchingPosts) { - if (updatePostAuthor(post, newAuthor)) { + if (updatePostAuthor({ post, newAuthor })) { updatedCount++; } } @@ -265,7 +277,7 @@ function rebalanceAuthors(): void { ); if (authorWithLeast !== post.author) { - if (updatePostAuthor(post, authorWithLeast)) { + if (updatePostAuthor({ post, newAuthor: authorWithLeast })) { authorCounts[authorWithLeast] = (authorCounts[authorWithLeast] ?? 0) + 1; updatedCount++; } @@ -330,7 +342,7 @@ if (isMainModule()) { } assertDefined(args[1]); assertDefined(args[2]); - updatePostBySlug(args[1], args[2]); + updatePostBySlug({ slug: args[1], newAuthor: args[2] }); break; case 'update-title': @@ -342,7 +354,7 @@ if (isMainModule()) { } assertDefined(args[1]); assertDefined(args[2]); - updatePostsByTitle(args[1], args[2]); + updatePostsByTitle({ searchTitle: args[1], newAuthor: args[2] }); break; case 'update-by-author': @@ -356,7 +368,7 @@ if (isMainModule()) { } assertDefined(args[1]); assertDefined(args[2]); - updatePostsByAuthor(args[1], args[2]); + updatePostsByAuthor({ currentAuthor: args[1], newAuthor: args[2] }); break; case 'find': { diff --git a/apps/guides/styles/globals.css b/apps/guides/styles/globals.css index ac6844236c..8a078384e1 100644 --- a/apps/guides/styles/globals.css +++ b/apps/guides/styles/globals.css @@ -13,6 +13,10 @@ body { } @layer base { + html { + scroll-behavior: smooth; + } + :root { --background: 0 0% 100%; --foreground: 0 0% 3.9%; diff --git a/apps/guides/vitest.config.ts b/apps/guides/vitest.config.ts new file mode 100644 index 0000000000..7eb8b7863d --- /dev/null +++ b/apps/guides/vitest.config.ts @@ -0,0 +1,18 @@ +import { resolve } from 'node:path'; +import { defineConfig } from 'vitest/config'; + +export default defineConfig({ + resolve: { + alias: { + 'guides-app': resolve(__dirname, '.'), + }, + }, + test: { + name: 'guides-og', + environment: 'node', + globals: true, + include: [resolve(__dirname, '__tests__/**/*.test.ts')], + hookTimeout: 60_000, + testTimeout: 15_000, + }, +}); diff --git a/apps/landing/README.md b/apps/landing/README.md new file mode 100644 index 0000000000..841afeb9cb --- /dev/null +++ b/apps/landing/README.md @@ -0,0 +1,93 @@ +# PackRat Landing + +Next.js 15 static-export marketing site for PackRat. Deployed to Cloudflare +Pages from `apps/landing/out/`. + +## Build pipeline + +The `build` script in `package.json` runs: + +``` +bun run generate-og-images → next build +``` + +- `scripts/generate-og-images.ts` renders a real `public/og-image.png` + from the same JSX used in `app/opengraph-image.tsx`. Static exports + cannot serve Next.js metadata-route images correctly from a CDN — + the `.body`/`.meta` files Next emits are a Next.js-internal format — + so we write a plain PNG to `public/` instead. +- `next build` produces the static export in `out/`. + +## Useful scripts + +| Script | Purpose | +|---|---| +| `bun run dev` | Local Next.js dev server | +| `bun run generate-og-images` | Render `public/og-image.png` | +| `bun run build` | Full static build (`out/`) | +| `bun run test` | Vitest suite (metadata + og-image PNG checks) | +| `bun run test:og-meta` | Parse built HTML and assert OG / Twitter meta tags | +| `bun run lighthouse` | Build + run LHCI assertions locally | +| `bun run lighthouse:ci` | Run LHCI against an already-built `out/` (CI mode) | + +## Open Graph metadata validation + +All PackRat web apps share the same OG validation pattern (see +[`apps/guides/README.md`](../guides/README.md) for the full rationale and +the per-post variant). Layers: + +1. **Image generation** — `bun run generate-og-images` produces + `public/og-image.png` at 1200×630. `__tests__/og-image.test.ts` asserts + the file exists, has the PNG signature, and matches expected dimensions. +2. **Static meta in built HTML** — `bun run test:og-meta` runs + `bun run build` (if `out/` is missing) and parses every + `out/*.html` plus `out//index.html` with cheerio. It asserts the + required tags (`og:title`, `og:description`, `og:image`, + `og:image:width`, `og:image:height`, `og:type`, `og:url`, + `og:site_name`, `twitter:card`, `twitter:title`, `twitter:description`, + `twitter:image`) are present on every page and that `og:image` is an + absolute `https://` URL pointing at the site-wide image (`/og-image.png` + or the Next.js auto-generated `/opengraph-image` route). + This step runs in the `Builds` workflow on every PR. +3. **Live OG meta on a deployed URL** — opt-in via + `OG_LIVE_CHECK_URL=https://packratai.com bun run test:og-meta`. + Hits the live origin via [`open-graph-scraper`][ogs] (the same parser + most platforms use under the hood) and asserts the same shape. + Skipped by default. + +### Manual validators + +For one-off checks after a deploy: + +- [opengraph.xyz](https://www.opengraph.xyz/) — quick visual preview +- [microlink.io](https://microlink.io/) — JSON view of every OG / Twitter tag +- [Facebook Sharing Debugger](https://developers.facebook.com/tools/debug/) — also flushes FB's cache +- [LinkedIn Post Inspector](https://www.linkedin.com/post-inspector/) — also flushes LI's cache + +## Lighthouse CI + +`.lighthouserc.js` (desktop) and `.lighthouserc.mobile.js` (mobile) drive +LHCI against the static `out/` directory. Budgets: + +- Performance ≥ 0.8 +- Accessibility ≥ 0.9 +- Best Practices ≥ 0.9 +- SEO ≥ 0.9 +- LCP < 2500 ms (desktop) / 4000 ms (mobile) +- CLS < 0.1 +- TBT < 300 ms (desktop) / 600 ms (mobile) + +The `Builds` GitHub Actions workflow runs `lighthouse:ci` after the OG +meta test on every PR and surfaces the scores in the GitHub Step Summary. +The step is marked `continue-on-error: true` — perf regressions appear as +a yellow check on the PR rather than a hard block, so reviewers can decide +whether a deploy is worth tightening the threshold for. + +To run locally: + +``` +bun run --cwd apps/landing lighthouse # full: build + LHCI +bun run --cwd apps/landing lighthouse:ci # CI mode: requires out/ to exist +``` + +[ogs]: https://github.com/jshemas/openGraphScraper diff --git a/apps/landing/__tests__/layout.metadata.test.ts b/apps/landing/__tests__/layout.metadata.test.ts new file mode 100644 index 0000000000..aa881f716e --- /dev/null +++ b/apps/landing/__tests__/layout.metadata.test.ts @@ -0,0 +1,20 @@ +import { describe, expect, it } from 'vitest'; +import { siteConfig } from '../config/site'; +import { landingMetadata as metadata } from '../lib/metadata'; + +describe('landing metadata', () => { + it('includes absolute Open Graph and Twitter image URLs', () => { + const expectedImageUrl = new URL('/og-image.png', siteConfig.url).toString(); + + expect(metadata.openGraph?.images).toEqual([ + { + url: expectedImageUrl, + width: 1200, + height: 630, + alt: siteConfig.name, + }, + ]); + + expect(metadata.twitter?.images).toEqual([new URL('/og-image.png', siteConfig.url).toString()]); + }); +}); diff --git a/apps/landing/__tests__/og-image.test.ts b/apps/landing/__tests__/og-image.test.ts new file mode 100644 index 0000000000..f1476f9a81 --- /dev/null +++ b/apps/landing/__tests__/og-image.test.ts @@ -0,0 +1,85 @@ +import { execSync } from 'node:child_process'; +import fs from 'node:fs'; +import path from 'node:path'; +import { beforeAll, describe, expect, it } from 'vitest'; +import { siteConfig } from '../config/site'; +import { landingMetadata } from '../lib/metadata'; + +const APP_DIR = path.resolve(__dirname, '..'); +const OG_IMAGE_PATH = path.resolve(APP_DIR, 'public/og-image.png'); +const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); + +const EXPECTED_OG_URL = new URL('/og-image.png', siteConfig.url).toString(); + +/** Read a uint32 big-endian from a buffer at offset. */ +function readUint32BE(buf: Buffer, offset: number): number { + return buf.readUInt32BE(offset); +} + +describe('landing OG image generation', () => { + beforeAll(() => { + execSync('bun run scripts/generate-og-images.ts', { + cwd: APP_DIR, + stdio: 'inherit', + }); + }); + + it('generates public/og-image.png', () => { + expect(fs.existsSync(OG_IMAGE_PATH)).toBe(true); + }); + + it('output is a valid PNG file', () => { + const buf = fs.readFileSync(OG_IMAGE_PATH); + expect(buf.subarray(0, 8)).toEqual(PNG_SIGNATURE); + }); + + it('PNG has correct dimensions (1200 × 630)', () => { + const buf = fs.readFileSync(OG_IMAGE_PATH); + // IHDR chunk starts at byte 16; first 4 bytes = width, next 4 = height + const width = readUint32BE(buf, 16); + const height = readUint32BE(buf, 20); + expect(width).toBe(1200); + expect(height).toBe(630); + }); + + it('PNG is non-trivially sized (> 1 KB)', () => { + const { size } = fs.statSync(OG_IMAGE_PATH); + expect(size).toBeGreaterThan(1024); + }); + + it('metadata.openGraph.images[0].url references the generated file', () => { + const images = (landingMetadata.openGraph as { images?: unknown })?.images; + const first = Array.isArray(images) ? images[0] : images; + const url = typeof first === 'string' ? first : (first as { url: string })?.url; + // Derive the local path from the URL and assert the file exists. + // This catches the class of bug where metadata points at /opengraph-image.png + // (a Next.js internal route that static export does not expose as a real PNG) + // instead of /og-image.png (the file written by scripts/generate-og-images.ts). + const pathname = new URL(url).pathname; + const filePath = path.resolve(APP_DIR, 'public', pathname.slice(1)); + expect( + fs.existsSync(filePath), + `og:image URL (${url}) → ${filePath} does not exist in public/. ` + + 'Ensure metadata points to a file generated by scripts/generate-og-images.ts.', + ).toBe(true); + }); +}); + +describe('landing metadata', () => { + it('openGraph.images[0].url is the absolute og-image.png URL', () => { + const images = (landingMetadata.openGraph as { images?: unknown })?.images; + expect(images).toBeDefined(); + const first = Array.isArray(images) ? images[0] : images; + const url = typeof first === 'string' ? first : (first as { url: string })?.url; + expect(url).toBe(EXPECTED_OG_URL); + }); + + it('twitter.images[0] is the absolute og-image.png URL', () => { + const images = (landingMetadata.twitter as { images?: unknown })?.images; + expect(images).toBeDefined(); + const first = Array.isArray(images) ? images[0] : images; + const twitterUrl = + typeof first === 'string' ? first : ((first as { url?: string })?.url ?? first); + expect(twitterUrl).toBe(EXPECTED_OG_URL); + }); +}); diff --git a/apps/landing/__tests__/og-meta.test.ts b/apps/landing/__tests__/og-meta.test.ts new file mode 100644 index 0000000000..456f43c6bb --- /dev/null +++ b/apps/landing/__tests__/og-meta.test.ts @@ -0,0 +1,256 @@ +import { execSync } from 'node:child_process'; +import fs from 'node:fs'; +import path from 'node:path'; +import * as cheerio from 'cheerio'; +import { beforeAll, describe, expect, it } from 'vitest'; + +const APP_DIR = path.resolve(__dirname, '..'); +const OUT_DIR = path.join(APP_DIR, 'out'); +const ROOT_INDEX = path.join(OUT_DIR, 'index.html'); + +/** + * Required OG / Twitter meta tag names for every landing page. Same set the + * guides test enforces; consistent shape across web apps is the whole point + * of this validation layer. + */ +const REQUIRED_OG_META = [ + 'og:title', + 'og:description', + 'og:image', + 'og:image:width', + 'og:image:height', + 'og:type', + 'og:url', + 'og:site_name', + 'twitter:card', + 'twitter:title', + 'twitter:description', + 'twitter:image', +] as const; + +type MetaMap = Map; + +function parseMeta(html: string): MetaMap { + const $ = cheerio.load(html); + const meta: MetaMap = new Map(); + $('meta').each((_, el) => { + const property = $(el).attr('property') ?? $(el).attr('name'); + const content = $(el).attr('content'); + if (property && content && !meta.has(property)) { + meta.set(property, content); + } + }); + return meta; +} + +/** + * Walk the static export for top-level pages. Next.js with `output: 'export'` + * and no `trailingSlash` config emits each route as either + * `out//index.html` (nested routes) or `out/.html`. We want both. + * Skip 404/error pages — they're conventional Next.js artifacts whose OG + * payload reasonably differs. + */ +function listLandingHtmlFiles(): string[] { + if (!fs.existsSync(OUT_DIR)) return []; + const results: string[] = []; + const seen = new Set(); + const skipNames = new Set(['404.html', '500.html', 'not-found.html']); + + // Top-level *.html + for (const entry of fs.readdirSync(OUT_DIR, { withFileTypes: true })) { + if (!entry.isFile()) continue; + if (!entry.name.endsWith('.html')) continue; + if (skipNames.has(entry.name)) continue; + const full = path.join(OUT_DIR, entry.name); + if (!seen.has(full)) { + seen.add(full); + results.push(full); + } + } + + // Nested /index.html (one level deep — landing has flat routes). + for (const entry of fs.readdirSync(OUT_DIR, { withFileTypes: true })) { + if (!entry.isDirectory()) continue; + if (entry.name.startsWith('_')) continue; + const nested = path.join(OUT_DIR, entry.name, 'index.html'); + if (fs.existsSync(nested) && !seen.has(nested)) { + seen.add(nested); + results.push(nested); + } + } + + return results; +} + +function isAbsoluteHttps(url: string | undefined): boolean { + return typeof url === 'string' && url.startsWith('https://'); +} + +/** + * Landing's site-wide image must be the static `/og-image.png` written by + * `scripts/generate-og-images.ts`. With `output: 'export'`, the Next.js + * `/opengraph-image` metadata route does NOT produce a plain PNG file that a + * CDN can serve — only `og-image.png` (pre-generated at build time) is valid. + */ +function isLandingOgImageUrl(url: string | undefined): boolean { + if (!url) return false; + return /\/og-image\.png(\?|$)/.test(url); +} + +describe('landing built HTML OG meta', () => { + beforeAll(() => { + if (!fs.existsSync(ROOT_INDEX)) { + execSync('bun run build', { + cwd: APP_DIR, + stdio: 'inherit', + }); + } + }, 240_000); + + const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); + + it('root out/index.html exists', () => { + expect(fs.existsSync(ROOT_INDEX), 'expected out/index.html to exist after build').toBe(true); + }); + + it('out/og-image.png is present in the static export', () => { + const ogPath = path.join(OUT_DIR, 'og-image.png'); + expect( + fs.existsSync(ogPath), + 'og-image.png must be copied from public/ into the out/ static export by next build. ' + + 'If missing, run scripts/generate-og-images.ts before building.', + ).toBe(true); + }); + + it('out/og-image.png is a valid 1200×630 PNG', () => { + const buf = fs.readFileSync(path.join(OUT_DIR, 'og-image.png')); + expect(buf.subarray(0, 8), 'PNG signature').toEqual(PNG_SIGNATURE); + expect(buf.readUInt32BE(16), 'width').toBe(1200); + expect(buf.readUInt32BE(20), 'height').toBe(630); + expect(buf.length, 'file size').toBeGreaterThan(1024); + }); + + it('discovers at least one landing HTML page beyond root', () => { + const files = listLandingHtmlFiles(); + // Expect index.html plus at least one of about / pricing / blog / + // privacy-policy / account-deletion. If this trips, either the build + // failed to emit nested routes or someone removed every secondary + // page — both are signal worth surfacing. + expect(files.length, `expected >=2 HTML files in out/, got ${files.length}`).toBeGreaterThan(1); + }); + + it('root out/index.html has full OG meta with absolute site-wide og:image', () => { + const html = fs.readFileSync(ROOT_INDEX, 'utf8'); + const meta = parseMeta(html); + + for (const tag of REQUIRED_OG_META) { + expect(meta.get(tag), `root: missing `).toBeTruthy(); + } + + const ogImage = meta.get('og:image'); + expect( + isAbsoluteHttps(ogImage), + `root og:image must be absolute https URL, got: ${ogImage}`, + ).toBe(true); + expect( + isLandingOgImageUrl(ogImage), + `root og:image must reference og-image or opengraph-image, got: ${ogImage}`, + ).toBe(true); + + const twitterImage = meta.get('twitter:image'); + expect( + isAbsoluteHttps(twitterImage), + `root twitter:image must be absolute, got: ${twitterImage}`, + ).toBe(true); + + expect(meta.get('twitter:card')).toBe('summary_large_image'); + expect(meta.get('og:type')).toBe('website'); + expect(meta.get('og:site_name')).toBe('PackRat'); + }); + + it('every landing HTML page has full OG meta + absolute og:image', () => { + const files = listLandingHtmlFiles(); + const failures: string[] = []; + + for (const file of files) { + const rel = path.relative(OUT_DIR, file); + const meta = parseMeta(fs.readFileSync(file, 'utf8')); + + for (const tag of REQUIRED_OG_META) { + if (!meta.get(tag)) { + failures.push(`${rel}: missing `); + } + } + + const ogImage = meta.get('og:image'); + if (!isAbsoluteHttps(ogImage)) { + failures.push(`${rel}: og:image not absolute (${ogImage})`); + } else if (!isLandingOgImageUrl(ogImage)) { + failures.push(`${rel}: og:image not a site-wide image route (${ogImage})`); + } + + const twitterImage = meta.get('twitter:image'); + if (!isAbsoluteHttps(twitterImage)) { + failures.push(`${rel}: twitter:image not absolute (${twitterImage})`); + } + + const card = meta.get('twitter:card'); + if (card !== 'summary_large_image') { + failures.push(`${rel}: twitter:card="${card}" (expected summary_large_image)`); + } + + const siteName = meta.get('og:site_name'); + if (siteName !== 'PackRat') { + failures.push(`${rel}: og:site_name="${siteName}" (expected PackRat)`); + } + } + + expect(failures, `OG meta issues:\n${failures.join('\n')}`).toEqual([]); + }); +}); + +/** + * Optional live OG check. Set OG_LIVE_CHECK_URL to the deployed origin + * (e.g. `https://packratai.com`) to fetch the homepage + a secondary page + * over the wire and run them through `open-graph-scraper` — the same + * parser most platforms (LinkedIn, FB, microlink) use. + * + * Skipped by default because it requires network + a live deploy. + */ +describe.skipIf(!process.env.OG_LIVE_CHECK_URL)('live OG check', () => { + const liveUrl = (process.env.OG_LIVE_CHECK_URL ?? '').replace(/\/$/, ''); + + it('root URL has valid OG metadata via open-graph-scraper', async () => { + const mod = await import('open-graph-scraper'); + const ogs = + typeof (mod as { default?: unknown }).default === 'function' + ? (mod as { default: typeof mod.default }).default + : (mod as unknown as typeof mod.default); + const { result, error } = await ogs({ url: liveUrl, timeout: 15_000 }); + expect(error, `og fetch failed for ${liveUrl}`).toBeFalsy(); + expect(result.ogTitle, 'ogTitle').toBeTruthy(); + expect(result.ogDescription, 'ogDescription').toBeTruthy(); + expect(result.twitterCard).toBe('summary_large_image'); + const firstImage = result.ogImage?.[0]?.url; + expect(isAbsoluteHttps(firstImage), `root ogImage[0].url absolute (got ${firstImage})`).toBe( + true, + ); + }, 30_000); + + it('/pricing has valid OG metadata via open-graph-scraper', async () => { + const target = `${liveUrl}/pricing`; + const mod = await import('open-graph-scraper'); + const ogs = + typeof (mod as { default?: unknown }).default === 'function' + ? (mod as { default: typeof mod.default }).default + : (mod as unknown as typeof mod.default); + const { result, error } = await ogs({ url: target, timeout: 15_000 }); + expect(error, `og fetch failed for ${target}`).toBeFalsy(); + expect(result.ogTitle, 'ogTitle').toBeTruthy(); + expect(result.twitterCard).toBe('summary_large_image'); + const firstImage = result.ogImage?.[0]?.url; + expect(isAbsoluteHttps(firstImage), `pricing ogImage[0].url absolute (got ${firstImage})`).toBe( + true, + ); + }, 30_000); +}); diff --git a/apps/landing/app/global-error.tsx b/apps/landing/app/global-error.tsx new file mode 100644 index 0000000000..7c0e7c8d53 --- /dev/null +++ b/apps/landing/app/global-error.tsx @@ -0,0 +1,114 @@ +'use client'; + +/** + * Next.js global-error replaces the root layout when an error escapes it, + * so this component renders its own and . Styles are inlined + * so a failed stylesheet can't cascade into a blank page. + */ +export default function GlobalError({ + error: _error, + reset, +}: { + error: Error & { digest?: string }; + reset: () => void; +}) { + return ( + + + Something went wrong + + + + + +
+

+ 500 +

+

+ Something went wrong +

+

+ An unexpected error occurred while loading this page. You can try again, or head back to + the PackRat home page. +

+
+ + + Back to home + +
+
+ + + ); +} diff --git a/apps/landing/app/layout.tsx b/apps/landing/app/layout.tsx index beb509206a..2324e29eb7 100644 --- a/apps/landing/app/layout.tsx +++ b/apps/landing/app/layout.tsx @@ -2,8 +2,7 @@ import { cn } from '@packrat/web-ui/lib/utils'; import MainNav from 'landing-app/components/main-nav'; import SiteFooter from 'landing-app/components/site-footer'; import { ThemeProvider } from 'landing-app/components/theme-provider'; -import { siteConfig } from 'landing-app/config/site'; -import type { Metadata } from 'next'; +import { landingMetadata } from 'landing-app/lib/metadata'; import { Mona_Sans as FontSans } from 'next/font/google'; import type React from 'react'; import './globals.css'; @@ -14,37 +13,7 @@ const fontSans = FontSans({ weight: ['400', '500', '600', '700'], }); -export const metadata: Metadata = { - title: { - default: siteConfig.name, - template: `%s | ${siteConfig.name}`, - }, - description: siteConfig.description, - keywords: siteConfig.keywords, - authors: [{ name: siteConfig.author, url: siteConfig.url }], - creator: siteConfig.author, - metadataBase: new URL(siteConfig.url), - openGraph: { - type: 'website', - locale: 'en_US', - url: siteConfig.url, - title: siteConfig.name, - description: siteConfig.description, - siteName: siteConfig.name, - }, - twitter: { - card: 'summary_large_image', - title: siteConfig.name, - description: siteConfig.description, - creator: siteConfig.twitterHandle, - }, - icons: { - icon: '/PackRat.ico', - shortcut: '/favicon-16x16.png', - apple: '/apple-touch-icon.png', - }, - manifest: `${siteConfig.url}/site.webmanifest`, -}; +export const metadata = landingMetadata; export default function RootLayout({ children, diff --git a/apps/landing/app/not-found.tsx b/apps/landing/app/not-found.tsx index acd51677b9..de0c5bf5f4 100644 --- a/apps/landing/app/not-found.tsx +++ b/apps/landing/app/not-found.tsx @@ -1,16 +1,39 @@ import { Button } from '@packrat/web-ui/components/button'; +import { Compass, Home } from 'lucide-react'; +import type { Metadata } from 'next'; import Link from 'next/link'; +export const metadata: Metadata = { + title: 'Page not found', + description: + "We couldn't find that page on PackRat. Head back home or explore what PackRat can do for your next outdoor adventure.", + robots: { index: false, follow: false }, +}; + export default function NotFound() { return ( -
-
-

404

-

Page not found

- +
+
+

404

+

Page not found

+

+ The page you're looking for doesn't exist or has been moved. Let's get you back on trail. +

+
+ + +
-
+
); } diff --git a/apps/landing/app/opengraph-image.tsx b/apps/landing/app/opengraph-image.tsx deleted file mode 100644 index f4ed493119..0000000000 --- a/apps/landing/app/opengraph-image.tsx +++ /dev/null @@ -1,90 +0,0 @@ -import { ImageResponse } from 'next/og'; - -export const dynamic = 'force-static'; -export const size = { width: 1200, height: 630 }; -export const contentType = 'image/png'; - -export default function Image() { - return new ImageResponse( -
-
-
- 🎒 -
-
- PackRat -
-
-
- Stop overpacking. Start adventuring. -
-
- {['10K+ Users', '4.8★ Rating', '100% Free'].map((stat) => ( -
- {stat} -
- ))} -
-
, - { ...size }, - ); -} diff --git a/apps/landing/app/twitter-image.tsx b/apps/landing/app/twitter-image.tsx deleted file mode 100644 index c105da691f..0000000000 --- a/apps/landing/app/twitter-image.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { ImageResponse } from 'next/og'; - -export const dynamic = 'force-static'; -export const size = { width: 1200, height: 630 }; -export const contentType = 'image/png'; - -export default function Image() { - return new ImageResponse( -
-
-
- 🎒 -
-
- PackRat -
-
-
- Your AI-powered outdoor adventure companion. Free forever. -
-
, - { ...size }, - ); -} diff --git a/apps/landing/components/app-preview.tsx b/apps/landing/components/app-preview.tsx index eb48935d54..a3c1b7eaa5 100644 --- a/apps/landing/components/app-preview.tsx +++ b/apps/landing/components/app-preview.tsx @@ -1,7 +1,5 @@ 'use client'; -import { AnimatePresence, motion } from 'framer-motion'; -import { assertDefined } from 'landing-app/lib/typeAssertions'; import Image from 'next/image'; import { useEffect, useState } from 'react'; @@ -29,28 +27,24 @@ export default function AppPreview() { return () => clearInterval(interval); }, [screens.length]); - assertDefined(screens[currentScreen]); - return ( <> - - ( +
{screens[currentScreen].alt} - - +
+ ))}
{screens.map((_, index) => ( -

- By creating an account you agree to our{' '} - - Terms - {' '} - and{' '} - - Privacy Policy - - . -

- - - - -
-
- - setLoginEmail(e.target.value)} - required - autoComplete="email" - /> -
-
-
- - + + +
+ + setRegFirstName(e.target.value)} + autoComplete="given-name" + />
- setLoginPassword(e.target.value)} - required - autoComplete="current-password" - /> -
- - - - - - {forgotSent ? ( -
-

Check your inbox

-

- We sent a password reset link to{' '} - {forgotEmail}. -

- -
- ) : ( -
-

- Enter your email and we'll send you a link to reset your password. +

+ By creating an account you agree to our{' '} + + Terms + {' '} + and{' '} + + Privacy Policy + + .

+
+ + + +
- + setForgotEmail(e.target.value)} + value={loginEmail} + onChange={(e) => setLoginEmail(e.target.value)} required autoComplete="email" />
+
+
+ + +
+ setLoginPassword(e.target.value)} + required + autoComplete="current-password" + /> +
-
- )} - - + + + + {forgotSent ? ( +
+

Check your inbox

+

+ We sent a password reset link to{' '} + {forgotEmail}. +

+ +
+ ) : ( +
+

+ Enter your email and we'll send you a link to reset your password. +

+
+ + setForgotEmail(e.target.value)} + required + autoComplete="email" + /> +
+ + +
+ )} + + + )} ); diff --git a/apps/trails/components/TrailsPage.tsx b/apps/trails/components/TrailsPage.tsx index 1c6785fe71..61f4f99167 100644 --- a/apps/trails/components/TrailsPage.tsx +++ b/apps/trails/components/TrailsPage.tsx @@ -59,7 +59,7 @@ export function TrailsPage() { } try { - const trails = await loadNearbyTrails(center[0], center[1]); + const trails = await loadNearbyTrails({ lat: center[0], lon: center[1] }); if (!cancelled) setPublicTrails(trails); } catch { // Overpass failure is non-fatal; map still shows with no trails diff --git a/apps/trails/lib/apiClient.ts b/apps/trails/lib/apiClient.ts index f21dfafcfc..fc30730757 100644 --- a/apps/trails/lib/apiClient.ts +++ b/apps/trails/lib/apiClient.ts @@ -1,7 +1,7 @@ 'use client'; import { createApiClient } from '@packrat/api-client'; -import { authClient } from 'trails-app/lib/auth-client'; +import { trailsAuthClient as authClient } from 'trails-app/lib/auth-client'; import { trailsEnv } from 'trails-app/lib/env'; export class AuthExpiredError extends Error { diff --git a/apps/trails/lib/auth-client.ts b/apps/trails/lib/auth-client.ts index b0ca02943c..a12b75ffae 100644 --- a/apps/trails/lib/auth-client.ts +++ b/apps/trails/lib/auth-client.ts @@ -1,10 +1,8 @@ 'use client'; -import { nextCookies } from 'better-auth/next-js'; import { createAuthClient } from 'better-auth/react'; import { trailsEnv } from 'trails-app/lib/env'; -export const authClient = createAuthClient({ +export const trailsAuthClient = createAuthClient({ baseURL: trailsEnv.NEXT_PUBLIC_API_URL, - plugins: [nextCookies()], }); diff --git a/apps/trails/lib/auth.ts b/apps/trails/lib/auth.ts index 11198e198a..3d95a64e1b 100644 --- a/apps/trails/lib/auth.ts +++ b/apps/trails/lib/auth.ts @@ -28,9 +28,15 @@ export function getRefreshToken(): string | null { return parseToken(safeLocalStorage.getItem(REFRESH_KEY)); } -export function setTokens(accessToken: string, refreshToken: string): void { - safeLocalStorage.setItem(ACCESS_KEY, accessToken); - safeLocalStorage.setItem(REFRESH_KEY, refreshToken); +export function setTokens({ + accessToken, + refreshToken, +}: { + accessToken: string; + refreshToken: string; +}): void { + safeLocalStorage.setItem({ key: ACCESS_KEY, value: accessToken }); + safeLocalStorage.setItem({ key: REFRESH_KEY, value: refreshToken }); } export function clearTokens(): void { @@ -39,7 +45,7 @@ export function clearTokens(): void { } export const UserInfoSchema = z.object({ - id: z.number(), + id: z.string(), email: z.string(), firstName: z.string().nullish(), lastName: z.string().nullish(), @@ -48,7 +54,7 @@ export const UserInfoSchema = z.object({ export type UserInfo = z.infer; export function setUser(user: UserInfo): void { - safeLocalStorage.setItem('user', JSON.stringify(user)); + safeLocalStorage.setItem({ key: 'user', value: JSON.stringify(user) }); } export function getUser(): UserInfo | null { diff --git a/apps/trails/lib/metadata.ts b/apps/trails/lib/metadata.ts new file mode 100644 index 0000000000..cc1c31244d --- /dev/null +++ b/apps/trails/lib/metadata.ts @@ -0,0 +1,34 @@ +import type { Metadata } from 'next'; +import { OG_IMAGE_SIZE } from 'trails-app/lib/og-image'; + +export const SITE_URL = 'https://trails.packratai.com'; +export const OG_IMAGE_URL = `${SITE_URL}/og-image.png`; + +export const trailsMetadata: Metadata = { + title: 'Trail Search — PackRat', + description: 'Discover hiking, cycling, and outdoor trails near you. Powered by PackRat.', + keywords: ['trail search', 'hiking trails', 'outdoor trails', 'trail finder', 'PackRat'], + metadataBase: new URL(SITE_URL), + openGraph: { + type: 'website', + url: SITE_URL, + title: 'Trail Search — PackRat', + description: 'Discover hiking, cycling, and outdoor trails near you.', + siteName: 'PackRat', + images: [ + { + url: OG_IMAGE_URL, + width: OG_IMAGE_SIZE.width, + height: OG_IMAGE_SIZE.height, + alt: 'Trail Search — PackRat', + }, + ], + }, + twitter: { + card: 'summary_large_image', + title: 'Trail Search — PackRat', + description: 'Discover hiking, cycling, and outdoor trails near you.', + creator: '@packratai', + images: [OG_IMAGE_URL], + }, +}; diff --git a/apps/trails/lib/og-image.tsx b/apps/trails/lib/og-image.tsx new file mode 100644 index 0000000000..7645d9b914 --- /dev/null +++ b/apps/trails/lib/og-image.tsx @@ -0,0 +1,118 @@ +import type { ReactElement } from 'react'; + +export const OG_IMAGE_SIZE = { width: 1200, height: 630 } as const; +export const OG_IMAGE_CONTENT_TYPE = 'image/png' as const; + +const MARK = + 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAVBUlEQVR4nO2de5RfVXXH9zn3NxMyCSEQRXkoYkVUpA9FBG1BK/VF6VJ80pfVamutYlHran2s0LWUsrBWqwVRYamLVappsQoq9VGjFsEFQStEkSiQCElISOb9e9x79j6f/nHPnfnNZDL5zWR+v98g+a41ZHF/9567z977nLNf51yRQziERzJcvwlYCAAnJc3tdOOci30i6ZEBwAPZAe7JkoAeVlj2BAOZc85ERG6Glc8QObEu8gQRWTUksieK/HyVcw/Mdf8hHAQAV2n03jw/pQVXKNyrpkYbzJhQuLUFF22G1enZeUfLIRwAgHNOZD34poUPqtFkJgxQILZfDKZbmvCi1MYhISwGSfM9UCuwLwJEIoqFxPg4UxZEtWBmGiilEidzfX1qK2tvdwNkG6HGzL+H5drRNWzYsCETEZk0uzzpegE2m+mzZUAkAqaAmVpswu+KiAArAH+g9yZBHPC+pcaykny1gDYDzz+sJt+OZuqzLJMF0BnFzEuWBYl3bxH/6093rhARGYUjB0ROcmYnOpFHuSxb4aQYjjK4tSnyo6OcG2unoUtdXN6oNLBldmM5tZjOr/lzjIUYUcMAci2+mQe7tFC7sTB9cH/PBLP7c7OPNOGJ/eZB37A+MX8rHJNrMVnOPvvM9x3DbM5pK4KqQSj5jpavSc/AWA7/SDltOZGZ1tivNEgL5jj8dowAFmNcNP8rKCWz97GY9hUMLYAcvrEZBpm1OFMu2Eu+RvR80TkQvMgql3RvCZrLRKSW/p1Pi126BzP7flo3as45Nm6ktgXWOOfUORfTiOjYeiJZdMt+FFXaNQrPVCzGqCzBCFgIDIjB7J7dcJKIyEaoNbB/DmbbWujfj8NT5qDbJWHUNk4Lxqe/AzJ92UgFcM459uxhzZq1evdAVnuMiCGS9XKUIiJOTcctc7f46I4d8P7U6keLsTCRW53nmyrxW4UM/Gytc8PzNTgGzxmK8YWF959a5dyOqp/V730TQKUd7cQANRGJzSgfX+nlLSKmIlmtl3RFEXwbX2I08BlOLPpZtKjoLol+CyJbo/d3BZF7Vog8iMhkEImFyMgqCzcNZgPHN6N9ZSirnccsM7dnAkgM9yIi7QSkqceLiFXCeADWPdb051lWW2sx4p3z4lzPiE1CiCLRiXifBoaICCIxlv/6/a4rCOLEiUX5uoXi59mKwZcGsUtWutrVgO95+Jw5rAdgxYYNM+M1I7C2CW8u4JmjhBeXU3PElGCLt0i7ici0pTXb2lKAhhbv3LSdod5xexZIoQUB14KXFYSrgtomM7tXNdxVYDcU8Le7JzmmbvZBgMJsu4jIsPKnhVkLADNr6+RcMaHlBKOMi4yMwpPK7tPTqTTxvNTwUYrTAnbz/BTb7qZxWSvY1Q2zqyqCRwtOU/jv2fdHwIwY4/KSRUlX6cFPmF3Sd+Y3Ay8MpvVEXzVcre2vugZA07j+HjgitTFQtTcOv9M0uyy38L2A3V1YUADD4nISgKGVObtzjLF1dGiOLjXzS5u+yZPU2FNSpmEeukkRzwCQm359w7Q9vY/DsxFqDxU8szB7AIgHE7JYKkTKmCxmAWACLki86G1eghTP37R9+1CA2wAsLUidwLACoA5/2d4BkrMDZJU0ctMtU4/1ERGI0aZob1n4RFeZz7Q7Xnl8U642ab5rWfhcou8Amj8TlmL6LdM7NsEAs7SfNC1Nml1Z3t+5cLsFixFTLQBy9Po0eruT6JmvUSrmKxeWlNmCmA/Tc3pQzUebPIlSuAMkoYuI1Cn+urw3qMV+LQEx/WGkPHVh9qVfwkq6FUGtGr0LDm+pvqswri/Mrm+ovmMUjhQRGad4rkIBpnbATNYc3YqxnNWBvfD02TSMB15h5e8HinB2F2amplOjr2nhw+vT2kc3mL9+/XoPuD2wRs1unU1Pjv1kG5yi6FYAIyxqbZwKwKlOTCqva8E7A7zkgTHWDRecpVheCnbhwl0CVL7I1JqjsHky8JKK8XTL4iEN/9xsA4CZ5mqmirYAJs0ubypfS2TpYldFKx2umKvd2jL719TJOBns46phZ8kF7arhU00uhplWXu6s16nZT+pw4c2wMvEnk0UwvyMHAag557SB/t2g+FfFGNV7PyjiTERW1C1eX5gfP3JQXhJjNO+zRYcwKfMAPiC3rBQ522Js1aO/ZsjLeZmvPVZEou9ihJT03xiJmfdVnEpwIhblPnzc2NR43Zpa7ZurnAsiB5dHPqAAUuM6QThnUNwHRETFk0WR6MVlzRjvakW+vXZQPhRFzJdELxYx81mWW7xTHbfislfnMf77YT6eVfP+BBExKRMnXQRCdDHzzqvY7TG6r4jX7U0Z/PGIlztOdFlr6s7SzIxdS+KTFpVheHyw8GA1RailGhDVyV3KWwvT7WlYLsokKW0Ji4CqabNRcKaIyDicrWb3Vu9dzHSyYFgKomGf+WSbJ97OdHpRS0RyqDZCrWX59xN5adUvYx2jqu/JjZtKuhfrDMXkxJT+QlOLt4qI7IYnK9wz871dR6qmsFs3wKAr+TAA1Db0uoCLpP1N+JfEg5AoVIAxs6smzD5TXtODYpBZyfyGFVeLiIzBSS2zXjMfSs0KdYrTREQ2srH3QbTE/ExEpAGvToSFMupYan7T+P6eQt9fMs908fZIhMTgltltwOA2ODaY/Qyg3c7uNirFyo2vtvOgH9x3gNu0adNAwO5MXFJNdTZqdv8u5W1qOglqtthMSQQtp/YY0JFR+LUtsKalpY+htrAQxsGg8jwAcvhj2rzuPvC/nOd2wirDHiSFjc2CBbPWbuUi1UpDsbjI3Ihh0UpvjWE4T0QkN/1m2a6FsuWexdgiQIGGsVQRQY/qRPd5iXMOwB/jXD0Xf0t5T8y9r/mW+KsPd+GsLPMnxyjmnXjEy0JTy5SNmvdSq4tcfJRzNxRmnxn02TkWo2bO1/CI71HZUpQyResjjZpIoycvnQ+kJMIIPKEwfpq0ctew6nuT9h7copsW7abZDSIiDeUdUA6zKg7UY5QBQNN8BE6seNALXs/5kiprf6RzW+/3cqaKXNny8m81iWdIWRFwMO+MXrIsxPiLUe9fO05x1qDnwzFGw8cM14diPXDRLNZ8Nojq05neDNhfrG/Tgv+DVYWxvdTgxU3ORoiAFqqNSfiNYTgiN9sJRLODqsU9SMQpP6Qw+6zIMtphQ0oL/hTWBeOhkpGLiETG2OZs5a8XEambXZt+7ZnFMw8iENUY3QPHkRzRbvO3kxfgnLMoMgFxPD228MJZ59SL1HLRy1fWVnxmPHD+kPcXiJhKv0y+mXAiEjMvR6xRvcQ5x+23375sRkEmIlI3rgE6znTFFNitFt3c9H83w+B9sLahdi8QUxXBckJZUqL6h6nv+8SDeg6SAMbgjLQXK9DBhF3WnZTlI2q6axgeLyLSNPsHKKN5XWPjIpE2dmgwq48XnJX63/8RuiEJYQL7QKJ1RmZoP71JtTuajxXFmSIiu+GYYOw1s2iLjJ4eJKaSuXPBgGovsprtGYVniSyHRTnVwYuINI3LpglWTTEbLUPGVhZapcIphZF6yC9uwJmAa5pdBpC2B83HiyXHdNjKMKrw9hzyiEz9Xpjt3VsUz1keQpDpUMU4vDwkJ21/yM1um1DernAzQEN5VaHhfiAy9x6uriEmJgcLuVaCMALzxrLKERxM90zknJL6v6SW0aKcDVIK7j447FEi56+I8SXASQirETdWc9zdjPLlptSydbV4TSZ+yETuzKPcOOTl3RYtZr6nGy+iiDiTuFXFnzsZZM3qTK5a4eXpbb9XJeMuingn4pyIWFTLfC0LMd414P3pUoYqaN/X0BfQwXDcBasbWrxDYbyhXNcMWiZvepXdmkYAaGnxNxVte2BNE7tUsW1zP6JmYGUYPj1vdkWnfe8UB+Vu07bpQsrcKO3Xqlzp3jw/RbPBP1gndnGWZTVKDeslEBHXlHD2Shm46ScitWoD965drB46Ws4YMDlNnJxck3hyFHnigPePaXs+iggWo2+pP231CvdDHi4buoEVIiJNwiXt2thDpJSzFUzX6nvajIrZGIG144FXqOp3MZtI7RQARbBrUxtLMgq6at9SbkjLfwkrfYwXpLHSr62xeaPRmKpoSHO4MT1inZQjJTrnRkXkurrZs2uw28f4rJr3J0iM0dfkXBg9yjk3zBJsN+o2M5yIyMogT6t5/3iZSgX0BTRT2c/FbRedczjnLO0DtjSNZkAWvP9kFHlajPJfZlqI9z4Tv+YhW/3yDTAoVRnRQaDbzPAiIod5OdOnjXhdft98pLh1MuREZgpgLlRz+1rn7ilELnU+nheQD4nITovxR56w7Vlbt/qlsIS6LQBERLyLz+jyew4ML6451LnR4ZwzoHZErXZNEG4b8O619Sj/KV6aa2pZfuKJJ7aWah1YcjB96JLbAFlQuzMtZP0IvFVO1zhwXKKvI8VL/XDbYahJePFknv9WMGsp3DcMR9CP7Uf7IbTapLFP8dIWeHSB7Z3BjN4iFfGzZ3ycRyd6F820CXgNQE64UkRk48Y+BuoS4/fRpg2QbYMjBdwwjROK6f1h/Sopp4D7b4LDE90LEgBt50GITFeIjwV+P/2+6Klo0dKjzREZh6ceJvJ7mcRnR5GTReRoL/GoIsqOBoPv9dOb3Ps2XJ3I5I5FVjy0mawe8Fvr9QuPX7nq7CEXP7EHvicik8w6A6KrqCQ+CqcXZl9qV7dgqqj90mBzA77UUC4wsL4lfFPU1cy+lWg/KMODKjkVwisBWvDZ9utdR9WBuvIXafMCwWxzC33P3oLn7oBHtxMzCuckPvQn85Uq7My4PNF/0HN21UYR+BzACOHl6Xp3hcBUUoYXVN1rKe9KTsk+9wJ+FF5Y3tp7ASTzJxUC8LZ25h0kHzzgH4B1arpdYdfOCY6mq4n8qmYUBlqmtwE00HcngmacIkVbnKUOZ5Ts6P2erkjELMQITIRQHWO5JFpatTNJOBegbsXn0/XuWEVMb9Y4FaDQsGMTDLGf8zara+Pw1DB9gl6Pj8BKBcWqY+PwqETXkhkClRDqZp8GmEBf0369E3Q8XL5ThRVEniYi+Mz/8DTnquTEPgGpi9O/e0VGopfJfpg/PiVZzMlNh4vspbTcltJSiYCf9P4iNdl2WHRX7KF+XHW9Qxo7w/Ok1B4VOUlEJIi/i5n5gBm4OIUh6iLDEmV3utzbLNKUWnBfyfj/WNIRkITpHuPcZD3TN9e8P2pNPOxj1fWleo+ItFk/hd0AkOvUcNvvnMd0Er8vFXBxKvkeaWBXd+sIgaqfrRAuB5iE17VfX4oXeMA92Gw+MZg11Wg2Uo3PfEOtEk5V/dx7AZTnOFS+QG724SVlzHQ/HeB3snNVMLYE09E9dY5P1wfm41GnLxgQEWmlxabFVFZo3oarjg7D2W086akISksomUNEJgJLag3N7usEPA8gV73xoBtdX2r+gIhIU/XPzIgKY2NwMh3YvKShPgbrCtOH+iOEEtN7wPTbibYlt9dJm/oaND8KMKn6hkZRnN0oGr/Tzo8OGpq5R2pS9Y2qpUMzprqg+a26Lze+kXjRl3LEqiLLMB2F0xfSh05BUsr14IPZnWA5QNPyLy7qfbvgsS24supES4sLF9JQdd9koe8zo0E/D1YqS1rTiVz2T4m+JXWaSAt8E/3z6uT3loZfjsG69Pv8I4DkxY7A2pbqu9VsB0DAdo6HcH47UzshRkSkCW8oGWAVG7qFOT9rMuMGC2WRj+kP1x8gmUJbCDr9HbDfTHnH+qaAfSoP9lGAJvrGjnjHlNloXygJtljAJx+g8biFML/qXB2OVbW9lNHQbml/VY/ajvZT03X6RqtKVBrDcELq05z5jE762QkK1TsAto/P7YnPHoKloxT91SrxngnvP3+Uc3ekBzsuRLpYxDvntAV/kmX+KClPV9n/cEdEXCSKmMT0oTbvRSS66Z2SUWJERDIQIfOCRcvKEkcvweweMndHJv6cTOTwmS+IMYo4V9aDRe/9ypUiTxGRbTLLYar6uYtdqw+Xo8/1ITzZex+aMfvOEYPuB3QQ909CzZxzYTTLXrlW5EXHHi4TnfBursYW7LhUWqXwA6ZPl51Ph+Nit9sHuFvhvdvSiV17GzyuBecH7JICvhBMbwFIp2xVBy7RgneRUqmJ5qkA4gjhBQW2T+FxXYuLKp50yIfFOXwVYXMNzw6eLTdzhPDSir37522kYohGpQh2bY5+Q8025yE8UJiNmNmEmU2q2Xih+qBq+Gmh9rUAHwzw/C2p8q793bMxhr49TFdjtwCKYFenZ1Zsaj+fVHlLSKFzIxSkA6lys68ONxonsMBTsdqF3BNUQmuZfg9AzXI1VTWLZVjArDzlztL5ExDMJhtpS1BqxG3exeoJOLoOx9Xh+Ek4ZhiOeNUcTKZtlDJ91ujUWf4iImNwbsB2p2FQmNnW3a1yV7yIyGYYbMKHSpXRqGahWjNa2Mek7ZMmXWbh4lFp4GQoY+Sm81dBa2kof3k459T0fEejrm2EdvoVi5qIyB54aoHdUY04NdubG5/IjQ+0rFws1YJVWTQ1DXXlr1IbPdk1uWhUBG6ArDDbBKCq1gjhilz1f4LpDsW2qfHT3OwrLXj/ZJ7/Ztvz2ay2HODWt32NYqHDvx0bkxDug7W52XVzKUTQ6Q/CBWz3JKH6Kt/D4hMk5RE3qn80reFlIlxE5CE4HBiabeKxn9KWbqD93XXs4somNaxlpladW1SY/XgMnpzo6/8GvQOh0sztMBRM7622/QSzq9Lvh826f9GL/BLRWmbrAucbNlrKQSsv+foRWCsiwsY+Hdi0UExrf/HOkvEaSsPPHtrL9N6qZTOU22Jdw3BqYfwYoG52aXXLUjpjXUWlTSPwhMJUy72pIZA2wgWzHU3VN1Ud6nTh7AUqIfxigqPHW+FlIqVXtn45L7azUU0/e+FxLcK1lbFt5blLUw5YDreOBV7ab3pno30aBLwsE+VYNEZCeH7Avju9EGuhbZmwFlyZqimWR2WxzPSCH7aY0QnnJEdfV8DPmBoRmls6Y6Jh4SPpmYd3p5cjaPvAwmZY3YL3qTFMMvmAXE1HgKPT/ctiFPzKoV27R+DEFnza2j5P2yiK586+7xCWGLPn1jqcrqbfKSzsGIWjqnv6R+EjBOtTgKz6/wcfyR9O7idmmXyHNL8fYLlHFQ/hEA6hh/h/2xWz3sIOgC4AAAAASUVORK5CYII='; + +export function getTrailsOgImageElement(): ReactElement { + return ( +
+ {/* Header: mark + wordmark */} +
+ + + PackRat + +
+ + {/* Center: badge + headline + subtext */} +
+
+ + Trail Search + +
+ +
+ + Discover trails + + + near you. + +
+ + + Hiking, cycling, and outdoor trails — all in one place. + +
+ + {/* Footer: activity tags + domain */} +
+
+ {['Hiking', 'Cycling', 'Outdoors'].map((tag) => ( +
+ {tag} +
+ ))} +
+ + trails.packratai.com + +
+
+ ); +} diff --git a/apps/trails/lib/overpass.ts b/apps/trails/lib/overpass.ts index dc1ba28716..b3617a592f 100644 --- a/apps/trails/lib/overpass.ts +++ b/apps/trails/lib/overpass.ts @@ -12,13 +12,20 @@ export interface TrailSummaryWithCoords { center: [number, number] | null; } -export async function loadNearbyTrails( - lat: number, - lon: number, -): Promise { - const ql = new TrailQueryBuilder().sport('hiking').around(lat, lon, 15_000).timeout(30).build(); +export async function loadNearbyTrails({ + lat, + lon, +}: { + lat: number; + lon: number; +}): Promise { + const ql = new TrailQueryBuilder() + .sport('hiking') + .around({ lat, lon, radiusM: 15_000 }) + .timeout(30) + .build(); - const result = await queryOverpass(ql); + const result = await queryOverpass({ ql }); return result.elements.map((el) => { const summary = toTrailSummary(el); diff --git a/apps/trails/lib/useAuth.tsx b/apps/trails/lib/useAuth.tsx index ecd3688f75..48ec6e21ca 100644 --- a/apps/trails/lib/useAuth.tsx +++ b/apps/trails/lib/useAuth.tsx @@ -1,18 +1,31 @@ 'use client'; -import { createContext, useCallback, useContext, useMemo, useState } from 'react'; -import { authClient } from 'trails-app/lib/auth-client'; +import { fromZod } from '@packrat/guards'; +import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'; +import { + clearTokens, + clearUser, + getAccessToken, + getUser, + setTokens, + setUser, + type UserInfo, + UserInfoSchema, +} from 'trails-app/lib/auth'; +import { trailsAuthClient } from 'trails-app/lib/auth-client'; interface AuthState { isAuthed: boolean; - user: { id: string; email: string; name?: string | null } | null; + user: UserInfo | null; + pendingEmail: string | null; } interface AuthActions { register(email: string, opts: { password: string; firstName?: string }): Promise; + verifyEmail(token: string): Promise; + resendVerification(): Promise; login(email: string, password: string): Promise; logout(): Promise; - forgotPassword(email: string): Promise; openAuthGate(): void; closeAuthGate(): void; authGateOpen: boolean; @@ -20,43 +33,106 @@ interface AuthActions { const AuthContext = createContext<(AuthState & AuthActions) | null>(null); +function parseAuthUser(user: { + id: string; + email: string; + [key: string]: unknown; +}): UserInfo | null { + return ( + fromZod(UserInfoSchema)({ + id: user.id, + email: user.email, + firstName: (user.firstName as string | null | undefined) ?? null, + lastName: (user.lastName as string | null | undefined) ?? null, + }) ?? null + ); +} + export function AuthProvider({ children }: { children: React.ReactNode }) { - const session = authClient.useSession(); + const [state, setState] = useState({ + isAuthed: false, + user: null, + pendingEmail: null, + }); const [authGateOpen, setAuthGateOpen] = useState(false); - const isAuthed = !!session.data?.user; - const user = session.data?.user ?? null; + // Hydrate from localStorage on mount + useEffect(() => { + const token = getAccessToken(); + const user = getUser(); + if (token && user) { + setState({ isAuthed: true, user, pendingEmail: null }); + } + }, []); const register = useCallback( - async (email: string, { password, firstName }: { password: string; firstName?: string }) => { - const { error } = await authClient.signUp.email({ + async (email: string, opts: { password: string; firstName?: string }) => { + const name = opts.firstName ?? email; + const { data, error } = await trailsAuthClient.signUp.email({ email, - password, - name: firstName || email, + password: opts.password, + name, }); if (error) throw new Error(error.message ?? 'Registration failed'); - setAuthGateOpen(false); + if (data?.token) { + // autoSignIn: true succeeded — token is the Bearer session token + const parsedUser = parseAuthUser(data.user as Parameters[0]); + if (!parsedUser) throw new Error('Registration failed: unexpected user shape'); + setTokens({ accessToken: data.token, refreshToken: '' }); + setUser(parsedUser); + setState({ isAuthed: true, user: parsedUser, pendingEmail: null }); + setAuthGateOpen(false); + } else { + setState((s) => ({ ...s, pendingEmail: email })); + } }, [], ); + const verifyEmail = useCallback( + async (token: string) => { + if (!state.pendingEmail) throw new Error('No pending email verification'); + const { error } = await trailsAuthClient.verifyEmail({ query: { token } }); + if (error) throw new Error(error.message ?? 'Verification failed'); + const sessionRes = await trailsAuthClient.getSession(); + if (!sessionRes.data?.session || !sessionRes.data.user) { + throw new Error('Verification failed: could not get session'); + } + const parsedUser = parseAuthUser(sessionRes.data.user as Parameters[0]); + if (!parsedUser) throw new Error('Verification failed: unexpected user shape'); + setTokens({ accessToken: sessionRes.data.session.token, refreshToken: '' }); + setUser(parsedUser); + setState({ isAuthed: true, user: parsedUser, pendingEmail: null }); + setAuthGateOpen(false); + }, + [state.pendingEmail], + ); + + const resendVerification = useCallback(async () => { + if (!state.pendingEmail) throw new Error('No pending email'); + const { error } = await trailsAuthClient.sendVerificationEmail({ + email: state.pendingEmail, + callbackURL: typeof window !== 'undefined' ? window.location.origin : '', + }); + if (error) throw new Error(error.message ?? 'Resend failed'); + }, [state.pendingEmail]); + const login = useCallback(async (email: string, password: string) => { - const { error } = await authClient.signIn.email({ email, password }); - if (error) throw new Error(error.message ?? 'Login failed'); + const { data, error } = await trailsAuthClient.signIn.email({ email, password }); + if (error || !data) throw new Error(error?.message ?? 'Login failed'); + const parsedUser = parseAuthUser(data.user as Parameters[0]); + if (!parsedUser) throw new Error('Login failed: unexpected user shape'); + setTokens({ accessToken: data.token, refreshToken: '' }); + setUser(parsedUser); + setState({ isAuthed: true, user: parsedUser, pendingEmail: null }); setAuthGateOpen(false); }, []); const logout = useCallback(async () => { - await authClient.signOut(); - }, []); - - const forgotPassword = useCallback(async (email: string) => { - const redirectTo = - typeof window !== 'undefined' - ? `${window.location.origin}/reset-password` - : '/reset-password'; - const { error } = await authClient.requestPasswordReset({ email, redirectTo }); - if (error) throw new Error(error.message ?? 'Failed to send reset email'); + await trailsAuthClient.signOut(); + clearTokens(); + clearUser(); + setState({ isAuthed: false, user: null, pendingEmail: null }); }, []); const openAuthGate = useCallback(() => setAuthGateOpen(true), []); @@ -64,24 +140,24 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { const value = useMemo( () => ({ - isAuthed, - user, + ...state, authGateOpen, register, + verifyEmail, + resendVerification, login, logout, - forgotPassword, openAuthGate, closeAuthGate, }), [ - isAuthed, - user, + state, authGateOpen, register, + verifyEmail, + resendVerification, login, logout, - forgotPassword, openAuthGate, closeAuthGate, ], diff --git a/apps/trails/package.json b/apps/trails/package.json index 9d9f20ea7c..a20c41ac96 100644 --- a/apps/trails/package.json +++ b/apps/trails/package.json @@ -1,14 +1,17 @@ { "name": "packrat-trails-app", - "version": "2.0.24", + "version": "2.0.26", "private": true, "scripts": { - "build": "next build", + "build": "bun run generate-og-images && next build", "clean": "bunx rimraf node_modules .next out", "dev": "next dev", "doctor:react": "bunx react-doctor", + "generate-og-images": "bun run scripts/generate-og-images.ts", "lint": "next lint", - "start": "next start" + "start": "next start", + "test": "vitest run --config vitest.config.ts", + "test:og-meta": "vitest run --config vitest.config.ts __tests__/og-meta.test.ts" }, "dependencies": { "@packrat/api-client": "workspace:*", @@ -21,28 +24,30 @@ "@radix-ui/react-separator": "catalog:", "@radix-ui/react-tabs": "catalog:", "@radix-ui/react-toast": "catalog:", - "better-auth": "^1.6.9", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "input-otp": "1.4.1", - "leaflet": "^1.9.4", - "lucide-react": "^1.8.0", - "next": "^15.3.4", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "input-otp": "catalog:", + "leaflet": "catalog:", + "lucide-react": "catalog:", + "next": "catalog:", "react": "catalog:", "react-dom": "catalog:", - "react-leaflet": "^5.0.0", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", + "react-leaflet": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", "zod": "catalog:" }, "devDependencies": { - "@types/leaflet": "^1.9.21", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@types/leaflet": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "cheerio": "^1.0.0", + "open-graph-scraper": "^6.10.0", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", - "typescript": "catalog:" + "typescript": "catalog:", + "vitest": "catalog:" } } diff --git a/apps/trails/scripts/generate-og-images.ts b/apps/trails/scripts/generate-og-images.ts new file mode 100644 index 0000000000..e02c0092e3 --- /dev/null +++ b/apps/trails/scripts/generate-og-images.ts @@ -0,0 +1,62 @@ +/** + * Pre-build script: generates the static Open Graph image PNG for the Trails app. + * + * Static exports (`output: 'export'`) cannot serve Next.js metadata-route images + * (opengraph-image.tsx) correctly from a CDN — the generated .body/.meta files + * are a Next.js-internal format, not plain PNG files. + * + * This script renders the same JSX used in opengraph-image.tsx via ImageResponse + * and writes a real .png file to public/ so the CDN can serve it with the correct + * Content-Type automatically. + * + * Run: `bun run scripts/generate-og-images.ts` + * Output: apps/trails/public/og-image.png + */ + +import fs from 'node:fs'; +import path from 'node:path'; +import { ImageResponse } from 'next/og'; +import { createElement } from 'react'; +import { getTrailsOgImageElement, OG_IMAGE_SIZE } from '../lib/og-image'; + +// Intercept Google Fonts requests — CF Pages' build network occasionally 4xx's +// fonts.googleapis.com, which kills the build. Return 404 to fall back to +// bundled fonts instead. +const FONT_HOSTS = new Set(['fonts.googleapis.com', 'fonts.gstatic.com']); +const originalFetch = globalThis.fetch; +globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { + const href = input instanceof URL ? input.href : input instanceof Request ? input.url : input; + try { + if (FONT_HOSTS.has(new URL(href).hostname)) { + return new Response(null, { status: 404 }); + } + } catch { + // Not a parseable absolute URL — fall through to the real fetch. + } + return originalFetch(input, init); +}) as typeof fetch; + +const PUBLIC_DIR = path.join(import.meta.dir, '..', 'public'); + +async function generateOgImages(): Promise { + if (!fs.existsSync(PUBLIC_DIR)) { + fs.mkdirSync(PUBLIC_DIR, { recursive: true }); + } + + const response = new ImageResponse( + createElement(() => getTrailsOgImageElement()), + OG_IMAGE_SIZE, + ); + + const buffer = Buffer.from(await response.arrayBuffer()); + const outputPath = path.join(PUBLIC_DIR, 'og-image.png'); + fs.writeFileSync(outputPath, buffer); + + const rel = path.relative(process.cwd(), outputPath); + console.log(`✓ Generated ${rel} (${buffer.length} bytes)`); +} + +generateOgImages().catch((err) => { + console.error('Failed to generate OG images:', err); + process.exit(1); +}); diff --git a/apps/trails/vitest.config.ts b/apps/trails/vitest.config.ts new file mode 100644 index 0000000000..e0502cabe1 --- /dev/null +++ b/apps/trails/vitest.config.ts @@ -0,0 +1,17 @@ +import { resolve } from 'node:path'; +import { defineConfig } from 'vitest/config'; + +export default defineConfig({ + root: __dirname, + resolve: { + alias: { + 'trails-app': resolve(__dirname, '.'), + }, + }, + test: { + name: 'trails-og', + environment: 'node', + globals: true, + include: ['__tests__/**/*.test.ts'], + }, +}); diff --git a/apps/web/app/auth/page.tsx b/apps/web/app/auth/page.tsx index 9e915f6416..6c989613c1 100644 --- a/apps/web/app/auth/page.tsx +++ b/apps/web/app/auth/page.tsx @@ -1,9 +1,46 @@ 'use client'; +import { webEnv } from '@packrat/env/web'; import { useMutation } from '@tanstack/react-query'; import { useRouter } from 'next/navigation'; import type React from 'react'; import { useState } from 'react'; -import { authClient } from 'web-app/lib/auth-client'; +import { setTokens } from 'web-app/lib/auth'; + +const API_BASE = webEnv.NEXT_PUBLIC_API_URL ?? 'http://localhost:8787'; + +function useLoginMutation() { + return useMutation({ + mutationFn: async (body: { email: string; password: string }) => { + const res = await fetch(`${API_BASE}/api/auth/sign-in/email`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }); + if (!res.ok) throw new Error('Login failed'); + return res.json() as Promise<{ token?: string; user?: unknown }>; + }, + }); +} + +function useRegisterMutation() { + return useMutation({ + mutationFn: async (body: { + email: string; + password: string; + firstName?: string; + lastName?: string; + }) => { + const name = [body.firstName, body.lastName].filter(Boolean).join(' ') || body.email; + const res = await fetch(`${API_BASE}/api/auth/sign-up/email`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email: body.email, password: body.password, name }), + }); + if (!res.ok) throw new Error('Registration failed'); + return res.json(); + }, + }); +} export default function AuthPage() { const [tab, setTab] = useState<'login' | 'register'>('login'); @@ -13,35 +50,44 @@ export default function AuthPage() { const [info, setInfo] = useState(null); const router = useRouter(); - const loginMutation = useMutation({ - mutationFn: async (body: { email: string; password: string }) => { - const { error } = await authClient.signIn.email(body); - if (error) throw new Error(error.message ?? 'Login failed'); - }, - onSuccess: () => router.push('/'), - }); - - const registerMutation = useMutation({ - mutationFn: async (body: { email: string; password: string; name: string }) => { - const { error } = await authClient.signUp.email(body); - if (error) throw new Error(error.message ?? 'Registration failed'); - }, - onSuccess: () => { - setTab('login'); - setInfo('Account created! Please check your email to verify, then sign in.'); - }, - }); + const loginMutation = useLoginMutation(); + const registerMutation = useRegisterMutation(); function handleLogin(e: React.FormEvent) { e.preventDefault(); - loginMutation.mutate({ email, password }); + setInfo(null); + loginMutation.mutate( + { email, password }, + { + onSuccess: (data) => { + const token = (data as { token?: string }).token ?? ''; + if (!token) return; + setTokens({ accessToken: token, refreshToken: '' }); + router.push('/'); + }, + }, + ); } function handleRegister(e: React.FormEvent) { e.preventDefault(); - registerMutation.mutate({ email, password, name: username || email }); + setInfo(null); + const [firstName, ...rest] = username.trim().split(' '); + const lastName = rest.join(' ') || undefined; + registerMutation.mutate( + { email, password, firstName: firstName ?? username, lastName }, + { + onSuccess: () => { + setTab('login'); + setInfo('Account created! Please check your email to verify, then sign in.'); + }, + }, + ); } + const loginError = loginMutation.error?.message ?? null; + const registerError = registerMutation.error?.message ?? null; + return (
@@ -83,9 +129,7 @@ export default function AuthPage() { required /> {info &&

{info}

} - {loginMutation.error && ( -

{loginMutation.error.message}

- )} + {loginError &&

{loginError}

}
) : ( filtered.map((item) => { - const itemWeightG = toGrams(item.weight, item.weightUnit); + const itemWeightG = toGrams({ weight: item.weight, unit: item.weightUnit }); return (
{trip.name}
- {formatDateRange(trip.startDate, trip.endDate)} + {formatDateRange({ start: trip.startDate, end: trip.endDate })}
{trip.description && ( @@ -253,7 +253,7 @@ function TripDetail({

{trip.name}

- {formatDateRange(trip.startDate, trip.endDate)} + {formatDateRange({ start: trip.startDate, end: trip.endDate })}

@@ -371,7 +371,7 @@ function TripDetail({ ); } -function formatDateRange(start?: string | null, end?: string | null): string { +function formatDateRange({ start, end }: { start?: string | null; end?: string | null }): string { if (!start) return 'Dates TBD'; const s = new Date(start); const startStr = s.toLocaleDateString('en-US', { month: 'short', day: 'numeric' }); diff --git a/apps/web/lib/auth.ts b/apps/web/lib/auth.ts index f40c34e00f..60a44fb9b9 100644 --- a/apps/web/lib/auth.ts +++ b/apps/web/lib/auth.ts @@ -1,6 +1,12 @@ import Cookies from 'js-cookie'; -export function setTokens(accessToken: string, refreshToken: string) { +export function setTokens({ + accessToken, + refreshToken, +}: { + accessToken: string; + refreshToken: string; +}) { Cookies.set('access_token', accessToken, { expires: 1, sameSite: 'strict' }); Cookies.set('refresh_token', refreshToken, { expires: 30, sameSite: 'strict' }); } diff --git a/apps/web/lib/data.ts b/apps/web/lib/data.ts index eb0f05e6c6..a7d353e803 100644 --- a/apps/web/lib/data.ts +++ b/apps/web/lib/data.ts @@ -15,7 +15,7 @@ import type { // ── Weight helpers ─────────────────────────────────────────────────────────── -export function toGrams(weight: number, unit: WeightUnit): number { +export function toGrams({ weight, unit }: { weight: number; unit: WeightUnit }): number { switch (unit) { case 'oz': return Math.round(weight * 28.3495); @@ -28,7 +28,7 @@ export function toGrams(weight: number, unit: WeightUnit): number { } } -export function fromGrams(grams: number, unit: WeightUnit): number { +export function fromGrams({ grams, unit }: { grams: number; unit: WeightUnit }): number { switch (unit) { case 'oz': return Math.round((grams / 28.3495) * 10) / 10; @@ -41,8 +41,8 @@ export function fromGrams(grams: number, unit: WeightUnit): number { } } -export function formatWeight(grams: number, unit: WeightUnit): string { - const value = fromGrams(grams, unit); +export function formatWeight({ grams, unit }: { grams: number; unit: WeightUnit }): string { + const value = fromGrams({ grams, unit }); return `${value}${unit}`; } @@ -369,7 +369,7 @@ function calcWeights(items: PackItem[]): { totalWeight: number; baseWeight: numb let total = 0; let base = 0; for (const item of items) { - const w = toGrams(item.weight, item.weightUnit) * item.quantity; + const w = toGrams({ weight: item.weight, unit: item.weightUnit }) * item.quantity; total += w; if (!item.consumable && !item.worn) { base += w; @@ -1219,7 +1219,13 @@ export async function fetchCurrentUser(): Promise { // ── Packs ──────────────────────────────────────────────────────────────────── -export async function fetchPacks(page = 1, limit = 10): Promise { +export async function fetchPacks({ + page = 1, + limit = 10, +}: { + page?: number; + limit?: number; +} = {}): Promise { await delay(300); const packs = mockPacks.filter((p) => !p.deleted); return { diff --git a/apps/web/lib/weight-context.tsx b/apps/web/lib/weight-context.tsx index 28a4371a99..d552500e44 100644 --- a/apps/web/lib/weight-context.tsx +++ b/apps/web/lib/weight-context.tsx @@ -22,7 +22,7 @@ const Ctx = createContext({ export function WeightProvider({ children }: { children: React.ReactNode }) { const [unit, setUnit] = useAtom(weightUnitAtom); const toggleUnit = () => setUnit((u) => (u === 'g' ? 'oz' : 'g')); - const fw = (grams: number) => fmt(grams, unit); + const fw = (grams: number) => fmt({ grams, unit }); return {children}; } diff --git a/apps/web/package.json b/apps/web/package.json index 912c93470d..05da19afb8 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -9,35 +9,32 @@ "type-check": "tsc --noEmit" }, "dependencies": { - "@ai-sdk/react": "^3.0.170", "@packrat/api-client": "workspace:*", "@packrat/app": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", "@packrat/web-ui": "workspace:*", - "@tanstack/react-query": "^5.70.0", - "@tanstack/react-query-devtools": "^5.70.0", - "ai": "catalog:", - "better-auth": "^1.6.9", - "jotai": "^2.12.2", + "@tanstack/react-query": "catalog:", + "@tanstack/react-query-devtools": "catalog:", + "jotai": "catalog:", "js-cookie": "^3.0.5", - "lucide-react": "^1.8.0", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "lucide-react": "catalog:", + "next": "catalog:", + "next-themes": "catalog:", "react": "catalog:", "react-dom": "catalog:", - "recharts": "3.8.1", + "recharts": "catalog:", "zod": "catalog:" }, "devDependencies": { "@types/js-cookie": "^3.0.6", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "autoprefixer": "^10.4.21", - "postcss": "^8.5.6", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "autoprefixer": "catalog:", + "postcss": "catalog:", "tailwindcss": "catalog:", - "tailwindcss-animate": "^1.0.7", + "tailwindcss-animate": "catalog:", "typescript": "catalog:" } } diff --git a/biome.json b/biome.json index 0d84b85940..e8276c7f91 100644 --- a/biome.json +++ b/biome.json @@ -22,7 +22,8 @@ "!**/*.gen.ts", "!**/vite.config.ts.timestamp-*.mjs", "!**/src/codegen", - "!**/.claude" + "!**/.claude", + "!**/.expo" ] }, "formatter": { @@ -72,7 +73,6 @@ "packages/api/test/setup.ts", "apps/expo/utils/weight.ts", "packages/api/src/utils/weight.ts", - "packages/units/src/index.ts", "packages/mcp/src/index.ts", "scripts/lint/**", "scripts/format/**", diff --git a/bun.lock b/bun.lock index 3779104607..85f1532ae6 100644 --- a/bun.lock +++ b/bun.lock @@ -4,9 +4,6 @@ "workspaces": { "": { "name": "packrat-monorepo", - "dependencies": { - "@packrat-ai/nativewindui": "^2.0.6", - }, "devDependencies": { "@biomejs/biome": "2.4.6", "@manypkg/cli": "^0.24.0", @@ -23,12 +20,13 @@ }, "apps/admin": { "name": "packrat-admin-app", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@elysiajs/eden": "catalog:", "@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:", @@ -42,36 +40,36 @@ "@radix-ui/react-slot": "catalog:", "@radix-ui/react-tabs": "catalog:", "@radix-ui/react-tooltip": "catalog:", - "@tanstack/react-query": "^5.70.0", - "@types/leaflet": "^1.9.21", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "leaflet": "^1.9.4", - "lucide-react": "^1.8.0", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "@tanstack/react-query": "catalog:", + "@types/leaflet": "catalog:", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "leaflet": "catalog:", + "lucide-react": "catalog:", + "next": "catalog:", + "next-themes": "catalog:", "nuqs": "^2.8.9", "react": "catalog:", "react-dom": "catalog:", "react-error-boundary": "^6.1.1", - "recharts": "3.8.1", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", + "recharts": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", "zod": "catalog:", }, "devDependencies": { - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:", }, }, "apps/expo": { "name": "packrat-expo-app", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@ai-sdk/react": "^3.0.170", "@better-auth/expo": "^1.6.9", @@ -81,8 +79,12 @@ "@legendapp/state": "^3.0.0-beta.30", "@packrat/api-client": "workspace:*", "@packrat/config": "workspace:*", + "@packrat/constants": "workspace:*", + "@packrat/db": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", + "@packrat/schemas": "workspace:*", + "@packrat/types": "workspace:*", "@packrat/units": "workspace:*", "@react-native-ai/apple": "~0.10.0", "@react-native-ai/llama": "~0.10.0", @@ -109,13 +111,13 @@ "@shopify/flash-list": "2.0.2", "@stardazed/streams-text-encoding": "^1.0.2", "@tanstack/react-form": "^1.0.5", - "@tanstack/react-query": "^5.70.0", + "@tanstack/react-query": "catalog:", "ai": "catalog:", - "better-auth": "^1.6.9", + "better-auth": "catalog:", "burnt": "^0.13.0", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "date-fns": "^4.1.0", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "date-fns": "catalog:", "expo": "~55.0.17", "expo-apple-authentication": "~55.0.13", "expo-blur": "~55.0.14", @@ -129,6 +131,7 @@ "expo-haptics": "~55.0.14", "expo-image": "~55.0.10", "expo-image-picker": "~55.0.20", + "expo-keep-awake": "~55.0.8", "expo-linear-gradient": "~55.0.13", "expo-linking": "~55.0.15", "expo-localization": "~55.0.13", @@ -144,12 +147,12 @@ "expo-system-ui": "~55.0.17", "expo-updates": "~55.0.21", "expo-web-browser": "~55.0.15", - "google-auth-library": "^10.1.0", + "google-auth-library": "catalog:", "he": "^1.2.0", "i": "^0.3.7", "i18next": "^25.8.18", - "jotai": "^2.12.2", - "leaflet": "^1.9.4", + "jotai": "catalog:", + "leaflet": "catalog:", "llama.rn": "0.10.1", "nanoid": "^5.1.9", "nativewind": "^4.2.3", @@ -157,7 +160,7 @@ "react": "catalog:", "react-dom": "catalog:", "react-i18next": "^17.0.4", - "react-leaflet": "^5.0.0", + "react-leaflet": "catalog:", "react-native": "0.83.6", "react-native-blob-util": "^0.24.5", "react-native-css-interop": "^0.2.3", @@ -175,7 +178,7 @@ "react-native-web": "^0.21.0", "react-native-worklets": "0.7.4", "rn-icon-mapper": "^0.0.1", - "tailwind-merge": "^3.5.0", + "tailwind-merge": "catalog:", "use-debounce": "^10.0.5", "zod": "catalog:", }, @@ -183,12 +186,12 @@ "@babel/core": "^7.20.0", "@biomejs/biome": "2.4.6", "@types/he": "^1.2.3", - "@types/leaflet": "^1.9.21", - "@types/react": "~19.2.10", + "@types/leaflet": "catalog:", + "@types/react": "catalog:", "@types/ungap__structured-clone": "^1.2.0", "@typescript-eslint/eslint-plugin": "^7.7.0", "@typescript-eslint/parser": "^7.7.0", - "@vitest/coverage-v8": "~3.1.4", + "@vitest/coverage-v8": "catalog:", "ajv": "^8.12.0", "eslint": "^8.57.0", "eslint-config-universe": "^15.0.3", @@ -197,16 +200,16 @@ "rimraf": "^6.0.1", "tailwindcss": "catalog:", "typescript": "catalog:", - "vitest": "~3.1.4", + "vitest": "catalog:", }, }, "apps/guides": { "name": "packrat-guides-app", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { - "@ai-sdk/openai": "^3.0.53", + "@ai-sdk/openai": "catalog:", "@elysiajs/eden": "catalog:", - "@hookform/resolvers": "^5.2.2", + "@hookform/resolvers": "catalog:", "@packrat/api": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", @@ -239,58 +242,61 @@ "@radix-ui/react-toggle-group": "catalog:", "@radix-ui/react-tooltip": "catalog:", "@tailwindcss/typography": "^0.5.16", - "@tanstack/react-query": "^5.70.0", - "@tanstack/react-query-devtools": "^5.70.0", + "@tanstack/react-query": "catalog:", + "@tanstack/react-query-devtools": "catalog:", "ai": "catalog:", - "autoprefixer": "^10.4.21", + "autoprefixer": "catalog:", "chalk": "catalog:", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "cmdk": "1.1.1", - "date-fns": "^4.1.0", - "embla-carousel-react": "8.6.0", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "cmdk": "catalog:", + "date-fns": "catalog:", + "embla-carousel-react": "catalog:", "fs": "^0.0.1-security", - "gray-matter": "^4.0.3", - "input-otp": "1.4.1", - "lucide-react": "^1.8.0", + "gray-matter": "catalog:", + "input-otp": "catalog:", + "lucide-react": "catalog:", "mdx": "^0.3.1", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "next": "catalog:", + "next-themes": "catalog:", "path": "^0.12.7", "react": "catalog:", - "react-day-picker": "9.14.0", + "react-day-picker": "catalog:", "react-dom": "catalog:", - "react-hook-form": "^7.58.1", - "react-resizable-panels": "^4.10.0", + "react-hook-form": "catalog:", + "react-resizable-panels": "catalog:", "remark": "^15.0.1", "remark-gfm": "^4.0.1", "remark-html": "^16.0.1", "remark-parse": "^11.0.0", "slugify": "^1.6.6", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", + "sonner": "catalog:", + "tailwind-merge": "catalog:", "unified": "^11.0.0", - "vaul": "^1.1.2", + "vaul": "catalog:", "zod": "catalog:", }, "devDependencies": { - "@lhci/cli": "^0.14.0", + "@lhci/cli": "catalog:", "@types/mdx": "^2.0.13", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "cheerio": "^1.0.0", + "open-graph-scraper": "^6.10.0", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:", + "vitest": "catalog:", }, }, "apps/landing": { "name": "packrat-landing-app", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@emotion/is-prop-valid": "^1.3.1", - "@hookform/resolvers": "^5.2.2", + "@hookform/resolvers": "catalog:", "@packrat/guards": "workspace:*", "@packrat/web-ui": "workspace:*", "@radix-ui/react-accordion": "catalog:", @@ -320,41 +326,44 @@ "@radix-ui/react-toggle": "catalog:", "@radix-ui/react-toggle-group": "catalog:", "@radix-ui/react-tooltip": "catalog:", - "autoprefixer": "^10.4.21", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "cmdk": "1.1.1", - "date-fns": "^4.1.0", - "embla-carousel-react": "8.6.0", + "autoprefixer": "catalog:", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "cmdk": "catalog:", + "date-fns": "catalog:", + "embla-carousel-react": "catalog:", "framer-motion": "^12.19.1", - "input-otp": "1.4.1", - "lucide-react": "^1.8.0", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "input-otp": "catalog:", + "lucide-react": "catalog:", + "next": "catalog:", + "next-themes": "catalog:", "react": "catalog:", - "react-day-picker": "9.14.0", + "react-day-picker": "catalog:", "react-dom": "catalog:", - "react-hook-form": "^7.58.1", - "react-resizable-panels": "^4.10.0", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", - "vaul": "^1.1.2", + "react-hook-form": "catalog:", + "react-resizable-panels": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", + "vaul": "catalog:", "zod": "catalog:", }, "devDependencies": { - "@lhci/cli": "^0.14.0", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@lhci/cli": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "cheerio": "^1.0.0", + "open-graph-scraper": "^6.10.0", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:", + "vitest": "catalog:", }, }, "apps/trails": { "name": "packrat-trails-app", - "version": "2.0.24", + "version": "2.0.26", "dependencies": { "@packrat/api-client": "workspace:*", "@packrat/app": "workspace:*", @@ -366,89 +375,88 @@ "@radix-ui/react-separator": "catalog:", "@radix-ui/react-tabs": "catalog:", "@radix-ui/react-toast": "catalog:", - "better-auth": "^1.6.9", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "input-otp": "1.4.1", - "leaflet": "^1.9.4", - "lucide-react": "^1.8.0", - "next": "^15.3.4", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "input-otp": "catalog:", + "leaflet": "catalog:", + "lucide-react": "catalog:", + "next": "catalog:", "react": "catalog:", "react-dom": "catalog:", - "react-leaflet": "^5.0.0", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", + "react-leaflet": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", "zod": "catalog:", }, "devDependencies": { - "@types/leaflet": "^1.9.21", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "postcss": "^8.5.6", - "postcss-import": "^16.1.1", + "@types/leaflet": "catalog:", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "cheerio": "^1.0.0", + "open-graph-scraper": "^6.10.0", + "postcss": "catalog:", + "postcss-import": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:", + "vitest": "catalog:", }, }, "apps/web": { "name": "packrat-web-app", "dependencies": { - "@ai-sdk/react": "^3.0.170", "@packrat/api-client": "workspace:*", "@packrat/app": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", "@packrat/web-ui": "workspace:*", - "@tanstack/react-query": "^5.70.0", - "@tanstack/react-query-devtools": "^5.70.0", - "ai": "catalog:", - "better-auth": "^1.6.9", - "jotai": "^2.12.2", + "@tanstack/react-query": "catalog:", + "@tanstack/react-query-devtools": "catalog:", + "jotai": "catalog:", "js-cookie": "^3.0.5", - "lucide-react": "^1.8.0", - "next": "^15.3.4", - "next-themes": "^0.4.6", + "lucide-react": "catalog:", + "next": "catalog:", + "next-themes": "catalog:", "react": "catalog:", "react-dom": "catalog:", - "recharts": "3.8.1", + "recharts": "catalog:", "zod": "catalog:", }, "devDependencies": { "@types/js-cookie": "^3.0.6", - "@types/node": "^25.6.0", - "@types/react": "~19.2.10", - "@types/react-dom": "^19.1.6", - "autoprefixer": "^10.4.21", - "postcss": "^8.5.6", + "@types/node": "catalog:", + "@types/react": "catalog:", + "@types/react-dom": "catalog:", + "autoprefixer": "catalog:", + "postcss": "catalog:", "tailwindcss": "catalog:", - "tailwindcss-animate": "^1.0.7", + "tailwindcss-animate": "catalog:", "typescript": "catalog:", }, }, "packages/analytics": { "name": "@packrat/analytics", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { - "@duckdb/node-api": "1.5.0-r.1", + "@duckdb/node-api": "catalog:", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", - "consola": "^3.4.2", + "consola": "catalog:", "magic-regexp": "catalog:", "radash": "catalog:", "zod": "catalog:", }, "devDependencies": { - "@types/bun": "latest", - "vitest": "~3.1.4", + "@types/bun": "catalog:", + "vitest": "catalog:", }, }, "packages/api": { "name": "@packrat/api", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@ai-sdk/google": "^3.0.64", - "@ai-sdk/openai": "^3.0.53", + "@ai-sdk/openai": "catalog:", "@ai-sdk/perplexity": "^3.0.29", "@aws-sdk/client-s3": "~3.787.0", "@aws-sdk/s3-request-presigner": "~3.787.0", @@ -457,30 +465,35 @@ "@elysiajs/eden": "catalog:", "@elysiajs/openapi": "catalog:", "@mozilla/readability": "^0.6.0", - "@neondatabase/serverless": "^1.0.0", + "@neondatabase/serverless": "catalog:", + "@packrat/constants": "workspace:*", + "@packrat/db": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", "@packrat/overpass": "workspace:*", + "@packrat/schemas": "workspace:*", + "@packrat/types": "workspace:*", "@packrat/units": "workspace:*", + "@sentry/cloudflare": "^10.0.0", "@sinclair/typebox": "^0.34.15", "@types/nodemailer": "^6.4.17", "ai": "catalog:", "bcryptjs": "^3.0.2", "csv-parse": "^6.2.1", - "drizzle-kit": "^0.31.10", - "drizzle-orm": "^0.45.2", - "drizzle-zod": "^0.8.3", + "drizzle-kit": "catalog:", + "drizzle-orm": "catalog:", + "drizzle-zod": "catalog:", "elysia": "catalog:", - "google-auth-library": "^10.1.0", - "gray-matter": "^4.0.3", + "google-auth-library": "catalog:", + "gray-matter": "catalog:", "jose": "^5.9.6", "linkedom": "^0.18.11", "nodemailer": "^6.10.0", - "pg": "^8.16.3", + "pg": "catalog:", "radash": "catalog:", "resend": "^6.10.0", "workers-ai-provider": "^0.7.2", - "ws": "^8.18.1", + "ws": "catalog:", "youtube-transcript": "^1.3.0", "zod": "catalog:", "zod-openapi": "^5.4.6", @@ -488,23 +501,23 @@ "devDependencies": { "@better-auth/drizzle-adapter": "^1.6.9", "@cloudflare/vitest-pool-workers": "0.8.71", - "@cloudflare/workers-types": "^4.20250405.0", - "@types/bun": "latest", + "@cloudflare/workers-types": "catalog:", + "@types/bun": "catalog:", "@types/pg": "^8.11.15", "@types/ws": "^8.5.14", - "@vitest/coverage-v8": "~3.1.4", - "better-auth": "^1.6.9", + "@vitest/coverage-v8": "catalog:", + "better-auth": "catalog:", "better-auth-cloudflare": "^0.3.0", "concurrently": "^8.2.2", - "drizzle-orm": "^0.45.2", + "drizzle-orm": "catalog:", "typed-htmx": "^0.3.1", - "vitest": "~3.1.4", - "wrangler": "^4.21.2", + "vitest": "catalog:", + "wrangler": "catalog:", }, }, "packages/api-client": { "name": "@packrat/api-client", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@elysiajs/eden": "catalog:", "@packrat/guards": "workspace:*", @@ -522,11 +535,12 @@ }, "packages/app": { "name": "@packrat/app", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@packrat/api-client": "workspace:*", - "@tanstack/react-query": "^5.70.0", - "jotai": "^2.12.2", + "@packrat/schemas": "workspace:*", + "@tanstack/react-query": "catalog:", + "jotai": "catalog:", "react": "catalog:", "zod": "catalog:", }, @@ -535,53 +549,75 @@ "steiger": "^0.5.11", }, "peerDependencies": { - "@tanstack/react-query": "^5.70.0", - "jotai": "^2.12.2", + "@tanstack/react-query": "catalog:", + "jotai": "catalog:", "react": "catalog:", }, }, "packages/checks": { "name": "@packrat/checks", - "version": "2.0.25", + "version": "2.0.26", }, "packages/cli": { "name": "@packrat/cli", - "version": "2.0.25", + "version": "2.0.26", "bin": { "packrat": "./src/index.ts", }, "dependencies": { - "@duckdb/node-api": "1.5.0-r.1", + "@duckdb/node-api": "catalog:", "@packrat/analytics": "workspace:*", + "@packrat/api-client": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", "chalk": "catalog:", "citty": "^0.2.1", "cli-table3": "^0.6.5", - "consola": "^3.4.2", + "consola": "catalog:", + "uuid": "^11.0.5", "zod": "catalog:", }, "devDependencies": { - "@types/bun": "latest", + "@types/bun": "catalog:", + "@types/uuid": "^11.0.0", }, }, "packages/config": { "name": "@packrat/config", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@packrat/guards": "workspace:*", }, }, + "packages/constants": { + "name": "@packrat/constants", + "version": "0.0.0", + "devDependencies": { + "typescript": "catalog:", + }, + }, + "packages/db": { + "name": "@packrat/db", + "version": "0.0.0", + "dependencies": { + "@packrat/constants": "workspace:*", + "drizzle-orm": "catalog:", + "drizzle-zod": "catalog:", + }, + "devDependencies": { + "typescript": "catalog:", + }, + }, "packages/env": { "name": "@packrat/env", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "zod": "catalog:", }, }, "packages/guards": { "name": "@packrat/guards", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "radash": "catalog:", "ts-extras": "catalog:", @@ -590,7 +626,7 @@ }, "packages/mcp": { "name": "@packrat/mcp", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@cloudflare/workers-oauth-provider": "^0.4.0", "@modelcontextprotocol/sdk": "^1.11.0", @@ -600,46 +636,70 @@ "zod": "catalog:", }, "devDependencies": { - "@cloudflare/workers-types": "^4.20250405.0", - "@vitest/coverage-v8": "~3.1.4", + "@cloudflare/workers-types": "catalog:", + "@vitest/coverage-v8": "catalog:", "partyserver": "^0.4.1", "typescript": "catalog:", - "vitest": "~3.1.4", - "wrangler": "^4.21.2", + "vitest": "catalog:", + "wrangler": "catalog:", }, }, "packages/osm-db": { "name": "@packrat/osm-db", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { - "@neondatabase/serverless": "^1.0.0", - "drizzle-orm": "^0.45.2", - "pg": "^8.16.3", - "ws": "^8.18.1", + "@neondatabase/serverless": "catalog:", + "drizzle-orm": "catalog:", + "pg": "catalog:", + "ws": "catalog:", }, "devDependencies": { - "drizzle-kit": "^0.31.10", + "drizzle-kit": "catalog:", "typescript": "catalog:", }, }, "packages/osm-import": { "name": "@packrat/osm-import", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@packrat/env": "workspace:*", - "pg": "^8.16.3", + "pg": "catalog:", }, }, "packages/overpass": { "name": "@packrat/overpass", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@packrat/guards": "workspace:*", "zod": "catalog:", }, "devDependencies": { "typescript": "catalog:", - "vitest": "~3.1.4", + "vitest": "catalog:", + }, + }, + "packages/schemas": { + "name": "@packrat/schemas", + "version": "0.0.0", + "dependencies": { + "@packrat/constants": "workspace:*", + "@packrat/db": "workspace:*", + "@packrat/guards": "workspace:*", + "zod": "catalog:", + }, + "devDependencies": { + "typescript": "catalog:", + }, + }, + "packages/types": { + "name": "@packrat/types", + "version": "0.0.0", + "dependencies": { + "@packrat/constants": "workspace:*", + "@packrat/schemas": "workspace:*", + }, + "devDependencies": { + "typescript": "catalog:", }, }, "packages/ui": { @@ -651,18 +711,19 @@ }, "packages/units": { "name": "@packrat/units", - "version": "0.1.0", + "version": "2.0.26", "dependencies": { + "@packrat/constants": "workspace:*", "@packrat/guards": "workspace:*", }, "devDependencies": { "convert-units": "3.0.0-beta.8", - "vitest": "~3.1.4", + "vitest": "catalog:", }, }, "packages/web-ui": { "name": "@packrat/web-ui", - "version": "2.0.25", + "version": "2.0.26", "dependencies": { "@packrat/guards": "workspace:*", "@radix-ui/react-accordion": "catalog:", @@ -692,32 +753,32 @@ "@radix-ui/react-toggle": "catalog:", "@radix-ui/react-toggle-group": "catalog:", "@radix-ui/react-tooltip": "catalog:", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "cmdk": "1.1.1", - "embla-carousel-react": "8.6.0", - "input-otp": "1.4.1", - "lucide-react": "^1.8.0", - "next-themes": "^0.4.6", - "react-day-picker": "9.14.0", - "react-hook-form": "^7.58.1", - "react-resizable-panels": "^4.10.0", - "recharts": "3.8.1", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", - "tailwindcss-animate": "^1.0.7", - "vaul": "^1.1.2", + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "cmdk": "catalog:", + "embla-carousel-react": "catalog:", + "input-otp": "catalog:", + "lucide-react": "catalog:", + "next-themes": "catalog:", + "react-day-picker": "catalog:", + "react-hook-form": "catalog:", + "react-resizable-panels": "catalog:", + "recharts": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", + "tailwindcss-animate": "catalog:", + "vaul": "catalog:", }, "devDependencies": { - "@types/react": "~19.2.10", + "@types/react": "catalog:", "react": "catalog:", - "recharts": "3.8.1", + "recharts": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:", }, "peerDependencies": { "react": "catalog:", - "recharts": "3.8.1", + "recharts": "catalog:", "tailwindcss": "catalog:", }, }, @@ -726,19 +787,24 @@ "@sentry/cli", ], "overrides": { - "@packrat-ai/nativewindui": "2.0.6", "@sinclair/typebox": "^0.34.15", "elysia": "^1.4.0", "expo-sqlite": "~55.0.15", "react": "19.2.6", }, "catalog": { + "@ai-sdk/openai": "^3.0.53", + "@cloudflare/workers-types": "^4.20250405.0", + "@duckdb/node-api": "1.5.0-r.1", "@elysiajs/cors": "^1.2.0", "@elysiajs/eden": "^1.2.0", "@elysiajs/openapi": "^1.2.0", "@hono/sentry": "^1.2.2", "@hono/zod-openapi": "^1.3.0", "@hono/zod-validator": "^0.7.6", + "@hookform/resolvers": "^5.2.2", + "@lhci/cli": "^0.14.0", + "@neondatabase/serverless": "^1.0.0", "@radix-ui/react-accordion": "^1.2.11", "@radix-ui/react-alert-dialog": "^1.1.14", "@radix-ui/react-aspect-ratio": "^1.1.7", @@ -766,34 +832,76 @@ "@radix-ui/react-toggle": "^1.1.9", "@radix-ui/react-toggle-group": "^1.1.10", "@radix-ui/react-tooltip": "^1.2.7", + "@tanstack/react-query": "^5.70.0", + "@tanstack/react-query-devtools": "^5.70.0", + "@types/bun": "latest", + "@types/leaflet": "^1.9.21", + "@types/node": "^25.6.0", + "@types/react": "~19.2.10", + "@types/react-dom": "^19.1.6", + "@vitest/coverage-v8": "~3.1.4", "ai": "^6.0.168", + "autoprefixer": "^10.4.21", + "better-auth": "^1.6.9", "chalk": "^5.6.2", + "class-variance-authority": "^0.7.1", + "clsx": "^2.1.1", + "cmdk": "1.1.1", + "consola": "^3.4.2", + "date-fns": "^4.1.0", + "drizzle-kit": "^0.31.10", + "drizzle-orm": "^0.45.2", + "drizzle-zod": "^0.8.3", "elysia": "^1.4.0", + "embla-carousel-react": "8.6.0", + "google-auth-library": "^10.1.0", + "gray-matter": "^4.0.3", "hono": "^4.10.7", + "input-otp": "1.4.1", + "jotai": "^2.12.2", + "leaflet": "^1.9.4", + "lucide-react": "^1.8.0", "magic-regexp": "^0.11.0", + "next": "^15.3.4", + "next-themes": "^0.4.6", + "pg": "^8.16.3", + "postcss": "^8.5.6", + "postcss-import": "^16.1.1", "radash": "^12.1.1", "react": "19.2.6", + "react-day-picker": "9.14.0", "react-dom": "19.2.6", + "react-hook-form": "^7.58.1", + "react-leaflet": "^5.0.0", + "react-resizable-panels": "^4.10.0", + "recharts": "3.8.1", "semver": "^7.7.4", + "sonner": "^2.0.7", + "tailwind-merge": "^3.5.0", "tailwindcss": "^3.4.17", + "tailwindcss-animate": "^1.0.7", "ts-extras": "^1.0.0", "typescript": "~5.9.2", + "vaul": "^1.1.2", + "vitest": "~3.1.4", + "wrangler": "^4.21.2", + "ws": "^8.18.1", "zod": "^3.24.2", }, "packages": { - "@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.104", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZKX5n74io8VIRlhIMSLWVlvT3sXC8Z7cZ9GHuWBWZDVi96+62AIsWuLGvMfcBA1STYuSoDrp6rIziZmvrTq0TA=="], + "@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.121", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-uY248djJRxa5W68MHiyqO8WLdOeKQoRClGg7PVX/VPhVW8SJNM7/l5DcrA5WAM3YfQrLyNkgZa2VOu8T0t8LUw=="], - "@ai-sdk/google": ["@ai-sdk/google@3.0.64", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CbR82EgGPNrj/6q0HtclwuCqe0/pDShyv3nWDP/A9DroujzWXnLMlUJVrgPOsg4b40zQCwwVs2XSKCxvt/4QaA=="], + "@ai-sdk/google": ["@ai-sdk/google@3.0.80", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-5ORbm/yFUPO0MEvZsxBMN0cdKw2+lwU/wVn5KN3KF8Dmk1LughuDuUohMh/7iU/XFTiyB0OvmTW/tdV/J7O9zg=="], - "@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="], + "@ai-sdk/openai": ["@ai-sdk/openai@3.0.67", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-oAiGC9eWG7IgtdsdS74bOCnAAHarAfTJhWN9x5INwnWPekL802AvF+0I5DvLzIF1MIRmNw4N8mPSL/GUVbX9Mw=="], - "@ai-sdk/perplexity": ["@ai-sdk/perplexity@3.0.29", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-9UfV7ywpnxNLPI/hdheFPHXDdLG9vLqNoPSdRTPV+nPAX117zMtBmqD5KSvmXTjeF7IXpObUZ9bWzwMR/ewL1g=="], + "@ai-sdk/perplexity": ["@ai-sdk/perplexity@3.0.33", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-aNt6pTAzq+akadDXVdg2SjN2dODtaVlkKbw8/35c+sekr+Tx0sJwVqMR1udxrjLzhQvz8qtfsWRuz+hB9pmOnQ=="], - "@ai-sdk/provider": ["@ai-sdk/provider@3.0.8", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ=="], + "@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="], - "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="], + "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="], - "@ai-sdk/react": ["@ai-sdk/react@3.0.170", "", { "dependencies": { "@ai-sdk/provider-utils": "4.0.23", "ai": "6.0.168", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ~19.0.1 || ~19.1.2 || ^19.2.1" } }, "sha512-YUDn+mK0c8iUz14rCBf1A0zg6SV5b5aSVUz+azF1bdBd1SFXVI19dKYR+PQSpZY+0+z+zs252AAsacUqiO98Kw=="], + "@ai-sdk/react": ["@ai-sdk/react@3.0.195", "", { "dependencies": { "@ai-sdk/provider-utils": "4.0.27", "ai": "6.0.193", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ~19.0.1 || ~19.1.2 || ^19.2.1" } }, "sha512-+yIH84d4bBNzLKfaDDf4EocEH0XQKKNwNShxbrz5xAiJMNIPnWVWT9cyrSerYaGH3iNVS/g2io42PE4HNbc4RA=="], "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="], @@ -879,57 +987,59 @@ "@aws-sdk/xml-builder": ["@aws-sdk/xml-builder@3.775.0", "", { "dependencies": { "@smithy/types": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-b9NGO6FKJeLGYnV7Z1yvcP1TNU4dkD5jNsLWOF1/sygZoASaQhNOlaiJ/1OH331YQ1R1oWk38nBb0frsYkDsOQ=="], - "@babel/code-frame": ["@babel/code-frame@7.29.0", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw=="], + "@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], - "@babel/compat-data": ["@babel/compat-data@7.29.0", "", {}, "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg=="], + "@babel/compat-data": ["@babel/compat-data@7.29.7", "", {}, "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg=="], - "@babel/core": ["@babel/core@7.29.0", "", { "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-module-transforms": "^7.28.6", "@babel/helpers": "^7.28.6", "@babel/parser": "^7.29.0", "@babel/template": "^7.28.6", "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA=="], + "@babel/core": ["@babel/core@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", "@babel/helper-compilation-targets": "^7.29.7", "@babel/helper-module-transforms": "^7.29.7", "@babel/helpers": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/template": "^7.29.7", "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA=="], - "@babel/generator": ["@babel/generator@7.29.1", "", { "dependencies": { "@babel/parser": "^7.29.0", "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw=="], + "@babel/generator": ["@babel/generator@7.29.7", "", { "dependencies": { "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ=="], - "@babel/helper-annotate-as-pure": ["@babel/helper-annotate-as-pure@7.27.3", "", { "dependencies": { "@babel/types": "^7.27.3" } }, "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg=="], + "@babel/helper-annotate-as-pure": ["@babel/helper-annotate-as-pure@7.29.7", "", { "dependencies": { "@babel/types": "^7.29.7" } }, "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw=="], - "@babel/helper-compilation-targets": ["@babel/helper-compilation-targets@7.28.6", "", { "dependencies": { "@babel/compat-data": "^7.28.6", "@babel/helper-validator-option": "^7.27.1", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" } }, "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA=="], + "@babel/helper-compilation-targets": ["@babel/helper-compilation-targets@7.29.7", "", { "dependencies": { "@babel/compat-data": "^7.29.7", "@babel/helper-validator-option": "^7.29.7", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" } }, "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g=="], - "@babel/helper-create-class-features-plugin": ["@babel/helper-create-class-features-plugin@7.28.6", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-member-expression-to-functions": "^7.28.5", "@babel/helper-optimise-call-expression": "^7.27.1", "@babel/helper-replace-supers": "^7.28.6", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", "@babel/traverse": "^7.28.6", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow=="], + "@babel/helper-create-class-features-plugin": ["@babel/helper-create-class-features-plugin@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-member-expression-to-functions": "^7.29.7", "@babel/helper-optimise-call-expression": "^7.29.7", "@babel/helper-replace-supers": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", "@babel/traverse": "^7.29.7", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg=="], - "@babel/helper-create-regexp-features-plugin": ["@babel/helper-create-regexp-features-plugin@7.28.5", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "regexpu-core": "^6.3.1", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw=="], + "@babel/helper-create-regexp-features-plugin": ["@babel/helper-create-regexp-features-plugin@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "regexpu-core": "^6.3.1", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-907Uymvqgg1dwUA+7IGwFAOSYzQOuzPXKNJ1yxzwPffzkYFg2q2eHi1fIOs6sXkG9NbIUMunnUlkYsfRFNvomg=="], "@babel/helper-define-polyfill-provider": ["@babel/helper-define-polyfill-provider@0.6.8", "", { "dependencies": { "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "debug": "^4.4.3", "lodash.debounce": "^4.0.8", "resolve": "^1.22.11" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "sha512-47UwBLPpQi1NoWzLuHNjRoHlYXMwIJoBf7MFou6viC/sIHWYygpvr0B6IAyh5sBdA2nr2LPIRww8lfaUVQINBA=="], - "@babel/helper-globals": ["@babel/helper-globals@7.28.0", "", {}, "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw=="], + "@babel/helper-globals": ["@babel/helper-globals@7.29.7", "", {}, "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA=="], - "@babel/helper-member-expression-to-functions": ["@babel/helper-member-expression-to-functions@7.28.5", "", { "dependencies": { "@babel/traverse": "^7.28.5", "@babel/types": "^7.28.5" } }, "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg=="], + "@babel/helper-member-expression-to-functions": ["@babel/helper-member-expression-to-functions@7.29.7", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg=="], - "@babel/helper-module-imports": ["@babel/helper-module-imports@7.28.6", "", { "dependencies": { "@babel/traverse": "^7.28.6", "@babel/types": "^7.28.6" } }, "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw=="], + "@babel/helper-module-imports": ["@babel/helper-module-imports@7.29.7", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g=="], - "@babel/helper-module-transforms": ["@babel/helper-module-transforms@7.28.6", "", { "dependencies": { "@babel/helper-module-imports": "^7.28.6", "@babel/helper-validator-identifier": "^7.28.5", "@babel/traverse": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA=="], + "@babel/helper-module-transforms": ["@babel/helper-module-transforms@7.29.7", "", { "dependencies": { "@babel/helper-module-imports": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg=="], - "@babel/helper-optimise-call-expression": ["@babel/helper-optimise-call-expression@7.27.1", "", { "dependencies": { "@babel/types": "^7.27.1" } }, "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw=="], + "@babel/helper-optimise-call-expression": ["@babel/helper-optimise-call-expression@7.29.7", "", { "dependencies": { "@babel/types": "^7.29.7" } }, "sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong=="], - "@babel/helper-plugin-utils": ["@babel/helper-plugin-utils@7.28.6", "", {}, "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug=="], + "@babel/helper-plugin-utils": ["@babel/helper-plugin-utils@7.29.7", "", {}, "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw=="], - "@babel/helper-remap-async-to-generator": ["@babel/helper-remap-async-to-generator@7.27.1", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.1", "@babel/helper-wrap-function": "^7.27.1", "@babel/traverse": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA=="], + "@babel/helper-remap-async-to-generator": ["@babel/helper-remap-async-to-generator@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-wrap-function": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-16AMiW26DbXWBbr3B8wNozKM0ydMLB892vaOaJW/fPJdnT8vJk5sdkQcU/isqUxyCE0cEoa8wZOcbgDuC4b6Og=="], - "@babel/helper-replace-supers": ["@babel/helper-replace-supers@7.28.6", "", { "dependencies": { "@babel/helper-member-expression-to-functions": "^7.28.5", "@babel/helper-optimise-call-expression": "^7.27.1", "@babel/traverse": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg=="], + "@babel/helper-replace-supers": ["@babel/helper-replace-supers@7.29.7", "", { "dependencies": { "@babel/helper-member-expression-to-functions": "^7.29.7", "@babel/helper-optimise-call-expression": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ=="], - "@babel/helper-skip-transparent-expression-wrappers": ["@babel/helper-skip-transparent-expression-wrappers@7.27.1", "", { "dependencies": { "@babel/traverse": "^7.27.1", "@babel/types": "^7.27.1" } }, "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg=="], + "@babel/helper-skip-transparent-expression-wrappers": ["@babel/helper-skip-transparent-expression-wrappers@7.29.7", "", { "dependencies": { "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ=="], - "@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], + "@babel/helper-string-parser": ["@babel/helper-string-parser@7.29.7", "", {}, "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw=="], - "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], + "@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.29.7", "", {}, "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg=="], - "@babel/helper-validator-option": ["@babel/helper-validator-option@7.27.1", "", {}, "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg=="], + "@babel/helper-validator-option": ["@babel/helper-validator-option@7.29.7", "", {}, "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw=="], - "@babel/helper-wrap-function": ["@babel/helper-wrap-function@7.28.6", "", { "dependencies": { "@babel/template": "^7.28.6", "@babel/traverse": "^7.28.6", "@babel/types": "^7.28.6" } }, "sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ=="], + "@babel/helper-wrap-function": ["@babel/helper-wrap-function@7.29.7", "", { "dependencies": { "@babel/template": "^7.29.7", "@babel/traverse": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-iES0Skag9ERIF68aXadpO6dbXa03mNWK3sEqJaMnLNs/eC3l0lkImdfoy6Y09/SfkpawdAB4RjQ7PVA7TcVGdw=="], - "@babel/helpers": ["@babel/helpers@7.29.2", "", { "dependencies": { "@babel/template": "^7.28.6", "@babel/types": "^7.29.0" } }, "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw=="], + "@babel/helpers": ["@babel/helpers@7.29.7", "", { "dependencies": { "@babel/template": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg=="], - "@babel/parser": ["@babel/parser@7.29.2", "", { "dependencies": { "@babel/types": "^7.29.0" }, "bin": "./bin/babel-parser.js" }, "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA=="], + "@babel/highlight": ["@babel/highlight@7.25.9", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" } }, "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw=="], - "@babel/plugin-proposal-decorators": ["@babel/plugin-proposal-decorators@7.29.0", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/plugin-syntax-decorators": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-CVBVv3VY/XRMxRYq5dwr2DS7/MvqPm23cOCjbwNnVrfOqcWlnefua1uUs0sjdKOGjvPUG633o07uWzJq4oI6dA=="], + "@babel/parser": ["@babel/parser@7.29.7", "", { "dependencies": { "@babel/types": "^7.29.7" }, "bin": "./bin/babel-parser.js" }, "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg=="], - "@babel/plugin-proposal-export-default-from": ["@babel/plugin-proposal-export-default-from@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-hjlsMBl1aJc5lp8MoCDEZCiYzlgdRAShOjAfRw6X+GlpLpUPU7c3XNLsKFZbQk/1cRzBlJ7CXg3xJAJMrFa1Uw=="], + "@babel/plugin-proposal-decorators": ["@babel/plugin-proposal-decorators@7.29.7", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/plugin-syntax-decorators": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-EtU0Hi3GvrTqD56xKmZvV/uCXK2ZbwVNPNLAquVItcAZpUhkXwWlo3Fmj0c2LxgSf2I8IDULeAepwNP1OefLXg=="], + + "@babel/plugin-proposal-export-default-from": ["@babel/plugin-proposal-export-default-from@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-p+G5BNXDcy3bOXplhY4HybQ1GxH3i2Tppmdm/3epyRu2VgJJZuUlZ61MqRTg582Q7ZLBdP7fePYvsumSEkMxcQ=="], "@babel/plugin-syntax-async-generators": ["@babel/plugin-syntax-async-generators@7.8.4", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="], @@ -939,21 +1049,21 @@ "@babel/plugin-syntax-class-static-block": ["@babel/plugin-syntax-class-static-block@7.14.5", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="], - "@babel/plugin-syntax-decorators": ["@babel/plugin-syntax-decorators@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-71EYI0ONURHJBL4rSFXnITXqXrrY8q4P0q006DPfN+Rk+ASM+++IBXem/ruokgBZR8YNEWZ8R6B+rCb8VcUTqA=="], + "@babel/plugin-syntax-decorators": ["@babel/plugin-syntax-decorators@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-9MTTLbF39X6sqM92JPEsoI7++26hjZvzkxKZy64aMhWLH2mPkJ/Q3AV4QLmls3R14FpSpkOwQQfUh962JGQxxg=="], "@babel/plugin-syntax-dynamic-import": ["@babel/plugin-syntax-dynamic-import@7.8.3", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="], - "@babel/plugin-syntax-export-default-from": ["@babel/plugin-syntax-export-default-from@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Svlx1fjJFnNz0LZeUaybRukSxZI3KkpApUmIRzEdXC5k8ErTOz0OD0kNrICi5Vc3GlpP5ZCeRyRO+mfWTSz+iQ=="], + "@babel/plugin-syntax-export-default-from": ["@babel/plugin-syntax-export-default-from@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-foag0BB37ROhdeIX9O8G0jX7hw0UekJc04cHMrYLOnrErsnBKqJGHJ8eDRpoCFZBvEPPygmmtw4qyU97qa4oOw=="], - "@babel/plugin-syntax-flow": ["@babel/plugin-syntax-flow@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-D+OrJumc9McXNEBI/JmFnc/0uCM2/Y3PEBG3gfV3QIYkKv5pvnpzFrl1kYCrcHJP8nOeFB/SHi1IHz29pNGuew=="], + "@babel/plugin-syntax-flow": ["@babel/plugin-syntax-flow@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ajMX6QPcyomotqwpzhkYGxcK2i/us0rs1Qo9QvUpa+Fca0FTmqrzKrctoIYLMxcOhGZldGT/BAVkRGTWBiR8gQ=="], - "@babel/plugin-syntax-import-attributes": ["@babel/plugin-syntax-import-attributes@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw=="], + "@babel/plugin-syntax-import-attributes": ["@babel/plugin-syntax-import-attributes@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg=="], "@babel/plugin-syntax-import-meta": ["@babel/plugin-syntax-import-meta@7.10.4", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="], "@babel/plugin-syntax-json-strings": ["@babel/plugin-syntax-json-strings@7.8.3", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="], - "@babel/plugin-syntax-jsx": ["@babel/plugin-syntax-jsx@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w=="], + "@babel/plugin-syntax-jsx": ["@babel/plugin-syntax-jsx@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A=="], "@babel/plugin-syntax-logical-assignment-operators": ["@babel/plugin-syntax-logical-assignment-operators@7.10.4", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="], @@ -971,119 +1081,119 @@ "@babel/plugin-syntax-top-level-await": ["@babel/plugin-syntax-top-level-await@7.14.5", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="], - "@babel/plugin-syntax-typescript": ["@babel/plugin-syntax-typescript@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A=="], + "@babel/plugin-syntax-typescript": ["@babel/plugin-syntax-typescript@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA=="], "@babel/plugin-transform-arrow-functions": ["@babel/plugin-transform-arrow-functions@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA=="], - "@babel/plugin-transform-async-generator-functions": ["@babel/plugin-transform-async-generator-functions@7.29.0", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-remap-async-to-generator": "^7.27.1", "@babel/traverse": "^7.29.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w=="], + "@babel/plugin-transform-async-generator-functions": ["@babel/plugin-transform-async-generator-functions@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-remap-async-to-generator": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-d98gXZkgswvkyohMBABkhm3GeXhYj8psWfwQ2C7gtfrKGTykQa/iOIi+JJhwMjPlZ6Vm2XN+DCf3Es1EoG4ZLA=="], - "@babel/plugin-transform-async-to-generator": ["@babel/plugin-transform-async-to-generator@7.28.6", "", { "dependencies": { "@babel/helper-module-imports": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-remap-async-to-generator": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g=="], + "@babel/plugin-transform-async-to-generator": ["@babel/plugin-transform-async-to-generator@7.29.7", "", { "dependencies": { "@babel/helper-module-imports": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-remap-async-to-generator": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-pcUb2SS+RMo9TWVBwKGI5ShtoG7R+zBsFmCKDa6fe8c+hPr3XJlZgoE5j6i8W7gDjhyvy+85vmYexanvXh3d1w=="], - "@babel/plugin-transform-block-scoping": ["@babel/plugin-transform-block-scoping@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw=="], + "@babel/plugin-transform-block-scoping": ["@babel/plugin-transform-block-scoping@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ=="], "@babel/plugin-transform-class-properties": ["@babel/plugin-transform-class-properties@7.27.1", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.27.1", "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA=="], - "@babel/plugin-transform-class-static-block": ["@babel/plugin-transform-class-static-block@7.28.6", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.12.0" } }, "sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ=="], + "@babel/plugin-transform-class-static-block": ["@babel/plugin-transform-class-static-block@7.29.7", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.12.0" } }, "sha512-kibJgmEdX2iMwsHY2tSZNDgj8PwIlCQz7FK9KuGKO8zsuoUwSEhoNnNVp/emKWrbY4HeO6kkXfdMqRKKKXBm2A=="], "@babel/plugin-transform-classes": ["@babel/plugin-transform-classes@7.28.4", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-globals": "^7.28.0", "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-replace-supers": "^7.27.1", "@babel/traverse": "^7.28.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA=="], - "@babel/plugin-transform-computed-properties": ["@babel/plugin-transform-computed-properties@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6", "@babel/template": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ=="], + "@babel/plugin-transform-computed-properties": ["@babel/plugin-transform-computed-properties@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/template": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-RK7/IyU5phpuCdBAuig5VkzG/EnbDaui5SQGdU9BFrHdV+mV4cUjLMQ9lJDjLNtWHsqtiefpGZUXQP2BiTYMsA=="], - "@babel/plugin-transform-destructuring": ["@babel/plugin-transform-destructuring@7.28.5", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/traverse": "^7.28.5" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw=="], + "@babel/plugin-transform-destructuring": ["@babel/plugin-transform-destructuring@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg=="], - "@babel/plugin-transform-export-namespace-from": ["@babel/plugin-transform-export-namespace-from@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ=="], + "@babel/plugin-transform-export-namespace-from": ["@babel/plugin-transform-export-namespace-from@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-24B2nOy2TeJSMheqwPD4DDQOV/elLSIlKxjZt4i05H5AgdPdWR3n18HnNrcJ+j76WJd9gbwb9jPjNYUy6RautA=="], - "@babel/plugin-transform-flow-strip-types": ["@babel/plugin-transform-flow-strip-types@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/plugin-syntax-flow": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-G5eDKsu50udECw7DL2AcsysXiQyB7Nfg521t2OAJ4tbfTJ27doHLeF/vlI1NZGlLdbb/v+ibvtL1YBQqYOwJGg=="], + "@babel/plugin-transform-flow-strip-types": ["@babel/plugin-transform-flow-strip-types@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/plugin-syntax-flow": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-wRHeUjUjCZnMHmiO5bRgjFLcoEh7JyTdByOW11ahhwNa4V0bmeGEaIvt51yq0zQp2yWIpqfxXXPyUP6GFJZHOQ=="], - "@babel/plugin-transform-for-of": ["@babel/plugin-transform-for-of@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw=="], + "@babel/plugin-transform-for-of": ["@babel/plugin-transform-for-of@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ=="], - "@babel/plugin-transform-function-name": ["@babel/plugin-transform-function-name@7.27.1", "", { "dependencies": { "@babel/helper-compilation-targets": "^7.27.1", "@babel/helper-plugin-utils": "^7.27.1", "@babel/traverse": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ=="], + "@babel/plugin-transform-function-name": ["@babel/plugin-transform-function-name@7.29.7", "", { "dependencies": { "@babel/helper-compilation-targets": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-otRWaHXE6fbAGkePvaj/kvs3HsqXfPhlnzwSOlnFgbqCPMd975dW+4wZ00WFBt+/YlBGcJwNrARQTOJOb4ZrIg=="], - "@babel/plugin-transform-literals": ["@babel/plugin-transform-literals@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA=="], + "@babel/plugin-transform-literals": ["@babel/plugin-transform-literals@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-DZ/oLP21ZuWx1vKqnoNv6/tvEK48AQOBRai40CX9dTjGluvT/YZCyY3rryDtyUqCEoyNroy5KKPwX2iQCiRvyw=="], - "@babel/plugin-transform-logical-assignment-operators": ["@babel/plugin-transform-logical-assignment-operators@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A=="], + "@babel/plugin-transform-logical-assignment-operators": ["@babel/plugin-transform-logical-assignment-operators@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-A0H91hh6W8MFRkp5TqJmMr39jzGD1A1E1Ysiv2O06Sfbhkapm+XyIzxWCEh5kqwOZ1/8QZ0dY3SeQ7XBqfJd5Q=="], - "@babel/plugin-transform-modules-commonjs": ["@babel/plugin-transform-modules-commonjs@7.28.6", "", { "dependencies": { "@babel/helper-module-transforms": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA=="], + "@babel/plugin-transform-modules-commonjs": ["@babel/plugin-transform-modules-commonjs@7.29.7", "", { "dependencies": { "@babel/helper-module-transforms": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ=="], - "@babel/plugin-transform-named-capturing-groups-regex": ["@babel/plugin-transform-named-capturing-groups-regex@7.29.0", "", { "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.28.5", "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ=="], + "@babel/plugin-transform-named-capturing-groups-regex": ["@babel/plugin-transform-named-capturing-groups-regex@7.29.7", "", { "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-vuFoLwr4qnv2xbZ16SQd6uPcH5FNrLHhk/Jzo++0XJFcaDsr4gjJVg6j398oMHiC+83k/GiBzviwF5KBJkPUtQ=="], "@babel/plugin-transform-nullish-coalescing-operator": ["@babel/plugin-transform-nullish-coalescing-operator@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA=="], - "@babel/plugin-transform-numeric-separator": ["@babel/plugin-transform-numeric-separator@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w=="], + "@babel/plugin-transform-numeric-separator": ["@babel/plugin-transform-numeric-separator@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-zR7fv/z14OjgHl4AgRtkDBvBMhIzCxqV/qN/2BCRC7LjFwvuzjYe7gDWxC4Wl/SNsLM6SE1IWvRPYMgSJaUvNw=="], - "@babel/plugin-transform-object-rest-spread": ["@babel/plugin-transform-object-rest-spread@7.28.6", "", { "dependencies": { "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/plugin-transform-destructuring": "^7.28.5", "@babel/plugin-transform-parameters": "^7.27.7", "@babel/traverse": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA=="], + "@babel/plugin-transform-object-rest-spread": ["@babel/plugin-transform-object-rest-spread@7.29.7", "", { "dependencies": { "@babel/helper-compilation-targets": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/plugin-transform-destructuring": "^7.29.7", "@babel/plugin-transform-parameters": "^7.29.7", "@babel/traverse": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Ld98jn4c0smUywL57m7SgsHq3OpThOa6LqZJif3G6jYOovPleoFhVrBJ1WegRApSFB2wu4+RelAj9AC9G08Z4A=="], - "@babel/plugin-transform-optional-catch-binding": ["@babel/plugin-transform-optional-catch-binding@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ=="], + "@babel/plugin-transform-optional-catch-binding": ["@babel/plugin-transform-optional-catch-binding@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-sLsyndxK2VwX6yNUOakMb7Sh553ZTe/vVM1XJ+9Z5aW1ytsc8xOIwmyk05NNjN60vkc5/KqoTH6hB4V41LJhng=="], "@babel/plugin-transform-optional-chaining": ["@babel/plugin-transform-optional-chaining@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg=="], - "@babel/plugin-transform-parameters": ["@babel/plugin-transform-parameters@7.27.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg=="], + "@babel/plugin-transform-parameters": ["@babel/plugin-transform-parameters@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ZDOBqV/qLYJI0YElr8DcENEyARsFQeESqWXH6gZlghYXuPPjvweuDhP4VyEi4BlUBlLRFZVjxoZDMjxhLW766g=="], - "@babel/plugin-transform-private-methods": ["@babel/plugin-transform-private-methods@7.28.6", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg=="], + "@babel/plugin-transform-private-methods": ["@babel/plugin-transform-private-methods@7.29.7", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-/6Rz4DK1ETDEM/bWHsPHcaEe7ZaT1EqSXjtSP/L0DijOYuaUhiRiOKcwpZ8P7zR4xXEHc2ITdiCgBm9Tpyv9ug=="], - "@babel/plugin-transform-private-property-in-object": ["@babel/plugin-transform-private-property-in-object@7.28.6", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-create-class-features-plugin": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA=="], + "@babel/plugin-transform-private-property-in-object": ["@babel/plugin-transform-private-property-in-object@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-create-class-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-+BNo06dnrzdNNqCm1X6YUaVv0DKk8Q+JYcoZfOkLhYWNCXzlwTSRq8zGWayT1csjcpNXV9CQTBRRbmTLZac5cA=="], - "@babel/plugin-transform-react-display-name": ["@babel/plugin-transform-react-display-name@7.28.0", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA=="], + "@babel/plugin-transform-react-display-name": ["@babel/plugin-transform-react-display-name@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-+1wdDMGNb4UPeY3Q4L5yLiYe6TXPXubs4NjrgRFw13hPRLJfEMw2Q5OXkee6/IfdqePIeW4Jjwe3aBh7SdKz4Q=="], - "@babel/plugin-transform-react-jsx": ["@babel/plugin-transform-react-jsx@7.28.6", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-module-imports": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/plugin-syntax-jsx": "^7.28.6", "@babel/types": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow=="], + "@babel/plugin-transform-react-jsx": ["@babel/plugin-transform-react-jsx@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-module-imports": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/plugin-syntax-jsx": "^7.29.7", "@babel/types": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-WsZulLVBUHXVj2cUcPVx6UE21TpalB6bHbSFErKT0Ib++ax24jjXe73FqlWvdylFOjiuPHYi6VCcgRad1ItN+A=="], - "@babel/plugin-transform-react-jsx-development": ["@babel/plugin-transform-react-jsx-development@7.27.1", "", { "dependencies": { "@babel/plugin-transform-react-jsx": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q=="], + "@babel/plugin-transform-react-jsx-development": ["@babel/plugin-transform-react-jsx-development@7.29.7", "", { "dependencies": { "@babel/plugin-transform-react-jsx": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Xfy3UVMF04+ypnFbkhvfqtmvwfe92qwQdbGZVonhE+6v35GzlofmOnA1szaZqzb9xYWr0nl1e5EMmzi0DNON1g=="], - "@babel/plugin-transform-react-jsx-self": ["@babel/plugin-transform-react-jsx-self@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw=="], + "@babel/plugin-transform-react-jsx-self": ["@babel/plugin-transform-react-jsx-self@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw=="], - "@babel/plugin-transform-react-jsx-source": ["@babel/plugin-transform-react-jsx-source@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw=="], + "@babel/plugin-transform-react-jsx-source": ["@babel/plugin-transform-react-jsx-source@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q=="], - "@babel/plugin-transform-react-pure-annotations": ["@babel/plugin-transform-react-pure-annotations@7.27.1", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.1", "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA=="], + "@babel/plugin-transform-react-pure-annotations": ["@babel/plugin-transform-react-pure-annotations@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-H5E+HBgDpr6Q5t+Aj11tL7XkIui1jhbIoArVQnqjgXo5/3YxkN7ZEBcWF4RQlB0T4rrxJQbXS6kiFV6B7XTqUA=="], - "@babel/plugin-transform-regenerator": ["@babel/plugin-transform-regenerator@7.29.0", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog=="], + "@babel/plugin-transform-regenerator": ["@babel/plugin-transform-regenerator@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw=="], - "@babel/plugin-transform-runtime": ["@babel/plugin-transform-runtime@7.29.0", "", { "dependencies": { "@babel/helper-module-imports": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "babel-plugin-polyfill-corejs2": "^0.4.14", "babel-plugin-polyfill-corejs3": "^0.13.0", "babel-plugin-polyfill-regenerator": "^0.6.5", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-jlaRT5dJtMaMCV6fAuLbsQMSwz/QkvaHOHOSXRitGGwSpR1blCY4KUKoyP2tYO8vJcqYe8cEj96cqSztv3uF9w=="], + "@babel/plugin-transform-runtime": ["@babel/plugin-transform-runtime@7.29.7", "", { "dependencies": { "@babel/helper-module-imports": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "babel-plugin-polyfill-corejs2": "^0.4.14", "babel-plugin-polyfill-corejs3": "^0.13.0", "babel-plugin-polyfill-regenerator": "^0.6.5", "semver": "^6.3.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-xmAscdE/AsqRW7vutbPNoUmu/nF5SrLKPs7aoJgEjo35lLKA/Bc0i2rMv/hr1+Y0o1bQCiVtith3u2vdgRL39Q=="], "@babel/plugin-transform-shorthand-properties": ["@babel/plugin-transform-shorthand-properties@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ=="], - "@babel/plugin-transform-spread": ["@babel/plugin-transform-spread@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA=="], + "@babel/plugin-transform-spread": ["@babel/plugin-transform-spread@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ=="], - "@babel/plugin-transform-sticky-regex": ["@babel/plugin-transform-sticky-regex@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g=="], + "@babel/plugin-transform-sticky-regex": ["@babel/plugin-transform-sticky-regex@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-BCHzNYJGe9l7EpwwDBN/ztlL2NYFFq8hp9ddjtUEM9f2O7S7kKV/lL6Fwo7IF7NSkYhPK2vO+86nIGltA90MsA=="], "@babel/plugin-transform-template-literals": ["@babel/plugin-transform-template-literals@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg=="], - "@babel/plugin-transform-typescript": ["@babel/plugin-transform-typescript@7.28.6", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-create-class-features-plugin": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", "@babel/plugin-syntax-typescript": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-0YWL2RFxOqEm9Efk5PvreamxPME8OyY0wM5wh5lHjF+VtVhdneCWGzZeSqzOfiobVqQaNCd2z0tQvnI9DaPWPw=="], + "@babel/plugin-transform-typescript": ["@babel/plugin-transform-typescript@7.29.7", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.29.7", "@babel/helper-create-class-features-plugin": "^7.29.7", "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", "@babel/plugin-syntax-typescript": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw=="], "@babel/plugin-transform-unicode-regex": ["@babel/plugin-transform-unicode-regex@7.27.1", "", { "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.27.1", "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw=="], - "@babel/preset-react": ["@babel/preset-react@7.28.5", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-validator-option": "^7.27.1", "@babel/plugin-transform-react-display-name": "^7.28.0", "@babel/plugin-transform-react-jsx": "^7.27.1", "@babel/plugin-transform-react-jsx-development": "^7.27.1", "@babel/plugin-transform-react-pure-annotations": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-Z3J8vhRq7CeLjdC58jLv4lnZ5RKFUJWqH5emvxmv9Hv3BD1T9R/Im713R4MTKwvFaV74ejZ3sM01LyEKk4ugNQ=="], + "@babel/preset-react": ["@babel/preset-react@7.29.7", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", "@babel/helper-validator-option": "^7.29.7", "@babel/plugin-transform-react-display-name": "^7.29.7", "@babel/plugin-transform-react-jsx": "^7.29.7", "@babel/plugin-transform-react-jsx-development": "^7.29.7", "@babel/plugin-transform-react-pure-annotations": "^7.29.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-C+PV1TFUPTmBQGoPBL8j2QmLpZ117YTCwxIZeJOM96GbYMFSc7/pOXU5lVykwnZxyTqQxRsvoRk6f2FktZgGHA=="], "@babel/preset-typescript": ["@babel/preset-typescript@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-validator-option": "^7.27.1", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-transform-modules-commonjs": "^7.27.1", "@babel/plugin-transform-typescript": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ=="], - "@babel/runtime": ["@babel/runtime@7.29.2", "", {}, "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g=="], + "@babel/runtime": ["@babel/runtime@7.29.7", "", {}, "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw=="], - "@babel/runtime-corejs3": ["@babel/runtime-corejs3@7.29.2", "", { "dependencies": { "core-js-pure": "^3.48.0" } }, "sha512-Lc94FOD5+0aXhdb0Tdg3RUtqT6yWbI/BbFWvlaSJ3gAb9Ks+99nHRDKADVqC37er4eCB0fHyWT+y+K3QOvJKbw=="], + "@babel/runtime-corejs3": ["@babel/runtime-corejs3@7.29.7", "", { "dependencies": { "core-js-pure": "^3.48.0" } }, "sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ=="], - "@babel/template": ["@babel/template@7.28.6", "", { "dependencies": { "@babel/code-frame": "^7.28.6", "@babel/parser": "^7.28.6", "@babel/types": "^7.28.6" } }, "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ=="], + "@babel/template": ["@babel/template@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/types": "^7.29.7" } }, "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg=="], - "@babel/traverse": ["@babel/traverse@7.29.0", "", { "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.29.0", "@babel/template": "^7.28.6", "@babel/types": "^7.29.0", "debug": "^4.3.1" } }, "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA=="], + "@babel/traverse": ["@babel/traverse@7.29.7", "", { "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", "@babel/helper-globals": "^7.29.7", "@babel/parser": "^7.29.7", "@babel/template": "^7.29.7", "@babel/types": "^7.29.7", "debug": "^4.3.1" } }, "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw=="], - "@babel/types": ["@babel/types@7.29.0", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A=="], + "@babel/types": ["@babel/types@7.29.7", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA=="], "@bcoe/v8-coverage": ["@bcoe/v8-coverage@1.0.2", "", {}, "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA=="], - "@better-auth/core": ["@better-auth/core@1.6.9", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.39.0", "@standard-schema/spec": "^1.1.0", "zod": "^4.3.6" }, "peerDependencies": { "@better-auth/utils": "0.4.0", "@better-fetch/fetch": "1.1.21", "@cloudflare/workers-types": ">=4", "@opentelemetry/api": "^1.9.0", "better-call": "1.3.5", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1" }, "optionalPeers": ["@cloudflare/workers-types", "@opentelemetry/api"] }, "sha512-ADFk5pwmLybmc+LvYvXJ6M1x2oY/EyYLkwLuH0x28FUq12DfjL0wnE7g+WRDf3yozDO+qIxTpFGXDGwLKbfz0w=="], + "@better-auth/core": ["@better-auth/core@1.6.13", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.39.0", "@standard-schema/spec": "^1.1.0", "zod": "^4.3.6" }, "peerDependencies": { "@better-auth/utils": "0.4.1", "@better-fetch/fetch": "1.1.21", "@cloudflare/workers-types": ">=4", "@opentelemetry/api": "^1.9.0", "better-call": "1.3.5", "jose": "^6.1.0", "kysely": "^0.28.5 || ^0.29.0", "nanostores": "^1.0.1" }, "optionalPeers": ["@cloudflare/workers-types", "@opentelemetry/api"] }, "sha512-3YNjiLUmlNt5T9qQ/weu0tZgGgXDSYax4EE/uLUBIBBGtQI9Q3KdEnO6tfPgDedborcSE1bIspuAIaHpaHwxZQ=="], - "@better-auth/drizzle-adapter": ["@better-auth/drizzle-adapter@1.6.9", "", { "peerDependencies": { "@better-auth/core": "^1.6.9", "@better-auth/utils": "0.4.0", "drizzle-orm": "^0.45.2" }, "optionalPeers": ["drizzle-orm"] }, "sha512-Lcco5hOGrMgc4XKAkvB6x72eQm4wCcya8IevMg4wBHY9W9GVg8pu23rpRX6VsVQSO4Ux13S7lFwUWtF7/r9aKw=="], + "@better-auth/drizzle-adapter": ["@better-auth/drizzle-adapter@1.6.13", "", { "peerDependencies": { "@better-auth/core": "^1.6.13", "@better-auth/utils": "0.4.1", "drizzle-orm": "^0.45.2" }, "optionalPeers": ["drizzle-orm"] }, "sha512-0V6e+e7TnIZZDjhQP/tvAberSrdrf5yfbDSx5oDFsfI5MCh2ATvbuTPNxGWbLdbGnUYfbX4K9FZwzKMj8RpLmg=="], - "@better-auth/expo": ["@better-auth/expo@1.6.9", "", { "dependencies": { "@better-fetch/fetch": "1.1.21", "better-call": "1.3.5", "zod": "^4.3.6" }, "peerDependencies": { "@better-auth/core": "^1.6.9", "better-auth": "^1.6.9", "expo-constants": ">=17.0.0", "expo-linking": ">=7.0.0", "expo-network": ">=8.0.7", "expo-web-browser": ">=14.0.0" }, "optionalPeers": ["expo-constants", "expo-linking", "expo-network", "expo-web-browser"] }, "sha512-ch8DRTAWvnn4k1mFvLxi5h9+pg/KWYXJEZ2XANXtdPp84H3qA0mxzFQ//OIuKxm0Ohuubc7WNQD1IsVlKP4/ew=="], + "@better-auth/expo": ["@better-auth/expo@1.6.13", "", { "dependencies": { "@better-fetch/fetch": "1.1.21", "better-call": "1.3.5", "zod": "^4.3.6" }, "peerDependencies": { "@better-auth/core": "^1.6.13", "better-auth": "^1.6.13", "expo-constants": ">=17.0.0", "expo-linking": ">=7.0.0", "expo-network": ">=8.0.7", "expo-web-browser": ">=14.0.0" }, "optionalPeers": ["expo-constants", "expo-linking", "expo-network", "expo-web-browser"] }, "sha512-VkWC8hMkBjs/gOjP5jtoM8cWrNzn7VA5KDhp+jrS9CaXZNMK9Kptb0sL/8mXySbGQByfX6Sd3W6S010DY8h1YA=="], - "@better-auth/kysely-adapter": ["@better-auth/kysely-adapter@1.6.9", "", { "peerDependencies": { "@better-auth/core": "^1.6.9", "@better-auth/utils": "0.4.0", "kysely": "^0.28.14" }, "optionalPeers": ["kysely"] }, "sha512-gyjuuxJtZ4o9G9z9q4kqn24X2kvMSp7F+KHogYxF03SnXY/2WleAcuj57iC4wP3e9mGDbjPOrnM5K6Kr3Ktdpw=="], + "@better-auth/kysely-adapter": ["@better-auth/kysely-adapter@1.6.13", "", { "peerDependencies": { "@better-auth/core": "^1.6.13", "@better-auth/utils": "0.4.1", "kysely": "^0.28.17 || ^0.29.0" }, "optionalPeers": ["kysely"] }, "sha512-r+TeBL9dJecuCaSMqL3106qwaXYL3GAkoJDfmtbZ2eZ/Ejr9xVj5msJnSULb0ZqyQ1g5SCbnM39WZaCOFirziQ=="], - "@better-auth/memory-adapter": ["@better-auth/memory-adapter@1.6.9", "", { "peerDependencies": { "@better-auth/core": "^1.6.9", "@better-auth/utils": "0.4.0" } }, "sha512-XmIG4tUnOXZ+KEcWjHUjOI9Z5donD09dC2t/AQTXifAUIqx7cySg86w0KTM09ArzAxRx1fCqO36Wkt5nULnrkQ=="], + "@better-auth/memory-adapter": ["@better-auth/memory-adapter@1.6.13", "", { "peerDependencies": { "@better-auth/core": "^1.6.13", "@better-auth/utils": "0.4.1" } }, "sha512-upmNncEwm9Q0MpWLVOdx9Pe3fU/aqobO80zwI+WVCavxmL59SufW5Ud7194/J5ushw4Dd52XNn0XWPJT1ZUThg=="], - "@better-auth/mongo-adapter": ["@better-auth/mongo-adapter@1.6.9", "", { "peerDependencies": { "@better-auth/core": "^1.6.9", "@better-auth/utils": "0.4.0", "mongodb": "^6.0.0 || ^7.0.0" }, "optionalPeers": ["mongodb"] }, "sha512-h+AiRJ/TsBSi+ZDjySASBpbJ/9QCXBre34PSKgCz7QmTHrFM9Cg2EM4AM7LjR5lPXipEE+2rWPBc9wfnUBjhcw=="], + "@better-auth/mongo-adapter": ["@better-auth/mongo-adapter@1.6.13", "", { "peerDependencies": { "@better-auth/core": "^1.6.13", "@better-auth/utils": "0.4.1", "mongodb": "^6.0.0 || ^7.0.0" }, "optionalPeers": ["mongodb"] }, "sha512-u0g5KThZQInx4QxsaXDJ+Yg5A9z/ia/3EBwi+gI7+kSTKkeT9PZZ6J+erwJ5Sh4d0JUQsEX2DX2YRsg/mYnXWQ=="], - "@better-auth/prisma-adapter": ["@better-auth/prisma-adapter@1.6.9", "", { "peerDependencies": { "@better-auth/core": "^1.6.9", "@better-auth/utils": "0.4.0", "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0", "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0" }, "optionalPeers": ["@prisma/client", "prisma"] }, "sha512-XHks01ntK20orqK/jICq8wmEbJ/zT6dct49Fk8zTQKN9QNGDc+Ix5+7z/Kvui0DXGFf790GfvRozquzaLtXa8Q=="], + "@better-auth/prisma-adapter": ["@better-auth/prisma-adapter@1.6.13", "", { "peerDependencies": { "@better-auth/core": "^1.6.13", "@better-auth/utils": "0.4.1", "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0", "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0" }, "optionalPeers": ["@prisma/client", "prisma"] }, "sha512-gjmUIdqmxWb4WoNEN5rTQYQli6A9fPopAaVDiLh/gwO3ET10/PuOEwfESePEwUbArlKLLK3hPEWWe0RBojyxgQ=="], - "@better-auth/telemetry": ["@better-auth/telemetry@1.6.9", "", { "peerDependencies": { "@better-auth/core": "^1.6.9", "@better-auth/utils": "0.4.0", "@better-fetch/fetch": "1.1.21" } }, "sha512-0u5zkhSCAQFoN3DHvUkLHOF6MBbVTDAa6mU8mhPwiysdz1x21vMzhzfaAKN/ZGWaQ09v91/F+2qu42G/bhUV4A=="], + "@better-auth/telemetry": ["@better-auth/telemetry@1.6.13", "", { "peerDependencies": { "@better-auth/core": "^1.6.13", "@better-auth/utils": "0.4.1", "@better-fetch/fetch": "1.1.21" } }, "sha512-CXfPPL55mZrGH1FUhZOw9REp2WRJoVjCh9egn+cIx3ReB/OnPz+eHSRft/IVLD2PQyP1FNr1Au89SXd2oPBUPg=="], - "@better-auth/utils": ["@better-auth/utils@0.4.0", "", { "dependencies": { "@noble/hashes": "^2.0.1" } }, "sha512-RpMtLUIQAEWMgdPLNVbIF5ON2mm+CH0U3rCdUCU1VyeAUui4m38DyK7/aXMLZov2YDjG684pS1D0MBllrmgjQA=="], + "@better-auth/utils": ["@better-auth/utils@0.4.1", "", { "dependencies": { "@noble/hashes": "^2.0.1" } }, "sha512-SZBPRPF3z0nBvE5ygOkxae35wnnXPRShmqFo78S+qslLeFoPu/pMgnXAuNKFMMybac3tiLaVg1e3MQW5MC+1iA=="], "@better-fetch/fetch": ["@better-fetch/fetch@1.1.21", "", {}, "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="], @@ -1115,31 +1225,31 @@ "@cloudflare/containers": ["@cloudflare/containers@0.0.30", "", {}, "sha512-i148xBgmyn/pje82ZIyuTr/Ae0BT/YWwa1/GTJcw6DxEjUHAzZLaBCiX446U9OeuJ2rBh/L/9FIzxX5iYNt1AQ=="], - "@cloudflare/kv-asset-handler": ["@cloudflare/kv-asset-handler@0.4.2", "", {}, "sha512-SIOD2DxrRRwQ+jgzlXCqoEFiKOFqaPjhnNTGKXSRLvp1HiOvapLaFG2kEr9dYQTYe8rKrd9uvDUzmAITeNyaHQ=="], + "@cloudflare/kv-asset-handler": ["@cloudflare/kv-asset-handler@0.5.0", "", {}, "sha512-jxQYkj8dSIzc0cD6cMMNdOc1UVjqSqu8BZdor5s8cGjW2I8BjODt/kWPVdY+u9zj3ms75Q5qaZgnxUad83+eAg=="], "@cloudflare/unenv-preset": ["@cloudflare/unenv-preset@2.16.1", "", { "peerDependencies": { "unenv": "2.0.0-rc.24", "workerd": ">1.20260305.0 <2.0.0-0" }, "optionalPeers": ["workerd"] }, "sha512-ECxObrMfyTl5bhQf/lZCXwo5G6xX9IAUo+nDMKK4SZ8m4Jvvxp52vilxyySSWh2YTZz8+HQ07qGH/2rEom1vDw=="], "@cloudflare/vitest-pool-workers": ["@cloudflare/vitest-pool-workers@0.8.71", "", { "dependencies": { "birpc": "0.2.14", "cjs-module-lexer": "^1.2.3", "devalue": "^5.3.2", "miniflare": "4.20250906.0", "semver": "^7.7.1", "wrangler": "4.35.0", "zod": "^3.22.3" }, "peerDependencies": { "@vitest/runner": "2.0.x - 3.2.x", "@vitest/snapshot": "2.0.x - 3.2.x", "vitest": "2.0.x - 3.2.x" } }, "sha512-keu2HCLQfRNwbmLBCDXJgCFpANTaYnQpE01fBOo4CNwiWHUT7SZGN7w64RKiSWRHyYppStXBuE5Ng7F42+flpg=="], - "@cloudflare/workerd-darwin-64": ["@cloudflare/workerd-darwin-64@1.20260424.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-yFR1XaJbSDLg/qbwtrYaU2xwFXatIPKR5nrMQCN1q/m6+Qe/j6r+kCnFEvOJjMZOm9iCKsE6Qly5clgl4u32qw=="], + "@cloudflare/workerd-darwin-64": ["@cloudflare/workerd-darwin-64@1.20260526.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-/pR3GH3gfv0PUp7DjI8v0aAIDOqFwibq4bg5xT7TZgcVdBV/cJQWckdXCMqiRtHiawLwogUX00EIOINkYJ1Zqg=="], - "@cloudflare/workerd-darwin-arm64": ["@cloudflare/workerd-darwin-arm64@1.20260424.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LqWKcE7x/9KyC2iQvKPeb20hKST3dYXDZlYTvFymgR1DfLS0OFOCzVGTloVNd7WqvK4SkdzBYfxo7QMIAeBK0w=="], + "@cloudflare/workerd-darwin-arm64": ["@cloudflare/workerd-darwin-arm64@1.20260526.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-rcyu0iANYfaiezKh3Mcao1O4IIgVfQldxduiL5TZT1sP0NIeRY4YReSTrzPxNnXxSYaIqaqRHMcHbUM/ic4knA=="], - "@cloudflare/workerd-linux-64": ["@cloudflare/workerd-linux-64@1.20260424.1", "", { "os": "linux", "cpu": "x64" }, "sha512-YlEBFbAYZHe/ylzl8WEYQEU/jr+0XMqXaST2oBk5oVjksdb1NGuJaggluCdZAzuJJ8UqdTmyhY5u/qrasbiFWA=="], + "@cloudflare/workerd-linux-64": ["@cloudflare/workerd-linux-64@1.20260526.1", "", { "os": "linux", "cpu": "x64" }, "sha512-5EZAEnlLwa9oGJRo8Nd3iY5Wcd9ROGNNG90xNIGp8MEjj8v2jTn42NC47fCZKFdnLj3+S+vWEhu1x0GVJnALjA=="], - "@cloudflare/workerd-linux-arm64": ["@cloudflare/workerd-linux-arm64@1.20260424.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-qJ0X0m6cL8fWDUPDg8K4IxYZXNJI6XbeOihqjnqKbAClrjdPDn8VUSd+z2XiCQ5NylMtMrpa/skC9UfaR6mh8g=="], + "@cloudflare/workerd-linux-arm64": ["@cloudflare/workerd-linux-arm64@1.20260526.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-X/YBQXeXFeCN7QTStoWrATEBc9WKl7PIqkw/dQkjyJ72gh3rkLe0+Xkzp3wO7gtxTDQMa7NPGy1W4+sdMf8q1g=="], - "@cloudflare/workerd-windows-64": ["@cloudflare/workerd-windows-64@1.20260424.1", "", { "os": "win32", "cpu": "x64" }, "sha512-tZ7Z9qmYNAP6z1/+8r/zKbk8F8DZmpmwNzMeN+zkde2Wnhfr3FBqOkJXT/5zmli8HPoWrIXxSiyqcNDMy8V2Zg=="], + "@cloudflare/workerd-windows-64": ["@cloudflare/workerd-windows-64@1.20260526.1", "", { "os": "win32", "cpu": "x64" }, "sha512-R+tqpFFdcfZIljx8fIW9rj9fRTtDgfoA2yonsfAGa6e8snrmr+38mdFHtkRC0D3UyZpn/hOtmXiUBfdX2gMR7Q=="], "@cloudflare/workers-oauth-provider": ["@cloudflare/workers-oauth-provider@0.4.0", "", {}, "sha512-UtbV8hjC2NloB+Ds6J6v/9HiG8rx8MbdeYGCyFwOACT5vANWzDL6SKo3W5UZymsXiameAgC7jAmtUx4cc+Qpaw=="], - "@cloudflare/workers-types": ["@cloudflare/workers-types@4.20260425.1", "", {}, "sha512-f6dlo3SsA+TNqjveavPDN73nxRfCOOd0iMdf8iEosgR/RJtQlrGwfr5L5Vf7x/5cpeeguxScKevuaMmdjpOECw=="], + "@cloudflare/workers-types": ["@cloudflare/workers-types@4.20260601.1", "", {}, "sha512-pYORr1EKlDu55HCHhln8XSXoOSvKAkrTkovJL66bX8xw6DAT2fhs39B6FLjCJD+x++hjBEE2bmKB1TcFKS+0Dw=="], "@colors/colors": ["@colors/colors@1.5.0", "", {}, "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="], "@cspotcode/source-map-support": ["@cspotcode/source-map-support@0.8.1", "", { "dependencies": { "@jridgewell/trace-mapping": "0.3.9" } }, "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="], - "@date-fns/tz": ["@date-fns/tz@1.4.1", "", {}, "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA=="], + "@date-fns/tz": ["@date-fns/tz@1.5.0", "", {}, "sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg=="], "@dependents/detective-less": ["@dependents/detective-less@5.0.3", "", { "dependencies": { "gonzales-pe": "^4.3.0", "node-source-walk": "^7.0.1" } }, "sha512-v6oD9Ukp+N7V4n6p5I/+mM5fIohSfkrDSGlFm5w/pYmchvbk+sMIHsLxrFJ5Lnujewj1BzWL0K84d88lwZAMQA=="], @@ -1245,15 +1355,15 @@ "@eslint/js": ["@eslint/js@8.57.1", "", {}, "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q=="], - "@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.34", "", {}, "sha512-PdwETUhvu1gHF1e8eIyEHnBJLq/dRNoTrT5yhsGUfGyRxH5pbm54dF3+QPknxwMKj0M1trN7PSelYz+yzlt3lA=="], + "@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.38", "", {}, "sha512-IJkBtN1o8u9BW5fvSii1MyHPQ7Q0HxbWcVBvOrOzgMLpVtZw7R2w94wBTVR7kZwv3w1JNTESMmLA5Sqn1+Z36A=="], - "@expo/cli": ["@expo/cli@55.0.29", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/config": "~55.0.16", "@expo/config-plugins": "~55.0.8", "@expo/devcert": "^1.2.1", "@expo/env": "~2.1.2", "@expo/image-utils": "^0.8.14", "@expo/json-file": "^10.0.14", "@expo/log-box": "55.0.12", "@expo/metro": "~55.1.1", "@expo/metro-config": "~55.0.20", "@expo/osascript": "^2.4.3", "@expo/package-manager": "^1.10.5", "@expo/plist": "^0.5.3", "@expo/prebuild-config": "^55.0.17", "@expo/require-utils": "^55.0.5", "@expo/router-server": "^55.0.16", "@expo/schema-utils": "^55.0.4", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.4.0", "@react-native/dev-middleware": "0.83.6", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "dnssd-advertise": "^1.1.4", "expo-server": "^55.0.9", "fetch-nodeshim": "^0.4.10", "getenv": "^2.0.0", "glob": "^13.0.0", "lan-network": "^0.2.1", "multitars": "^1.0.0", "node-forge": "^1.3.3", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^4.0.3", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "resolve-from": "^5.0.0", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "terminal-link": "^2.1.1", "toqr": "^0.1.1", "wrap-ansi": "^7.0.0", "ws": "^8.12.1", "zod": "^3.25.76" }, "peerDependencies": { "expo": "*", "expo-router": "*", "react-native": "*" }, "optionalPeers": ["expo-router", "react-native"], "bin": { "expo-internal": "build/bin/cli" } }, "sha512-r2dXQ82e/3nwxS7faLRL6HBD8UWDo/IyptQ0Vg6Z5Bgyp2Kd24h8xPn3RHfY3LLJ3wfEXglf4E79/Dqkm1Z6WA=="], + "@expo/cli": ["@expo/cli@55.0.32", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/config": "~55.0.17", "@expo/config-plugins": "~55.0.10", "@expo/devcert": "^1.2.1", "@expo/env": "~2.1.2", "@expo/image-utils": "^0.8.14", "@expo/json-file": "^10.0.15", "@expo/log-box": "55.0.12", "@expo/metro": "~55.1.1", "@expo/metro-config": "~55.0.23", "@expo/osascript": "^2.4.4", "@expo/package-manager": "^1.10.5", "@expo/plist": "^0.5.4", "@expo/prebuild-config": "^55.0.18", "@expo/require-utils": "^55.0.5", "@expo/router-server": "^55.0.18", "@expo/schema-utils": "^55.0.4", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.4.0", "@react-native/dev-middleware": "0.83.6", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "dnssd-advertise": "^1.1.4", "expo-server": "^55.0.11", "fetch-nodeshim": "^0.4.10", "getenv": "^2.0.0", "glob": "^13.0.0", "lan-network": "^0.2.1", "multitars": "^1.0.0", "node-forge": "^1.3.3", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^4.0.3", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "resolve-from": "^5.0.0", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "terminal-link": "^2.1.1", "toqr": "^0.1.1", "wrap-ansi": "^7.0.0", "ws": "^8.12.1", "zod": "^3.25.76" }, "peerDependencies": { "expo": "*", "expo-router": "*", "react-native": "*" }, "optionalPeers": ["expo-router", "react-native"], "bin": { "expo-internal": "build/bin/cli" } }, "sha512-fq+/yUYBVw5ZudT4igNyJ3WaF17R39iS7EZlrkfHkLI7Y1kmUlivabwKviLoAfepJOKjKODKpViti9EPfmG3SQ=="], "@expo/code-signing-certificates": ["@expo/code-signing-certificates@0.0.6", "", { "dependencies": { "node-forge": "^1.3.3" } }, "sha512-iNe0puxwBNEcuua9gmTGzq+SuMDa0iATai1FlFTMHJ/vUmKvN/V//drXoLJkVb5i5H3iE/n/qIJxyoBnXouD0w=="], - "@expo/config": ["@expo/config@55.0.16", "", { "dependencies": { "@expo/config-plugins": "~55.0.8", "@expo/config-types": "^55.0.5", "@expo/json-file": "^10.0.14", "@expo/require-utils": "^55.0.5", "deepmerge": "^4.3.1", "getenv": "^2.0.0", "glob": "^13.0.0", "resolve-workspace-root": "^2.0.0", "semver": "^7.6.0", "slugify": "^1.3.4" } }, "sha512-H5dpQv5TfyZDNheZAWO3SmP10diGWZwN5QOUsArkDJih0QKNtahQBOmrV2xbhgln/nrUGoy41U/ZIY/MEx63Ug=="], + "@expo/config": ["@expo/config@55.0.17", "", { "dependencies": { "@expo/config-plugins": "~55.0.9", "@expo/config-types": "^55.0.5", "@expo/json-file": "^10.0.14", "@expo/require-utils": "^55.0.5", "deepmerge": "^4.3.1", "getenv": "^2.0.0", "glob": "^13.0.0", "resolve-workspace-root": "^2.0.0", "semver": "^7.6.0", "slugify": "^1.3.4" } }, "sha512-Y3VaRg7Jllg3MhlUOTQqHm6/dttsqcjYlnS9enhAllZvPUpTHnRA4YPETtUZlxkdMJy6y3UZe986pd/KfJ6OTg=="], - "@expo/config-plugins": ["@expo/config-plugins@55.0.8", "", { "dependencies": { "@expo/config-types": "^55.0.5", "@expo/json-file": "~10.0.13", "@expo/plist": "^0.5.2", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^2.0.0", "glob": "^13.0.0", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-8WfWTRntTCcowfOS+tHdB0z98gKetTwktg4G5TWkCkXVa8Jt1NUnvzaaU4UHk2vbR2U4N84RyZJFizSwfF6C9g=="], + "@expo/config-plugins": ["@expo/config-plugins@55.0.10", "", { "dependencies": { "@expo/config-types": "^55.0.5", "@expo/json-file": "~10.0.15", "@expo/plist": "^0.5.4", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^2.0.0", "glob": "^13.0.0", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-1txnRnMLIO5lM/Of/VyvDkCwZap0YFvCyfSTIlUQamhwhx6Rh7r8TXfcIstaDYUQ7X6GTMkNxLXWbcYS6ZAFDw=="], "@expo/config-types": ["@expo/config-types@55.0.5", "", {}, "sha512-sCmSUZG4mZ/ySXvfyyBdhjivz8Q539X1NondwDdYG7s3SBsk+wsgPJzYsqgAG/P9+l0xWjUD2F+kQ1cAJ6NNLg=="], @@ -1269,37 +1379,37 @@ "@expo/image-utils": ["@expo/image-utils@0.8.14", "", { "dependencies": { "@expo/require-utils": "^55.0.5", "@expo/spawn-async": "^1.7.2", "chalk": "^4.0.0", "getenv": "^2.0.0", "jimp-compact": "0.16.1", "parse-png": "^2.1.0", "semver": "^7.6.0" } }, "sha512-5Sn+jG4Cw+shC2wDMXoqSAJnvERbiwzHn05FpWtD5IBflfTIs5gUmjzwiGVyjOdlMSQhgRrw/AymPbmO9h9mpQ=="], - "@expo/json-file": ["@expo/json-file@10.0.14", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "json5": "^2.2.3" } }, "sha512-yWwBFywFv+SxkJp/pIzzA416JVYflNUh7pqQzgaA6nXDqRyK7KfrqVzk8PdUfDnqbBcaZZxpzNssfQZzp5KHrA=="], + "@expo/json-file": ["@expo/json-file@10.2.0", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "json5": "^2.2.3" } }, "sha512-S6XzKe3R9GQeHiUPXc3xJjOv2VJhOEwFYf7xdC2z2cUqt3kZJ9mSO877sNQloVdnW/SUCtPY3bexlM7nwq+CAQ=="], - "@expo/local-build-cache-provider": ["@expo/local-build-cache-provider@55.0.12", "", { "dependencies": { "@expo/config": "~55.0.16", "chalk": "^4.1.2" } }, "sha512-Wqhe7ajt6lyIEQvqDC1zm0MQ1RqQLlM9awCepY9pz+tm9rvhuxGPZTSddWeD8k4kolinBlDbLDFnNi06XgaDWQ=="], + "@expo/local-build-cache-provider": ["@expo/local-build-cache-provider@55.0.13", "", { "dependencies": { "@expo/config": "~55.0.17", "chalk": "^4.1.2" } }, "sha512-Vg5BE10UL+0yg3BVtIeiSoeHU31Qe1m3UxhBPS478ACY1zzKuxZE30x2sym/B2OIWypjmPzXDRt8J9TOGFuFNw=="], "@expo/log-box": ["@expo/log-box@55.0.12", "", { "dependencies": { "@expo/dom-webview": "^55.0.6", "anser": "^1.4.9", "stacktrace-parser": "^0.1.10" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-f9ARS8J60cq3LLNdIqmUjYwyerBzVS5Ecp7KjIf3GOIPjW0571rkcwLz4/U18l/1DeSkSzIkYsNl2TC9oTdWaQ=="], "@expo/metro": ["@expo/metro@55.1.1", "", { "dependencies": { "metro": "0.83.7", "metro-babel-transformer": "0.83.7", "metro-cache": "0.83.7", "metro-cache-key": "0.83.7", "metro-config": "0.83.7", "metro-core": "0.83.7", "metro-file-map": "0.83.7", "metro-minify-terser": "0.83.7", "metro-resolver": "0.83.7", "metro-runtime": "0.83.7", "metro-source-map": "0.83.7", "metro-symbolicate": "0.83.7", "metro-transform-plugins": "0.83.7", "metro-transform-worker": "0.83.7" } }, "sha512-/wfXo5hTuAVpVLG/4hzlmD9NBGJkzkmBEMm/4VICajYRbj7y8OmqqPWbbymzHiBiHB6tI9BnsyXpQM6zVZEECg=="], - "@expo/metro-config": ["@expo/metro-config@55.0.20", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "@babel/core": "^7.20.0", "@babel/generator": "^7.20.5", "@expo/config": "~55.0.16", "@expo/env": "~2.1.2", "@expo/json-file": "~10.0.14", "@expo/metro": "~55.1.1", "@expo/spawn-async": "^1.7.2", "browserslist": "^4.25.0", "chalk": "^4.1.0", "debug": "^4.3.2", "getenv": "^2.0.0", "glob": "^13.0.0", "hermes-parser": "^0.32.0", "jsc-safe-url": "^0.2.4", "lightningcss": "^1.30.1", "picomatch": "^4.0.3", "postcss": "~8.4.32", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*" }, "optionalPeers": ["expo"] }, "sha512-dUv0simEyPbN2wbOjI+BdEZyXdghgCZD0+3rrA1WxXZN1lRofUx6g2+Nik2Qg61v/BXFrCTh8reYEzQPzHOhdQ=="], + "@expo/metro-config": ["@expo/metro-config@55.0.23", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "@babel/core": "^7.20.0", "@babel/generator": "^7.20.5", "@expo/config": "~55.0.17", "@expo/env": "~2.1.2", "@expo/json-file": "~10.0.15", "@expo/metro": "~55.1.1", "@expo/spawn-async": "^1.7.2", "browserslist": "^4.25.0", "chalk": "^4.1.0", "debug": "^4.3.2", "getenv": "^2.0.0", "glob": "^13.0.0", "hermes-parser": "^0.32.0", "jsc-safe-url": "^0.2.4", "lightningcss": "^1.30.1", "picomatch": "^4.0.3", "postcss": "^8.5.14", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*" }, "optionalPeers": ["expo"] }, "sha512-Mkw3Ss/1LFlafH3iie3r9E13yKMyJgZqGTEkGviGf6LYp51eY5fR8ATbXrNsH69wVc2z+ty4lT/8lEA18YJv7g=="], - "@expo/metro-runtime": ["@expo/metro-runtime@55.0.10", "", { "dependencies": { "@expo/log-box": "55.0.11", "anser": "^1.4.9", "pretty-format": "^29.7.0", "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-dom": "*", "react-native": "*" }, "optionalPeers": ["react-dom"] }, "sha512-7v+ldTvMWRa1ml83Jel9W2f8qT/NZZWrlHaEjf29nb72JTEO50+Xac9PWLo+X3LCDAAuyYuBGKYXOJwfqxV0fQ=="], + "@expo/metro-runtime": ["@expo/metro-runtime@55.0.11", "", { "dependencies": { "@expo/log-box": "55.0.12", "anser": "^1.4.9", "pretty-format": "^29.7.0", "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-dom": "*", "react-native": "*" }, "optionalPeers": ["react-dom"] }, "sha512-4KKi/jGrIEXi2YGu0hYTVr0CEeRJy5SXbCrz9+KDZkuD3ROwKNpM1DBawni5rhPVovFnR323HBck9GaxhnfrRw=="], - "@expo/osascript": ["@expo/osascript@2.4.3", "", { "dependencies": { "@expo/spawn-async": "^1.7.2" } }, "sha512-wbuj3EebM7W9hN/Wp4xTzKd6rQ2zKJzAxkFxkOOwyysLp0HOAgQ4/5RINyoS241pZUX2rUHq7mAJ7pcCQ8U0Ow=="], + "@expo/osascript": ["@expo/osascript@2.6.0", "", { "dependencies": { "@expo/spawn-async": "^1.8.0" } }, "sha512-QvqDBlJXa8CS2vRORJ4wEflY1m0vVI07uSJdIRgBrLxRPBcsrXxrtU7+wXRXMqfq9zLwNP9XbvRsXF2omoDylg=="], - "@expo/package-manager": ["@expo/package-manager@1.10.5", "", { "dependencies": { "@expo/json-file": "^10.0.14", "@expo/spawn-async": "^1.7.2", "chalk": "^4.0.0", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "resolve-workspace-root": "^2.0.0" } }, "sha512-nCP9Mebfl3jvOr0/P6VAuyah6PAtun+aihIL2zAtuE8uSe94JWkVZ7051i0MUVO+y3gFpBqnr8IIH5ch+VJjHA=="], + "@expo/package-manager": ["@expo/package-manager@1.12.1", "", { "dependencies": { "@expo/json-file": "^10.2.0", "@expo/spawn-async": "^1.8.0", "chalk": "^4.0.0", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "resolve-workspace-root": "^2.0.0" } }, "sha512-fQLiFAcFRWF53mtuLK32SUJQ1ahhrTcBZPZPedYTiUT5ha5FF+UO6bPtCc0Y/hgj0/m3HCGBAuSHjbg2kI9oPQ=="], - "@expo/plist": ["@expo/plist@0.5.2", "", { "dependencies": { "@xmldom/xmldom": "^0.8.8", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-o4xdVdBpe4aTl3sPMZ2u3fJH4iG1I768EIRk1xRZP+GaFI93MaR3JvoFibYqxeTmLQ1p1kNEVqylfUjezxx45g=="], + "@expo/plist": ["@expo/plist@0.5.4", "", { "dependencies": { "@xmldom/xmldom": "^0.8.8", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-Jqppj0FULNq6Zp5JtQrFICl8TtpMjwwUbxEcEC2T3z7m+TOrTQEHZXz3D3Ay7vhbmvD+VMgfWJ4ARclJXeN8Eg=="], - "@expo/prebuild-config": ["@expo/prebuild-config@55.0.17", "", { "dependencies": { "@expo/config": "~55.0.16", "@expo/config-plugins": "~55.0.8", "@expo/config-types": "^55.0.5", "@expo/image-utils": "^0.8.14", "@expo/json-file": "^10.0.14", "@react-native/normalize-colors": "0.83.6", "debug": "^4.3.1", "resolve-from": "^5.0.0", "semver": "^7.6.0", "xml2js": "0.6.0" }, "peerDependencies": { "expo": "*" } }, "sha512-Mcs+dg4Ripu0yCtzf66KZr18PehI1O8HxzJw+G5SUF8VWX+ic99aci1PltvmydWepLwTQL6ykmpXicAUA31IqA=="], + "@expo/prebuild-config": ["@expo/prebuild-config@55.0.18", "", { "dependencies": { "@expo/config": "~55.0.17", "@expo/config-plugins": "~55.0.9", "@expo/config-types": "^55.0.5", "@expo/image-utils": "^0.8.14", "@expo/json-file": "^10.0.14", "@react-native/normalize-colors": "0.83.6", "debug": "^4.3.1", "resolve-from": "^5.0.0", "semver": "^7.6.0", "xml2js": "0.6.0" }, "peerDependencies": { "expo": "*" } }, "sha512-2oKXyy5pyM87DJqXW5Z+Sakle6rApFFtpPhWOiNsOdoh6rOAD+EqVgyrs2OEEic8CE0tTt27w3SRfSZe/PZrxg=="], "@expo/react-native-action-sheet": ["@expo/react-native-action-sheet@4.1.1", "", { "dependencies": { "@types/hoist-non-react-statics": "^3.3.1", "hoist-non-react-statics": "^3.3.0" }, "peerDependencies": { "react": ">=18.0.0" } }, "sha512-4KRaba2vhqDRR7ObBj6nrD5uJw8ePoNHdIOMETTpgGTX7StUbrF4j/sfrP1YUyaPEa1P8FXdwG6pB+2WtrJd1A=="], "@expo/require-utils": ["@expo/require-utils@55.0.5", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "@babel/core": "^7.25.2", "@babel/plugin-transform-modules-commonjs": "^7.24.8" }, "peerDependencies": { "typescript": "^5.0.0 || ^5.0.0-0" }, "optionalPeers": ["typescript"] }, "sha512-U4K/CQ2VpXuwfNGsN+daKmYOt15hCP8v/pXaYH6eut7kdYZo6SfJ1yr67BIcJ+1Gzzs+QzTxswAZChKpXmceyw=="], - "@expo/router-server": ["@expo/router-server@55.0.16", "", { "dependencies": { "debug": "^4.3.4" }, "peerDependencies": { "@expo/metro-runtime": "^55.0.11", "expo": "*", "expo-constants": "^55.0.16", "expo-font": "^55.0.7", "expo-router": "*", "expo-server": "^55.0.9", "react": "*", "react-dom": "*", "react-server-dom-webpack": "~19.0.1 || ~19.1.2 || ~19.2.1" }, "optionalPeers": ["@expo/metro-runtime", "expo-router", "react-dom", "react-server-dom-webpack"] }, "sha512-LvAdrm039nQBG+95+ff5Rc4CsBuoc/giDhjQrgxB9lKJqC/ZTq1xbwfEZFNq6yokX6fOCs/vlxdhmSkOjMIrvg=="], + "@expo/router-server": ["@expo/router-server@55.0.18", "", { "dependencies": { "debug": "^4.3.4" }, "peerDependencies": { "@expo/metro-runtime": "^55.0.11", "expo": "*", "expo-constants": "^55.0.16", "expo-font": "^55.0.8", "expo-router": "*", "expo-server": "^55.0.11", "react": "*", "react-dom": "*", "react-server-dom-webpack": "~19.0.1 || ~19.1.2 || ~19.2.1" }, "optionalPeers": ["@expo/metro-runtime", "expo-router", "react-dom", "react-server-dom-webpack"] }, "sha512-W0VsvIiR48OvdlAOUlag4qspGYT/DV4srfYowlbYxwZh5Qw0MjiZAID4Zt7F0qynGZZxx8OZPpFhIX7XsqtRmg=="], "@expo/schema-utils": ["@expo/schema-utils@55.0.4", "", {}, "sha512-65IdeeE8dAZR3n3J5Eq7LYiQ8BFGeEYCWPBCzycvafL7PkskbCyIclTQarRwf/HXFoRvezKCjaLwy/8v9Prk6g=="], "@expo/sdk-runtime-versions": ["@expo/sdk-runtime-versions@1.0.0", "", {}, "sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="], - "@expo/spawn-async": ["@expo/spawn-async@1.7.2", "", { "dependencies": { "cross-spawn": "^7.0.3" } }, "sha512-QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew=="], + "@expo/spawn-async": ["@expo/spawn-async@1.8.0", "", { "dependencies": { "cross-spawn": "^7.0.6" } }, "sha512-eb9xxd/LbuEGSdua4NumCu/McVB9EM+F/JxB9pWgnERw4HQ9XyTNH1KapG6oqLWR8TuRK2LQfzJlmNi94CVobw=="], "@expo/sudo-prompt": ["@expo/sudo-prompt@9.3.2", "", {}, "sha512-HHQigo3rQWKMDzYDLkubN5WQOYXJJE2eNqIQC2axC2iO3mHdwnIR7FgZVvHWtBwAdzBgAP0ECp8KqS8TiMKvgw=="], @@ -1307,11 +1417,11 @@ "@expo/ws-tunnel": ["@expo/ws-tunnel@1.0.6", "", {}, "sha512-nDRbLmSrJar7abvUjp3smDwH8HcbZcoOEa5jVPUv9/9CajgmWw20JNRwTuBRzWIWIkEJDkz20GoNA+tSwUqk0Q=="], - "@expo/xcpretty": ["@expo/xcpretty@4.4.3", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "chalk": "^4.1.0", "js-yaml": "^4.1.0" }, "bin": { "excpretty": "build/cli.js" } }, "sha512-wC562eD3gS6vO2tWHToFhlFnmHKfKHgF1oyvojeSkLK/ZYop1bMU+7cOMiF9Sq70CzcsLy/EMRy/uRc76QmNRw=="], + "@expo/xcpretty": ["@expo/xcpretty@4.4.4", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "chalk": "^4.1.0", "js-yaml": "^4.1.0" }, "bin": { "excpretty": "build/cli.js" } }, "sha512-4aQzz9vgxcNXFfo/iyNgDDYfsU5XGKKxWxZopw0cVotHiW+U8IJbIxMaxsINs6bHhtkG3StKNPcOrn3eBuxKPw=="], "@feature-sliced/filesystem": ["@feature-sliced/filesystem@3.1.0", "", { "dependencies": { "typescript": "^5.8.3" } }, "sha512-kdNcVwJMCiORdi2Aog7epDeQMEREFUvdqqQHmE7D3ZjSdsQzZWMH6Ex7gtGAttTT/oRBFysqCtP5pl0CETEc9Q=="], - "@feature-sliced/steiger-plugin": ["@feature-sliced/steiger-plugin@0.5.7", "", { "dependencies": { "@feature-sliced/filesystem": "^3.0.1", "fastest-levenshtein": "^1.0.16", "lodash-es": "^4.17.21", "pluralize": "^8.0.0", "precinct": "^12.1.2", "tsconfck": "^3.1.4" } }, "sha512-xENW2fvfU+UyMgcB3S+CCMPrH2Tq/BG1W9IxGp5B8+j0TtbgmbzT3DIj3A2HG4kouVYUjzgWA6JIuHbGo3lDzg=="], + "@feature-sliced/steiger-plugin": ["@feature-sliced/steiger-plugin@0.5.8", "", { "dependencies": { "@feature-sliced/filesystem": "^3.1.0", "fastest-levenshtein": "^1.0.16", "lodash-es": "^4.17.21", "pluralize": "^8.0.0", "precinct": "^12.2.0", "tsconfck": "^3.1.6" } }, "sha512-SXn2PQS0yVRzhltSM968hz0hWmNj93l7dNU4Qqry3OgSkvrO4kl1/daWYwRYzmm9sImsAUsTztabwLUbF9U9YA=="], "@floating-ui/core": ["@floating-ui/core@1.7.5", "", { "dependencies": { "@floating-ui/utils": "^0.2.11" } }, "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ=="], @@ -1331,13 +1441,13 @@ "@formatjs/intl-localematcher": ["@formatjs/intl-localematcher@0.6.2", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA=="], - "@gorhom/bottom-sheet": ["@gorhom/bottom-sheet@5.2.10", "", { "dependencies": { "@gorhom/portal": "1.0.14", "invariant": "^2.2.4" }, "peerDependencies": { "@types/react": "*", "@types/react-native": "*", "react": "*", "react-native": "*", "react-native-gesture-handler": ">=2.16.1", "react-native-reanimated": ">=3.16.0 || >=4.0.0-" }, "optionalPeers": ["@types/react", "@types/react-native"] }, "sha512-MnFddmVOlaoash0d9g1ClqFqX+32h/sV3PNEFz9A8XCvUbZGQM9OG6HHAzTb+eQfUGA8DkaurI+wfpNFyzj5Yw=="], + "@gorhom/bottom-sheet": ["@gorhom/bottom-sheet@5.2.14", "", { "dependencies": { "@gorhom/portal": "1.0.14", "invariant": "^2.2.4" }, "peerDependencies": { "@types/react": "*", "@types/react-native": "*", "react": "*", "react-native": "*", "react-native-gesture-handler": ">=2.16.1", "react-native-reanimated": ">=3.16.0 || >=4.0.0-" }, "optionalPeers": ["@types/react", "@types/react-native"] }, "sha512-uLQFlDjp9z+jrOFcMSEldPqL5JdaXL3vXOh+juhwoNvXgTsEorJLjHTugXu+YccAG/0KJnShzKCrb71MHBsvJg=="], "@gorhom/portal": ["@gorhom/portal@1.0.14", "", { "dependencies": { "nanoid": "^3.3.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-MXyL4xvCjmgaORr/rtryDNFy3kU4qUbKlwtQqqsygd0xX3mhKjOLn6mQK8wfu0RkoE0pBE0nAasRoHua+/QZ7A=="], "@hono/node-server": ["@hono/node-server@1.19.14", "", { "peerDependencies": { "hono": "^4" } }, "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw=="], - "@hookform/resolvers": ["@hookform/resolvers@5.2.2", "", { "dependencies": { "@standard-schema/utils": "^0.3.0" }, "peerDependencies": { "react-hook-form": "^7.55.0" } }, "sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA=="], + "@hookform/resolvers": ["@hookform/resolvers@5.4.0", "", { "dependencies": { "@standard-schema/utils": "^0.3.0" }, "peerDependencies": { "react-hook-form": "^7.55.0" } }, "sha512-EIsqr/t/qbinPIhGjMdtvutIN1Kk4uwbROE9/UQ93CAVGR7GkA7Y92+fX80OzXi/OB67jVFYwKGO1WzkxmkFZw=="], "@humanwhocodes/config-array": ["@humanwhocodes/config-array@0.13.0", "", { "dependencies": { "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" } }, "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw=="], @@ -1427,7 +1537,7 @@ "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="], - "@legendapp/state": ["@legendapp/state@3.0.0-beta.46", "", { "dependencies": { "use-sync-external-store": "^1.2.2" }, "peerDependencies": { "expo-sqlite": "^15.0.0" }, "optionalPeers": ["expo-sqlite"] }, "sha512-TcCabsE9jPW2r0sKQbUet46L0hbWiupKoun9UUkcHyF/6Jec1RyJCmLrdgFPnYZ9HwupJKIRxJVlxNrg2tG3SQ=="], + "@legendapp/state": ["@legendapp/state@3.0.0-beta.47", "", { "dependencies": { "use-sync-external-store": "^1.2.2" }, "peerDependencies": { "expo-sqlite": "^15.0.0" }, "optionalPeers": ["expo-sqlite"] }, "sha512-MPgPacXXSoAazAv7ulW/o0ZAtK4YHk3twvXZ241l2HqAHciHozb7tg5SMbEAc2HKUUfC3JBh+9+DXfMsYokLpQ=="], "@lhci/cli": ["@lhci/cli@0.14.0", "", { "dependencies": { "@lhci/utils": "0.14.0", "chrome-launcher": "^0.13.4", "compression": "^1.7.4", "debug": "^4.3.1", "express": "^4.17.1", "inquirer": "^6.3.1", "isomorphic-fetch": "^3.0.0", "lighthouse": "12.1.0", "lighthouse-logger": "1.2.0", "open": "^7.1.0", "proxy-agent": "^6.4.0", "tmp": "^0.1.0", "uuid": "^8.3.1", "yargs": "^15.4.1", "yargs-parser": "^13.1.2" }, "bin": { "lhci": "./src/cli.js" } }, "sha512-TxOH9pFBnmmN7Jmo2Aimxx5UhE8veqXpHfFJDMWsCVxkwh7mGxcAWchGl84mK139SZbbRmerqZ72c+h2nG9/QQ=="], @@ -1449,23 +1559,23 @@ "@neondatabase/serverless": ["@neondatabase/serverless@1.1.0", "", {}, "sha512-r3ZZhRjEcfEdKIZnoB1RusNgvHuaBRqfCzV4Gi+5A9yUX0S4HTws/ASWqt13wL4y4I+0rqsWGdA2w7EQXHi3+Q=="], - "@next/env": ["@next/env@15.5.15", "", {}, "sha512-vcmyu5/MyFzN7CdqRHO3uHO44p/QPCZkuTUXroeUmhNP8bL5PHFEhik22JUazt+CDDoD6EpBYRCaS2pISL+/hg=="], + "@next/env": ["@next/env@15.5.18", "", {}, "sha512-hAV85Ckd9QR6RvH04MEKwsfLTksvFpO47j9xwtoIuvuPnlwecpSi+uZTtm8HirVbtlI2Fnz//xpcSTjFdyJk+g=="], - "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.5.15", "", { "os": "darwin", "cpu": "arm64" }, "sha512-6PvFO2Tzt10GFK2Ro9tAVEtacMqRmTarYMFKAnV2vYMdwWc73xzmDQyAV7SwEdMhzmiRoo7+m88DuiXlJlGeaw=="], + "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.5.18", "", { "os": "darwin", "cpu": "arm64" }, "sha512-w0WvQf1n+txiwns/9pwIQteCJpZTbxzO2SE0FLcwuD4v0WEh1JPOjdyxWL21XwJsdpx8cFRjyzxzCS/siP7HcQ=="], - "@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.5.15", "", { "os": "darwin", "cpu": "x64" }, "sha512-G+YNV+z6FDZTp/+IdGyIMFqalBTaQSnvAA+X/hrt+eaTRFSznRMz9K7rTmzvM6tDmKegNtyzgufZW0HwVzEqaQ=="], + "@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.5.18", "", { "os": "darwin", "cpu": "x64" }, "sha512-znn71QmDuxm+BOaglihMZfvyySMnNljkVIY5Z2TCssBmm+WqL6c19VhtH5ktFkHa8EZ2bnTUpcNcmNSQsg67og=="], - "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.5.15", "", { "os": "linux", "cpu": "arm64" }, "sha512-eVkrMcVIBqGfXB+QUC7jjZ94Z6uX/dNStbQFabewAnk13Uy18Igd1YZ/GtPRzdhtm7QwC0e6o7zOQecul4iC1w=="], + "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.5.18", "", { "os": "linux", "cpu": "arm64" }, "sha512-yPPe5MNL+igZUa+OsqQJisqSfh6oarIuA1Q0BDxljGJhRQyZeP+WRHh7rs/jZUGMh5aY0YdIjXZG0VohkKkUdw=="], - "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.5.15", "", { "os": "linux", "cpu": "arm64" }, "sha512-RwSHKMQ7InLy5GfkY2/n5PcFycKA08qI1VST78n09nN36nUPqCvGSMiLXlfUmzmpQpF6XeBYP2KRWHi0UW3uNg=="], + "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.5.18", "", { "os": "linux", "cpu": "arm64" }, "sha512-glaCczEWIrHsokFZ3pP08U4BpKxwIdnT+txdOM32OBgpL9Yw4aqx8NejmgtZQZOdstQ5f0L3CasIZudzCuD+nw=="], - "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.5.15", "", { "os": "linux", "cpu": "x64" }, "sha512-nplqvY86LakS+eeiuWsNWvfmK8pFcOEW7ZtVRt4QH70lL+0x6LG/m1OpJ/tvrbwjmR8HH9/fH2jzW1GlL03TIg=="], + "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.5.18", "", { "os": "linux", "cpu": "x64" }, "sha512-oUfg2EgJmU3R0OCOWiokGFUTvZiPfXtriXiuF3YNxRoROCdgvTedHIzYoeKH34gsZxS/V7mHbfq2hpAHwhH1/A=="], - "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.5.15", "", { "os": "linux", "cpu": "x64" }, "sha512-eAgl9NKQ84/sww0v81DQINl/vL2IBxD7sMybd0cWRw6wqgouVI53brVRBrggqBRP/NWeIAE1dm5cbKYoiMlqDQ=="], + "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.5.18", "", { "os": "linux", "cpu": "x64" }, "sha512-JLxSP3KTd9iu/bvUMQxH7RJo9xKSHf55/6RPE4a6FTSZygGn7uvZbCej0AHXydwkggQGSD9UddSjwv6Xz5ESfA=="], - "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.5.15", "", { "os": "win32", "cpu": "arm64" }, "sha512-GJVZC86lzSquh0MtvZT+L7G8+jMnJcldloOjA8Kf3wXvBrvb6OGe2MzPuALxFshSm/IpwUtD2mIoof39ymf52A=="], + "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.5.18", "", { "os": "win32", "cpu": "arm64" }, "sha512-ir1v7enP52K2HNz3tQQvwF+x7VNxBk1ciiZ18WBPvxf4C59IqdfmHPJYK3vH7rSxpuCVw/8C712wTXNAtEp+NA=="], - "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.5.15", "", { "os": "win32", "cpu": "x64" }, "sha512-nFucjVdwlFqxh/JG3hWSJ4p8+YJV7Ii8aPDuBQULB6DzUF4UNZETXLfEUk+oI2zEznWWULPt7MeuTE6xtK1HSA=="], + "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.5.18", "", { "os": "win32", "cpu": "x64" }, "sha512-LIu5me6QTANCd25E7I5uIEfvgQ06RK7tvHAbYo3zCb3VpxQEPvMcSpd87NwUABDT6MbGPdEGR5VRiK4PPTJhQg=="], "@noble/ciphers": ["@noble/ciphers@2.2.0", "", {}, "sha512-Z6pjIZ/8IJcCGzb2S/0Px5J81yij85xASuk1teLNeg75bfT07MV3a/O2Mtn1I2se43k3lkVEcFaR10N4cgQcZA=="], @@ -1477,11 +1587,11 @@ "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="], - "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="], + "@opentelemetry/api": ["@opentelemetry/api@1.9.1", "", {}, "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q=="], - "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.40.0", "", {}, "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw=="], + "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.41.1", "", {}, "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA=="], - "@oxc-project/types": ["@oxc-project/types@0.127.0", "", {}, "sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ=="], + "@oxc-project/types": ["@oxc-project/types@0.133.0", "", {}, "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA=="], "@packrat-ai/nativewindui": ["@packrat-ai/nativewindui@2.0.6", "https://npm.pkg.github.com/download/@packrat-ai/nativewindui/2.0.6/555a865d3d9f1ca8a3ccf1318c26286d7b2f522c", { "peerDependencies": { "@expo/vector-icons": ">=15.0.0", "@gorhom/bottom-sheet": "^5.1.2", "@react-native-community/datetimepicker": "^8.4.0", "@react-native-community/slider": "^5.0.0", "@react-native-picker/picker": "^2.11.0", "@react-native-segmented-control/segmented-control": "^2.5.0", "@react-navigation/drawer": "^7.1.1", "@react-navigation/elements": "^2.3.1", "@react-navigation/native": "^7.0.14", "@rn-primitives/alert-dialog": "^1.1.0", "@rn-primitives/avatar": "^1.0.4", "@rn-primitives/checkbox": "^1.1.0", "@rn-primitives/context-menu": "^1.1.0", "@rn-primitives/dropdown-menu": "^1.1.0", "@rn-primitives/hooks": "^1.1.0", "@rn-primitives/portal": "^1.1.0", "@rn-primitives/slot": "^1.1.0", "@shopify/flash-list": "^2.0.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "expo-blur": "~55.0.0", "expo-device": "~55.0.0", "expo-glass-effect": "~55.0.0", "expo-haptics": "~55.0.0", "expo-image": "~55.0.0", "expo-linear-gradient": "~55.0.0", "expo-navigation-bar": "~55.0.0", "expo-router": "~55.0.0", "expo-symbols": "~55.0.0", "nativewind": "^4.2.3", "react": ">=19.2.0", "react-native": ">=0.83.0", "react-native-keyboard-controller": "^1.21.0", "react-native-reanimated": ">=4.2.0", "react-native-safe-area-context": ">=5.6.0", "react-native-screens": ">=4.23.0", "react-native-uitextview": "^1.1.4", "rn-icon-mapper": "^0.0.1", "tailwind-merge": "^2.2.1" } }, "sha512-AB8MfYtVajR8i1MyQUeeJ7QuoHpkeGPqKjmv4Gu5+FZRDM1LNqtf3YTfuFEEoOx7UJc7/5tEWsDo8hOeOQBzCg=="], @@ -1499,6 +1609,10 @@ "@packrat/config": ["@packrat/config@workspace:packages/config"], + "@packrat/constants": ["@packrat/constants@workspace:packages/constants"], + + "@packrat/db": ["@packrat/db@workspace:packages/db"], + "@packrat/env": ["@packrat/env@workspace:packages/env"], "@packrat/guards": ["@packrat/guards@workspace:packages/guards"], @@ -1511,6 +1625,10 @@ "@packrat/overpass": ["@packrat/overpass@workspace:packages/overpass"], + "@packrat/schemas": ["@packrat/schemas@workspace:packages/schemas"], + + "@packrat/types": ["@packrat/types@workspace:packages/types"], + "@packrat/ui": ["@packrat/ui@workspace:packages/ui"], "@packrat/units": ["@packrat/units@workspace:packages/units"], @@ -1521,9 +1639,9 @@ "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="], - "@pkgr/core": ["@pkgr/core@0.2.9", "", {}, "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA=="], + "@pkgr/core": ["@pkgr/core@0.3.6", "", {}, "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA=="], - "@playwright/test": ["@playwright/test@1.59.1", "", { "dependencies": { "playwright": "1.59.1" }, "bin": { "playwright": "cli.js" } }, "sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg=="], + "@playwright/test": ["@playwright/test@1.60.0", "", { "dependencies": { "playwright": "1.60.0" }, "bin": { "playwright": "cli.js" } }, "sha512-O71yZIbAh/PxDMNGns37GHBIfrVkEVyn+AXyIa5dOTfb4/xNvRWV+Vv/NMbNCtODB/pO7vLlF2OTmMVLhmr7Ag=="], "@pnpm/config.env-replace": ["@pnpm/config.env-replace@1.1.0", "", {}, "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w=="], @@ -1691,21 +1809,21 @@ "@react-native/virtualized-lists": ["@react-native/virtualized-lists@0.83.6", "", { "dependencies": { "invariant": "^2.2.4", "nullthrows": "^1.1.1" }, "peerDependencies": { "@types/react": "^19.2.0", "react": "*", "react-native": "*" }, "optionalPeers": ["@types/react"] }, "sha512-gNSFXeb4P7qHtauLvl+zESroULIyX6Ltpvau3dhwy/QmfanBv0KUcrIU/7aVXxtWcXgp+54oWJyu2LIrsZ9+LQ=="], - "@react-navigation/bottom-tabs": ["@react-navigation/bottom-tabs@7.15.10", "", { "dependencies": { "@react-navigation/elements": "^2.9.15", "color": "^4.2.3", "sf-symbols-typescript": "^2.1.0" }, "peerDependencies": { "@react-navigation/native": "^7.2.2", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-Ao/yYlrpr0cwYYGxt9FDMQk+tTSHNm4WTaszyhroINLdoEMuKH19k1tGFdYbRBKHJx1UIH8kD+EZTYW1w6LL3Q=="], + "@react-navigation/bottom-tabs": ["@react-navigation/bottom-tabs@7.16.2", "", { "dependencies": { "@react-navigation/elements": "^2.9.19", "color": "^4.2.3", "sf-symbols-typescript": "^2.1.0" }, "peerDependencies": { "@react-navigation/native": "^7.2.5", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-Lbp++BGMc7SQXnyKuO/JrQJIhFH0zyB5v4kIEbnzDJLJfgubd5hoSe+QfCqy4YHfLA4phC4Xf/6Q2Ic8x7datQ=="], - "@react-navigation/core": ["@react-navigation/core@7.17.2", "", { "dependencies": { "@react-navigation/routers": "^7.5.3", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "query-string": "^7.1.3", "react-is": "^19.1.0", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "react": ">= 18.2.0" } }, "sha512-Rt2OZwcgOmjv401uLGAKaRM6xo0fiBce/A7LfRHI1oe5FV+KooWcgAoZ2XOtgKj6UzVMuQWt3b2e6rxo/mDJRA=="], + "@react-navigation/core": ["@react-navigation/core@7.17.5", "", { "dependencies": { "@react-navigation/routers": "^7.5.5", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "query-string": "^7.1.3", "react-is": "^19.1.0", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "react": ">= 18.2.0" } }, "sha512-6fDCwDTWC7DJn0SDb9DJGRlipaygHIc+2elpZBJI6Crl/2Pu+Z1d6W4jMJ2gZO6iHKf+Pe5sUiQ/uwepGprZtg=="], - "@react-navigation/drawer": ["@react-navigation/drawer@7.9.9", "", { "dependencies": { "@react-navigation/elements": "^2.9.15", "color": "^4.2.3", "react-native-drawer-layout": "^4.2.2", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "@react-navigation/native": "^7.2.2", "react": ">= 18.2.0", "react-native": "*", "react-native-gesture-handler": ">= 2.0.0", "react-native-reanimated": ">= 2.0.0", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-ZeHhx5MH7Y/qG+28KU0PDtBjNcNnpvnafPwIoSzSrN8M55HvtQex90TP3ylmHtErhw2RDWlp30vpmWvG0wvFIA=="], + "@react-navigation/drawer": ["@react-navigation/drawer@7.10.3", "", { "dependencies": { "@react-navigation/elements": "^2.9.19", "color": "^4.2.3", "react-native-drawer-layout": "^4.2.4", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "@react-navigation/native": "^7.2.5", "react": ">= 18.2.0", "react-native": "*", "react-native-gesture-handler": ">= 2.0.0", "react-native-reanimated": ">= 2.0.0", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-Gt60Cc8taRBAR+kzPNY/c42xQ67skS4nek/LcegKVhbiHqptABzx75+gp5NIsLCS0WqnH/LZasPWXawixMubjg=="], - "@react-navigation/elements": ["@react-navigation/elements@2.9.15", "", { "dependencies": { "color": "^4.2.3", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "@react-native-masked-view/masked-view": ">= 0.2.0", "@react-navigation/native": "^7.2.2", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0" }, "optionalPeers": ["@react-native-masked-view/masked-view"] }, "sha512-cyz/pPiyyC6gaTVLsGFc1g0MYgrmuCFqklAWGXMWPscr5YU3ui94vPI4vnZwcsEy0T758TQWLzmS5XudZeRKcA=="], + "@react-navigation/elements": ["@react-navigation/elements@2.9.19", "", { "dependencies": { "color": "^4.2.3", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "@react-native-masked-view/masked-view": ">= 0.2.0", "@react-navigation/native": "^7.2.5", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0" }, "optionalPeers": ["@react-native-masked-view/masked-view"] }, "sha512-gBUvCZuUkOGw1KpLQEZIkByUz8RYPwXeoA6mZFJy9K1mxd8GdqHDMFCIoB0lfPz9rgrHj99RvtdlGZ/ZzkZv2A=="], - "@react-navigation/native": ["@react-navigation/native@7.2.2", "", { "dependencies": { "@react-navigation/core": "^7.17.2", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*" } }, "sha512-kem1Ko2BcbAjmbQIv66dNmr6EtfDut3QU0qjsVhMnLLhktwyXb6FzZYp8gTrUb6AvkAbaJoi+BF5Pl55pAUa5w=="], + "@react-navigation/native": ["@react-navigation/native@7.2.5", "", { "dependencies": { "@react-navigation/core": "^7.17.5", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*" } }, "sha512-01AAUQiiHQAfTabq+ZyU1/ZWq+AbB/J3v0CB0UTJSON6M6cuadWNsbChzrZUdqQvHrXvg96U5i2PQLJzK3+zpg=="], - "@react-navigation/native-stack": ["@react-navigation/native-stack@7.14.12", "", { "dependencies": { "@react-navigation/elements": "^2.9.15", "color": "^4.2.3", "sf-symbols-typescript": "^2.1.0", "warn-once": "^0.1.1" }, "peerDependencies": { "@react-navigation/native": "^7.2.2", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-dUfpkrVeVKKV8iqXsmoUp3Rv0iH3YaB3eZwScru/FlcqAp/r3/qA6zEXkGX9hZK+/ziWAPFrf1frBSNbgOYSFQ=="], + "@react-navigation/native-stack": ["@react-navigation/native-stack@7.16.0", "", { "dependencies": { "@react-navigation/elements": "^2.9.19", "color": "^4.2.3", "sf-symbols-typescript": "^2.1.0", "warn-once": "^0.1.1" }, "peerDependencies": { "@react-navigation/native": "^7.2.5", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-wM21rHYR2XifjDnKLrr3HeHUeGsWQZJRwPqEzy1Vp/a9k3ieiwTGpmpDItD/jtERH9qkYESwDPO6oEtrVBEpQg=="], - "@react-navigation/routers": ["@react-navigation/routers@7.5.3", "", { "dependencies": { "nanoid": "^3.3.11" } }, "sha512-1tJHg4KKRJuQ1/EvJxatrMef3NZXEPzwUIUZ3n1yJ2t7Q97siwRtbynRpQG9/69ebbtiZ8W3ScOZF/OmhvM4Rg=="], + "@react-navigation/routers": ["@react-navigation/routers@7.5.5", "", { "dependencies": { "nanoid": "^3.3.11" } }, "sha512-9/hhMte12Kgu+pMnLfA4EWJ0OQmIEAMVMX06FPH2yGkEQSQ3JhhCN/GkcRikzQhtEi97VYYQA15umptBUShcOQ=="], - "@reduxjs/toolkit": ["@reduxjs/toolkit@2.11.2", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@standard-schema/utils": "^0.3.0", "immer": "^11.0.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", "reselect": "^5.1.0" }, "peerDependencies": { "react": "^16.9.0 || ^17.0.0 || ^18 || ^19", "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0" }, "optionalPeers": ["react", "react-redux"] }, "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ=="], + "@reduxjs/toolkit": ["@reduxjs/toolkit@2.12.0", "", { "dependencies": { "@standard-schema/spec": "^1.0.0", "@standard-schema/utils": "^0.3.0", "immer": "^11.0.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", "reselect": "^5.1.0" }, "peerDependencies": { "react": "^16.9.0 || ^17.0.0 || ^18 || ^19", "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0" }, "optionalPeers": ["react", "react-redux"] }, "sha512-KiT+RzZbp6mQET+Mg+h2c97+9j1sNflUxQkIHI7Yuzf6Peu+OYpmkn6nbHWmLLWj+1ZODUJFwGZ7gx3L9R9EOw=="], "@rn-primitives/alert-dialog": ["@rn-primitives/alert-dialog@1.4.0", "", { "dependencies": { "@radix-ui/react-alert-dialog": "^1.1.15", "@rn-primitives/hooks": "1.4.0", "@rn-primitives/slot": "1.4.0", "@rn-primitives/types": "1.4.0" }, "peerDependencies": { "@rn-primitives/portal": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native", "react-native-web"] }, "sha512-TLnFbdOR1gqofJliMgLbm8A3liHAX0gTsLQyqG/aSVgSXSHNSGlO5H7WMcmaWcBe6vJgbR1UYIV3ADMHbzu+mA=="], @@ -1727,89 +1845,89 @@ "@rn-primitives/utils": ["@rn-primitives/utils@1.4.0", "", { "peerDependencies": { "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native", "react-native-web"] }, "sha512-nMFZ99AGKakMRDAlfbsYUfqwKO0LItWtp58YTwxmNuGVhXG43/zIfyWWaB3FJeOL+hhcpUn0YR7C1Vsrg0FgvQ=="], - "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.0.0-rc.17", "", { "os": "android", "cpu": "arm64" }, "sha512-s70pVGhw4zqGeFnXWvAzJDlvxhlRollagdCCKRgOsgUOH3N1l0LIxf83AtGzmb5SiVM4Hjl5HyarMRfdfj3DaQ=="], + "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.0.3", "", { "os": "android", "cpu": "arm64" }, "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw=="], - "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.0.0-rc.17", "", { "os": "darwin", "cpu": "arm64" }, "sha512-4ksWc9n0mhlZpZ9PMZgTGjeOPRu8MB1Z3Tz0Mo02eWfWCHMW1zN82Qz/pL/rC+yQa+8ZnutMF0JjJe7PjwasYw=="], + "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.0.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA=="], - "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.0.0-rc.17", "", { "os": "darwin", "cpu": "x64" }, "sha512-SUSDOI6WwUVNcWxd02QEBjLdY1VPHvlEkw6T/8nYG322iYWCTxRb1vzk4E+mWWYehTp7ERibq54LSJGjmouOsw=="], + "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.0.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg=="], - "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.0.0-rc.17", "", { "os": "freebsd", "cpu": "x64" }, "sha512-hwnz3nw9dbJ05EDO/PvcjaaewqqDy7Y1rn1UO81l8iIK1GjenME75dl16ajbvSSMfv66WXSRCYKIqfgq2KCfxw=="], + "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.0.3", "", { "os": "freebsd", "cpu": "x64" }, "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g=="], - "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.17", "", { "os": "linux", "cpu": "arm" }, "sha512-IS+W7epTcwANmFSQFrS1SivEXHtl1JtuQA9wlxrZTcNi6mx+FDOYrakGevvvTwgj2JvWiK8B29/qD9BELZPyXQ=="], + "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.0.3", "", { "os": "linux", "cpu": "arm" }, "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw=="], - "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.0.0-rc.17", "", { "os": "linux", "cpu": "arm64" }, "sha512-e6usGaHKW5BMNZOymS1UcEYGowQMWcgZ71Z17Sl/h2+ZziNJ1a9n3Zvcz6LdRyIW5572wBCTH/Z+bKuZouGk9Q=="], + "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.0.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw=="], - "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.0.0-rc.17", "", { "os": "linux", "cpu": "arm64" }, "sha512-b/CgbwAJpmrRLp02RPfhbudf5tZnN9nsPWK82znefso832etkem8H7FSZwxrOI9djcdTP7U6YfNhbRnh7djErg=="], + "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.0.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q=="], - "@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.17", "", { "os": "linux", "cpu": "ppc64" }, "sha512-4EII1iNGRUN5WwGbF/kOh/EIkoDN9HsupgLQoXfY+D1oyJm7/F4t5PYU5n8SWZgG0FEwakyM8pGgwcBYruGTlA=="], + "@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.0.3", "", { "os": "linux", "cpu": "ppc64" }, "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg=="], - "@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.0.0-rc.17", "", { "os": "linux", "cpu": "s390x" }, "sha512-AH8oq3XqQo4IibpVXvPeLDI5pzkpYn0WiZAfT05kFzoJ6tQNzwRdDYQ45M8I/gslbodRZwW8uxLhbSBbkv96rA=="], + "@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.0.3", "", { "os": "linux", "cpu": "s390x" }, "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg=="], - "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.0.0-rc.17", "", { "os": "linux", "cpu": "x64" }, "sha512-cLnjV3xfo7KslbU41Z7z8BH/E1y5mzUYzAqih1d1MDaIGZRCMqTijqLv76/P7fyHuvUcfGsIpqCdddbxLLK9rA=="], + "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.0.3", "", { "os": "linux", "cpu": "x64" }, "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg=="], - "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.0.0-rc.17", "", { "os": "linux", "cpu": "x64" }, "sha512-0phclDw1spsL7dUB37sIARuis2tAgomCJXAHZlpt8PXZ4Ba0dRP1e+66lsRqrfhISeN9bEGNjQs+T/Fbd7oYGw=="], + "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.0.3", "", { "os": "linux", "cpu": "x64" }, "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow=="], - "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.0.0-rc.17", "", { "os": "none", "cpu": "arm64" }, "sha512-0ag/hEgXOwgw4t8QyQvUCxvEg+V0KBcA6YuOx9g0r02MprutRF5dyljgm3EmR02O292UX7UeS6HzWHAl6KgyhA=="], + "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.0.3", "", { "os": "none", "cpu": "arm64" }, "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg=="], - "@rolldown/binding-wasm32-wasi": ["@rolldown/binding-wasm32-wasi@1.0.0-rc.17", "", { "dependencies": { "@emnapi/core": "1.10.0", "@emnapi/runtime": "1.10.0", "@napi-rs/wasm-runtime": "^1.1.4" }, "cpu": "none" }, "sha512-LEXei6vo0E5wTGwpkJ4KoT3OZJRnglwldt5ziLzOlc6qqb55z4tWNq2A+PFqCJuvWWdP53CVhG1Z9NtToDPJrA=="], + "@rolldown/binding-wasm32-wasi": ["@rolldown/binding-wasm32-wasi@1.0.3", "", { "dependencies": { "@emnapi/core": "1.10.0", "@emnapi/runtime": "1.10.0", "@napi-rs/wasm-runtime": "^1.1.4" }, "cpu": "none" }, "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg=="], - "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.0.0-rc.17", "", { "os": "win32", "cpu": "arm64" }, "sha512-gUmyzBl3SPMa6hrqFUth9sVfcLBlYsbMzBx5PlexMroZStgzGqlZ26pYG89rBb45Mnia+oil6YAIFeEWGWhoZA=="], + "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.0.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g=="], - "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.0.0-rc.17", "", { "os": "win32", "cpu": "x64" }, "sha512-3hkiolcUAvPB9FLb3UZdfjVVNWherN1f/skkGWJP/fgSQhYUZpSIRr0/I8ZK9TkF3F7kxvJAk0+IcKvPHk9qQg=="], + "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.0.3", "", { "os": "win32", "cpu": "x64" }, "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA=="], "@rolldown/plugin-babel": ["@rolldown/plugin-babel@0.2.3", "", { "dependencies": { "picomatch": "^4.0.4" }, "peerDependencies": { "@babel/core": "^7.29.0 || ^8.0.0-rc.1", "@babel/plugin-transform-runtime": "^7.29.0 || ^8.0.0-rc.1", "@babel/runtime": "^7.27.0 || ^8.0.0-rc.1", "rolldown": "^1.0.0-rc.5", "vite": "^8.0.0" }, "optionalPeers": ["@babel/plugin-transform-runtime", "@babel/runtime", "vite"] }, "sha512-+zEk16yGlz1F9STiRr6uG9hmIXb6nprjLczV/htGptYuLoCuxb+itZ03RKCEeOhBpDDd1NU7qF6x1VLMUp62bw=="], - "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-rc.17", "", {}, "sha512-n8iosDOt6Ig1UhJ2AYqoIhHWh/isz0xpicHTzpKBeotdVsTEcxsSA/i3EVM7gQAj0rU27OLAxCjzlj15IWY7bg=="], + "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.1", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="], - "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.60.2", "", { "os": "android", "cpu": "arm" }, "sha512-dnlp69efPPg6Uaw2dVqzWRfAWRnYVb1XJ8CyyhIbZeaq4CA5/mLeZ1IEt9QqQxmbdvagjLIm2ZL8BxXv5lH4Yw=="], + "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.60.4", "", { "os": "android", "cpu": "arm" }, "sha512-F5QXMSiFebS9hKZj02XhWLLnRpJ3B3AROP0tWbFBSj+6kCbg5m9j5JoHKd4mmSVy5mS/IMQloYgYxCuJC0fxEQ=="], - "@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.60.2", "", { "os": "android", "cpu": "arm64" }, "sha512-OqZTwDRDchGRHHm/hwLOL7uVPB9aUvI0am/eQuWMNyFHf5PSEQmyEeYYheA0EPPKUO/l0uigCp+iaTjoLjVoHg=="], + "@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.60.4", "", { "os": "android", "cpu": "arm64" }, "sha512-GxxTKApUpzRhof7poWvCJHRF51C67u1R7D6DiluBE8wKU1u5GWE8t+v81JvJYtbawoBFX1hLv5Ei4eVjkWokaw=="], - "@rollup/rollup-darwin-arm64": ["@rollup/rollup-darwin-arm64@4.60.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-UwRE7CGpvSVEQS8gUMBe1uADWjNnVgP3Iusyda1nSRwNDCsRjnGc7w6El6WLQsXmZTbLZx9cecegumcitNfpmA=="], + "@rollup/rollup-darwin-arm64": ["@rollup/rollup-darwin-arm64@4.60.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-tua0TaJxMOB1R0V0RS1jFZ/RpURFDJIOR2A6jWwQeawuFyS4gBW+rntLRaQd0EQ4bd6Vp44Z2rXW+YYDBsj6IA=="], - "@rollup/rollup-darwin-x64": ["@rollup/rollup-darwin-x64@4.60.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-gjEtURKLCC5VXm1I+2i1u9OhxFsKAQJKTVB8WvDAHF+oZlq0GTVFOlTlO1q3AlCTE/DF32c16ESvfgqR7343/g=="], + "@rollup/rollup-darwin-x64": ["@rollup/rollup-darwin-x64@4.60.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-CSKq7MsP+5PFIcydhAiR1K0UhEI1A2jWXVKHPCBZ151yOutENwvnPocgVHkivu2kviURtCEB6zUQw0vs8RrhMg=="], - "@rollup/rollup-freebsd-arm64": ["@rollup/rollup-freebsd-arm64@4.60.2", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-Bcl6CYDeAgE70cqZaMojOi/eK63h5Me97ZqAQoh77VPjMysA/4ORQBRGo3rRy45x4MzVlU9uZxs8Uwy7ZaKnBw=="], + "@rollup/rollup-freebsd-arm64": ["@rollup/rollup-freebsd-arm64@4.60.4", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-+O8OkVdyvXMtJEciu2wS/pzm1IxntEEQx3z5TAVy4l32G0etZn+RsA48ARRrFm6Ri8fvqPQfgrvNxSjKAbnd3g=="], - "@rollup/rollup-freebsd-x64": ["@rollup/rollup-freebsd-x64@4.60.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-LU+TPda3mAE2QB0/Hp5VyeKJivpC6+tlOXd1VMoXV/YFMvk/MNk5iXeBfB4MQGRWyOYVJ01625vjkr0Az98OJQ=="], + "@rollup/rollup-freebsd-x64": ["@rollup/rollup-freebsd-x64@4.60.4", "", { "os": "freebsd", "cpu": "x64" }, "sha512-Iw3oMskH3AfNuhU0MSN7vNbdi4me/NiYo2azqPz/Le16zHSa+3RRmliCMWWQmh4lcndccU40xcJuTYJZxNo/lw=="], - "@rollup/rollup-linux-arm-gnueabihf": ["@rollup/rollup-linux-arm-gnueabihf@4.60.2", "", { "os": "linux", "cpu": "arm" }, "sha512-2QxQrM+KQ7DAW4o22j+XZ6RKdxjLD7BOWTP0Bv0tmjdyhXSsr2Ul1oJDQqh9Zf5qOwTuTc7Ek83mOFaKnodPjg=="], + "@rollup/rollup-linux-arm-gnueabihf": ["@rollup/rollup-linux-arm-gnueabihf@4.60.4", "", { "os": "linux", "cpu": "arm" }, "sha512-EIPRXTVQpHyF8WOo219AD2yEltPehLTcTMz2fn6JsatLYSzQf00hj3rulF+yauOlF9/FtM2WpkT/hJh/KJFGhA=="], - "@rollup/rollup-linux-arm-musleabihf": ["@rollup/rollup-linux-arm-musleabihf@4.60.2", "", { "os": "linux", "cpu": "arm" }, "sha512-TbziEu2DVsTEOPif2mKWkMeDMLoYjx95oESa9fkQQK7r/Orta0gnkcDpzwufEcAO2BLBsD7mZkXGFqEdMRRwfw=="], + "@rollup/rollup-linux-arm-musleabihf": ["@rollup/rollup-linux-arm-musleabihf@4.60.4", "", { "os": "linux", "cpu": "arm" }, "sha512-J3Yh9PzzF1Ovah2At+lHiGQdsYgArxBbXv/zHfSyaiFQEqvNv7DcW98pCrmdjCZBrqBiKrKKe2V+aaSGWuBe/w=="], - "@rollup/rollup-linux-arm64-gnu": ["@rollup/rollup-linux-arm64-gnu@4.60.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-bO/rVDiDUuM2YfuCUwZ1t1cP+/yqjqz+Xf2VtkdppefuOFS2OSeAfgafaHNkFn0t02hEyXngZkxtGqXcXwO8Rg=="], + "@rollup/rollup-linux-arm64-gnu": ["@rollup/rollup-linux-arm64-gnu@4.60.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-BFDEZMYfUvLn37ONE1yMBojPxnMlTFsdyNoqncT0qFq1mAfllL+ATMMJd8TeuVMiX84s1KbcxcZbXInmcO2mRg=="], - "@rollup/rollup-linux-arm64-musl": ["@rollup/rollup-linux-arm64-musl@4.60.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-hr26p7e93Rl0Za+JwW7EAnwAvKkehh12BU1Llm9Ykiibg4uIr2rbpxG9WCf56GuvidlTG9KiiQT/TXT1yAWxTA=="], + "@rollup/rollup-linux-arm64-musl": ["@rollup/rollup-linux-arm64-musl@4.60.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-pc9EYOSlOgdQ2uPl1o9PF6/kLSgaUosia7gOuS8mB69IxJvlclko1MECXysjs5ryez1/5zjYqx3+xYU0TU6R1A=="], - "@rollup/rollup-linux-loong64-gnu": ["@rollup/rollup-linux-loong64-gnu@4.60.2", "", { "os": "linux", "cpu": "none" }, "sha512-pOjB/uSIyDt+ow3k/RcLvUAOGpysT2phDn7TTUB3n75SlIgZzM6NKAqlErPhoFU+npgY3/n+2HYIQVbF70P9/A=="], + "@rollup/rollup-linux-loong64-gnu": ["@rollup/rollup-linux-loong64-gnu@4.60.4", "", { "os": "linux", "cpu": "none" }, "sha512-NxnomyxYerDh5n4iLrNa+sH+Z+U4BMEE46V2PgQ/hoB909i8gV1M5wPojWg9fk1jWpO3IQnOs20K4wyZuFLEFQ=="], - "@rollup/rollup-linux-loong64-musl": ["@rollup/rollup-linux-loong64-musl@4.60.2", "", { "os": "linux", "cpu": "none" }, "sha512-2/w+q8jszv9Ww1c+6uJT3OwqhdmGP2/4T17cu8WuwyUuuaCDDJ2ojdyYwZzCxx0GcsZBhzi3HmH+J5pZNXnd+Q=="], + "@rollup/rollup-linux-loong64-musl": ["@rollup/rollup-linux-loong64-musl@4.60.4", "", { "os": "linux", "cpu": "none" }, "sha512-nbJnQ8a3z1mtmrwImCYhc6BGpThAyYVRQxw9uKSKG4wR6aAYno9sVjJ0zaZcW9BPJX1GbrDPf+SvdWjgTuDmnw=="], - "@rollup/rollup-linux-ppc64-gnu": ["@rollup/rollup-linux-ppc64-gnu@4.60.2", "", { "os": "linux", "cpu": "ppc64" }, "sha512-11+aL5vKheYgczxtPVVRhdptAM2H7fcDR5Gw4/bTcteuZBlH4oP9f5s9zYO9aGZvoGeBpqXI/9TZZihZ609wKw=="], + "@rollup/rollup-linux-ppc64-gnu": ["@rollup/rollup-linux-ppc64-gnu@4.60.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-2EU6acNrQLd8tYvo/LXW535wupT3m6fo7HKo6lr7ktQoItxTyOL1ZCR/GfGCuXl2vR+zmfI6eRXkSemafv+iVg=="], - "@rollup/rollup-linux-ppc64-musl": ["@rollup/rollup-linux-ppc64-musl@4.60.2", "", { "os": "linux", "cpu": "ppc64" }, "sha512-i16fokAGK46IVZuV8LIIwMdtqhin9hfYkCh8pf8iC3QU3LpwL+1FSFGej+O7l3E/AoknL6Dclh2oTdnRMpTzFQ=="], + "@rollup/rollup-linux-ppc64-musl": ["@rollup/rollup-linux-ppc64-musl@4.60.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-WeBtoMuaMxiiIrO2IYP3xs6GMWkJP2C0EoT8beTLkUPmzV1i/UcOSVw1d5r9KBODtHKilG5yFxsGRnBbK3wJ4A=="], - "@rollup/rollup-linux-riscv64-gnu": ["@rollup/rollup-linux-riscv64-gnu@4.60.2", "", { "os": "linux", "cpu": "none" }, "sha512-49FkKS6RGQoriDSK/6E2GkAsAuU5kETFCh7pG4yD/ylj9rKhTmO3elsnmBvRD4PgJPds5W2PkhC82aVwmUcJ7A=="], + "@rollup/rollup-linux-riscv64-gnu": ["@rollup/rollup-linux-riscv64-gnu@4.60.4", "", { "os": "linux", "cpu": "none" }, "sha512-FJHFfqpKUI3A10WrWKiFbBZ7yVbGT4q4B5o1qKFFojqpaYoh9LrQgqWCmmcxQzVSXYtyB5bzkXrYzlHTs21MYA=="], - "@rollup/rollup-linux-riscv64-musl": ["@rollup/rollup-linux-riscv64-musl@4.60.2", "", { "os": "linux", "cpu": "none" }, "sha512-mjYNkHPfGpUR00DuM1ZZIgs64Hpf4bWcz9Z41+4Q+pgDx73UwWdAYyf6EG/lRFldmdHHzgrYyge5akFUW0D3mQ=="], + "@rollup/rollup-linux-riscv64-musl": ["@rollup/rollup-linux-riscv64-musl@4.60.4", "", { "os": "linux", "cpu": "none" }, "sha512-mcEl6CUT5IAUmQf1m9FYSmVqCJlpQ8r8eyftFUHG8i9OhY7BkBXSUdnLH5DOf0wCOjcP9v/QO93zpmF1SptCCw=="], - "@rollup/rollup-linux-s390x-gnu": ["@rollup/rollup-linux-s390x-gnu@4.60.2", "", { "os": "linux", "cpu": "s390x" }, "sha512-ALyvJz965BQk8E9Al/JDKKDLH2kfKFLTGMlgkAbbYtZuJt9LU8DW3ZoDMCtQpXAltZxwBHevXz5u+gf0yA0YoA=="], + "@rollup/rollup-linux-s390x-gnu": ["@rollup/rollup-linux-s390x-gnu@4.60.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-ynt3JxVd2w2buzoKDWIyiV1pJW93xlQic1THVLXilz429oijRpSHivZAgp65KBu+cMcgf1eVVjdnTLvPxgCuoQ=="], - "@rollup/rollup-linux-x64-gnu": ["@rollup/rollup-linux-x64-gnu@4.60.2", "", { "os": "linux", "cpu": "x64" }, "sha512-UQjrkIdWrKI626Du8lCQ6MJp/6V1LAo2bOK9OTu4mSn8GGXIkPXk/Vsp4bLHCd9Z9Iz2OTEaokUE90VweJgIYQ=="], + "@rollup/rollup-linux-x64-gnu": ["@rollup/rollup-linux-x64-gnu@4.60.4", "", { "os": "linux", "cpu": "x64" }, "sha512-Boiz5+MsaROEWDf+GGEwF8VMHGhlUoQMtIPjOgA5fv4osupqTVnJteQNKJwUcnUog2G55jYXH7KZFFiJe0TEzQ=="], - "@rollup/rollup-linux-x64-musl": ["@rollup/rollup-linux-x64-musl@4.60.2", "", { "os": "linux", "cpu": "x64" }, "sha512-bTsRGj6VlSdn/XD4CGyzMnzaBs9bsRxy79eTqTCBsA8TMIEky7qg48aPkvJvFe1HyzQ5oMZdg7AnVlWQSKLTnw=="], + "@rollup/rollup-linux-x64-musl": ["@rollup/rollup-linux-x64-musl@4.60.4", "", { "os": "linux", "cpu": "x64" }, "sha512-+qfSY27qIrFfI/Hom04KYFw3GKZSGU4lXus51wsb5EuySfFlWRwjkKWoE9emgRw/ukoT4Udsj4W/+xxG8VbPKg=="], - "@rollup/rollup-openbsd-x64": ["@rollup/rollup-openbsd-x64@4.60.2", "", { "os": "openbsd", "cpu": "x64" }, "sha512-6d4Z3534xitaA1FcMWP7mQPq5zGwBmGbhphh2DwaA1aNIXUu3KTOfwrWpbwI4/Gr0uANo7NTtaykFyO2hPuFLg=="], + "@rollup/rollup-openbsd-x64": ["@rollup/rollup-openbsd-x64@4.60.4", "", { "os": "openbsd", "cpu": "x64" }, "sha512-VpTfOPHgVXEBeeR8hZ2O0F3aSso+JDWqTWmTmzcQKted54IAdUVbxE+j/MVxUsKa8L20HJhv3vUezVPoquqWjA=="], - "@rollup/rollup-openharmony-arm64": ["@rollup/rollup-openharmony-arm64@4.60.2", "", { "os": "none", "cpu": "arm64" }, "sha512-NetAg5iO2uN7eB8zE5qrZ3CSil+7IJt4WDFLcC75Ymywq1VZVD6qJ6EvNLjZ3rEm6gB7XW5JdT60c6MN35Z85Q=="], + "@rollup/rollup-openharmony-arm64": ["@rollup/rollup-openharmony-arm64@4.60.4", "", { "os": "none", "cpu": "arm64" }, "sha512-IPOsh5aRYuLv/nkU51X10Bf75Bsf6+gZdx1X+QP5QM6lIJFHHqbHLG0uJn/hWthzo13UAc2umiUorqZy3axoZg=="], - "@rollup/rollup-win32-arm64-msvc": ["@rollup/rollup-win32-arm64-msvc@4.60.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-NCYhOotpgWZ5kdxCZsv6Iudx0wX8980Q/oW4pNFNihpBKsDbEA1zpkfxJGC0yugsUuyDZ7gL37dbzwhR0VI7pQ=="], + "@rollup/rollup-win32-arm64-msvc": ["@rollup/rollup-win32-arm64-msvc@4.60.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-4QzE9E81OohJ/HKzHhsqU+zcYYojVOXlFMs1DdyMT6qXl/niOH7AVElmmEdUNHHS/oRkc++d5k6Vy85zFs0DEw=="], - "@rollup/rollup-win32-ia32-msvc": ["@rollup/rollup-win32-ia32-msvc@4.60.2", "", { "os": "win32", "cpu": "ia32" }, "sha512-RXsaOqXxfoUBQoOgvmmijVxJnW2IGB0eoMO7F8FAjaj0UTywUO/luSqimWBJn04WNgUkeNhh7fs7pESXajWmkg=="], + "@rollup/rollup-win32-ia32-msvc": ["@rollup/rollup-win32-ia32-msvc@4.60.4", "", { "os": "win32", "cpu": "ia32" }, "sha512-zTPgT1YuHHcd+Tmx7h8aml0FWFVelV5N54oHow9SLj+GfoDy/huQ+UV396N/C7KpMDMiPspRktzM1/0r1usYEA=="], - "@rollup/rollup-win32-x64-gnu": ["@rollup/rollup-win32-x64-gnu@4.60.2", "", { "os": "win32", "cpu": "x64" }, "sha512-qdAzEULD+/hzObedtmV6iBpdL5TIbKVztGiK7O3/KYSf+HIzU257+MX1EXJcyIiDbMAqmbwaufcYPvyRryeZtA=="], + "@rollup/rollup-win32-x64-gnu": ["@rollup/rollup-win32-x64-gnu@4.60.4", "", { "os": "win32", "cpu": "x64" }, "sha512-DRS4G7mi9lJxqEDezIkKCaUIKCrLUUDCUaCsTPCi/rtqaC6D/jjwslMQyiDU50Ka0JKpeXeRBFBAXwArY52vBw=="], - "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.60.2", "", { "os": "win32", "cpu": "x64" }, "sha512-Nd/SgG27WoA9e+/TdK74KnHz852TLa94ovOYySo/yMPuTmpckK/jIF2jSwS3g7ELSKXK13/cVdmg1Z/DaCWKxA=="], + "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.60.4", "", { "os": "win32", "cpu": "x64" }, "sha512-QVTUovf40zgTqlFVrKA1uXMVvU2QWEFWfAH8Wdc48IxLvrJMQVMBRjuQyUpzZCDkakImib9eVazbWlC6ksWtJw=="], "@ronradtke/react-native-markdown-display": ["@ronradtke/react-native-markdown-display@8.1.0", "", { "dependencies": { "css-to-react-native": "^3.2.0", "markdown-it": "^13.0.1", "prop-types": "^15.7.2", "react-native-fit-image": "^1.5.5" }, "peerDependencies": { "react": ">=16.2.0", "react-native": ">=0.50.4" } }, "sha512-pAtefWI76vpkxsEgIFivyq1q6ej8rDyR7oVM/cWAxUydyBej9LOvULjLAeFuFLbYAelHTNoYXmGxQOlFLBa0+w=="], @@ -1845,7 +1963,9 @@ "@sentry/cli-win32-x64": ["@sentry/cli-win32-x64@2.58.4", "", { "os": "win32", "cpu": "x64" }, "sha512-cSzN4PjM1RsCZ4pxMjI0VI7yNCkxiJ5jmWncyiwHXGiXrV1eXYdQ3n1LhUYLZ91CafyprR0OhDcE+RVZ26Qb5w=="], - "@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], + "@sentry/cloudflare": ["@sentry/cloudflare@10.55.0", "", { "dependencies": { "@opentelemetry/api": "^1.9.1", "@sentry/core": "10.55.0" }, "peerDependencies": { "@cloudflare/workers-types": "^4.x" }, "optionalPeers": ["@cloudflare/workers-types"] }, "sha512-1FcCtbQb60bKJGQuxtTzqicolRea9SK8DdwZKMKjBNjuqsSDf48jh//nE05/qX0NIj7NxsmsLeTtxchMIrz6AQ=="], + + "@sentry/core": ["@sentry/core@10.55.0", "", {}, "sha512-XUyoNtDSYCvgJnoNzlh+YeAXfIPhCRIXbhWqqM3GQ3AFtZICi85lkyfsrwXEl9wzlPGYnU+Eg8F4tOfScx+FcQ=="], "@sentry/hub": ["@sentry/hub@6.19.7", "", { "dependencies": { "@sentry/types": "6.19.7", "@sentry/utils": "6.19.7", "tslib": "^1.9.3" } }, "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="], @@ -1873,105 +1993,87 @@ "@sinonjs/fake-timers": ["@sinonjs/fake-timers@10.3.0", "", { "dependencies": { "@sinonjs/commons": "^3.0.0" } }, "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA=="], - "@smithy/chunked-blob-reader": ["@smithy/chunked-blob-reader@5.2.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-St+kVicSyayWQca+I1rGitaOEH6uKgE8IUWoYnnEX26SWdWQcL6LvMSD19Lg+vYHKdT9B2Zuu7rd3i6Wnyb/iw=="], - - "@smithy/chunked-blob-reader-native": ["@smithy/chunked-blob-reader-native@4.2.3", "", { "dependencies": { "@smithy/util-base64": "^4.3.2", "tslib": "^2.6.2" } }, "sha512-jA5k5Udn7Y5717L86h4EIv06wIr3xn8GM1qHRi/Nf31annXcXHJjBKvgztnbn2TxH3xWrPBfgwHsOwZf0UmQWw=="], - - "@smithy/config-resolver": ["@smithy/config-resolver@4.4.17", "", { "dependencies": { "@smithy/node-config-provider": "^4.3.14", "@smithy/types": "^4.14.1", "@smithy/util-config-provider": "^4.2.2", "@smithy/util-endpoints": "^3.4.2", "@smithy/util-middleware": "^4.2.14", "tslib": "^2.6.2" } }, "sha512-TzDZcAnhTyAHbXVxWZo7/tEcrIeFq20IBk8So3OLOetWpR8EwY/yEqBMBFaJMeyEiREDq4NfEl+qO3OAUD+vbQ=="], - - "@smithy/core": ["@smithy/core@3.23.17", "", { "dependencies": { "@smithy/protocol-http": "^5.3.14", "@smithy/types": "^4.14.1", "@smithy/url-parser": "^4.2.14", "@smithy/util-base64": "^4.3.2", "@smithy/util-body-length-browser": "^4.2.2", "@smithy/util-middleware": "^4.2.14", "@smithy/util-stream": "^4.5.25", "@smithy/util-utf8": "^4.2.2", "@smithy/uuid": "^1.1.2", "tslib": "^2.6.2" } }, "sha512-x7BlLbUFL8NWCGjMF9C+1N5cVCxcPa7g6Tv9B4A2luWx3be3oU8hQ96wIwxe/s7OhIzvoJH73HAUSg5JXVlEtQ=="], - - "@smithy/credential-provider-imds": ["@smithy/credential-provider-imds@4.2.14", "", { "dependencies": { "@smithy/node-config-provider": "^4.3.14", "@smithy/property-provider": "^4.2.14", "@smithy/types": "^4.14.1", "@smithy/url-parser": "^4.2.14", "tslib": "^2.6.2" } }, "sha512-Au28zBN48ZAoXdooGUHemuVBrkE+Ie6RPmGNIAJsFqj33Vhb6xAgRifUydZ2aY+M+KaMAETAlKk5NC5h1G7wpg=="], + "@smithy/config-resolver": ["@smithy/config-resolver@4.5.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-HehAZr4sq2m+4zHgEqDvtWENy/B5yywMKA8Pl4gBcU3F4ekelpZqDLDxQHdJlguaKNyTq31cZYjLWomzdujQrA=="], - "@smithy/eventstream-codec": ["@smithy/eventstream-codec@4.2.14", "", { "dependencies": { "@aws-crypto/crc32": "5.2.0", "@smithy/types": "^4.14.1", "@smithy/util-hex-encoding": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-erZq0nOIpzfeZdCyzZjdJb4nVSKLUmSkaQUVkRGQTXs30gyUGeKnrYEg+Xe1W5gE3aReS7IgsvANwVPxSzY6Pw=="], + "@smithy/core": ["@smithy/core@3.24.5", "", { "dependencies": { "@aws-crypto/crc32": "5.2.0", "@smithy/types": "^4.14.2", "tslib": "^2.6.2" } }, "sha512-Kt8phUg45M15EjhYAbZ+fFikYneijLu9Liugz8ZsYz2i8j0hzGv27LWKpEHYRfvj+LyCOSijpcR/2i8RouV+cA=="], - "@smithy/eventstream-serde-browser": ["@smithy/eventstream-serde-browser@4.2.14", "", { "dependencies": { "@smithy/eventstream-serde-universal": "^4.2.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-8IelTCtTctWRbb+0Dcy+C0aICh1qa0qWXqgjcXDmMuCvPJRnv26hiDZoAau2ILOniki65mCPKqOQs/BaWvO4CQ=="], + "@smithy/credential-provider-imds": ["@smithy/credential-provider-imds@4.3.6", "", { "dependencies": { "@smithy/core": "^3.24.5", "@smithy/types": "^4.14.2", "tslib": "^2.6.2" } }, "sha512-tHhdiWZfG1ZIh2YcRfPJmY2gHcBmqbAzqm3ER4TIDFYsSEqTD5tICT7cgQ/kI8LRakxp12myOYyK68XPn7MnHw=="], - "@smithy/eventstream-serde-config-resolver": ["@smithy/eventstream-serde-config-resolver@4.3.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-sqHiHpYRYo3FJlaIxD1J8PhbcmJAm7IuM16mVnwSkCToD7g00IBZzKuiLNMGmftULmEUX6/UAz8/NN5uMP8bVA=="], + "@smithy/eventstream-serde-browser": ["@smithy/eventstream-serde-browser@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-M9rMkTar7JcRrvUHsK1271AuWDmrISIPQpQ4TSHmYZ4KMisGnMH0gfjCWnBwdndR7skvvp/UheHhZGvO3Cr8/g=="], - "@smithy/eventstream-serde-node": ["@smithy/eventstream-serde-node@4.2.14", "", { "dependencies": { "@smithy/eventstream-serde-universal": "^4.2.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-Ht/8BuGlKfFTy0H3+8eEu0vdpwGztCnaLLXtpXNdQqiR7Hj4vFScU3T436vRAjATglOIPjJXronY+1WxxNLSiw=="], + "@smithy/eventstream-serde-config-resolver": ["@smithy/eventstream-serde-config-resolver@4.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-lUwPPu7DNNVJjeS+gV7g2rDHbW9X1wSRQIsIyzOgBtP7KDMefLhz0kz42AWAxZIFPcOO3pUbtq76LSkVcxLKRw=="], - "@smithy/eventstream-serde-universal": ["@smithy/eventstream-serde-universal@4.2.14", "", { "dependencies": { "@smithy/eventstream-codec": "^4.2.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-lWyt4T2XQZUZgK3tQ3Wn0w3XBvZsK/vjTuJl6bXbnGZBHH0ZUSONTYiK9TgjTTzU54xQr3DRFwpjmhp0oLm3gg=="], + "@smithy/eventstream-serde-node": ["@smithy/eventstream-serde-node@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-QydEYKqvdiS6dJb0tOfDiogt12FzzImt2FnL7gMD72hNrkiUAUKqtStRmkTrdzDKFJ46abe3yH94luCuhtnCkQ=="], - "@smithy/fetch-http-handler": ["@smithy/fetch-http-handler@5.3.17", "", { "dependencies": { "@smithy/protocol-http": "^5.3.14", "@smithy/querystring-builder": "^4.2.14", "@smithy/types": "^4.14.1", "@smithy/util-base64": "^4.3.2", "tslib": "^2.6.2" } }, "sha512-bXOvQzaSm6MnmLaWA1elgfQcAtN4UP3vXqV97bHuoOrHQOJiLT3ds6o9eo5bqd0TJfRFpzdGnDQdW3FACiAVdw=="], + "@smithy/fetch-http-handler": ["@smithy/fetch-http-handler@5.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "@smithy/types": "^4.14.2", "tslib": "^2.6.2" } }, "sha512-SK3VMeH0fibgdTg2QeB+O4p7Yy/2E5HBOHJeC58FshkDdeuX8lOgO7PfjYfLyPLP1ch55j91cQqKBzDS0mRjSQ=="], - "@smithy/hash-blob-browser": ["@smithy/hash-blob-browser@4.2.15", "", { "dependencies": { "@smithy/chunked-blob-reader": "^5.2.2", "@smithy/chunked-blob-reader-native": "^4.2.3", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-0PJ4Al3fg2nM4qKrAIxyNcApgqHAXcBkN8FeizOz69z0rb26uZ6lMESYtxegaTlXB5Hj84JfwMPavMrwDMjucA=="], + "@smithy/hash-blob-browser": ["@smithy/hash-blob-browser@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-DNInwxNX32WtmhiKVrplzFtkKk5ePNHitJYPCnsPrD2EHm06iWJKQo8F8eq5ss94yp/xSfmojYD7nFBsgzrHHQ=="], - "@smithy/hash-node": ["@smithy/hash-node@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "@smithy/util-buffer-from": "^4.2.2", "@smithy/util-utf8": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-8ZBDY2DD4wr+GGjTpPtiglEsqr0lUP+KHqgZcWczFf6qeZ/YRjMIOoQWVQlmwu7EtxKTd8YXD8lblmYcpBIA1g=="], + "@smithy/hash-node": ["@smithy/hash-node@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-/tUIDaB36qjLq/CIhMRIiFXCT7rVGBGAhFmMA9PbC/iW2u3QPNATZuFSdK0JBO3qeSPoHBeudFMmsbFq2Mf5EQ=="], - "@smithy/hash-stream-node": ["@smithy/hash-stream-node@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "@smithy/util-utf8": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-tw4GANWkZPb6+BdD4Fgucqzey2+r73Z/GRo9zklsCdwrnxxumUV83ZIaBDdudV4Ylazw3EPTiJZhpX42105ruQ=="], + "@smithy/hash-stream-node": ["@smithy/hash-stream-node@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-dLboKYf5ezU+b8SDDzVNjSHWHYPiU9aTI7IfIh9GhUpvCkwfdw1zUtK6dAGFHOrI5l1nVmsEWZrcAHophlNKug=="], - "@smithy/invalid-dependency": ["@smithy/invalid-dependency@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-c21qJiTSb25xvvOp+H2TNZzPCngrvl5vIPqPB8zQ/DmJF4QWXO19x1dWfMJZ6wZuuWUPPm0gV8C0cU3+ifcWuw=="], + "@smithy/invalid-dependency": ["@smithy/invalid-dependency@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-c8C1GzrU4PcY1QT/HP0ILCTLutyVONT93kPSisOyHoZaXlKQZtV6+RKqolhBtPolGULf59vq2yseagU6+WY82w=="], - "@smithy/is-array-buffer": ["@smithy/is-array-buffer@4.2.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-n6rQ4N8Jj4YTQO3YFrlgZuwKodf4zUFs7EJIWH86pSCWBaAtAGBFfCM7Wx6D2bBJ2xqFNxGBSrUWswT3M0VJow=="], + "@smithy/is-array-buffer": ["@smithy/is-array-buffer@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-AzWk7NstKv+z3h0GmZlQkDdgcnh3tvBWnBr0zoBY/agV/zaMqEBnpqgF1S+sJAy5yfE1b2KZqiz+uHHV70vOYg=="], - "@smithy/md5-js": ["@smithy/md5-js@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "@smithy/util-utf8": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-V2v0vx+h0iUSNG1Alt+GNBMSLGCrl9iVsdd+Ap67HPM9PN479x12V8LkuMoKImNZxn3MXeuyUjls+/7ZACZghA=="], + "@smithy/md5-js": ["@smithy/md5-js@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-U/zFWFDuNFspkLAtUbatmpevrRjXwQkoGPJTg1hapUsjLKK+aN3u4seX4+aSBzLom+RnZSdWncfSIgG100vsGg=="], - "@smithy/middleware-content-length": ["@smithy/middleware-content-length@4.2.14", "", { "dependencies": { "@smithy/protocol-http": "^5.3.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-xhHq7fX4/3lv5NHxLUk3OeEvl0xZ+Ek3qIbWaCL4f9JwgDZEclPBElljaZCAItdGPQl/kSM4LPMOpy1MYgprpw=="], + "@smithy/middleware-content-length": ["@smithy/middleware-content-length@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-lzOzJ4c0t3vkBut02CjdWNgduN3mUWjc1WK9TPr75KVV6OgVWico9wMDn9ZnQN97VJPYfweBW6Dm5CElvQl8BQ=="], - "@smithy/middleware-endpoint": ["@smithy/middleware-endpoint@4.4.32", "", { "dependencies": { "@smithy/core": "^3.23.17", "@smithy/middleware-serde": "^4.2.20", "@smithy/node-config-provider": "^4.3.14", "@smithy/shared-ini-file-loader": "^4.4.9", "@smithy/types": "^4.14.1", "@smithy/url-parser": "^4.2.14", "@smithy/util-middleware": "^4.2.14", "tslib": "^2.6.2" } }, "sha512-ZZkgyjnJppiZbIm6Qbx92pbXYi1uzenIvGhBSCDlc7NwuAkiqSgS75j1czAD25ZLs2FjMjYy1q7gyRVWG6JA0Q=="], + "@smithy/middleware-endpoint": ["@smithy/middleware-endpoint@4.5.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-8DnkSoUMQAcuT/DHdigsFPti8M/Dm6TPCAsrIQ/bUDGxRkrgGuI++3dXRr8CoUyc9r0kGSCcZHjJje407ydgBQ=="], - "@smithy/middleware-retry": ["@smithy/middleware-retry@4.5.5", "", { "dependencies": { "@smithy/core": "^3.23.17", "@smithy/node-config-provider": "^4.3.14", "@smithy/protocol-http": "^5.3.14", "@smithy/service-error-classification": "^4.3.0", "@smithy/smithy-client": "^4.12.13", "@smithy/types": "^4.14.1", "@smithy/util-middleware": "^4.2.14", "@smithy/util-retry": "^4.3.4", "@smithy/uuid": "^1.1.2", "tslib": "^2.6.2" } }, "sha512-wnYOpB5vATFKWrY2Z9Alb0KhjZI6AbzU6Fbz3Hq2GnURdRYWB4q+qWivQtSTwXcmWUA3MZ6krfwL6Cq5MAbxsA=="], + "@smithy/middleware-retry": ["@smithy/middleware-retry@4.6.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-fumMIfh5xOFjirylbSzmBX9bgQtrWFtQrosPfkjsJSBzqXVbQMNDGIC8oJBz4V3bokIm2F0CL3bziLtbXR7cbA=="], - "@smithy/middleware-serde": ["@smithy/middleware-serde@4.2.20", "", { "dependencies": { "@smithy/core": "^3.23.17", "@smithy/protocol-http": "^5.3.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-Lx9JMO9vArPtiChE3wbEZ5akMIDQpWQtlu90lhACQmNOXcGXRbaDywMHDzuDZ2OkZzP+9wQfZi3YJT9F67zTQQ=="], + "@smithy/middleware-serde": ["@smithy/middleware-serde@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-+7glfRrb7byruZCPAM53TvmK8cx/ghzAThB4EvPzHynAYobtISl0g+DzzSVEC0NQob5BunP9gC9GP+Fcz6H9yw=="], - "@smithy/middleware-stack": ["@smithy/middleware-stack@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-2dvkUKLuFdKsCRmOE4Mn63co0Djtsm+JMh0bYZQupN1pJwMeE8FmQmRLLzzEMN0dnNi7CDCYYH8F0EVwWiPBeA=="], + "@smithy/middleware-stack": ["@smithy/middleware-stack@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-Yj4wjBQZXHePRIy9cBIKfCOn/kPjRlgDPGlr7DjIhwrnz8kWu7Ux7UwPr51P/wcug5oq4nWdBXSY4TV5afBdew=="], - "@smithy/node-config-provider": ["@smithy/node-config-provider@4.3.14", "", { "dependencies": { "@smithy/property-provider": "^4.2.14", "@smithy/shared-ini-file-loader": "^4.4.9", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-S+gFjyo/weSVL0P1b9Ts8C/CwIfNCgUPikk3sl6QVsfE/uUuO+QsF+NsE/JkpvWqqyz1wg7HFdiaZuj5CoBMRg=="], + "@smithy/node-config-provider": ["@smithy/node-config-provider@4.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-c2G9QJ4xVZLwAkAf+WQESSSCkKbtt33ytje1klGvTcBn6cKuqV28E+62wbRPHwuTikkB3LQ7CBnNrayCoJur5A=="], - "@smithy/node-http-handler": ["@smithy/node-http-handler@4.6.1", "", { "dependencies": { "@smithy/protocol-http": "^5.3.14", "@smithy/querystring-builder": "^4.2.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-iB+orM4x3xrr57X3YaXazfKnntl0LHlZB1kcXSGzMV1Tt0+YwEjGlbjk/44qEGtBzXAz6yFDzkYTKSV6Pj2HUg=="], + "@smithy/node-http-handler": ["@smithy/node-http-handler@4.7.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "@smithy/types": "^4.14.2", "tslib": "^2.6.2" } }, "sha512-3dA9TQ+ybRSZ/m0wnbZhiBy4Dezjgq1Ib/ZZrYTpJDBgpoLLU/SDzZc/g0x0MNAdOJe1wPcM+x2PBRmoOur+Sw=="], - "@smithy/property-provider": ["@smithy/property-provider@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-WuM31CgfsnQ/10i7NYr0PyxqknD72Y5uMfUMVSniPjbEPceiTErb4eIqJQ+pdxNEAUEWrewrGjIRjVbVHsxZiQ=="], + "@smithy/property-provider": ["@smithy/property-provider@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-QNc22/FgfEm/9/rkefShfQUVckH3HWiQ2RPs+40hwAdY65hbg88gombeHwkfMzmVDZjolcyQeyOjnxZRmpavIA=="], - "@smithy/protocol-http": ["@smithy/protocol-http@5.3.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-dN5F8kHx8RNU0r+pCwNmFZyz6ChjMkzShy/zup6MtkRmmix4vZzJdW+di7x//b1LiynIev88FM18ie+wwPcQtQ=="], + "@smithy/protocol-http": ["@smithy/protocol-http@5.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-jOD+4WNWQLntiLJn3r82C7BLheEbRCKTbU5U5bskZmT7nwRiGkh0IghuHwHRZ1ZEFXpHltQxxp9/koOPsdluJg=="], - "@smithy/querystring-builder": ["@smithy/querystring-builder@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "@smithy/util-uri-escape": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-XYA5Z0IqTeF+5XDdh4BBmSA0HvbgVZIyv4cmOoUheDNR57K1HgBp9ukUMx3Cr3XpDHHpLBnexPE3LAtDsZkj2A=="], + "@smithy/querystring-builder": ["@smithy/querystring-builder@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-62hgMWlA1ifBY0HkVYjBE5bEnpagq6I4hK6eonHJaRFSpZaCKA7Hc2CgoSHXJt20Vlmy9jKY79rAbMUGs18k9A=="], - "@smithy/querystring-parser": ["@smithy/querystring-parser@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-hr+YyqBD23GVvRxGGrcc/oOeNlK3PzT5Fu4dzrDXxzS1LpFiuL2PQQqKPs87M79aW7ziMs+nvB3qdw77SqE7Lw=="], + "@smithy/shared-ini-file-loader": ["@smithy/shared-ini-file-loader@4.5.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-W7IPDXj8AZdyH5EWEXmOvN7ao8iN0JKJ0FNLpGcqj08HZc0MmqGcJnGgh3DfUdGYtzrPIEudxs+ovq/EWZgLjg=="], - "@smithy/service-error-classification": ["@smithy/service-error-classification@4.3.0", "", { "dependencies": { "@smithy/types": "^4.14.1" } }, "sha512-9jKsBYQRPR0xBLgc2415RsA5PIcP2sis4oBdN9s0D13cg1B1284mNTjx9Yc+BEERXzuPm5ObktI96OxsKh8E9A=="], + "@smithy/signature-v4": ["@smithy/signature-v4@5.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "@smithy/types": "^4.14.2", "tslib": "^2.6.2" } }, "sha512-QBJKWGqIknH0dc9LWpfH1mkdokAx6iXYN3UcQ3eY6uIEyScuoQAhfl94ge7ozUy9WgFUdE8xsvwBjaYBbWmPNA=="], - "@smithy/shared-ini-file-loader": ["@smithy/shared-ini-file-loader@4.4.9", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-495/V2I15SHgedSJoDPD23JuSfKAp726ZI1V0wtjB07Wh7q/0tri/0e0DLefZCHgxZonrGKt/OCTpAtP1wE1kQ=="], + "@smithy/smithy-client": ["@smithy/smithy-client@4.13.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "@smithy/types": "^4.14.2", "tslib": "^2.6.2" } }, "sha512-pg9QRQESz3m/5HgAW/z9lA3ln8MSsCWNWc82MX40Djlxpcj/+7DZQ0yIk7tGWYJCVZog/9LBdNl1uEVRAhqm5Q=="], - "@smithy/signature-v4": ["@smithy/signature-v4@5.3.14", "", { "dependencies": { "@smithy/is-array-buffer": "^4.2.2", "@smithy/protocol-http": "^5.3.14", "@smithy/types": "^4.14.1", "@smithy/util-hex-encoding": "^4.2.2", "@smithy/util-middleware": "^4.2.14", "@smithy/util-uri-escape": "^4.2.2", "@smithy/util-utf8": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-1D9Y/nmlVjCeSivCbhZ7hgEpmHyY1h0GvpSZt3l0xcD9JjmjVC1CHOozS6+Gh+/ldMH8JuJ6cujObQqfayAVFA=="], + "@smithy/types": ["@smithy/types@4.14.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-P+otAxbV4CqBybp7EkcJCrig63yE2E7PuNVOmilVMRcx/O+QDzGULTrKsq4DV13gSfak9ObPrWaHl/9bL5YcWw=="], - "@smithy/smithy-client": ["@smithy/smithy-client@4.12.13", "", { "dependencies": { "@smithy/core": "^3.23.17", "@smithy/middleware-endpoint": "^4.4.32", "@smithy/middleware-stack": "^4.2.14", "@smithy/protocol-http": "^5.3.14", "@smithy/types": "^4.14.1", "@smithy/util-stream": "^4.5.25", "tslib": "^2.6.2" } }, "sha512-y/Pcj1V9+qG98gyu1gvftHB7rDpdh+7kIBIggs55yGm3JdtBV8GT8IFF3a1qxZ79QnaJHX9GXzvBG6tAd+czJA=="], + "@smithy/url-parser": ["@smithy/url-parser@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-f7kUYrRdLiAHz10WXQXiUkuBFaL2c2ZBD2kSwZyQBh73lWFTvXwdpS9l5irQ/uldk8YMJpm66BozmqCg/3uZvA=="], - "@smithy/types": ["@smithy/types@4.14.1", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-59b5HtSVrVR/eYNei3BUj3DCPKD/G7EtDDe7OEJE7i7FtQFugYo6MxbotS8mVJkLNVf8gYaAlEBwwtJ9HzhWSg=="], + "@smithy/util-base64": ["@smithy/util-base64@4.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-2J8l+DoX3IIiP75X5SYkJ3mIgOkxW29MxOs7oPjbXLuInQ7UL6zLw2IJHbQ44+eKDBBhTjvt+GgwsTTNBGt8zA=="], - "@smithy/url-parser": ["@smithy/url-parser@4.2.14", "", { "dependencies": { "@smithy/querystring-parser": "^4.2.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-p06BiBigJ8bTA3MgnOfCtDUWnAMY0YfedO/GRpmc7p+wg3KW8vbXy1xwSu5ASy0wV7rRYtlfZOIKH4XqfhjSQQ=="], + "@smithy/util-body-length-browser": ["@smithy/util-body-length-browser@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-nQtYwXg4spM6uc0Luq3yck+WXZ1VPfrYkC2SqkQ+YOGks0qR2bKKlSCjidSqfpq+VAY/RJe1O5V+CtBmnT63KQ=="], - "@smithy/util-base64": ["@smithy/util-base64@4.3.2", "", { "dependencies": { "@smithy/util-buffer-from": "^4.2.2", "@smithy/util-utf8": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-XRH6b0H/5A3SgblmMa5ErXQ2XKhfbQB+Fm/oyLZ2O2kCUrwgg55bU0RekmzAhuwOjA9qdN5VU2BprOvGGUkOOQ=="], + "@smithy/util-body-length-node": ["@smithy/util-body-length-node@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-BAsAed9yWExECwNIi61Le6D8ZTY71MFEFrf3d4L2+uzcbTjFAWxOtymkA1vCV8bNZQN9TGgZo4c68JDsnjNShA=="], - "@smithy/util-body-length-browser": ["@smithy/util-body-length-browser@4.2.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-JKCrLNOup3OOgmzeaKQwi4ZCTWlYR5H4Gm1r2uTMVBXoemo1UEghk5vtMi1xSu2ymgKVGW631e2fp9/R610ZjQ=="], + "@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="], - "@smithy/util-body-length-node": ["@smithy/util-body-length-node@4.2.3", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-ZkJGvqBzMHVHE7r/hcuCxlTY8pQr1kMtdsVPs7ex4mMU+EAbcXppfo5NmyxMYi2XU49eqaz56j2gsk4dHHPG/g=="], + "@smithy/util-config-provider": ["@smithy/util-config-provider@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-7yflDiFlO+bVXjI7BJe3B8jx5HyGCI146xrkZRwK9pO2ParfgWzgGfPGK3KsXkxcU+EBzIz1kFnX7fJRxAMbQA=="], - "@smithy/util-buffer-from": ["@smithy/util-buffer-from@4.2.2", "", { "dependencies": { "@smithy/is-array-buffer": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-FDXD7cvUoFWwN6vtQfEta540Y/YBe5JneK3SoZg9bThSoOAC/eGeYEua6RkBgKjGa/sz6Y+DuBZj3+YEY21y4Q=="], + "@smithy/util-defaults-mode-browser": ["@smithy/util-defaults-mode-browser@4.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-LbE6AGHhQOunqIN5UyWDMgpPwmUHUzrV2NtUOQ+lt6Stpipzo6S7uDyeGtO0GGgUD1balEPCNu8Xfl1AQNiruQ=="], - "@smithy/util-config-provider": ["@smithy/util-config-provider@4.2.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-dWU03V3XUprJwaUIFVv4iOnS1FC9HnMHDfUrlNDSh4315v0cWyaIErP8KiqGVbf5z+JupoVpNM7ZB3jFiTejvQ=="], + "@smithy/util-defaults-mode-node": ["@smithy/util-defaults-mode-node@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-72gNpNDQ2iIGbaNmeaF9I58shWsEuD5tNI7my5uXlm1CSPH5i8IKI/nzU50qqB8y+kgw/qTLGgsf0We5qeM/aA=="], - "@smithy/util-defaults-mode-browser": ["@smithy/util-defaults-mode-browser@4.3.49", "", { "dependencies": { "@smithy/property-provider": "^4.2.14", "@smithy/smithy-client": "^4.12.13", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-a5bNrdiONYB/qE2BuKegvUMd/+ZDwdg4vsNuuSzYE8qs2EYAdK9CynL+Rzn29PbPiUqoz/cbpRbcLzD5lEevHw=="], + "@smithy/util-endpoints": ["@smithy/util-endpoints@3.5.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-NJhe8KmNjeZ7V+gJsQR5xw0IN47N8pBKosed40xfhelDuYkg8VQ5CVGDcHTEuJq3e3zQb21vnoOOReQothejhA=="], - "@smithy/util-defaults-mode-node": ["@smithy/util-defaults-mode-node@4.2.54", "", { "dependencies": { "@smithy/config-resolver": "^4.4.17", "@smithy/credential-provider-imds": "^4.2.14", "@smithy/node-config-provider": "^4.3.14", "@smithy/property-provider": "^4.2.14", "@smithy/smithy-client": "^4.12.13", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-g1cvrJvOnzeJgEdf7AE4luI7gp6L8weE0y9a9wQUSGtjb8QRHDbCJYuE4Sy0SD9N8RrnNPFsPltAz/OSoBR9Zw=="], + "@smithy/util-middleware": ["@smithy/util-middleware@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-N1IR4bMHIDbqO3GxkJHgqNGsnrd7MNrj+EVqhFqKeRqSBV5I3KCjNllKfnbF9KV0YteGhfLqcMR5CYsPLJqpqw=="], - "@smithy/util-endpoints": ["@smithy/util-endpoints@3.4.2", "", { "dependencies": { "@smithy/node-config-provider": "^4.3.14", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-a55Tr+3OKld4TTtnT+RhKOQHyPxm3j/xL4OR83WBUhLJaKDS9dnJ7arRMOp3t31dcLhApwG9bgvrRXBHlLdIkg=="], + "@smithy/util-retry": ["@smithy/util-retry@4.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-W9Ovy9i02yGqtLlpqZNQuXNxXc5OPfXujnembxN/FxyBtGjJd8vKY0PQYEJ8FNybTOcXG+ZxsSsX23HOb3zQzg=="], - "@smithy/util-hex-encoding": ["@smithy/util-hex-encoding@4.2.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-Qcz3W5vuHK4sLQdyT93k/rfrUwdJ8/HZ+nMUOyGdpeGA1Wxt65zYwi3oEl9kOM+RswvYq90fzkNDahPS8K0OIg=="], + "@smithy/util-stream": ["@smithy/util-stream@4.6.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-PFzBVEBP5k8R+mK/c+VAKmtpUTL+KzBIXWJ6oM0GWOb31K+QgymXV9IW03XLPM1wtkC7oAb9ZBN2aswSSVbNFg=="], - "@smithy/util-middleware": ["@smithy/util-middleware@4.2.14", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-1Su2vj9RYNDEv/V+2E+jXkkwGsgR7dc4sfHn9Z7ruzQHJIEni9zzw5CauvRXlFJfmgcqYP8fWa0dkh2Q2YaQyw=="], + "@smithy/util-utf8": ["@smithy/util-utf8@4.3.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-l1d7I7YP2LjXjAZDC7eXqkzuEB75KfCANwhNj/knmT6+0a9XG3QasvI8kEn8WAI3tx/q8PdmSuuXcM+MTkk/7Q=="], - "@smithy/util-retry": ["@smithy/util-retry@4.3.4", "", { "dependencies": { "@smithy/service-error-classification": "^4.3.0", "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-FY1UQQ1VFmMwiYp1GVS4MeaGD5O0blLNYK0xCRHU+mJgeoH/hSY8Ld8sJWKQ6uznkh14HveRGQJncgPyNl9J+A=="], - - "@smithy/util-stream": ["@smithy/util-stream@4.5.25", "", { "dependencies": { "@smithy/fetch-http-handler": "^5.3.17", "@smithy/node-http-handler": "^4.6.1", "@smithy/types": "^4.14.1", "@smithy/util-base64": "^4.3.2", "@smithy/util-buffer-from": "^4.2.2", "@smithy/util-hex-encoding": "^4.2.2", "@smithy/util-utf8": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-/PFpG4k8Ze8Ei+mMKj3oiPICYekthuzePZMgZbCqMiXIHHf4n2aZ4Ps0aSRShycFTGuj/J6XldmC0x0DwednIA=="], - - "@smithy/util-uri-escape": ["@smithy/util-uri-escape@4.2.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-2kAStBlvq+lTXHyAZYfJRb/DfS3rsinLiwb+69SstC9Vb0s9vNWkRwpnj918Pfi85mzi42sOqdV72OLxWAISnw=="], - - "@smithy/util-utf8": ["@smithy/util-utf8@4.2.2", "", { "dependencies": { "@smithy/util-buffer-from": "^4.2.2", "tslib": "^2.6.2" } }, "sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw=="], - - "@smithy/util-waiter": ["@smithy/util-waiter@4.2.16", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-GtclrKoZ3Lt7jPQ7aTIYKfjY92OgceScftVnkTsG8e1KV8rkvZgN+ny6YSRhd9hxB8rZtwVbmln7NTvE5O3GmQ=="], - - "@smithy/uuid": ["@smithy/uuid@1.1.2", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g=="], + "@smithy/util-waiter": ["@smithy/util-waiter@4.4.5", "", { "dependencies": { "@smithy/core": "^3.24.5", "tslib": "^2.6.2" } }, "sha512-EYviebytZE6vplW0AGwZ2Rc3sNuVR83lfUCNZu11VchUiKhMwJqrRWy7iVDTNEwG/vEwItno591Iad6/prj6Bw=="], "@speed-highlight/core": ["@speed-highlight/core@1.2.15", "", {}, "sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw=="], @@ -1991,23 +2093,23 @@ "@tanstack/devtools-event-client": ["@tanstack/devtools-event-client@0.4.3", "", { "bin": { "intent": "bin/intent.js" } }, "sha512-OZI6QyULw0FI0wjgmeYzCIfbgPsOEzwJtCpa69XrfLMtNXLGnz3d/dIabk7frg0TmHo+Ah49w5I4KC7Tufwsvw=="], - "@tanstack/form-core": ["@tanstack/form-core@1.29.1", "", { "dependencies": { "@tanstack/devtools-event-client": "^0.4.1", "@tanstack/pacer-lite": "^0.1.1", "@tanstack/store": "^0.9.1" } }, "sha512-NIYPO36eEu7nSWvMpbFDQaBWyVtnH/C8fsZ3/XpJUT4uOWgmxsiUvHGbTbDNIQTXAKIkhwEl0sUrqBNn2SfUnw=="], + "@tanstack/form-core": ["@tanstack/form-core@1.33.0", "", { "dependencies": { "@tanstack/devtools-event-client": "^0.4.1", "@tanstack/pacer-lite": "^0.1.1", "@tanstack/store": "^0.11.0" } }, "sha512-AV4Pw9Dk4orFsuPBcDssfWMJFs+yMYBae7zZ4oTqrCf4ftNGQKxvrQRZeqKHG6A4TkiLeSvf2kzIjcVkrW7E6w=="], "@tanstack/pacer-lite": ["@tanstack/pacer-lite@0.1.1", "", {}, "sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w=="], - "@tanstack/query-core": ["@tanstack/query-core@5.100.1", "", {}, "sha512-awvQhOO/2TrSCHE5LKKsXcvvj6WSBncwEcMFCB/ez0Qs0b17iyyivoGArNV3HFfXryZwCpnb/olsaBBKrIbtSw=="], + "@tanstack/query-core": ["@tanstack/query-core@5.100.14", "", {}, "sha512-5X41dGpxgeaHISCRW2oYwcSycZeULZzAunaudXT9ov1KOTj9xwt0CH6hbwqP1/z74ZWF7rYFnDpyYH07XFcZew=="], - "@tanstack/query-devtools": ["@tanstack/query-devtools@5.100.1", "", {}, "sha512-jZLV2l7XjYxXCrXHj9pj15gZuY8Te+idoSPS2hIh3+SxOd20Gn0rfUoqEw9vc+us/b16hi0/DWqpzx9O1ZsyIQ=="], + "@tanstack/query-devtools": ["@tanstack/query-devtools@5.100.14", "", {}, "sha512-g96SmSSQecYTYcyuAMRXr895GplJv01UGt7qttQWPOUyZ5EGz5tbRc589bMc2m5BsPFD6O0PCEAHdbDYNP6UBw=="], - "@tanstack/react-form": ["@tanstack/react-form@1.29.1", "", { "dependencies": { "@tanstack/form-core": "1.29.1", "@tanstack/react-store": "^0.9.1" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-hVHk4g0phd0HxRsv2ry6Xt8BqmalT55Q3cokhJBCC1St0hcGZhgwJJbohm9atao45BPG9e55DGvtbwExqZe35g=="], + "@tanstack/react-form": ["@tanstack/react-form@1.33.0", "", { "dependencies": { "@tanstack/form-core": "1.33.0", "@tanstack/react-store": "^0.11.0" }, "peerDependencies": { "@tanstack/react-start": "*", "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@tanstack/react-start"] }, "sha512-unaee+VS4MvKo+s1dmgGUXI4902VeAhuaUbKsQbhFe3MceOpB3JpAUGCDpyzjQPXVFkFY0COKfLrUNX2XZYW4g=="], - "@tanstack/react-query": ["@tanstack/react-query@5.100.1", "", { "dependencies": { "@tanstack/query-core": "5.100.1" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-UgWRLhQKprC37SsO6y1zRabOqDmM2gsdTNPbqTT35yl7kOOhwXU4nyfOiGHXPwoEFJV1IpSk85hjIFjNFWVpzw=="], + "@tanstack/react-query": ["@tanstack/react-query@5.100.14", "", { "dependencies": { "@tanstack/query-core": "5.100.14" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-oOr6aRdSFEwWhzxEkD/9ZcItM3+LjBSkeVmadWKwUssAHTsqd/7bOjWrX4AbvEkoEhgAxzN0Xk6H/aYzXiYBAw=="], - "@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.100.1", "", { "dependencies": { "@tanstack/query-devtools": "5.100.1" }, "peerDependencies": { "@tanstack/react-query": "^5.100.1", "react": "^18 || ^19" } }, "sha512-JuLinBUl/BlZhm0WVX83fJgE2a3YSbuEdxf3fgP+THg92hX7YfwuH5DzT35a6sL/rifZsPr0yJ9itB6jDOcdRg=="], + "@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.100.14", "", { "dependencies": { "@tanstack/query-devtools": "5.100.14" }, "peerDependencies": { "@tanstack/react-query": "^5.100.14", "react": "^18 || ^19" } }, "sha512-JkP5VDgKOw3t/QSA1OABRHEqx8BuNs5MfvZRooNqdvN57SzTuGq3fKR1a2IH5rqa5HDLUm+FOXUEnB9ueHiLzg=="], - "@tanstack/react-store": ["@tanstack/react-store@0.9.3", "", { "dependencies": { "@tanstack/store": "0.9.3", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-y2iHd/N9OkoQbFJLUX1T9vbc2O9tjH0pQRgTcx1/Nz4IlwLvkgpuglXUx+mXt0g5ZDFrEeDnONPqkbfxXJKwRg=="], + "@tanstack/react-store": ["@tanstack/react-store@0.11.0", "", { "dependencies": { "@tanstack/store": "0.11.0", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-tX4YXh3PDkmpvGQWkWqKpzs/MSqbtuwY9dWdWhtV9Q50PmO+jOkUKIWIX4G85dwt7lxdHLXsiaEKPdKmC8F41w=="], - "@tanstack/store": ["@tanstack/store@0.9.3", "", {}, "sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw=="], + "@tanstack/store": ["@tanstack/store@0.11.0", "", {}, "sha512-WlzzCt3xi0G6pCAJu1U+2jiECwabETDpQDi3hfkFZvJii9AuZqEKbOiVarX1/bWhTNjU486yQtJCCasi/0q+Cw=="], "@tokenizer/inflate": ["@tokenizer/inflate@0.4.1", "", { "dependencies": { "debug": "^4.4.3", "token-types": "^6.1.1" } }, "sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA=="], @@ -2015,7 +2117,7 @@ "@tootallnate/quickjs-emscripten": ["@tootallnate/quickjs-emscripten@0.23.0", "", {}, "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="], - "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="], + "@tybys/wasm-util": ["@tybys/wasm-util@0.10.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg=="], "@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="], @@ -2025,7 +2127,7 @@ "@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="], - "@types/bun": ["@types/bun@1.3.13", "", { "dependencies": { "bun-types": "1.3.13" } }, "sha512-9fqXWk5YIHGGnUau9TEi+qdlTYDAnOj+xLCmSTwXfAIqXr2x4tytJb43E9uCvt09zJURKXwAtkoH4nLQfzeTXw=="], + "@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="], "@types/d3-array": ["@types/d3-array@3.2.2", "", {}, "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw=="], @@ -2047,7 +2149,7 @@ "@types/debug": ["@types/debug@4.1.13", "", { "dependencies": { "@types/ms": "*" } }, "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw=="], - "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], + "@types/estree": ["@types/estree@1.0.9", "", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="], "@types/fs-extra": ["@types/fs-extra@11.0.4", "", { "dependencies": { "@types/jsonfile": "*", "@types/node": "*" } }, "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ=="], @@ -2085,13 +2187,13 @@ "@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="], - "@types/node": ["@types/node@25.6.0", "", { "dependencies": { "undici-types": "~7.19.0" } }, "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ=="], + "@types/node": ["@types/node@25.9.1", "", { "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } }, "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg=="], "@types/nodemailer": ["@types/nodemailer@6.4.23", "", { "dependencies": { "@types/node": "*" } }, "sha512-aFV3/NsYFLSx9mbb5gtirBSXJnAlrusoKNuPbxsASWc7vrKLmIrTQRpdcxNcSFL3VW2A2XpeLEavwb2qMi6nlQ=="], "@types/pg": ["@types/pg@8.20.0", "", { "dependencies": { "@types/node": "*", "pg-protocol": "*", "pg-types": "^2.2.0" } }, "sha512-bEPFOaMAHTEP1EzpvHTbmwR8UsFyHSKsRisLIHVMXnpNefSbGA1bD6CVy+qKjGSqmZqNqBDV2azOBo8TgkcVow=="], - "@types/react": ["@types/react@19.2.14", "", { "dependencies": { "csstype": "^3.2.2" } }, "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w=="], + "@types/react": ["@types/react@19.2.15", "", { "dependencies": { "csstype": "^3.2.2" } }, "sha512-eRwcGNHve+E8qtEQSSRl6urh+rFop4v8gm6O8rGv25CodbvFdLjA1vVQ1KkiFE0w0UPOnb8tDiFKL5lp0rtY5Q=="], "@types/react-dom": ["@types/react-dom@19.2.3", "", { "peerDependencies": { "@types/react": "^19.2.0" } }, "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ=="], @@ -2103,6 +2205,8 @@ "@types/use-sync-external-store": ["@types/use-sync-external-store@0.0.6", "", {}, "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="], + "@types/uuid": ["@types/uuid@11.0.0", "", { "dependencies": { "uuid": "*" } }, "sha512-HVyk8nj2m+jcFRNazzqyVKiZezyhDKrGUA3jlEcg/nZ6Ms+qHwocba1Y/AaVaznJTAM9xpdFSh+ptbNrhOGvZA=="], + "@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="], "@types/yargs": ["@types/yargs@17.0.35", "", { "dependencies": { "@types/yargs-parser": "*" } }, "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg=="], @@ -2111,27 +2215,27 @@ "@types/yauzl": ["@types/yauzl@2.10.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q=="], - "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@7.18.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/type-utils": "7.18.0", "@typescript-eslint/utils": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", "ts-api-utils": "^1.3.0" }, "peerDependencies": { "@typescript-eslint/parser": "^7.0.0", "eslint": "^8.56.0" } }, "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw=="], + "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@7.18.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/type-utils": "7.18.0", "@typescript-eslint/utils": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", "ts-api-utils": "^1.3.0" }, "peerDependencies": { "@typescript-eslint/parser": "^7.0.0", "eslint": "^8.56.0", "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw=="], - "@typescript-eslint/parser": ["@typescript-eslint/parser@7.18.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", "@typescript-eslint/typescript-estree": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.56.0" } }, "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg=="], + "@typescript-eslint/parser": ["@typescript-eslint/parser@7.18.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", "@typescript-eslint/typescript-estree": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.56.0", "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg=="], - "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.59.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.59.0", "@typescript-eslint/types": "^8.59.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw=="], + "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.60.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.60.0", "@typescript-eslint/types": "^8.60.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg=="], "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@7.18.0", "", { "dependencies": { "@typescript-eslint/types": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0" } }, "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA=="], - "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.59.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg=="], + "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.60.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ=="], - "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@7.18.0", "", { "dependencies": { "@typescript-eslint/typescript-estree": "7.18.0", "@typescript-eslint/utils": "7.18.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, "peerDependencies": { "eslint": "^8.56.0" } }, "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA=="], + "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@7.18.0", "", { "dependencies": { "@typescript-eslint/typescript-estree": "7.18.0", "@typescript-eslint/utils": "7.18.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, "peerDependencies": { "eslint": "^8.56.0", "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA=="], "@typescript-eslint/types": ["@typescript-eslint/types@7.18.0", "", {}, "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ=="], - "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@7.18.0", "", { "dependencies": { "@typescript-eslint/types": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^1.3.0" } }, "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA=="], + "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@7.18.0", "", { "dependencies": { "@typescript-eslint/types": "7.18.0", "@typescript-eslint/visitor-keys": "7.18.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^1.3.0" }, "peerDependencies": { "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA=="], "@typescript-eslint/utils": ["@typescript-eslint/utils@7.18.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", "@typescript-eslint/typescript-estree": "7.18.0" }, "peerDependencies": { "eslint": "^8.56.0" } }, "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw=="], "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@7.18.0", "", { "dependencies": { "@typescript-eslint/types": "7.18.0", "eslint-visitor-keys": "^3.4.3" } }, "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg=="], - "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="], + "@ungap/structured-clone": ["@ungap/structured-clone@1.3.1", "", {}, "sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ=="], "@vercel/oidc": ["@vercel/oidc@3.2.0", "", {}, "sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug=="], @@ -2151,15 +2255,15 @@ "@vitest/utils": ["@vitest/utils@3.1.4", "", { "dependencies": { "@vitest/pretty-format": "3.1.4", "loupe": "^3.1.3", "tinyrainbow": "^2.0.0" } }, "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg=="], - "@vue/compiler-core": ["@vue/compiler-core@3.5.34", "", { "dependencies": { "@babel/parser": "^7.29.3", "@vue/shared": "3.5.34", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw=="], + "@vue/compiler-core": ["@vue/compiler-core@3.5.35", "", { "dependencies": { "@babel/parser": "^7.29.3", "@vue/shared": "3.5.35", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "sha512-BUmHaR1J+O+CKZ9uJucdVTEr1LHsdyvv7vG3eNRhK3CczEHeMd/LtsHAuD7PbrxvI2envCY2v7HI1vC1aBRzKw=="], - "@vue/compiler-dom": ["@vue/compiler-dom@3.5.34", "", { "dependencies": { "@vue/compiler-core": "3.5.34", "@vue/shared": "3.5.34" } }, "sha512-EbF/T++k0e2MMZlJsBhzK8Sgwt0HcIPOhzn1CTB/lv6sQcyk+OWf8YeiLxZp3ro7MbbLcAfAJ6sEvjFWuNgUCw=="], + "@vue/compiler-dom": ["@vue/compiler-dom@3.5.35", "", { "dependencies": { "@vue/compiler-core": "3.5.35", "@vue/shared": "3.5.35" } }, "sha512-k+bprkXxuqhVajgTx5mUHuir7TwQzUKOWR40ng1ncAqQRPnrLngGGgqVEEhOnTMlc8btHYVKmrP8s5Qyg0hvYA=="], - "@vue/compiler-sfc": ["@vue/compiler-sfc@3.5.34", "", { "dependencies": { "@babel/parser": "^7.29.3", "@vue/compiler-core": "3.5.34", "@vue/compiler-dom": "3.5.34", "@vue/compiler-ssr": "3.5.34", "@vue/shared": "3.5.34", "estree-walker": "^2.0.2", "magic-string": "^0.30.21", "postcss": "^8.5.14", "source-map-js": "^1.2.1" } }, "sha512-D/ihr6uZeIt6r+pVZf46RWT1fAsLFMbUP7k8G1VkiiWexriED9GrX3echHd4Abbt17zjlfiFJ8z7a3BxZOPNjg=="], + "@vue/compiler-sfc": ["@vue/compiler-sfc@3.5.35", "", { "dependencies": { "@babel/parser": "^7.29.3", "@vue/compiler-core": "3.5.35", "@vue/compiler-dom": "3.5.35", "@vue/compiler-ssr": "3.5.35", "@vue/shared": "3.5.35", "estree-walker": "^2.0.2", "magic-string": "^0.30.21", "postcss": "^8.5.15", "source-map-js": "^1.2.1" } }, "sha512-G5VPMcXTSywXBgtFOZOnHKBxKSrwXUcvY1iaF5/hRcy7t0J6CH/d8ha9F4nzi00Fax1eLV0QHM7v4mQu68jydw=="], - "@vue/compiler-ssr": ["@vue/compiler-ssr@3.5.34", "", { "dependencies": { "@vue/compiler-dom": "3.5.34", "@vue/shared": "3.5.34" } }, "sha512-cDtTHKibkThKGHH1SP+WdccquNRYQDFH6rRjQCqT9G2ltFAfoR5pUftpab/z+aM5mW9HLLVQW7hfKKQe/1GBeQ=="], + "@vue/compiler-ssr": ["@vue/compiler-ssr@3.5.35", "", { "dependencies": { "@vue/compiler-dom": "3.5.35", "@vue/shared": "3.5.35" } }, "sha512-rGhAeXgdM7/ffTJGXT69rCCdTmjDewnFuUZfBQQHTdcEBeWdT5HCGY60y2ytLJr9/Dsu7IntUi5z/w0h6Rjnzw=="], - "@vue/shared": ["@vue/shared@3.5.34", "", {}, "sha512-24uqU4OIiX29ryC3MeWid/Xf2fa2EFRUVLb77nRhk+UrTVrh/XiGtFAFmJBAtBRbjwNdsPRP+jj/OL27Eg1NDA=="], + "@vue/shared": ["@vue/shared@3.5.35", "", {}, "sha512-zSbjL7gRXwks2ZQLRGCajBtBXEOXW9Ddhn/HvSdrGkE2dqGnumzW8XtusRrxrE9LvqtiqDXQ+A60Hp6mvdYxfA=="], "@xmldom/xmldom": ["@xmldom/xmldom@0.8.13", "", {}, "sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw=="], @@ -2175,9 +2279,9 @@ "agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="], - "agents": ["agents@0.11.5", "", { "dependencies": { "@babel/plugin-proposal-decorators": "^7.29.0", "@cfworker/json-schema": "^4.1.1", "@modelcontextprotocol/sdk": "1.29.0", "@rolldown/plugin-babel": "^0.2.3", "cron-schedule": "^6.0.0", "mimetext": "^3.0.28", "nanoid": "^5.1.9", "partyserver": "^0.4.1", "partysocket": "1.1.18", "yargs": "^18.0.0" }, "peerDependencies": { "@cloudflare/ai-chat": ">=0.0.8 <1.0.0", "@cloudflare/codemode": ">=0.0.7 <1.0.0", "@tanstack/ai": ">=0.10.2 <1.0.0", "@x402/core": "^2.0.0", "@x402/evm": "^2.0.0", "ai": "^6.0.0", "react": "^19.0.0", "vite": ">=6.0.0 <9.0.0", "zod": "^4.0.0" }, "optionalPeers": ["@cloudflare/ai-chat", "@cloudflare/codemode", "@tanstack/ai", "@x402/core", "@x402/evm", "vite"], "bin": { "agents": "dist/cli/index.js" } }, "sha512-1wPkA7OOfEdR4GKwaBmqdnZkOxutN2mCsolVU4ekg5QxrTLnC9Vz9LyZPcGqV2ldyfpUY7R73AUqtig5iYRLvQ=="], + "agents": ["agents@0.11.9", "", { "dependencies": { "@babel/plugin-proposal-decorators": "^7.29.0", "@cfworker/json-schema": "^4.1.1", "@modelcontextprotocol/sdk": "1.29.0", "@rolldown/plugin-babel": "^0.2.3", "cron-schedule": "^6.0.0", "mimetext": "^3.0.28", "nanoid": "^5.1.9", "partyserver": "^0.5.5", "partysocket": "1.1.18", "yargs": "^18.0.0" }, "peerDependencies": { "@cloudflare/ai-chat": ">=0.5.2 <1.0.0", "@cloudflare/codemode": ">=0.3.4 <1.0.0", "@tanstack/ai": ">=0.10.2 <1.0.0", "@x402/core": "^2.0.0", "@x402/evm": "^2.0.0", "ai": "^6.0.0", "react": "^19.0.0", "vite": ">=6.0.0 <9.0.0", "zod": "^4.0.0" }, "optionalPeers": ["@cloudflare/ai-chat", "@cloudflare/codemode", "@tanstack/ai", "@x402/core", "@x402/evm", "vite"], "bin": { "agents": "dist/cli/index.js" } }, "sha512-La8kXl/zEr9tu17Xc5BXb5Xz5yfrH+Oh98nnWtj1OxteO1AB0i2R26w77pXCT0ffViLaE3RtgN2dOq8QGDTwsA=="], - "ai": ["ai@6.0.168", "", { "dependencies": { "@ai-sdk/gateway": "3.0.104", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-2HqCJuO+1V2aV7vfYs5LFEUfxbkGX+5oa54q/gCCTL7KLTdbxcCu5D7TdLA5kwsrs3Szgjah9q6D9tpjHM3hUQ=="], + "ai": ["ai@6.0.193", "", { "dependencies": { "@ai-sdk/gateway": "3.0.121", "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27", "@opentelemetry/api": "^1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-VQOTOse8+X8kMtg61DNSXlYJzwOW4NjMLDJNk/qxClWsFe4oiyFJDHGGG1oezfGcFzuYuQe/8Z7r4kwiZWh2YQ=="], "ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="], @@ -2231,7 +2335,7 @@ "assertion-error": ["assertion-error@2.0.1", "", {}, "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="], - "ast-module-types": ["ast-module-types@6.0.1", "", {}, "sha512-WHw67kLXYbZuHTmcdbIrVArCq5wxo6NEuj3hiYAWr8mwJeC+C2mMCIBIWCiDoCye/OF/xelc+teJ1ERoWmnEIA=="], + "ast-module-types": ["ast-module-types@6.0.2", "", {}, "sha512-6KuK/7nZ/2Qh7sGuVEiwxjCxzTY2Pdb5mTo5z1e6/J8BA0tvjR7G8vQJKrQMTqwmnA3UPEyKIFX4YUS1DO1Hvw=="], "ast-types": ["ast-types@0.13.4", "", { "dependencies": { "tslib": "^2.0.1" } }, "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="], @@ -2269,7 +2373,7 @@ "babel-preset-current-node-syntax": ["babel-preset-current-node-syntax@1.2.0", "", { "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-import-attributes": "^7.24.7", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-numeric-separator": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5" }, "peerDependencies": { "@babel/core": "^7.0.0 || ^8.0.0-0" } }, "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg=="], - "babel-preset-expo": ["babel-preset-expo@55.0.21", "", { "dependencies": { "@babel/generator": "^7.20.5", "@babel/helper-module-imports": "^7.25.9", "@babel/plugin-proposal-decorators": "^7.12.9", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-transform-class-static-block": "^7.27.1", "@babel/plugin-transform-export-namespace-from": "^7.25.9", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.0", "@react-native/babel-preset": "0.83.6", "babel-plugin-react-compiler": "^1.0.0", "babel-plugin-react-native-web": "~0.21.0", "babel-plugin-syntax-hermes-parser": "^0.32.0", "babel-plugin-transform-flow-enums": "^0.0.2", "debug": "^4.3.4", "resolve-from": "^5.0.0" }, "peerDependencies": { "@babel/runtime": "^7.20.0", "expo": "*", "expo-widgets": "^55.0.17", "react-refresh": ">=0.14.0 <1.0.0" }, "optionalPeers": ["@babel/runtime", "expo", "expo-widgets"] }, "sha512-anXoUZBcxydLdVs2L+r3bWKGUvZv2FtgOl8xRJ12i/YfKICBpwTGZWSTiEYTqBByZ6GkA3mE9+3TW97X2ocFTQ=="], + "babel-preset-expo": ["babel-preset-expo@55.0.22", "", { "dependencies": { "@babel/generator": "^7.20.5", "@babel/helper-module-imports": "^7.25.9", "@babel/plugin-proposal-decorators": "^7.12.9", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-transform-class-static-block": "^7.27.1", "@babel/plugin-transform-export-namespace-from": "^7.25.9", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.0", "@react-native/babel-preset": "0.83.6", "babel-plugin-react-compiler": "^1.0.0", "babel-plugin-react-native-web": "~0.21.0", "babel-plugin-syntax-hermes-parser": "^0.32.0", "babel-plugin-transform-flow-enums": "^0.0.2", "debug": "^4.3.4", "resolve-from": "^5.0.0" }, "peerDependencies": { "@babel/runtime": "^7.20.0", "expo": "*", "expo-widgets": "^55.0.19", "react-refresh": ">=0.14.0 <1.0.0" }, "optionalPeers": ["@babel/runtime", "expo", "expo-widgets"] }, "sha512-Se6kPnvCNN13jJVIa6JJvlmImVoVRzu9stagAbivCPcfrq2VNrsEiYpJZ1+H32kXinKW/y797/wctGuxPy0APw=="], "babel-preset-jest": ["babel-preset-jest@29.6.3", "", { "dependencies": { "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA=="], @@ -2277,7 +2381,7 @@ "balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="], - "bare-events": ["bare-events@2.8.2", "", { "peerDependencies": { "bare-abort-controller": "*" }, "optionalPeers": ["bare-abort-controller"] }, "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ=="], + "bare-events": ["bare-events@2.8.3", "", { "peerDependencies": { "bare-abort-controller": "*" }, "optionalPeers": ["bare-abort-controller"] }, "sha512-HdUm8EMQBLaJvGUdidNNbqpA1kYkwNcb+MYxkxCLAPJGQzlv9J0C24h8V65Z4c5GLd/JEALDvpFCQgpLJqc0zw=="], "bare-fs": ["bare-fs@4.7.1", "", { "dependencies": { "bare-events": "^2.5.4", "bare-path": "^3.0.0", "bare-stream": "^2.6.4", "bare-url": "^2.2.2", "fast-fifo": "^1.3.2" }, "peerDependencies": { "bare-buffer": "*" }, "optionalPeers": ["bare-buffer"] }, "sha512-WDRsyVN52eAx/lBamKD6uyw8H4228h/x0sGGGegOamM2cd7Pag88GfMQalobXI+HaEUxpCkbKQUDOQqt9wawRw=="], @@ -2293,13 +2397,13 @@ "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="], - "baseline-browser-mapping": ["baseline-browser-mapping@2.10.21", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA=="], + "baseline-browser-mapping": ["baseline-browser-mapping@2.10.33", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-bA6+tcSLpz2tIEdDXZPpPTIuxBcC4+w6SieaYyfigIa4h8GlFxbA17v22Vx3JUtuZQj9SgOsnbK+aTBzyDyEuw=="], "basic-ftp": ["basic-ftp@5.3.1", "", {}, "sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw=="], "bcryptjs": ["bcryptjs@3.0.3", "", { "bin": { "bcrypt": "bin/bcrypt" } }, "sha512-GlF5wPWnSa/X5LKM1o0wz0suXIINz1iHRLvTS+sLyi7XPbe5ycmYI3DlZqVGZZtDgl4DmasFg7gOB3JYbphV5g=="], - "better-auth": ["better-auth@1.6.9", "", { "dependencies": { "@better-auth/core": "1.6.9", "@better-auth/drizzle-adapter": "1.6.9", "@better-auth/kysely-adapter": "1.6.9", "@better-auth/memory-adapter": "1.6.9", "@better-auth/mongo-adapter": "1.6.9", "@better-auth/prisma-adapter": "1.6.9", "@better-auth/telemetry": "1.6.9", "@better-auth/utils": "0.4.0", "@better-fetch/fetch": "1.1.21", "@noble/ciphers": "^2.1.1", "@noble/hashes": "^2.0.1", "better-call": "1.3.5", "defu": "^6.1.4", "jose": "^6.1.3", "kysely": "^0.28.14", "nanostores": "^1.1.1", "zod": "^4.3.6" }, "peerDependencies": { "@lynx-js/react": "*", "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0", "@sveltejs/kit": "^2.0.0", "@tanstack/react-start": "^1.0.0", "@tanstack/solid-start": "^1.0.0", "better-sqlite3": "^12.0.0", "drizzle-kit": ">=0.31.4", "drizzle-orm": "^0.45.2", "mongodb": "^6.0.0 || ^7.0.0", "mysql2": "^3.0.0", "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "pg": "^8.0.0", "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "solid-js": "^1.0.0", "svelte": "^4.0.0 || ^5.0.0", "vitest": "^2.0.0 || ^3.0.0 || ^4.0.0", "vue": "^3.0.0" }, "optionalPeers": ["@lynx-js/react", "@prisma/client", "@sveltejs/kit", "@tanstack/react-start", "@tanstack/solid-start", "better-sqlite3", "drizzle-kit", "drizzle-orm", "mongodb", "mysql2", "next", "pg", "prisma", "react", "react-dom", "solid-js", "svelte", "vitest", "vue"] }, "sha512-EBFURtglyiEZxbx4NJBoqUD8J65dX24yC+6I9AUbIXNgUkt76mshzGbHkxZ3n/lB7Dwq3kBC+hHt0hUQsnL7HA=="], + "better-auth": ["better-auth@1.6.13", "", { "dependencies": { "@better-auth/core": "1.6.13", "@better-auth/drizzle-adapter": "1.6.13", "@better-auth/kysely-adapter": "1.6.13", "@better-auth/memory-adapter": "1.6.13", "@better-auth/mongo-adapter": "1.6.13", "@better-auth/prisma-adapter": "1.6.13", "@better-auth/telemetry": "1.6.13", "@better-auth/utils": "0.4.1", "@better-fetch/fetch": "1.1.21", "@noble/ciphers": "^2.1.1", "@noble/hashes": "^2.0.1", "better-call": "1.3.5", "defu": "^6.1.4", "jose": "^6.1.3", "kysely": "^0.28.17 || ^0.29.0", "nanostores": "^1.1.1", "zod": "^4.3.6" }, "peerDependencies": { "@lynx-js/react": "*", "@prisma/client": "^5.0.0 || ^6.0.0 || ^7.0.0", "@sveltejs/kit": "^2.0.0", "@tanstack/react-start": "^1.0.0", "@tanstack/solid-start": "^1.0.0", "better-sqlite3": "^12.0.0", "drizzle-kit": ">=0.31.4", "drizzle-orm": "^0.45.2", "mongodb": "^6.0.0 || ^7.0.0", "mysql2": "^3.0.0", "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "pg": "^8.0.0", "prisma": "^5.0.0 || ^6.0.0 || ^7.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "solid-js": "^1.0.0", "svelte": "^4.0.0 || ^5.0.0", "vitest": "^2.0.0 || ^3.0.0 || ^4.0.0", "vue": "^3.0.0" }, "optionalPeers": ["@lynx-js/react", "@prisma/client", "@sveltejs/kit", "@tanstack/react-start", "@tanstack/solid-start", "better-sqlite3", "drizzle-kit", "drizzle-orm", "mongodb", "mysql2", "next", "pg", "prisma", "react", "react-dom", "solid-js", "svelte", "vitest", "vue"] }, "sha512-jn8ATnGWDzMwpO4a/3iyW1/RayOF/aoPQOfAeqyCVnQCdqkaONVas9CjbY6PovMsTMa/MG+GRABySfzqtj5J/g=="], "better-auth-cloudflare": ["better-auth-cloudflare@0.3.0", "", { "dependencies": { "drizzle-orm": "^0.45.0", "mime": "^4.1.0", "zod": "^4.3.0" }, "peerDependencies": { "@better-auth/drizzle-adapter": "^1.5.0", "@cloudflare/workers-types": "^4.0.0", "better-auth": "^1.5.0" } }, "sha512-u0TrMbFhHNL2IFzkCbCQYyA/beeBSivdL+vfrNywYnsVrQO1qT5CC/yKhnRdrkwXLeNi9tCeoSwWoygTMSl0Yg=="], @@ -2327,7 +2431,7 @@ "bplist-parser": ["bplist-parser@0.3.2", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ=="], - "brace-expansion": ["brace-expansion@5.0.5", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ=="], + "brace-expansion": ["brace-expansion@5.0.6", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g=="], "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="], @@ -2343,7 +2447,7 @@ "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="], - "bun-types": ["bun-types@1.3.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-QXKeHLlOLqQX9LgYaHJfzdBaV21T63HhFJnvuRCcjZiaUDpbs5ED1MgxbMra71CsryN/1dAoXuJJJwIv/2drVA=="], + "bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], "burnt": ["burnt@0.13.0", "", { "dependencies": { "sf-symbols-typescript": "^1.0.0", "sonner": "^2.0.1" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-LjlQa7CLkGWUdz08YUIaGCJ8BLXib31/ztKqowgwqd7UH283A/kmdCj+1PYAQwDQEMPNmvSUfFHrjXbcwZibFQ=="], @@ -2367,7 +2471,7 @@ "camelize": ["camelize@1.0.1", "", {}, "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ=="], - "caniuse-lite": ["caniuse-lite@1.0.30001790", "", {}, "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw=="], + "caniuse-lite": ["caniuse-lite@1.0.30001793", "", {}, "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA=="], "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="], @@ -2381,10 +2485,14 @@ "character-entities-legacy": ["character-entities-legacy@3.0.0", "", {}, "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ=="], - "chardet": ["chardet@0.7.0", "", {}, "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="], + "chardet": ["chardet@2.1.1", "", {}, "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ=="], "check-error": ["check-error@2.1.3", "", {}, "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA=="], + "cheerio": ["cheerio@1.2.0", "", { "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", "domutils": "^3.2.2", "encoding-sniffer": "^0.2.1", "htmlparser2": "^10.1.0", "parse5": "^7.3.0", "parse5-htmlparser2-tree-adapter": "^7.1.0", "parse5-parser-stream": "^7.1.2", "undici": "^7.19.0", "whatwg-mimetype": "^4.0.0" } }, "sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg=="], + + "cheerio-select": ["cheerio-select@2.1.0", "", { "dependencies": { "boolbase": "^1.0.0", "css-select": "^5.1.0", "css-what": "^6.1.0", "domelementtype": "^2.3.0", "domhandler": "^5.0.3", "domutils": "^3.0.1" } }, "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g=="], + "chokidar": ["chokidar@4.0.3", "", { "dependencies": { "readdirp": "^4.0.1" } }, "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA=="], "chrome-launcher": ["chrome-launcher@0.13.4", "", { "dependencies": { "@types/node": "*", "escape-string-regexp": "^1.0.5", "is-wsl": "^2.2.0", "lighthouse-logger": "^1.0.0", "mkdirp": "^0.5.3", "rimraf": "^3.0.2" } }, "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A=="], @@ -2529,11 +2637,11 @@ "data-view-byte-offset": ["data-view-byte-offset@1.0.1", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-data-view": "^1.0.1" } }, "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ=="], - "date-fns": ["date-fns@4.1.0", "", {}, "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg=="], + "date-fns": ["date-fns@4.4.0", "", {}, "sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w=="], "date-fns-jalali": ["date-fns-jalali@4.1.0-0", "", {}, "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg=="], - "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], + "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="], "decamelize": ["decamelize@1.2.0", "", {}, "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="], @@ -2585,7 +2693,7 @@ "detective-es6": ["detective-es6@5.0.2", "", { "dependencies": { "node-source-walk": "^7.0.1" } }, "sha512-+qHHGYhjupiVs4rnIpI9nZ5B130A4AmE35ZX1w33hb46vcZ7T3jfDbvmPw0FhWtMHn5BS5HHu7ZtnZ53bMcXZA=="], - "detective-postcss": ["detective-postcss@8.0.3", "", { "dependencies": { "is-url-superb": "^4.0.0", "postcss-values-parser": "^6.0.2" }, "peerDependencies": { "postcss": "^8.4.47" } }, "sha512-0AQjxn13b14tLmeXQq0QAFXSP6vBZhWFfmEazyFQ+JVlVwfrYlKF6dGy4R06hqAiSZ9cRvFx0FW4uvVnx0WXiw=="], + "detective-postcss": ["detective-postcss@8.0.4", "", { "dependencies": { "is-url-superb": "^4.0.0", "postcss-values-parser": "^6.0.2" }, "peerDependencies": { "postcss": "^8.4.47" } }, "sha512-DZ7M/hWPZyr17ZUdoQ+TVXaPj70mYr4XXrAE+GeJbca44haCvZgb191L/jLJmFYewhxRJuBd4lUtNSu986TXag=="], "detective-sass": ["detective-sass@6.0.2", "", { "dependencies": { "gonzales-pe": "^4.3.0", "node-source-walk": "^7.0.1" } }, "sha512-i3xpXHDKS0qI2aFW4asQ7fqlPK00ndOVZELvQapFJCaF0VxYmsNWtd0AmvXbTLMk7bfO5VdIeorhY9KfmHVoVA=="], @@ -2597,7 +2705,7 @@ "detective-vue2": ["detective-vue2@2.3.0", "", { "dependencies": { "@dependents/detective-less": "^5.0.1", "@vue/compiler-sfc": "^3.5.32", "detective-es6": "^5.0.1", "detective-sass": "^6.0.1", "detective-scss": "^5.0.1", "detective-stylus": "^5.0.1", "detective-typescript": "^14.1.0" }, "peerDependencies": { "typescript": "^5.4.4 || ^6.0.2" } }, "sha512-3gwbZPqVTm9sL9XdZsgEJ7x4x99O853VVZHapQAiEkGuMJMpFPjHDrecSgfqnS5JW3FJfYXesLZGvUOibjn49g=="], - "devalue": ["devalue@5.7.1", "", {}, "sha512-MUbZ586EgQqdRnC4yDrlod3BEdyvE4TapGYHMW2CiaW+KkkFmWEFqBUaLltEZCGi0iFXCEjRF0OjF0DV2QHjOA=="], + "devalue": ["devalue@5.8.1", "", {}, "sha512-4CXDYRBGqN+57wVJkuXBYmpAVUSg3L6JAQa/DFqm238G73E1wuyc/JhGQJzN7vUf/CMphYau2zXbfWzDR5aTEw=="], "devlop": ["devlop@1.1.0", "", { "dependencies": { "dequal": "^2.0.0" } }, "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="], @@ -2625,7 +2733,7 @@ "drizzle-kit": ["drizzle-kit@0.31.10", "", { "dependencies": { "@drizzle-team/brocli": "^0.10.2", "@esbuild-kit/esm-loader": "^2.5.5", "esbuild": "^0.25.4", "tsx": "^4.21.0" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-7OZcmQUrdGI+DUNNsKBn1aW8qSoKuTH7d0mYgSP8bAzdFzKoovxEFnoGQp2dVs82EOJeYycqRtciopszwUf8bw=="], - "drizzle-orm": ["drizzle-orm@0.45.2", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-kY0BSaTNYWnoDMVoyY8uxmyHjpJW1geOmBMdSSicKo9CIIWkSxMIj2rkeSR51b8KAPB7m+qysjuHme5nKP+E5Q=="], + "drizzle-orm": ["drizzle-orm@0.45.2", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "prisma": "*", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "prisma", "sql.js", "sqlite3"] }, "sha512-kY0BSaTNYWnoDMVoyY8uxmyHjpJW1geOmBMdSSicKo9CIIWkSxMIj2rkeSR51b8KAPB7m+qysjuHme5nKP+E5Q=="], "drizzle-zod": ["drizzle-zod@0.8.3", "", { "peerDependencies": { "drizzle-orm": ">=0.36.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-66yVOuvGhKJnTdiqj1/Xaaz9/qzOdRJADpDa68enqS6g3t0kpNkwNYjUuaeXgZfO/UWuIM9HIhSlJ6C5ZraMww=="], @@ -2639,7 +2747,7 @@ "effector": ["effector@23.4.4", "", {}, "sha512-QkZboRN28K/iwxigDhlJcI3ux3aNbt8kYGGH/GkqWG0OlGeyuBhb7PdM89Iu+ogV8Lmz16xIlwnXR2UNWI6psg=="], - "electron-to-chromium": ["electron-to-chromium@1.5.344", "", {}, "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg=="], + "electron-to-chromium": ["electron-to-chromium@1.5.364", "", {}, "sha512-G/dYE3+AYhyHwzTwg8UbnXf7zqMERYh7l2jJ3QujhFsH8agSYwtnGAR2aZ7f0AakIKJXd5En/Hre4igIUrdlYw=="], "elysia": ["elysia@1.4.28", "", { "dependencies": { "cookie": "^1.1.1", "exact-mirror": "^0.2.7", "fast-decode-uri-component": "^1.0.1", "memoirist": "^0.4.0" }, "peerDependencies": { "@sinclair/typebox": ">= 0.34.0 < 1", "@types/bun": ">= 1.2.0", "file-type": ">= 20.0.0", "openapi-types": ">= 12.0.0", "typescript": ">= 5.0.0" }, "optionalPeers": ["@types/bun", "typescript"] }, "sha512-Vrx8sBnvq8squS/3yNBzR1jBXI+SgmnmvwawPjNuEHndUe5l1jV2Gp6JJ4ulDkEB8On6bWmmuyPpA+bq4t+WYg=="], @@ -2655,9 +2763,11 @@ "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="], + "encoding-sniffer": ["encoding-sniffer@0.2.1", "", { "dependencies": { "iconv-lite": "^0.6.3", "whatwg-encoding": "^3.1.1" } }, "sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw=="], + "end-of-stream": ["end-of-stream@1.4.5", "", { "dependencies": { "once": "^1.4.0" } }, "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg=="], - "enhanced-resolve": ["enhanced-resolve@5.21.0", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" } }, "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA=="], + "enhanced-resolve": ["enhanced-resolve@5.22.1", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.3.3" } }, "sha512-6QEuw3zoX1SJQc7b87aBXke/no+mG2bTBgw29gWMQonLmpEkWoCAVkl+M49e48AZlWzxiDzDZzYdp6kobcyLww=="], "enquirer": ["enquirer@2.4.1", "", { "dependencies": { "ansi-colors": "^4.1.1", "strip-ansi": "^6.0.1" } }, "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ=="], @@ -2681,7 +2791,7 @@ "es-module-lexer": ["es-module-lexer@1.7.0", "", {}, "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="], - "es-object-atoms": ["es-object-atoms@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="], + "es-object-atoms": ["es-object-atoms@1.1.2", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw=="], "es-set-tostringtag": ["es-set-tostringtag@2.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA=="], @@ -2689,7 +2799,7 @@ "es-to-primitive": ["es-to-primitive@1.3.0", "", { "dependencies": { "is-callable": "^1.2.7", "is-date-object": "^1.0.5", "is-symbol": "^1.0.4" } }, "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g=="], - "es-toolkit": ["es-toolkit@1.46.0", "", {}, "sha512-IToJ6ct9OLl5zz6WsC/1vZEwfSZ7Myil+ygl5Tf30Xjn9AEkzNB4kqp2G7VUJKF1DtTx/ra5M5KLlXvzOg51BA=="], + "es-toolkit": ["es-toolkit@1.47.0", "", {}, "sha512-n1GuoD0WEQZMBk5tttoZSqwgyLx01oqa5XsBmCHwPyNe1S9jPBEmtR2pSgp2kJuWE3ciFZ6yRHmY4pM4C3OOkw=="], "esbuild": ["esbuild@0.27.3", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.27.3", "@esbuild/android-arm": "0.27.3", "@esbuild/android-arm64": "0.27.3", "@esbuild/android-x64": "0.27.3", "@esbuild/darwin-arm64": "0.27.3", "@esbuild/darwin-x64": "0.27.3", "@esbuild/freebsd-arm64": "0.27.3", "@esbuild/freebsd-x64": "0.27.3", "@esbuild/linux-arm": "0.27.3", "@esbuild/linux-arm64": "0.27.3", "@esbuild/linux-ia32": "0.27.3", "@esbuild/linux-loong64": "0.27.3", "@esbuild/linux-mips64el": "0.27.3", "@esbuild/linux-ppc64": "0.27.3", "@esbuild/linux-riscv64": "0.27.3", "@esbuild/linux-s390x": "0.27.3", "@esbuild/linux-x64": "0.27.3", "@esbuild/netbsd-arm64": "0.27.3", "@esbuild/netbsd-x64": "0.27.3", "@esbuild/openbsd-arm64": "0.27.3", "@esbuild/openbsd-x64": "0.27.3", "@esbuild/openharmony-arm64": "0.27.3", "@esbuild/sunos-x64": "0.27.3", "@esbuild/win32-arm64": "0.27.3", "@esbuild/win32-ia32": "0.27.3", "@esbuild/win32-x64": "0.27.3" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg=="], @@ -2707,11 +2817,11 @@ "eslint-config-prettier": ["eslint-config-prettier@9.1.2", "", { "peerDependencies": { "eslint": ">=7.0.0" }, "bin": { "eslint-config-prettier": "bin/cli.js" } }, "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ=="], - "eslint-config-universe": ["eslint-config-universe@15.0.3", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "^8.29.1", "@typescript-eslint/parser": "^8.29.1", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.17.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^5.2.6", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^5.2.0", "globals": "^16.0.0" }, "peerDependencies": { "eslint": ">=8.10", "prettier": ">=3" }, "optionalPeers": ["prettier"] }, "sha512-fUMsNXp7GJBu7Sz9PXFBbXhkiixdQ5sbnViFIBbk6ORAfeokczJ+eVv5HQ2gwxPQdbfJarpkO9WZDtxIvJnEGw=="], + "eslint-config-universe": ["eslint-config-universe@15.2.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "^8.59.0", "@typescript-eslint/parser": "^8.59.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.31.0", "eslint-plugin-n": "^17.17.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^5.2.6", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^7.0.0", "globals": "^16.0.0" }, "peerDependencies": { "eslint": ">=8.10", "prettier": ">=3" }, "optionalPeers": ["prettier"] }, "sha512-n2662q/mM+2pTFVz7ELosqhN+/nbR75Ut/4vLme40kKSHHe0oPbPMxgPqyYrASlANuSDP4aAJ71rRviDMCZTxg=="], "eslint-import-resolver-node": ["eslint-import-resolver-node@0.3.10", "", { "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.16.1", "resolve": "^2.0.0-next.6" } }, "sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ=="], - "eslint-module-utils": ["eslint-module-utils@2.12.1", "", { "dependencies": { "debug": "^3.2.7" } }, "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw=="], + "eslint-module-utils": ["eslint-module-utils@2.13.0", "", { "dependencies": { "debug": "^3.2.7" }, "peerDependencies": { "eslint": "*" }, "optionalPeers": ["eslint"] }, "sha512-bLohSkT6469rRs8czj0tLTD8vaeIS/whvPRJVjDr7IuoTT1k5DYDERlNycjDj/HkOlvQdYurmfZ/g3fG5bgeLQ=="], "eslint-plugin-es": ["eslint-plugin-es@3.0.1", "", { "dependencies": { "eslint-utils": "^2.0.0", "regexpp": "^3.0.0" }, "peerDependencies": { "eslint": ">=4.19.1" } }, "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ=="], @@ -2723,11 +2833,11 @@ "eslint-plugin-node": ["eslint-plugin-node@11.1.0", "", { "dependencies": { "eslint-plugin-es": "^3.0.0", "eslint-utils": "^2.0.0", "ignore": "^5.1.1", "minimatch": "^3.0.4", "resolve": "^1.10.1", "semver": "^6.1.0" }, "peerDependencies": { "eslint": ">=5.16.0" } }, "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g=="], - "eslint-plugin-prettier": ["eslint-plugin-prettier@5.5.5", "", { "dependencies": { "prettier-linter-helpers": "^1.0.1", "synckit": "^0.11.12" }, "peerDependencies": { "@types/eslint": ">=8.0.0", "eslint": ">=8.0.0", "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", "prettier": ">=3.0.0" }, "optionalPeers": ["@types/eslint", "eslint-config-prettier"] }, "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw=="], + "eslint-plugin-prettier": ["eslint-plugin-prettier@5.5.6", "", { "dependencies": { "prettier-linter-helpers": "^1.0.1", "synckit": "^0.11.13" }, "peerDependencies": { "@types/eslint": ">=8.0.0", "eslint": ">=8.0.0", "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", "prettier": ">=3.0.0" }, "optionalPeers": ["@types/eslint", "eslint-config-prettier"] }, "sha512-ifetmTcxWfz+4qRW3pH/ujdTq2jQIj59AxJMIN26K5avYgU8dxycUETQonWiW+wPrYXA0j3Try0l1CnwVQtDqQ=="], "eslint-plugin-react": ["eslint-plugin-react@7.37.5", "", { "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", "array.prototype.flatmap": "^1.3.3", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.2.1", "estraverse": "^5.3.0", "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.9", "object.fromentries": "^2.0.8", "object.values": "^1.2.1", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", "string.prototype.matchall": "^4.0.12", "string.prototype.repeat": "^1.0.0" }, "peerDependencies": { "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" } }, "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA=="], - "eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@5.2.0", "", { "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" } }, "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg=="], + "eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@7.1.1", "", { "dependencies": { "@babel/core": "^7.24.4", "@babel/parser": "^7.24.4", "hermes-parser": "^0.25.1", "zod": "^3.25.0 || ^4.0.0", "zod-validation-error": "^3.5.0 || ^4.0.0" }, "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 || ^10.0.0" } }, "sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g=="], "eslint-scope": ["eslint-scope@7.2.2", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg=="], @@ -2761,7 +2871,7 @@ "eventsource": ["eventsource@3.0.7", "", { "dependencies": { "eventsource-parser": "^3.0.1" } }, "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA=="], - "eventsource-parser": ["eventsource-parser@3.0.8", "", {}, "sha512-70QWGkr4snxr0OXLRWsFLeRBIRPuQOvt4s8QYjmUlmlkyTZkRqS7EDVRZtzU3TiyDbXSzaOeF0XUKy8PchzukQ=="], + "eventsource-parser": ["eventsource-parser@3.1.0", "", {}, "sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg=="], "exact-mirror": ["exact-mirror@0.2.7", "", { "peerDependencies": { "@sinclair/typebox": "^0.34.15" }, "optionalPeers": ["@sinclair/typebox"] }, "sha512-+MeEmDcLA4o/vjK2zujgk+1VTxPR4hdp23qLqkWfStbECtAq9gmsvQa3LW6z/0GXZyHJobrCnmy1cdeE7BjsYg=="], @@ -2769,7 +2879,7 @@ "expect-type": ["expect-type@1.3.0", "", {}, "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA=="], - "expo": ["expo@55.0.23", "", { "dependencies": { "@babel/runtime": "^7.20.0", "@expo/cli": "55.0.29", "@expo/config": "~55.0.16", "@expo/config-plugins": "~55.0.8", "@expo/devtools": "55.0.3", "@expo/fingerprint": "0.16.7", "@expo/local-build-cache-provider": "55.0.12", "@expo/log-box": "55.0.12", "@expo/metro": "~55.1.1", "@expo/metro-config": "55.0.20", "@expo/vector-icons": "^15.0.2", "@ungap/structured-clone": "^1.3.0", "babel-preset-expo": "~55.0.21", "expo-asset": "~55.0.17", "expo-constants": "~55.0.16", "expo-file-system": "~55.0.19", "expo-font": "~55.0.7", "expo-keep-awake": "~55.0.8", "expo-modules-autolinking": "55.0.21", "expo-modules-core": "55.0.25", "pretty-format": "^29.7.0", "react-refresh": "^0.14.2", "whatwg-url-minimum": "^0.1.1" }, "peerDependencies": { "@expo/dom-webview": "*", "@expo/metro-runtime": "*", "react": "*", "react-native": "*", "react-native-webview": "*" }, "optionalPeers": ["@expo/dom-webview", "@expo/metro-runtime", "react-native-webview"], "bin": { "expo": "bin/cli", "fingerprint": "bin/fingerprint", "expo-modules-autolinking": "bin/autolinking" } }, "sha512-b+lKwfzJzFiSm9G0wVGWw3c2YoZyubbl9gHOF1ZFuK8FqtxSge8pDDJMuEFmTi14dbKwh/tirB7MiORq54r7CQ=="], + "expo": ["expo@55.0.26", "", { "dependencies": { "@babel/runtime": "^7.20.0", "@expo/cli": "55.0.32", "@expo/config": "~55.0.17", "@expo/config-plugins": "~55.0.10", "@expo/devtools": "55.0.3", "@expo/fingerprint": "0.16.7", "@expo/local-build-cache-provider": "55.0.13", "@expo/log-box": "55.0.12", "@expo/metro": "~55.1.1", "@expo/metro-config": "55.0.23", "@expo/vector-icons": "^15.0.2", "@ungap/structured-clone": "^1.3.0", "babel-preset-expo": "~55.0.22", "expo-asset": "~55.0.17", "expo-constants": "~55.0.16", "expo-file-system": "~55.0.22", "expo-font": "~55.0.8", "expo-keep-awake": "~55.0.8", "expo-modules-autolinking": "55.0.24", "expo-modules-core": "55.0.25", "pretty-format": "^29.7.0", "react-refresh": "^0.14.2", "whatwg-url-minimum": "^0.1.2" }, "peerDependencies": { "@expo/dom-webview": "*", "@expo/metro-runtime": "*", "react": "*", "react-native": "*", "react-native-webview": "*" }, "optionalPeers": ["@expo/dom-webview", "@expo/metro-runtime", "react-native-webview"], "bin": { "expo": "bin/cli", "fingerprint": "bin/fingerprint", "expo-modules-autolinking": "bin/autolinking" } }, "sha512-MuVW6Uzd/Jh6E37ICOYAiTOm9nflNMUNzf6wH5ld/IXFyuF2Lo86a8fCSMgHcvTGsSjRsJ5Uxhf+WHZcvGPfrg=="], "expo-apple-authentication": ["expo-apple-authentication@55.0.13", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-Qvh3DmhXqhtWOe7BC9e7UVApR3XS1qE7+68tVLqb3KI/sET7QV9KT5JgOJogWmmCJVxA/kaot0M136yvW1pdWA=="], @@ -2781,29 +2891,29 @@ "expo-constants": ["expo-constants@55.0.16", "", { "dependencies": { "@expo/env": "~2.1.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-Z15/No94UHoogD+pulxjudGAeOHTEIWZgb/vnX48Wx5D+apWTeCbnKxQZZtGQlosvduYL5kaic2/W8U+NHfBQQ=="], - "expo-dev-client": ["expo-dev-client@55.0.32", "", { "dependencies": { "expo-dev-launcher": "55.0.33", "expo-dev-menu": "55.0.27", "expo-dev-menu-interface": "55.0.2", "expo-manifests": "~55.0.16", "expo-updates-interface": "~55.1.6" }, "peerDependencies": { "expo": "*" } }, "sha512-rfZ0Xpgbw3RPymkivvLSQ2Koqefj+oVOReqNLN3JXDlqdC2jOr3MCqfTaJs5VFNzFKk7pOPyE60jh03UdvsHCQ=="], + "expo-dev-client": ["expo-dev-client@55.0.35", "", { "dependencies": { "expo-dev-launcher": "55.0.36", "expo-dev-menu": "55.0.30", "expo-dev-menu-interface": "55.0.2", "expo-manifests": "~55.0.17", "expo-updates-interface": "~55.1.6" }, "peerDependencies": { "expo": "*" } }, "sha512-DN50x9gqWYAfnJpxgiJm3zK2bFvDhxJ5JjFq0wFot7o4knZ7H3BVwiL6zZMHG29g6gfxdgpzGG69WPiSR/Ipgg=="], - "expo-dev-launcher": ["expo-dev-launcher@55.0.33", "", { "dependencies": { "@expo/schema-utils": "^55.0.3", "expo-dev-menu": "55.0.27", "expo-manifests": "~55.0.16" }, "peerDependencies": { "expo": "*" } }, "sha512-WZsTtyEVgCBMj3vlgbDSKbYbUbAwijNhJY9jBqqlmbPLHtLE+Wc6nCTafb0dWY6+Si+afF98lvPyz6WSAu59uA=="], + "expo-dev-launcher": ["expo-dev-launcher@55.0.36", "", { "dependencies": { "@expo/schema-utils": "^55.0.4", "expo-dev-menu": "55.0.30", "expo-manifests": "~55.0.17" }, "peerDependencies": { "expo": "*" } }, "sha512-Dn2om4J71aavWqi1jLzK3QlGZjDiFv7nIBZkQyzy2zW62IOD9kLwOOvHHj07Ra/6n9cqFEpNYzwpPkR7KHuYZA=="], - "expo-dev-menu": ["expo-dev-menu@55.0.27", "", { "dependencies": { "expo-dev-menu-interface": "55.0.2" }, "peerDependencies": { "expo": "*" } }, "sha512-Il+kkIXlPDfZ/Z3ZquV1r5niECEByJObUMkB24c0B4N4693f0SDoKyyaRqcGRsRCVXW9r0eAoTeEnXl1revQdA=="], + "expo-dev-menu": ["expo-dev-menu@55.0.30", "", { "dependencies": { "expo-dev-menu-interface": "55.0.2" }, "peerDependencies": { "expo": "*" } }, "sha512-uwDI4cEPzpRemf06Ts5O41azJcz8BBcE6QOkNaTX8JlzdJ05eq9jWxmbA1WhoSoE5C+NFo8njHSvmHqUqTpOng=="], "expo-dev-menu-interface": ["expo-dev-menu-interface@55.0.2", "", { "peerDependencies": { "expo": "*" } }, "sha512-DomUNvGzY/xliwnMdbAYY780sCv19N7zIbifc0ClcoCzJZpNSCkvJ2qGIFRPyM/7DmqmlHGCKi8di7kYYLKNEg=="], - "expo-device": ["expo-device@55.0.16", "", { "dependencies": { "ua-parser-js": "^0.7.33" }, "peerDependencies": { "expo": "*" } }, "sha512-o6eQjO2reoniXpos0FnPcrAVMYUfFPcIUdMRUUpKwQys7cmTJBjJLbOo+SuctVXUrsHUm6zyoKI7nX3C3lpqJw=="], + "expo-device": ["expo-device@55.0.17", "", { "dependencies": { "ua-parser-js": "^0.7.33" }, "peerDependencies": { "expo": "*" } }, "sha512-ZcMrSeD0zWooosm5Bet5qluxUrhw+NPgcMmN6ySVF7cm4K8Bvh4KPogJePbI1qfhFAiJWcWeV9e/2uewb9ktfw=="], "expo-eas-client": ["expo-eas-client@55.0.5", "", {}, "sha512-wRagCeSbSnSGVXgP7V+qiGfXzZ9hTVKWvKIOP7lwrX3MIEenNmNlO4D3RVC3aNU2GhmO3ZCZIIEre80KZoUUHA=="], - "expo-file-system": ["expo-file-system@55.0.19", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-c4smCbMqELLI3YQrGpw21MwZIREXM2e53vQD/+KWQcae1q+hgw8J2TroEqcQ/jVOtFpZYVvyVfgu4HDKNEKmNw=="], + "expo-file-system": ["expo-file-system@55.0.22", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-T5Rfv3vqcFyhVrl/tEEeglc/J8LJbcZQgC3TMT5jxzIgUgWmIgJEgncGYqB/YNXFgUTL2LiuCvqrU51Dzp83NQ=="], - "expo-font": ["expo-font@55.0.7", "", { "dependencies": { "fontfaceobserver": "^2.1.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-oH39Xb+3i6Y69b7YRP+P+5WLx7621t+ep/RAgLwJJYpTjs7CnSohUG+873rEtqsTAuQGi63ms7x9ZeHj1E9LYw=="], + "expo-font": ["expo-font@55.0.8", "", { "dependencies": { "fontfaceobserver": "^2.1.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-WyP75pnKqhLNktYwDn3xKAUNt5rLihRDv8XWGhhz6VEhVqypixpT86NA3uGtiDTlM3gGjhrYCY7o7ypXgCUOZg=="], "expo-glass-effect": ["expo-glass-effect@55.0.11", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-wqq7GUOqSkfoFJzreZvBG0jzjsq5c582m3glhWSjcmIuByxXXWp6j6GY6hyFuYKzpOXhbuvusVxGCQi0yWnp3g=="], "expo-haptics": ["expo-haptics@55.0.14", "", { "peerDependencies": { "expo": "*" } }, "sha512-KjDItBsA9mi1f5nRwf8g1wOdfEcLHwvEdt5Jl1sMCDETR/homcGOl+F3QIiPOl/PRlbGVieQsjTtF4DGtHOj6g=="], - "expo-image": ["expo-image@55.0.10", "", { "dependencies": { "sf-symbols-typescript": "^2.2.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-We+vq/Z8jy8zmGxcOP8vrhiWkkwyXFdSks8cSlPi0bpu6D0Ei6l9Nj2xHWCD+yoENh92aCEe1+QRujAwXbogGA=="], + "expo-image": ["expo-image@55.0.11", "", { "dependencies": { "sf-symbols-typescript": "^2.2.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-PVIBYQJW/h1f6Zb9xnoWlgfqyOPVm2yb6eo6ZogaKbvMrhb/Q/fiERbagi4oqmR6IPljWPEpkXXQyFBUh7TjpQ=="], - "expo-image-loader": ["expo-image-loader@55.0.0", "", { "peerDependencies": { "expo": "*" } }, "sha512-NOjp56wDrfuA5aiNAybBIjqIn1IxKeGJ8CECWZncQ/GzjZfyTYAHTCyeApYkdKkMBLHINzI4BbTGSlbCa0fXXQ=="], + "expo-image-loader": ["expo-image-loader@55.0.1", "", { "peerDependencies": { "expo": "*" } }, "sha512-o8gCo1j59XpXDh0/llgNYPcnfecYQhafQAO0yw5pb+kukPizvNoEqea8tFQIIQmNYqxd6Ljgs7lLXed0gXpOdQ=="], "expo-image-picker": ["expo-image-picker@55.0.20", "", { "dependencies": { "expo-image-loader": "~55.0.0" }, "peerDependencies": { "expo": "*" } }, "sha512-lfWt/0rPWdKz8AdDEGmGHZIJSNlVc720Dlx5bfou10FU16ZV5wAbTU63nm2jkXd8hbXke4a/2Ha1dzxCVA+LQQ=="], @@ -2811,53 +2921,53 @@ "expo-keep-awake": ["expo-keep-awake@55.0.8", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-PfIpMfM+STOBwkR5XOE+yVtER86c44MD+W8QD8JxuO0sT9pF7Y1SJYakWlpvX8xsGA+bjKLxftm9403s9kQhKA=="], - "expo-linear-gradient": ["expo-linear-gradient@55.0.13", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-Qz2T4jpkA15RIk29DBqI1TwW+8O9AN8MyC4TJPbh/5UnihH0yNNz3waplUO8Szh5OZ3czTGvtPQU4ysF3RDxwQ=="], + "expo-linear-gradient": ["expo-linear-gradient@55.0.14", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-n01A9P0ZebRo8Rm4QHYEjMR8z4Y6MBc8uVnT8NB9cOJislvEmz2o2WQJoK6RD7FjoeFEW8KkRtggK7fQ3h7KIg=="], "expo-linking": ["expo-linking@55.0.15", "", { "dependencies": { "expo-constants": "~55.0.16", "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-/RQh2vkNqV8Bim9Owm/evVqn2fqTvCDYHkpYPoSKbLAdydSGdHC2xZNw7Odl4wu1i1/3L4Xz//LKd3NsPWYWBQ=="], - "expo-localization": ["expo-localization@55.0.13", "", { "dependencies": { "rtl-detect": "^1.0.2" }, "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-fXiEUUihIrXmAEzoneaTOFcQ7TKmr25RR/ymrB/MvYTVnmevFA1zY2KI0VSiXY+NKKjZ8mG65YSn1wh4gEYKxA=="], + "expo-localization": ["expo-localization@55.0.15", "", { "dependencies": { "rtl-detect": "^1.0.2" }, "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-+HD55LeeIWyVRLvpQ909Am89XS16dUBkbB4/ruCJXS9oWv1K8W+FoXuOPTpmdvwHfC9cxt0loiwPWUiw2fdgbg=="], - "expo-location": ["expo-location@55.1.9", "", { "dependencies": { "@expo/image-utils": "^0.8.13" }, "peerDependencies": { "expo": "*" } }, "sha512-PIH9/qeyhtGh190FyIJNZYHXZOoi42SbVHY9IoTMBmqWLHf1BJyGhPpFlaLBSCjxObqfVZmrWsN5dtjueSwYQA=="], + "expo-location": ["expo-location@55.1.10", "", { "dependencies": { "@expo/image-utils": "^0.8.14" }, "peerDependencies": { "expo": "*" } }, "sha512-MkcFucsZ567Bn8ChElVTYVbOs2QXn27IKaBrVKogw7ZcbooImdj3L/UR6E7s3LkgF33YubKynAp9Opvixdwl7g=="], - "expo-manifests": ["expo-manifests@55.0.16", "", { "dependencies": { "expo-json-utils": "~55.0.2" }, "peerDependencies": { "expo": "*" } }, "sha512-BR9BPcNsSnCKlQ/d7ECywr+2T54+bTSr26HjRjSua949o4mO/iPIrLjK0lOAa1oIczju6a6oUFckZD2OljxP0g=="], + "expo-manifests": ["expo-manifests@55.0.17", "", { "dependencies": { "expo-json-utils": "~55.0.2" }, "peerDependencies": { "expo": "*" } }, "sha512-vKZvFivX3usVJKfBODKQcFHso0g38zlGbRGqGAppz+il0zKvG6umpJ47OZbzLod7iJpjd+ZDD2AGuOxacixonA=="], - "expo-modules-autolinking": ["expo-modules-autolinking@55.0.21", "", { "dependencies": { "@expo/require-utils": "^55.0.5", "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "commander": "^7.2.0" }, "bin": { "expo-modules-autolinking": "bin/expo-modules-autolinking.js" } }, "sha512-P9KsJgOwI7JVwxmGfRvcXkXO4LNRvHRdWmb4ukLmX15G/vZ7b6SM17yiYkPceWq1F5KeeZ11KFjEcl0y17xy7w=="], + "expo-modules-autolinking": ["expo-modules-autolinking@55.0.24", "", { "dependencies": { "@expo/require-utils": "^55.0.5", "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "commander": "^7.2.0" }, "bin": { "expo-modules-autolinking": "bin/expo-modules-autolinking.js" } }, "sha512-A0OyMbTPZqibYrwqj98HFYTNSvl4NSS4Zt+R5A8qiAx3nM0mc81e6Iqw7Wl4J8M/t36lJ+cT3WuVTz5Oszj6Hw=="], "expo-modules-core": ["expo-modules-core@55.0.25", "", { "dependencies": { "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*", "react-native-worklets": "^0.7.4 || ^0.8.0" }, "optionalPeers": ["react-native-worklets"] }, "sha512-yXpfg7aHLbuqoXocK34Vua6Aey5SCyqLygAsXAMbul9P8vfBjLpaOPiTJ5cLVF7Drfq8ownqVJO6qpGEtZ6GOw=="], - "expo-navigation-bar": ["expo-navigation-bar@55.0.12", "", { "dependencies": { "debug": "^4.3.2", "react-native-is-edge-to-edge": "^1.2.1" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-G7olnyAqGd7I3hLFAgP4WdcZFMD9pV6UY79P7EHyRdMuRZrYJfDdwcelyYB2+tekOdQEktZ3WlLVK+uS7f7TYw=="], + "expo-navigation-bar": ["expo-navigation-bar@55.0.13", "", { "dependencies": { "debug": "^4.3.2", "react-native-is-edge-to-edge": "^1.2.1" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-etU3o7+IqyX5tp+X6+UT5OqrQXIWpSiomv8rZmHTIAL8+AviKFELAgw1TaOddrRNfw849nM6UqGWAZnoIQxhMQ=="], - "expo-network": ["expo-network@55.0.13", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-7u+npCmCPRpVrjkUlQtUetPnTN1gRyj7z13bBM5w9w1AHMb4PfoxtIys5EB9ukzNYBg/gaZ/y5dtxomGpc6BKw=="], + "expo-network": ["expo-network@55.0.14", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-Sy544zTPjVh+tbOLUOU8fBX87oRSrNQqUZY6TLO0w0WF/QTNb7yxlwRh6v6wfKKRg9xpZypTIIEtdG/s6q8ZQA=="], - "expo-router": ["expo-router@55.0.14", "", { "dependencies": { "@expo/metro-runtime": "^55.0.11", "@expo/schema-utils": "^55.0.4", "@radix-ui/react-slot": "^1.2.0", "@radix-ui/react-tabs": "^1.1.12", "@react-navigation/bottom-tabs": "^7.15.5", "@react-navigation/native": "^7.1.33", "@react-navigation/native-stack": "^7.14.5", "client-only": "^0.0.1", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "expo-glass-effect": "^55.0.11", "expo-image": "^55.0.10", "expo-server": "^55.0.9", "expo-symbols": "^55.0.8", "fast-deep-equal": "^3.1.3", "invariant": "^2.2.4", "nanoid": "^3.3.8", "query-string": "^7.1.3", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.2.1", "semver": "~7.6.3", "server-only": "^0.0.1", "sf-symbols-typescript": "^2.1.0", "shallowequal": "^1.1.0", "use-latest-callback": "^0.2.1", "vaul": "^1.1.2" }, "peerDependencies": { "@expo/log-box": "55.0.12", "@react-navigation/drawer": "^7.9.4", "@testing-library/react-native": ">= 13.2.0", "expo": "*", "expo-constants": "^55.0.16", "expo-linking": "^55.0.15", "react": "*", "react-dom": "*", "react-native": "*", "react-native-gesture-handler": "*", "react-native-reanimated": "*", "react-native-safe-area-context": ">= 5.4.0", "react-native-screens": "*", "react-native-web": "*", "react-server-dom-webpack": "~19.0.4 || ~19.1.5 || ~19.2.4" }, "optionalPeers": ["@react-navigation/drawer", "@testing-library/react-native", "react-dom", "react-native-gesture-handler", "react-native-reanimated", "react-native-web", "react-server-dom-webpack"] }, "sha512-rOn/wosp2hAPM+O2o41hnarbP5Zqv9UkHWa31KoSoiOme1tpmZd2yc93XtRAtzP0P5E5xzqq7a2rbEAarpP5XA=="], + "expo-router": ["expo-router@55.0.16", "", { "dependencies": { "@expo/metro-runtime": "^55.0.11", "@expo/schema-utils": "^55.0.4", "@radix-ui/react-slot": "^1.2.0", "@radix-ui/react-tabs": "^1.1.12", "@react-navigation/bottom-tabs": "^7.15.5", "@react-navigation/native": "^7.1.33", "@react-navigation/native-stack": "^7.14.5", "client-only": "^0.0.1", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "expo-glass-effect": "^55.0.11", "expo-image": "^55.0.11", "expo-server": "^55.0.11", "expo-symbols": "^55.0.9", "fast-deep-equal": "^3.1.3", "invariant": "^2.2.4", "nanoid": "^3.3.8", "query-string": "^7.1.3", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.2.1", "semver": "~7.6.3", "server-only": "^0.0.1", "sf-symbols-typescript": "^2.1.0", "shallowequal": "^1.1.0", "use-latest-callback": "^0.2.1", "vaul": "^1.1.2" }, "peerDependencies": { "@expo/log-box": "55.0.12", "@react-navigation/drawer": "^7.9.4", "@testing-library/react-native": ">= 13.2.0", "expo": "*", "expo-constants": "^55.0.16", "expo-linking": "^55.0.15", "react": "*", "react-dom": "*", "react-native": "*", "react-native-gesture-handler": "*", "react-native-reanimated": "*", "react-native-safe-area-context": ">= 5.4.0", "react-native-screens": "*", "react-native-web": "*", "react-server-dom-webpack": "~19.0.4 || ~19.1.5 || ~19.2.4" }, "optionalPeers": ["@react-navigation/drawer", "@testing-library/react-native", "react-dom", "react-native-gesture-handler", "react-native-reanimated", "react-native-web", "react-server-dom-webpack"] }, "sha512-xVwWsDz3Ar2+3hRpMMrZMYFzkJak322vCA5/XCP7WOL0hEXnWhgQGhv5IEYZyz/TXZbl2IYD6/1MnH9mBhjwKQ=="], - "expo-secure-store": ["expo-secure-store@55.0.13", "", { "peerDependencies": { "expo": "*" } }, "sha512-I6r0JNO1Fd4o0Gu7Ixiic7s89lqgdUHq17uBH9y1f/AntoyKn71TdtYJH82RgfsBbu5qNVzrwImmvlANyOlITQ=="], + "expo-secure-store": ["expo-secure-store@55.0.14", "", { "peerDependencies": { "expo": "*" } }, "sha512-OKp9pDiTa4kgChop8+pTRJGBPhkJUcAxP5c6JbivNr4bmx3I+gKmAj1ov4KOXkY95TpWdHO+GQ4+0BgSY2P3JQ=="], - "expo-server": ["expo-server@55.0.9", "", {}, "sha512-N5Ipn1NwqaJzEm+G97o0Jbe4g/th3R/16N1DabnYryXKCiZwDkK13/w3VfGkQN9LOOaBP+JIRxGf4M8lQKPzyA=="], + "expo-server": ["expo-server@55.0.11", "", {}, "sha512-AxRdHqcv0H1g4s923vu+5n1Nrhne23bjXbP+Vl7+Lwfpe7MG9PuU1IS95IJK6a+7BVV1mRN6QlZvs8Yv7EEXNQ=="], - "expo-sqlite": ["expo-sqlite@55.0.15", "", { "dependencies": { "await-lock": "^2.2.2" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-vxE5fs6l953QSIyievQ8TuSstj62eC7zUREjNzbUOwRWaHGGnhnlPJM1HLoTIv+oIt3+b1m7k2fmcDGkpK5t3w=="], + "expo-sqlite": ["expo-sqlite@55.0.16", "", { "dependencies": { "await-lock": "^2.2.2" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-v6EIL4ygqWt/+ZfI76jIIv+IIaU8PnWPNjkmIN95vEQgh0FrWqzwssqe5ffQmm79kIfqIPTtAgTdl8MuZv88gg=="], "expo-status-bar": ["expo-status-bar@55.0.6", "", { "dependencies": { "react-native-is-edge-to-edge": "^1.2.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-ijOUptfdiqYt7rObZ6jrPQ8sE5YN/8MxKCIJx0b7TY4nGkSJxhPIxeoW4GXcXCA8mTQ9PiOHH/ThLZgRVZvUlQ=="], - "expo-store-review": ["expo-store-review@55.0.13", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-3cIfDUOBArAeuDQEiYToTZdB1UGSHSe4NhLunEf7hYG86ICgSYIXcosisYnsMLTE6GxL/0XJ34sQOfrP7HfASA=="], + "expo-store-review": ["expo-store-review@55.0.14", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-1cUGDgu7nrOKqr1Zs5jwPxCkv3l0TbdavftYAjambPNPxl9+AYOG1JQ95js3WavFOD3+Zceuq6NPwAdU/nza1Q=="], "expo-structured-headers": ["expo-structured-headers@55.0.2", "", {}, "sha512-KITovrWigTOtsII5hRQ9/3ydaNcxCux5g6O+eTPLyjnye9dpkDKl5GmCLVPVKIL/d7253OtbGtWMD4m0gha5pw=="], - "expo-symbols": ["expo-symbols@55.0.8", "", { "dependencies": { "@expo-google-fonts/material-symbols": "^0.4.1", "sf-symbols-typescript": "^2.0.0" }, "peerDependencies": { "expo": "*", "expo-font": "*", "react": "*", "react-native": "*" } }, "sha512-Dg6BTu+fCWukdlh+3XYIr6NbqJWmK4aAQ6i6BInKnWU0ALuzVUJcMDq8Lk9bHok2hOh3OhzJqlCqEoBXPInIVQ=="], + "expo-symbols": ["expo-symbols@55.0.9", "", { "dependencies": { "@expo-google-fonts/material-symbols": "^0.4.1", "sf-symbols-typescript": "^2.0.0" }, "peerDependencies": { "expo": "*", "expo-font": "*", "react": "*", "react-native": "*" } }, "sha512-F85C/8ExQjd2gYjasLVKMT8wPj+1+19TVTqg4jAeVjVZklqiQtLO72io9Ji1xAjYNgmDeUI0diVHlFMMTC4Ekg=="], - "expo-system-ui": ["expo-system-ui@55.0.17", "", { "dependencies": { "@react-native/normalize-colors": "0.83.6", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-sCrQbp1VyMe63c7y7/luz88P9Ro3/jeUBXby2uYk0wHtkawUzBK9V69J3HTC4rI5eXiJMJPF2oCKO71c/7wtTg=="], + "expo-system-ui": ["expo-system-ui@55.0.18", "", { "dependencies": { "@react-native/normalize-colors": "0.83.6", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-Fbc0HJgqMpABeA/gI7NJFnSXwUeLrEMjjXq8Nl+4gTXyacIK2iOOrzCkvq41rKBBde0CR6kVnB1DXj0j9ZYnjg=="], - "expo-updates": ["expo-updates@55.0.21", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/plist": "^0.5.2", "@expo/spawn-async": "^1.7.2", "arg": "^4.1.0", "chalk": "^4.1.2", "debug": "^4.3.4", "expo-eas-client": "~55.0.5", "expo-manifests": "~55.0.16", "expo-structured-headers": "~55.0.2", "expo-updates-interface": "~55.1.6", "getenv": "^2.0.0", "glob": "^13.0.0", "ignore": "^5.3.1", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" }, "bin": { "expo-updates": "bin/cli.js" } }, "sha512-wpWQAqNeBw1LLjqSK85/P9aHB+2R0nuuFPHb8ZRPRMJLhRUIk7IF0FaOdEy2NbiRJvrnGfRW3SK4NVQqrT8ULQ=="], + "expo-updates": ["expo-updates@55.0.24", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/plist": "^0.5.4", "@expo/spawn-async": "^1.7.2", "arg": "^4.1.0", "chalk": "^4.1.2", "debug": "^4.3.4", "expo-eas-client": "~55.0.5", "expo-manifests": "~55.0.17", "expo-structured-headers": "~55.0.2", "expo-updates-interface": "~55.1.6", "getenv": "^2.0.0", "glob": "^13.0.0", "ignore": "^5.3.1", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" }, "bin": { "expo-updates": "bin/cli.js" } }, "sha512-aqbsRT5GyKG8++RndIb4+jFUknsPgqWImzYUG20PiPjwPlQ25MSfz5+r1IAI8YfvGuLRIIRt8yDQ2Ob+RV+fyg=="], "expo-updates-interface": ["expo-updates-interface@55.1.6", "", { "peerDependencies": { "expo": "*" } }, "sha512-evxNpagCkjT3lE6bGV570TFzRtKuIuLY8I37RYHoriXCJ+ZKCN1hbmklK29uAixya+BxGpeTI2K4FqYeJLvfrw=="], - "expo-web-browser": ["expo-web-browser@55.0.15", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-6hwZQob3EF+RWwZ+IvWLZjj2wI1frqx21+m/uzBqdUEHUhp2cVJi7kmxDolDmrve+ZldryZi1qfN78ALdvjHSA=="], + "expo-web-browser": ["expo-web-browser@55.0.16", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-eeGs3439ewO/Q56Pzg3qbAVZSE0oH/R7XW9VCXI59k0m78ZIYbBtPT4PMFL/+sBgRkXm546Lq/DFcJQPTOfXJg=="], "exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="], "express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="], - "express-rate-limit": ["express-rate-limit@8.4.1", "", { "dependencies": { "ip-address": "10.1.0" }, "peerDependencies": { "express": ">= 4.11" } }, "sha512-NGVYwQSAyEQgzxX1iCM978PP9AdO/hW93gMcF6ZwQCm+rFvLsBH6w4xcXWTcliS8La5EPRN3p9wzItqBwJrfNw=="], + "express-rate-limit": ["express-rate-limit@8.5.2", "", { "dependencies": { "ip-address": "^10.2.0" }, "peerDependencies": { "express": ">= 4.11" } }, "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A=="], "exsolve": ["exsolve@1.0.8", "", {}, "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA=="], @@ -2887,7 +2997,7 @@ "fast-sha256": ["fast-sha256@1.3.0", "", {}, "sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ=="], - "fast-uri": ["fast-uri@3.1.0", "", {}, "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA=="], + "fast-uri": ["fast-uri@3.1.2", "", {}, "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ=="], "fast-xml-parser": ["fast-xml-parser@4.4.1", "", { "dependencies": { "strnum": "^1.0.5" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw=="], @@ -2943,13 +3053,13 @@ "fraction.js": ["fraction.js@5.3.4", "", {}, "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ=="], - "framer-motion": ["framer-motion@12.38.0", "", { "dependencies": { "motion-dom": "^12.38.0", "motion-utils": "^12.36.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-rFYkY/pigbcswl1XQSb7q424kSTQ8q6eAC+YUsSKooHQYuLdzdHjrt6uxUC+PRAO++q5IS7+TamgIw1AphxR+g=="], + "framer-motion": ["framer-motion@12.40.0", "", { "dependencies": { "motion-dom": "^12.40.0", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-uaBd3qC1v3KQqBEjwTUd183K6PbS+j0yR9w9VmEOLWA/tnUcSn8Xa3uck7t4dgpDoUss8xQTcj8W2L07lrnLFg=="], "fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="], "fs": ["fs@0.0.1-security", "", {}, "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w=="], - "fs-extra": ["fs-extra@11.3.4", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA=="], + "fs-extra": ["fs-extra@11.3.5", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg=="], "fs.realpath": ["fs.realpath@1.0.0", "", {}, "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="], @@ -2973,7 +3083,7 @@ "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="], - "get-east-asian-width": ["get-east-asian-width@1.5.0", "", {}, "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA=="], + "get-east-asian-width": ["get-east-asian-width@1.6.0", "", {}, "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA=="], "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="], @@ -3037,7 +3147,7 @@ "has-tostringtag": ["has-tostringtag@1.0.2", "", { "dependencies": { "has-symbols": "^1.0.3" } }, "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="], - "hasown": ["hasown@2.0.3", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg=="], + "hasown": ["hasown@2.0.4", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A=="], "hast-util-sanitize": ["hast-util-sanitize@5.0.2", "", { "dependencies": { "@types/hast": "^3.0.0", "@ungap/structured-clone": "^1.0.0", "unist-util-position": "^5.0.0" } }, "sha512-3yTWghByc50aGS7JlGhk61SPenfE/p1oaFeNwkOOyrscaOkMGrcW9+Cy/QAIOBpZxP1yqDIzFMR0+Np0i0+usg=="], @@ -3049,13 +3159,13 @@ "hermes-compiler": ["hermes-compiler@0.14.1", "", {}, "sha512-+RPPQlayoZ9n6/KXKt5SFILWXCGJ/LV5d24L5smXrvTDrPS4L6dSctPczXauuvzFP3QEJbD1YO7Z3Ra4a+4IhA=="], - "hermes-estree": ["hermes-estree@0.32.0", "", {}, "sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ=="], + "hermes-estree": ["hermes-estree@0.25.1", "", {}, "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="], - "hermes-parser": ["hermes-parser@0.32.0", "", { "dependencies": { "hermes-estree": "0.32.0" } }, "sha512-g4nBOWFpuiTqjR3LZdRxKUkij9iyveWeuks7INEsMX741f3r9xxrOe8TeQfUxtda0eXmiIFiMQzoeSQEno33Hw=="], + "hermes-parser": ["hermes-parser@0.25.1", "", { "dependencies": { "hermes-estree": "0.25.1" } }, "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA=="], "hoist-non-react-statics": ["hoist-non-react-statics@3.3.2", "", { "dependencies": { "react-is": "^16.7.0" } }, "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="], - "hono": ["hono@4.12.15", "", {}, "sha512-qM0jDhFEaCBb4TxoW7f53Qrpv9RBiayUHo0S52JudprkhvpjIrGoU1mnnr29Fvd1U335ZFPZQY1wlkqgfGXyLg=="], + "hono": ["hono@4.12.23", "", {}, "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA=="], "hosted-git-info": ["hosted-git-info@7.0.2", "", { "dependencies": { "lru-cache": "^10.0.1" } }, "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w=="], @@ -3119,7 +3229,7 @@ "invariant": ["invariant@2.2.4", "", { "dependencies": { "loose-envify": "^1.0.0" } }, "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="], - "ip-address": ["ip-address@10.1.0", "", {}, "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q=="], + "ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="], "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="], @@ -3137,7 +3247,7 @@ "is-callable": ["is-callable@1.2.7", "", {}, "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="], - "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], + "is-core-module": ["is-core-module@2.16.2", "", { "dependencies": { "hasown": "^2.0.3" } }, "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA=="], "is-data-view": ["is-data-view@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" } }, "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw=="], @@ -3247,13 +3357,13 @@ "jose": ["jose@5.10.0", "", {}, "sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg=="], - "jotai": ["jotai@2.19.1", "", { "peerDependencies": { "@babel/core": ">=7.0.0", "@babel/template": ">=7.0.0", "@types/react": ">=17.0.0", "react": ">=17.0.0" }, "optionalPeers": ["@babel/core", "@babel/template", "@types/react", "react"] }, "sha512-sqm9lVZiqBHZH8aSRk32DSiZDHY3yUIlulXYn9GQj7/LvoUdYXSMti7ZPJGo+6zjzKFt5a25k/I6iBCi43PJcw=="], + "jotai": ["jotai@2.20.0", "", { "peerDependencies": { "@babel/core": ">=7.0.0", "@babel/template": ">=7.0.0", "@types/react": ">=17.0.0", "react": ">=17.0.0" }, "optionalPeers": ["@babel/core", "@babel/template", "@types/react", "react"] }, "sha512-b5GAqgmXmXzB4WPaTH26ppk9Sl7AA9WSQX7yfdM+gJ1rFROiWcVbi97gFuN/yVCojOcbcvop2sfLL+fjxW0JVg=="], "jpeg-js": ["jpeg-js@0.4.4", "", {}, "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="], "js-base64": ["js-base64@3.7.8", "", {}, "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow=="], - "js-cookie": ["js-cookie@3.0.5", "", {}, "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="], + "js-cookie": ["js-cookie@3.0.8", "", {}, "sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw=="], "js-library-detector": ["js-library-detector@6.7.0", "", {}, "sha512-c80Qupofp43y4cJ7+8TTDN/AsDwLi5oOm/plBrWI+iQt485vKXCco+yVmOwEgdo9VOdsYTuV0UlTeetVPTriXA=="], @@ -3297,7 +3407,7 @@ "ky": ["ky@1.14.3", "", {}, "sha512-9zy9lkjac+TR1c2tG+mkNSVlyOpInnWdSMiue4F+kq8TwJSgv6o8jhLRg8Ho6SnZ9wOYUq/yozts9qQCfk7bIw=="], - "kysely": ["kysely@0.28.16", "", {}, "sha512-3i5pmOiZvMDj00qhrIVbH0AnioVTx22DMP7Vn5At4yJO46iy+FM8Y/g61ltenLVSo3fiO8h8Q3QOFgf/gQ72ww=="], + "kysely": ["kysely@0.29.2", "", {}, "sha512-s6WVJyEZrbm6jhBpiKHsGHyePMrVQKJ85wZCFCr9W4QHv6WTjWIrdvTmO9hDEA3bNK0xkrE2DqrHsXMLWuZpQg=="], "lan-network": ["lan-network@0.2.1", "", { "bin": { "lan-network": "dist/lan-network-cli.js" } }, "sha512-ONPnazC96VKDntab9j9JKwIWhZ4ZUceB4A9Epu4Ssg0hYFmtHZSeQ+n15nIwTFmcBUKtExOer8WTJ4GF9MO64A=="], @@ -3395,11 +3505,11 @@ "loupe": ["loupe@3.2.1", "", {}, "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ=="], - "lru-cache": ["lru-cache@11.3.5", "", {}, "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw=="], + "lru-cache": ["lru-cache@11.5.1", "", {}, "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A=="], "lru_map": ["lru_map@0.3.3", "", {}, "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="], - "lucide-react": ["lucide-react@1.11.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-UOhjdztXCgdBReRcIhsvz2siIBogfv/lhJEIViCpLt924dO+GDms9T7DNoucI23s6kEPpe988m5N0D2ajnzb2g=="], + "lucide-react": ["lucide-react@1.17.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-9FA9evdox/JQL5PT57fdA1x/yg8T7knJ98+zjTL3UfKza6pflQUUh3XtaQIHKvnsJw1lmsEyHVlt5jchYxOQ5w=="], "magic-regexp": ["magic-regexp@0.11.0", "", { "dependencies": { "magic-string": "^0.30.21", "regexp-tree": "^0.1.27", "type-level-regexp": "~0.1.17", "unplugin": "^3.0.0" } }, "sha512-LG77Z/gVnwz7oaDpD4heX6ryl+lcr4l1B2gnP4MMvt2pGhGC1Dfj7dl1pXpP4ih+VQFLuAadeKVa+lARAzfW+Q=="], @@ -3487,9 +3597,9 @@ "metro-resolver": ["metro-resolver@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-WSJIENlMcoSsuz66IfBHOkgfp3KJt2UW2TnEHPf1b8pIG2eEXNOVmo2+03A0H17WY2XGXWgxL0CG7FAopqgB1A=="], - "metro-runtime": ["metro-runtime@0.83.6", "", { "dependencies": { "@babel/runtime": "^7.25.0", "flow-enums-runtime": "^0.0.6" } }, "sha512-WQPua1G2VgYbwRn6vSKxOhTX7CFbSf/JdUu6Nd8bZnPXckOf7HQ2y51NXNQHoEsiuawathrkzL8pBhv+zgZFmg=="], + "metro-runtime": ["metro-runtime@0.83.7", "", { "dependencies": { "@babel/runtime": "^7.25.0", "flow-enums-runtime": "^0.0.6" } }, "sha512-9GKkJURaB2iyYoEExKnedzAHzxmKtSi+k0tsZUvMoU27tBZJElchYt7JH/Ai/XzYAI9lCAaV7u5HZSI8J5Z+wQ=="], - "metro-source-map": ["metro-source-map@0.83.6", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.6", "nullthrows": "^1.1.1", "ob1": "0.83.6", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-AqJbOMMpeyyM4iNI91pchqDIszzNuuHApEhg6OABqZ+9mjLEqzcIEQ/fboZ7x74fNU5DBd2K36FdUQYPqlGClA=="], + "metro-source-map": ["metro-source-map@0.83.7", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.7", "nullthrows": "^1.1.1", "ob1": "0.83.7", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-JgA1h7oc1a1jydBe1GhVFsUoMYo3wLPk7oRA32rjlDsq+sP2JLt9x2p2lWbNSxTm/u8NV4VRid3hvEJgcX8tKw=="], "metro-symbolicate": ["metro-symbolicate@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-source-map": "0.83.7", "nullthrows": "^1.1.1", "source-map": "^0.5.6", "vlq": "^1.0.0" }, "bin": { "metro-symbolicate": "src/index.js" } }, "sha512-g4suyxw20WOHWI680c+Kq4wC/NF+Hx5pRH9afrMp+sMTxqLeKcPR1Xf4wMhsjlbvx7LbIREdke6q928jEjvJWw=="], @@ -3579,9 +3689,9 @@ "module-definition": ["module-definition@6.0.2", "", { "dependencies": { "ast-module-types": "^6.0.1", "node-source-walk": "^7.0.1" }, "bin": { "module-definition": "bin/cli.js" } }, "sha512-SvAU3lB0+Yjbq55yHY3wkRZBOh+fhU1SnIF3IFbTewv6mtAh7yUT8ACHAJ2mGIJ7tCes2QuCL/cl6m0JSZ/ArA=="], - "motion-dom": ["motion-dom@12.38.0", "", { "dependencies": { "motion-utils": "^12.36.0" } }, "sha512-pdkHLD8QYRp8VfiNLb8xIBJis1byQ9gPT3Jnh2jqfFtAsWUA3dEepDlsWe/xMpO8McV+VdpKVcp+E+TGJEtOoA=="], + "motion-dom": ["motion-dom@12.40.0", "", { "dependencies": { "motion-utils": "^12.39.0" } }, "sha512-HxU3ZaBwNPVQUBQf1xxgq+7JrPNZvjLVxgbpEZL7RrWJnsxOf0/OM+yrHG9ogLQ31Do/r57Oz2gQWPK+6q62mg=="], - "motion-utils": ["motion-utils@12.36.0", "", {}, "sha512-eHWisygbiwVvf6PZ1vhaHCLamvkSbPIeAYxWUuL3a2PD/TROgE7FvfHWTIH4vMl798QLfMw15nRqIaRDXTlYRg=="], + "motion-utils": ["motion-utils@12.39.0", "", {}, "sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ=="], "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], @@ -3593,11 +3703,11 @@ "mz": ["mz@2.7.0", "", { "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", "thenify-all": "^1.0.0" } }, "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="], - "nanoid": ["nanoid@5.1.9", "", { "bin": { "nanoid": "bin/nanoid.js" } }, "sha512-ZUvP7KeBLe3OZ1ypw6dI/TzYJuvHP77IM4Ry73waSQTLn8/g8rpdjfyVAh7t1/+FjBtG4lCP42MEbDxOsRpBMw=="], + "nanoid": ["nanoid@5.1.11", "", { "bin": { "nanoid": "bin/nanoid.js" } }, "sha512-v+KEsUv2ps74PaSKv0gHTxTCgMXOIfBEbaqa6w6ISIGC7ZsvHN4N9oJ8d4cmf0n5oTzQz2SLmThbQWhjd/8eKg=="], "nanostores": ["nanostores@1.3.0", "", {}, "sha512-XPUa/jz+P1oJvN9VBxw4L9MtdFfaH3DAryqPssqhb2kXjmb9npz0dly6rCsgFWOPr4Yg9mTfM3MDZgZZ+7A3lA=="], - "nativewind": ["nativewind@4.2.3", "", { "dependencies": { "comment-json": "^4.2.5", "debug": "^4.3.7", "react-native-css-interop": "0.2.3" }, "peerDependencies": { "tailwindcss": ">3.3.0" } }, "sha512-HglF1v6A8CqBFpXWs0d3yf4qQGurrreLuyE8FTRI/VDH8b0npZa2SDG5tviTkLiBg0s5j09mQALZOjxuocgMLA=="], + "nativewind": ["nativewind@4.2.4", "", { "dependencies": { "comment-json": "^4.2.5", "debug": "^4.3.7", "react-native-css-interop": "0.2.4" }, "peerDependencies": { "tailwindcss": ">3.3.0" } }, "sha512-PRO7X5a5cnmJD5ryijqeDJhmtabfbbZiPLk3ItTtL7trDzH3uWOv7kPJIqm6L0QFH98m2ynZ55DRPe3AETEOAQ=="], "natural-compare": ["natural-compare@1.4.0", "", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="], @@ -3605,7 +3715,7 @@ "netmask": ["netmask@2.1.1", "", {}, "sha512-eonl3sLUha+S1GzTPxychyhnUzKyeQkZ7jLjKrBagJgPla13F+uQ71HgpFefyHgqrjEbCPkDArxYsjY8/+gLKA=="], - "next": ["next@15.5.15", "", { "dependencies": { "@next/env": "15.5.15", "@swc/helpers": "0.5.15", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.5.15", "@next/swc-darwin-x64": "15.5.15", "@next/swc-linux-arm64-gnu": "15.5.15", "@next/swc-linux-arm64-musl": "15.5.15", "@next/swc-linux-x64-gnu": "15.5.15", "@next/swc-linux-x64-musl": "15.5.15", "@next/swc-win32-arm64-msvc": "15.5.15", "@next/swc-win32-x64-msvc": "15.5.15", "sharp": "^0.34.3" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-VSqCrJwtLVGwAVE0Sb/yikrQfkwkZW9p+lL/J4+xe+G3ZA+QnWPqgcfH1tDUEuk9y+pthzzVFp4L/U8JerMfMQ=="], + "next": ["next@15.5.18", "", { "dependencies": { "@next/env": "15.5.18", "@swc/helpers": "0.5.15", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.5.18", "@next/swc-darwin-x64": "15.5.18", "@next/swc-linux-arm64-gnu": "15.5.18", "@next/swc-linux-arm64-musl": "15.5.18", "@next/swc-linux-x64-gnu": "15.5.18", "@next/swc-linux-x64-musl": "15.5.18", "@next/swc-win32-arm64-msvc": "15.5.18", "@next/swc-win32-x64-msvc": "15.5.18", "sharp": "^0.34.3" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-eKL8zUJkX9Y5lE+RX/2YJoItVdGlIscyVyboeD9wSpp0PaGqjoA4tTpT2qPqz9ax+5IzGESyLSeZ/RCwbSZ2uQ=="], "next-themes": ["next-themes@0.4.6", "", { "peerDependencies": { "react": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc", "react-dom": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc" } }, "sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA=="], @@ -3619,7 +3729,7 @@ "node-int64": ["node-int64@0.4.0", "", {}, "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="], - "node-releases": ["node-releases@2.0.38", "", {}, "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw=="], + "node-releases": ["node-releases@2.0.46", "", {}, "sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ=="], "node-source-walk": ["node-source-walk@7.0.2", "", { "dependencies": { "@babel/parser": "^7.29.0" } }, "sha512-71kFFjYaSshDTA8/a2HiTYPLdASWjLJxUyJxGE+ffxU+KhxSBtM9kiLUX+R2yooFdSFKMFpi4n3PFtDy6qXv8A=="], @@ -3637,7 +3747,7 @@ "nuqs": ["nuqs@2.8.9", "", { "dependencies": { "@standard-schema/spec": "1.0.0" }, "peerDependencies": { "@remix-run/react": ">=2", "@tanstack/react-router": "^1", "next": ">=14.2.0", "react": ">=18.2.0 || ^19.0.0-0", "react-router": "^5 || ^6 || ^7", "react-router-dom": "^5 || ^6 || ^7" }, "optionalPeers": ["@remix-run/react", "@tanstack/react-router", "next", "react-router", "react-router-dom"] }, "sha512-8ou6AEwsxMWSYo2qkfZtYFVzngwbKmg4c00HVxC1fF6CEJv3Fwm6eoZmfVPALB+vw8Udo7KL5uy96PFcYe1BIQ=="], - "ob1": ["ob1@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-m/xZYkwcjo6UqLMrUICEB3iHk7Bjt3RSR7KXMi6Y1MO/kGkPhoRmfUDF6KAan3rLAZ7ABRqnQyKUTwaqZgUV4w=="], + "ob1": ["ob1@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-9M5kpuOLyTPogMtZiQUIxdAZxl7Dxs6tVBbJErSumsqGMuhVSoUbkfeZ3XNPpLpwBBtqY5QDUzGwggLHX3slQg=="], "object-assign": ["object-assign@4.0.1", "", {}, "sha512-c6legOHWepAbWnp3j5SRUMpxCXBKI4rD7A5Osn9IzZ8w4O/KccXdW0lqdkQKbpk0eHGjNgKihgzY6WuEq99Tfw=="], @@ -3669,6 +3779,8 @@ "open": ["open@7.4.2", "", { "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" } }, "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="], + "open-graph-scraper": ["open-graph-scraper@6.11.0", "", { "dependencies": { "chardet": "^2.1.1", "cheerio": "^1.1.2", "iconv-lite": "^0.7.0", "undici": "^7.16.0" } }, "sha512-KkO3qMMzJj9KYGtCl19dRtncb+RuBiG/P9BgukcAG4p2w9wSAWTE90vL6/xqth1K9ThkYF/+xfTGrVvU79TJtQ=="], + "openapi-types": ["openapi-types@12.1.3", "", {}, "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw=="], "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="], @@ -3715,6 +3827,12 @@ "parse-png": ["parse-png@2.1.0", "", { "dependencies": { "pngjs": "^3.3.0" } }, "sha512-Nt/a5SfCLiTnQAjx3fHlqp8hRgTL3z7kTQZzvIMS9uCAepnCyjpdEc6M/sz69WqMBdaDBw9sF1F1UaHROYzGkQ=="], + "parse5": ["parse5@7.3.0", "", { "dependencies": { "entities": "^6.0.0" } }, "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw=="], + + "parse5-htmlparser2-tree-adapter": ["parse5-htmlparser2-tree-adapter@7.1.0", "", { "dependencies": { "domhandler": "^5.0.3", "parse5": "^7.0.0" } }, "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g=="], + + "parse5-parser-stream": ["parse5-parser-stream@7.1.2", "", { "dependencies": { "parse5": "^7.0.0" } }, "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow=="], + "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="], "partyserver": ["partyserver@0.4.1", "", { "dependencies": { "nanoid": "^5.1.6" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20240729.0" } }, "sha512-StSs0oY8RmTxjGNil7VbCG4gnTN+4rYX20fiUIItAxTPpr/5rPDZT6PIvMROkk9M1Gn7GzE1wuQXwhxceaGhXA=="], @@ -3745,17 +3863,17 @@ "pend": ["pend@1.2.0", "", {}, "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="], - "pg": ["pg@8.20.0", "", { "dependencies": { "pg-connection-string": "^2.12.0", "pg-pool": "^3.13.0", "pg-protocol": "^1.13.0", "pg-types": "2.2.0", "pgpass": "1.0.5" }, "optionalDependencies": { "pg-cloudflare": "^1.3.0" }, "peerDependencies": { "pg-native": ">=3.0.1" }, "optionalPeers": ["pg-native"] }, "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA=="], + "pg": ["pg@8.21.0", "", { "dependencies": { "pg-connection-string": "^2.13.0", "pg-pool": "^3.14.0", "pg-protocol": "^1.14.0", "pg-types": "2.2.0", "pgpass": "1.0.5" }, "optionalDependencies": { "pg-cloudflare": "^1.4.0" }, "peerDependencies": { "pg-native": ">=3.0.1" }, "optionalPeers": ["pg-native"] }, "sha512-AUP1EYJuHraQGsVoCQVIcM7TEJVGtDzxWtGFZd8rds9d+CCXlU5Js1rYgfLNvxy9iJrpHjGrRjoi/3BT9fRyiA=="], - "pg-cloudflare": ["pg-cloudflare@1.3.0", "", {}, "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ=="], + "pg-cloudflare": ["pg-cloudflare@1.4.0", "", {}, "sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A=="], - "pg-connection-string": ["pg-connection-string@2.12.0", "", {}, "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ=="], + "pg-connection-string": ["pg-connection-string@2.13.0", "", {}, "sha512-EMnU9E2fSULdsbErBbMaXJvFeD9B4+nPcM3f+4lsiCR0BHLPrLVjv3DbyM2hgQQviKJaTWIRRTjKjWlHg3p2ig=="], "pg-int8": ["pg-int8@1.0.1", "", {}, "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="], - "pg-pool": ["pg-pool@3.13.0", "", { "peerDependencies": { "pg": ">=8.0" } }, "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA=="], + "pg-pool": ["pg-pool@3.14.0", "", { "peerDependencies": { "pg": ">=8.0" } }, "sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw=="], - "pg-protocol": ["pg-protocol@1.13.0", "", {}, "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w=="], + "pg-protocol": ["pg-protocol@1.14.0", "", {}, "sha512-n5taZ1kO3s9ngDTVxsEznOqCyToTgz0FLuPq0B33COy5pPpuWJpY3/2oRBVETuOgzdqRXfWpM9HIhp2LBBT1BA=="], "pg-types": ["pg-types@2.2.0", "", { "dependencies": { "pg-int8": "1.0.1", "postgres-array": "~2.0.0", "postgres-bytea": "~1.0.0", "postgres-date": "~1.0.4", "postgres-interval": "^1.1.0" } }, "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="], @@ -3775,11 +3893,11 @@ "pkce-challenge": ["pkce-challenge@5.0.1", "", {}, "sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ=="], - "playwright": ["playwright@1.59.1", "", { "dependencies": { "playwright-core": "1.59.1" }, "optionalDependencies": { "fsevents": "2.3.2" }, "bin": { "playwright": "cli.js" } }, "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw=="], + "playwright": ["playwright@1.60.0", "", { "dependencies": { "playwright-core": "1.60.0" }, "optionalDependencies": { "fsevents": "2.3.2" }, "bin": { "playwright": "cli.js" } }, "sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA=="], - "playwright-core": ["playwright-core@1.59.1", "", { "bin": { "playwright-core": "cli.js" } }, "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg=="], + "playwright-core": ["playwright-core@1.60.0", "", { "bin": { "playwright-core": "cli.js" } }, "sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA=="], - "plist": ["plist@3.1.0", "", { "dependencies": { "@xmldom/xmldom": "^0.8.8", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="], + "plist": ["plist@3.1.1", "", { "dependencies": { "@xmldom/xmldom": "^0.9.10", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-ZIfcLJC+7E7FBFnDxm9MPmt7D+DidyQ26lewieO75AdhA2ayMtsJSES0iWzqJQbcVRSrTufQoy0DR94xHue0oA=="], "pluralize": ["pluralize@8.0.0", "", {}, "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="], @@ -3789,7 +3907,7 @@ "postal-mime": ["postal-mime@2.7.4", "", {}, "sha512-0WdnFQYUrPGGTFu1uOqD2s7omwua8xaeYGdO6rb88oD5yJ/4pPHDA4sdWqfD8wQVfCny563n/HQS7zTFft+f/g=="], - "postcss": ["postcss@8.5.14", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg=="], + "postcss": ["postcss@8.5.15", "", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A=="], "postcss-import": ["postcss-import@16.1.1", "", { "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", "resolve": "^1.1.7" }, "peerDependencies": { "postcss": "^8.0.0" } }, "sha512-2xVS1NCZAfjtVdvXiyegxzJ447GyqCeEI5V7ApgQVOWnros1p5lGNovJNapwPpMombyFBfqDwt7AD3n2l0KOfQ=="], @@ -3821,7 +3939,7 @@ "prettier-linter-helpers": ["prettier-linter-helpers@1.0.1", "", { "dependencies": { "fast-diff": "^1.1.2" } }, "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg=="], - "prettier-plugin-tailwindcss": ["prettier-plugin-tailwindcss@0.7.3", "", { "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", "@prettier/plugin-hermes": "*", "@prettier/plugin-oxc": "*", "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", "@trivago/prettier-plugin-sort-imports": "*", "@zackad/prettier-plugin-twig": "*", "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-sort-imports": "*", "prettier-plugin-svelte": "*" }, "optionalPeers": ["@ianvs/prettier-plugin-sort-imports", "@prettier/plugin-hermes", "@prettier/plugin-oxc", "@prettier/plugin-pug", "@shopify/prettier-plugin-liquid", "@trivago/prettier-plugin-sort-imports", "@zackad/prettier-plugin-twig", "prettier-plugin-astro", "prettier-plugin-css-order", "prettier-plugin-jsdoc", "prettier-plugin-marko", "prettier-plugin-multiline-arrays", "prettier-plugin-organize-attributes", "prettier-plugin-organize-imports", "prettier-plugin-sort-imports", "prettier-plugin-svelte"] }, "sha512-lckXaWWdo2ZVXoMoUO3WIBiz9hVY+YBEh1gYyMFfrWP9WZW/wpFXQKizHx7WrFQFMkcG0bGShdpp531X1n+qpg=="], + "prettier-plugin-tailwindcss": ["prettier-plugin-tailwindcss@0.7.4", "", { "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", "@prettier/plugin-hermes": "*", "@prettier/plugin-oxc": "*", "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", "@trivago/prettier-plugin-sort-imports": "*", "@zackad/prettier-plugin-twig": "*", "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-sort-imports": "*", "prettier-plugin-svelte": "*" }, "optionalPeers": ["@ianvs/prettier-plugin-sort-imports", "@prettier/plugin-hermes", "@prettier/plugin-oxc", "@prettier/plugin-pug", "@shopify/prettier-plugin-liquid", "@trivago/prettier-plugin-sort-imports", "@zackad/prettier-plugin-twig", "prettier-plugin-astro", "prettier-plugin-css-order", "prettier-plugin-jsdoc", "prettier-plugin-marko", "prettier-plugin-multiline-arrays", "prettier-plugin-organize-attributes", "prettier-plugin-organize-imports", "prettier-plugin-sort-imports", "prettier-plugin-svelte"] }, "sha512-UKii4RjY05SNt/WQi6/NcOn/LsT0/ILLXsxygjbRg5/YZelsSu5jTqorYHPDGq4nZy5q5hpCu+XdGZ1xaJEQgw=="], "pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="], @@ -3855,7 +3973,7 @@ "puppeteer-core": ["puppeteer-core@22.15.0", "", { "dependencies": { "@puppeteer/browsers": "2.3.0", "chromium-bidi": "0.6.3", "debug": "^4.3.6", "devtools-protocol": "0.0.1312386", "ws": "^8.18.0" } }, "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA=="], - "qs": ["qs@6.15.1", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-6YHEFRL9mfgcAvql/XhwTvf5jKcOiiupt2FiJxHkiX1z4j7WL8J/jRHYLluORvc1XxB5rV20KoeK00gVJamspg=="], + "qs": ["qs@6.15.2", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw=="], "query-string": ["query-string@7.1.3", "", { "dependencies": { "decode-uri-component": "^0.2.2", "filter-obj": "^1.1.0", "split-on-first": "^1.0.0", "strict-uri-encode": "^2.0.0" } }, "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="], @@ -3881,27 +3999,27 @@ "react-dom": ["react-dom@19.2.6", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.6" } }, "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g=="], - "react-error-boundary": ["react-error-boundary@6.1.1", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0" } }, "sha512-BrYwPOdXi5mqkk5lw+Uvt0ThHx32rCt3BkukS4X23A2AIWDPSGX6iaWTc0y9TU/mHDA/6qOSGel+B2ERkOvD1w=="], + "react-error-boundary": ["react-error-boundary@6.1.2", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0" } }, "sha512-3DpCr5HVdZ0caUjYE/kIHBEJN0mNP3ZCgf16c48uJ5TbWjorKVp+YG8W3XqlJ7vJAVNw6wNIImyPXmFydwmyng=="], "react-fast-compare": ["react-fast-compare@3.2.2", "", {}, "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="], "react-freeze": ["react-freeze@1.0.4", "", { "peerDependencies": { "react": ">=17.0.0" } }, "sha512-r4F0Sec0BLxWicc7HEyo2x3/2icUTrRmDjaaRyzzn+7aDyFZliszMDOgLVwSnQnYENOlL1o569Ze2HZefk8clA=="], - "react-hook-form": ["react-hook-form@7.73.1", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-VAfVYOPcx3piiEVQy95vyFmBwbVUsP/AUIN+mpFG8h11yshDd444nn0VyfaGWSRnhOLVgiDu7HIuBtAIzxn9dA=="], + "react-hook-form": ["react-hook-form@7.77.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-Sslh9YDYc0GDlWT/lxasnIduNo4v3yyvqRGvmGKUre5AFjDs/HV9/OafHGD8d+sB2yoL4UIL9L8X9i0WlZZebg=="], - "react-i18next": ["react-i18next@17.0.4", "", { "dependencies": { "@babel/runtime": "^7.29.2", "html-parse-stringify": "^3.0.1", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "i18next": ">= 26.0.1", "react": ">= 16.8.0", "typescript": "^5 || ^6" }, "optionalPeers": ["typescript"] }, "sha512-hQipmK4EF0y6RO6tt6WuqnmWpWYEXmQUUzecmMBuNsIgYd3smXcG4GtYPWhvgxn0pqMOItKlEO8H24HCs5hc3g=="], + "react-i18next": ["react-i18next@17.0.8", "", { "dependencies": { "@babel/runtime": "^7.29.2", "html-parse-stringify": "^3.0.1", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "i18next": ">= 26.2.0", "react": ">= 16.8.0", "react-dom": "*", "react-native": "*", "typescript": "^5 || ^6" }, "optionalPeers": ["react-dom", "react-native", "typescript"] }, "sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw=="], - "react-is": ["react-is@19.2.5", "", {}, "sha512-Dn0t8IQhCmeIT3wu+Apm1/YVsJXsGWi6k4sPdnBIdqMVtHtv0IGi6dcpNpNkNac0zB2uUAqNX3MHzN8c+z2rwQ=="], + "react-is": ["react-is@19.2.6", "", {}, "sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw=="], "react-leaflet": ["react-leaflet@5.0.0", "", { "dependencies": { "@react-leaflet/core": "^3.0.0" }, "peerDependencies": { "leaflet": "^1.9.0", "react": "^19.0.0", "react-dom": "^19.0.0" } }, "sha512-CWbTpr5vcHw5bt9i4zSlPEVQdTVcML390TjeDG0cK59z1ylexpqC6M1PJFjV8jD7CF+ACBFsLIDs6DRMoLEofw=="], "react-native": ["react-native@0.83.6", "", { "dependencies": { "@jest/create-cache-key-function": "^29.7.0", "@react-native/assets-registry": "0.83.6", "@react-native/codegen": "0.83.6", "@react-native/community-cli-plugin": "0.83.6", "@react-native/gradle-plugin": "0.83.6", "@react-native/js-polyfills": "0.83.6", "@react-native/normalize-colors": "0.83.6", "@react-native/virtualized-lists": "0.83.6", "abort-controller": "^3.0.0", "anser": "^1.4.9", "ansi-regex": "^5.0.0", "babel-jest": "^29.7.0", "babel-plugin-syntax-hermes-parser": "0.32.0", "base64-js": "^1.5.1", "commander": "^12.0.0", "flow-enums-runtime": "^0.0.6", "glob": "^7.1.1", "hermes-compiler": "0.14.1", "invariant": "^2.2.4", "jest-environment-node": "^29.7.0", "memoize-one": "^5.0.0", "metro-runtime": "^0.83.6", "metro-source-map": "^0.83.6", "nullthrows": "^1.1.1", "pretty-format": "^29.7.0", "promise": "^8.3.0", "react-devtools-core": "^6.1.5", "react-refresh": "^0.14.0", "regenerator-runtime": "^0.13.2", "scheduler": "0.27.0", "semver": "^7.1.3", "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0", "ws": "^7.5.10", "yargs": "^17.6.2" }, "peerDependencies": { "@types/react": "^19.1.1", "react": "^19.2.0" }, "optionalPeers": ["@types/react"], "bin": { "react-native": "cli.js" } }, "sha512-H513+8VzviNFXOdPnStRzX9S3/jiJGg++QZ1zd+ROyAvBEKqFqKUPHH0d82y3QyRPct5qKjdOa7J6vNehCvXYA=="], - "react-native-blob-util": ["react-native-blob-util@0.24.7", "", { "dependencies": { "base-64": "0.1.0", "glob": "13.0.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-3vgn3hblfJh0+LIoqEhYRqCtwKh1xID2LtXHdTrUml3rYh4xj69eN+lvWU235AL0FRbX5uKrS1c4lIYexSgtWQ=="], + "react-native-blob-util": ["react-native-blob-util@0.24.9", "", { "dependencies": { "base-64": "0.1.0", "glob": "13.0.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-tG3+m0WhVdBGifvxSFxZDVqtr85D0fGBJU6E4UxmK3tU+RabJZTumXEn8k7jn5/NFe8OhQhPjtBEZ11ZJ6L7Vw=="], - "react-native-css-interop": ["react-native-css-interop@0.2.3", "", { "dependencies": { "@babel/helper-module-imports": "^7.22.15", "@babel/traverse": "^7.23.0", "@babel/types": "^7.23.0", "debug": "^4.3.7", "lightningcss": "~1.27.0", "semver": "^7.6.3" }, "peerDependencies": { "react": ">=18", "react-native": "*", "react-native-reanimated": ">=3.6.2", "tailwindcss": "~3" } }, "sha512-wc+JI7iUfdFBqnE18HhMTtD0q9vkhuMczToA87UdHGWwMyxdT5sCcNy+i4KInPCE855IY0Ic8kLQqecAIBWz7w=="], + "react-native-css-interop": ["react-native-css-interop@0.2.4", "", { "dependencies": { "@babel/helper-module-imports": "^7.22.15", "@babel/traverse": "^7.23.0", "@babel/types": "^7.23.0", "debug": "^4.3.7", "lightningcss": "~1.27.0", "semver": "^7.6.3" }, "peerDependencies": { "react": ">=18", "react-native": "*", "react-native-reanimated": ">=3.6.2", "react-native-safe-area-context": "*", "react-native-svg": "*", "tailwindcss": "~3" }, "optionalPeers": ["react-native-safe-area-context", "react-native-svg"] }, "sha512-ATP3BACxGM4h/l8cisFauGMGxnXpu8Bcp4Bc3O7iNZpq7j0VJjc1RRRBUSBY4C4WuI7VA/xvp3puijVS9d95rg=="], - "react-native-drawer-layout": ["react-native-drawer-layout@4.2.2", "", { "dependencies": { "color": "^4.2.3", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*", "react-native-gesture-handler": ">= 2.0.0", "react-native-reanimated": ">= 2.0.0" } }, "sha512-UG/PTTeyyr43KahbgoGyXri8LMO5USHY3/RUpeKBKwCc7xLVGnDLOVNSRrJw0dDc7YmPbmAyJ4oxp8nKboKKuw=="], + "react-native-drawer-layout": ["react-native-drawer-layout@4.2.4", "", { "dependencies": { "color": "^4.2.3", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*", "react-native-gesture-handler": ">= 2.0.0", "react-native-reanimated": ">= 2.0.0" } }, "sha512-l1Le5HcVidobnJm8xqFZo46Rs8FDHdxbTZhkjxpNSRgU+QMoQXilOfzTHAeNjEGiKVGgIs9cW3ctXeHqgp5jJg=="], "react-native-fit-image": ["react-native-fit-image@1.5.5", "", { "dependencies": { "prop-types": "^15.5.10" } }, "sha512-Wl3Vq2DQzxgsWKuW4USfck9zS7YzhvLNPpkwUUCF90bL32e1a0zOVQ3WsJILJOwzmPdHfzZmWasiiAUNBkhNkg=="], @@ -3933,7 +4051,7 @@ "react-native-worklets": ["react-native-worklets@0.7.4", "", { "dependencies": { "@babel/plugin-transform-arrow-functions": "7.27.1", "@babel/plugin-transform-class-properties": "7.27.1", "@babel/plugin-transform-classes": "7.28.4", "@babel/plugin-transform-nullish-coalescing-operator": "7.27.1", "@babel/plugin-transform-optional-chaining": "7.27.1", "@babel/plugin-transform-shorthand-properties": "7.27.1", "@babel/plugin-transform-template-literals": "7.27.1", "@babel/plugin-transform-unicode-regex": "7.27.1", "@babel/preset-typescript": "7.27.1", "convert-source-map": "2.0.0", "semver": "7.7.3" }, "peerDependencies": { "@babel/core": "*", "react": "*", "react-native": "*" } }, "sha512-NYOdM1MwBb3n+AtMqy1tFy3Mn8DliQtd8sbzAVRf9Gc+uvQ0zRfxN7dS8ZzoyX7t6cyQL5THuGhlnX+iFlQTag=="], - "react-redux": ["react-redux@9.2.0", "", { "dependencies": { "@types/use-sync-external-store": "^0.0.6", "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "@types/react": "^18.2.25 || ^19", "react": "^18.0 || ^19", "redux": "^5.0.0" }, "optionalPeers": ["@types/react", "redux"] }, "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g=="], + "react-redux": ["react-redux@9.3.0", "", { "dependencies": { "@types/use-sync-external-store": "^0.0.6", "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "@types/react": "^18.2.25 || ^19", "react": "^18.0 || ^19", "redux": "^5.0.0" }, "optionalPeers": ["@types/react", "redux"] }, "sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g=="], "react-refresh": ["react-refresh@0.14.2", "", {}, "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="], @@ -3941,7 +4059,7 @@ "react-remove-scroll-bar": ["react-remove-scroll-bar@2.3.8", "", { "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q=="], - "react-resizable-panels": ["react-resizable-panels@4.10.0", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-frjewRQt7TCv/vCH1pJfjZ7RxAhr5pKuqVQtVgzFq/vherxBFOWyC3xMbryx5Ti2wylViGUFc93Etg4rB3E0UA=="], + "react-resizable-panels": ["react-resizable-panels@4.11.2", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-+kfFbDZ8mygc7g0vxOcDzCVGuwiIUOnILqPoUHo6/uP+Mmyx6HzZU+kj1aOPDlktXuobYbr6BtQekvJwHRX4Eg=="], "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="], @@ -4007,7 +4125,7 @@ "reselect": ["reselect@5.1.1", "", {}, "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="], - "resend": ["resend@6.12.2", "", { "dependencies": { "postal-mime": "2.7.4", "svix": "1.90.0" }, "peerDependencies": { "@react-email/render": "*" }, "optionalPeers": ["@react-email/render"] }, "sha512-xwgmU4b0OqoabJsIoK/x0Whk0Fcs3bpbK4i/DEWPiE5hYJHyHl0TbB6QbI3gIr+bLdLUJ1GYm/fe41aVFuHXgw=="], + "resend": ["resend@6.12.4", "", { "dependencies": { "postal-mime": "2.7.4", "standardwebhooks": "1.0.0" }, "peerDependencies": { "@react-email/render": "*" }, "optionalPeers": ["@react-email/render"] }, "sha512-lRpJ2Hxd+ht+JPDm97juRcUp9HOMuZyxaRFRFmc9Tx8iNWiei94Dx9v6SWufgKk2667C/uCeKKspMotOHSpCSg=="], "resolve": ["resolve@1.22.12", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA=="], @@ -4027,9 +4145,17 @@ "robots-parser": ["robots-parser@3.0.1", "", {}, "sha512-s+pyvQeIKIZ0dx5iJiQk1tPLJAWln39+MI5jtM8wnyws+G5azk+dMnMX0qfbqNetKKNgcWWOdi0sfm+FbQbgdQ=="], - "rolldown": ["rolldown@1.0.0-rc.17", "", { "dependencies": { "@oxc-project/types": "=0.127.0", "@rolldown/pluginutils": "1.0.0-rc.17" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.0-rc.17", "@rolldown/binding-darwin-arm64": "1.0.0-rc.17", "@rolldown/binding-darwin-x64": "1.0.0-rc.17", "@rolldown/binding-freebsd-x64": "1.0.0-rc.17", "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.17", "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.17", "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.17", "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.17", "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.17", "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.17", "@rolldown/binding-linux-x64-musl": "1.0.0-rc.17", "@rolldown/binding-openharmony-arm64": "1.0.0-rc.17", "@rolldown/binding-wasm32-wasi": "1.0.0-rc.17", "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.17", "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.17" }, "bin": { "rolldown": "bin/cli.mjs" } }, "sha512-ZrT53oAKrtA4+YtBWPQbtPOxIbVDbxT0orcYERKd63VJTF13zPcgXTvD4843L8pcsI7M6MErt8QtON6lrB9tyA=="], + "rolldown": ["rolldown@1.0.3", "", { "dependencies": { "@oxc-project/types": "=0.133.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.3", "@rolldown/binding-darwin-arm64": "1.0.3", "@rolldown/binding-darwin-x64": "1.0.3", "@rolldown/binding-freebsd-x64": "1.0.3", "@rolldown/binding-linux-arm-gnueabihf": "1.0.3", "@rolldown/binding-linux-arm64-gnu": "1.0.3", "@rolldown/binding-linux-arm64-musl": "1.0.3", "@rolldown/binding-linux-ppc64-gnu": "1.0.3", "@rolldown/binding-linux-s390x-gnu": "1.0.3", "@rolldown/binding-linux-x64-gnu": "1.0.3", "@rolldown/binding-linux-x64-musl": "1.0.3", "@rolldown/binding-openharmony-arm64": "1.0.3", "@rolldown/binding-wasm32-wasi": "1.0.3", "@rolldown/binding-win32-arm64-msvc": "1.0.3", "@rolldown/binding-win32-x64-msvc": "1.0.3" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g=="], + + "rollup": ["rollup@4.60.4", "", { "dependencies": { "@types/estree": "1.0.8" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.60.4", "@rollup/rollup-android-arm64": "4.60.4", "@rollup/rollup-darwin-arm64": "4.60.4", "@rollup/rollup-darwin-x64": "4.60.4", "@rollup/rollup-freebsd-arm64": "4.60.4", "@rollup/rollup-freebsd-x64": "4.60.4", "@rollup/rollup-linux-arm-gnueabihf": "4.60.4", "@rollup/rollup-linux-arm-musleabihf": "4.60.4", "@rollup/rollup-linux-arm64-gnu": "4.60.4", "@rollup/rollup-linux-arm64-musl": "4.60.4", "@rollup/rollup-linux-loong64-gnu": "4.60.4", "@rollup/rollup-linux-loong64-musl": "4.60.4", "@rollup/rollup-linux-ppc64-gnu": "4.60.4", "@rollup/rollup-linux-ppc64-musl": "4.60.4", "@rollup/rollup-linux-riscv64-gnu": "4.60.4", "@rollup/rollup-linux-riscv64-musl": "4.60.4", "@rollup/rollup-linux-s390x-gnu": "4.60.4", "@rollup/rollup-linux-x64-gnu": "4.60.4", "@rollup/rollup-linux-x64-musl": "4.60.4", "@rollup/rollup-openbsd-x64": "4.60.4", "@rollup/rollup-openharmony-arm64": "4.60.4", "@rollup/rollup-win32-arm64-msvc": "4.60.4", "@rollup/rollup-win32-ia32-msvc": "4.60.4", "@rollup/rollup-win32-x64-gnu": "4.60.4", "@rollup/rollup-win32-x64-msvc": "4.60.4", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-WHeFSbZYsPu3+bLoNRUuAO+wavNlocOPf3wSHTP7hcFKVnJeWsYlCDbr3mTS14FCizf9ccIxXA8sGL8zKeQN3g=="], + + "rosie-skills": ["rosie-skills@0.6.4", "", { "optionalDependencies": { "rosie-skills-darwin-arm64": "0.6.4", "rosie-skills-freebsd-x64": "0.6.4", "rosie-skills-linux-x64": "0.6.4" }, "bin": { "rosie-skills": "dist/bin.js" } }, "sha512-ojfhSiQRdZ2QyWbmKAHOSAUbaLYrTc5zIH7mS1jKoP8KCFSQddwVhMyFqldckTeybTfW3zNcsZzyOTzGTN1SBA=="], - "rollup": ["rollup@4.60.2", "", { "dependencies": { "@types/estree": "1.0.8" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.60.2", "@rollup/rollup-android-arm64": "4.60.2", "@rollup/rollup-darwin-arm64": "4.60.2", "@rollup/rollup-darwin-x64": "4.60.2", "@rollup/rollup-freebsd-arm64": "4.60.2", "@rollup/rollup-freebsd-x64": "4.60.2", "@rollup/rollup-linux-arm-gnueabihf": "4.60.2", "@rollup/rollup-linux-arm-musleabihf": "4.60.2", "@rollup/rollup-linux-arm64-gnu": "4.60.2", "@rollup/rollup-linux-arm64-musl": "4.60.2", "@rollup/rollup-linux-loong64-gnu": "4.60.2", "@rollup/rollup-linux-loong64-musl": "4.60.2", "@rollup/rollup-linux-ppc64-gnu": "4.60.2", "@rollup/rollup-linux-ppc64-musl": "4.60.2", "@rollup/rollup-linux-riscv64-gnu": "4.60.2", "@rollup/rollup-linux-riscv64-musl": "4.60.2", "@rollup/rollup-linux-s390x-gnu": "4.60.2", "@rollup/rollup-linux-x64-gnu": "4.60.2", "@rollup/rollup-linux-x64-musl": "4.60.2", "@rollup/rollup-openbsd-x64": "4.60.2", "@rollup/rollup-openharmony-arm64": "4.60.2", "@rollup/rollup-win32-arm64-msvc": "4.60.2", "@rollup/rollup-win32-ia32-msvc": "4.60.2", "@rollup/rollup-win32-x64-gnu": "4.60.2", "@rollup/rollup-win32-x64-msvc": "4.60.2", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ=="], + "rosie-skills-darwin-arm64": ["rosie-skills-darwin-arm64@0.6.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-rn1s5hqFKcxeiDEWWoFa1hdGPshR8TkwHLzy/cBavb9XJNAaUxbe3oQ78W9sQkRHAgRyzJYyk9tw68Qrdnizgg=="], + + "rosie-skills-freebsd-x64": ["rosie-skills-freebsd-x64@0.6.4", "", { "os": "freebsd", "cpu": "x64" }, "sha512-SxCRduPBMtfjkQ+q56Yw9OLA3PyaqoALzt7kER7IDKuUVfM2O/1w8sa5xhTDiCvWkZJixnH5d5Ya6KT+/Mwcng=="], + + "rosie-skills-linux-x64": ["rosie-skills-linux-x64@0.6.4", "", { "os": "linux", "cpu": "x64" }, "sha512-D9Y9mfu7goB0s0X59uU3hcFeUTef3VbpCIDwFMzyvJrAq3XhRACWBDMHQsHlyWdHxTXPX/ILyW65RXyrJlgqng=="], "rou3": ["rou3@0.7.12", "", {}, "sha512-iFE4hLDuloSWcD7mjdCDhx2bKcIsYbtOTpfH5MHHLSKMOUyjqQXTeZVa289uuwEGEKFoE/BAPbhaU4B774nceg=="], @@ -4063,7 +4189,7 @@ "sembear": ["sembear@0.7.0", "", { "dependencies": { "semver": "^7.3.5" } }, "sha512-XyLTEich2D02FODCkfdto3mB9DetWPLuTzr4tvoofe9SvyM27h4nQSbV3+iVcYQz94AFyKtqBv5pcZbj3k2hdA=="], - "semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="], + "semver": ["semver@7.8.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg=="], "send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="], @@ -4097,7 +4223,7 @@ "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], - "shell-quote": ["shell-quote@1.8.3", "", {}, "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw=="], + "shell-quote": ["shell-quote@1.8.4", "", {}, "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ=="], "side-channel": ["side-channel@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", "side-channel-list": "^1.0.0", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw=="], @@ -4123,7 +4249,7 @@ "smart-buffer": ["smart-buffer@4.2.0", "", {}, "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="], - "socks": ["socks@2.8.8", "", { "dependencies": { "ip-address": "^10.1.1", "smart-buffer": "^4.2.0" } }, "sha512-NlGELfPrgX2f1TAAcz0WawlLn+0r3FyhhCRpFFK2CemXenPYvzMWWZINv3eDNo9ucdwme7oCHRY0Jnbs4aIkog=="], + "socks": ["socks@2.8.9", "", { "dependencies": { "ip-address": "^10.1.1", "smart-buffer": "^4.2.0" } }, "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw=="], "socks-proxy-agent": ["socks-proxy-agent@8.0.5", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" } }, "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw=="], @@ -4173,7 +4299,7 @@ "std-env": ["std-env@3.10.0", "", {}, "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg=="], - "steiger": ["steiger@0.5.11", "", { "dependencies": { "@clack/prompts": "^0.9.1", "@feature-sliced/steiger-plugin": "0.5.7", "chokidar": "^4.0.3", "cosmiconfig": "^9.0.0", "effector": "^23.4.2", "empathic": "^1.1.0", "fastest-levenshtein": "^1.0.16", "globby": "^14.1.0", "immer": "^10.1.1", "lodash-es": "^4.17.21", "micromatch": "^4.0.8", "patronum": "^2.3.0", "picocolors": "^1.1.1", "prexit": "^2.3.0", "yargs": "^17.7.2", "zod": "^3.25.76", "zod-validation-error": "^3.5.3" }, "bin": { "steiger": "dist/cli.mjs" } }, "sha512-Sv6ovPX8tVlUufvAvGSUnwDQLupccYjcgfK5pbqECGP5KCe9M257U0IbRdjuLfUXfey4FprZWQQtnIz3qOPpWA=="], + "steiger": ["steiger@0.5.12", "", { "dependencies": { "@clack/prompts": "^0.9.1", "@feature-sliced/steiger-plugin": "0.5.8", "chokidar": "^4.0.3", "cosmiconfig": "^9.0.0", "effector": "^23.4.2", "empathic": "^1.1.0", "fastest-levenshtein": "^1.0.16", "globby": "^14.1.0", "immer": "^10.1.1", "lodash-es": "^4.17.21", "micromatch": "^4.0.8", "patronum": "^2.3.0", "picocolors": "^1.1.1", "prexit": "^2.3.0", "yargs": "^17.7.2", "zod": "^3.25.76", "zod-validation-error": "^3.5.3" }, "bin": { "steiger": "dist/cli.mjs" } }, "sha512-ZIqsRMRVG0Yr3Y+TQ3kfH+3FXQKRAza/sC77UuCzaXOBRD7NnuXVzWqB/SklBAZC8GMO10neo2V3M53ZnpSJrA=="], "stop-iteration-iterator": ["stop-iteration-iterator@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "internal-slot": "^1.1.0" } }, "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ=="], @@ -4181,7 +4307,7 @@ "stream-buffers": ["stream-buffers@2.2.0", "", {}, "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg=="], - "streamx": ["streamx@2.25.0", "", { "dependencies": { "events-universal": "^1.0.0", "fast-fifo": "^1.3.2", "text-decoder": "^1.1.0" } }, "sha512-0nQuG6jf1w+wddNEEXCF4nTg3LtufWINB5eFEN+5TNZW7KWJp6x87+JFL43vaAUPyCfH1wID+mNVyW6OHtFamg=="], + "streamx": ["streamx@2.26.0", "", { "dependencies": { "events-universal": "^1.0.0", "fast-fifo": "^1.3.2", "text-decoder": "^1.1.0" } }, "sha512-VvNG1K72Po/xwJzxZFnZ++Tbrv4lwSptsbkFuzXCJAYZvCK5nnxsvXU6ajqkv7chyiI1Y0YXq2Jh8Iy8Y7NF/A=="], "strict-uri-encode": ["strict-uri-encode@2.0.0", "", {}, "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="], @@ -4219,7 +4345,7 @@ "structured-headers": ["structured-headers@0.4.1", "", {}, "sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg=="], - "styled-jsx": ["styled-jsx@5.1.6", "", { "dependencies": { "client-only": "0.0.1" }, "peerDependencies": { "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" } }, "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA=="], + "styled-jsx": ["styled-jsx@5.1.6", "", { "dependencies": { "client-only": "0.0.1" }, "peerDependencies": { "@babel/core": "*", "babel-plugin-macros": "*", "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" }, "optionalPeers": ["@babel/core", "babel-plugin-macros"] }, "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA=="], "styleq": ["styleq@0.1.3", "", {}, "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA=="], @@ -4231,15 +4357,13 @@ "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], - "svix": ["svix@1.90.0", "", { "dependencies": { "standardwebhooks": "1.0.0", "uuid": "^10.0.0" } }, "sha512-ljkZuyy2+IBEoESkIpn8sLM+sxJHQcPxlZFxU+nVDhltNfUMisMBzWX/UR8SjEnzoI28ZjCzMbmYAPwSTucoMw=="], - "swr": ["swr@2.4.1", "", { "dependencies": { "dequal": "^2.0.3", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-2CC6CiKQtEwaEeNiqWTAw9PGykW8SR5zZX8MZk6TeAvEAnVS7Visz8WzphqgtQ8v2xz/4Q5K+j+SeMaKXeeQIA=="], - "synckit": ["synckit@0.11.12", "", { "dependencies": { "@pkgr/core": "^0.2.9" } }, "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ=="], + "synckit": ["synckit@0.11.13", "", { "dependencies": { "@pkgr/core": "^0.3.6" } }, "sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg=="], "tagged-tag": ["tagged-tag@1.0.0", "", {}, "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng=="], - "tailwind-merge": ["tailwind-merge@3.5.0", "", {}, "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A=="], + "tailwind-merge": ["tailwind-merge@3.6.0", "", {}, "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w=="], "tailwindcss": ["tailwindcss@3.4.19", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.6.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.3.2", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.21.7", "lilconfig": "^3.1.3", "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.1.1", "postcss": "^8.4.47", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0", "postcss-nested": "^6.2.0", "postcss-selector-parser": "^6.1.2", "resolve": "^1.22.8", "sucrase": "^3.35.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ=="], @@ -4255,7 +4379,7 @@ "terminal-link": ["terminal-link@2.1.1", "", { "dependencies": { "ansi-escapes": "^4.2.1", "supports-hyperlinks": "^2.0.0" } }, "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="], - "terser": ["terser@5.46.2", "", { "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.15.0", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, "bin": { "terser": "bin/terser" } }, "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw=="], + "terser": ["terser@5.48.0", "", { "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.15.0", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, "bin": { "terser": "bin/terser" } }, "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q=="], "test-exclude": ["test-exclude@7.0.2", "", { "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^10.4.1", "minimatch": "^10.2.2" } }, "sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw=="], @@ -4279,9 +4403,9 @@ "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], - "tinyexec": ["tinyexec@1.1.1", "", {}, "sha512-VKS/ZaQhhkKFMANmAOhhXVoIfBXblQxGX1myCQ2faQrfmobMftXeJPcZGp0gS07ocvGJWDLZGyOZDadDBqYIJg=="], + "tinyexec": ["tinyexec@1.2.4", "", {}, "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg=="], - "tinyglobby": ["tinyglobby@0.2.16", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg=="], + "tinyglobby": ["tinyglobby@0.2.17", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="], "tinypool": ["tinypool@1.1.1", "", {}, "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg=="], @@ -4329,15 +4453,15 @@ "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], - "tsx": ["tsx@4.21.0", "", { "dependencies": { "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw=="], + "tsx": ["tsx@4.22.4", "", { "dependencies": { "esbuild": "~0.28.0" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg=="], "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="], "type-detect": ["type-detect@4.0.8", "", {}, "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="], - "type-fest": ["type-fest@5.6.0", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA=="], + "type-fest": ["type-fest@5.7.0", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg=="], - "type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="], + "type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="], "type-level-regexp": ["type-level-regexp@0.1.17", "", {}, "sha512-wTk4DH3cxwk196uGLK/E9pE45aLfeKJacKmcEgEOA/q5dnPGNxXt0cfYdFxb57L+sEpf1oJH4Dnx/pnRcku9jg=="], @@ -4347,7 +4471,7 @@ "typed-array-byte-offset": ["typed-array-byte-offset@1.0.4", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "for-each": "^0.3.3", "gopd": "^1.2.0", "has-proto": "^1.2.0", "is-typed-array": "^1.1.15", "reflect.getprototypeof": "^1.0.9" } }, "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ=="], - "typed-array-length": ["typed-array-length@1.0.7", "", { "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", "is-typed-array": "^1.1.13", "possible-typed-array-names": "^1.0.0", "reflect.getprototypeof": "^1.0.6" } }, "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg=="], + "typed-array-length": ["typed-array-length@1.0.8", "", { "dependencies": { "call-bind": "^1.0.9", "for-each": "^0.3.5", "gopd": "^1.2.0", "is-typed-array": "^1.1.15", "possible-typed-array-names": "^1.1.0", "reflect.getprototypeof": "^1.0.10" } }, "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g=="], "typed-html": ["typed-html@3.0.1", "", {}, "sha512-JKCM9zTfPDuPqQqdGZBWSEiItShliKkBFg5c6yOR8zth43v763XkAzTWaOlVqc0Y6p9ee8AaAbipGfUnCsYZUA=="], @@ -4361,7 +4485,7 @@ "uc.micro": ["uc.micro@1.0.6", "", {}, "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="], - "ufo": ["ufo@1.6.3", "", {}, "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q=="], + "ufo": ["ufo@1.6.4", "", {}, "sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA=="], "uhyphen": ["uhyphen@0.2.0", "", {}, "sha512-qz3o9CHXmJJPGBdqzab7qAYuW8kQGKNEuoHFYrBwV6hWIMcpAmxDLXojcHfFr9US1Pe6zUswEIJIbLI610fuqA=="], @@ -4371,9 +4495,9 @@ "unbzip2-stream": ["unbzip2-stream@1.4.3", "", { "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" } }, "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="], - "undici": ["undici@7.25.0", "", {}, "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ=="], + "undici": ["undici@7.26.0", "", {}, "sha512-3O9Tf67pGhgOv9jM35AbhkXAKi13f3oy3aE4CSgr+TckGeY+/iu97ZXN+J7DpHPzLbVApFd1IFhcnBjREYXYcg=="], - "undici-types": ["undici-types@7.19.2", "", {}, "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg=="], + "undici-types": ["undici-types@7.24.6", "", {}, "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg=="], "unenv": ["unenv@2.0.0-rc.24", "", { "dependencies": { "pathe": "^2.0.3" } }, "sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw=="], @@ -4429,7 +4553,7 @@ "utils-merge": ["utils-merge@1.0.1", "", {}, "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="], - "uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="], + "uuid": ["uuid@11.1.1", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ=="], "validate-npm-package-license": ["validate-npm-package-license@3.0.4", "", { "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="], @@ -4467,11 +4591,15 @@ "webpack-virtual-modules": ["webpack-virtual-modules@0.6.2", "", {}, "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ=="], + "whatwg-encoding": ["whatwg-encoding@3.1.1", "", { "dependencies": { "iconv-lite": "0.6.3" } }, "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ=="], + "whatwg-fetch": ["whatwg-fetch@3.6.20", "", {}, "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="], + "whatwg-mimetype": ["whatwg-mimetype@4.0.0", "", {}, "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg=="], + "whatwg-url": ["whatwg-url@5.0.0", "", { "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="], - "whatwg-url-minimum": ["whatwg-url-minimum@0.1.1", "", {}, "sha512-u2FNVjFVFZhdjb502KzXy1gKn1mEisQRJssmSJT8CPhZdZa0AP6VCbWlXERKyGu0l09t0k50FiDiralpGhBxgA=="], + "whatwg-url-minimum": ["whatwg-url-minimum@0.1.2", "", {}, "sha512-XPEm0XFQWNVG292lII1PrRRJl3sItrs7CettZ4ncYxuDVpLyy+NwlGyut2hXI0JswcJUxeCH+CyOJK0ZzAXD6A=="], "which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="], @@ -4483,17 +4611,17 @@ "which-module": ["which-module@2.0.1", "", {}, "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="], - "which-typed-array": ["which-typed-array@1.1.20", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "call-bound": "^1.0.4", "for-each": "^0.3.5", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" } }, "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg=="], + "which-typed-array": ["which-typed-array@1.1.21", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.9", "call-bound": "^1.0.4", "for-each": "^0.3.5", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" } }, "sha512-zbRA8cVm6io/d5W8uIe2hblzN76/Wm3v/yiythQvr+dpBWeqhPSWIDNj4zOyHi4zKbMK6DN34Xsr9jPHJERAEw=="], "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], "word-wrap": ["word-wrap@1.2.5", "", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="], - "workerd": ["workerd@1.20260424.1", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20260424.1", "@cloudflare/workerd-darwin-arm64": "1.20260424.1", "@cloudflare/workerd-linux-64": "1.20260424.1", "@cloudflare/workerd-linux-arm64": "1.20260424.1", "@cloudflare/workerd-windows-64": "1.20260424.1" }, "bin": { "workerd": "bin/workerd" } }, "sha512-oKsB0Xo/mfkYMdSACoS06XZg09VUK4rXwHfF/1t3P++sMbwzf4UHQvMO57+zxpEB2nVrY/ZkW0bYFGq4GdAFSQ=="], + "workerd": ["workerd@1.20260526.1", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20260526.1", "@cloudflare/workerd-darwin-arm64": "1.20260526.1", "@cloudflare/workerd-linux-64": "1.20260526.1", "@cloudflare/workerd-linux-arm64": "1.20260526.1", "@cloudflare/workerd-windows-64": "1.20260526.1" }, "bin": { "workerd": "bin/workerd" } }, "sha512-IHzymht98p10JH1zzwdCpbViAqw97HrwKl7+KfZeASFMsYSrIsAULWdPn0LRC5FTUzBpamLNyKCCKxbgXHgRHQ=="], "workers-ai-provider": ["workers-ai-provider@0.7.5", "", { "dependencies": { "@ai-sdk/provider": "^1.1.3", "@ai-sdk/provider-utils": "^2.2.8" } }, "sha512-dhCwgc3D65oDDTpH3k8Gf0Ek7KItzvaQidn2N5L5cqLo3WG8GM/4+Nr4rU56o8O3oZRsloB1gUCHYaRv2j7Y0A=="], - "wrangler": ["wrangler@4.85.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.4.2", "@cloudflare/unenv-preset": "2.16.1", "blake3-wasm": "2.1.5", "esbuild": "0.27.3", "miniflare": "4.20260424.0", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.24", "workerd": "1.20260424.1" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20260424.1" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-93cwt2RPb1qdcmEgPzH7ybiLN4BIKoWpscIX6SywjHrQOeIZrQk2haoc3XMLKtQTmzapxza9OuDD+kMHpsuuhg=="], + "wrangler": ["wrangler@4.95.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.5.0", "@cloudflare/unenv-preset": "2.16.1", "blake3-wasm": "2.1.5", "esbuild": "0.27.3", "miniflare": "4.20260526.0", "path-to-regexp": "6.3.0", "rosie-skills": "^0.6.3", "unenv": "2.0.0-rc.24", "workerd": "1.20260526.1" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20260526.1" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-vgXzFVSCdUbeCadgVXvu8fK5tzNm8T9W+7lriyGWZMx0B1+CAdr4d8JTlZszHfgjypRAHmAxb49etZGIRD9pgg=="], "wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="], @@ -4503,7 +4631,7 @@ "write-file-atomic": ["write-file-atomic@4.0.2", "", { "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" } }, "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="], - "ws": ["ws@8.20.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA=="], + "ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="], "xcode": ["xcode@3.0.1", "", { "dependencies": { "simple-plist": "^1.1.0", "uuid": "^7.0.3" } }, "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA=="], @@ -4519,7 +4647,7 @@ "yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="], - "yaml": ["yaml@2.8.3", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg=="], + "yaml": ["yaml@2.9.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA=="], "yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="], @@ -4533,7 +4661,7 @@ "youch-core": ["youch-core@0.3.3", "", { "dependencies": { "@poppinss/exception": "^1.2.2", "error-stack-parser-es": "^1.0.5" } }, "sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA=="], - "youtube-transcript": ["youtube-transcript@1.3.0", "", {}, "sha512-laWv9RcKIWh6rZUH3hVnOngEvtKAhFMV5UepUO6AgevPYqe2zv8KW/uCkZJDSnPwf5/AdVu0Q66/1RDblKsp6Q=="], + "youtube-transcript": ["youtube-transcript@1.3.1", "", {}, "sha512-NDCjwad113TGybbYF51y9Z4tcwzBHUZWQdF9veULNca18L+FdDbHHtTHIr69WVa3bB90l67S8kN0HtL2JO9fhg=="], "zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="], @@ -4543,28 +4671,16 @@ "zod-validation-error": ["zod-validation-error@3.5.4", "", { "peerDependencies": { "zod": "^3.24.4" } }, "sha512-+hEiRIiPobgyuFlEojnqjJnhFvg4r/i3cqgcm67eehZf/WBaK3g6cD02YU9mtdVxZjv8CzCA9n/Rhrs3yAAvAw=="], - "zustand": ["zustand@5.0.12", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-i77ae3aZq4dhMlRhJVCYgMLKuSiZAaUPAct2AksxQ+gOtimhGMdXljRT21P5BNpeT4kXlLIckvkPM029OljD7g=="], + "zustand": ["zustand@5.0.14", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-/8tAspM5LMPr28b3fwLYrtdj77ECpfZviaP75CMTnwO8ISyaE4GDIG/9rDDYq/cH9D2Xw2A2RXglLInmVBQB/g=="], "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="], "@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@aws-crypto/crc32/@aws-sdk/types": ["@aws-sdk/types@3.973.8", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw=="], - - "@aws-crypto/crc32c/@aws-sdk/types": ["@aws-sdk/types@3.973.8", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw=="], - - "@aws-crypto/sha1-browser/@aws-sdk/types": ["@aws-sdk/types@3.973.8", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw=="], - "@aws-crypto/sha1-browser/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="], - "@aws-crypto/sha256-browser/@aws-sdk/types": ["@aws-sdk/types@3.973.8", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw=="], - "@aws-crypto/sha256-browser/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="], - "@aws-crypto/sha256-js/@aws-sdk/types": ["@aws-sdk/types@3.973.8", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw=="], - - "@aws-crypto/util/@aws-sdk/types": ["@aws-sdk/types@3.973.8", "", { "dependencies": { "@smithy/types": "^4.14.1", "tslib": "^2.6.2" } }, "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw=="], - "@aws-crypto/util/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="], "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], @@ -4577,15 +4693,17 @@ "@babel/helper-create-regexp-features-plugin/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "@babel/highlight/chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="], + "@babel/plugin-transform-runtime/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], "@better-auth/core/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@better-auth/core/jose": ["jose@6.2.2", "", {}, "sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ=="], + "@better-auth/core/jose": ["jose@6.2.3", "", {}, "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw=="], - "@better-auth/core/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "@better-auth/core/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], - "@better-auth/expo/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "@better-auth/expo/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], "@cloudflare/vitest-pool-workers/wrangler": ["wrangler@4.35.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.4.0", "@cloudflare/unenv-preset": "2.7.3", "blake3-wasm": "2.1.5", "esbuild": "0.25.4", "miniflare": "4.20250906.0", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.21", "workerd": "1.20250906.0" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20250906.0" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-HbyXtbrh4Fi3mU8ussY85tVdQ74qpVS1vctUgaPc+bPrXBTqfDLkZ6VRtHAVF/eBhz4SFmhJtCQpN1caY2Ak8A=="], @@ -4595,12 +4713,10 @@ "@eslint/eslintrc/ajv": ["ajv@6.15.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="], - "@eslint/eslintrc/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "@eslint/eslintrc/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], "@eslint/eslintrc/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], - "@expo/cli/@expo/plist": ["@expo/plist@0.5.3", "", { "dependencies": { "@xmldom/xmldom": "^0.8.8", "base64-js": "^1.5.1", "xmlbuilder": "^15.1.1" } }, "sha512-jz5oPcPDd3fygwVxwSwmO6wodTwm0Qa14NUyPy0ka7H8sFmCtNZUI2+DzVe/EXjOhq1FbEjrwl89gdlWYOnVjQ=="], - "@expo/cli/accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="], "@expo/cli/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], @@ -4611,7 +4727,7 @@ "@expo/config/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], - "@expo/config-plugins/@expo/json-file": ["@expo/json-file@10.0.13", "", { "dependencies": { "@babel/code-frame": "^7.20.0", "json5": "^2.2.3" } }, "sha512-pX/XjQn7tgNw6zuuV2ikmegmwe/S7uiwhrs2wXrANMkq7ozrA+JcZwgW9Q/8WZgciBzfAhNp5hnackHcrmapQA=="], + "@expo/config-plugins/@expo/json-file": ["@expo/json-file@10.0.16", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "json5": "^2.2.3" } }, "sha512-fcVkWEj+hLuP2yt5W0aw6LmDRqSPWDLUSxOMcmFeV+algmIF59sQVKCwB9btjQLd4V6x9N0pISkQEkBubUHrCw=="], "@expo/config-plugins/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], @@ -4631,27 +4747,23 @@ "@expo/local-build-cache-provider/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - "@expo/metro/metro-runtime": ["metro-runtime@0.83.7", "", { "dependencies": { "@babel/runtime": "^7.25.0", "flow-enums-runtime": "^0.0.6" } }, "sha512-9GKkJURaB2iyYoEExKnedzAHzxmKtSi+k0tsZUvMoU27tBZJElchYt7JH/Ai/XzYAI9lCAaV7u5HZSI8J5Z+wQ=="], - - "@expo/metro/metro-source-map": ["metro-source-map@0.83.7", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.7", "nullthrows": "^1.1.1", "ob1": "0.83.7", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-JgA1h7oc1a1jydBe1GhVFsUoMYo3wLPk7oRA32rjlDsq+sP2JLt9x2p2lWbNSxTm/u8NV4VRid3hvEJgcX8tKw=="], + "@expo/metro-config/@expo/json-file": ["@expo/json-file@10.0.16", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "json5": "^2.2.3" } }, "sha512-fcVkWEj+hLuP2yt5W0aw6LmDRqSPWDLUSxOMcmFeV+algmIF59sQVKCwB9btjQLd4V6x9N0pISkQEkBubUHrCw=="], "@expo/metro-config/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "@expo/metro-config/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], - "@expo/metro-config/lightningcss": ["lightningcss@1.32.0", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.32.0", "lightningcss-darwin-arm64": "1.32.0", "lightningcss-darwin-x64": "1.32.0", "lightningcss-freebsd-x64": "1.32.0", "lightningcss-linux-arm-gnueabihf": "1.32.0", "lightningcss-linux-arm64-gnu": "1.32.0", "lightningcss-linux-arm64-musl": "1.32.0", "lightningcss-linux-x64-gnu": "1.32.0", "lightningcss-linux-x64-musl": "1.32.0", "lightningcss-win32-arm64-msvc": "1.32.0", "lightningcss-win32-x64-msvc": "1.32.0" } }, "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ=="], - - "@expo/metro-config/postcss": ["postcss@8.4.49", "", { "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA=="], + "@expo/metro-config/hermes-parser": ["hermes-parser@0.32.0", "", { "dependencies": { "hermes-estree": "0.32.0" } }, "sha512-g4nBOWFpuiTqjR3LZdRxKUkij9iyveWeuks7INEsMX741f3r9xxrOe8TeQfUxtda0eXmiIFiMQzoeSQEno33Hw=="], - "@expo/metro-runtime/@expo/log-box": ["@expo/log-box@55.0.11", "", { "dependencies": { "@expo/dom-webview": "^55.0.5", "anser": "^1.4.9", "stacktrace-parser": "^0.1.10" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-JQHFLWkskIbJi6cxYMjErx8lQqfFJilDQLKmdTO3m3YkdmN9GE/CrzjOfVlCG0DGEGZJ90br0pGKvGPdXNsHKw=="], + "@expo/metro-config/lightningcss": ["lightningcss@1.32.0", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.32.0", "lightningcss-darwin-arm64": "1.32.0", "lightningcss-darwin-x64": "1.32.0", "lightningcss-freebsd-x64": "1.32.0", "lightningcss-linux-arm-gnueabihf": "1.32.0", "lightningcss-linux-arm64-gnu": "1.32.0", "lightningcss-linux-arm64-musl": "1.32.0", "lightningcss-linux-x64-gnu": "1.32.0", "lightningcss-linux-x64-musl": "1.32.0", "lightningcss-win32-arm64-msvc": "1.32.0", "lightningcss-win32-x64-msvc": "1.32.0" } }, "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ=="], "@expo/package-manager/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "@expo/xcpretty/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - "@expo/xcpretty/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "@expo/xcpretty/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], - "@gorhom/portal/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "@gorhom/portal/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], "@humanwhocodes/config-array/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], @@ -4663,19 +4775,17 @@ "@jest/types/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - "@lhci/cli/express": ["express@4.22.1", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.3", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.14.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g=="], - - "@lhci/cli/yargs": ["yargs@15.4.1", "", { "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^18.1.2" } }, "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="], + "@lhci/cli/express": ["express@4.22.2", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.5", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.15.1", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q=="], - "@manypkg/tools/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "@lhci/cli/uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="], - "@modelcontextprotocol/sdk/jose": ["jose@6.2.2", "", {}, "sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ=="], + "@lhci/cli/yargs": ["yargs@15.4.1", "", { "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", "yargs-parser": "^18.1.2" } }, "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="], - "@packrat/analytics/@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="], + "@manypkg/tools/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], - "@packrat/api/@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="], + "@modelcontextprotocol/sdk/jose": ["jose@6.2.3", "", {}, "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw=="], - "@packrat/cli/@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="], + "@modelcontextprotocol/sdk/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], "@pnpm/network.ca-file/graceful-fs": ["graceful-fs@4.2.10", "", {}, "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="], @@ -4713,49 +4823,47 @@ "@radix-ui/react-tooltip/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.3", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A=="], - "@react-native-ai/apple/@ai-sdk/provider": ["@ai-sdk/provider@2.0.1", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-KCUwswvsC5VsW2PWFqF8eJgSCu5Ysj7m1TxiHTVA6g7k360bk0RNQENT8KTMAYEs+8fWPD3Uu4dEmzGHc+jGng=="], + "@react-native-ai/apple/@ai-sdk/provider": ["@ai-sdk/provider@2.0.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-h88OPkavHTiN9tMn2l5awAznGB0lXzjcLhgR1/rvjB2zlLprsNxbM2tt6OJsHUxduLC3klq0/eqaSf6fX5XVww=="], - "@react-native-ai/apple/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.23", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-60GYsRj5wIJQRcq5YwYJq4KhwLeStceXEJiZdecP1miiH+6FMmrnc7lZDOJoQ6m9lrudEb+uI4LEwddLz5+rPQ=="], + "@react-native-ai/apple/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.25", "", { "dependencies": { "@ai-sdk/provider": "2.0.3", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CvsRu+32Y8a167s+lrIBtsybvgTHp8j9y+6BeTvLeoW3Q+okw/b4CnNUFOLIXsRaKHQKAH+IHNJPYWywfpw0LA=="], - "@react-native-ai/apple/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "@react-native-ai/apple/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], - "@react-native-ai/llama/@ai-sdk/provider": ["@ai-sdk/provider@2.0.1", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-KCUwswvsC5VsW2PWFqF8eJgSCu5Ysj7m1TxiHTVA6g7k360bk0RNQENT8KTMAYEs+8fWPD3Uu4dEmzGHc+jGng=="], + "@react-native-ai/llama/@ai-sdk/provider": ["@ai-sdk/provider@2.0.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-h88OPkavHTiN9tMn2l5awAznGB0lXzjcLhgR1/rvjB2zlLprsNxbM2tt6OJsHUxduLC3klq0/eqaSf6fX5XVww=="], - "@react-native-ai/llama/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.23", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-60GYsRj5wIJQRcq5YwYJq4KhwLeStceXEJiZdecP1miiH+6FMmrnc7lZDOJoQ6m9lrudEb+uI4LEwddLz5+rPQ=="], + "@react-native-ai/llama/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.25", "", { "dependencies": { "@ai-sdk/provider": "2.0.3", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CvsRu+32Y8a167s+lrIBtsybvgTHp8j9y+6BeTvLeoW3Q+okw/b4CnNUFOLIXsRaKHQKAH+IHNJPYWywfpw0LA=="], - "@react-native-ai/llama/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "@react-native-ai/llama/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], - "@react-native/babel-preset/@babel/plugin-transform-class-properties": ["@babel/plugin-transform-class-properties@7.28.6", "", { "dependencies": { "@babel/helper-create-class-features-plugin": "^7.28.6", "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw=="], + "@react-native/codegen/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - "@react-native/babel-preset/@babel/plugin-transform-classes": ["@babel/plugin-transform-classes@7.28.6", "", { "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-compilation-targets": "^7.28.6", "@babel/helper-globals": "^7.28.0", "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-replace-supers": "^7.28.6", "@babel/traverse": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q=="], + "@react-native/codegen/hermes-parser": ["hermes-parser@0.32.0", "", { "dependencies": { "hermes-estree": "0.32.0" } }, "sha512-g4nBOWFpuiTqjR3LZdRxKUkij9iyveWeuks7INEsMX741f3r9xxrOe8TeQfUxtda0eXmiIFiMQzoeSQEno33Hw=="], - "@react-native/babel-preset/@babel/plugin-transform-nullish-coalescing-operator": ["@babel/plugin-transform-nullish-coalescing-operator@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg=="], + "@react-native/dev-middleware/chrome-launcher": ["chrome-launcher@0.15.2", "", { "dependencies": { "@types/node": "*", "escape-string-regexp": "^4.0.0", "is-wsl": "^2.2.0", "lighthouse-logger": "^1.0.0" }, "bin": { "print-chrome-path": "bin/print-chrome-path.js" } }, "sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ=="], - "@react-native/babel-preset/@babel/plugin-transform-optional-chaining": ["@babel/plugin-transform-optional-chaining@7.28.6", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w=="], + "@react-native/dev-middleware/serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="], - "@react-native/codegen/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], + "@react-native/dev-middleware/ws": ["ws@7.5.11", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA=="], - "@react-native/community-cli-plugin/metro": ["metro@0.83.6", "", { "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/core": "^7.25.2", "@babel/generator": "^7.29.1", "@babel/parser": "^7.29.0", "@babel/template": "^7.28.6", "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "accepts": "^2.0.0", "chalk": "^4.0.0", "ci-info": "^2.0.0", "connect": "^3.6.5", "debug": "^4.4.0", "error-stack-parser": "^2.0.6", "flow-enums-runtime": "^0.0.6", "graceful-fs": "^4.2.4", "hermes-parser": "0.35.0", "image-size": "^1.0.2", "invariant": "^2.2.4", "jest-worker": "^29.7.0", "jsc-safe-url": "^0.2.2", "lodash.throttle": "^4.1.1", "metro-babel-transformer": "0.83.6", "metro-cache": "0.83.6", "metro-cache-key": "0.83.6", "metro-config": "0.83.6", "metro-core": "0.83.6", "metro-file-map": "0.83.6", "metro-resolver": "0.83.6", "metro-runtime": "0.83.6", "metro-source-map": "0.83.6", "metro-symbolicate": "0.83.6", "metro-transform-plugins": "0.83.6", "metro-transform-worker": "0.83.6", "mime-types": "^3.0.1", "nullthrows": "^1.1.1", "serialize-error": "^2.1.0", "source-map": "^0.5.6", "throat": "^5.0.0", "ws": "^7.5.10", "yargs": "^17.6.2" }, "bin": { "metro": "src/cli.js" } }, "sha512-pbdndsAZ2F/ceopDdhVbttpa/hfLzXPJ/husc+QvQ33R0D9UXJKzTn5+OzOXx4bpQNtAKF2bY88cCI3Zl44xDQ=="], + "@react-navigation/core/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], - "@react-native/community-cli-plugin/metro-config": ["metro-config@0.83.6", "", { "dependencies": { "connect": "^3.6.5", "flow-enums-runtime": "^0.0.6", "jest-validate": "^29.7.0", "metro": "0.83.6", "metro-cache": "0.83.6", "metro-core": "0.83.6", "metro-runtime": "0.83.6", "yaml": "^2.6.1" } }, "sha512-G5622400uNtnAMlppEA5zkFAZltEf7DSGhOu09BkisCxOlVMWfdosD/oPyh4f2YVQsc1MBYyp4w6OzbExTYarg=="], + "@react-navigation/native/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], - "@react-native/community-cli-plugin/metro-core": ["metro-core@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6", "lodash.throttle": "^4.1.1", "metro-resolver": "0.83.6" } }, "sha512-l+yQ2fuIgR//wszUlMrrAa9+Z+kbKazd0QOh0VQY7jC4ghb7yZBBSla/UMYRBZZ6fPg9IM+wD3+h+37a5f9etw=="], + "@react-navigation/routers/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], - "@react-native/dev-middleware/chrome-launcher": ["chrome-launcher@0.15.2", "", { "dependencies": { "@types/node": "*", "escape-string-regexp": "^4.0.0", "is-wsl": "^2.2.0", "lighthouse-logger": "^1.0.0" }, "bin": { "print-chrome-path": "bin/print-chrome-path.js" } }, "sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ=="], + "@reduxjs/toolkit/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@react-native/dev-middleware/serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="], + "@reduxjs/toolkit/immer": ["immer@11.1.8", "", {}, "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA=="], - "@react-native/dev-middleware/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], + "@sentry-internal/browser-utils/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], - "@react-navigation/core/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "@sentry-internal/feedback/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], - "@react-navigation/native/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "@sentry-internal/replay/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], - "@react-navigation/routers/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "@sentry-internal/replay-canvas/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], - "@reduxjs/toolkit/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - - "@reduxjs/toolkit/immer": ["immer@11.1.4", "", {}, "sha512-XREFCPo6ksxVzP4E0ekD5aMdf8WMwmdNaz6vuvxgI40UaEiu6q3p8X52aU6GdyvLY3XXX/8R7JOTXStz/nBbRw=="], + "@sentry/browser/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], "@sentry/cli/https-proxy-agent": ["https-proxy-agent@5.0.1", "", { "dependencies": { "agent-base": "6", "debug": "4" } }, "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="], @@ -4779,13 +4887,23 @@ "@sentry/node/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="], + "@sentry/react/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], + + "@sentry/react-native/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], + + "@sentry/types/@sentry/core": ["@sentry/core@10.37.0", "", {}, "sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g=="], + "@sentry/utils/@sentry/types": ["@sentry/types@6.19.7", "", {}, "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="], "@sentry/utils/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="], + "@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="], + "@tailwindcss/typography/postcss-selector-parser": ["postcss-selector-parser@6.0.10", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="], - "@typescript-eslint/project-service/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "@types/glob/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], + + "@typescript-eslint/project-service/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], "@typescript-eslint/typescript-estree/globby": ["globby@11.1.0", "", { "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" } }, "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="], @@ -4795,19 +4913,17 @@ "@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.1.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg=="], - "@vue/compiler-core/@babel/parser": ["@babel/parser@7.29.3", "", { "dependencies": { "@babel/types": "^7.29.0" }, "bin": "./bin/babel-parser.js" }, "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA=="], - "@vue/compiler-core/estree-walker": ["estree-walker@2.0.2", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="], - "@vue/compiler-sfc/@babel/parser": ["@babel/parser@7.29.3", "", { "dependencies": { "@babel/types": "^7.29.0" }, "bin": "./bin/babel-parser.js" }, "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA=="], - "@vue/compiler-sfc/estree-walker": ["estree-walker@2.0.2", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="], "accepts/negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="], + "agents/partyserver": ["partyserver@0.5.6", "", { "dependencies": { "nanoid": "^5.1.9" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20260424.1" } }, "sha512-/LKCqlq9nWzNXA8UXZFO/Xz15QDCjJnGAgRQVLnXJO9bA0HKt5J8VM8wLnGc814WatzuQgeG17tqzI//y5WFGA=="], + "agents/yargs": ["yargs@18.0.0", "", { "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "string-width": "^7.2.0", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" } }, "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg=="], - "agents/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "agents/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], "anymatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], @@ -4819,13 +4935,13 @@ "babel-plugin-polyfill-corejs2/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], - "babel-preset-expo/@babel/preset-typescript": ["@babel/preset-typescript@7.28.5", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-validator-option": "^7.27.1", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-transform-modules-commonjs": "^7.27.1", "@babel/plugin-transform-typescript": "^7.28.5" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g=="], + "babel-plugin-syntax-hermes-parser/hermes-parser": ["hermes-parser@0.32.0", "", { "dependencies": { "hermes-estree": "0.32.0" } }, "sha512-g4nBOWFpuiTqjR3LZdRxKUkij9iyveWeuks7INEsMX741f3r9xxrOe8TeQfUxtda0eXmiIFiMQzoeSQEno33Hw=="], - "better-auth/jose": ["jose@6.2.2", "", {}, "sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ=="], + "better-auth/jose": ["jose@6.2.3", "", {}, "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw=="], - "better-auth/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "better-auth/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], - "better-auth-cloudflare/zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="], + "better-auth-cloudflare/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], "better-opn/open": ["open@8.4.2", "", { "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", "is-wsl": "^2.2.0" } }, "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="], @@ -4835,14 +4951,10 @@ "chrome-launcher/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="], - "chrome-launcher/lighthouse-logger": ["lighthouse-logger@1.4.2", "", { "dependencies": { "debug": "^2.6.9", "marky": "^1.2.2" } }, "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g=="], - "chrome-launcher/rimraf": ["rimraf@3.0.2", "", { "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "bin.js" } }, "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="], "chromium-bidi/zod": ["zod@3.23.8", "", {}, "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g=="], - "chromium-edge-launcher/lighthouse-logger": ["lighthouse-logger@1.4.2", "", { "dependencies": { "debug": "^2.6.9", "marky": "^1.2.2" } }, "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g=="], - "chromium-edge-launcher/mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="], "chromium-edge-launcher/rimraf": ["rimraf@3.0.2", "", { "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "bin.js" } }, "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="], @@ -4863,11 +4975,11 @@ "connect/finalhandler": ["finalhandler@1.1.2", "", { "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "on-finished": "~2.3.0", "parseurl": "~1.3.3", "statuses": "~1.5.0", "unpipe": "~1.0.0" } }, "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="], - "cosmiconfig/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "cosmiconfig/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], "cross-fetch/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="], - "detective-typescript/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.59.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.59.0", "@typescript-eslint/tsconfig-utils": "8.59.0", "@typescript-eslint/types": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw=="], + "detective-typescript/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.60.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.60.0", "@typescript-eslint/tsconfig-utils": "8.60.0", "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g=="], "dir-glob/path-type": ["path-type@4.0.0", "", {}, "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="], @@ -4875,25 +4987,27 @@ "drizzle-kit/esbuild": ["esbuild@0.25.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="], + "encoding-sniffer/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="], + "escodegen/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], "eslint/ajv": ["ajv@6.15.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="], "eslint/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - "eslint/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="], + "eslint/js-yaml": ["js-yaml@4.2.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw=="], "eslint/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.59.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.59.0", "@typescript-eslint/type-utils": "8.59.0", "@typescript-eslint/utils": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.59.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.60.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.60.0", "@typescript-eslint/type-utils": "8.60.0", "@typescript-eslint/utils": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.60.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-QYb/sa74/s7OKMbACMjrYnGspj9Hs5YI5aaffSL65UfeBUzVzBJfVo3oWSpbzPurvm7yaCCo2Lk7lVj610HqKw=="], - "eslint-config-universe/@typescript-eslint/parser": ["@typescript-eslint/parser@8.59.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.59.0", "@typescript-eslint/types": "8.59.0", "@typescript-eslint/typescript-estree": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg=="], + "eslint-config-universe/@typescript-eslint/parser": ["@typescript-eslint/parser@8.60.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.60.0", "@typescript-eslint/types": "8.60.0", "@typescript-eslint/typescript-estree": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg=="], "eslint-config-universe/globals": ["globals@16.5.0", "", {}, "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ=="], "eslint-import-resolver-node/debug": ["debug@3.2.7", "", { "dependencies": { "ms": "^2.1.1" } }, "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="], - "eslint-import-resolver-node/resolve": ["resolve@2.0.0-next.6", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.1", "node-exports-info": "^1.6.0", "object-keys": "^1.1.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA=="], + "eslint-import-resolver-node/resolve": ["resolve@2.0.0-next.7", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.2", "node-exports-info": "^1.6.0", "object-keys": "^1.1.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ=="], "eslint-module-utils/debug": ["debug@3.2.7", "", { "dependencies": { "ms": "^2.1.1" } }, "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="], @@ -4915,23 +5029,23 @@ "eslint-plugin-react/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], - "eslint-plugin-react/resolve": ["resolve@2.0.0-next.6", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.1", "node-exports-info": "^1.6.0", "object-keys": "^1.1.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA=="], + "eslint-plugin-react/resolve": ["resolve@2.0.0-next.7", "", { "dependencies": { "es-errors": "^1.3.0", "is-core-module": "^2.16.2", "node-exports-info": "^1.6.0", "object-keys": "^1.1.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ=="], "eslint-plugin-react/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], + "eslint-plugin-react-hooks/zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="], + "eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@1.3.0", "", {}, "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="], "expo-modules-autolinking/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], "expo-modules-autolinking/commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="], - "expo-router/@expo/metro-runtime": ["@expo/metro-runtime@55.0.11", "", { "dependencies": { "@expo/log-box": "55.0.12", "anser": "^1.4.9", "pretty-format": "^29.7.0", "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-dom": "*", "react-native": "*" }, "optionalPeers": ["react-dom"] }, "sha512-4KKi/jGrIEXi2YGu0hYTVr0CEeRJy5SXbCrz9+KDZkuD3ROwKNpM1DBawni5rhPVovFnR323HBck9GaxhnfrRw=="], - - "expo-router/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "expo-router/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], "expo-router/semver": ["semver@7.6.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="], - "expo-updates/arg": ["arg@4.1.0", "", {}, "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg=="], + "expo-updates/arg": ["arg@4.1.3", "", {}, "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="], "expo-updates/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], @@ -4939,6 +5053,8 @@ "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], + "external-editor/chardet": ["chardet@0.7.0", "", {}, "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="], + "external-editor/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="], "external-editor/tmp": ["tmp@0.0.33", "", { "dependencies": { "os-tmpdir": "~1.0.2" } }, "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="], @@ -5003,7 +5119,7 @@ "lighthouse/semver": ["semver@5.7.2", "", { "bin": { "semver": "bin/semver" } }, "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="], - "lighthouse/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], + "lighthouse/ws": ["ws@7.5.11", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA=="], "lighthouse/yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="], @@ -5025,34 +5141,16 @@ "mdast-util-find-and-replace/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="], - "meow/object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="], - "merge-options/is-plain-obj": ["is-plain-obj@2.1.0", "", {}, "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="], - "metro/@babel/parser": ["@babel/parser@7.29.3", "", { "dependencies": { "@babel/types": "^7.29.0" }, "bin": "./bin/babel-parser.js" }, "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA=="], - "metro/ci-info": ["ci-info@2.0.0", "", {}, "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="], "metro/hermes-parser": ["hermes-parser@0.35.0", "", { "dependencies": { "hermes-estree": "0.35.0" } }, "sha512-9JLjeHxBx8T4CAsydZR49PNZUaix+WpQJwu9p2010lu+7Kwl6D/7wYFFJxoz+aXkaaClp9Zfg6W6/zVlSJORaA=="], - "metro/metro-runtime": ["metro-runtime@0.83.7", "", { "dependencies": { "@babel/runtime": "^7.25.0", "flow-enums-runtime": "^0.0.6" } }, "sha512-9GKkJURaB2iyYoEExKnedzAHzxmKtSi+k0tsZUvMoU27tBZJElchYt7JH/Ai/XzYAI9lCAaV7u5HZSI8J5Z+wQ=="], - - "metro/metro-source-map": ["metro-source-map@0.83.7", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.7", "nullthrows": "^1.1.1", "ob1": "0.83.7", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-JgA1h7oc1a1jydBe1GhVFsUoMYo3wLPk7oRA32rjlDsq+sP2JLt9x2p2lWbNSxTm/u8NV4VRid3hvEJgcX8tKw=="], - - "metro/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], + "metro/ws": ["ws@7.5.11", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA=="], "metro-babel-transformer/hermes-parser": ["hermes-parser@0.35.0", "", { "dependencies": { "hermes-estree": "0.35.0" } }, "sha512-9JLjeHxBx8T4CAsydZR49PNZUaix+WpQJwu9p2010lu+7Kwl6D/7wYFFJxoz+aXkaaClp9Zfg6W6/zVlSJORaA=="], - "metro-config/metro-runtime": ["metro-runtime@0.83.7", "", { "dependencies": { "@babel/runtime": "^7.25.0", "flow-enums-runtime": "^0.0.6" } }, "sha512-9GKkJURaB2iyYoEExKnedzAHzxmKtSi+k0tsZUvMoU27tBZJElchYt7JH/Ai/XzYAI9lCAaV7u5HZSI8J5Z+wQ=="], - - "metro-source-map/metro-symbolicate": ["metro-symbolicate@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-source-map": "0.83.6", "nullthrows": "^1.1.1", "source-map": "^0.5.6", "vlq": "^1.0.0" }, "bin": { "metro-symbolicate": "src/index.js" } }, "sha512-4nvkmv9T7ozhprlPwk/+xm0SVPsxly5kYyMHdNaOlFemFz4df9BanvD46Ac6OISu/4Idinzfk2KVb++6OfzPAQ=="], - - "metro-symbolicate/metro-source-map": ["metro-source-map@0.83.7", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.7", "nullthrows": "^1.1.1", "ob1": "0.83.7", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-JgA1h7oc1a1jydBe1GhVFsUoMYo3wLPk7oRA32rjlDsq+sP2JLt9x2p2lWbNSxTm/u8NV4VRid3hvEJgcX8tKw=="], - - "metro-transform-worker/@babel/parser": ["@babel/parser@7.29.3", "", { "dependencies": { "@babel/types": "^7.29.0" }, "bin": "./bin/babel-parser.js" }, "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA=="], - - "metro-transform-worker/metro-source-map": ["metro-source-map@0.83.7", "", { "dependencies": { "@babel/traverse": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.7", "nullthrows": "^1.1.1", "ob1": "0.83.7", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-JgA1h7oc1a1jydBe1GhVFsUoMYo3wLPk7oRA32rjlDsq+sP2JLt9x2p2lWbNSxTm/u8NV4VRid3hvEJgcX8tKw=="], - "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "mimetext/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], @@ -5083,9 +5181,13 @@ "p-locate/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], + "parse5/entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="], + "playwright/fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="], - "postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "plist/@xmldom/xmldom": ["@xmldom/xmldom@0.9.10", "", {}, "sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw=="], + + "postcss/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], "pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="], @@ -5099,11 +5201,11 @@ "rc/strip-json-comments": ["strip-json-comments@2.0.1", "", {}, "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="], - "react-devtools-core/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], + "react-devtools-core/ws": ["ws@7.5.11", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA=="], "react-native/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - "react-native/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], + "react-native/ws": ["ws@7.5.11", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA=="], "react-native-blob-util/glob": ["glob@13.0.1", "", { "dependencies": { "minimatch": "^10.1.2", "minipass": "^7.1.2", "path-scurry": "^2.0.0" } }, "sha512-B7U/vJpE3DkJ5WXTgTpTRN63uV42DseiXXKMwG14LQBXmsdeIoHAPbU/MEo6II0k5ED74uc2ZGTC6MwHFQhF6w=="], @@ -5125,14 +5227,14 @@ "rimraf/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="], + "rollup/@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], + "router/path-to-regexp": ["path-to-regexp@8.4.2", "", {}, "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA=="], "simple-plist/bplist-parser": ["bplist-parser@0.3.1", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA=="], "simple-swizzle/is-arrayish": ["is-arrayish@0.3.4", "", {}, "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA=="], - "socks/ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="], - "source-map-support/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], "stack-utils/escape-string-regexp": ["escape-string-regexp@2.0.0", "", {}, "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="], @@ -5143,12 +5245,8 @@ "supports-hyperlinks/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], - "svix/uuid": ["uuid@10.0.0", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ=="], - "tailwindcss/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="], - "tailwindcss/postcss": ["postcss@8.5.10", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ=="], - "tailwindcss/postcss-import": ["postcss-import@15.1.0", "", { "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", "resolve": "^1.1.7" }, "peerDependencies": { "postcss": "^8.0.0" } }, "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew=="], "terminal-link/ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="], @@ -5163,19 +5261,23 @@ "tsconfig-paths/json5": ["json5@1.0.2", "", { "dependencies": { "minimist": "^1.2.0" }, "bin": { "json5": "lib/cli.js" } }, "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="], + "tsx/esbuild": ["esbuild@0.28.0", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.28.0", "@esbuild/android-arm": "0.28.0", "@esbuild/android-arm64": "0.28.0", "@esbuild/android-x64": "0.28.0", "@esbuild/darwin-arm64": "0.28.0", "@esbuild/darwin-x64": "0.28.0", "@esbuild/freebsd-arm64": "0.28.0", "@esbuild/freebsd-x64": "0.28.0", "@esbuild/linux-arm": "0.28.0", "@esbuild/linux-arm64": "0.28.0", "@esbuild/linux-ia32": "0.28.0", "@esbuild/linux-loong64": "0.28.0", "@esbuild/linux-mips64el": "0.28.0", "@esbuild/linux-ppc64": "0.28.0", "@esbuild/linux-riscv64": "0.28.0", "@esbuild/linux-s390x": "0.28.0", "@esbuild/linux-x64": "0.28.0", "@esbuild/netbsd-arm64": "0.28.0", "@esbuild/netbsd-x64": "0.28.0", "@esbuild/openbsd-arm64": "0.28.0", "@esbuild/openbsd-x64": "0.28.0", "@esbuild/openharmony-arm64": "0.28.0", "@esbuild/sunos-x64": "0.28.0", "@esbuild/win32-arm64": "0.28.0", "@esbuild/win32-ia32": "0.28.0", "@esbuild/win32-x64": "0.28.0" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw=="], + + "type-is/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="], + "util/inherits": ["inherits@2.0.3", "", {}, "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="], "vite/esbuild": ["esbuild@0.25.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="], - "vite/postcss": ["postcss@8.5.10", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ=="], - "vitest/tinyexec": ["tinyexec@0.3.2", "", {}, "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="], + "whatwg-encoding/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="], + "workers-ai-provider/@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="], "workers-ai-provider/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA=="], - "wrangler/miniflare": ["miniflare@4.20260424.0", "", { "dependencies": { "@cspotcode/source-map-support": "0.8.1", "sharp": "^0.34.5", "undici": "7.24.8", "workerd": "1.20260424.1", "ws": "8.18.0", "youch": "4.1.0-beta.10" }, "bin": { "miniflare": "bootstrap.js" } }, "sha512-B6MKBBd5TJ19daUc3Ae9rWctn1nDA/VCXykXfCsp9fTxyfGxnZY27tJs1caxgE9MWEMMKGbGHouqVtgKbKGxmw=="], + "wrangler/miniflare": ["miniflare@4.20260526.0", "", { "dependencies": { "@cspotcode/source-map-support": "0.8.1", "sharp": "^0.34.5", "undici": "7.24.8", "workerd": "1.20260526.1", "ws": "8.20.1", "youch": "4.1.0-beta.10" }, "bin": { "miniflare": "bootstrap.js" } }, "sha512-JYQ7jPZZWoaaj9jWHb8Ucp6Cu2SbDVqIsAJhumqdzzLkkfq0pYkDeino/sZfW1ixJWPjv/C44zjm9gVJC2izCA=="], "write-file-atomic/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="], @@ -5185,11 +5287,11 @@ "yargs/yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="], - "@aws-crypto/sha1-browser/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="], + "@babel/highlight/chalk/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="], - "@aws-crypto/sha256-browser/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="], + "@babel/highlight/chalk/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="], - "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="], + "@babel/highlight/chalk/supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="], "@cloudflare/vitest-pool-workers/wrangler/@cloudflare/kv-asset-handler": ["@cloudflare/kv-asset-handler@0.4.0", "", { "dependencies": { "mime": "^3.0.0" } }, "sha512-+tv3z+SPp+gqTIcImN9o0hqE9xyfQjI1XD9pL6NuKjua9B1y7mNYv0S9cP+QEbA4ppVgGZEmKOvHX5G5Ei1CVA=="], @@ -5249,7 +5351,7 @@ "@eslint/eslintrc/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], - "@eslint/eslintrc/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "@eslint/eslintrc/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "@expo/cli/accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], @@ -5263,6 +5365,8 @@ "@expo/cli/send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="], + "@expo/config-plugins/@expo/json-file/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="], + "@expo/config-plugins/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], "@expo/devtools/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], @@ -5275,8 +5379,12 @@ "@expo/local-build-cache-provider/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], + "@expo/metro-config/@expo/json-file/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="], + "@expo/metro-config/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], + "@expo/metro-config/hermes-parser/hermes-estree": ["hermes-estree@0.32.0", "", {}, "sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ=="], + "@expo/metro-config/lightningcss/lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.32.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ=="], "@expo/metro-config/lightningcss/lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.32.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w=="], @@ -5297,19 +5405,13 @@ "@expo/metro-config/lightningcss/lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.32.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q=="], - "@expo/metro-config/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - - "@expo/metro-runtime/@expo/log-box/@expo/dom-webview": ["@expo/dom-webview@55.0.5", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-lt3uxYOCk3wmWvtOOvsC35CKGbDAOx5C2EaY8SH1JVSfBzqmF8Cs0Xp1MPxncDPMyxpMiWx5SvvV/iLF1rJU4A=="], - - "@expo/metro/metro-source-map/ob1": ["ob1@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-9M5kpuOLyTPogMtZiQUIxdAZxl7Dxs6tVBbJErSumsqGMuhVSoUbkfeZ3XNPpLpwBBtqY5QDUzGwggLHX3slQg=="], - "@expo/package-manager/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], "@expo/xcpretty/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], "@expo/xcpretty/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], - "@humanwhocodes/config-array/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "@humanwhocodes/config-array/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "@istanbuljs/load-nyc-config/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="], @@ -5337,8 +5439,6 @@ "@lhci/cli/express/path-to-regexp": ["path-to-regexp@0.1.13", "", {}, "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA=="], - "@lhci/cli/express/qs": ["qs@6.14.2", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q=="], - "@lhci/cli/express/send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="], "@lhci/cli/express/serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="], @@ -5355,47 +5455,13 @@ "@manypkg/tools/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], - "@packrat/analytics/@types/bun/bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], - - "@packrat/api/@types/bun/bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], - - "@packrat/cli/@types/bun/bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], - "@react-native-ai/apple/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], "@react-native-ai/llama/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], "@react-native/codegen/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], - "@react-native/community-cli-plugin/metro/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - - "@react-native/community-cli-plugin/metro/ci-info": ["ci-info@2.0.0", "", {}, "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="], - - "@react-native/community-cli-plugin/metro/hermes-parser": ["hermes-parser@0.35.0", "", { "dependencies": { "hermes-estree": "0.35.0" } }, "sha512-9JLjeHxBx8T4CAsydZR49PNZUaix+WpQJwu9p2010lu+7Kwl6D/7wYFFJxoz+aXkaaClp9Zfg6W6/zVlSJORaA=="], - - "@react-native/community-cli-plugin/metro/metro-babel-transformer": ["metro-babel-transformer@0.83.6", "", { "dependencies": { "@babel/core": "^7.25.2", "flow-enums-runtime": "^0.0.6", "hermes-parser": "0.35.0", "metro-cache-key": "0.83.6", "nullthrows": "^1.1.1" } }, "sha512-1AnuazBpzY3meRMr04WUw14kRBkV0W3Ez+AA75FAeNpRyWNN5S3M3PHLUbZw7IXq7ZeOzceyRsHStaFrnWd+8w=="], - - "@react-native/community-cli-plugin/metro/metro-cache": ["metro-cache@0.83.6", "", { "dependencies": { "exponential-backoff": "^3.1.1", "flow-enums-runtime": "^0.0.6", "https-proxy-agent": "^7.0.5", "metro-core": "0.83.6" } }, "sha512-DpvZE32feNkqfZkI4Fic7YI/Kw8QP9wdl1rC4YKPrA77wQbI9vXbxjmfkCT/EGwBTFOPKqvIXo+H3BNe93YyiQ=="], - - "@react-native/community-cli-plugin/metro/metro-cache-key": ["metro-cache-key@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-5gdK4PVpgNOHi7xCGrgesNP1AuOA2TiPqpcirGXZi4RLLzX1VMowpkgTVtBfpQQCqWoosQF9yrSo9/KDQg1eBg=="], - - "@react-native/community-cli-plugin/metro/metro-file-map": ["metro-file-map@0.83.6", "", { "dependencies": { "debug": "^4.4.0", "fb-watchman": "^2.0.0", "flow-enums-runtime": "^0.0.6", "graceful-fs": "^4.2.4", "invariant": "^2.2.4", "jest-worker": "^29.7.0", "micromatch": "^4.0.4", "nullthrows": "^1.1.1", "walker": "^1.0.7" } }, "sha512-Jg3oN604C7GWbQwFAUXt8KsbMXeKfsxbZ5HFy4XFM3ggTS+ja9QgUmq9B613kgXv3G4M6rwiI6cvh9TRly4x3w=="], - - "@react-native/community-cli-plugin/metro/metro-resolver": ["metro-resolver@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-lAwR/FsT1uJ5iCt4AIsN3boKfJ88aN8bjvDT5FwBS0tKeKw4/sbdSTWlFxc7W/MUTN5RekJ3nQkJRIWsvs28tA=="], - - "@react-native/community-cli-plugin/metro/metro-symbolicate": ["metro-symbolicate@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-source-map": "0.83.6", "nullthrows": "^1.1.1", "source-map": "^0.5.6", "vlq": "^1.0.0" }, "bin": { "metro-symbolicate": "src/index.js" } }, "sha512-4nvkmv9T7ozhprlPwk/+xm0SVPsxly5kYyMHdNaOlFemFz4df9BanvD46Ac6OISu/4Idinzfk2KVb++6OfzPAQ=="], - - "@react-native/community-cli-plugin/metro/metro-transform-plugins": ["metro-transform-plugins@0.83.6", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/generator": "^7.29.1", "@babel/template": "^7.28.6", "@babel/traverse": "^7.29.0", "flow-enums-runtime": "^0.0.6", "nullthrows": "^1.1.1" } }, "sha512-V+zoY2Ul0v0BW6IokJkTud3raXmDdbdwkUQ/5eiSoy0jKuKMhrDjdH+H5buCS5iiJdNbykOn69Eip+Sqymkodg=="], - - "@react-native/community-cli-plugin/metro/metro-transform-worker": ["metro-transform-worker@0.83.6", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/generator": "^7.29.1", "@babel/parser": "^7.29.0", "@babel/types": "^7.29.0", "flow-enums-runtime": "^0.0.6", "metro": "0.83.6", "metro-babel-transformer": "0.83.6", "metro-cache": "0.83.6", "metro-cache-key": "0.83.6", "metro-minify-terser": "0.83.6", "metro-source-map": "0.83.6", "metro-transform-plugins": "0.83.6", "nullthrows": "^1.1.1" } }, "sha512-G5kDJ/P0ZTIf57t3iyAd5qIXbj2Wb1j7WtIDh82uTFQHe2Mq2SO9aXG9j1wI+kxZlIe58Z22XEXIKMl89z0ibQ=="], - - "@react-native/community-cli-plugin/metro/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="], - - "@react-native/community-cli-plugin/metro-config/metro-cache": ["metro-cache@0.83.6", "", { "dependencies": { "exponential-backoff": "^3.1.1", "flow-enums-runtime": "^0.0.6", "https-proxy-agent": "^7.0.5", "metro-core": "0.83.6" } }, "sha512-DpvZE32feNkqfZkI4Fic7YI/Kw8QP9wdl1rC4YKPrA77wQbI9vXbxjmfkCT/EGwBTFOPKqvIXo+H3BNe93YyiQ=="], - - "@react-native/community-cli-plugin/metro-core/metro-resolver": ["metro-resolver@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-lAwR/FsT1uJ5iCt4AIsN3boKfJ88aN8bjvDT5FwBS0tKeKw4/sbdSTWlFxc7W/MUTN5RekJ3nQkJRIWsvs28tA=="], - - "@react-native/dev-middleware/chrome-launcher/lighthouse-logger": ["lighthouse-logger@1.4.2", "", { "dependencies": { "debug": "^2.6.9", "marky": "^1.2.2" } }, "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g=="], + "@react-native/codegen/hermes-parser/hermes-estree": ["hermes-estree@0.32.0", "", {}, "sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ=="], "@react-native/dev-middleware/serve-static/send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="], @@ -5405,7 +5471,7 @@ "@typescript-eslint/typescript-estree/globby/slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="], - "@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.1.0", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w=="], + "@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.1.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA=="], "agents/yargs/cliui": ["cliui@9.0.1", "", { "dependencies": { "string-width": "^7.2.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" } }, "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w=="], @@ -5419,12 +5485,10 @@ "babel-plugin-istanbul/test-exclude/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], - "chrome-launcher/lighthouse-logger/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], + "babel-plugin-syntax-hermes-parser/hermes-parser/hermes-estree": ["hermes-estree@0.32.0", "", {}, "sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ=="], "chrome-launcher/rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], - "chromium-edge-launcher/lighthouse-logger/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], - "chromium-edge-launcher/rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], "compression/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], @@ -5445,9 +5509,9 @@ "cosmiconfig/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], - "detective-typescript/@typescript-eslint/typescript-estree/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "detective-typescript/@typescript-eslint/typescript-estree/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], - "detective-typescript/@typescript-eslint/typescript-estree/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.59.0", "", { "dependencies": { "@typescript-eslint/types": "8.59.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q=="], + "detective-typescript/@typescript-eslint/typescript-estree/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.60.0", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg=="], "detective-typescript/@typescript-eslint/typescript-estree/ts-api-utils": ["ts-api-utils@2.5.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA=="], @@ -5503,31 +5567,31 @@ "drizzle-kit/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.59.0", "", { "dependencies": { "@typescript-eslint/types": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0" } }, "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.60.0", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0" } }, "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.59.0", "", { "dependencies": { "@typescript-eslint/types": "8.59.0", "@typescript-eslint/typescript-estree": "8.59.0", "@typescript-eslint/utils": "8.59.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.60.0", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "@typescript-eslint/typescript-estree": "8.60.0", "@typescript-eslint/utils": "8.60.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-SX46wEUtitCpq7AN38HkUU/+zvUpdKf7ephtWAFgckH8O7PQIyL5gvrhQgBLuEYgLfuKWOVvWVskMbuFHAz5xg=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/utils": ["@typescript-eslint/utils@8.59.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.59.0", "@typescript-eslint/types": "8.59.0", "@typescript-eslint/typescript-estree": "8.59.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/utils": ["@typescript-eslint/utils@8.60.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.60.0", "@typescript-eslint/types": "8.60.0", "@typescript-eslint/typescript-estree": "8.60.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.59.0", "", { "dependencies": { "@typescript-eslint/types": "8.59.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.60.0", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg=="], "eslint-config-universe/@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="], "eslint-config-universe/@typescript-eslint/eslint-plugin/ts-api-utils": ["ts-api-utils@2.5.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA=="], - "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.59.0", "", { "dependencies": { "@typescript-eslint/types": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0" } }, "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg=="], + "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.60.0", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0" } }, "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw=="], - "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], - "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.59.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.59.0", "@typescript-eslint/tsconfig-utils": "8.59.0", "@typescript-eslint/types": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw=="], + "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.60.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.60.0", "@typescript-eslint/tsconfig-utils": "8.60.0", "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g=="], - "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.59.0", "", { "dependencies": { "@typescript-eslint/types": "8.59.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q=="], + "eslint-config-universe/@typescript-eslint/parser/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.60.0", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg=="], - "eslint-plugin-import/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "eslint-plugin-import/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], - "eslint-plugin-node/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "eslint-plugin-node/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], - "eslint-plugin-react/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "eslint-plugin-react/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "eslint/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="], @@ -5535,7 +5599,7 @@ "eslint/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="], - "eslint/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "eslint/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "expo-modules-autolinking/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], @@ -5573,14 +5637,8 @@ "metro-babel-transformer/hermes-parser/hermes-estree": ["hermes-estree@0.35.0", "", {}, "sha512-xVx5Opwy8Oo1I5yGpVRhCvWL/iV3M+ylksSKVNlxxD90cpDpR/AR1jLYqK8HWihm065a6UI3HeyAmYzwS8NOOg=="], - "metro-symbolicate/metro-source-map/ob1": ["ob1@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-9M5kpuOLyTPogMtZiQUIxdAZxl7Dxs6tVBbJErSumsqGMuhVSoUbkfeZ3XNPpLpwBBtqY5QDUzGwggLHX3slQg=="], - - "metro-transform-worker/metro-source-map/ob1": ["ob1@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-9M5kpuOLyTPogMtZiQUIxdAZxl7Dxs6tVBbJErSumsqGMuhVSoUbkfeZ3XNPpLpwBBtqY5QDUzGwggLHX3slQg=="], - "metro/hermes-parser/hermes-estree": ["hermes-estree@0.35.0", "", {}, "sha512-xVx5Opwy8Oo1I5yGpVRhCvWL/iV3M+ylksSKVNlxxD90cpDpR/AR1jLYqK8HWihm065a6UI3HeyAmYzwS8NOOg=="], - "metro/metro-source-map/ob1": ["ob1@0.83.7", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-9M5kpuOLyTPogMtZiQUIxdAZxl7Dxs6tVBbJErSumsqGMuhVSoUbkfeZ3XNPpLpwBBtqY5QDUzGwggLHX3slQg=="], - "mimetext/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], "miniflare/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="], @@ -5631,7 +5689,7 @@ "miniflare/workerd/@cloudflare/workerd-windows-64": ["@cloudflare/workerd-windows-64@1.20250906.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Q8Qjfs8jGVILnZL6vUpQ90q/8MTCYaGR3d1LGxZMBqte8Vr7xF3KFHPEy7tFs0j0mMjnqCYzlofmPNY+9ZaDRg=="], - "next/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "next/postcss/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], "ora/chalk/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="], @@ -5651,8 +5709,6 @@ "tailwindcss/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="], - "tailwindcss/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - "terminal-link/ansi-escapes/type-fest": ["type-fest@0.21.3", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="], "test-exclude/glob/jackspeak": ["jackspeak@3.4.3", "", { "dependencies": { "@isaacs/cliui": "^8.0.2" }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="], @@ -5663,6 +5719,58 @@ "tmp/rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], + "tsx/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.28.0", "", { "os": "aix", "cpu": "ppc64" }, "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA=="], + + "tsx/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.28.0", "", { "os": "android", "cpu": "arm" }, "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ=="], + + "tsx/esbuild/@esbuild/android-arm64": ["@esbuild/android-arm64@0.28.0", "", { "os": "android", "cpu": "arm64" }, "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw=="], + + "tsx/esbuild/@esbuild/android-x64": ["@esbuild/android-x64@0.28.0", "", { "os": "android", "cpu": "x64" }, "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA=="], + + "tsx/esbuild/@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.28.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q=="], + + "tsx/esbuild/@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.28.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ=="], + + "tsx/esbuild/@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.28.0", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q=="], + + "tsx/esbuild/@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.28.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw=="], + + "tsx/esbuild/@esbuild/linux-arm": ["@esbuild/linux-arm@0.28.0", "", { "os": "linux", "cpu": "arm" }, "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw=="], + + "tsx/esbuild/@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.28.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A=="], + + "tsx/esbuild/@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.28.0", "", { "os": "linux", "cpu": "ia32" }, "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ=="], + + "tsx/esbuild/@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg=="], + + "tsx/esbuild/@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w=="], + + "tsx/esbuild/@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.28.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg=="], + + "tsx/esbuild/@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ=="], + + "tsx/esbuild/@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.28.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q=="], + + "tsx/esbuild/@esbuild/linux-x64": ["@esbuild/linux-x64@0.28.0", "", { "os": "linux", "cpu": "x64" }, "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ=="], + + "tsx/esbuild/@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.28.0", "", { "os": "none", "cpu": "arm64" }, "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw=="], + + "tsx/esbuild/@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.28.0", "", { "os": "none", "cpu": "x64" }, "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw=="], + + "tsx/esbuild/@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.28.0", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g=="], + + "tsx/esbuild/@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.28.0", "", { "os": "openbsd", "cpu": "x64" }, "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA=="], + + "tsx/esbuild/@esbuild/openharmony-arm64": ["@esbuild/openharmony-arm64@0.28.0", "", { "os": "none", "cpu": "arm64" }, "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w=="], + + "tsx/esbuild/@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.28.0", "", { "os": "sunos", "cpu": "x64" }, "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw=="], + + "tsx/esbuild/@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.28.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA=="], + + "tsx/esbuild/@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.28.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA=="], + + "tsx/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.28.0", "", { "os": "win32", "cpu": "x64" }, "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw=="], + "vite/esbuild/@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.12", "", { "os": "aix", "cpu": "ppc64" }, "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA=="], "vite/esbuild/@esbuild/android-arm": ["@esbuild/android-arm@0.25.12", "", { "os": "android", "cpu": "arm" }, "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg=="], @@ -5715,19 +5823,15 @@ "vite/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="], - "vite/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - - "workers-ai-provider/@ai-sdk/provider-utils/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "workers-ai-provider/@ai-sdk/provider-utils/nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], "wrangler/miniflare/undici": ["undici@7.24.8", "", {}, "sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ=="], - "wrangler/miniflare/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], - - "@aws-crypto/sha1-browser/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="], + "wrangler/miniflare/ws": ["ws@8.20.1", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w=="], - "@aws-crypto/sha256-browser/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="], + "@babel/highlight/chalk/ansi-styles/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="], - "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="], + "@babel/highlight/chalk/supports-color/has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="], "@cloudflare/vitest-pool-workers/wrangler/@cloudflare/kv-asset-handler/mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="], @@ -5807,8 +5911,6 @@ "@lhci/cli/express/body-parser/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="], - "@lhci/cli/express/body-parser/qs": ["qs@6.15.1", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-6YHEFRL9mfgcAvql/XhwTvf5jKcOiiupt2FiJxHkiX1z4j7WL8J/jRHYLluORvc1XxB5rV20KoeK00gVJamspg=="], - "@lhci/cli/express/body-parser/raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="], "@lhci/cli/express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], @@ -5823,15 +5925,7 @@ "@lhci/cli/yargs/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="], - "@react-native/codegen/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], - - "@react-native/community-cli-plugin/metro/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="], - - "@react-native/community-cli-plugin/metro/hermes-parser/hermes-estree": ["hermes-estree@0.35.0", "", {}, "sha512-xVx5Opwy8Oo1I5yGpVRhCvWL/iV3M+ylksSKVNlxxD90cpDpR/AR1jLYqK8HWihm065a6UI3HeyAmYzwS8NOOg=="], - - "@react-native/community-cli-plugin/metro/metro-transform-worker/metro-minify-terser": ["metro-minify-terser@0.83.6", "", { "dependencies": { "flow-enums-runtime": "^0.0.6", "terser": "^5.15.0" } }, "sha512-Vx3/Ne9Q+EIEDLfKzZUOtn/rxSNa/QjlYxc42nvK4Mg8mB6XUgd3LXX5ZZVq7lzQgehgEqLrbgShJPGfeF8PnQ=="], - - "@react-native/dev-middleware/chrome-launcher/lighthouse-logger/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], + "@react-native/codegen/glob/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "@react-native/dev-middleware/serve-static/send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="], @@ -5849,29 +5943,25 @@ "agents/yargs/string-width/strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="], - "babel-plugin-istanbul/test-exclude/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], - - "chrome-launcher/lighthouse-logger/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], + "babel-plugin-istanbul/test-exclude/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "chrome-launcher/rimraf/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], - "chromium-edge-launcher/lighthouse-logger/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - "chromium-edge-launcher/rimraf/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], "detective-typescript/@typescript-eslint/typescript-estree/@typescript-eslint/visitor-keys/eslint-visitor-keys": ["eslint-visitor-keys@5.0.1", "", {}, "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/type-utils/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/type-utils/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/type-utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.59.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.59.0", "@typescript-eslint/tsconfig-utils": "8.59.0", "@typescript-eslint/types": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/type-utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.60.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.60.0", "@typescript-eslint/tsconfig-utils": "8.60.0", "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.59.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.59.0", "@typescript-eslint/tsconfig-utils": "8.59.0", "@typescript-eslint/types": "8.59.0", "@typescript-eslint/visitor-keys": "8.59.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.60.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.60.0", "@typescript-eslint/tsconfig-utils": "8.60.0", "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g=="], - "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/visitor-keys/@typescript-eslint/types": ["@typescript-eslint/types@8.59.0", "", {}, "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A=="], + "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/visitor-keys/@typescript-eslint/types": ["@typescript-eslint/types@8.60.0", "", {}, "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA=="], "eslint-config-universe/@typescript-eslint/eslint-plugin/@typescript-eslint/visitor-keys/eslint-visitor-keys": ["eslint-visitor-keys@5.0.1", "", {}, "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA=="], @@ -5903,18 +5993,20 @@ "ora/chalk/supports-color/has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="], - "react-native/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "react-native/glob/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "tailwindcss/chokidar/readdirp/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "test-exclude/glob/jackspeak/@isaacs/cliui": ["@isaacs/cliui@8.0.2", "", { "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", "strip-ansi": "^7.0.1", "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", "wrap-ansi": "^8.1.0", "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" } }, "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="], - "test-exclude/glob/minimatch/brace-expansion": ["brace-expansion@2.1.0", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w=="], + "test-exclude/glob/minimatch/brace-expansion": ["brace-expansion@2.1.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA=="], "test-exclude/glob/path-scurry/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="], "tmp/rimraf/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="], + "@babel/highlight/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], + "@istanbuljs/load-nyc-config/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], "@lhci/cli/express/accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], @@ -5925,8 +6017,6 @@ "@react-native/codegen/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "@react-native/dev-middleware/chrome-launcher/lighthouse-logger/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], - "@react-native/dev-middleware/serve-static/send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="], "agents/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="], @@ -5937,11 +6027,11 @@ "babel-plugin-istanbul/test-exclude/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "chrome-launcher/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "chrome-launcher/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], - "chromium-edge-launcher/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "chromium-edge-launcher/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], - "flat-cache/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "flat-cache/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "inquirer/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], @@ -5959,7 +6049,7 @@ "test-exclude/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], - "tmp/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.14", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g=="], + "tmp/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.15", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg=="], "@lhci/cli/yargs/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="], diff --git a/copilot-instructions.md b/copilot-instructions.md index f52facf997..83baf28438 100644 --- a/copilot-instructions.md +++ b/copilot-instructions.md @@ -212,6 +212,54 @@ Always add new features behind a flag and default to `false` until the feature i - Tailwind CSS for all styling — no inline styles - Radix UI for accessible components +### Monitoring (Sentry) + +All new code that performs async operations or calls external services must include Sentry instrumentation. Sentry is already initialised per-platform — you only need to import and call the helpers. + +**Expo / React Native** — import from `@sentry/react-native`: + +```ts +import * as Sentry from '@sentry/react-native'; + +// Breadcrumb before async operations +Sentry.addBreadcrumb({ category: 'feature', message: 'Action started', level: 'info', data: { ... } }); + +// Every catch block must capture the original error +} catch (error) { + Sentry.captureException(error, { + tags: { feature: 'myFeature', action: 'doThing' }, + extra: { userId, relevantId }, + }); + throw error; +} +``` + +Rules: +- **Never wrap the root error** in `new Error(...)` before passing to `captureException` — wrapping loses the original stack trace and drops properties like HTTP status and error codes. +- **Better Auth client errors** are plain objects `{ message, status, code }`, not JS Errors. Use `toAuthError` from `expo-app/features/auth/lib/authErrors` to convert them into an `AuthClientError` carrying `.status` and `.code`. Capture that single error — do not create two separate `new Error()` objects (one to capture, one to throw). +- Include `httpStatus` and `errorCode` in `extra` for any HTTP error. + +**API / Cloudflare Workers** — use helpers from `@packrat/api/utils/sentry`: + +```ts +import { apiAddBreadcrumb, captureApiException } from '@packrat/api/utils/sentry'; + +apiAddBreadcrumb({ category: 'feature', message: 'Calling external service', level: 'info' }); + +} catch (error) { + captureApiException(error, { + operation: 'featureName.action', + userId, + tags: { feature: 'myFeature' }, + extra: { relevantId }, + }); + throw error; +} +``` + +- Use `captureApiException` (not the raw `captureException`) — it adds structured operation context and also logs to console for `wrangler dev` output. +- Every route `catch` block and service method touching the DB or an external API needs a `captureApiException` call. + ## Repository Structure ``` diff --git a/docs/brainstorms/2026-05-23-cf-gateway-unified-billing-openai-requirements.md b/docs/brainstorms/2026-05-23-cf-gateway-unified-billing-openai-requirements.md new file mode 100644 index 0000000000..910475134f --- /dev/null +++ b/docs/brainstorms/2026-05-23-cf-gateway-unified-billing-openai-requirements.md @@ -0,0 +1,118 @@ +--- +date: 2026-05-23 +topic: cf-gateway-unified-billing-openai +--- + +# Cloudflare AI Gateway Unified Billing for OpenAI + +## Summary + +PackRat should use Cloudflare AI Gateway Unified Billing as the preferred billing and authentication path for OpenAI-backed runtime AI features. Existing Google/Gemini and Perplexity usages remain direct-provider exceptions in this pass. + +--- + +## Problem Frame + +PackRat's runtime AI surface is mostly OpenAI-backed, but the codebase currently mixes shared OpenAI-through-gateway usage with direct OpenAI SDK setup. That keeps provider billing, key management, and request traceability harder to manage than necessary. + +Cloudflare AI Gateway Unified Billing can route supported third-party provider traffic through Cloudflare account credits and a Cloudflare API token instead of direct provider keys. For this pass, the operational pain is concentrated enough around OpenAI that broad multi-provider migration would add carrying cost without matching near-term value. + +--- + +## Actors + +- A1. PackRat operator: Manages AI provider spend, credentials, deployment configuration, and incident investigation. +- A2. PackRat user: Uses AI-backed app features and should not see behavior regress when billing path changes. +- A3. Implementation agent: Plans and implements the migration from this scope document. + +--- + +## Key Flows + +- F1. OpenAI-backed request uses Cloudflare unified billing + - **Trigger:** A PackRat runtime feature invokes an OpenAI-backed model. + - **Actors:** A1, A2 + - **Steps:** The feature selects the shared OpenAI provider path, the request is sent through Cloudflare AI Gateway unified billing when configured, and PackRat records enough metadata to trace the request in Cloudflare. + - **Outcome:** The request succeeds through Cloudflare billing without requiring a direct OpenAI key for the primary production path. + - **Covered by:** R1, R2, R4, R5 + +- F2. Unsupported or non-migrated provider remains direct + - **Trigger:** A PackRat feature uses Google/Gemini template analysis or Perplexity web search. + - **Actors:** A1, A2 + - **Steps:** The feature continues using its existing provider configuration, and logs/configuration make clear that it is outside the OpenAI unified billing migration. + - **Outcome:** Non-OpenAI features keep working while their billing/key behavior remains explicit. + - **Covered by:** R3, R5, R7 + +--- + +## Requirements + +**OpenAI unified billing** +- R1. PackRat must prefer Cloudflare AI Gateway Unified Billing for OpenAI-backed runtime AI requests when the required Cloudflare configuration is present. +- R2. OpenAI-backed runtime features must no longer require a direct OpenAI API key for the primary production unified billing path. +- R3. The migration must preserve existing direct-provider behavior for Google/Gemini template generation and Perplexity web search. + +**Compatibility and fallback** +- R4. PackRat must retain a clear direct OpenAI fallback for local development, emergency rollback, or environments not configured for unified billing. +- R5. Failures must make the active billing/authentication path clear enough for operators to distinguish Cloudflare unified billing issues from direct-provider key issues. + +**Observability** +- R6. OpenAI-backed requests routed through Cloudflare must expose enough request metadata for operators to correlate PackRat logs with Cloudflare AI Gateway observability. +- R7. PackRat documentation or runbooks must identify which AI features are covered by unified billing and which remain direct-provider exceptions. + +--- + +## Acceptance Examples + +- AE1. **Covers R1, R2, R6.** Given production has valid Cloudflare AI Gateway unified billing configuration and no direct OpenAI key, when a user sends an AI chat message, the request completes through Cloudflare and PackRat logs include correlation metadata for AI Gateway investigation. +- AE2. **Covers R3, R7.** Given the template generation route uses Google/Gemini, when an admin generates a pack template from online content, the feature continues to use the configured Google provider path and the runbook lists it as outside this OpenAI migration. +- AE3. **Covers R4, R5.** Given a local developer has a direct OpenAI key but no Cloudflare API token, when they run an OpenAI-backed feature locally, the feature can use the direct OpenAI fallback and errors identify the direct-provider path. + +--- + +## Success Criteria + +- Operators can manage the main OpenAI bill and credentials through Cloudflare instead of a separate OpenAI production key. +- The main OpenAI-backed user experiences continue working without visible behavior regressions. +- AI failures and cost investigations are easier because PackRat logs and Cloudflare AI Gateway records can be correlated. +- A downstream planner can enumerate the OpenAI call sites to migrate without also needing to decide whether Google/Gemini or Perplexity are in scope. + +--- + +## Scope Boundaries + +- In scope: OpenAI-backed runtime AI features, including chat, embeddings, catalog/vector flows, pack generation, image gear detection, wildlife identification, and season suggestions. +- In scope: preserving direct OpenAI fallback for development and rollback. +- In scope: documenting provider coverage and operational setup for Cloudflare credits, spend limits, and request investigation. +- Deferred: migrating Google/Gemini pack-template analysis to Cloudflare unified billing. +- Deferred: migrating Perplexity web search to Cloudflare AI Gateway or replacing it with another provider. +- Deferred: adding a user- or admin-facing provider selection menu. +- Out of scope: changing model behavior, prompt behavior, AI feature UX, or catalog embedding dimensions as part of this billing migration. + +--- + +## Key Decisions + +- OpenAI first: PackRat mostly uses OpenAI at runtime, so this pass targets the dominant billing/key-management pain without expanding into every installed AI dependency. +- Keep non-OpenAI direct for now: Google/Gemini and Perplexity are real runtime usages, but they are narrower and should not block the OpenAI billing cleanup. +- Prefer Cloudflare unified billing over BYOK for production OpenAI: The goal is fewer provider bills and fewer provider API keys, not only routing direct OpenAI keys through Cloudflare. + +--- + +## Dependencies / Assumptions + +- Cloudflare AI Gateway Unified Billing is available and enabled for the PackRat Cloudflare account. +- The PackRat Cloudflare account has credits, spend limits, and a suitable API token configured before production cutover. +- OpenAI models used by PackRat are available through Cloudflare's unified billing path. +- Cloudflare Workers AI models remain billed separately and are not part of this unified billing migration. +- The Vercel AI SDK integration through Cloudflare's AI Gateway provider is expected to reduce implementation complexity because PackRat already uses the Vercel AI SDK. + +--- + +## Outstanding Questions + +### Deferred to Planning + +- [Affects R1, R2][Needs research] Which exact Cloudflare AI Gateway provider mode should PackRat use for each OpenAI call shape: unified model wrapper, OpenAI-compatible provider wrapper, AI binding, or provider-native endpoint? +- [Affects R6][Technical] Which request metadata is available from the Vercel AI SDK integration for reliable Cloudflare AI Gateway log correlation? +- [Affects R4][Technical] What configuration flag or precedence rule should determine Cloudflare unified billing versus direct OpenAI fallback? diff --git a/docs/design/client-uuid-split.md b/docs/design/client-uuid-split.md new file mode 100644 index 0000000000..6f8f17cf35 --- /dev/null +++ b/docs/design/client-uuid-split.md @@ -0,0 +1,652 @@ +# Design: Client/Server ID split for offline-first tables + +**Status:** Draft — for review, no code yet. +**Author:** Architecture follow-up to [PR #2433](https://github.com/PackRat-AI/PackRat/pull/2433) ("T9: server-side ID minting"). +**Scope:** `packs`, `pack_items`, `weight_history`, `trips`, `pack_templates`, `pack_template_items`, `trail_condition_reports`. +**Decision needed before implementation:** see [Open questions](#8-open-questions). + +--- + +## 1. Background & motivation + +### What T9 did + +PR #2433 made every offline-syncable `POST` accept an **optional** `id` and mint one server-side via `mintId(prefix)` (`packages/api/src/utils/ids.ts`) when absent: + +```ts +// packages/api/src/utils/ids.ts (post-T9) +export function mintId(prefix: string): string { + return `${prefix}_${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`; +} +``` + +```ts +// packages/api/src/routes/packs/index.ts (post-T9) +const packId = data.id ?? mintId('p'); +``` + +This unlocked lean callers (`@packrat/mcp`, `@packrat/cli`, web) that have no offline-first concerns and shouldn't have to mint their own IDs. Offline-first stores (`apps/expo/features/*/store/*.ts`) keep supplying `nanoid()`-generated IDs because Legend State writes to the local store *before* the network round-trip — the row needs a stable key to live under in `observable>` and to be referenced by FK-bearing rows (`packItems.packId`, `trips.packId`). + +### What's hacky about it + +One column (`packs.id`, `pack_items.id`, etc.) has **dual ownership**: + +- Sometimes the **client** owns it (offline-first mobile). The server is required to accept and persist whatever the client sent, with `notNull()` and `primaryKey()` enforcing only that *something* is there. +- Sometimes the **server** owns it (MCP / CLI / web with no offline concerns), and mints it lazily. + +Consequences: + +1. **No invariant on format.** Today every server-minted ID is `_<12-hex>`, but client-supplied IDs are raw `nanoid()` (21 chars, URL-safe). The DB can't tell them apart, and a stray `pack.id = 'banana'` from a misbehaving client would be accepted. +2. **No idempotency primitive.** Retrying a `POST /packs` after a network blip produces a duplicate row (with a new server-minted id) unless the client also remembers and resends `id`. The contract for that is implicit. +3. **The PK does double duty.** It's both the storage key *and* the dedup key, which means we can't safely change PK shape (e.g. switch to numeric serial for index locality) without re-coordinating the offline-first contract. +4. **Foreign keys reference a client-owned string.** `pack_items.pack_id` points at `packs.id`. If we ever wanted to switch the server PK to something cheaper to index (bigserial or UUIDv7), we'd have to migrate every FK column simultaneously, because the client is part of the contract. +5. **`createdAt` / `updatedAt` confusion.** We already split server-controlled timestamps (`created_at`, `updated_at`) from client-controlled ones (`local_created_at`, `local_updated_at`). The id column is the last holdout where the split hasn't been applied. + +### The cleaner pattern + +Two columns, two owners: + +| Column | Owner | Purpose | +| ------------ | ------ | ------------------------------------------------------------------------------ | +| `id` | server | Real primary key. Server-minted at insert. Used by all server-side joins/FKs. | +| `client_uuid` | client | Stable idempotency key supplied at create time. `UNIQUE NOT NULL`. Used by sync. | + +Local writes land in the Legend State store keyed by `clientUuid`. On first successful sync, the client receives `{ id, clientUuid }` and learns the server id. Subsequent writes (PATCH/DELETE) address the row by `id`. FK columns (`pack_items.pack_id`) hold the server `id` once the parent has synced — the local store maintains a `clientUuid → id` map for any FK edges that need rewriting in the offline window (see [§6](#6-foreign-keys-in-the-offline-window)). + +This is the standard "offline-first replicated database" pattern (Linear, Figma, Notion, Replicache all do a variant). It separates **identity** (server) from **idempotency** (client), and it lets us evolve the PK shape independently of the offline-first contract. + +--- + +## 2. Target schema + +### 2.1 Decision: numeric `bigserial` vs `UUIDv7` + +I recommend **`bigserial`** (alias for `bigint` + sequence) for the new server-owned `id`, not UUIDv7. Reasoning: + +| Criterion | bigserial | UUIDv7 | +| --------------------- | ------------------------------------------------------- | ---------------------------------------------------- | +| Index locality | Excellent — monotonic, btree-friendly | Good (time-ordered) but 2x byte width | +| Storage | 8 bytes | 16 bytes (or 36 as text — what we'd actually use) | +| FK column width | 8 bytes per row × every FK = significant | 16+ bytes, plus join cost | +| External exposure | Leaks growth rate | Opaque | +| Already used in codebase | Yes: `catalog_items.id`, `posts.id`, `post_likes.id`, `etc` | No | +| Mintable without round-trip | No (need server) | Yes (but we don't need to — `client_uuid` covers that) | + +The "mintable without round-trip" argument for UUIDv7 doesn't apply here because **`client_uuid` is what the offline-first client uses for that purpose**. The server `id` only needs to exist once the row reaches the server, and at that point we already have a sequence. Width matters: `pack_items` is the highest-fanout table and currently has `pack_id text` — switching to `bigint` saves real bytes per row. + +`users.id` stays `text`/UUID for Better Auth compatibility — that's an external contract we don't control. Tables with FKs to `users.id` keep `user_id text`. This design only touches the seven offline-first tables. + +> **If we later want opaque external IDs** (for share URLs etc.) we can add a separate `public_id text UNIQUE` column with a UUIDv7 default. That's orthogonal to this design. + +### 2.2 Per-table target shape + +For each affected table the diff is: rename the existing `id text` to `client_uuid text UNIQUE NOT NULL`, add a new `id bigserial PRIMARY KEY`, and convert FK columns to `bigint`. + +#### `packs` + +```ts +export const packs = pgTable( + 'packs', + { + id: bigserial('id', { mode: 'number' }).primaryKey(), + clientUuid: text('client_uuid').unique().notNull(), + name: text('name').notNull(), + // ... unchanged columns ... + userId: text('user_id').references(() => users.id, { onDelete: 'cascade' }).notNull(), + templateId: bigint('template_id', { mode: 'number' }).references(() => packTemplates.id), + // ... unchanged columns ... + }, + (t) => [ + index('packs_user_id_idx').on(t.userId), + index('packs_client_uuid_idx').on(t.clientUuid), // already implied by UNIQUE + ], +); +``` + +#### `pack_items` + +```ts +export const packItems = pgTable( + 'pack_items', + { + id: bigserial('id', { mode: 'number' }).primaryKey(), + clientUuid: text('client_uuid').unique().notNull(), + // ... unchanged columns ... + packId: bigint('pack_id', { mode: 'number' }) + .references(() => packs.id, { onDelete: 'cascade' }) + .notNull(), + catalogItemId: integer('catalog_item_id').references(() => catalogItems.id), + userId: text('user_id').references(() => users.id).notNull(), + templateItemId: bigint('template_item_id', { mode: 'number' }).references(() => packTemplateItems.id), + // ... unchanged columns ... + }, + // ... unchanged indexes ... +); +``` + +#### `weight_history`, `pack_templates`, `pack_template_items`, `trips`, `trail_condition_reports` + +Same shape: `id bigserial PK`, `client_uuid text UNIQUE NOT NULL`, FK columns to other offline-first tables become `bigint`. + +FK rewrites: + +| Table | FK column | Was | Becomes | +| --------------------------- | --------------- | --------------- | ------------------------------------ | +| `pack_items` | `pack_id` | `text` | `bigint → packs.id` | +| `pack_items` | `template_item_id` | `text` | `bigint → pack_template_items.id` | +| `weight_history` | `pack_id` | `text` | `bigint → packs.id` | +| `pack_template_items` | `pack_template_id` | `text` | `bigint → pack_templates.id` | +| `packs` | `template_id` | `text` | `bigint → pack_templates.id` | +| `trips` | `pack_id` | `text` | `bigint → packs.id` | +| `trail_condition_reports` | `trip_id` | `text` | `bigint → trips.id` | + +`user_id text` columns are unchanged everywhere. + +### 2.3 Format constraints on `client_uuid` + +Server should validate `client_uuid` is non-empty, ≤ 64 chars, and matches `^[A-Za-z0-9_-]+$` (URL-safe, nanoid-compatible). The Zod schema enforces this at the API edge; a CHECK constraint enforces it at the DB: + +```sql +ALTER TABLE packs + ADD CONSTRAINT packs_client_uuid_format + CHECK (client_uuid ~ '^[A-Za-z0-9_-]{1,64}$'); +``` + +This is opportunistically tighter than today, where any string passes. + +--- + +## 3. Migration path for existing rows + +Every existing row has `id` like `p_a1b2c3d4e5f6` (T9 server-minted) or a 21-char nanoid (client-supplied). Three options: + +### Option A — Move existing id to `client_uuid`, mint fresh server ids + +```sql +ALTER TABLE packs ADD COLUMN client_uuid TEXT; +UPDATE packs SET client_uuid = id; +ALTER TABLE packs ALTER COLUMN client_uuid SET NOT NULL; +ALTER TABLE packs ADD CONSTRAINT packs_client_uuid_unique UNIQUE (client_uuid); + +ALTER TABLE packs ADD COLUMN new_id BIGSERIAL; +-- (sequence auto-fills new_id for existing rows) +-- ... drop FK constraints from pack_items, weight_history, trips ... +-- ... add new FK columns, populate via JOIN on client_uuid, swap, drop old ... +ALTER TABLE packs DROP COLUMN id; +ALTER TABLE packs RENAME COLUMN new_id TO id; +ALTER TABLE packs ADD PRIMARY KEY (id); +``` + +**Pros:** End state is clean. `client_uuid` for every row is the value the mobile store already has locally — no client-side data migration. Server ids are real bigints. + +**Cons:** Big bang. Hairy: every FK in the seven-table graph must be rewritten in the same transaction, in dependency order, with `ON DELETE CASCADE` re-installed. Hard to roll back. Old REST clients with cached deep links (`/packs/p_a1b2c3d4`) 404 unless we also keep a legacy lookup path. + +### Option B — Compatibility shim: keep id text, add client_uuid alongside + +Don't change the PK type. Just add `client_uuid text UNIQUE NOT NULL` and backfill it from `id`. Server keeps generating `text` ids (via `mintId` or sequence-backed), clients keep supplying their `nanoid` in `client_uuid`. Over time, the *meaning* of `id` shifts to "server-owned" without changing its *type*. + +**Pros:** No FK rewrites. Reversible by dropping the column. Mobile store keeps working: it can switch its local key from `id` to `client_uuid` independently. URLs and external references keep working. + +**Cons:** Doesn't actually fix the structural problem we set out to fix — `id` is still text, still wide as a FK, still externally exposed. We'd be paying migration cost for half the benefit. Also: requires a follow-up to *really* split, so we'd end up doing Option A later anyway, just on a smaller surface. + +### Option C — Hybrid: shim now, narrow later + +Phase 1: Option B (add `client_uuid`, leave `id` text). +Phase 2: After mobile fully migrates to addressing rows by `client_uuid` locally and by server `id` for FKs, run Option A on the now-empty contract. + +**Pros:** Each phase is reversible. Mobile rollout decoupled from DB rollout. +**Cons:** Two migrations, two windows of compatibility code, twice the review. + +### Recommendation: **Option C (hybrid)** + +Andrew's instinct on PR #2433 was right that this needs its own brainstorm, but it doesn't all need to land at once. Phase 1 (shim) is small, reversible, and immediately unlocks idempotent retries — the biggest user-visible bug class today. Phase 2 (narrow PK to `bigint`) is bigger but can wait until mobile has shipped the addressing-by-`client_uuid` rewrite and we have ~30 days of telemetry showing no stragglers. + +**Phase 1 migration sketch:** + +```sql +-- packages/api/drizzle/0048_add_client_uuid.sql +ALTER TABLE "packs" ADD COLUMN "client_uuid" text; +UPDATE "packs" SET "client_uuid" = "id" WHERE "client_uuid" IS NULL; +ALTER TABLE "packs" ALTER COLUMN "client_uuid" SET NOT NULL; +ALTER TABLE "packs" ADD CONSTRAINT "packs_client_uuid_unique" UNIQUE ("client_uuid"); +ALTER TABLE "packs" ADD CONSTRAINT "packs_client_uuid_format" + CHECK ("client_uuid" ~ '^[A-Za-z0-9_-]{1,64}$'); + +-- Repeat for: pack_items, weight_history, pack_templates, pack_template_items, +-- trips, trail_condition_reports +``` + +That's it for phase 1 on the DB side. No FK changes, no PK changes. Reversal is `ALTER TABLE ... DROP COLUMN client_uuid` per table. + +**Phase 2 migration sketch (later PR, after mobile rollout):** + +```sql +-- packages/api/drizzle/00XX_narrow_id_to_bigserial.sql +-- For each table, in topological order from leaves to roots: +-- 1. Add new_id BIGSERIAL. +-- 2. Build text → bigint lookup table. +-- 3. For each FK pointing at this table, add a new bigint FK column, +-- populate it via JOIN, drop the old text FK, rename. +-- 4. Drop old text id, rename new_id to id, mark PRIMARY KEY. +``` + +Phase 2 is its own design doc — too much surface to nail down here. + +--- + +## 4. Sync plugin rewire + +This section is mostly about Phase 1 — Phase 2 is a much smaller follow-up rewire (just swap the wire format from `text` to `bigint` for `id` and any FK fields). + +### 4.1 What changes in the Legend State store + +Today (`apps/expo/features/packs/store/packs.ts`): + +```ts +export const packsStore = observable>({}); +// keyed by id (== nanoid()) +``` + +After Phase 1, the **local key becomes `clientUuid`**. The server `id` is just another field on the record, populated after sync. + +```ts +// New PackInStore shape +type PackInStore = { + id?: string; // server id, populated after first sync + clientUuid: string; // local PK, never changes + // ... existing fields ... +}; + +export const packsStore = observable>({}); +// keyed by clientUuid +``` + +`useCreatePack` mints `clientUuid` via `nanoid()`. Nothing else changes: + +```ts +// apps/expo/features/packs/hooks/useCreatePack.ts +export function useCreatePack() { + return useCallback((packData: PackInput) => { + const clientUuid = nanoid(); + const timestamp = new Date().toISOString(); + const newPack: PackInStore = { + clientUuid, + ...packData, + localCreatedAt: timestamp, + localUpdatedAt: timestamp, + deleted: false, + }; + obs(packsStore, clientUuid).set(newPack); + return clientUuid; + }, []); +} +``` + +### 4.2 `syncedCrud` config — `transform` + `as` hooks + +`syncedCrud` is configured with `list`, `create`, `update` functions. The two places we need to teach it about the split: + +1. **Sending a create:** wire format sends `clientUuid` (server mints id). +2. **Receiving the create response:** server returns `{ id, clientUuid, ... }`. We need to write `id` into the local row keyed by `clientUuid`. + +`syncedCrud` already handles writing the response back into the observable. The local key stays `clientUuid` because that's what was used in the `obs(store, clientUuid).set(...)` call. The newly-arrived server `id` just becomes another field. + +```ts +// apps/expo/features/packs/store/packs.ts (after Phase 1) +const createPack = async (packData: PackInStore): Promise => { + const { data, error } = await apiClient.packs.post({ + clientUuid: packData.clientUuid, // <-- changed + name: packData.name, + description: packData.description ?? undefined, + category: packData.category ?? undefined, + isPublic: packData.isPublic, + image: packData.image, + tags: packData.tags ?? undefined, + localCreatedAt: packData.localCreatedAt ?? new Date().toISOString(), + localUpdatedAt: packData.localUpdatedAt ?? new Date().toISOString(), + }); + if (error) throw new Error(`Failed to create pack: ${error.value}`); + // Response has { id, clientUuid, ... }. Returning it overwrites the local row + // keyed by clientUuid — `id` now lands on the record. + return PackWithWeightsSchema.parse(data) as unknown as PackInStore; +}; + +const updatePack = async ({ clientUuid, id, ...data }: Partial) => { + if (!id) { + // Local row exists but hasn't been synced yet — retry later. + // syncedCrud will re-call us once create resolves. + throw new Error('Cannot update pack before initial sync settles'); + } + const { data: result, error } = await apiClient.packs({ packId: String(id) }).put({ + /* ... unchanged ... */ + }); + if (error) throw new Error(`Failed to update pack: ${error.value}`); + return PackWithWeightsSchema.parse(result) as unknown as PackInStore; +}; +``` + +Two things to call out: + +- **`updatePack` blocks until `create` settles.** `syncedCrud` already serializes create-then-update for a given key (it tracks pending writes), so throwing here just defers the update; the plugin retries with `backoff: 'exponential'`. The alternative is to PATCH by `clientUuid` server-side, which we keep on the table as an idempotency convenience but don't rely on for normal flow. +- **`changesSince: 'last-sync'` keeps working.** It's keyed off `updatedAt`, not `id`. + +### 4.3 Pack items — the FK edge + +Pack items reference packs via `packId`. In the offline window, the parent pack may not yet have a server `id`. + +The store keeps two coordinates per `packItem`: + +```ts +type PackItem = { + id?: string; // server id (post-sync) + clientUuid: string; // local PK + packId?: string; // server pack id (post-sync of the parent pack) + packClientUuid: string; // local pack PK — never changes + // ... existing fields ... +}; +``` + +The store is keyed by `packItem.clientUuid`. Queries like "items in pack X" use `packClientUuid`: + +```ts +// apps/expo/features/packs/store/packItems.ts +export function getPackItems(packClientUuid: string) { + return Object.values(packItemsStore.get()).filter( + (item) => item.packClientUuid === packClientUuid && !item.deleted, + ); +} +``` + +On create, the client sends both: + +```ts +const createPackItem = async ({ packClientUuid, packId, ...data }: PackItem) => { + // We need a server packId to address the route; block if the parent isn't synced. + if (!packId) { + throw new Error('Cannot create pack item before parent pack syncs'); + } + const { data: result, error } = await apiClient + .packs({ packId: String(packId) }) + .items.post({ + clientUuid: data.clientUuid, + // packId comes from the URL path, not the body + name: data.name, + // ... unchanged ... + }); + if (error) throw new Error(`Failed to create pack item: ${error.value}`); + return PackItemSchema.parse(result) as unknown as PackItem; +}; +``` + +`syncedCrud` retries on the thrown error, so this naturally drains in topological order: pack creates first, then its items. + +**Alternative considered:** Resolve `packId` from `packClientUuid` inside `createPackItem` by reading `packsStore`. Rejected because it adds a cross-store dependency at the plugin layer and makes errors harder to attribute. The retry-on-not-synced approach keeps each store responsible for its own contract. + +### 4.4 Backfill on first launch after upgrade + +Old local rows in the persisted store have `id` but no `clientUuid`. On boot, a one-shot migration in `persistPlugin` copies `id → clientUuid` for every row in every affected store, re-keys the record under `clientUuid`, and bumps a `schemaVersion`. After the migration the local store looks exactly like a fresh install except that `id` is already populated (so the server can recognize the row on next sync by `clientUuid` lookup — see [§5.3](#53-server-side-upsert-on-client_uuid)). + +Pseudocode: + +```ts +// apps/expo/lib/persist-plugin/migrations.ts +export function migrateToClientUuid(state: Record) { + const next: Record = {}; + for (const row of Object.values(state)) { + const clientUuid = row.clientUuid ?? row.id; + next[clientUuid] = { ...row, clientUuid, id: row.id }; + } + return next; +} +``` + +--- + +## 5. API surface change + +### 5.1 Request shape + +POST endpoints stop accepting `id`. They accept optional `clientUuid` instead: + +```ts +// packages/api/src/routes/packs/index.ts (after Phase 1) +const CreatePackBodySchema = CreatePackRequestSchema.extend({ + clientUuid: z.string().regex(/^[A-Za-z0-9_-]{1,64}$/).optional(), + localCreatedAt: z.string(), + localUpdatedAt: z.string(), +}); +``` + +The handler: + +```ts +const clientUuid = data.clientUuid ?? mintId('p'); // lean callers (MCP/CLI/web) + +const [newPack] = await db + .insert(packs) + .values({ + clientUuid, + // id is omitted — Postgres sequence fills it (Phase 2) OR mintId('p') still + // sets it (Phase 1, because id is still text PK) + userId: user.userId, + // ... unchanged ... + }) + .onConflictDoUpdate({ target: packs.clientUuid, set: { /* ... */ } }) // see §5.3 + .returning(); +``` + +`mintId(prefix)` survives Phase 1 as the lean-caller default for `clientUuid`. In Phase 2 it gets renamed to `mintClientUuid` and stops being used to fill the server PK. + +### 5.2 Response shape + +Every response that returns a row gains `clientUuid` alongside `id`. GET shapes otherwise unchanged. The Zod response schemas in `packages/api/src/schemas/packs.ts`, `trips.ts`, etc. add `clientUuid: z.string()`. + +```ts +// packages/api/src/schemas/packs.ts (after Phase 1) +export const PackSchema = z.object({ + id: z.string(), // Phase 1: still text; Phase 2: z.number() + clientUuid: z.string(), // new + // ... unchanged ... +}); +``` + +### 5.3 Server-side upsert on `client_uuid` + +Idempotency: a retry of a `POST /packs` with the same `clientUuid` must return the existing row, not 409 or duplicate. + +```ts +.onConflictDoNothing({ target: packs.clientUuid }) +.returning(); + +// then: +const pack = await db.query.packs.findFirst({ where: eq(packs.clientUuid, clientUuid) }); +``` + +Or `onConflictDoUpdate` if we want retries to refresh `localUpdatedAt`. Either way, the contract is: same `clientUuid` → same `id`. + +### 5.4 Route versioning? + +**Recommendation: transition in place, no `/v2/` prefix.** + +Reasons: + +- The wire format is *additive* in Phase 1: we add `clientUuid` request/response, we don't remove `id` (it's still on the response). Old clients that send `id` still work — the server treats it as `clientUuid` for one release. Add a deprecation log line + a `Sunset` header per RFC 8594. +- New clients (post-PR) send `clientUuid`. We coexist on the same routes for a 60-day window. +- Phase 2 is where `id` changes type, and by then the surviving client codepaths are all using `clientUuid` for sync and `id` for joins. + +Compatibility shim for one release window: + +```ts +const clientUuid = data.clientUuid ?? data.id ?? mintId('p'); +if (data.id && !data.clientUuid) { + // log: "deprecated_id_field", userId, route +} +``` + +Once mobile telemetry shows zero callers sending `id`-only, drop the shim. + +--- + +## 6. Foreign keys in the offline window + +The FK columns (`pack_items.pack_id`, `trips.pack_id`, `trail_condition_reports.trip_id`) need a clear contract while the parent row hasn't synced yet. + +### What the FK column holds locally + +| State | Local `packId` | Local `packClientUuid` | +| ----------------------------------------- | ---------------------- | ---------------------- | +| Item created offline; pack not synced | `undefined` | `"abc123..."` | +| Pack synced; item not yet pushed | `"p_xxxxx"` (Phase 1) | `"abc123..."` | +| Both synced | `"p_xxxxx"` (Phase 1) | `"abc123..."` | + +The local store always has `packClientUuid` (the stable local reference). It has `packId` only when the parent has synced. The store performs all "items in pack X" queries via `packClientUuid`. The server-bound API call uses `packId`. + +### Why we keep both fields, not "swap on sync" + +A pure swap (i.e., field always called `packId`, contains uuid pre-sync and server id post-sync) is brittle: + +1. The semantic type changes mid-row-lifecycle (text id → text id of different format → eventually bigint). +2. Any local-only references (deep links, navigation state) break when the swap happens, requiring an event-driven re-link. +3. Queries can't tell which form is in the field without a heuristic on prefix. + +Keeping both fields is verbose but unambiguous: `packClientUuid` is always present, `packId` is present iff parent has synced. + +### Server-side: do FKs reference `id` or `client_uuid`? + +**FKs reference `id`.** Always. `client_uuid` exists only at the row's own level. The server never accepts a `clientUuid` for a FK position — the client must resolve it locally to a server `id` before making the call. + +Edge case: what if the client tries to create a pack item where the parent pack is mid-sync? Two options: + +- **Block (recommended):** Throw in the local create handler; `syncedCrud` retries with backoff. Drains naturally. +- **Server-side lookup:** Accept `parentClientUuid` as a body field, look up the server `id`, write it to the FK. More flexible but bleeds the split through the API. + +Recommend "block" for now. Revisit if we see a class of retry storms in telemetry. + +### What about `trail_condition_reports.tripId` (`ON DELETE SET NULL`)? + +Unchanged conceptually. The DB action stays `SET NULL`. The client doesn't get a notification — the report just appears with `tripId: null` on next sync. Same as today. + +--- + +## 7. Rollback story + +### Phase 1 + +**Schema:** Each table's change is `ADD COLUMN client_uuid` + `UPDATE` backfill + `ADD CONSTRAINT UNIQUE`. The down migration is literally `DROP COLUMN client_uuid`. Drizzle generates this automatically if we write the up migration well. + +**API:** The compat shim (§5.4) means rolling back the API to a `id`-only client doesn't break new clients — they keep sending `clientUuid` and the server still recognizes it. Rolling forward then back then forward is safe. + +**Mobile:** The persisted-store migration is one-way (copies `id` into `clientUuid`). Rolling back the mobile app to a pre-split build means the user's local rows still have `id`, just unused — the old build ignores `clientUuid` and keeps working off `id`. No data loss. + +Net: rollback is safe at every layer if we land the migration as Phase 1 only. + +### Phase 2 + +This is the irreversible one — once `packs.id` is `bigint`, going back to `text` requires re-minting old-format IDs. We accept this. Phase 2 only lands when Phase 1 telemetry is clean. + +--- + +## 8. Open questions + +These need Andrew's call before implementation starts: + +1. **`bigserial` vs `UUIDv7` for server id.** I recommended `bigserial` for index locality and storage. UUIDv7 is the alternative if we want opaque external IDs. Either way the design is the same; only the column type differs in Phase 2. +2. **Phase 2 timing.** Days or weeks after Phase 1? Specifically: how long do we wait on telemetry before pulling the trigger on the irreversible PK type change? +3. **Backfill batch size for the persisted-store migration.** The Legend State persisted store can be large (every pack item ever). Do we migrate eagerly on first launch (blocks UI for a beat) or lazily as records are read? +4. **MCP / CLI behaviour.** Today T9 lets them omit `id`. After Phase 1, do they omit `clientUuid` too (server mints) or do they generate one? I lean "server mints" because they have no offline-first concerns — keeps the offline-first ID surface narrow to the mobile app. +5. **Trail condition reports — same shape?** They follow the same offline-first pattern, but are they shipping in the next release cycle? If they're pre-launch we have more freedom to make breaking changes. Confirm. +6. **Trip lifecycle.** `trips.packId` is `ON DELETE SET NULL`. If we swap to a bigint, that nullable FK is fine. But: do we expect users to have pre-existing trips referencing packs that no longer exist? Spot-check the data before Phase 2. +7. **Existing similar abstraction?** I couldn't find a `clientUuid`-style column anywhere in `packages/api/src/db/schema.ts`. There's a precedent for the UUID-PK migration pattern itself (`drizzle/0040_uuid_pk_better_auth_migration.sql` through `0045`), which we should mimic stylistically. If Andrew remembers anything I missed, flag it. +8. **Do we want a public-facing `slug` or `share_id` for pack share URLs?** Currently share URLs use `packs.id`. If we go `bigserial`, exposing `42` is ugly. Out of scope for this design — calling it out so we don't paint ourselves into a corner. + +--- + +## 9. Implementation plan + +Six shippable PRs, in order. Each PR is independently revertable and leaves the system in a consistent state. + +### PR 1 — Schema shim (Phase 1 DB) + +- Add `client_uuid` column to seven tables. +- Backfill from existing `id`. +- Add `UNIQUE` constraint and format CHECK. +- Drizzle migration only; no code changes touching it yet. + +**Risk:** Low. Reversible by dropping the column. +**Touches:** `packages/api/drizzle/00XX_add_client_uuid.sql`, `packages/api/src/db/schema.ts`. + +### PR 2 — API: accept and return `clientUuid` + +- Update Zod request schemas to accept optional `clientUuid`. +- Update handlers to use `data.clientUuid ?? data.id ?? mintId(prefix)`. +- Add `onConflictDoNothing(target: clientUuid)` for idempotency. +- Update response schemas to include `clientUuid`. +- Add deprecation log for `id`-only requests. + +**Risk:** Low. Additive on the wire. +**Touches:** `packages/api/src/routes/{packs,trips,packTemplates,trailConditions}/*.ts`, `packages/api/src/schemas/*.ts`, `packages/api/src/utils/ids.ts` (rename `mintId` semantics in comments). + +### PR 3 — Mobile: persisted store migration + read by `clientUuid` + +- `persistPlugin` migration: copy `id → clientUuid`, re-key store records. +- Update `PackInStore`, `PackItem`, `TripInStore`, etc. types to include `clientUuid`. +- Update `useCreatePack`, `useCreatePackItem`, etc. to mint `clientUuid` instead of `id`. +- Update `getPackItems`-style queries to filter by `packClientUuid`. +- Don't touch sync wire format yet — `id` is still the field name on the wire. + +**Risk:** Medium. Persisted-store migration is one-way. Test on a representative dataset. +**Touches:** `apps/expo/features/packs/store/*.ts`, `apps/expo/features/packs/hooks/*.ts`, `apps/expo/features/{trips,trail-conditions,pack-templates}/store/*.ts`, `apps/expo/lib/persist-plugin/*.ts`, `apps/expo/features/packs/types.ts` and siblings. + +### PR 4 — Mobile: switch sync wire format to `clientUuid` + +- Update `createPack`, `createPackItem`, `createTrip`, etc. in the stores to send `clientUuid` on the wire. +- Update `updatePack`, `updatePackItem`, etc. to throw-and-retry when local row has no server `id` yet. +- Keep `id` on the response as the server-owned identifier; populate it into the local row on first sync return. + +**Risk:** Medium. Watch for retry storms in telemetry. +**Touches:** Same files as PR 3. + +### PR 5 — API: drop the `id`-on-create compatibility shim + +- Remove `data.id ?? data.clientUuid` fallback. +- Force `clientUuid` (server can still mint). +- Bump the API minor version, update OpenAPI docs. + +**Risk:** Low if PR 3+4 have shipped to 100% of users for at least one release cycle. +**Touches:** `packages/api/src/routes/*/*.ts`, `packages/api/src/schemas/*.ts`. + +### PR 6 — Phase 2: narrow `id` to `bigserial`, rewrite FKs + +- Big-bang DB migration for the seven tables. +- Update Drizzle schema types. +- Update API handlers to read `id` as `number`. +- Update mobile to handle numeric server `id`. + +**Risk:** High. Plan a maintenance window. Have a rollback runbook. Backup the DB. +**Touches:** Everything that references `id` on these seven tables. + +Phase 2 (PR 6) is **a separate design doc** — too much surface to nail down here. Mentioning it for completeness; the meat of *this* design is PRs 1-5. + +--- + +## Appendix A — Files touched (current understanding) + +Cited so reviewers can trace the design back to ground truth: + +- **Schema:** `packages/api/src/db/schema.ts` (lines 110-380 for affected tables; user/auth tables untouched). +- **Routes:** `packages/api/src/routes/packs/index.ts`, `routes/trips/index.ts`, `routes/packTemplates/index.ts`, `routes/trailConditions/reports.ts`. +- **Schemas (Zod):** `packages/api/src/schemas/packs.ts`, `schemas/trips.ts`, `schemas/packTemplates.ts`. +- **ID helper:** `packages/api/src/utils/ids.ts` (introduced in T9). +- **Mobile stores:** `apps/expo/features/packs/store/{packs,packItems,packWeightHistory}.ts`, `features/trips/store/trips.ts`, `features/trail-conditions/store/trailConditionReports.ts`, `features/pack-templates/store/*.ts`. +- **Mobile hooks:** `apps/expo/features/packs/hooks/{useCreatePack,useCreatePackItem,useCreatePackFromPack}.ts`. +- **Persist plugin:** `apps/expo/lib/persist-plugin/*.ts`. +- **Drizzle migrations:** `packages/api/drizzle/` (existing UUID PK migration `0040_*.sql` is a good stylistic template). + +## Appendix B — Why not "just make `id` a UUIDv7 server-side and drop client-supplied IDs entirely" + +Tempting, but breaks offline-first: + +1. The Legend State store needs a stable local key the instant `useCreatePack` returns. Without one, the create button on mobile can't navigate to the new pack's screen until the network round-trip completes — that's the bug this whole architecture exists to avoid. +2. Even if we generated a UUIDv7 client-side, we'd still face the dual-ownership problem the moment two clients (mobile + web) generate IDs concurrently for the same logical row. `client_uuid` solves this by being explicitly local-scoped: it's an idempotency token, not a shared identifier. + +The client-supplied ID has to exist for offline-first to work. The design choice is whether it's *also* the PK (status quo, hacky) or a separate idempotency column (this design, clean). diff --git a/docs/plans/2026-05-13-chore-enroll-catalog-candidates-plan.md b/docs/plans/2026-05-13-chore-enroll-catalog-candidates-plan.md new file mode 100644 index 0000000000..d5796bb90d --- /dev/null +++ b/docs/plans/2026-05-13-chore-enroll-catalog-candidates-plan.md @@ -0,0 +1,122 @@ +--- +title: "chore: enroll remaining catalog candidates into Bun workspace catalog" +type: chore +status: active +date: 2026-05-13 +--- + +# chore: enroll remaining catalog candidates into Bun workspace catalog + +The Bun workspace catalog exists at the root `package.json` with 46 entries and a pre-push +enforcement script (`scripts/lint/no-duplicate-deps.ts`). That script currently emits 47 +**CATALOG CANDIDATE** warnings for third-party deps pinned at the same version in 2+ workspaces. +These are non-blocking today but represent unnecessary drift risk — any future version bump in one +workspace would silently create a VERSION MISMATCH (which IS blocking). + +This chore eliminates all warnings by enrolling every third-party candidate into the catalog. + +## Acceptance Criteria + +- [ ] `bun ./scripts/lint/no-duplicate-deps.ts` produces **0 CATALOG CANDIDATES** for third-party packages +- [ ] **0 CATALOG VIOLATIONS** and **0 VERSION MISMATCHES** (must remain at zero) +- [ ] `bun run check-types` exits 0 after changes +- [ ] `bun install` re-run to sync lockfile after package.json edits + +## Pattern + +**Two-step for each candidate:** + +1. Add an entry to the `"catalog"` object in root `package.json`: + ```json + "package-name": "^x.y.z" + ``` +2. In every workspace `package.json` that pins that dep, replace the explicit version with: + ```json + "package-name": "catalog:" + ``` + +**Do NOT catalog:** `workspace:*` references (`@packrat/guards`, `@packrat/env`, etc.) — these use +the workspace protocol, not semver, and should stay as `"workspace:*"`. + +## Packages to Enroll + +All 47 are currently at a **consistent version** across all workspaces (no mismatches), so the +catalog version is simply the existing pinned string. + +### @-scoped + +| Package | Version | Appears in | +|---|---|---| +| `@ai-sdk/openai` | `^3.0.53` | apps/guides, packages/api | +| `@cloudflare/workers-types` | `^4.20250405.0` | packages/mcp, packages/api | +| `@duckdb/node-api` | `1.5.0-r.1` | packages/cli, packages/analytics | +| `@hookform/resolvers` | `^5.2.2` | apps/landing, apps/guides | +| `@lhci/cli` | `^0.14.0` | apps/landing, apps/guides | +| `@neondatabase/serverless` | `^1.0.0` | packages/api, packages/osm-db | +| `@tanstack/react-query` | `^5.70.0` | apps/web, apps/admin, apps/expo, apps/guides, packages/app | +| `@tanstack/react-query-devtools` | `^5.70.0` | apps/web, apps/guides | +| `@types/bun` | `latest` | packages/cli, packages/api, packages/analytics | +| `@types/leaflet` | `^1.9.21` | apps/trails, apps/admin, apps/expo | +| `@types/node` | `^25.6.0` | apps/trails, apps/landing, apps/web, apps/admin, apps/guides | +| `@types/react` | `~19.2.10` | apps/trails, apps/landing, apps/web, apps/admin, apps/expo, apps/guides, packages/web-ui | +| `@types/react-dom` | `^19.1.6` | apps/trails, apps/landing, apps/web, apps/admin, apps/guides | +| `@vitest/coverage-v8` | `~3.1.4` | apps/expo, packages/mcp, packages/api | + +### Unscoped + +| Package | Version | Appears in | +|---|---|---| +| `autoprefixer` | `^10.4.21` | apps/landing, apps/web, apps/guides | +| `better-auth` | `^1.6.9` | apps/expo, packages/api | +| `class-variance-authority` | `^0.7.1` | apps/trails, apps/landing, apps/admin, apps/expo, apps/guides, packages/web-ui | +| `clsx` | `^2.1.1` | apps/trails, apps/landing, apps/admin, apps/expo, apps/guides, packages/web-ui | +| `cmdk` | `1.1.1` | apps/landing, apps/guides, packages/web-ui | +| `consola` | `^3.4.2` | packages/cli, packages/analytics | +| `date-fns` | `^4.1.0` | apps/landing, apps/expo, apps/guides | +| `drizzle-kit` | `^0.31.10` | packages/api, packages/osm-db | +| `drizzle-orm` | `^0.45.2` | packages/api, packages/osm-db | +| `embla-carousel-react` | `8.6.0` | apps/landing, apps/guides, packages/web-ui | +| `google-auth-library` | `^10.1.0` | apps/expo, packages/api | +| `gray-matter` | `^4.0.3` | apps/guides, packages/api | +| `input-otp` | `1.4.1` | apps/trails, apps/landing, apps/guides, packages/web-ui | +| `jotai` | `^2.12.2` | apps/web, apps/expo, packages/app | +| `leaflet` | `^1.9.4` | apps/trails, apps/admin, apps/expo | +| `lucide-react` | `^1.8.0` | apps/trails, apps/landing, apps/web, apps/admin, apps/guides, packages/web-ui | +| `next` | `^15.3.4` | apps/trails, apps/landing, apps/web, apps/admin, apps/guides | +| `next-themes` | `^0.4.6` | apps/landing, apps/web, apps/admin, apps/guides, packages/web-ui | +| `pg` | `^8.16.3` | packages/osm-import, packages/api, packages/osm-db | +| `postcss` | `^8.5.6` | apps/trails, apps/landing, apps/web, apps/admin, apps/guides | +| `postcss-import` | `^16.1.1` | apps/trails, apps/landing, apps/admin, apps/guides | +| `react-day-picker` | `9.14.0` | apps/landing, apps/guides, packages/web-ui | +| `react-hook-form` | `^7.58.1` | apps/landing, apps/guides, packages/web-ui | +| `react-leaflet` | `^5.0.0` | apps/trails, apps/expo | +| `react-resizable-panels` | `^4.10.0` | apps/landing, apps/guides, packages/web-ui | +| `recharts` | `3.8.1` | apps/web, apps/admin, packages/web-ui | +| `sonner` | `^2.0.7` | apps/trails, apps/landing, apps/admin, apps/guides, packages/web-ui | +| `tailwind-merge` | `^3.5.0` | apps/trails, apps/landing, apps/admin, apps/expo, apps/guides, packages/web-ui | +| `tailwindcss-animate` | `^1.0.7` | apps/web, packages/web-ui | +| `vaul` | `^1.1.2` | apps/landing, apps/guides, packages/web-ui | +| `vitest` | `~3.1.4` | apps/expo, packages/overpass, packages/mcp, packages/units, packages/api, packages/analytics | +| `wrangler` | `^4.21.2` | packages/mcp, packages/api | +| `ws` | `^8.18.1` | packages/api, packages/osm-db | + +## Implementation Steps + +- [ ] Add all 47 packages to the `"catalog"` section of root `package.json` (alphabetical order, interleaved with existing entries) +- [ ] For each workspace listed in the table, replace the pinned version with `"catalog:"` +- [ ] Run `bun install` to regenerate the lockfile +- [ ] Run `bun run check-types` — must exit 0 +- [ ] Run `bun ./scripts/lint/no-duplicate-deps.ts` — must show 0 CATALOG CANDIDATES (for third-party; `workspace:*` refs are expected to remain) + +## Context + +- Root catalog: `package.json` lines ~76–123 +- Enforcement script: `scripts/lint/no-duplicate-deps.ts` +- Pre-push hook: `lefthook.yml` (`pre-push.clean-checks`) +- Related PR: #2414 (type system unification — landed on the same branch pattern) + +## Sources + +- Enforcement script: `scripts/lint/no-duplicate-deps.ts` +- Root catalog: `package.json` (catalog section) +- Bun workspace catalog docs: https://bun.sh/docs/install/workspaces diff --git a/docs/plans/2026-05-14-refactor-extract-schemas-and-db-packages-plan.md b/docs/plans/2026-05-14-refactor-extract-schemas-and-db-packages-plan.md new file mode 100644 index 0000000000..a690cb1d01 --- /dev/null +++ b/docs/plans/2026-05-14-refactor-extract-schemas-and-db-packages-plan.md @@ -0,0 +1,313 @@ +--- +title: "refactor: extract @packrat/db and @packrat/schemas from packages/api" +type: refactor +status: active +date: 2026-05-14 +--- + +# refactor: extract @packrat/db and @packrat/schemas from packages/api + +## Overview + +`packages/api` currently serves two incompatible roles: a Cloudflare Worker (deployed binary, CF-specific deps) and a shared schema/type library imported by every consumer in the monorepo. This plan extracts the Drizzle schema + drizzle-zod generated schemas into `@packrat/db`, and the route-level Zod schemas into `@packrat/schemas`. Frontend apps get a clean import path with no CF Workers leakage. Migration infra is unchanged. + +## Problem Statement + +**Leaky abstraction.** `apps/expo`, `packages/app`, `apps/admin`, and `apps/guides` import from `@packrat/api`. That package has `compatibility_flags: ["nodejs_compat"]`, `wrangler.jsonc`, and CF Workers-specific deps. Frontend toolchains encounter server-only types — fragile and semantically wrong. + +**Schema duplication.** Hand-written Zod schemas in `packages/api/src/schemas/` duplicate the shape of Drizzle tables. `drizzle-zod` can generate the base layer from the table definitions, making the DB the single source of truth. This is only possible if the Drizzle schema lives in a package that `@packrat/schemas` can import from without a circular dep. + +**`packages/app` entity re-exports are vestigial.** After PR #2414, `packages/app/src/entities/*/schema.ts` are 3-line re-export passthroughs to `@packrat/api/schemas/*`. Once `@packrat/schemas` exists, they have a real home. + +## Proposed Solution + +Two new packages, created in order: + +### `packages/db` → `@packrat/db` (foundation) + +Pure Drizzle + drizzle-zod. No Zod dep. No CF Workers bindings. + +Contains: +- `src/schema.ts` — Drizzle table definitions (moved from `packages/api/src/db/schema.ts`) +- `src/zod-schemas.ts` — drizzle-zod generated base schemas (`createSelectSchema(users)`, `createInsertSchema(packs)`, etc.) — moved from `packages/api/src/db/zod-schemas.ts` +- `src/constants.ts` — raw `as const` arrays + TypeScript types only (`PACK_CATEGORIES`, `PackCategory`, `WEIGHT_UNITS`, `WeightUnit`, etc.) — no Zod dep needed +- `src/validation.ts` — `ValidationError` interface only (plain TypeScript, no Zod) — used by `schema.ts` as `.$type()` +- `src/index.ts` — re-exports all of the above + +Does **not** contain: +- DB client factories (`createDb`, `createReadOnlyDb`) — stay in `packages/api/src/db/index.ts` +- `drizzle.config.ts`, `drizzle/` migrations — stay in `packages/api` (see Migration Infra below) +- Any Zod schemas — those belong in `@packrat/schemas` + +**`package.json` for `@packrat/db`:** +```json +{ + "name": "@packrat/db", + "version": "0.0.0", + "private": true, + "exports": { + ".": { "types": "./src/index.ts", "default": "./src/index.ts" }, + "./*": { "types": "./src/*", "default": "./src/*" } + }, + "dependencies": { + "drizzle-orm": "catalog:", + "drizzle-zod": "catalog:" + } +} +``` + +Note: `drizzle-zod` v0.8.3 explicitly supports `"zod": "^3.25.0 || ^4.0.0"` — no compatibility issue. + +### `packages/schemas` → `@packrat/schemas` (depends on db) + +Route-level Zod schemas. Depends on `@packrat/db`. No Elysia. No CF Workers bindings. + +The drizzle-zod chain: `@packrat/db` generates base schemas from tables → `@packrat/schemas` extends/picks/transforms them for routes: +```typescript +// single source of truth +import { selectUserSchema } from '@packrat/db/zod-schemas'; +export const UserProfileSchema = selectUserSchema + .pick({ id: true, email: true, firstName: true, ... }) + .extend({ createdAt: z.string().datetime() }); +``` + +Contains: +- Route-level Zod schemas extending drizzle-zod output (packs, catalog, trips, feed, guides, users, etc.) +- Hand-written schemas for non-DB types (weather, upload, chat, AI, guides search, etc.) +- Zod enum wrappers around raw constants from `@packrat/db`: `PackCategorySchema = z.enum(PACK_CATEGORIES)` +- `ValidationErrorSchema` (Zod schema wrapping `ValidationError` interface from `@packrat/db`) +- Inferred TypeScript types + +Does **not** contain: +- `admin.ts` — uses Elysia TypeBox `t`; stays in `packages/api/src/schemas/` +- Raw Drizzle table definitions or DB connection code + +**`package.json` for `@packrat/schemas`:** +```json +{ + "name": "@packrat/schemas", + "version": "0.0.0", + "private": true, + "exports": { + ".": { "types": "./src/index.ts", "default": "./src/index.ts" }, + "./*": { "types": "./src/*", "default": "./src/*" } + }, + "dependencies": { + "zod": "catalog:", + "@packrat/db": "workspace:*", + "@packrat/guards": "workspace:*" + } +} +``` + +### `packages/api` — 3 re-export shims + 1 dep, nothing else + +The only changes to `packages/api`: + +1. `src/db/schema.ts` → `export * from '@packrat/db/schema';` +2. `src/types/constants.ts` → `export * from '@packrat/schemas/constants';` (which itself re-exports raw arrays from `@packrat/db/constants` — single shim covers both layers) +3. `src/types/validation.ts` → `export * from '@packrat/schemas/validation';` +4. `package.json` → add `"@packrat/db": "workspace:*"` and `"@packrat/schemas": "workspace:*"` + +Everything else in `packages/api` is **unchanged**: routes, services, middleware, db client factories, env-validation, `drizzle.config.ts`, `drizzle/` migrations, `db:generate` script. + +## Dependency Graph + +``` +@packrat/guards + +@packrat/db (drizzle-orm, drizzle-zod — no Zod) + │ Drizzle tables, raw enum arrays/types, drizzle-zod generated schemas + ↓ +@packrat/schemas (zod, @packrat/db, @packrat/guards) + │ Zod enum wrappers, route schemas extending drizzle-zod output + ↓ +@packrat/api (elysia, CF Workers, @packrat/db, @packrat/schemas, ...) + │ Routes, middleware, DB client factories, migrations + ↓ +@packrat/api-client (eden treaty, @packrat/api type App) + ↓ +apps/expo, apps/web, apps/admin, apps/guides, packages/app +``` + +## Migration Infra — Zero Changes + +`drizzle.config.ts` stays in `packages/api` pointing at `./src/db/schema.ts`. That file is now a 1-line re-export shim. drizzle-kit v0.31 loads schema files via `require()` + `Object.values(exports)` — it follows re-exports transparently (verified from source at `node_modules/drizzle-kit/bin.cjs` lines 15893–15920). The `drizzle/` migrations folder, `db:generate` script, `db:migrate` script — all unchanged. + +## Implementation Phases + +### Phase 1: Create `@packrat/db` + +**Deliverables:** +- New `packages/db/` with `package.json`, `tsconfig.json`, `src/index.ts` +- Move `packages/api/src/db/schema.ts` → `packages/db/src/schema.ts` + - Update import `from '@packrat/api/types/constants'` → `from './constants'` + - Update import `from '../types/validation'` → `from './validation'` +- Move `packages/api/src/db/zod-schemas.ts` → `packages/db/src/zod-schemas.ts` + - Update import `from './schema'` — stays the same (local) +- Extract to `packages/db/src/constants.ts` (raw arrays + TS types only, no Zod): + - `PACK_CATEGORIES`, `PackCategory` + - `ITEM_CATEGORIES`, `ItemCategory` + - `WEIGHT_UNITS`, `WeightUnit` + - `AVAILABILITY_VALUES`, `Availability` + - `ItemLink`, `ItemReview` (plain TS interfaces) +- Extract to `packages/db/src/validation.ts`: `ValidationError` interface only (no Zod) +- Add re-export shim `packages/api/src/db/schema.ts` → `export * from '@packrat/db/schema'` +- Add re-export shim `packages/api/src/db/zod-schemas.ts` → `export * from '@packrat/db/zod-schemas'` +- Add `@packrat/db` to root `tsconfig.json` path aliases and `package.json` workspaces +- Add `"@packrat/db": "workspace:*"` to `packages/api/package.json` + +**`tsconfig.json` for `packages/db`:** +```json +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "bundler", + "strict": true, + "noUncheckedIndexedAccess": true + }, + "include": ["src"] +} +``` + +**Success criteria:** +- `bun check-types` exits 0 +- `bun run --cwd packages/api db:generate` still works (drizzle-kit follows re-export shim) +- `packages/api` routes still resolve Drizzle tables via `@packrat/api/db/schema` (through shim) + +### Phase 2: Create `@packrat/schemas` + +**Deliverables:** +- New `packages/schemas/` with `package.json`, `tsconfig.json`, `src/index.ts` +- Move (copy → delete) from `packages/api/src/schemas/` → `packages/schemas/src/`: + - `ai.ts`, `auth.ts`, `catalog.ts`, `chat.ts`, `feed.ts`, `guides.ts` + - `imageDetection.ts`, `packTemplates.ts`, `packs.ts`, `seasonSuggestions.ts` + - `trailConditions.ts`, `trips.ts`, `upload.ts`, `users.ts`, `weather.ts` +- Create `packages/schemas/src/constants.ts`: + ```typescript + export * from '@packrat/db/constants'; // re-export raw arrays + TS types + import { PACK_CATEGORIES, ITEM_CATEGORIES, WEIGHT_UNITS, AVAILABILITY_VALUES } from '@packrat/db/constants'; + export const PackCategorySchema = z.enum(PACK_CATEGORIES); + export const ItemCategorySchema = z.enum(ITEM_CATEGORIES); + export const WeightUnitSchema = z.enum(WEIGHT_UNITS); + export const AvailabilitySchema = z.enum(AVAILABILITY_VALUES); + // ... inferred types + ``` +- Create `packages/schemas/src/validation.ts`: + ```typescript + export type { ValidationError } from '@packrat/db/validation'; + export const ValidationErrorSchema = z.object({ ... }); + export const ValidationErrorsSchema = z.array(ValidationErrorSchema); + ``` +- Add 1-line re-export shims in `packages/api/src/schemas/*.ts` (except `admin.ts`) → `@packrat/schemas/*` +- Replace `packages/api/src/types/constants.ts` with: `export * from '@packrat/schemas/constants'` +- Replace `packages/api/src/types/validation.ts` with: `export * from '@packrat/schemas/validation'` +- Cleanup: `CatalogItemSchema`, `PackItemSchema`, `PackSchema`, `UserSchema` currently live in `constants.ts` but belong in their respective schema files (`catalog.ts`, `packs.ts`, `users.ts`). Remove the duplicates from `constants.ts` during this move. +- Add `@packrat/schemas` to root `tsconfig.json` path aliases and `package.json` workspaces +- Add `"@packrat/schemas": "workspace:*"` to `packages/api/package.json` + +**`tsconfig.json` for `packages/schemas`:** +```json +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "bundler", + "strict": true, + "noUncheckedIndexedAccess": true, + "paths": { + "@packrat/db": ["../db/src/index.ts"], + "@packrat/db/*": ["../db/src/*"], + "@packrat/guards": ["../guards/src/index.ts"], + "@packrat/guards/*": ["../guards/src/*"] + } + }, + "include": ["src"] +} +``` + +**Root `tsconfig.json` additions (both phases):** +```json +"@packrat/db": ["./packages/db/src/index.ts"], +"@packrat/db/*": ["./packages/db/src/*"], +"@packrat/schemas": ["./packages/schemas/src/index.ts"], +"@packrat/schemas/*": ["./packages/schemas/src/*"] +``` + +**Success criteria:** +- `bun check-types` exits 0 +- `packages/api/src/schemas/catalog.ts` is a 1-line re-export +- `apps/expo` imports still resolve unchanged (re-export shims preserve all existing paths) +- `bun ./scripts/lint/no-duplicate-deps.ts` exits 0 + +### Phase 3: Migrate `packages/app` entities + +Update 5 files in `packages/app/src/entities/`: +- `catalog/schema.ts` → `from '@packrat/schemas/catalog'` +- `pack/schema.ts` → `from '@packrat/schemas/packs'` +- `feed/schema.ts` → `from '@packrat/schemas/feed'` +- `trip/schema.ts` → `from '@packrat/schemas/trips'` +- `user/schema.ts` → `from '@packrat/schemas/users'` + +Add `"@packrat/schemas": "workspace:*"` to `packages/app/package.json`. + +**Success criteria:** `packages/app` has no `@packrat/api` imports. + +### Phase 4: Direct consumer migration (optional) + +Update `apps/expo` (35+ files), `apps/admin`, `apps/guides` to import from `@packrat/schemas` directly. The re-export shims make this fully deferrable — things work correctly without it. + +```bash +grep -r "from '@packrat/api/schemas" apps/ packages/app/ --include="*.ts" --include="*.tsx" -l +grep -r "from '@packrat/api/types" apps/ packages/app/ --include="*.ts" --include="*.tsx" -l +``` + +### Phase 5: Incremental drizzle-zod migration (ongoing) + +Replace hand-written Zod schemas that duplicate DB-backed shapes with drizzle-zod extensions: +```typescript +// before +export const TripSchema = z.object({ id: z.string(), name: z.string(), ... }); + +// after +import { selectTripSchema } from '@packrat/db/zod-schemas'; +export const TripSchema = selectTripSchema.extend({ startDate: z.string().datetime().nullable(), ... }); +``` + +This is incremental — schemas can be migrated one at a time, `bun check-types` after each. + +## Acceptance Criteria + +- [ ] `packages/db/` exists; `package.json` deps are only `drizzle-orm` and `drizzle-zod` (no Zod) +- [ ] `packages/schemas/` exists; `package.json` deps are `zod`, `@packrat/db`, `@packrat/guards` +- [ ] `bun check-types` exits 0 after each phase +- [ ] `bun ./scripts/lint/no-duplicate-deps.ts` exits 0 (catalog entries used correctly) +- [ ] `bun run --cwd packages/api db:generate` still works after Phase 1 +- [ ] DB client factories, `drizzle.config.ts`, `drizzle/` migrations all stay in `packages/api` +- [ ] `packages/api/src/schemas/admin.ts` stays in `packages/api` +- [ ] Re-export shims mean zero changes to `apps/expo` through Phases 1–2 +- [ ] Phase 3: `packages/app` has no `@packrat/api` imports +- [ ] Phase 4 (optional): no file outside `packages/api` imports from `@packrat/api/schemas/*` + +## Risks — All Low + +| Risk | Assessment | Mitigation | +|---|---|---| +| drizzle-kit can't follow re-export shim | **None** — verified from source (v0.31 uses `require()` + `Object.values(exports)`) | N/A | +| drizzle-zod incompatible with Zod v4 | **None** — v0.8.3 peer dep is `"zod": "^3.25.0 \|\| ^4.0.0"` | N/A | +| `ValidationError` circular dep | **None** — it's a plain TS interface; lives in `@packrat/db` with no Zod dep | N/A | +| Routes in `packages/api` break | **None** — all import via `@packrat/api/db/schema` which becomes a re-export shim | N/A | +| `better-auth` CLI needs stable schema path | **None** — `packages/api/src/db/schema.ts` path is preserved as a re-export shim | N/A | +| Phase 4 touches 35+ files in `apps/expo` | Medium — but fully deferrable; shims work indefinitely | Do with find-replace when ready | + +## Sources & References + +- `packages/api/src/db/schema.ts` — Drizzle table definitions (735 lines); moves to `@packrat/db` +- `packages/api/src/db/zod-schemas.ts` — drizzle-zod generated schemas; moves to `@packrat/db` +- `packages/api/src/types/constants.ts` — raw arrays + Zod enums + misplaced schemas; splits across `@packrat/db` and `@packrat/schemas` +- `packages/api/src/types/validation.ts` — `ValidationError` interface + Zod schema; splits across `@packrat/db` and `@packrat/schemas` +- `packages/api/src/schemas/` — 16 files; 15 move, `admin.ts` stays +- `packages/osm-db/` — existing monorepo template for a standalone Drizzle schema package +- PR #2414 — prerequisite; establishes clean schema boundaries and `app/entities/*` re-exports +- `docs/plans/2026-05-13-chore-enroll-catalog-candidates-plan.md` — `zod`, `drizzle-orm`, `drizzle-zod` already enrolled in catalog diff --git a/docs/plans/2026-05-23-001-feat-cf-gateway-unified-billing-plan.md b/docs/plans/2026-05-23-001-feat-cf-gateway-unified-billing-plan.md new file mode 100644 index 0000000000..c89392ec2f --- /dev/null +++ b/docs/plans/2026-05-23-001-feat-cf-gateway-unified-billing-plan.md @@ -0,0 +1,419 @@ +--- +title: "feat: Add Cloudflare AI Gateway Unified Billing for OpenAI" +type: feat +status: completed +date: 2026-05-23 +origin: docs/brainstorms/2026-05-23-cf-gateway-unified-billing-openai-requirements.md +--- + +# feat: Add Cloudflare AI Gateway Unified Billing for OpenAI + +## Summary + +Introduce a shared OpenAI provider path that prefers Cloudflare AI Gateway Unified Billing in production while preserving direct OpenAI fallback for development and rollback. Migrate PackRat's remaining direct OpenAI runtime call sites into that shared path, then document which AI features are unified-billing covered versus still direct-provider. + +--- + +## Problem Frame + +PackRat already routes some OpenAI calls through Cloudflare AI Gateway, but the current path still assumes an OpenAI API key and several runtime features instantiate OpenAI directly. The result is a mixed operational model for billing, secrets, and request investigation. + +--- + +## Requirements + +- R1. PackRat must prefer Cloudflare AI Gateway Unified Billing for OpenAI-backed runtime AI requests when the required Cloudflare configuration is present. +- R2. OpenAI-backed runtime features must no longer require a direct OpenAI API key for the primary production unified billing path. +- R3. The migration must preserve existing direct-provider behavior for Google/Gemini template generation and Perplexity web search. +- R4. PackRat must retain a clear direct OpenAI fallback for local development, emergency rollback, or environments not configured for unified billing. +- R5. Failures must make the active billing/authentication path clear enough for operators to distinguish Cloudflare unified billing issues from direct-provider key issues. +- R6. OpenAI-backed requests routed through Cloudflare must expose enough request metadata for operators to correlate PackRat logs with Cloudflare AI Gateway observability. +- R7. PackRat documentation or runbooks must identify which AI features are covered by unified billing and which remain direct-provider exceptions. + +**Origin actors:** A1 PackRat operator, A2 PackRat user, A3 Implementation agent +**Origin flows:** F1 OpenAI-backed request uses Cloudflare unified billing, F2 Unsupported or non-migrated provider remains direct +**Origin acceptance examples:** AE1 production chat through Cloudflare without direct OpenAI key, AE2 Google/Gemini remains direct, AE3 local direct OpenAI fallback + +--- + +## Scope Boundaries + +- In scope: OpenAI-backed runtime AI features, including chat, embeddings, catalog/vector flows, pack generation, image gear detection, wildlife identification, and season suggestions. +- In scope: direct OpenAI fallback for local development, emergency rollback, and environments not configured for Cloudflare unified billing. +- In scope: operator-facing logging and docs that identify the active billing/authentication path. +- Out of scope: model, prompt, UX, embedding dimension, and catalog schema behavior changes. +- Out of scope: user- or admin-facing provider selection. + +### Deferred to Follow-Up Work + +- Google/Gemini pack-template analysis: Cloudflare unified billing supports Google AI Studio, so this is a good follow-up after OpenAI is stable. +- Perplexity web search: Cloudflare AI Gateway has a Perplexity provider integration, but unified billing support must be verified before migration. +- Multi-provider abstraction beyond OpenAI: keep the current plan focused on the dominant runtime provider and avoid designing a provider menu prematurely. + +--- + +## Context & Research + +### Relevant Code and Patterns + +- `packages/api/src/utils/ai/provider.ts` is the existing shared provider helper. It currently routes OpenAI through Cloudflare AI Gateway's OpenAI provider endpoint but still requires `OPENAI_API_KEY`. +- `packages/api/src/services/embeddingService.ts` centralizes embedding generation through `createAIProvider`, and is used by catalog, pack item, and ETL flows. +- `packages/api/src/routes/chat.ts`, `packages/api/src/routes/packs/index.ts`, `packages/api/src/routes/catalog/index.ts`, `packages/api/src/services/catalogService.ts`, and `packages/api/src/services/etl/processValidItemsBatch.ts` already use the shared provider path for some OpenAI-backed behavior. +- `packages/api/src/services/imageDetectionService.ts`, `packages/api/src/services/wildlifeIdentificationService.ts`, `packages/api/src/services/packService.ts`, and `packages/api/src/routes/seasonSuggestions.ts` still instantiate OpenAI directly. +- `packages/api/src/utils/env-validation.ts` currently requires `OPENAI_API_KEY` in production and validates `AI_PROVIDER` as `openai | cloudflare-workers-ai`. +- `packages/api/src/utils/ai/logging.ts` exists but is not wired into active AI call sites and only extracts Cloudflare IDs for `cloudflare-workers-ai`. +- `.github/scripts/env.ts`, `README.md`, and `packages/api/wrangler.jsonc` describe the repo's root `.env.local` to API `.dev.vars` environment flow. + +### Institutional Learnings + +- `docs/solutions/developer-experience/better-auth-cli-cloudflare-worker-factory-2026-05-02.md` reinforces that Cloudflare Worker runtime bindings and CLI/local contexts often need separate static/dev-safe configuration. This plan should preserve local fallback rather than assuming production bindings exist everywhere. + +### External References + +- Cloudflare Unified Billing docs: + - Unified billing uses Cloudflare credits and Cloudflare API token authentication for supported third-party models. + - Workers AI models are not charged via unified billing. + - HTTP unified billing provider set includes OpenAI, Anthropic, Google AI Studio, Google Vertex AI, xAI, and Groq. + - Spend limits and ZDR are gateway-level operational concerns; ZDR currently applies to OpenAI and Anthropic. +- Cloudflare Vercel AI SDK integration: + - Use `ai-gateway-provider` and `createAiGateway(...)` with provider wrappers such as `createUnified()` or provider-specific wrappers. + - The current package version observed during planning is `ai-gateway-provider@3.1.3`. +- Cloudflare supported models docs: + - Model availability should be checked during implementation for PackRat's exact OpenAI chat and embedding model IDs. + +--- + +## Key Technical Decisions + +- Use Cloudflare's AI SDK gateway provider as the preferred integration path: PackRat already uses Vercel AI SDK functions for chat, objects, and embeddings, so a provider-level change avoids hand-authored REST clients. +- Add an explicit billing mode instead of relying only on secret presence: operators need a predictable rollback switch between Cloudflare unified billing and direct OpenAI. +- Keep the shared provider helper OpenAI-focused for this pass: Google/Gemini and Perplexity remain direct-provider exceptions, so a broad multi-provider abstraction would add unnecessary design surface. +- Make `OPENAI_API_KEY` optional only when Cloudflare unified billing is configured: production should not fail validation solely because the OpenAI key is absent, but direct fallback must still validate the direct key before use. +- Treat observability as structured billing-path metadata plus Cloudflare correlation IDs where available: the plan should not promise a specific header if the AI SDK integration does not expose it for every response type. + +--- + +## Open Questions + +### Resolved During Planning + +- Should Gemini be included in this implementation? No. Cloudflare unified billing supports Google AI Studio, but the active implementation should stay OpenAI-first and defer Gemini to follow-up work. +- Should Perplexity be included in this implementation? No. Cloudflare AI Gateway supports Perplexity as a provider integration, but unified billing support was not confirmed during planning. +- Which integration family should be preferred? Use Cloudflare's Vercel AI SDK provider unless implementation proves a specific OpenAI call shape is unsupported. +- How should fallback be selected? Use an explicit billing mode with direct OpenAI fallback requiring `OPENAI_API_KEY`; do not silently fall back from production Cloudflare failures unless the operator has configured direct mode. + +### Deferred to Implementation + +- Exact model ID mapping: verify whether PackRat's current chat and embedding model IDs should stay provider-native or use unified model prefixes with the selected `ai-gateway-provider` wrapper. +- Correlation metadata availability: confirm what metadata the AI SDK gateway provider exposes for stream, object, and embedding calls, then log the strongest available correlation fields. +- Exact environment variable names: prefer names that match existing repo conventions and Cloudflare docs, but settle final names while editing `env-validation` and deployment docs. + +--- + +## High-Level Technical Design + +> *This illustrates the intended approach and is directional guidance for review, not implementation specification. The implementing agent should treat it as context, not code to reproduce.* + +```mermaid +flowchart TD + A[OpenAI-backed PackRat feature] --> B[Shared OpenAI provider helper] + B --> C{Billing mode} + C -->|Cloudflare unified| D[AI Gateway provider with Cloudflare token] + C -->|Direct fallback| E[Direct OpenAI provider with OpenAI key] + D --> F[Vercel AI SDK generate/stream/embed call] + E --> F + F --> G[Structured AI billing-path log] +``` + +--- + +## Implementation Units + +### U1. Add billing-mode environment contract + +**Goal:** Define and validate the configuration that selects Cloudflare unified billing versus direct OpenAI fallback. + +**Requirements:** R1, R2, R4, R5 + +**Dependencies:** None + +**Files:** +- Modify: `packages/api/src/utils/env-validation.ts` +- Modify: `packages/api/src/utils/__tests__/env-validation.test.ts` +- Modify: `packages/api/test/setup.ts` +- Modify: `.github/scripts/env.ts` +- Modify: `README.md` +- Modify: `packages/api/wrangler.jsonc` + +**Approach:** +- Introduce an explicit AI billing mode for OpenAI-backed requests, with values for Cloudflare unified billing and direct OpenAI fallback. +- Add Cloudflare AI Gateway token validation for the unified billing path. +- Make `OPENAI_API_KEY` optional only when the selected mode does not need a direct OpenAI key. +- Preserve existing Google and Perplexity env validation because those providers remain direct in this plan. +- Document how root `.env.local` fans out into API `.dev.vars`, and which secrets belong in Cloudflare dashboard or Wrangler secrets for production. + +**Patterns to follow:** +- `packages/api/src/utils/env-validation.ts` conditional validation style around `apiEnvSchema` and test schema. +- `.github/scripts/env.ts` root-env fanout into `packages/api/.dev.vars`. +- `packages/api/wrangler.jsonc` comments for operational environment guidance. + +**Test scenarios:** +- Happy path: production env with Cloudflare billing mode, Cloudflare account/gateway/token, and no OpenAI key validates successfully. +- Happy path: production env with direct billing mode and valid OpenAI key validates successfully. +- Error path: direct billing mode without OpenAI key fails validation with a clear configuration error. +- Error path: Cloudflare billing mode without Cloudflare token fails validation with a clear configuration error. +- Regression: Google and Perplexity direct-provider secrets remain required according to the current production env contract. + +**Verification:** +- Env validation tests prove production can run OpenAI unified billing without a direct OpenAI key. +- Local test setup still provides a valid environment for existing API tests. + +--- + +### U2. Replace the OpenAI provider helper with unified billing support + +**Goal:** Make the shared provider helper produce an OpenAI-compatible AI SDK provider for either Cloudflare unified billing or direct OpenAI fallback. + +**Requirements:** R1, R2, R4, R5, R6 + +**Dependencies:** U1 + +**Files:** +- Modify: `packages/api/package.json` +- Modify: `package.json` +- Modify: `bun.lock` +- Modify: `packages/api/src/utils/ai/provider.ts` +- Modify: `packages/api/src/utils/ai/logging.ts` +- Create or modify: `packages/api/src/utils/ai/__tests__/provider.test.ts` +- Create or modify: `packages/api/src/utils/ai/__tests__/logging.test.ts` +- Modify: `packages/api/test/setup.ts` + +**Approach:** +- Add `ai-gateway-provider` to the API workspace dependencies. +- Keep one public helper for OpenAI-backed call sites, but have it select Cloudflare unified billing or direct OpenAI based on validated env/config. +- Return the same kind of AI SDK model factory interface call sites already expect, so `streamText`, `generateObject`, `embed`, and `embedMany` can keep their existing call shape. +- Include billing path, provider, model, gateway ID, and available Cloudflare correlation metadata in logging output. +- Remove or quarantine the misleading `cloudflare-workers-ai` behavior that currently returns OpenAI through the gateway, unless implementation needs a short compatibility bridge. + +**Patterns to follow:** +- Existing `createAIProvider` call-site shape in `packages/api/src/routes/chat.ts` and `packages/api/src/services/embeddingService.ts`. +- Existing `logAIRequest` structure in `packages/api/src/utils/ai/logging.ts`. +- Global provider mocks in `packages/api/test/setup.ts`. + +**Test scenarios:** +- Happy path: Cloudflare billing mode creates an AI Gateway-backed provider with Cloudflare account, gateway, and token values. +- Happy path: direct billing mode creates a direct OpenAI provider and passes the OpenAI key. +- Error path: Cloudflare billing mode with missing token throws a configuration error that identifies Cloudflare unified billing. +- Error path: direct billing mode with missing OpenAI key throws a configuration error that identifies direct OpenAI. +- Observability: logging records billing path and model for both Cloudflare and direct modes. +- Observability: when Cloudflare correlation metadata is available, logging includes it without requiring it for direct mode. + +**Verification:** +- Provider tests pin the selection rules so later call-site migrations cannot accidentally reintroduce a required OpenAI key for unified billing. +- Type checks confirm the returned provider still satisfies existing AI SDK usage. + +--- + +### U3. Migrate direct OpenAI runtime services into the shared provider path + +**Goal:** Eliminate direct OpenAI SDK setup from OpenAI-backed runtime services that are currently outside the shared helper. + +**Requirements:** R1, R2, R4, R5, R6 + +**Dependencies:** U2 + +**Files:** +- Modify: `packages/api/src/services/imageDetectionService.ts` +- Modify: `packages/api/src/services/wildlifeIdentificationService.ts` +- Modify: `packages/api/src/services/packService.ts` +- Modify: `packages/api/src/routes/seasonSuggestions.ts` +- Modify: `packages/api/src/services/__tests__/packService.test.ts` +- Create or modify: `packages/api/src/services/__tests__/imageDetectionService.test.ts` +- Create or modify: `packages/api/src/services/__tests__/wildlifeIdentificationService.test.ts` +- Create or modify: `packages/api/src/routes/__tests__/seasonSuggestions.test.ts` + +**Approach:** +- Replace direct `createOpenAI` usage with the shared OpenAI provider helper. +- Preserve model IDs, prompts, schemas, temperatures, and response handling. +- Add or adjust unit coverage so the services prove they call the shared provider instead of direct OpenAI. +- Keep image and wildlife behavior unchanged; this unit is about billing/auth path only. + +**Execution note:** Use characterization-style tests for services that currently lack focused tests, asserting current prompts/schema-facing behavior enough to guard against accidental behavior changes while moving provider setup. + +**Patterns to follow:** +- `packages/api/src/routes/chat.ts` for current shared-provider usage. +- `packages/api/src/services/__tests__/packService.test.ts` for mocking OpenAI/provider behavior in service tests. + +**Test scenarios:** +- Covers AE1. Happy path: image detection uses the shared provider and still passes image content to the AI SDK object generation call. +- Happy path: wildlife identification uses the shared provider and preserves the current structured response schema. +- Happy path: pack generation uses the shared provider and preserves count-driven concept generation. +- Happy path: season suggestions use the shared provider and preserve inventory/location/date prompt inputs. +- Error path: provider configuration failure surfaces as an AI/provider configuration error rather than a misleading missing OpenAI key when Cloudflare mode is active. +- Regression: generated object schemas and temperatures stay equivalent to current behavior. + +**Verification:** +- `rg "createOpenAI" packages/api/src` shows no remaining OpenAI direct runtime usage except intentionally excluded scripts/tests or direct fallback internals. +- Service tests prove the direct OpenAI SDK imports are no longer needed in migrated runtime files. + +--- + +### U4. Remove OpenAI-key hard requirements from shared-provider callers + +**Goal:** Update existing shared-provider call sites so OpenAI unified billing no longer fails before reaching the provider helper. + +**Requirements:** R1, R2, R4, R5, R6 + +**Dependencies:** U2 + +**Files:** +- Modify: `packages/api/src/services/embeddingService.ts` +- Modify: `packages/api/src/services/catalogService.ts` +- Modify: `packages/api/src/services/etl/processValidItemsBatch.ts` +- Modify: `packages/api/src/routes/chat.ts` +- Modify: `packages/api/src/routes/packs/index.ts` +- Modify: `packages/api/src/routes/catalog/index.ts` +- Modify: `packages/api/src/services/__tests__/embeddingService.test.ts` +- Modify: `packages/api/test/etl.test.ts` +- Modify or create: `packages/api/test/catalog.test.ts` +- Modify or create: `packages/api/test/packs.test.ts` + +**Approach:** +- Stop checking `OPENAI_API_KEY` before invoking embedding or chat provider helpers when Cloudflare unified billing is configured. +- Pass a normalized provider config or env-derived provider object rather than raw OpenAI key assumptions through embedding and route layers. +- Preserve direct OpenAI fallback checks inside the provider helper so missing-key errors remain clear when direct mode is selected. +- Add billing-path logging around high-value shared-provider entry points, especially chat and embedding generation. + +**Patterns to follow:** +- Existing embedding normalization and empty-input behavior in `packages/api/src/services/embeddingService.ts`. +- Existing route-level error handling in `packages/api/src/routes/packs/index.ts` and `packages/api/src/routes/catalog/index.ts`. +- Existing ETL embedding failure fallback logging in `packages/api/src/services/etl/processValidItemsBatch.ts`. + +**Test scenarios:** +- Covers AE1. Happy path: chat route can create a stream in Cloudflare billing mode without an OpenAI key. +- Covers AE3. Happy path: chat and embedding flows can use direct OpenAI mode locally when an OpenAI key is present. +- Happy path: catalog item creation and update can generate embeddings in Cloudflare billing mode without an OpenAI key. +- Happy path: pack item creation and update can generate embeddings in Cloudflare billing mode without an OpenAI key. +- Error path: direct mode without an OpenAI key returns or throws the existing clear service-unavailable style error. +- Regression: empty embedding inputs still return `null` or `[]` without creating a provider. +- Integration: ETL valid-item processing still falls back gracefully when embedding generation fails. + +**Verification:** +- No in-scope runtime route blocks unified billing solely because `OPENAI_API_KEY` is absent. +- Existing API tests continue to cover direct-mode behavior through test setup. + +--- + +### U5. Preserve non-OpenAI direct-provider exceptions + +**Goal:** Keep Google/Gemini pack-template analysis and Perplexity web search working exactly as direct-provider integrations, while making their exception status explicit. + +**Requirements:** R3, R7 + +**Dependencies:** U1 + +**Files:** +- Modify: `packages/api/src/routes/packTemplates/index.ts` +- Modify: `packages/api/src/services/aiService.ts` +- Modify or create: `packages/api/src/routes/packTemplates/__tests__/generateFromOnlineContent.test.ts` +- Modify or create: `packages/api/src/services/__tests__/aiService.test.ts` + +**Approach:** +- Avoid migrating Google/Gemini and Perplexity in this implementation pass. +- Add lightweight comments or logs only where useful to prevent future confusion that these direct-provider paths were accidentally skipped. +- Ensure env validation and tests still prove these providers require their direct keys. + +**Patterns to follow:** +- Existing `AIService.perplexitySearch` direct-provider pattern. +- Existing `packTemplates` Google/Gemini object generation path. + +**Test scenarios:** +- Covers AE2. Happy path: Google/Gemini template generation still uses the configured Google provider path. +- Happy path: Perplexity web search still uses the configured Perplexity provider path. +- Regression: OpenAI billing mode changes do not alter Google or Perplexity provider setup. +- Error path: missing Google or Perplexity keys continue to fail through the direct-provider configuration path, not the OpenAI billing mode. + +**Verification:** +- Non-OpenAI tests demonstrate that OpenAI unified billing configuration does not intercept or break Google/Gemini or Perplexity usage. + +--- + +### U6. Add operator documentation and rollout notes + +**Goal:** Document setup, coverage, fallback, spend controls, and troubleshooting for operators. + +**Requirements:** R5, R6, R7 + +**Dependencies:** U1, U2, U3, U4, U5 + +**Files:** +- Create or modify: `docs/runbooks/ai-gateway-unified-billing.md` +- Modify: `README.md` +- Modify: `packages/api/README.md` + +**Approach:** +- Document the production setup path: Cloudflare credits, spend limits, AI Gateway authentication token, gateway ID, and chosen billing mode. +- List covered OpenAI runtime features and direct-provider exceptions. +- Describe rollback to direct OpenAI mode and what secret is required for that fallback. +- Explain how to correlate PackRat logs with Cloudflare AI Gateway observability using the metadata available after implementation. +- Note that Gemini is a follow-up candidate because Google AI Studio is unified-billing supported, while Perplexity needs billing verification. + +**Patterns to follow:** +- Existing operational style in `docs/runbooks/etl-pipeline.md`. +- Existing setup guidance in `README.md` and `packages/api/README.md`. + +**Test scenarios:** +- Test expectation: none -- documentation-only unit. + +**Verification:** +- A developer or operator can identify which AI features are covered, which secrets are needed for each mode, and how to roll back without reading source code. + +--- + +## System-Wide Impact + +- **Interaction graph:** Shared OpenAI provider creation affects chat, object generation services, embeddings, catalog/vector flows, pack item routes, and ETL embedding jobs. +- **Error propagation:** Provider configuration errors should identify the billing mode so operators can distinguish Cloudflare token/gateway issues from direct OpenAI key issues. +- **State lifecycle risks:** Embedding generation failures already have fallback paths in ETL and some catalog flows; the migration must preserve those paths and avoid partial writes caused by earlier configuration checks. +- **API surface parity:** Public API response shapes and mobile/web client behavior should not change. +- **Integration coverage:** Unit tests can verify provider selection, but route/service integration tests are needed to prove existing flows no longer pre-block on `OPENAI_API_KEY`. +- **Unchanged invariants:** Model IDs, prompt text, schemas, embedding dimensions, database columns, and AI feature UX are intentionally unchanged. + +--- + +## Risks & Dependencies + +| Risk | Mitigation | +|------|------------| +| Cloudflare AI Gateway provider wrapper does not support one PackRat call shape, especially embeddings or object generation | Verify model creation against each AI SDK function during U2/U4; if a call shape is unsupported, use the closest Cloudflare-documented OpenAI-compatible provider path for that specific shape while preserving the shared helper boundary | +| Unified billing model IDs differ from current OpenAI provider-native IDs | Confirm exact chat and embedding model IDs during implementation and keep mapping localized to the provider helper | +| Env validation accidentally weakens direct-provider failures | Add explicit tests for both Cloudflare mode and direct mode, including missing-secret cases | +| Production loses the emergency OpenAI rollback path | Require direct mode to remain supported and document the rollback variable/secret set in U6 | +| Observability promises exceed what the AI SDK exposes | Log billing path, provider, model, and gateway ID unconditionally; add Cloudflare request correlation only when available | +| Google/Gemini support through unified billing tempts scope creep | Keep Gemini in documentation as follow-up work, not active implementation | + +--- + +## Documentation Plan + +- Add an AI Gateway unified billing runbook under `docs/runbooks/`. +- Update setup docs to describe the new Cloudflare token and direct OpenAI fallback. +- Include a provider coverage table: OpenAI covered, Google/Gemini deferred, Perplexity direct pending verification, Workers AI billed separately. + +--- + +## Operational / Rollout Notes + +- Configure Cloudflare AI Gateway credits, spend limits, and gateway authentication before production cutover. +- Roll out in a non-production environment first with direct OpenAI key intentionally absent to prove unified billing is not accidentally depending on it. +- Keep the direct OpenAI key available only for rollback environments or direct billing mode. +- During initial rollout, monitor Cloudflare AI Gateway logs and PackRat structured logs for matching provider/model/billing-path metadata. + +--- + +## Sources & References + +- Origin requirements: `docs/brainstorms/2026-05-23-cf-gateway-unified-billing-openai-requirements.md` +- Cloudflare Unified Billing: +- Cloudflare Vercel AI SDK integration: +- Cloudflare supported models: diff --git a/docs/runbooks/ai-gateway-unified-billing.md b/docs/runbooks/ai-gateway-unified-billing.md new file mode 100644 index 0000000000..204f450f44 --- /dev/null +++ b/docs/runbooks/ai-gateway-unified-billing.md @@ -0,0 +1,79 @@ +# Cloudflare AI Gateway Unified Billing + +PackRat prefers Cloudflare AI Gateway Unified Billing for OpenAI-backed and Google AI Studio-backed runtime AI calls when the Cloudflare configuration is complete. Provider keys are still required in the environment so direct fallback and rollback are always available. + +## Configuration + +Unified billing is active when all of these values are present: + +- `CLOUDFLARE_ACCOUNT_ID` +- `CLOUDFLARE_AI_GATEWAY_ID` +- `CLOUDFLARE_API_TOKEN` + +Direct provider fallback is active when the Cloudflare unified billing configuration is incomplete. `OPENAI_API_KEY` must be present and start with `sk-`, `GOOGLE_GENERATIVE_AI_API_KEY` must be present for Gemini-backed pack-template generation, and `PERPLEXITY_API_KEY` must be present for Perplexity search. + +There is intentionally no separate billing-mode environment variable. Complete Cloudflare configuration wins; otherwise the runtime uses direct OpenAI. + +For local development, put these values in the root `.env.local` and regenerate `packages/api/.dev.vars` with `bun install` or `bun run env`. + +For production, store `CLOUDFLARE_API_TOKEN` and any direct-provider fallback keys as Cloudflare Worker secrets. Keep `CLOUDFLARE_ACCOUNT_ID` and `CLOUDFLARE_AI_GATEWAY_ID` aligned with the AI Gateway configured in the Cloudflare dashboard. + +## Operational Setup + +Before production cutover: + +1. Load Cloudflare AI Gateway credits. +2. Configure spend limits on the AI Gateway. +3. Enable authenticated gateway access and provision `CLOUDFLARE_API_TOKEN`. +4. Deploy with `CLOUDFLARE_ACCOUNT_ID`, `CLOUDFLARE_AI_GATEWAY_ID`, and `CLOUDFLARE_API_TOKEN`. +5. Keep direct provider keys configured as emergency fallback even when Cloudflare is the active path. + +Cloudflare Unified Billing applies to third-party provider models. Workers AI models remain billed through Workers AI pricing. + +## Covered Runtime Paths + +The shared OpenAI provider path is used for: + +- Chat route streaming. +- Catalog embeddings and vector search helpers. +- Pack item embedding generation. +- ETL embedding generation. +- AI-generated pack concepts. +- Image gear detection. +- Wildlife identification. +- Season suggestions. +- Gemini pack-template generation. + +The active billing path is selected in `packages/api/src/utils/ai/provider.ts`. Environment validation is in `packages/api/src/utils/env-validation.ts`. + +## Observability + +Provider logs can include: + +- `billingPath` +- `provider` +- `model` +- `cloudflareGatewayId` when unified billing is active +- `cloudflareLogId` when a Cloudflare AI Gateway response header is available + +`billingPath` values are: + +- `cloudflare-unified` for Cloudflare AI Gateway Unified Billing. +- `cloudflare-gateway-byok` for Cloudflare AI Gateway routing with provider-key billing. +- `direct-provider` for direct provider fallback. + +Use `billingPath` first when triaging AI failures. A `cloudflare-unified` failure points to Cloudflare credits, spend limits, gateway authentication, gateway ID, or model availability. A `cloudflare-gateway-byok` failure points to gateway routing or provider-key authentication through Cloudflare. A `direct-provider` failure points to direct provider auth, quota, or provider-side availability. + +## Provider Scope + +OpenAI and Google AI Studio are migrated in this pass. + +Gemini/Google pack-template generation uses Cloudflare AI Gateway Unified Billing when Cloudflare config is complete, with direct Google AI Studio fallback when it is not. + +Perplexity is routed through Cloudflare AI Gateway when the Cloudflare account and gateway ID are configured, but it remains BYOK/direct-provider billing because Cloudflare's Perplexity provider docs require an active Perplexity API token and Perplexity was not listed in the unified-billing HTTP API provider set verified during this implementation. If Cloudflare gateway config is absent, PackRat calls Perplexity directly with `PERPLEXITY_API_KEY`. + +## References + +- Cloudflare Unified Billing: https://developers.cloudflare.com/ai-gateway/features/unified-billing/ +- Cloudflare Vercel AI SDK integration: https://developers.cloudflare.com/ai-gateway/integrations/vercel-ai-sdk/ +- Cloudflare supported models: https://developers.cloudflare.com/ai-gateway/supported-models/ diff --git a/lefthook.yml b/lefthook.yml index 97c1d3aa56..02dc451700 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -23,5 +23,6 @@ pre-push: bun scripts/lint/no-duplicate-guards.ts && bun scripts/lint/no-unauth-routes.ts && bun scripts/format/sort-package-json.ts --check && + bun run --cwd packages/checks check:route-schemas:strict && bun check:casts:strict fail_text: "Pre-push checks failed! Run `bun check:all` for the full picture." diff --git a/package.json b/package.json index 662f027afc..8e210ca4a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "packrat-monorepo", - "version": "2.0.25", + "version": "2.0.26", "workspaces": [ "apps/*", "packages/*" @@ -34,7 +34,7 @@ "ios": "cd apps/expo && bun ios", "lefthook": "lefthook install", "lint": "biome check --write", - "lint:custom": "bun run scripts/lint/no-raw-typeof.ts && bun run scripts/lint/no-raw-regex.ts && bun run packages/env/scripts/no-raw-process-env.ts && bun run scripts/lint/no-duplicate-guards.ts && bun run scripts/lint/no-unauth-routes.ts", + "lint:custom": "bun run scripts/lint/no-raw-typeof.ts && bun run scripts/lint/no-raw-regex.ts && bun run scripts/lint/no-owned-max-params.ts && bun run packages/env/scripts/no-raw-process-env.ts && bun run scripts/lint/no-duplicate-guards.ts && bun run scripts/lint/no-unauth-routes.ts && bun run scripts/lint/check-drizzle-migrations.ts", "lint:strict": "biome check && bun run lint:custom", "lint-unsafe": "biome check --write --unsafe", "mcp": "bun run --cwd packages/mcp dev", @@ -45,6 +45,8 @@ "test:e2e:ios": "bash .github/scripts/e2e.sh ios", "test:expo": "vitest run --config apps/expo/vitest.config.ts", "test:expo:rpc-types": "vitest run --config apps/expo/vitest.types.config.ts", + "test:guides": "vitest run --config apps/guides/vitest.config.ts", + "test:landing": "vitest run --config apps/landing/vitest.config.ts", "test:mcp": "bun run --cwd packages/mcp test", "trails": "bun run --cwd apps/trails dev", "web": "bun run --cwd apps/web dev" @@ -68,18 +70,24 @@ "semver": "catalog:", "sort-package-json": "^3.6.1" }, - "packageManager": "bun@1.3.10", + "packageManager": "bun@1.3.14", "engines": { - "bun": ">=1.3.10", - "node": ">=24.0.0" + "bun": ">=1.3.14", + "node": "^24.0.0" }, "catalog": { + "@ai-sdk/openai": "^3.0.53", + "@cloudflare/workers-types": "^4.20250405.0", + "@duckdb/node-api": "1.5.0-r.1", "@elysiajs/cors": "^1.2.0", "@elysiajs/eden": "^1.2.0", "@elysiajs/openapi": "^1.2.0", "@hono/sentry": "^1.2.2", "@hono/zod-openapi": "^1.3.0", "@hono/zod-validator": "^0.7.6", + "@hookform/resolvers": "^5.2.2", + "@lhci/cli": "^0.14.0", + "@neondatabase/serverless": "^1.0.0", "@radix-ui/react-accordion": "^1.2.11", "@radix-ui/react-alert-dialog": "^1.1.14", "@radix-ui/react-aspect-ratio": "^1.1.7", @@ -107,18 +115,60 @@ "@radix-ui/react-toggle": "^1.1.9", "@radix-ui/react-toggle-group": "^1.1.10", "@radix-ui/react-tooltip": "^1.2.7", + "@tanstack/react-query": "^5.70.0", + "@tanstack/react-query-devtools": "^5.70.0", + "@types/bun": "latest", + "@types/leaflet": "^1.9.21", + "@types/node": "^25.6.0", + "@types/react": "~19.2.10", + "@types/react-dom": "^19.1.6", + "@vitest/coverage-v8": "~3.1.4", "ai": "^6.0.168", + "autoprefixer": "^10.4.21", + "better-auth": "^1.6.9", "chalk": "^5.6.2", + "class-variance-authority": "^0.7.1", + "clsx": "^2.1.1", + "cmdk": "1.1.1", + "consola": "^3.4.2", + "date-fns": "^4.1.0", + "drizzle-kit": "^0.31.10", + "drizzle-orm": "^0.45.2", + "drizzle-zod": "^0.8.3", "elysia": "^1.4.0", + "embla-carousel-react": "8.6.0", + "google-auth-library": "^10.1.0", + "gray-matter": "^4.0.3", "hono": "^4.10.7", + "input-otp": "1.4.1", + "jotai": "^2.12.2", + "leaflet": "^1.9.4", + "lucide-react": "^1.8.0", "magic-regexp": "^0.11.0", + "next": "^15.3.4", + "next-themes": "^0.4.6", + "pg": "^8.16.3", + "postcss": "^8.5.6", + "postcss-import": "^16.1.1", "radash": "^12.1.1", "react": "19.2.6", + "react-day-picker": "9.14.0", "react-dom": "19.2.6", + "react-hook-form": "^7.58.1", + "react-leaflet": "^5.0.0", + "react-resizable-panels": "^4.10.0", + "recharts": "3.8.1", "semver": "^7.7.4", + "sonner": "^2.0.7", + "tailwind-merge": "^3.5.0", "tailwindcss": "^3.4.17", + "tailwindcss-animate": "^1.0.7", "ts-extras": "^1.0.0", "typescript": "~5.9.2", + "vaul": "^1.1.2", + "vitest": "~3.1.4", + "wrangler": "^4.21.2", + "ws": "^8.18.1", "zod": "^3.24.2" }, "patchedDependencies": {}, diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 287442dc11..65ec68b0d9 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/analytics", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "scripts": { @@ -9,16 +9,16 @@ "test:watch": "vitest watch" }, "dependencies": { - "@duckdb/node-api": "1.5.0-r.1", + "@duckdb/node-api": "catalog:", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", - "consola": "^3.4.2", + "consola": "catalog:", "magic-regexp": "catalog:", "radash": "catalog:", "zod": "catalog:" }, "devDependencies": { - "@types/bun": "latest", - "vitest": "~3.1.4" + "@types/bun": "catalog:", + "vitest": "catalog:" } } diff --git a/packages/analytics/src/core/cache-metadata.ts b/packages/analytics/src/core/cache-metadata.ts index d1a98f23a0..c71a8c0eec 100644 --- a/packages/analytics/src/core/cache-metadata.ts +++ b/packages/analytics/src/core/cache-metadata.ts @@ -44,7 +44,13 @@ export function loadMetadata(cacheDir: string): CacheMetadataFile | null { return result.success ? result.data : null; } -export function saveMetadata(cacheDir: string, data: CacheMetadataFile): void { +export function saveMetadata({ + cacheDir, + data, +}: { + cacheDir: string; + data: CacheMetadataFile; +}): void { const validated = MetadataSchema.parse(data); writeFileSync(metadataPath(cacheDir), JSON.stringify(validated, null, 2)); } diff --git a/packages/analytics/src/core/enrichment.ts b/packages/analytics/src/core/enrichment.ts index b92c1e3a9d..61e46d0685 100644 --- a/packages/analytics/src/core/enrichment.ts +++ b/packages/analytics/src/core/enrichment.ts @@ -153,10 +153,16 @@ const REVIEWS_TABLE = 'product_reviews'; const ENTITIES_TABLE = 'product_entities'; export class Enrichment { - constructor( - private readonly conn: DuckDBConnection, - private readonly sourceTable = 'gear_data', - ) {} + private readonly conn: DuckDBConnection; + private readonly sourceTable: string; + + constructor({ + conn, + sourceTable = 'gear_data', + }: { conn: DuckDBConnection; sourceTable?: string }) { + this.conn = conn; + this.sourceTable = sourceTable; + } private async hasEntities(): Promise { try { @@ -260,7 +266,13 @@ export class Enrichment { } /** Get images for a product by keyword. */ - async getProductImages(query: string, limit = 20): Promise { + async getProductImages({ + query, + limit = 20, + }: { + query: string; + limit?: number; + }): Promise { try { await this.conn.runAndReadAll(`SELECT 1 FROM ${IMAGES_TABLE} LIMIT 1`); } catch { @@ -289,7 +301,13 @@ export class Enrichment { } /** Get review aggregation with weighted average for a product. */ - async getProductReviews(query: string, limit = 20): Promise { + async getProductReviews({ + query, + limit = 20, + }: { + query: string; + limit?: number; + }): Promise { try { await this.conn.runAndReadAll(`SELECT 1 FROM ${REVIEWS_TABLE} LIMIT 1`); } catch { diff --git a/packages/analytics/src/core/entity-resolver.ts b/packages/analytics/src/core/entity-resolver.ts index 6f755c2a8d..b69850ce69 100644 --- a/packages/analytics/src/core/entity-resolver.ts +++ b/packages/analytics/src/core/entity-resolver.ts @@ -47,7 +47,7 @@ function normalizeBrand(brand: string): string { return brand.toLowerCase().replace(NON_ALPHANUMERIC, '').trim(); } -function canonicalId(brand: string, name: string): string { +function canonicalId({ brand, name }: { brand: string; name: string }): string { const key = `${normalizeBrand(brand)}:${normalizeName(name)}`; return createHash('sha256').update(key).digest('hex').slice(0, 16); } @@ -65,7 +65,7 @@ function extractSlug(url: string): string { * Sorts tokens alphabetically then computes char-level similarity. * Good enough for product name matching without a heavy dep. */ -function tokenSortRatio(a: string, b: string): number { +function tokenSortRatio({ a, b }: { a: string; b: string }): number { const sortTokens = (s: string) => s.toLowerCase().split(WHITESPACE_SPLIT_PATTERN).sort().join(' '); const sa = sortTokens(a); @@ -76,11 +76,11 @@ function tokenSortRatio(a: string, b: string): number { // Levenshtein-based ratio const len = Math.max(sa.length, sb.length); - const dist = levenshtein(sa, sb); + const dist = levenshtein({ a: sa, b: sb }); return Math.round(((len - dist) / len) * 100); } -function levenshtein(a: string, b: string): number { +function levenshtein({ a, b }: { a: string; b: string }): number { const m = a.length; const n = b.length; const dp: number[][] = Array.from({ length: m + 1 }, () => Array(n + 1).fill(0)); @@ -141,7 +141,7 @@ class UnionFind { return root; } - union(a: number, b: number): void { + union({ a, b }: { a: number; b: number }): void { const ra = this.find(a); const rb = this.find(b); if (ra !== rb) this.parent.set(rb, ra); @@ -191,10 +191,15 @@ interface EntityRow { const ENTITIES_TABLE = 'product_entities'; export class EntityResolver { - constructor( - private readonly conn: DuckDBConnection, - private readonly sourceTable = 'gear_data', - ) {} + constructor({ + conn, + sourceTable = 'gear_data', + }: { conn: DuckDBConnection; sourceTable?: string }) { + this.conn = conn; + this.sourceTable = sourceTable; + } + private readonly conn: DuckDBConnection; + private readonly sourceTable: string; /** Run full entity resolution pipeline. */ async build( @@ -206,10 +211,10 @@ export class EntityResolver { for (const block of blocks.values()) { if (block.length > MAX_BLOCK_SIZE) continue; - matches.push(...this.matchWithinBlock(block, minConfidence)); + matches.push(...this.matchWithinBlock({ block, minConfidence })); } - const entities = this.buildEntities(candidates, matches); + const entities = this.buildEntities({ candidates, matches }); await this.writeEntities(entities); const uniqueEntities = new Set(entities.map((e) => e.canonical_id)).size; @@ -258,10 +263,13 @@ export class EntityResolver { return blocks; } - private matchWithinBlock( - block: Candidate[], - minConfidence: number, - ): [number, number, number, string][] { + private matchWithinBlock({ + block, + minConfidence, + }: { + block: Candidate[]; + minConfidence: number; + }): [number, number, number, string][] { const matches: [number, number, number, string][] = []; for (let i = 0; i < block.length; i++) { @@ -281,14 +289,14 @@ export class EntityResolver { } // Token-sort fuzzy - const nameScore = tokenSortRatio(a.normalized_name, b.normalized_name); + const nameScore = tokenSortRatio({ a: a.normalized_name, b: b.normalized_name }); let confidence = nameScore / 100; // URL slug boost const slugA = extractSlug(a.product_url); const slugB = extractSlug(b.product_url); if (slugA && slugB && slugA.length > 5) { - const slugScore = tokenSortRatio(slugA, slugB); + const slugScore = tokenSortRatio({ a: slugA, b: slugB }); if (slugScore > 70) { confidence = confidence * 0.1 + (slugScore / 100) * 0.9; } @@ -309,10 +317,13 @@ export class EntityResolver { return matches; } - private buildEntities( - candidates: Candidate[], - matches: [number, number, number, string][], - ): EntityRow[] { + private buildEntities({ + candidates, + matches, + }: { + candidates: Candidate[]; + matches: [number, number, number, string][]; + }): EntityRow[] { const uf = new UnionFind(); const matchMap = new Map(); @@ -321,7 +332,7 @@ export class EntityResolver { // Union matched pairs for (const [a, b, confidence, method] of matches) { - uf.union(a, b); + uf.union({ a, b }); // Track highest confidence per candidate const existing = matchMap.get(a); if (!existing || confidence > existing.confidence) matchMap.set(a, { confidence, method }); @@ -336,7 +347,7 @@ export class EntityResolver { for (const [root, members] of groups) { const rootCandidate = candidates[root]; assertDefined(rootCandidate); - const cid = canonicalId(rootCandidate.brand, rootCandidate.name); + const cid = canonicalId({ brand: rootCandidate.brand, name: rootCandidate.name }); for (const idx of members) { const c = candidates[idx]; @@ -396,7 +407,13 @@ export class EntityResolver { } /** Find all retailer listings for a product. */ - async identifyProduct(query: string, limit = 20): Promise { + async identifyProduct({ + query, + limit = 20, + }: { + query: string; + limit?: number; + }): Promise { const kw = SQLFragments.escapeSql(query.toLowerCase()); const result = await this.conn.runAndReadAll(` SELECT * FROM ${ENTITIES_TABLE} diff --git a/packages/analytics/src/core/local-cache.ts b/packages/analytics/src/core/local-cache.ts index dcd9ffad2b..0188c583bf 100644 --- a/packages/analytics/src/core/local-cache.ts +++ b/packages/analytics/src/core/local-cache.ts @@ -129,13 +129,16 @@ export class LocalCacheManager { const sites = sitesResult.getRows().map((r) => String(r[0])); const now = new Date().toISOString(); - saveMetadata(this.cacheDir, { - version: DBConfig.CACHE_VERSION, - schema_version: DBConfig.SCHEMA_VERSION, - created_at: this.metadata?.created_at ?? now, - updated_at: now, - record_count: recordCount, - sites, + saveMetadata({ + cacheDir: this.cacheDir, + data: { + version: DBConfig.CACHE_VERSION, + schema_version: DBConfig.SCHEMA_VERSION, + created_at: this.metadata?.created_at ?? now, + updated_at: now, + record_count: recordCount, + sites, + }, }); this.metadata = loadMetadata(this.cacheDir); } @@ -168,10 +171,13 @@ export class LocalCacheManager { // ── Search ────────────────────────────────────────────────────────── - async search( - keyword: string, - options: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number } = {}, - ): Promise { + async search({ + keyword, + options = {}, + }: { + keyword: string; + options?: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number }; + }): Promise { const { sites, minPrice, maxPrice, limit = DBConfig.DEFAULT_LIMIT } = options; const kw = SQLFragments.escapeSql(keyword.toLowerCase()); @@ -195,7 +201,13 @@ export class LocalCacheManager { // ── Price Comparison ──────────────────────────────────────────────── - async comparePrices(keyword: string, sites?: string[]): Promise { + async comparePrices({ + keyword, + sites, + }: { + keyword: string; + sites?: string[]; + }): Promise { const kw = SQLFragments.escapeSql(keyword.toLowerCase()); const conditions = [`(LOWER(name) LIKE '%${kw}%' OR LOWER(brand) LIKE '%${kw}%')`]; @@ -220,7 +232,13 @@ export class LocalCacheManager { // ── Brand Analysis ────────────────────────────────────────────────── - async analyzeBrand(brandName: string, sites?: string[]): Promise { + async analyzeBrand({ + brandName, + sites, + }: { + brandName: string; + sites?: string[]; + }): Promise { const brand = SQLFragments.escapeSql(brandName.toLowerCase()); const conditions = [`LOWER(brand) LIKE '%${brand}%'`]; @@ -246,7 +264,13 @@ export class LocalCacheManager { // ── Category Insights ─────────────────────────────────────────────── - async categoryInsights(categoryKeyword: string, sites?: string[]): Promise { + async categoryInsights({ + categoryKeyword, + sites, + }: { + categoryKeyword: string; + sites?: string[]; + }): Promise { const cat = SQLFragments.escapeSql(categoryKeyword.toLowerCase()); const conditions = [`LOWER(category) LIKE '%${cat}%'`]; @@ -272,10 +296,13 @@ export class LocalCacheManager { // ── Deals ─────────────────────────────────────────────────────────── - async findDeals( - maxPrice: number, - options: { category?: string; sites?: string[]; limit?: number } = {}, - ): Promise { + async findDeals({ + maxPrice, + options = {}, + }: { + maxPrice: number; + options?: { category?: string; sites?: string[]; limit?: number }; + }): Promise { const { category, sites, limit = DBConfig.DEFAULT_LIMIT } = options; const conditions = [`price <= ${maxPrice}`, `price > 0`]; @@ -296,10 +323,13 @@ export class LocalCacheManager { // ── Trends ────────────────────────────────────────────────────────── - async searchTrends( - keyword: string, - options: { site?: string; days?: number; limit?: number } = {}, - ): Promise { + async searchTrends({ + keyword, + options = {}, + }: { + keyword: string; + options?: { site?: string; days?: number; limit?: number }; + }): Promise { const { site, days = 90 } = options; const kw = SQLFragments.escapeSql(keyword.toLowerCase()); @@ -350,10 +380,13 @@ export class LocalCacheManager { // ── Top Brands ────────────────────────────────────────────────────── - async getTopBrands( + async getTopBrands({ limit = 20, - site?: string, - ): Promise<{ brand: string; product_count: number; avg_price: number }[]> { + site, + }: { + limit?: number; + site?: string; + } = {}): Promise<{ brand: string; product_count: number; avg_price: number }[]> { const conditions = ["brand != 'Unknown'"]; if (site) conditions.push(`site = '${SQLFragments.escapeSql(site)}'`); diff --git a/packages/analytics/src/core/query-builder.ts b/packages/analytics/src/core/query-builder.ts index 654197e44b..42be6aa994 100644 --- a/packages/analytics/src/core/query-builder.ts +++ b/packages/analytics/src/core/query-builder.ts @@ -35,7 +35,7 @@ export class SQLFragments { * NULLIF(TRIM(TRY_CAST(heading AS VARCHAR)), ''), * 'Unknown') as name */ - static safeCoalesce(field: string, defaultValue?: string): string { + static safeCoalesce({ field, defaultValue }: { field: string; defaultValue?: string }): string { const variations = FIELD_MAPPINGS[field] ?? [field]; let dflt: string; if (defaultValue !== undefined) { @@ -78,10 +78,13 @@ export class SQLFragments { } /** Safe float extraction from FIELD_MAPPINGS with optional range check. */ - static safeFloat( - field: string, - opts: { alias?: string; minVal?: number; maxVal?: number } = {}, - ): string { + static safeFloat({ + field, + opts = {}, + }: { + field: string; + opts?: { alias?: string; minVal?: number; maxVal?: number }; + }): string { const { alias, minVal, maxVal } = opts; const a = alias ?? field; const variations = FIELD_MAPPINGS[field] ?? [field]; @@ -111,7 +114,7 @@ export class SQLFragments { } /** Safe integer extraction from FIELD_MAPPINGS. */ - static safeInt(field: string, alias?: string): string { + static safeInt({ field, alias }: { field: string; alias?: string }): string { const a = alias ?? field; const variations = FIELD_MAPPINGS[field] ?? [field]; @@ -149,7 +152,13 @@ export class SQLFragments { } /** Standard read_csv_auto clause reading from multiple version prefixes. */ - static readCsvSource(bucketPath: string, globPatterns?: string[]): string { + static readCsvSource({ + bucketPath, + globPatterns, + }: { + bucketPath: string; + globPatterns?: string[]; + }): string { const globs = globPatterns ?? R2_CSV_GLOBS; const paths = globs.map((g) => `'${bucketPath}/${g}'`); const pathList = `[${paths.join(', ')}]`; @@ -165,26 +174,29 @@ export class SQLFragments { static selectFields(): string[] { return [ SQLFragments.siteExtract(), - SQLFragments.safeCoalesce('name'), - SQLFragments.safeCoalesce('brand'), - SQLFragments.safeCoalesce('category'), + SQLFragments.safeCoalesce({ field: 'name' }), + SQLFragments.safeCoalesce({ field: 'brand' }), + SQLFragments.safeCoalesce({ field: 'category' }), SQLFragments.safePrice(), SQLFragments.safeAvailability(), - SQLFragments.safeCoalesce('description'), - SQLFragments.safeCoalesce('product_url'), - SQLFragments.safeCoalesce('image_url'), + SQLFragments.safeCoalesce({ field: 'description' }), + SQLFragments.safeCoalesce({ field: 'product_url' }), + SQLFragments.safeCoalesce({ field: 'image_url' }), // V2 fields - SQLFragments.safeFloat('compare_at_price', { minVal: 0, maxVal: DBConfig.MAX_VALID_PRICE }), - SQLFragments.safeFloat('rating_value', { minVal: 0, maxVal: 5 }), - SQLFragments.safeInt('review_count'), - SQLFragments.safeFloat('weight', { minVal: -1 }), - SQLFragments.safeCoalesce('weight_unit', "''"), - SQLFragments.safeCoalesce('color'), - SQLFragments.safeCoalesce('size'), - SQLFragments.safeCoalesce('material'), - SQLFragments.safeCoalesce('tags'), - SQLFragments.safeCoalesce('published_at'), - SQLFragments.safeCoalesce('updated_at'), + SQLFragments.safeFloat({ + field: 'compare_at_price', + opts: { minVal: 0, maxVal: DBConfig.MAX_VALID_PRICE }, + }), + SQLFragments.safeFloat({ field: 'rating_value', opts: { minVal: 0, maxVal: 5 } }), + SQLFragments.safeInt({ field: 'review_count' }), + SQLFragments.safeFloat({ field: 'weight', opts: { minVal: -1 } }), + SQLFragments.safeCoalesce({ field: 'weight_unit', defaultValue: "''" }), + SQLFragments.safeCoalesce({ field: 'color' }), + SQLFragments.safeCoalesce({ field: 'size' }), + SQLFragments.safeCoalesce({ field: 'material' }), + SQLFragments.safeCoalesce({ field: 'tags' }), + SQLFragments.safeCoalesce({ field: 'published_at' }), + SQLFragments.safeCoalesce({ field: 'updated_at' }), ]; } @@ -226,7 +238,13 @@ export class SQLFragments { } /** WHERE clauses for price range filtering. */ - static priceRangeFilter(minPrice?: number, maxPrice?: number): string[] { + static priceRangeFilter({ + minPrice, + maxPrice, + }: { + minPrice?: number; + maxPrice?: number; + }): string[] { const conditions: string[] = []; if (minPrice !== undefined) { conditions.push(`( @@ -257,19 +275,22 @@ export class QueryBuilder { return conditions.filter(Boolean).join(' AND '); } - searchQuery( - keyword: string, - opts: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number } = {}, - ): string { + searchQuery({ + keyword, + opts = {}, + }: { + keyword: string; + opts?: { sites?: string[]; minPrice?: number; maxPrice?: number; limit?: number }; + }): string { const { sites, minPrice, maxPrice, limit = DBConfig.DEFAULT_LIMIT } = opts; const select = SQLFragments.selectFields().join(',\n '); - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const conditions: (string | null)[] = [ ...SQLFragments.baseWhere(), SQLFragments.keywordFilter(keyword), sites ? SQLFragments.siteFilter(sites) : null, - ...SQLFragments.priceRangeFilter(minPrice, maxPrice), + ...SQLFragments.priceRangeFilter({ minPrice, maxPrice }), ]; return ` @@ -281,9 +302,9 @@ export class QueryBuilder { `; } - priceComparisonQuery(keyword: string, sites?: string[]): string { + priceComparisonQuery({ keyword, sites }: { keyword: string; sites?: string[] }): string { const select = SQLFragments.selectFields().join(',\n '); - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const conditions: (string | null)[] = [ ...SQLFragments.baseWhere(), @@ -310,9 +331,9 @@ export class QueryBuilder { `; } - brandAnalysisQuery(brandName: string, sites?: string[]): string { + brandAnalysisQuery({ brandName, sites }: { brandName: string; sites?: string[] }): string { const select = SQLFragments.selectFields().join(',\n '); - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const conditions: (string | null)[] = [...SQLFragments.baseWhere()]; const brandVariations = FIELD_MAPPINGS.brand ?? ['brand']; @@ -342,9 +363,15 @@ export class QueryBuilder { `; } - categoryInsightsQuery(categoryKeyword: string, sites?: string[]): string { + categoryInsightsQuery({ + categoryKeyword, + sites, + }: { + categoryKeyword: string; + sites?: string[]; + }): string { const select = SQLFragments.selectFields().join(',\n '); - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const conditions: (string | null)[] = [...SQLFragments.baseWhere()]; const catVariations = FIELD_MAPPINGS.category ?? ['category']; @@ -374,17 +401,20 @@ export class QueryBuilder { `; } - dealsQuery( - maxPrice: number, - opts: { category?: string; sites?: string[]; limit?: number } = {}, - ): string { + dealsQuery({ + maxPrice, + opts = {}, + }: { + maxPrice: number; + opts?: { category?: string; sites?: string[]; limit?: number }; + }): string { const { category, sites, limit = DBConfig.DEFAULT_LIMIT } = opts; const select = SQLFragments.selectFields().join(',\n '); - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const conditions: (string | null)[] = [ ...SQLFragments.baseWhere(), - ...SQLFragments.priceRangeFilter(undefined, maxPrice), + ...SQLFragments.priceRangeFilter({ maxPrice }), ]; if (category) { const escapedCategory = SQLFragments.escapeSql(category.toLowerCase()); @@ -401,9 +431,15 @@ export class QueryBuilder { `; } - trendsQuery(keyword: string, opts: { sites?: string[]; days?: number } = {}): string { + trendsQuery({ + keyword, + opts = {}, + }: { + keyword: string; + opts?: { sites?: string[]; days?: number }; + }): string { const { sites, days = 90 } = opts; - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const kw = SQLFragments.escapeSql(keyword.toLowerCase()); const nameVariations = FIELD_MAPPINGS.name ?? ['name']; @@ -454,7 +490,7 @@ export class QueryBuilder { /** Build a SELECT query for normalized gear data (no CREATE TABLE). */ normalizedSelectQuery(): string { const select = SQLFragments.selectFields().join(',\n '); - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const conditions = SQLFragments.baseWhere(); return ` @@ -474,7 +510,7 @@ export class QueryBuilder { /** Build CREATE TABLE AS SELECT for price history cache. */ createPriceHistoryTable(tableName = 'price_history'): string { - const source = SQLFragments.readCsvSource(this.bucketPath); + const source = SQLFragments.readCsvSource({ bucketPath: this.bucketPath }); const maxP = DBConfig.MAX_VALID_PRICE; const nameVariations = FIELD_MAPPINGS.name ?? ['name']; diff --git a/packages/analytics/src/core/spec-parser.ts b/packages/analytics/src/core/spec-parser.ts index 6c60839368..d8d512ea00 100644 --- a/packages/analytics/src/core/spec-parser.ts +++ b/packages/analytics/src/core/spec-parser.ts @@ -80,12 +80,12 @@ const FABRIC_PATTERNS = [ // ── Unit Conversion ─────────────────────────────────────────────────── -function toGrams(value: number, unit: string): number | null { +function toGrams({ value, unit }: { value: number; unit: string }): number | null { const factor = WEIGHT_CONVERSIONS[unit.toLowerCase()]; return factor ? Math.round(value * factor * 100) / 100 : null; } -function toFahrenheit(value: number, unit: string): number { +function toFahrenheit({ value, unit }: { value: number; unit: string }): number { if (unit.toUpperCase() === 'C') return Math.round((value * 9) / 5 + 32); return value; } @@ -103,7 +103,7 @@ export function parseWeightGrams(text: string): number | null { const simple = WEIGHT_SIMPLE.exec(text); if (simple?.[1] !== undefined && simple[2] !== undefined) { - return toGrams(Number.parseFloat(simple[1]), simple[2]); + return toGrams({ value: Number.parseFloat(simple[1]), unit: simple[2] }); } return null; } @@ -118,12 +118,12 @@ export function parseTempRatingF(text: string): number | null { const range = TEMP_RANGE.exec(text); if (range?.[1] !== undefined && range[2] !== undefined && range[3] !== undefined) { const lower = Math.min(Number.parseInt(range[1], 10), Number.parseInt(range[2], 10)); - return toFahrenheit(lower, range[3]); + return toFahrenheit({ value: lower, unit: range[3] }); } const single = TEMP_SINGLE.exec(text); if (single?.[1] !== undefined && single[2] !== undefined) { - return toFahrenheit(Number.parseInt(single[1], 10), single[2]); + return toFahrenheit({ value: Number.parseInt(single[1], 10), unit: single[2] }); } return null; } @@ -215,10 +215,15 @@ export function extractSpecsFromRow(row: ProductRow): ProductSpecs { const SPECS_TABLE = 'parsed_specs'; export class SpecParser { - constructor( - private readonly conn: DuckDBConnection, - private readonly sourceTable = 'gear_data', - ) {} + constructor({ + conn, + sourceTable = 'gear_data', + }: { conn: DuckDBConnection; sourceTable?: string }) { + this.conn = conn; + this.sourceTable = sourceTable; + } + private readonly conn: DuckDBConnection; + private readonly sourceTable: string; /** Parse all products and store results in DuckDB. */ async build(batchSize = 10_000): Promise<{ total: number; parsed: number }> { @@ -287,7 +292,13 @@ export class SpecParser { } /** Search products by name/brand and return parsed specs. */ - async getProductSpecs(query: string, limit = 10): Promise { + async getProductSpecs({ + query, + limit = 10, + }: { + query: string; + limit?: number; + }): Promise { const kw = SQLFragments.escapeSql(query.toLowerCase()); const result = await this.conn.runAndReadAll(` SELECT * FROM ${SPECS_TABLE} diff --git a/packages/analytics/test/core/cache-metadata.test.ts b/packages/analytics/test/core/cache-metadata.test.ts index f8b9a540b1..c5c9fe97df 100644 --- a/packages/analytics/test/core/cache-metadata.test.ts +++ b/packages/analytics/test/core/cache-metadata.test.ts @@ -35,7 +35,7 @@ describe('cache metadata', () => { sites: ['rei', 'backcountry'], }; - saveMetadata(TEST_DIR, data); + saveMetadata({ cacheDir: TEST_DIR, data }); expect(loadMetadata(TEST_DIR)).toEqual(data); }); diff --git a/packages/analytics/test/core/query-builder.test.ts b/packages/analytics/test/core/query-builder.test.ts index 96bca2b44e..6edfdad997 100644 --- a/packages/analytics/test/core/query-builder.test.ts +++ b/packages/analytics/test/core/query-builder.test.ts @@ -31,7 +31,7 @@ describe('SQLFragments', () => { describe('safeCoalesce', () => { it('generates COALESCE for name field with all variations', () => { - const sql = SQLFragments.safeCoalesce('name'); + const sql = SQLFragments.safeCoalesce({ field: 'name' }); expect(sql).toContain('COALESCE('); expect(sql).toContain('name'); // column name from FIELD_MAPPINGS expect(sql).toContain("'Unknown'"); // default @@ -39,12 +39,12 @@ describe('SQLFragments', () => { }); it('uses custom default value', () => { - const sql = SQLFragments.safeCoalesce('brand', "'N/A'"); + const sql = SQLFragments.safeCoalesce({ field: 'brand', defaultValue: "'N/A'" }); expect(sql).toContain("'N/A'"); }); it('wraps unquoted default in quotes', () => { - const sql = SQLFragments.safeCoalesce('brand', 'N/A'); + const sql = SQLFragments.safeCoalesce({ field: 'brand', defaultValue: 'N/A' }); expect(sql).toContain("'N/A'"); }); }); @@ -70,14 +70,17 @@ describe('SQLFragments', () => { describe('readCsvSource', () => { it('generates read_csv_auto with bucket path', () => { - const sql = SQLFragments.readCsvSource('s3://my-bucket'); + const sql = SQLFragments.readCsvSource({ bucketPath: 's3://my-bucket' }); expect(sql).toContain("'s3://my-bucket/v2/*/*.csv'"); expect(sql).toContain('union_by_name=true'); expect(sql).toContain('filename=true'); }); it('uses custom glob patterns', () => { - const sql = SQLFragments.readCsvSource('s3://b', ['custom/*.csv']); + const sql = SQLFragments.readCsvSource({ + bucketPath: 's3://b', + globPatterns: ['custom/*.csv'], + }); expect(sql).toContain("'s3://b/custom/*.csv'"); expect(sql).not.toContain('v1'); }); @@ -139,24 +142,24 @@ describe('SQLFragments', () => { describe('priceRangeFilter', () => { it('generates min price condition', () => { - const conditions = SQLFragments.priceRangeFilter(10); + const conditions = SQLFragments.priceRangeFilter({ minPrice: 10 }); expect(conditions.length).toBe(1); expect(conditions[0]).toContain('>= 10'); }); it('generates max price condition', () => { - const conditions = SQLFragments.priceRangeFilter(undefined, 100); + const conditions = SQLFragments.priceRangeFilter({ maxPrice: 100 }); expect(conditions.length).toBe(1); expect(conditions[0]).toContain('<= 100'); }); it('generates both conditions', () => { - const conditions = SQLFragments.priceRangeFilter(10, 100); + const conditions = SQLFragments.priceRangeFilter({ minPrice: 10, maxPrice: 100 }); expect(conditions.length).toBe(2); }); it('returns empty array when no range', () => { - expect(SQLFragments.priceRangeFilter()).toEqual([]); + expect(SQLFragments.priceRangeFilter({})).toEqual([]); }); }); }); @@ -166,7 +169,7 @@ describe('QueryBuilder', () => { describe('searchQuery', () => { it('generates valid search SQL', () => { - const sql = qb.searchQuery('tent'); + const sql = qb.searchQuery({ keyword: 'tent' }); expect(sql).toContain('SELECT'); expect(sql).toContain('FROM read_csv_auto'); expect(sql).toContain('WHERE'); @@ -176,25 +179,25 @@ describe('QueryBuilder', () => { }); it('applies site filter', () => { - const sql = qb.searchQuery('tent', { sites: ['rei'] }); + const sql = qb.searchQuery({ keyword: 'tent', opts: { sites: ['rei'] } }); expect(sql).toContain("'rei'"); }); it('applies price range', () => { - const sql = qb.searchQuery('tent', { minPrice: 50, maxPrice: 200 }); + const sql = qb.searchQuery({ keyword: 'tent', opts: { minPrice: 50, maxPrice: 200 } }); expect(sql).toContain('>= 50'); expect(sql).toContain('<= 200'); }); it('uses custom limit', () => { - const sql = qb.searchQuery('tent', { limit: 50 }); + const sql = qb.searchQuery({ keyword: 'tent', opts: { limit: 50 } }); expect(sql).toContain('LIMIT 50'); }); }); describe('priceComparisonQuery', () => { it('generates GROUP BY site query', () => { - const sql = qb.priceComparisonQuery('tent'); + const sql = qb.priceComparisonQuery({ keyword: 'tent' }); expect(sql).toContain('WITH base AS'); expect(sql).toContain('GROUP BY site'); expect(sql).toContain('avg_price'); @@ -204,20 +207,20 @@ describe('QueryBuilder', () => { describe('brandAnalysisQuery', () => { it('filters by brand name', () => { - const sql = qb.brandAnalysisQuery('patagonia'); + const sql = qb.brandAnalysisQuery({ brandName: 'patagonia' }); expect(sql).toContain("'%patagonia%'"); expect(sql).toContain('GROUP BY site, category'); }); it('escapes brand name', () => { - const sql = qb.brandAnalysisQuery("Arc'teryx"); + const sql = qb.brandAnalysisQuery({ brandName: "Arc'teryx" }); expect(sql).toContain("arc''teryx"); }); }); describe('categoryInsightsQuery', () => { it('filters by category and groups by site', () => { - const sql = qb.categoryInsightsQuery('jackets'); + const sql = qb.categoryInsightsQuery({ categoryKeyword: 'jackets' }); expect(sql).toContain("'%jackets%'"); expect(sql).toContain('brand_count'); expect(sql).toContain('GROUP BY site'); @@ -226,20 +229,20 @@ describe('QueryBuilder', () => { describe('dealsQuery', () => { it('filters by max price', () => { - const sql = qb.dealsQuery(50); + const sql = qb.dealsQuery({ maxPrice: 50 }); expect(sql).toContain('<= 50'); expect(sql).toContain('ORDER BY price ASC'); }); it('filters by category', () => { - const sql = qb.dealsQuery(100, { category: 'tents' }); + const sql = qb.dealsQuery({ maxPrice: 100, opts: { category: 'tents' } }); expect(sql).toContain("'%tents%'"); }); }); describe('trendsQuery', () => { it('generates time-series aggregation', () => { - const sql = qb.trendsQuery('tent'); + const sql = qb.trendsQuery({ keyword: 'tent' }); expect(sql).toContain('scrape_date'); expect(sql).toContain('avg_price'); expect(sql).toContain('observations'); @@ -247,7 +250,7 @@ describe('QueryBuilder', () => { }); it('uses custom days parameter', () => { - const sql = qb.trendsQuery('tent', { days: 30 }); + const sql = qb.trendsQuery({ keyword: 'tent', opts: { days: 30 } }); expect(sql).toContain("INTERVAL '30 days'"); }); }); diff --git a/packages/analytics/test/integration/catalog-mode.test.ts b/packages/analytics/test/integration/catalog-mode.test.ts index 364b126f88..8dcb651c49 100644 --- a/packages/analytics/test/integration/catalog-mode.test.ts +++ b/packages/analytics/test/integration/catalog-mode.test.ts @@ -48,7 +48,7 @@ describe.skipIf(!hasCatalogCreds)('catalog mode integration', () => { const stats = await cache.getLiveStats(); if (stats.recordCount === 0) return; // No data published yet - const results = await cache.search('jacket', { limit: 5 }); + const results = await cache.search({ keyword: 'jacket', options: { limit: 5 } }); expect(results.length).toBeGreaterThan(0); expect(results[0]).toHaveProperty('name'); expect(results[0]).toHaveProperty('price'); @@ -77,7 +77,7 @@ describe.skipIf(!hasCatalogCreds)('catalog mode integration', () => { const stats = await cache.getLiveStats(); if (stats.recordCount === 0) return; - const brands = await cache.getTopBrands(5); + const brands = await cache.getTopBrands({ limit: 5 }); expect(brands.length).toBeGreaterThan(0); expect(brands[0]).toHaveProperty('brand'); }); diff --git a/packages/analytics/test/integration/local-mode.test.ts b/packages/analytics/test/integration/local-mode.test.ts index 21b728695d..8bd1720a32 100644 --- a/packages/analytics/test/integration/local-mode.test.ts +++ b/packages/analytics/test/integration/local-mode.test.ts @@ -51,7 +51,7 @@ describe.skipIf(!canRun)('local mode integration', () => { }); it('search returns results for broad keyword', async () => { - const results = await cache.search('jacket', { limit: 5 }); + const results = await cache.search({ keyword: 'jacket', options: { limit: 5 } }); expect(results.length).toBeGreaterThan(0); expect(results[0]).toHaveProperty('name'); expect(results[0]).toHaveProperty('price'); @@ -59,7 +59,7 @@ describe.skipIf(!canRun)('local mode integration', () => { }); it('comparePrices returns site-level aggregates', async () => { - const results = await cache.comparePrices('tent'); + const results = await cache.comparePrices({ keyword: 'tent' }); if (results.length > 0) { expect(results[0]).toHaveProperty('site'); expect(results[0]).toHaveProperty('avg_price'); @@ -89,7 +89,7 @@ describe.skipIf(!canRun)('local mode integration', () => { }); it('getTopBrands returns brand rankings', async () => { - const brands = await cache.getTopBrands(5); + const brands = await cache.getTopBrands({ limit: 5 }); expect(brands.length).toBeGreaterThan(0); const first = brands[0]; expect(first).toBeDefined(); @@ -107,7 +107,7 @@ describe.skipIf(!canRun)('local mode integration', () => { }); it('findDeals returns items under price threshold', async () => { - const deals = await cache.findDeals(50, { limit: 5 }); + const deals = await cache.findDeals({ maxPrice: 50, options: { limit: 5 } }); expect(deals.length).toBeGreaterThan(0); for (const deal of deals) { expect(Number(deal.price)).toBeLessThanOrEqual(50); @@ -121,19 +121,19 @@ describe.skipIf(!canRun)('local mode integration', () => { const site = stats.sites[0]; if (site === undefined) return; - const results = await cache.search('gear', { sites: [site], limit: 10 }); + const results = await cache.search({ keyword: 'gear', options: { sites: [site], limit: 10 } }); for (const r of results) { expect(r.site).toBe(site); } }); it('analyzeBrand returns category breakdown', async () => { - const brands = await cache.getTopBrands(1); + const brands = await cache.getTopBrands({ limit: 1 }); if (brands.length === 0) return; const firstBrand = brands[0]; if (firstBrand === undefined) return; - const analysis = await cache.analyzeBrand(firstBrand.brand); + const analysis = await cache.analyzeBrand({ brandName: firstBrand.brand }); if (analysis.length > 0) { expect(analysis[0]).toHaveProperty('site'); expect(analysis[0]).toHaveProperty('category'); @@ -142,7 +142,7 @@ describe.skipIf(!canRun)('local mode integration', () => { }); it('categoryInsights returns category-level stats', async () => { - const results = await cache.categoryInsights('tent'); + const results = await cache.categoryInsights({ categoryKeyword: 'tent' }); if (results.length > 0) { expect(results[0]).toHaveProperty('site'); expect(results[0]).toHaveProperty('product_count'); diff --git a/packages/analytics/vitest.config.ts b/packages/analytics/vitest.config.ts index 27d4706e48..8e1717bc06 100644 --- a/packages/analytics/vitest.config.ts +++ b/packages/analytics/vitest.config.ts @@ -1,9 +1,36 @@ +import { resolve } from 'node:path'; import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { environment: 'node', include: ['test/**/*.test.ts'], + coverage: { + provider: 'v8', + reporter: ['text', 'json-summary'], + reportsDirectory: resolve(__dirname, 'coverage'), + include: ['src/**/*.ts'], + exclude: [ + 'src/**/*.test.ts', + // Barrel files (just re-exports) + 'src/index.ts', + 'src/types/index.ts', + // DuckDB-dependent files — require a live DuckDB/S3 connection; + // unit-testable only via integration tests + 'src/core/connection.ts', + 'src/core/catalog-cache.ts', + 'src/core/local-cache.ts', + 'src/core/data-export.ts', + 'src/core/enrichment.ts', + 'src/core/entity-resolver.ts', + ], + thresholds: { + statements: 80, + branches: 80, + functions: 85, + lines: 80, + }, + }, }, resolve: { alias: { diff --git a/packages/api-client/package.json b/packages/api-client/package.json index 68a3306247..0a9d962340 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/api-client", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index 216c35e93b..4b26e8a063 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -82,7 +82,13 @@ export function createApiClient(config: ApiClientConfig) { * refreshes + retries once on a 401 response (unless the 401 came from the * refresh endpoint itself, in which case the user must re-auth). */ - const authFetcher = async (input: RequestInfo | URL, init?: RequestInit): Promise => { + const authFetcher = async ({ + input, + init, + }: { + input: RequestInfo | URL; + init?: RequestInit; + }): Promise => { const url = isString(input) ? input : input instanceof URL ? input.toString() : input.url; let pathname = ''; try { @@ -92,10 +98,13 @@ export function createApiClient(config: ApiClientConfig) { } const isRefreshPath = pathname === '/api/auth/refresh'; - const buildRequest = ( - token: string | null, - base: RequestInfo | URL, - ): [RequestInfo | URL, RequestInit | undefined] => { + const buildRequest = ({ + token, + base, + }: { + token: string | null; + base: RequestInfo | URL; + }): [RequestInfo | URL, RequestInit | undefined] => { if (!token) return [base, init]; const headers = new Headers(); const existing = init?.headers; @@ -127,7 +136,7 @@ export function createApiClient(config: ApiClientConfig) { const firstBase = input instanceof Request ? input.clone() : input; const firstToken = isRefreshPath ? null : await config.auth.getAccessToken(); - const [firstInput, firstInit] = buildRequest(firstToken, firstBase); + const [firstInput, firstInit] = buildRequest({ token: firstToken, base: firstBase }); const response = await baseFetcher(firstInput, firstInit); if (response.status !== 401 || isRefreshPath) return response; @@ -136,7 +145,7 @@ export function createApiClient(config: ApiClientConfig) { if (!newToken) return response; // `input` (the original) was never passed to fetch, so its body is still intact. - const [retryInput, retryInit] = buildRequest(newToken, input); + const [retryInput, retryInit] = buildRequest({ token: newToken, base: input }); return baseFetcher(retryInput, retryInit); }; @@ -151,7 +160,7 @@ export function createApiClient(config: ApiClientConfig) { // date-like strings (ISO 8601, "YYYY-MM-DD HH:MM") to Date objects. Without // this, every Zod z.string().datetime() field in API response schemas fails. return treaty(config.baseUrl, { - fetcher: authFetcher as unknown as typeof fetch, + fetcher: ((input, init) => authFetcher({ input, init })) as unknown as typeof fetch, parseDate: false, }).api; } @@ -191,21 +200,24 @@ export class ApiError extends Error { readonly status: number; readonly body: unknown; - constructor(message: string, options: ApiErrorOptions) { + constructor({ message, status, body }: { message: string; status: number; body: unknown }) { super(message); this.name = 'ApiError'; - this.status = options.status; - this.body = options.body; + this.status = status; + this.body = body; } } export type QueryParams = Record; export class PackRatApiClient { - constructor( - private readonly baseUrl: string, - private readonly getAuthToken: () => string, - ) {} + constructor({ baseUrl, getAuthToken }: { baseUrl: string; getAuthToken: () => string }) { + this.baseUrl = baseUrl; + this.getAuthToken = getAuthToken; + } + + private readonly baseUrl: string; + private readonly getAuthToken: () => string; private get headers(): Record { const token = this.getAuthToken(); @@ -217,7 +229,7 @@ export class PackRatApiClient { return base; } - async get(path: string, params?: QueryParams): Promise { + async get({ path, params }: { path: string; params?: QueryParams }): Promise { const url = new URL(`${this.baseUrl}${path}`); if (params) { for (const [key, value] of Object.entries(params)) { @@ -228,7 +240,7 @@ export class PackRatApiClient { return this.handleResponse(response); } - async post(path: string, body?: unknown): Promise { + async post({ path, body }: { path: string; body?: unknown }): Promise { const response = await fetch(`${this.baseUrl}${path}`, { method: 'POST', headers: this.headers, @@ -237,7 +249,7 @@ export class PackRatApiClient { return this.handleResponse(response); } - async put(path: string, body?: unknown): Promise { + async put({ path, body }: { path: string; body?: unknown }): Promise { const response = await fetch(`${this.baseUrl}${path}`, { method: 'PUT', headers: this.headers, @@ -246,7 +258,7 @@ export class PackRatApiClient { return this.handleResponse(response); } - async patch(path: string, body?: unknown): Promise { + async patch({ path, body }: { path: string; body?: unknown }): Promise { const response = await fetch(`${this.baseUrl}${path}`, { method: 'PATCH', headers: this.headers, @@ -255,7 +267,7 @@ export class PackRatApiClient { return this.handleResponse(response); } - async delete(path: string): Promise { + async delete({ path }: { path: string }): Promise { const response = await fetch(`${this.baseUrl}${path}`, { method: 'DELETE', headers: this.headers, @@ -270,14 +282,20 @@ export class PackRatApiClient { isObject(body) && 'error' in body ? String((body as Record).error) // safe-cast: isObject() guard confirms body is a non-null object; error field access is safe : `HTTP ${response.status}`; - throw new ApiError(errorMessage, { status: response.status, body }); + throw new ApiError({ message: errorMessage, status: response.status, body }); } return body as T; // safe-cast: caller-provided generic boundary — T is verified at each typed call-site } } -export function createPackRatClient(baseUrl: string, getAuthToken: () => string): PackRatApiClient { - return new PackRatApiClient(baseUrl, getAuthToken); +export function createPackRatClient({ + baseUrl, + getAuthToken, +}: { + baseUrl: string; + getAuthToken: () => string; +}): PackRatApiClient { + return new PackRatApiClient({ baseUrl, getAuthToken }); } // ── MCP tool result helpers ─────────────────────────────────────────────────── diff --git a/packages/api/.dev.vars.e2e.example b/packages/api/.dev.vars.e2e.example new file mode 100644 index 0000000000..c5d4d3f347 --- /dev/null +++ b/packages/api/.dev.vars.e2e.example @@ -0,0 +1,73 @@ +# E2E local overrides — copy to .dev.vars.e2e and fill in real secret values. +# The DB, API URL, and Auth URL are pre-configured for local Docker Postgres. +# All other keys should match your main packages/api/.dev.vars. + +# ── Database (local Docker, port 5435) ───────────────────────────────────── +NEON_DATABASE_URL=postgres://e2e_user:e2e_pass@localhost:5435/packrat_e2e +NEON_DATABASE_URL_READONLY=postgres://e2e_user:e2e_pass@localhost:5435/packrat_e2e + +# ── API & Auth URLs (wrangler dev on localhost) ───────────────────────────── +EXPO_PUBLIC_API_URL=http://localhost:8787 +BETTER_AUTH_URL=http://localhost:8787 +BETTER_AUTH_SECRET=dev-better-auth-secret-32-characters-long-minimum + +# ── E2E credentials (set these to match the seeded test user) ─────────────── +E2E_TEST_EMAIL=e2e@packrattest.local +E2E_TEST_PASSWORD=E2eTestPass123! + +# ── JWT ───────────────────────────────────────────────────────────────────── +JWT_SECRET= + +# ── AI ────────────────────────────────────────────────────────────────────── +OPENAI_API_KEY= +GOOGLE_GENERATIVE_AI_API_KEY= +PERPLEXITY_API_KEY= +CLOUDFLARE_AI_GATEWAY_ID=ai-chat-gateway +AI_PROVIDER=openai + +# ── Email ──────────────────────────────────────────────────────────────────── +EMAIL_PROVIDER=resend +RESEND_API_KEY= +EMAIL_FROM=no-reply@transactional.packratai.com + +# ── Password reset ─────────────────────────────────────────────────────────── +PASSWORD_RESET_SECRET= + +# ── Weather ────────────────────────────────────────────────────────────────── +WEATHER_API_KEY= +OPENWEATHER_KEY= + +# ── Cloudflare R2 Storage ──────────────────────────────────────────────────── +CLOUDFLARE_ACCOUNT_ID= +R2_ACCESS_KEY_ID= +R2_SECRET_ACCESS_KEY= +PACKRAT_BUCKET_R2_BUCKET_NAME=packrat-bucket-preview +PACKRAT_SCRAPY_BUCKET_R2_BUCKET_NAME=packrat-scrapy-bucket +PACKRAT_GUIDES_BUCKET_R2_BUCKET_NAME=packrat-guides +EXPO_PUBLIC_R2_PUBLIC_URL=https://pub-c3852b07b730407889986338ca3ef0e5.r2.dev +R2_PUBLIC_URL=https://pub-c3852b07b730407889986338ca3ef0e5.r2.dev + +# ── Misc ───────────────────────────────────────────────────────────────────── +PACKRAT_API_KEY=secret +ADMIN_USERNAME=admin +ADMIN_PASSWORD=gobuffs +PACKRAT_GUIDES_RAG_NAME=packrat-guides-rag +PACKRAT_GUIDES_BASE_URL=https://guides.packratai.com/ + +# ── Google OAuth ───────────────────────────────────────────────────────────── +EXPO_PUBLIC_GOOGLE_IOS_CLIENT_ID= +EXPO_PUBLIC_GOOGLE_WEB_CLIENT_ID= +GOOGLE_CLIENT_ID= +GOOGLE_CLIENT_SECRET= + +# ── Maps ───────────────────────────────────────────────────────────────────── +EXPO_PUBLIC_GOOGLE_MAPS_API_KEY= + +# ── Sentry ─────────────────────────────────────────────────────────────────── +SENTRY_DSN= + +# ── Apple Sign In ───────────────────────────────────────────────────────────── +APPLE_CLIENT_ID= +APPLE_PRIVATE_KEY= +APPLE_KEY_ID= +APPLE_TEAM_ID= diff --git a/packages/api/.gitignore b/packages/api/.gitignore index dccd134734..2fdcede70e 100644 --- a/packages/api/.gitignore +++ b/packages/api/.gitignore @@ -8,6 +8,7 @@ node_modules/ .wrangler/ .dev.vars +.dev.vars.e2e # yarn/pnp files - using bun in prod .pnp.cjs diff --git a/packages/api/README.e2e-local.md b/packages/api/README.e2e-local.md new file mode 100644 index 0000000000..f001af0b89 --- /dev/null +++ b/packages/api/README.e2e-local.md @@ -0,0 +1,93 @@ +# Local Maestro E2E — API Setup + +Run the full Maestro e2e suite against a local Postgres database and a local +`wrangler dev` API — no Neon cloud, no shared dev DB. + +## Prerequisites + +| Tool | Notes | +|------|-------| +| Docker Desktop | Must be running | +| Bun | Already required by the monorepo | +| Maestro CLI | `curl -Ls https://get.maestro.mobile.dev \| bash` | +| iOS Simulator | Xcode installed + at least one simulator booted | + +## Quick start + +```bash +# 1. One-time setup: generate .dev.vars.e2e from your existing .dev.vars +cd packages/api +bun run dev:e2e:init + +# 2. Start Postgres + run migrations + seed e2e user + launch wrangler dev +bun run dev:e2e +``` + +The API is now live at **http://localhost:8787**. + +## How the stack connects + +```text +iOS Simulator ──────► localhost:8787 (wrangler dev) + │ + ▼ + localhost:5435 (Docker Postgres — packrat_e2e) +``` + +The iOS Simulator on macOS shares the Mac's loopback, so `localhost` works +without any special network config. For a real device on the same Wi-Fi, use +your Mac's LAN IP and rebuild the app with: + +```bash +EXPO_PUBLIC_API_URL=http://:8787 +``` + +## Running Maestro flows + +```bash +# In another terminal — wrangler dev must be running first +maestro test .maestro/master-flow.yaml \ + --env TEST_EMAIL=e2e@packrattest.local \ + --env TEST_PASSWORD=E2eTestPass123! +``` + +Or with the full suite runner: + +```bash +bash .maestro/run-suite.sh +``` + +## Stopping + +```bash +bun run --filter @packrat/api dev:e2e:stop # keep Postgres data +bun run --filter @packrat/api dev:e2e:stop -- --volumes # wipe DB too +``` + +## Full reset (wipe DB + restart) + +```bash +bun run --filter @packrat/api dev:e2e:reset +``` + +## How vars are layered + +`e2e-local-start.sh` passes `--env-file .dev.vars.e2e` to `wrangler dev`. +Wrangler merges the env file on top of any `.dev.vars` present, so e2e +overrides win. The key overrides are: + +| Var | Local value | +|-----|-------------| +| `NEON_DATABASE_URL` | `postgres://e2e_user:e2e_pass@localhost:5435/packrat_e2e` | +| `NEON_DATABASE_URL_READONLY` | same as above | +| `EXPO_PUBLIC_API_URL` | `http://localhost:8787` | +| `BETTER_AUTH_URL` | `http://localhost:8787` | + +All other vars (AI keys, R2, email) come from your base `.dev.vars`. + +## DB connection — why no wsproxy? + +The `db/index.ts` `createConnection` helper detects a standard `postgres://` +URL (not on `neon.tech`/`neon.com`) and automatically switches to `pg.Pool` +(node-postgres) instead of the Neon serverless WebSocket driver. No wsproxy +needed locally. diff --git a/packages/api/README.md b/packages/api/README.md index 8f820235b3..c5d080ed39 100644 --- a/packages/api/README.md +++ b/packages/api/README.md @@ -9,4 +9,10 @@ bun run dev ``` open http://localhost:8787 + +## AI Billing + +AI-backed routes and services use Cloudflare AI Gateway when `CLOUDFLARE_ACCOUNT_ID`, `CLOUDFLARE_AI_GATEWAY_ID`, and `CLOUDFLARE_API_TOKEN` are configured. Direct provider keys such as `OPENAI_API_KEY`, `GOOGLE_GENERATIVE_AI_API_KEY`, and `PERPLEXITY_API_KEY` are still required for fallback and rollback. + +The root `.env.local` is copied into `packages/api/.dev.vars` by `bun install` / `bun run env`. See `../../docs/runbooks/ai-gateway-unified-billing.md` for the production setup and fallback runbook. # packrat-v2-api diff --git a/packages/api/container_src/package.json b/packages/api/container_src/package.json index 4da61eb864..0e066901c2 100644 --- a/packages/api/container_src/package.json +++ b/packages/api/container_src/package.json @@ -1,6 +1,6 @@ { "name": "container", - "version": "2.0.25", + "version": "2.0.26", "type": "module", "dependencies": { "@aws-sdk/client-s3": "^3.0.0", diff --git a/packages/api/container_src/server.ts b/packages/api/container_src/server.ts index 2e0c1e8f34..9c149124c4 100644 --- a/packages/api/container_src/server.ts +++ b/packages/api/container_src/server.ts @@ -58,10 +58,13 @@ const TikTokImportSchema = z.object({ /** * Detect media content type and file extension from response headers or buffer */ -function detectMediaTypeAndExtension( - response: Response, - opts: { buffer?: ArrayBuffer; isVideo?: boolean } = {}, -): { +function detectMediaTypeAndExtension({ + response, + opts = {}, +}: { + response: Response; + opts?: { buffer?: ArrayBuffer; isVideo?: boolean }; +}): { contentType: string; extension: string; } { @@ -132,10 +135,13 @@ function detectMediaTypeAndExtension( /** * Download image and rehost to R2 with 5-minute expiration */ -async function downloadAndRehostImage( - imageUrl: string, - opts: { contentId: string; index: number }, -): Promise { +async function downloadAndRehostImage({ + imageUrl, + opts, +}: { + imageUrl: string; + opts: { contentId: string; index: number }; +}): Promise { const { contentId, index } = opts; if (!s3Client || !env) { console.warn('R2 client not available, skipping image rehosting'); @@ -164,8 +170,11 @@ async function downloadAndRehostImage( } const imageBuffer = await response.arrayBuffer(); - const { contentType, extension } = detectMediaTypeAndExtension(response, { - buffer: imageBuffer, + const { contentType, extension } = detectMediaTypeAndExtension({ + response, + opts: { + buffer: imageBuffer, + }, }); const timestamp = Date.now(); @@ -224,7 +233,7 @@ async function uploadVideoToGoogle(videoUrl: string): Promise { }); console.log(`Video uploaded to Google AI. File URI: ${myfile.uri}, name: ${myfile.name}`); if (!myfile.name) throw new Error('Google AI upload did not return a file name'); - await waitForFileToBeActiveGoogle(googleAi, { fileName: myfile.name }); + await waitForFileToBeActiveGoogle({ ai: googleAi, opts: { fileName: myfile.name } }); return myfile.uri || null; } catch (error) { console.error('Failed to upload video to Google:', error); @@ -235,10 +244,13 @@ async function uploadVideoToGoogle(videoUrl: string): Promise { /** * Wait for uploaded file to become ACTIVE before using it for inference */ -async function waitForFileToBeActiveGoogle( - ai: GoogleGenAI, - opts: { fileName: string; maxWaitTimeMs?: number }, -): Promise { +async function waitForFileToBeActiveGoogle({ + ai, + opts, +}: { + ai: GoogleGenAI; + opts: { fileName: string; maxWaitTimeMs?: number }; +}): Promise { const { fileName, maxWaitTimeMs = 300000 } = opts; const startTime = Date.now(); while (Date.now() - startTime < maxWaitTimeMs) { @@ -265,10 +277,13 @@ async function waitForFileToBeActiveGoogle( /** * Download and rehost multiple images with best effort approach */ -async function downloadAndRehostImages( - imageUrls: string[], - contentId: string, -): Promise<{ rehostedUrls: string[]; failedCount: number; expiresAt: string }> { +async function downloadAndRehostImages({ + imageUrls, + contentId, +}: { + imageUrls: string[]; + contentId: string; +}): Promise<{ rehostedUrls: string[]; failedCount: number; expiresAt: string }> { if (!s3Client || !env) { console.warn('R2 client not available, returning empty results'); return { @@ -281,7 +296,9 @@ async function downloadAndRehostImages( console.log(`Starting rehosting of ${imageUrls.length} images`); const results = await Promise.allSettled( - imageUrls.map((url, index) => downloadAndRehostImage(url, { contentId, index })), + imageUrls.map((url, index) => + downloadAndRehostImage({ imageUrl: url, opts: { contentId, index } }), + ), ); const rehostedUrls: string[] = []; @@ -406,7 +423,10 @@ const app = new Elysia() const [imageResult, videoResult] = await Promise.allSettled([ hasImages - ? downloadAndRehostImages(fetchedData.imageUrls, fetchedData.contentId || 'unknown') + ? downloadAndRehostImages({ + imageUrls: fetchedData.imageUrls, + contentId: fetchedData.contentId || 'unknown', + }) : Promise.resolve({ rehostedUrls: [], failedCount: 0, expiresAt: '' }), hasVideo && fetchedData.videoUrl ? uploadVideoToGoogle(fetchedData.videoUrl) diff --git a/packages/api/docker-compose.e2e.yml b/packages/api/docker-compose.e2e.yml new file mode 100644 index 0000000000..b7a5022beb --- /dev/null +++ b/packages/api/docker-compose.e2e.yml @@ -0,0 +1,19 @@ +services: + postgres-e2e: + image: pgvector/pgvector:pg16 + environment: + POSTGRES_DB: packrat_e2e + POSTGRES_USER: e2e_user + POSTGRES_PASSWORD: e2e_pass + ports: + - "127.0.0.1:5435:5432" + volumes: + - postgres_e2e_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U e2e_user -d packrat_e2e"] + interval: 3s + timeout: 5s + retries: 15 + +volumes: + postgres_e2e_data: diff --git a/packages/api/drizzle/0037_nullable_catalog_weight.sql b/packages/api/drizzle/0037_nullable_catalog_weight.sql new file mode 100644 index 0000000000..8cec041368 --- /dev/null +++ b/packages/api/drizzle/0037_nullable_catalog_weight.sql @@ -0,0 +1,5 @@ +-- catalog_items.weight and weight_unit: drop NOT NULL to allow items without weight data. +-- The validator intentionally skips weight (clothing/footwear often omit it), but the +-- NOT NULL constraint was causing upserts to throw, which cascaded to ETL job failures. +ALTER TABLE "catalog_items" ALTER COLUMN "weight" DROP NOT NULL;--> statement-breakpoint +ALTER TABLE "catalog_items" ALTER COLUMN "weight_unit" DROP NOT NULL; diff --git a/packages/api/drizzle/0037_rich_electro.sql b/packages/api/drizzle/0037_rich_electro.sql new file mode 100644 index 0000000000..de1571ce17 --- /dev/null +++ b/packages/api/drizzle/0037_rich_electro.sql @@ -0,0 +1,2 @@ +ALTER TABLE "catalog_items" ALTER COLUMN "weight" DROP NOT NULL;--> statement-breakpoint +ALTER TABLE "catalog_items" ALTER COLUMN "weight_unit" DROP NOT NULL; diff --git a/packages/api/drizzle/0047_cute_bloodscream.sql b/packages/api/drizzle/0047_cute_bloodscream.sql new file mode 100644 index 0000000000..18c813ecf1 --- /dev/null +++ b/packages/api/drizzle/0047_cute_bloodscream.sql @@ -0,0 +1,2 @@ +ALTER TABLE "catalog_items" ALTER COLUMN "weight" DROP NOT NULL;--> statement-breakpoint +ALTER TABLE "catalog_items" ALTER COLUMN "weight_unit" DROP NOT NULL; \ No newline at end of file diff --git a/packages/api/drizzle/meta/0047_cute_bloodscream.json b/packages/api/drizzle/meta/0047_cute_bloodscream.json new file mode 100644 index 0000000000..cce3b7f09e --- /dev/null +++ b/packages/api/drizzle/meta/0047_cute_bloodscream.json @@ -0,0 +1,2257 @@ +{ + "id": "1f086d6d-055d-4b37-a5d6-32b1141d2043", + "prevId": "548299d6-dc62-4a37-893b-932e6b7451a1", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.account": { + "name": "account", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "account_id": { + "name": "account_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "provider_id": { + "name": "provider_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "access_token": { + "name": "access_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "refresh_token": { + "name": "refresh_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "id_token": { + "name": "id_token", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "access_token_expires_at": { + "name": "access_token_expires_at", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "refresh_token_expires_at": { + "name": "refresh_token_expires_at", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "scope": { + "name": "scope", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password": { + "name": "password", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "account_userId_idx": { + "name": "account_userId_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "account_user_id_users_id_fk": { + "name": "account_user_id_users_id_fk", + "tableFrom": "account", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "account_provider_account_idx": { + "name": "account_provider_account_idx", + "nullsNotDistinct": false, + "columns": ["provider_id", "account_id"] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.catalog_item_etl_jobs": { + "name": "catalog_item_etl_jobs", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "catalog_item_id": { + "name": "catalog_item_id", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "etl_job_id": { + "name": "etl_job_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "catalog_item_etl_jobs_catalog_item_id_catalog_items_id_fk": { + "name": "catalog_item_etl_jobs_catalog_item_id_catalog_items_id_fk", + "tableFrom": "catalog_item_etl_jobs", + "tableTo": "catalog_items", + "columnsFrom": ["catalog_item_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "catalog_item_etl_jobs_etl_job_id_etl_jobs_id_fk": { + "name": "catalog_item_etl_jobs_etl_job_id_etl_jobs_id_fk", + "tableFrom": "catalog_item_etl_jobs", + "tableTo": "etl_jobs", + "columnsFrom": ["etl_job_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.catalog_items": { + "name": "catalog_items", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "product_url": { + "name": "product_url", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "sku": { + "name": "sku", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "weight": { + "name": "weight", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "weight_unit": { + "name": "weight_unit", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "categories": { + "name": "categories", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "images": { + "name": "images", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "brand": { + "name": "brand", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "model": { + "name": "model", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "rating_value": { + "name": "rating_value", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "color": { + "name": "color", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "size": { + "name": "size", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "price": { + "name": "price", + "type": "real", + "primaryKey": false, + "notNull": false + }, + "availability": { + "name": "availability", + "type": "availability", + "typeSchema": "public", + "primaryKey": false, + "notNull": false + }, + "seller": { + "name": "seller", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "product_sku": { + "name": "product_sku", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "material": { + "name": "material", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "currency": { + "name": "currency", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "condition": { + "name": "condition", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "review_count": { + "name": "review_count", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "variants": { + "name": "variants", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "techs": { + "name": "techs", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "links": { + "name": "links", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "reviews": { + "name": "reviews", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "qas": { + "name": "qas", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "faqs": { + "name": "faqs", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "embedding": { + "name": "embedding", + "type": "vector(1536)", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "embedding_idx": { + "name": "embedding_idx", + "columns": [ + { + "expression": "embedding", + "isExpression": false, + "asc": true, + "nulls": "last", + "opclass": "vector_cosine_ops" + } + ], + "isUnique": false, + "concurrently": false, + "method": "hnsw", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "catalog_items_sku_unique": { + "name": "catalog_items_sku_unique", + "nullsNotDistinct": false, + "columns": ["sku"] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.comment_likes": { + "name": "comment_likes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "comment_id": { + "name": "comment_id", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "comment_likes_comment_id_post_comments_id_fk": { + "name": "comment_likes_comment_id_post_comments_id_fk", + "tableFrom": "comment_likes", + "tableTo": "post_comments", + "columnsFrom": ["comment_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "comment_likes_user_id_users_id_fk": { + "name": "comment_likes_user_id_users_id_fk", + "tableFrom": "comment_likes", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "comment_likes_comment_id_user_id_unique": { + "name": "comment_likes_comment_id_user_id_unique", + "nullsNotDistinct": false, + "columns": ["comment_id", "user_id"] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.etl_jobs": { + "name": "etl_jobs", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "status": { + "name": "status", + "type": "etl_job_status", + "typeSchema": "public", + "primaryKey": false, + "notNull": true + }, + "source": { + "name": "source", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "filename": { + "name": "filename", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "started_at": { + "name": "started_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "completed_at": { + "name": "completed_at", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "total_processed": { + "name": "total_processed", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "total_valid": { + "name": "total_valid", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "total_invalid": { + "name": "total_invalid", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "scraper_revision": { + "name": "scraper_revision", + "type": "text", + "primaryKey": false, + "notNull": true + } + }, + "indexes": { + "etl_jobs_scraper_revision_idx": { + "name": "etl_jobs_scraper_revision_idx", + "columns": [ + { + "expression": "scraper_revision", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.invalid_item_logs": { + "name": "invalid_item_logs", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "job_id": { + "name": "job_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "errors": { + "name": "errors", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "raw_data": { + "name": "raw_data", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "row_index": { + "name": "row_index", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "invalid_item_logs_job_id_etl_jobs_id_fk": { + "name": "invalid_item_logs_job_id_etl_jobs_id_fk", + "tableFrom": "invalid_item_logs", + "tableTo": "etl_jobs", + "columnsFrom": ["job_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.jwks": { + "name": "jwks", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "public_key": { + "name": "public_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "private_key": { + "name": "private_key", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.pack_items": { + "name": "pack_items", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "weight": { + "name": "weight", + "type": "real", + "primaryKey": false, + "notNull": true + }, + "weight_unit": { + "name": "weight_unit", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "quantity": { + "name": "quantity", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 1 + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "consumable": { + "name": "consumable", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "worn": { + "name": "worn", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "pack_id": { + "name": "pack_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "catalog_item_id": { + "name": "catalog_item_id", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "deleted": { + "name": "deleted", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "is_ai_generated": { + "name": "is_ai_generated", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "template_item_id": { + "name": "template_item_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "embedding": { + "name": "embedding", + "type": "vector(1536)", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "pack_items_embedding_idx": { + "name": "pack_items_embedding_idx", + "columns": [ + { + "expression": "embedding", + "isExpression": false, + "asc": true, + "nulls": "last", + "opclass": "vector_cosine_ops" + } + ], + "isUnique": false, + "concurrently": false, + "method": "hnsw", + "with": {} + } + }, + "foreignKeys": { + "pack_items_pack_id_packs_id_fk": { + "name": "pack_items_pack_id_packs_id_fk", + "tableFrom": "pack_items", + "tableTo": "packs", + "columnsFrom": ["pack_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "pack_items_catalog_item_id_catalog_items_id_fk": { + "name": "pack_items_catalog_item_id_catalog_items_id_fk", + "tableFrom": "pack_items", + "tableTo": "catalog_items", + "columnsFrom": ["catalog_item_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + }, + "pack_items_user_id_users_id_fk": { + "name": "pack_items_user_id_users_id_fk", + "tableFrom": "pack_items", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + }, + "pack_items_template_item_id_pack_template_items_id_fk": { + "name": "pack_items_template_item_id_pack_template_items_id_fk", + "tableFrom": "pack_items", + "tableTo": "pack_template_items", + "columnsFrom": ["template_item_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.pack_template_items": { + "name": "pack_template_items", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "weight": { + "name": "weight", + "type": "real", + "primaryKey": false, + "notNull": true + }, + "weight_unit": { + "name": "weight_unit", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "quantity": { + "name": "quantity", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 1 + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "consumable": { + "name": "consumable", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "worn": { + "name": "worn", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "pack_template_id": { + "name": "pack_template_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "catalog_item_id": { + "name": "catalog_item_id", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "deleted": { + "name": "deleted", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "pack_template_items_pack_template_id_pack_templates_id_fk": { + "name": "pack_template_items_pack_template_id_pack_templates_id_fk", + "tableFrom": "pack_template_items", + "tableTo": "pack_templates", + "columnsFrom": ["pack_template_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "pack_template_items_catalog_item_id_catalog_items_id_fk": { + "name": "pack_template_items_catalog_item_id_catalog_items_id_fk", + "tableFrom": "pack_template_items", + "tableTo": "catalog_items", + "columnsFrom": ["catalog_item_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + }, + "pack_template_items_user_id_users_id_fk": { + "name": "pack_template_items_user_id_users_id_fk", + "tableFrom": "pack_template_items", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.pack_templates": { + "name": "pack_templates", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "is_app_template": { + "name": "is_app_template", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "deleted": { + "name": "deleted", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "content_source": { + "name": "content_source", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "content_id": { + "name": "content_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "local_created_at": { + "name": "local_created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "local_updated_at": { + "name": "local_updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "pack_templates_user_id_users_id_fk": { + "name": "pack_templates_user_id_users_id_fk", + "tableFrom": "pack_templates", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.weight_history": { + "name": "weight_history", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "pack_id": { + "name": "pack_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "weight": { + "name": "weight", + "type": "real", + "primaryKey": false, + "notNull": true + }, + "local_created_at": { + "name": "local_created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "weight_history_user_id_users_id_fk": { + "name": "weight_history_user_id_users_id_fk", + "tableFrom": "weight_history", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "weight_history_pack_id_packs_id_fk": { + "name": "weight_history_pack_id_packs_id_fk", + "tableFrom": "weight_history", + "tableTo": "packs", + "columnsFrom": ["pack_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.packs": { + "name": "packs", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "category": { + "name": "category", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "template_id": { + "name": "template_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "is_public": { + "name": "is_public", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "tags": { + "name": "tags", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "deleted": { + "name": "deleted", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "is_ai_generated": { + "name": "is_ai_generated", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "local_created_at": { + "name": "local_created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "local_updated_at": { + "name": "local_updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "packs_user_id_users_id_fk": { + "name": "packs_user_id_users_id_fk", + "tableFrom": "packs", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "packs_template_id_pack_templates_id_fk": { + "name": "packs_template_id_pack_templates_id_fk", + "tableFrom": "packs", + "tableTo": "pack_templates", + "columnsFrom": ["template_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.post_comments": { + "name": "post_comments", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "post_id": { + "name": "post_id", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "parent_comment_id": { + "name": "parent_comment_id", + "type": "integer", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "post_comments_post_id_posts_id_fk": { + "name": "post_comments_post_id_posts_id_fk", + "tableFrom": "post_comments", + "tableTo": "posts", + "columnsFrom": ["post_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "post_comments_user_id_users_id_fk": { + "name": "post_comments_user_id_users_id_fk", + "tableFrom": "post_comments", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "post_comments_parent_comment_id_post_comments_id_fk": { + "name": "post_comments_parent_comment_id_post_comments_id_fk", + "tableFrom": "post_comments", + "tableTo": "post_comments", + "columnsFrom": ["parent_comment_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.post_likes": { + "name": "post_likes", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "post_id": { + "name": "post_id", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "post_likes_post_id_posts_id_fk": { + "name": "post_likes_post_id_posts_id_fk", + "tableFrom": "post_likes", + "tableTo": "posts", + "columnsFrom": ["post_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "post_likes_user_id_users_id_fk": { + "name": "post_likes_user_id_users_id_fk", + "tableFrom": "post_likes", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "post_likes_post_id_user_id_unique": { + "name": "post_likes_post_id_user_id_unique", + "nullsNotDistinct": false, + "columns": ["post_id", "user_id"] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.posts": { + "name": "posts", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "caption": { + "name": "caption", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "images": { + "name": "images", + "type": "jsonb", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "posts_user_id_users_id_fk": { + "name": "posts_user_id_users_id_fk", + "tableFrom": "posts", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.reported_content": { + "name": "reported_content", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_query": { + "name": "user_query", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "ai_response": { + "name": "ai_response", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "user_comment": { + "name": "user_comment", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "status": { + "name": "status", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'pending'" + }, + "reviewed": { + "name": "reviewed", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "reviewed_by": { + "name": "reviewed_by", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "reviewed_at": { + "name": "reviewed_at", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "reported_content_user_id_users_id_fk": { + "name": "reported_content_user_id_users_id_fk", + "tableFrom": "reported_content", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + }, + "reported_content_reviewed_by_users_id_fk": { + "name": "reported_content_reviewed_by_users_id_fk", + "tableFrom": "reported_content", + "tableTo": "users", + "columnsFrom": ["reviewed_by"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.session": { + "name": "session", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "token": { + "name": "token", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "ip_address": { + "name": "ip_address", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_agent": { + "name": "user_agent", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "impersonated_by": { + "name": "impersonated_by", + "type": "text", + "primaryKey": false, + "notNull": false + } + }, + "indexes": { + "session_userId_idx": { + "name": "session_userId_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "session_user_id_users_id_fk": { + "name": "session_user_id_users_id_fk", + "tableFrom": "session", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "session_token_unique": { + "name": "session_token_unique", + "nullsNotDistinct": false, + "columns": ["token"] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.trail_condition_reports": { + "name": "trail_condition_reports", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "trail_name": { + "name": "trail_name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trail_region": { + "name": "trail_region", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "surface": { + "name": "surface", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "overall_condition": { + "name": "overall_condition", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "hazards": { + "name": "hazards", + "type": "jsonb", + "primaryKey": false, + "notNull": true, + "default": "'[]'::jsonb" + }, + "water_crossings": { + "name": "water_crossings", + "type": "integer", + "primaryKey": false, + "notNull": true, + "default": 0 + }, + "water_crossing_difficulty": { + "name": "water_crossing_difficulty", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "photos": { + "name": "photos", + "type": "jsonb", + "primaryKey": false, + "notNull": true, + "default": "'[]'::jsonb" + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "trip_id": { + "name": "trip_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "deleted": { + "name": "deleted", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "local_created_at": { + "name": "local_created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "local_updated_at": { + "name": "local_updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "trail_condition_reports_user_id_idx": { + "name": "trail_condition_reports_user_id_idx", + "columns": [ + { + "expression": "user_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "trail_condition_reports_active_created_idx": { + "name": "trail_condition_reports_active_created_idx", + "columns": [ + { + "expression": "deleted", + "isExpression": false, + "asc": true, + "nulls": "last" + }, + { + "expression": "created_at", + "isExpression": false, + "asc": false, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "trail_condition_reports_trail_name_idx": { + "name": "trail_condition_reports_trail_name_idx", + "columns": [ + { + "expression": "trail_name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "trail_condition_reports_trip_id_idx": { + "name": "trail_condition_reports_trip_id_idx", + "columns": [ + { + "expression": "trip_id", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "where": "\"trail_condition_reports\".\"trip_id\" IS NOT NULL", + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": { + "trail_condition_reports_user_id_users_id_fk": { + "name": "trail_condition_reports_user_id_users_id_fk", + "tableFrom": "trail_condition_reports", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "trail_condition_reports_trip_id_trips_id_fk": { + "name": "trail_condition_reports_trip_id_trips_id_fk", + "tableFrom": "trail_condition_reports", + "tableTo": "trips", + "columnsFrom": ["trip_id"], + "columnsTo": ["id"], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.trips": { + "name": "trips", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "description": { + "name": "description", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "start_date": { + "name": "start_date", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "end_date": { + "name": "end_date", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "location": { + "name": "location", + "type": "jsonb", + "primaryKey": false, + "notNull": false + }, + "notes": { + "name": "notes", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "user_id": { + "name": "user_id", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "pack_id": { + "name": "pack_id", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "trail_osm_id": { + "name": "trail_osm_id", + "type": "bigint", + "primaryKey": false, + "notNull": false + }, + "local_created_at": { + "name": "local_created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "local_updated_at": { + "name": "local_updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "deleted": { + "name": "deleted", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "trips_user_id_users_id_fk": { + "name": "trips_user_id_users_id_fk", + "tableFrom": "trips", + "tableTo": "users", + "columnsFrom": ["user_id"], + "columnsTo": ["id"], + "onDelete": "no action", + "onUpdate": "no action" + }, + "trips_pack_id_packs_id_fk": { + "name": "trips_pack_id_packs_id_fk", + "tableFrom": "trips", + "tableTo": "packs", + "columnsFrom": ["pack_id"], + "columnsTo": ["id"], + "onDelete": "set null", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.users": { + "name": "users", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email": { + "name": "email", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "email_verified": { + "name": "email_verified", + "type": "boolean", + "primaryKey": false, + "notNull": true, + "default": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "role": { + "name": "role", + "type": "text", + "primaryKey": false, + "notNull": true, + "default": "'USER'" + }, + "banned": { + "name": "banned", + "type": "boolean", + "primaryKey": false, + "notNull": false, + "default": false + }, + "ban_reason": { + "name": "ban_reason", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "ban_expires": { + "name": "ban_expires", + "type": "timestamp", + "primaryKey": false, + "notNull": false + }, + "first_name": { + "name": "first_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "last_name": { + "name": "last_name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "avatar_url": { + "name": "avatar_url", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "password_hash": { + "name": "password_hash", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": { + "users_email_unique": { + "name": "users_email_unique", + "nullsNotDistinct": false, + "columns": ["email"] + } + }, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + }, + "public.verification": { + "name": "verification", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "identifier": { + "name": "identifier", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "expires_at": { + "name": "expires_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true + }, + "created_at": { + "name": "created_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updated_at": { + "name": "updated_at", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verification_identifier_idx": { + "name": "verification_identifier_idx", + "columns": [ + { + "expression": "identifier", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {}, + "policies": {}, + "checkConstraints": {}, + "isRLSEnabled": false + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "roles": {}, + "policies": {}, + "views": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} diff --git a/packages/api/drizzle/meta/_journal.json b/packages/api/drizzle/meta/_journal.json index af35b27774..ca463a5058 100644 --- a/packages/api/drizzle/meta/_journal.json +++ b/packages/api/drizzle/meta/_journal.json @@ -330,6 +330,13 @@ "when": 1777803600000, "tag": "0046_social_feed_tables_uuid", "breakpoints": true + }, + { + "idx": 46, + "version": "7", + "when": 1778594728740, + "tag": "0047_cute_bloodscream", + "breakpoints": true } ] } diff --git a/packages/api/package.json b/packages/api/package.json index 0f513afbab..963f2a9632 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/api", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { @@ -9,8 +9,8 @@ "default": "./src/index.ts" }, "./*": { - "types": "./src/*", - "default": "./src/*" + "types": "./src/*.ts", + "default": "./src/*.ts" } }, "main": "./src/index.ts", @@ -25,6 +25,10 @@ "deploy": "wrangler deploy --minify", "deploy:dev": "wrangler deploy --minify -e=dev", "dev": "wrangler dev -e=dev", + "dev:e2e": "bash scripts/e2e-local-start.sh", + "dev:e2e:init": "bash scripts/e2e-local-init.sh", + "dev:e2e:reset": "bash scripts/e2e-local-stop.sh --volumes && bash scripts/e2e-local-start.sh", + "dev:e2e:stop": "bash scripts/e2e-local-stop.sh", "test": "vitest run", "test:unit": "vitest run --config vitest.unit.config.ts", "test:unit:coverage": "vitest run --config vitest.unit.config.ts --coverage", @@ -32,7 +36,7 @@ }, "dependencies": { "@ai-sdk/google": "^3.0.64", - "@ai-sdk/openai": "^3.0.53", + "@ai-sdk/openai": "catalog:", "@ai-sdk/perplexity": "^3.0.29", "@aws-sdk/client-s3": "~3.787.0", "@aws-sdk/s3-request-presigner": "~3.787.0", @@ -41,30 +45,35 @@ "@elysiajs/eden": "catalog:", "@elysiajs/openapi": "catalog:", "@mozilla/readability": "^0.6.0", - "@neondatabase/serverless": "^1.0.0", + "@neondatabase/serverless": "catalog:", + "@packrat/constants": "workspace:*", + "@packrat/db": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", "@packrat/overpass": "workspace:*", + "@packrat/schemas": "workspace:*", + "@packrat/types": "workspace:*", "@packrat/units": "workspace:*", + "@sentry/cloudflare": "^10.0.0", "@sinclair/typebox": "^0.34.15", "@types/nodemailer": "^6.4.17", "ai": "catalog:", "bcryptjs": "^3.0.2", "csv-parse": "^6.2.1", - "drizzle-kit": "^0.31.10", - "drizzle-orm": "^0.45.2", - "drizzle-zod": "^0.8.3", + "drizzle-kit": "catalog:", + "drizzle-orm": "catalog:", + "drizzle-zod": "catalog:", "elysia": "catalog:", - "google-auth-library": "^10.1.0", - "gray-matter": "^4.0.3", + "google-auth-library": "catalog:", + "gray-matter": "catalog:", "jose": "^5.9.6", "linkedom": "^0.18.11", "nodemailer": "^6.10.0", - "pg": "^8.16.3", + "pg": "catalog:", "radash": "catalog:", "resend": "^6.10.0", "workers-ai-provider": "^0.7.2", - "ws": "^8.18.1", + "ws": "catalog:", "youtube-transcript": "^1.3.0", "zod": "catalog:", "zod-openapi": "^5.4.6" @@ -72,17 +81,17 @@ "devDependencies": { "@better-auth/drizzle-adapter": "^1.6.9", "@cloudflare/vitest-pool-workers": "0.8.71", - "@cloudflare/workers-types": "^4.20250405.0", - "@types/bun": "latest", + "@cloudflare/workers-types": "catalog:", + "@types/bun": "catalog:", "@types/pg": "^8.11.15", "@types/ws": "^8.5.14", - "@vitest/coverage-v8": "~3.1.4", - "better-auth": "^1.6.9", + "@vitest/coverage-v8": "catalog:", + "better-auth": "catalog:", "better-auth-cloudflare": "^0.3.0", "concurrently": "^8.2.2", - "drizzle-orm": "^0.45.2", + "drizzle-orm": "catalog:", "typed-htmx": "^0.3.1", - "vitest": "~3.1.4", - "wrangler": "^4.21.2" + "vitest": "catalog:", + "wrangler": "catalog:" } } diff --git a/packages/api/scripts/e2e-local-init.sh b/packages/api/scripts/e2e-local-init.sh new file mode 100755 index 0000000000..846190556b --- /dev/null +++ b/packages/api/scripts/e2e-local-init.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash +# e2e-local-init.sh — generate packages/api/.dev.vars.e2e for local Maestro e2e. +# +# Copies your existing .dev.vars (or the main-checkout copy if that exists) +# and overrides the DB + API URLs to point at local Docker Postgres. +# +# Run once per worktree setup, or whenever you want to reset the e2e vars. +# The generated .dev.vars.e2e is gitignored. +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +API_DIR="$(dirname "$SCRIPT_DIR")" +REPO_ROOT="$(cd "${API_DIR}/../.." && pwd)" + +E2E_DB_URL="postgres://e2e_user:e2e_pass@localhost:5435/packrat_e2e" +OUT="${API_DIR}/.dev.vars.e2e" + +# Candidate source files (in order of preference) +CANDIDATES=( + "${API_DIR}/.dev.vars" + "${REPO_ROOT}/../development/packages/api/.dev.vars" +) + +SOURCE="" +for candidate in "${CANDIDATES[@]}"; do + if [[ -f "$candidate" ]]; then + SOURCE="$candidate" + break + fi +done + +if [[ -z "$SOURCE" ]]; then + echo "Error: Could not find a base .dev.vars file." + echo " Checked:" + for c in "${CANDIDATES[@]}"; do echo " $c"; done + echo "" + echo "Copy .dev.vars.e2e.example to .dev.vars.e2e and fill in your secrets manually." + exit 1 +fi + +echo "Using base vars from: ${SOURCE}" + +# Stream the base file, overriding the keys that differ for local e2e. +while IFS= read -r line || [[ -n "$line" ]]; do + case "$line" in + NEON_DATABASE_URL=*) echo "NEON_DATABASE_URL=${E2E_DB_URL}" ;; + NEON_DATABASE_URL_READONLY=*) echo "NEON_DATABASE_URL_READONLY=${E2E_DB_URL}" ;; + EXPO_PUBLIC_API_URL=*) echo "EXPO_PUBLIC_API_URL=http://localhost:8787" ;; + BETTER_AUTH_URL=*) echo "BETTER_AUTH_URL=http://localhost:8787" ;; + *) echo "$line" ;; + esac +done < "$SOURCE" > "$OUT" + +# Append e2e credentials if not already present. +if ! grep -q "^E2E_TEST_EMAIL=" "$OUT"; then + echo "" >> "$OUT" + echo "E2E_TEST_EMAIL=${E2E_TEST_EMAIL:-e2e@packrattest.local}" >> "$OUT" +fi +if ! grep -q "^E2E_TEST_PASSWORD=" "$OUT"; then + echo "E2E_TEST_PASSWORD=${E2E_TEST_PASSWORD:-E2eTestPass123!}" >> "$OUT" +fi + +echo "Generated: ${OUT}" +echo "" +echo "Next steps:" +echo " 1. Review ${OUT} and confirm the values look correct." +echo " 2. Run: scripts/e2e-local-start.sh" diff --git a/packages/api/scripts/e2e-local-start.sh b/packages/api/scripts/e2e-local-start.sh new file mode 100755 index 0000000000..98605e6ef3 --- /dev/null +++ b/packages/api/scripts/e2e-local-start.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +# e2e-local-start.sh — spin up local Postgres + wrangler dev for Maestro e2e. +# +# Prerequisites: +# - Docker running +# - .dev.vars.e2e generated (run scripts/e2e-local-init.sh if missing) +# - Bun installed +# +# The API will be available at http://localhost:8787 +# iOS Simulator can reach it at http://localhost:8787 (shared loopback on macOS). +# For a real device on the same Wi-Fi, use your Mac's LAN IP instead: +# EXPO_PUBLIC_API_URL=http://:8787 +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +API_DIR="$(dirname "$SCRIPT_DIR")" +COMPOSE_FILE="${API_DIR}/docker-compose.e2e.yml" +E2E_VARS="${API_DIR}/.dev.vars.e2e" +E2E_DB_URL="postgres://e2e_user:e2e_pass@localhost:5435/packrat_e2e" + +# ── Preflight ─────────────────────────────────────────────────────────────── +if ! command -v docker &>/dev/null; then + echo "Error: Docker not found. Install Docker Desktop and try again." + exit 1 +fi + +if [[ ! -f "$E2E_VARS" ]]; then + echo "Error: ${E2E_VARS} not found." + echo "Run first: bun run --filter @packrat/api dev:e2e:init" + exit 1 +fi + +# ── Start Postgres ─────────────────────────────────────────────────────────── +echo "▶ Starting local Postgres (packrat_e2e on port 5435)..." +docker compose -f "$COMPOSE_FILE" up -d + +echo "▶ Waiting for Postgres to be ready..." +RETRIES=30 +until docker compose -f "$COMPOSE_FILE" exec -T postgres-e2e \ + pg_isready -U e2e_user -d packrat_e2e &>/dev/null; do + RETRIES=$((RETRIES - 1)) + if [[ $RETRIES -le 0 ]]; then + echo "Error: Postgres did not become healthy in time." + docker compose -f "$COMPOSE_FILE" logs postgres-e2e + exit 1 + fi + sleep 1 +done +echo " Postgres ready." + +# ── Migrations ─────────────────────────────────────────────────────────────── +echo "▶ Running schema migrations..." +( + cd "$API_DIR" + NEON_DATABASE_URL="$E2E_DB_URL" bun run db:migrate +) + +# ── Seed E2E user ──────────────────────────────────────────────────────────── +E2E_EMAIL="${E2E_TEST_EMAIL:-$(grep '^E2E_TEST_EMAIL=' "$E2E_VARS" 2>/dev/null || true | cut -d= -f2-)}" +E2E_PASS="${E2E_TEST_PASSWORD:-$(grep '^E2E_TEST_PASSWORD=' "$E2E_VARS" 2>/dev/null || true | cut -d= -f2-)}" +E2E_EMAIL="${E2E_EMAIL:-e2e@packrattest.local}" +E2E_PASS="${E2E_PASS:-E2eTestPass123!}" + +echo "▶ Seeding E2E test user (${E2E_EMAIL})..." +( + cd "$API_DIR" + NEON_DATABASE_URL="$E2E_DB_URL" \ + E2E_TEST_EMAIL="$E2E_EMAIL" \ + E2E_TEST_PASSWORD="$E2E_PASS" \ + bun run db:seed:e2e-user +) + +# ── Wrangler dev ───────────────────────────────────────────────────────────── +echo "" +echo "▶ Starting wrangler dev on http://localhost:8787 ..." +echo " Using env file: ${E2E_VARS}" +echo " Press Ctrl+C to stop." +echo "" + +cd "$API_DIR" +# --env-file layers e2e vars on top of any existing .dev.vars; +# --ip 0.0.0.0 also exposes the API on the LAN (useful for real device testing). +exec wrangler dev -e dev \ + --env-file "$E2E_VARS" \ + --ip 0.0.0.0 diff --git a/packages/api/scripts/e2e-local-stop.sh b/packages/api/scripts/e2e-local-stop.sh new file mode 100755 index 0000000000..59aedb5801 --- /dev/null +++ b/packages/api/scripts/e2e-local-stop.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +# e2e-local-stop.sh — tear down the local Postgres e2e stack. +# +# Stops and removes the Docker containers started by e2e-local-start.sh. +# Pass --volumes to also drop the Postgres data volume (full reset). +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +API_DIR="$(dirname "$SCRIPT_DIR")" +COMPOSE_FILE="${API_DIR}/docker-compose.e2e.yml" + +EXTRA_FLAGS=() +if [[ "${1:-}" == "--volumes" || "${1:-}" == "-v" ]]; then + EXTRA_FLAGS+=(--volumes) + echo "▶ Stopping and removing containers + data volume..." +else + echo "▶ Stopping containers (data volume preserved)..." + echo " Pass --volumes to also wipe the Postgres data." +fi + +docker compose -f "$COMPOSE_FILE" down "${EXTRA_FLAGS[@]}" +echo "Done." diff --git a/packages/api/src/auth/__tests__/auth.helpers.test.ts b/packages/api/src/auth/__tests__/auth.helpers.test.ts new file mode 100644 index 0000000000..fa08d228f0 --- /dev/null +++ b/packages/api/src/auth/__tests__/auth.helpers.test.ts @@ -0,0 +1,116 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + +const mocks = vi.hoisted(() => ({ + bcryptCompare: vi.fn<(hash: string, data: string | Buffer) => Promise>(), + verifyPassword: vi.fn<(hash: string, password: string) => Promise>(), + importPKCS8: vi.fn(), + signJwt: vi.fn(), +})); + +vi.mock('bcryptjs', () => ({ compare: mocks.bcryptCompare })); +vi.mock('@better-auth/utils/password', () => ({ verifyPassword: mocks.verifyPassword })); +vi.mock('jose', () => ({ + importPKCS8: mocks.importPKCS8, + SignJWT: vi.fn(() => ({ + setProtectedHeader: vi.fn().mockReturnThis(), + setIssuer: vi.fn().mockReturnThis(), + setSubject: vi.fn().mockReturnThis(), + setAudience: vi.fn().mockReturnThis(), + setIssuedAt: vi.fn().mockReturnThis(), + setExpirationTime: vi.fn().mockReturnThis(), + sign: mocks.signJwt, + })), +})); + +import { generateAppleClientSecret, verifyPasswordCompat } from '../auth.helpers'; + +describe('verifyPasswordCompat()', () => { + beforeEach(() => vi.clearAllMocks()); + + it('uses bcrypt for $2a$ hashes', async () => { + mocks.bcryptCompare.mockResolvedValue(true); + const result = await verifyPasswordCompat({ hash: '$2a$10$abc', password: 'pw' }); + expect(mocks.bcryptCompare).toHaveBeenCalledWith('pw', '$2a$10$abc'); + expect(mocks.verifyPassword).not.toHaveBeenCalled(); + expect(result).toBe(true); + }); + + it('uses bcrypt for $2b$ hashes', async () => { + mocks.bcryptCompare.mockResolvedValue(false); + const result = await verifyPasswordCompat({ hash: '$2b$12$xyz', password: 'wrong' }); + expect(mocks.bcryptCompare).toHaveBeenCalledWith('wrong', '$2b$12$xyz'); + expect(result).toBe(false); + }); + + it('uses bcrypt for $2y$ hashes', async () => { + mocks.bcryptCompare.mockResolvedValue(true); + await verifyPasswordCompat({ hash: '$2y$10$hash', password: 'pw' }); + expect(mocks.bcryptCompare).toHaveBeenCalled(); + expect(mocks.verifyPassword).not.toHaveBeenCalled(); + }); + + it('uses better-auth verifyPassword for non-bcrypt hashes', async () => { + mocks.verifyPassword.mockResolvedValue(true); + const result = await verifyPasswordCompat({ hash: 'argon2:somehash', password: 'pw' }); + expect(mocks.verifyPassword).toHaveBeenCalledWith('argon2:somehash', 'pw'); + expect(mocks.bcryptCompare).not.toHaveBeenCalled(); + expect(result).toBe(true); + }); + + it('returns false from better-auth verifyPassword on mismatch', async () => { + mocks.verifyPassword.mockResolvedValue(false); + const result = await verifyPasswordCompat({ hash: 'scrypt:somehash', password: 'bad' }); + expect(result).toBe(false); + }); +}); + +describe('generateAppleClientSecret()', () => { + const baseEnv = { + APPLE_PRIVATE_KEY: '-----BEGIN PRIVATE KEY-----\nfake\n-----END PRIVATE KEY-----', + APPLE_KEY_ID: 'KEYID123', + APPLE_TEAM_ID: 'TEAMID456', + APPLE_CLIENT_ID: 'com.example.app', + }; + + beforeEach(() => vi.clearAllMocks()); + + it('returns null when APPLE_PRIVATE_KEY is not set', async () => { + const result = await generateAppleClientSecret({ APPLE_PRIVATE_KEY: '' } as never); + expect(result).toBeNull(); + expect(mocks.importPKCS8).not.toHaveBeenCalled(); + }); + + it('returns a signed JWT string on success', async () => { + const fakeKey = {}; + mocks.importPKCS8.mockResolvedValue(fakeKey); + mocks.signJwt.mockResolvedValue('signed.jwt.token'); + + const result = await generateAppleClientSecret(baseEnv as never); + expect(result).toBe('signed.jwt.token'); + expect(mocks.importPKCS8).toHaveBeenCalledWith(baseEnv.APPLE_PRIVATE_KEY, 'ES256'); + expect(mocks.signJwt).toHaveBeenCalledWith(fakeKey); + }); + + it('returns null and warns when importPKCS8 throws', async () => { + mocks.importPKCS8.mockRejectedValue(new Error('bad key')); + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}); + + const result = await generateAppleClientSecret(baseEnv as never); + expect(result).toBeNull(); + expect(warnSpy).toHaveBeenCalledWith( + expect.stringContaining('Apple client-secret generation failed'), + expect.any(Error), + ); + warnSpy.mockRestore(); + }); + + it('returns null and warns when sign throws', async () => { + mocks.importPKCS8.mockResolvedValue({}); + mocks.signJwt.mockRejectedValue(new Error('sign failed')); + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}); + + const result = await generateAppleClientSecret(baseEnv as never); + expect(result).toBeNull(); + warnSpy.mockRestore(); + }); +}); diff --git a/packages/api/src/auth/auth.config.ts b/packages/api/src/auth/auth.config.ts index e8f21594b3..dba1f58e03 100644 --- a/packages/api/src/auth/auth.config.ts +++ b/packages/api/src/auth/auth.config.ts @@ -12,7 +12,7 @@ import { drizzleAdapter } from '@better-auth/drizzle-adapter'; import { neon } from '@neondatabase/serverless'; -import * as schema from '@packrat/api/db/schema'; +import * as schema from '@packrat/db'; import { betterAuth } from 'better-auth'; import { admin, bearer, jwt } from 'better-auth/plugins'; import { drizzle } from 'drizzle-orm/neon-http'; @@ -69,7 +69,7 @@ export const auth = betterAuth({ }, }, - plugins: [bearer(), jwt(), admin()], + plugins: [bearer(), jwt({ jwks: { disablePrivateKeyEncryption: true } }), admin()], trustedOrigins: ['http://localhost:8787', 'packrat://'], }); diff --git a/packages/api/src/auth/auth.helpers.ts b/packages/api/src/auth/auth.helpers.ts new file mode 100644 index 0000000000..e63fd2fc38 --- /dev/null +++ b/packages/api/src/auth/auth.helpers.ts @@ -0,0 +1,46 @@ +import { verifyPassword } from '@better-auth/utils/password'; +import type { ValidatedEnv } from '@packrat/api/utils/env-validation'; +import * as bcrypt from 'bcryptjs'; +import { importPKCS8, SignJWT } from 'jose'; + +// Matches bcrypt hashes ($2a$, $2b$, $2y$) left over from pre-migration auth. +const BCRYPT_HASH_RE = /^\$2[aby]\$/; + +export async function verifyPasswordCompat({ + hash, + password, +}: { + hash: string; + password: string; +}): Promise { + if (BCRYPT_HASH_RE.test(hash)) { + return bcrypt.compare(password, hash); + } + return verifyPassword(hash, password); +} + +// Apple requires a JWT as the OAuth2 client secret. It is valid for up to +// 6 months, so we regenerate it once per isolate (WeakMap cache in index.ts +// handles the per-request dedup). +// Returns null when Apple credentials are not configured (e.g., in tests). +export async function generateAppleClientSecret(env: ValidatedEnv): Promise { + if (!env.APPLE_PRIVATE_KEY) return null; + try { + const privateKey = await importPKCS8(env.APPLE_PRIVATE_KEY, 'ES256'); + const now = Math.floor(Date.now() / 1000); + return await new SignJWT({}) + .setProtectedHeader({ alg: 'ES256', kid: env.APPLE_KEY_ID }) + .setIssuer(env.APPLE_TEAM_ID) + .setSubject(env.APPLE_CLIENT_ID) + .setAudience('https://appleid.apple.com') + .setIssuedAt(now) + .setExpirationTime(now + 60 * 60 * 24 * 180) // 180 days + .sign(privateKey); + } catch (err) { + console.warn( + '[auth] Apple client-secret generation failed; web OAuth flow will be unavailable:', + err, + ); + return null; + } +} diff --git a/packages/api/src/auth/index.ts b/packages/api/src/auth/index.ts index a0f0621d9c..e7fd940aff 100644 --- a/packages/api/src/auth/index.ts +++ b/packages/api/src/auth/index.ts @@ -3,81 +3,49 @@ * * getAuth(env) is called per-request so each isolate invocation picks up the * correct KV binding, credentials, and DB connection. The result is cached - * in a WeakMap keyed by the raw env object so the instance is reused across + * in a Map keyed by NEON_DATABASE_URL so the same instance is reused across * requests within the same isolate lifetime. */ import { drizzleAdapter } from '@better-auth/drizzle-adapter'; import { expo } from '@better-auth/expo'; -import { verifyPassword } from '@better-auth/utils/password'; -import { neon } from '@neondatabase/serverless'; -import * as schema from '@packrat/api/db/schema'; +import { generateAppleClientSecret, verifyPasswordCompat } from '@packrat/api/auth/auth.helpers'; +import { createConnection } from '@packrat/api/db'; import type { ValidatedEnv } from '@packrat/api/utils/env-validation'; -import * as bcrypt from 'bcryptjs'; +import * as schema from '@packrat/db'; +import { isObject } from '@packrat/guards'; import { betterAuth } from 'better-auth'; import { admin, bearer, jwt } from 'better-auth/plugins'; -import { drizzle } from 'drizzle-orm/neon-http'; -import { importPKCS8, SignJWT } from 'jose'; - -// Matches bcrypt hashes ($2a$, $2b$, $2y$) left over from pre-migration auth. -const BCRYPT_HASH_RE = /^\$2[aby]\$/; - -async function verifyPasswordCompat({ - hash, - password, -}: { - hash: string; - password: string; -}): Promise { - if (BCRYPT_HASH_RE.test(hash)) { - return bcrypt.compare(password, hash); - } - return verifyPassword(hash, password); -} - -// ─── Apple client-secret generation ────────────────────────────────────────── -// Apple requires a JWT as the OAuth2 client secret. It is valid for up to -// 6 months, so we regenerate it once per isolate (WeakMap cache below -// handles the per-request dedup). -// Returns null when Apple credentials are not configured (e.g., in tests). -async function generateAppleClientSecret(env: ValidatedEnv): Promise { - if (!env.APPLE_PRIVATE_KEY) return null; - try { - const privateKey = await importPKCS8(env.APPLE_PRIVATE_KEY, 'ES256'); - const now = Math.floor(Date.now() / 1000); - return await new SignJWT({}) - .setProtectedHeader({ alg: 'ES256', kid: env.APPLE_KEY_ID }) - .setIssuer(env.APPLE_TEAM_ID) - .setSubject(env.APPLE_CLIENT_ID) - .setAudience('https://appleid.apple.com') - .setIssuedAt(now) - .setExpirationTime(now + 60 * 60 * 24 * 180) // 180 days - .sign(privateKey); - } catch (err) { - // Malformed or placeholder key — log so the issue is visible, then fall - // through so the provider is still registered for the native id-token flow - // (which verifies against Apple's public JWKS and does not use this secret). - console.warn( - '[auth] Apple client-secret generation failed; web OAuth flow will be unavailable:', - err, - ); - return null; - } -} // ─── Per-isolate auth instance cache ───────────────────────────────────────── +// Stores the in-flight Promise so concurrent requests that arrive before the +// first initialization completes all await the same Promise rather than each +// kicking off a redundant build. Evicted on rejection so the next call retries. +// Keyed by NEON_DATABASE_URL|BETTER_AUTH_URL — miniflare creates a new env +// object per request, so a WeakMap never hits; the URL composite key is stable +// within an isolate lifetime and distinguishes different env configurations. // biome-ignore lint/suspicious/noExplicitAny: Better Auth's generic type parameter is too specific to the exact plugin set — can't use ReturnType here -const authCache = new WeakMap(); +const authCache = new Map>(); // biome-ignore lint/suspicious/noExplicitAny: Better Auth instance type is plugin-specific and can't be expressed at declaration time without duplicating the full config signature export async function getAuth(env: ValidatedEnv): Promise { - const cached = authCache.get(env as object); + const cacheKey = `${env.NEON_DATABASE_URL}|${env.BETTER_AUTH_URL}`; + const cached = authCache.get(cacheKey); if (cached) return cached; + const promise = buildAuth(env).catch((err) => { + authCache.delete(cacheKey); + throw err; + }); + authCache.set(cacheKey, promise); + return promise; +} + +// biome-ignore lint/suspicious/noExplicitAny: Better Auth instance type is plugin-specific and can't be expressed at declaration time without duplicating the full config signature +async function buildAuth(env: ValidatedEnv): Promise { const appleClientSecret = await generateAppleClientSecret(env); - // Use the HTTP Neon driver — no long-lived connections inside a Worker. - const db = drizzle(neon(env.NEON_DATABASE_URL), { schema }); + const db = createConnection({ url: env.NEON_DATABASE_URL, useNeonHttp: true }); const auth = betterAuth({ baseURL: env.BETTER_AUTH_URL, @@ -101,7 +69,12 @@ export async function getAuth(env: ValidatedEnv): Promise { get: async (key: string) => env.AUTH_KV.get(key), // biome-ignore lint/complexity/useMaxParams: Better Auth secondaryStorage.set interface requires 3 params set: async (key: string, value: string, ttl?: number) => { - await env.AUTH_KV.put(key, value, ttl ? { expirationTtl: ttl } : undefined); + // KV requires a minimum expirationTtl of 60 seconds. + await env.AUTH_KV.put( + key, + value, + ttl !== undefined ? { expirationTtl: Math.max(60, ttl) } : undefined, + ); }, delete: async (key: string) => env.AUTH_KV.delete(key), } @@ -181,7 +154,32 @@ export async function getAuth(env: ValidatedEnv): Promise { // JWT: issues asymmetric JWTs and exposes a JWKS endpoint at // /api/auth/jwks for downstream service verification. - jwt(), + // Private key encryption is disabled — it causes decrypt failures when + // BETTER_AUTH_SECRET rotates or differs across environments. + // + // The adapter.getJwks filter skips any rows that were stored in the old + // encrypted format (where JSON.parse(privateKey) returns a string rather + // than a JWK object). Better Auth creates a fresh plaintext key when the + // filtered list is empty, resolving the "JWK must be an object" error that + // occurs after switching from encrypted to plaintext storage. + jwt({ + jwks: { disablePrivateKeyEncryption: true }, + adapter: { + // biome-ignore lint/suspicious/noExplicitAny: Better Auth ctx/key/jwks generics are not expressible here + getJwks: async (ctx: any) => { + // biome-ignore lint/suspicious/noExplicitAny: jwks row type from Better Auth is not exported + const keys: any[] = (await ctx.context.adapter.findMany({ model: 'jwks' })) ?? []; + // biome-ignore lint/suspicious/noExplicitAny: jwks row type from Better Auth is not exported + return keys.filter((key: any) => { + try { + return isObject(JSON.parse(key.privateKey)); + } catch { + return false; + } + }); + }, + }, + }), // Admin: role-based user management endpoints. admin(), @@ -209,7 +207,6 @@ export async function getAuth(env: ValidatedEnv): Promise { ], }); - authCache.set(env as object, auth); return auth; } diff --git a/packages/api/src/containers/AppContainer.ts b/packages/api/src/containers/AppContainer.ts index 85b2892592..96c6489e65 100644 --- a/packages/api/src/containers/AppContainer.ts +++ b/packages/api/src/containers/AppContainer.ts @@ -1,6 +1,6 @@ import { env } from 'cloudflare:workers'; import { Container } from '@cloudflare/containers'; -import type { Env } from '@packrat/api/types/env'; +import type { Env } from '@packrat/api/utils/env-validation'; const typedEnv = env as unknown as Env; // safe-cast: Cloudflare Durable Object constructor — module-level env from 'cloudflare:workers' is injected by the runtime with the correct Env shape diff --git a/packages/api/src/db/index.ts b/packages/api/src/db/index.ts index 5daf38ddf8..59b9f5e343 100644 --- a/packages/api/src/db/index.ts +++ b/packages/api/src/db/index.ts @@ -1,7 +1,7 @@ import { Pool as NeonPool, neon } from '@neondatabase/serverless'; -import * as schema from '@packrat/api/db/schema'; import type { ValidatedEnv } from '@packrat/api/utils/env-validation'; import { getEnv } from '@packrat/api/utils/env-validation'; +import * as schema from '@packrat/db/schema'; import { drizzle } from 'drizzle-orm/neon-http'; import { drizzle as drizzleServerless } from 'drizzle-orm/neon-serverless'; import { drizzle as drizzlePg } from 'drizzle-orm/node-postgres'; @@ -31,12 +31,24 @@ const isStandardPostgresUrl = (url: string) => { const pgPools = new Map(); -const createConnection = (url: string, useNeonHttp?: boolean) => { +export const createConnection = ({ url, useNeonHttp }: { url: string; useNeonHttp?: boolean }) => { if (isStandardPostgresUrl(url)) { let pool = pgPools.get(url); if (!pool) { - pool = new Pool({ connectionString: url }); - pgPools.set(url, pool); + const newPool = new Pool({ + connectionString: url, + max: 5, + // idleTimeoutMillis: 0 prevents pg.Pool from calling setTimeout().unref(), + // which is not supported in the Cloudflare Workers runtime (miniflare). + idleTimeoutMillis: 0, + connectionTimeoutMillis: 10000, + }); + newPool.on('error', () => { + pgPools.delete(url); + newPool.end().catch(() => {}); + }); + pgPools.set(url, newPool); + pool = newPool; } return drizzlePg(pool, { schema }); } @@ -54,7 +66,7 @@ const createConnection = (url: string, useNeonHttp?: boolean) => { */ export const createDb = () => { const { NEON_DATABASE_URL } = getEnv(); - return createConnection(NEON_DATABASE_URL); + return createConnection({ url: NEON_DATABASE_URL }); }; /** @@ -62,7 +74,7 @@ export const createDb = () => { */ export const createReadOnlyDb = () => { const { NEON_DATABASE_URL_READONLY } = getEnv(); - return createConnection(NEON_DATABASE_URL_READONLY); + return createConnection({ url: NEON_DATABASE_URL_READONLY }); }; /** @@ -80,7 +92,7 @@ export const createOsmDb = () => { 'OSM_DATABASE_URL is not configured — trail features are disabled on this server', ); } - return createConnection(OSM_DATABASE_URL); + return createConnection({ url: OSM_DATABASE_URL }); }; /** @@ -88,5 +100,5 @@ export const createOsmDb = () => { * Used from the queue handler which has direct access to the validated env. */ export const createDbClient = (env: ValidatedEnv) => { - return createConnection(env.NEON_DATABASE_URL, true); + return createConnection({ url: env.NEON_DATABASE_URL, useNeonHttp: true }); }; diff --git a/packages/api/src/db/seed-e2e-catalog.ts b/packages/api/src/db/seed-e2e-catalog.ts index 574509c013..3dc43b1d1e 100644 --- a/packages/api/src/db/seed-e2e-catalog.ts +++ b/packages/api/src/db/seed-e2e-catalog.ts @@ -14,12 +14,12 @@ */ import { neon, neonConfig } from '@neondatabase/serverless'; +import * as schema from '@packrat/db/schema'; import { nodeEnv } from '@packrat/env/node'; import { drizzle, type NeonHttpDatabase } from 'drizzle-orm/neon-http'; import { drizzle as drizzlePg, type NodePgDatabase } from 'drizzle-orm/node-postgres'; import { Client } from 'pg'; import WebSocket from 'ws'; -import * as schema from './schema'; neonConfig.webSocketConstructor = WebSocket; diff --git a/packages/api/src/db/seed-e2e-user.ts b/packages/api/src/db/seed-e2e-user.ts index 65feab5b68..0bd9795c0b 100644 --- a/packages/api/src/db/seed-e2e-user.ts +++ b/packages/api/src/db/seed-e2e-user.ts @@ -10,14 +10,14 @@ */ import { neon, neonConfig } from '@neondatabase/serverless'; +import * as schema from '@packrat/db/schema'; import { nodeEnv } from '@packrat/env/node'; -import { and, eq } from 'drizzle-orm'; +import { eq } from 'drizzle-orm'; import { drizzle, type NeonHttpDatabase } from 'drizzle-orm/neon-http'; import { drizzle as drizzlePg, type NodePgDatabase } from 'drizzle-orm/node-postgres'; import { Client } from 'pg'; import WebSocket from 'ws'; import { hashPassword } from '../utils/auth'; -import * as schema from './schema'; neonConfig.webSocketConstructor = WebSocket; @@ -74,10 +74,11 @@ async function seedE2EUser() { .where(eq(schema.users.id, userId)); console.log(`E2E user refreshed: ${normalizedEmail} (id=${userId})`); } else { + userId = crypto.randomUUID(); const [inserted] = await db .insert(schema.users) .values({ - id: crypto.randomUUID(), + id: userId, name: 'E2E Automation', email: normalizedEmail, passwordHash, @@ -87,38 +88,28 @@ async function seedE2EUser() { role: 'USER', }) .returning(); - if (!inserted) throw new Error('users insert returned no row'); - userId = inserted.id; + userId = inserted?.id ?? userId; console.log(`E2E user created: ${normalizedEmail} (id=${userId})`); } - // Better Auth's email/password sign-in reads the password from the - // `account` table (providerId='credential'), not `users.password_hash`. - // The 0042 data-migration only copies users → account at migrate time, so - // any user created after that migration (this seed, fresh dev DBs) needs - // an explicit credential row to be sign-in-able. - const existingAccount = await db - .select({ id: schema.account.id }) - .from(schema.account) - .where(and(eq(schema.account.userId, userId), eq(schema.account.providerId, 'credential'))) - .limit(1); - - if (existingAccount[0]) { - await db - .update(schema.account) - .set({ password: passwordHash, updatedAt: new Date() }) - .where(eq(schema.account.id, existingAccount[0].id)); - console.log(`Credential account refreshed for ${normalizedEmail}`); - } else { - await db.insert(schema.account).values({ + // Upsert the credential account row that better-auth looks up during sign-in. + // better-auth sets accountId = email for the 'credential' provider. + await db + .insert(schema.account) + .values({ id: crypto.randomUUID(), - accountId: userId, + accountId: normalizedEmail, providerId: 'credential', userId, password: passwordHash, + createdAt: new Date(), + updatedAt: new Date(), + }) + .onConflictDoUpdate({ + target: [schema.account.providerId, schema.account.accountId], + set: { userId, password: passwordHash, updatedAt: new Date() }, }); - console.log(`Credential account created for ${normalizedEmail}`); - } + console.log(`E2E credential account upserted for: ${normalizedEmail}`); } finally { await pgClient?.end(); } diff --git a/packages/api/src/db/seed.ts b/packages/api/src/db/seed.ts index 2efae017c0..feed0a1b45 100644 --- a/packages/api/src/db/seed.ts +++ b/packages/api/src/db/seed.ts @@ -17,13 +17,13 @@ */ import { neon, neonConfig } from '@neondatabase/serverless'; +import * as schema from '@packrat/db/schema'; import { nodeEnv } from '@packrat/env/node'; import { and, eq } from 'drizzle-orm'; import { drizzle, type NeonHttpDatabase } from 'drizzle-orm/neon-http'; import { drizzle as drizzlePg, type NodePgDatabase } from 'drizzle-orm/node-postgres'; import { Client } from 'pg'; import WebSocket from 'ws'; -import * as schema from './schema'; neonConfig.webSocketConstructor = WebSocket; diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index f871f2cd63..1a41528c0a 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -14,9 +14,11 @@ import { AppContainer } from '@packrat/api/containers'; import { routes } from '@packrat/api/routes'; import { CatalogService } from '@packrat/api/services'; import { processQueueBatch } from '@packrat/api/services/etl/queue'; -import type { Env } from '@packrat/api/types/env'; +import type { Env } from '@packrat/api/utils/env-validation'; import { getEnv, setWorkerEnv } from '@packrat/api/utils/env-validation'; import { packratOpenApi } from '@packrat/api/utils/openapi'; +import { captureApiException } from '@packrat/api/utils/sentry'; +import { withSentry } from '@sentry/cloudflare'; import { Elysia } from 'elysia'; import { CloudflareAdapter } from 'elysia/adapter/cloudflare-worker'; import type { CatalogETLMessage } from './services/etl/types'; @@ -63,6 +65,8 @@ export const app = new Elysia({ adapter: CloudflareAdapter }) const allowed = [ /^https:\/\/(www\.)?packrat\.world$/, /^https:\/\/[\w-]+\.packrat\.world$/, + /^https:\/\/[\w-]+\.packratai\.com$/, + /^https?:\/\/[\w-]+\.workers\.dev$/, /^http:\/\/localhost:\d+$/, /^exp:\/\//, ]; @@ -73,8 +77,21 @@ export const app = new Elysia({ adapter: CloudflareAdapter }) }), ) .use(packratOpenApi) - .onError(({ error, code }) => { - console.error('Error occurred:', error); + .onError(({ error, code, request }) => { + // Only report unexpected server errors — not user-input or routing errors. + if (code !== 'VALIDATION' && code !== 'PARSE' && code !== 'NOT_FOUND') { + captureApiException({ + error: error, + operation: 'elysia.onError', + tags: { + error_code: String(code), + method: request?.method ?? 'UNKNOWN', + path: request ? new URL(request.url).pathname : 'UNKNOWN', + }, + extra: { errorCode: String(code), httpStatus: 500 }, + }); + } + if (code === 'VALIDATION' || code === 'PARSE') { return new Response(JSON.stringify({ error: 'Validation failed' }), { status: 400, @@ -118,7 +135,7 @@ function enrichEnv(env: Env): Env { return env; } -export default { +const workerHandler = { async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise { const e = enrichEnv(env); setWorkerEnv(e as unknown as Record); // safe-cast: setWorkerEnv accepts Record; ValidatedEnv has no index signature by design @@ -186,17 +203,40 @@ export default { async queue(batch: MessageBatch, env: Env): Promise { setWorkerEnv(enrichEnv(env) as unknown as Record); // safe-cast: same as fetch handler above - if (batch.queue === 'packrat-etl-queue' || batch.queue === 'packrat-etl-queue-dev') { - if (!env.ETL_QUEUE) throw new Error('ETL_QUEUE is not configured'); - await processQueueBatch({ batch: batch as MessageBatch, env }); // safe-cast: batch queue name checked above; MessageBatch is compatible at runtime - } else if ( - batch.queue === 'packrat-embeddings-queue' || - batch.queue === 'packrat-embeddings-queue-dev' - ) { - if (!env.EMBEDDINGS_QUEUE) throw new Error('EMBEDDINGS_QUEUE is not configured'); - await new CatalogService(env, true).handleEmbeddingsBatch(batch); - } else { - throw new Error(`Unknown queue: ${batch.queue}`); + try { + if (batch.queue === 'packrat-etl-queue' || batch.queue === 'packrat-etl-queue-dev') { + if (!env.ETL_QUEUE) throw new Error('ETL_QUEUE is not configured'); + await processQueueBatch({ batch: batch as MessageBatch, env }); // safe-cast: batch queue name checked above; MessageBatch is compatible at runtime + } else if ( + batch.queue === 'packrat-embeddings-queue' || + batch.queue === 'packrat-embeddings-queue-dev' + ) { + if (!env.EMBEDDINGS_QUEUE) throw new Error('EMBEDDINGS_QUEUE is not configured'); + await new CatalogService({ explicitEnv: env, useHttpDriver: true }).handleEmbeddingsBatch( + batch, + ); + } else { + throw new Error(`Unknown queue: ${batch.queue}`); + } + } catch (error) { + captureApiException({ + error: error, + operation: 'queue.handler', + tags: { queue_name: batch.queue }, + extra: { messageCount: batch.messages.length }, + }); + throw error; } }, } satisfies ExportedHandler; + +export default withSentry( + (env) => ({ + dsn: env.SENTRY_DSN, + environment: env.ENVIRONMENT ?? 'production', + tracesSampleRate: env.ENVIRONMENT === 'production' ? 0.1 : 1.0, + sendDefaultPii: false, + release: env.SENTRY_RELEASE, + }), + workerHandler, +); diff --git a/packages/api/src/middleware/__tests__/cfAccess.test.ts b/packages/api/src/middleware/__tests__/cfAccess.test.ts index 55daf62b54..bd74d00402 100644 --- a/packages/api/src/middleware/__tests__/cfAccess.test.ts +++ b/packages/api/src/middleware/__tests__/cfAccess.test.ts @@ -125,70 +125,70 @@ describe('verifyCFAccessRequest', () => { it('returns { email } for a valid RS256 JWT with correct iss + aud', async () => { const token = await makeCFJwt({ privateKey }); - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-jwt-assertion': token }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-jwt-assertion': token }), opts, - ); + }); expect(result).toEqual({ email: 'admin@example.com' }); }); it('returns null when the cf-access-jwt-assertion header is absent', async () => { - const result = await verifyCFAccessRequest(makeRequest(), opts); + const result = await verifyCFAccessRequest({ request: makeRequest(), opts }); expect(result).toBeNull(); }); it('returns null for a JWT with a wrong audience', async () => { const token = await makeCFJwt({ privateKey, aud: 'wrong-audience' }); - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-jwt-assertion': token }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-jwt-assertion': token }), opts, - ); + }); expect(result).toBeNull(); }); it('returns null for a JWT with a wrong issuer', async () => { const token = await makeCFJwt({ privateKey, iss: 'https://attacker.cloudflareaccess.com' }); - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-jwt-assertion': token }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-jwt-assertion': token }), opts, - ); + }); expect(result).toBeNull(); }); it('returns null for a JWT signed by an untrusted key', async () => { const token = await makeCFJwt({ privateKey: untrustedPrivateKey }); - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-jwt-assertion': token }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-jwt-assertion': token }), opts, - ); + }); expect(result).toBeNull(); }); it('returns null when the JWT payload is missing the email field', async () => { const token = await makeCFJwt({ privateKey, omitEmail: true }); - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-jwt-assertion': token }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-jwt-assertion': token }), opts, - ); + }); expect(result).toBeNull(); }); it('returns null when the JWT payload has an empty string email', async () => { const token = await makeCFJwt({ privateKey, email: '' }); - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-jwt-assertion': token }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-jwt-assertion': token }), opts, - ); + }); expect(result).toBeNull(); }); it('returns null when only CF-Access-Authenticated-User-Email header is present (old spoofable vector)', async () => { // The pre-PR code trusted this header directly. The new code requires a // cryptographically verified JWT in cf-access-jwt-assertion. - const result = await verifyCFAccessRequest( - makeRequest({ 'cf-access-authenticated-user-email': 'admin@example.com' }), + const result = await verifyCFAccessRequest({ + request: makeRequest({ 'cf-access-authenticated-user-email': 'admin@example.com' }), opts, - ); + }); expect(result).toBeNull(); }); }); diff --git a/packages/api/src/middleware/adminMiddleware.ts b/packages/api/src/middleware/adminMiddleware.ts deleted file mode 100644 index 4ff784e907..0000000000 --- a/packages/api/src/middleware/adminMiddleware.ts +++ /dev/null @@ -1 +0,0 @@ -export { adminAuthPlugin as adminMiddleware } from './auth'; diff --git a/packages/api/src/middleware/apiKeyAuth.ts b/packages/api/src/middleware/apiKeyAuth.ts deleted file mode 100644 index f378d8743d..0000000000 --- a/packages/api/src/middleware/apiKeyAuth.ts +++ /dev/null @@ -1 +0,0 @@ -export { apiKeyAuthPlugin as apiKeyAuthMiddleware } from './auth'; diff --git a/packages/api/src/middleware/auth.ts b/packages/api/src/middleware/auth.ts index 507378091b..b1a279ca48 100644 --- a/packages/api/src/middleware/auth.ts +++ b/packages/api/src/middleware/auth.ts @@ -2,6 +2,7 @@ import { getAuth } from '@packrat/api/auth'; import { isValidApiKey } from '@packrat/api/utils/auth'; import type { ValidatedEnv } from '@packrat/api/utils/env-validation'; import { getEnv } from '@packrat/api/utils/env-validation'; +import { apiAddBreadcrumb, captureApiException, setApiUser } from '@packrat/api/utils/sentry'; import { Elysia, status } from 'elysia'; export type AuthUser = { @@ -22,17 +23,42 @@ export const authPlugin = new Elysia({ name: 'packrat-auth' }).macro({ resolve: async ({ request }: { request: Request }) => { const env = getEnv() as ValidatedEnv; // safe-cast: Worker env validated at startup; TS can't narrow the return type const auth = await getAuth(env); - const session = await auth.api.getSession({ headers: request.headers }); - if (!session) return status(401, { error: 'Unauthorized' }); - return { - user: { - userId: session.user.id, - role: (session.user as unknown as { role?: string }).role ?? 'USER', - email: session.user.email, - name: session.user.name, - }, + let session: Awaited>; + try { + session = await auth.api.getSession({ headers: request.headers }); + } catch (error) { + captureApiException({ + error: error, + operation: 'auth.getSession', + tags: { path: new URL(request.url).pathname }, + extra: { httpStatus: 500, errorCode: 'AUTH_SESSION_UNAVAILABLE' }, + }); + return status(500, { error: 'Authentication service unavailable' }); + } + + if (!session) { + apiAddBreadcrumb({ + category: 'auth', + message: 'Unauthenticated request rejected', + level: 'warning', + data: { path: new URL(request.url).pathname, method: request.method }, + }); + return status(401, { error: 'Unauthorized' }); + } + + const user = { + userId: session.user.id, + role: (session.user as unknown as { role?: string }).role ?? 'USER', + email: session.user.email, + name: session.user.name, }; + + // Attach user to the Sentry scope for this request so all subsequent + // captures are automatically associated with the authenticated user. + setApiUser({ id: user.userId, email: user.email, role: user.role }); + + return { user }; }, }, }); @@ -45,11 +71,34 @@ export const adminAuthPlugin = new Elysia({ name: 'packrat-admin-auth' }).use(au resolve: async ({ request }: { request: Request }) => { const env = getEnv() as ValidatedEnv; // safe-cast: Worker env validated at startup; TS can't narrow the return type const auth = await getAuth(env); - const session = await auth.api.getSession({ headers: request.headers }); + + let session: Awaited>; + try { + session = await auth.api.getSession({ headers: request.headers }); + } catch (error) { + captureApiException({ + error: error, + operation: 'adminAuth.getSession', + tags: { path: new URL(request.url).pathname }, + extra: { httpStatus: 500, errorCode: 'AUTH_SESSION_UNAVAILABLE' }, + }); + return status(500, { error: 'Authentication service unavailable' }); + } + if (!session) return status(401, { error: 'Unauthorized' }); const role = (session.user as unknown as { role?: string }).role; - if (role !== 'ADMIN') return status(403, { error: 'Forbidden' }); + if (role !== 'ADMIN') { + apiAddBreadcrumb({ + category: 'auth', + message: 'Admin access denied', + level: 'warning', + data: { userId: session.user.id, role, path: new URL(request.url).pathname }, + }); + return status(403, { error: 'Forbidden' }); + } + + setApiUser({ id: session.user.id, email: session.user.email, role: 'ADMIN' }); return { user: { @@ -70,6 +119,12 @@ export const apiKeyAuthPlugin = new Elysia({ name: 'packrat-api-key-auth' }).mac isValidApiKey: { resolve: ({ request }: { request: Request }) => { if (isValidApiKey(request.headers)) return { authorized: true }; + apiAddBreadcrumb({ + category: 'auth', + message: 'Invalid API key rejected', + level: 'warning', + data: { path: new URL(request.url).pathname }, + }); return status(401, { error: 'Unauthorized' }); }, }, diff --git a/packages/api/src/middleware/cfAccess.ts b/packages/api/src/middleware/cfAccess.ts index f64448411a..9abcf3780d 100644 --- a/packages/api/src/middleware/cfAccess.ts +++ b/packages/api/src/middleware/cfAccess.ts @@ -24,10 +24,13 @@ interface CFAccessOptions { aud: string; } -export async function verifyCFAccessRequest( - request: Request, - opts: CFAccessOptions, -): Promise { +export async function verifyCFAccessRequest({ + request, + opts, +}: { + request: Request; + opts: CFAccessOptions; +}): Promise { const { teamDomain, aud } = opts; const token = request.headers.get('cf-access-jwt-assertion'); if (!token) return null; diff --git a/packages/api/src/routes/admin/analytics/catalog.ts b/packages/api/src/routes/admin/analytics/catalog.ts index 44f9bf71d5..90b901add5 100644 --- a/packages/api/src/routes/admin/analytics/catalog.ts +++ b/packages/api/src/routes/admin/analytics/catalog.ts @@ -1,14 +1,20 @@ import { createDb } from '@packrat/api/db'; -import { catalogItems, etlJobs } from '@packrat/api/db/schema'; +import { queueCatalogETL } from '@packrat/api/services/etl/queue'; +import { getEnv } from '@packrat/api/utils/env-validation'; +import { catalogItems, etlJobs, invalidItemLogs } from '@packrat/db'; import { AdminErrorResponses, BrandRowSchema, CatalogOverviewSchema, + EtlFailureSummarySchema, + EtlJobFailuresSchema, + EtlResetStuckSchema, EtlResponseSchema, + EtlRetrySchema, PriceBucketSchema, -} from '@packrat/api/schemas/admin'; -import { and, avg, count, desc, gt, isNotNull, max, min, sql } from 'drizzle-orm'; -import { Elysia, status, t } from 'elysia'; +} from '@packrat/schemas/admin'; +import { and, avg, count, desc, eq, gt, isNotNull, lt, max, min, sql } from 'drizzle-orm'; +import { Elysia, status } from 'elysia'; import { z } from 'zod'; export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) @@ -59,14 +65,14 @@ export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) return { totalItems: t.totalItems, - totalBrands: t.totalBrands, + totalBrands: Number(t.totalBrands), avgPrice: t.avgPrice != null ? Math.round(Number(t.avgPrice) * 100) / 100 : null, minPrice: t.minPrice != null ? Number(t.minPrice) : null, maxPrice: t.maxPrice != null ? Number(t.maxPrice) : null, embeddingCoverage: { total: e.total, - withEmbedding: e.withEmbedding, - pct: e.total > 0 ? Math.round((e.withEmbedding / e.total) * 1000) / 10 : 0, + withEmbedding: Number(e.withEmbedding), + pct: e.total > 0 ? Math.round((Number(e.withEmbedding) / e.total) * 1000) / 10 : 0, }, availability: availabilityStats.map((r) => ({ status: r.status ?? null, @@ -125,9 +131,9 @@ export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) }, { query: z.object({ - limit: z.coerce.number().int().min(1).max(100).optional().default(25), + limit: z.coerce.number().int().min(1).max(100).optional(), }), - response: { 200: t.Array(BrandRowSchema), ...AdminErrorResponses }, + response: { 200: z.array(BrandRowSchema), ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'Top gear brands' }, }, ) @@ -164,7 +170,7 @@ export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) } }, { - response: { 200: t.Array(PriceBucketSchema), ...AdminErrorResponses }, + response: { 200: z.array(PriceBucketSchema), ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'Price distribution' }, }, ) @@ -209,9 +215,9 @@ export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) })), summary: { totalRuns: s?.totalRuns ?? 0, - completed: s?.completed ?? 0, - failed: s?.failed ?? 0, - totalItemsIngested: s?.totalItemsIngested ?? 0, + completed: Number(s?.completed ?? 0), + failed: Number(s?.failed ?? 0), + totalItemsIngested: Number(s?.totalItemsIngested ?? 0), }, }; } catch (error) { @@ -221,7 +227,7 @@ export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) }, { query: z.object({ - limit: z.coerce.number().int().min(1).max(200).optional().default(50), + limit: z.coerce.number().int().min(1).max(200).optional(), }), response: { 200: EtlResponseSchema, ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'ETL pipeline history' }, @@ -257,4 +263,208 @@ export const catalogAnalyticsRoutes = new Elysia({ prefix: '/catalog' }) } }, { detail: { tags: ['Admin'], summary: 'Embedding coverage' } }, + ) + + // ─── ETL failure summary ────────────────────────────────────────────────────── + + .get( + '/etl/failure-summary', + async ({ query }) => { + const db = createDb(); + const { limit = 20 } = query; + + try { + const [rows, [total]] = await Promise.all([ + db.execute<{ field: string; reason: string; count: number }>( + sql` + SELECT + err->>'field' AS field, + err->>'reason' AS reason, + COUNT(*)::int AS count + FROM ${invalidItemLogs}, + jsonb_array_elements(${invalidItemLogs.errors}) AS err + GROUP BY err->>'field', err->>'reason' + ORDER BY count DESC + LIMIT ${limit} + `, + ), + db.select({ n: count() }).from(invalidItemLogs), + ]); + + return { + topErrors: rows.rows.map((r) => ({ + field: r.field, + reason: r.reason, + count: r.count, + })), + totalInvalidItems: total?.n ?? 0, + }; + } catch (error) { + console.error('ETL failure summary error:', error); + return status(500, { + error: 'Failed to fetch failure summary', + code: 'ETL_FAILURE_SUMMARY_ERROR', + }); + } + }, + { + query: z.object({ + limit: z.coerce.number().int().min(1).max(100).optional(), + }), + response: { 200: EtlFailureSummarySchema, ...AdminErrorResponses }, + detail: { tags: ['Admin'], summary: 'Top ETL validation failure patterns' }, + }, + ) + + // ─── Per-job failure drill-down ─────────────────────────────────────────────── + + .get( + '/etl/:jobId/failures', + async ({ params, query }) => { + const db = createDb(); + const { limit = 50 } = query; + + try { + const [samples, breakdown] = await Promise.all([ + db + .select() + .from(invalidItemLogs) + .where(eq(invalidItemLogs.jobId, params.jobId)) + .orderBy(invalidItemLogs.rowIndex) + .limit(limit), + db.execute<{ field: string; reason: string; count: number }>( + sql` + SELECT + err->>'field' AS field, + err->>'reason' AS reason, + COUNT(*)::int AS count + FROM ${invalidItemLogs}, + jsonb_array_elements(${invalidItemLogs.errors}) AS err + WHERE ${invalidItemLogs.jobId} = ${params.jobId} + GROUP BY err->>'field', err->>'reason' + ORDER BY count DESC + `, + ), + ]); + + return { + jobId: params.jobId, + errorBreakdown: breakdown.rows.map((r) => ({ + field: r.field, + reason: r.reason, + count: r.count, + })), + samples: samples.map((s) => ({ + rowIndex: s.rowIndex, + errors: s.errors, + rawData: s.rawData, + })), + totalShown: samples.length, + }; + } catch (error) { + console.error('ETL job failures error:', error); + return status(500, { + error: 'Failed to fetch job failures', + code: 'ETL_JOB_FAILURES_ERROR', + }); + } + }, + { + params: z.object({ jobId: z.string().uuid() }), + query: z.object({ + limit: z.coerce.number().int().min(1).max(200).optional(), + }), + response: { 200: EtlJobFailuresSchema, ...AdminErrorResponses }, + detail: { tags: ['Admin'], summary: 'Validation failures for a specific ETL job' }, + }, + ) + + // ─── Reset stuck jobs ───────────────────────────────────────────────────────── + + .post( + '/etl/reset-stuck', + async () => { + const db = createDb(); + + try { + // Jobs stuck in 'running' for more than 30 minutes are considered stalled + const stuckCutoff = new Date(Date.now() - 30 * 60 * 1000); + + const reset = await db + .update(etlJobs) + .set({ status: 'failed', completedAt: new Date() }) + .where(and(eq(etlJobs.status, 'running'), lt(etlJobs.startedAt, stuckCutoff))) + .returning(); + + return { reset: reset.length, ids: reset.map((r) => r.id) }; + } catch (error) { + console.error('ETL reset stuck error:', error); + return status(500, { error: 'Failed to reset stuck jobs', code: 'ETL_RESET_STUCK_ERROR' }); + } + }, + { + response: { 200: EtlResetStuckSchema, ...AdminErrorResponses }, + detail: { tags: ['Admin'], summary: 'Mark stuck running ETL jobs as failed' }, + }, + ) + + // ─── Retry a failed job ─────────────────────────────────────────────────────── + + .post( + '/etl/:jobId/retry', + async ({ params }) => { + const db = createDb(); + + try { + const [original] = await db + .select() + .from(etlJobs) + .where(eq(etlJobs.id, params.jobId)) + .limit(1); + + if (!original) return status(404, { error: 'ETL job not found' }); + if (original.status !== 'failed') + return status(409, { + error: + original.status === 'running' + ? 'Job is still running — wait for it to complete or reset stuck jobs first' + : 'Only failed jobs can be retried', + }); + + const newJobId = crypto.randomUUID(); + const objectKey = `v2/${original.source}/${original.filename}`; + const env = getEnv(); + + if (!env.ETL_QUEUE) return status(400, { error: 'ETL_QUEUE is not configured' }); + + await db.insert(etlJobs).values({ + id: newJobId, + status: 'running', + source: original.source, + filename: original.filename, + scraperRevision: original.scraperRevision, + startedAt: new Date(), + }); + + try { + await queueCatalogETL({ queue: env.ETL_QUEUE, chunks: [{ objectKey }], jobId: newJobId }); + } catch (enqueueErr) { + await db + .update(etlJobs) + .set({ status: 'failed', completedAt: new Date() }) + .where(eq(etlJobs.id, newJobId)); + throw enqueueErr; + } + + return { success: true as const, newJobId, objectKey }; + } catch (error) { + console.error('ETL retry error:', error); + return status(500, { error: 'Failed to retry ETL job', code: 'ETL_RETRY_ERROR' }); + } + }, + { + params: z.object({ jobId: z.string().uuid() }), + response: { 200: EtlRetrySchema, ...AdminErrorResponses }, + detail: { tags: ['Admin'], summary: 'Retry a failed ETL job' }, + }, ); diff --git a/packages/api/src/routes/admin/analytics/platform.ts b/packages/api/src/routes/admin/analytics/platform.ts index 4b3f35bae1..40f9988a66 100644 --- a/packages/api/src/routes/admin/analytics/platform.ts +++ b/packages/api/src/routes/admin/analytics/platform.ts @@ -1,29 +1,24 @@ import { createDb } from '@packrat/api/db'; -import { - catalogItems, - packs, - posts, - trailConditionReports, - trips, - users, -} from '@packrat/api/db/schema'; +import { catalogItems, packs, posts, trailConditionReports, trips, users } from '@packrat/db'; import { ActiveUsersSchema, ActivityPointSchema, AdminErrorResponses, + AnalyticsPeriodSchema, BreakdownItemSchema, GrowthPointSchema, -} from '@packrat/api/schemas/admin'; +} from '@packrat/schemas/admin'; import { and, count, desc, eq, gte, sql } from 'drizzle-orm'; -import { Elysia, status, t } from 'elysia'; +import { Elysia, status } from 'elysia'; import { z } from 'zod'; -const PeriodSchema = z.object({ - period: z.enum(['day', 'week', 'month']).optional().default('month'), - range: z.coerce.number().int().min(1).max(365).optional().default(12), -}); - -function getStartDate(period: 'day' | 'week' | 'month', range: number): Date { +function getStartDate({ + period, + range, +}: { + period: 'day' | 'week' | 'month'; + range: number; +}): Date { const d = new Date(); if (period === 'day') d.setDate(d.getDate() - range); else if (period === 'week') d.setDate(d.getDate() - range * 7); @@ -46,7 +41,7 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' }) async ({ query }) => { const db = createDb(); const { period = 'month', range = 12 } = query; - const startDate = getStartDate(period, range); + const startDate = getStartDate({ period, range }); try { const [userGrowth, packGrowth, catalogGrowth] = await Promise.all([ @@ -105,8 +100,8 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' }) } }, { - query: PeriodSchema, - response: { 200: t.Array(GrowthPointSchema), ...AdminErrorResponses }, + query: AnalyticsPeriodSchema, + response: { 200: z.array(GrowthPointSchema), ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'Platform growth metrics' }, }, ) @@ -116,7 +111,7 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' }) async ({ query }) => { const db = createDb(); const { period = 'month', range = 12 } = query; - const startDate = getStartDate(period, range); + const startDate = getStartDate({ period, range }); try { const [tripActivity, trailActivity, postActivity] = await Promise.all([ @@ -182,8 +177,8 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' }) } }, { - query: PeriodSchema, - response: { 200: t.Array(ActivityPointSchema), ...AdminErrorResponses }, + query: AnalyticsPeriodSchema, + response: { 200: z.array(ActivityPointSchema), ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'User activity metrics' }, }, ) @@ -238,7 +233,7 @@ export const platformAnalyticsRoutes = new Elysia({ prefix: '/platform' }) } }, { - response: { 200: t.Array(BreakdownItemSchema), ...AdminErrorResponses }, + response: { 200: z.array(BreakdownItemSchema), ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'Categorical distribution metrics' }, }, ); diff --git a/packages/api/src/routes/admin/index.ts b/packages/api/src/routes/admin/index.ts index d40d9db318..43b131c5b9 100644 --- a/packages/api/src/routes/admin/index.ts +++ b/packages/api/src/routes/admin/index.ts @@ -1,7 +1,10 @@ import { cors } from '@elysiajs/cors'; import { createDb } from '@packrat/api/db'; -import { catalogItems, packs, users } from '@packrat/api/db/schema'; import { verifyCFAccessRequest } from '@packrat/api/middleware/cfAccess'; +import { timingSafeEqual } from '@packrat/api/utils/auth'; +import { getEnv } from '@packrat/api/utils/env-validation'; +import { catalogItems, packs, users } from '@packrat/db'; +import { assertAllDefined, queryBoolean } from '@packrat/guards'; import { AdminCatalogListSchema, AdminErrorResponses, @@ -11,10 +14,7 @@ import { CatalogUpdateSchema, HardDeleteSuccessSchema, SuccessSchema, -} from '@packrat/api/schemas/admin'; -import { timingSafeEqual } from '@packrat/api/utils/auth'; -import { getEnv } from '@packrat/api/utils/env-validation'; -import { assertAllDefined } from '@packrat/guards'; +} from '@packrat/schemas/admin'; import { and, count, desc, eq, ilike, or } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; import { jwtVerify, SignJWT } from 'jose'; @@ -26,6 +26,19 @@ const ADMIN_TOKEN_TTL_SECONDS = 3600; // 1 hour const ADMIN_JWT_ISSUER = 'packrat-api'; const ADMIN_JWT_AUDIENCE = 'packrat-admin'; +function checkAdminCredentials({ + username, + password, +}: { + username: string; + password: string; +}): boolean { + const env = getEnv(); + const userOk = timingSafeEqual({ a: username, b: env.ADMIN_USERNAME }); + const passOk = timingSafeEqual({ a: password, b: env.ADMIN_PASSWORD }); + return userOk && passOk; +} + function basicAuthGuard(request: Request): { authorized: true } | { authorized: false } { const header = request.headers.get('authorization') ?? ''; if (!header.startsWith('Basic ')) return { authorized: false }; @@ -36,10 +49,7 @@ function basicAuthGuard(request: Request): { authorized: true } | { authorized: if (sep === -1) return { authorized: false }; const username = decoded.slice(0, sep); const password = decoded.slice(sep + 1); - const env = getEnv(); - const userOk = timingSafeEqual(username, env.ADMIN_USERNAME); - const passOk = timingSafeEqual(password, env.ADMIN_PASSWORD); - if (userOk && passOk) return { authorized: true }; + if (checkAdminCredentials({ username, password })) return { authorized: true }; } catch { return { authorized: false }; } @@ -86,9 +96,12 @@ async function adminAuthGuard(request: Request): Promise { // When CF Access is configured, verify the CF JWT injected by the CF edge. if (CF_ACCESS_TEAM_DOMAIN && CF_ACCESS_AUD) { - const cfIdentity = await verifyCFAccessRequest(request, { - teamDomain: CF_ACCESS_TEAM_DOMAIN, - aud: CF_ACCESS_AUD, + const cfIdentity = await verifyCFAccessRequest({ + request, + opts: { + teamDomain: CF_ACCESS_TEAM_DOMAIN, + aud: CF_ACCESS_AUD, + }, }); if (cfIdentity) return true; } @@ -117,11 +130,67 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) // is rejected by browsers per the CORS spec). .use( cors({ - origin: 'https://admin.packratai.com', + // With credentials:true the browser requires a specific origin (not *). + // Reflect origin back when it's in our allowlist. + origin: (request) => { + const origin = request.headers.get('origin'); + if (!origin) return false; + if (origin === 'https://admin.packratai.com') return true; + if (origin.endsWith('.workers.dev')) return true; + if (/^https?:\/\/localhost(:\d+)?$/.test(origin)) return true; + return false; + }, credentials: true, allowedHeaders: ['Authorization', 'Content-Type'], }), ) + // Login (body-credential variant) — same credential semantics as /token, + // but takes `{ username, password }` in the JSON body. Typed clients (MCP, + // CLI, Eden Treaty) can hit this without overriding the Authorization + // header. The Basic-auth /token route remains for the admin SPA. + .post( + '/login', + async ({ body, request }) => { + const env = getEnv(); + if (env.TOKEN_RATE_LIMITER) { + const ip = request.headers.get('cf-connecting-ip') ?? 'unknown'; + const { success } = await env.TOKEN_RATE_LIMITER.limit({ key: ip }); + if (!success) return status(429, { error: 'Too many requests' }); + } + const { CF_ACCESS_TEAM_DOMAIN, CF_ACCESS_AUD } = env; + if (CF_ACCESS_TEAM_DOMAIN && CF_ACCESS_AUD) { + const cfIdentity = await verifyCFAccessRequest({ + request, + opts: { + teamDomain: CF_ACCESS_TEAM_DOMAIN, + aud: CF_ACCESS_AUD, + }, + }); + if (!cfIdentity) return status(401, { error: 'CF Access authentication required' }); + } + if (!checkAdminCredentials({ username: body.username, password: body.password })) { + return status(401, { error: 'Invalid username or password' }); + } + const token = await issueAdminJwt(body.username); + return { token, expiresIn: ADMIN_TOKEN_TTL_SECONDS }; + }, + { + body: z.object({ + username: z.string().min(1), + password: z.string().min(1), + }), + response: { + 200: z.object({ token: z.string(), expiresIn: z.number() }), + 401: z.object({ error: z.string() }), + 429: z.object({ error: z.string() }), + }, + detail: { + tags: ['Admin'], + summary: 'Exchange JSON credentials for a short-lived admin JWT', + }, + }, + ) + // Token exchange — must be registered BEFORE the auth guard so the admin // SPA can exchange Basic credentials for a short-lived JWT. .post( @@ -141,9 +210,12 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) // travels cross-origin; the CF edge then injects Cf-Access-Jwt-Assertion. // Basic credentials are always required and remain the primary gate. if (CF_ACCESS_TEAM_DOMAIN && CF_ACCESS_AUD) { - const cfIdentity = await verifyCFAccessRequest(request, { - teamDomain: CF_ACCESS_TEAM_DOMAIN, - aud: CF_ACCESS_AUD, + const cfIdentity = await verifyCFAccessRequest({ + request, + opts: { + teamDomain: CF_ACCESS_TEAM_DOMAIN, + aud: CF_ACCESS_AUD, + }, }); if (!cfIdentity) return status(401, { error: 'CF Access authentication required' }); } @@ -171,7 +243,10 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) }, ) .onBeforeHandle(async ({ request, path }) => { - if (path === '/api/admin/token') return; + // Credential-exchange routes own their own auth gating (Basic for /token, + // JSON body for /login). Skip the bearer guard for both. + if (path === '/api/admin/token' || path === '/api/admin/login') return; + if (request.method === 'OPTIONS') return; const ok = await adminAuthGuard(request); if (!ok) return status(401, { error: 'Unauthorized' }); }) @@ -189,7 +264,7 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) .where(eq(packs.deleted, false)); const [itemCount] = await db.select({ count: count() }).from(catalogItems); - assertAllDefined([userCount, packCount, itemCount]); + assertAllDefined({ values: [userCount, packCount, itemCount] }); return { users: userCount?.count ?? 0, @@ -265,7 +340,6 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) limit: z.coerce.number().int().positive().max(100).optional(), offset: z.coerce.number().int().min(0).optional(), q: z.string().optional(), - includeDeleted: z.string().optional(), }), response: { 200: AdminUsersListSchema, ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'List users' }, @@ -281,6 +355,7 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) const limit = Number(query.limit ?? 100); const offset = Number(query.offset ?? 0); const search = query.q; + const includeDeleted = query.includeDeleted ?? false; const searchFilter = search ? or( ilike(packs.name, `%${search}%`), @@ -289,7 +364,9 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) ilike(users.email, `%${search}%`), ) : undefined; - const whereClause = and(eq(packs.deleted, false), searchFilter); + const whereClause = includeDeleted + ? searchFilter + : and(eq(packs.deleted, false), searchFilter); const [packsList, [totalRow]] = await Promise.all([ db @@ -339,7 +416,10 @@ export const adminRoutes = new Elysia({ prefix: '/admin' }) limit: z.coerce.number().int().positive().max(100).optional(), offset: z.coerce.number().int().min(0).optional(), q: z.string().optional(), - includeDeleted: z.string().optional(), + // queryBoolean() instead of z.coerce.boolean() — the latter treats + // any non-empty string as truthy, so ?includeDeleted=false would + // wrongly include soft-deleted rows. + includeDeleted: queryBoolean(), }), response: { 200: AdminPacksListSchema, ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'List packs' }, diff --git a/packages/api/src/routes/admin/trails.ts b/packages/api/src/routes/admin/trails.ts index c04c388f75..e7a718e2f7 100644 --- a/packages/api/src/routes/admin/trails.ts +++ b/packages/api/src/routes/admin/trails.ts @@ -1,5 +1,6 @@ import { createDb, createOsmDb } from '@packrat/api/db'; -import { trailConditionReports, users } from '@packrat/api/db/schema'; +import { trailConditionReports, users } from '@packrat/db'; +import { queryBoolean } from '@packrat/guards'; import { AdminErrorResponses, SuccessSchema, @@ -7,22 +8,12 @@ import { TrailGeometrySchema, TrailSearchItemSchema, TrailSearchResultSchema, -} from '@packrat/api/schemas/admin'; +} from '@packrat/schemas/admin'; +import { RouteSearchRowSchema } from '@packrat/schemas/trails'; import { and, count, desc, eq, ilike, or, sql } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; import { z } from 'zod'; -const RouteSearchRowSchema = z.object({ - osm_id: z.string(), - name: z.string().nullable(), - sport: z.string().nullable(), - network: z.string().nullable(), - distance: z.string().nullable(), - difficulty: z.string().nullable(), - description: z.string().nullable(), - bbox: z.string().nullable(), -}); - export const adminTrailsRoutes = new Elysia({ prefix: '/trails' }) /** @@ -156,7 +147,7 @@ export const adminTrailsRoutes = new Elysia({ prefix: '/trails' }) geometry = JSON.parse(row.geojson); } else if (row.members && row.members.length > 0) { const { stitchRouteGeometry } = await import('@packrat/api/services/trails'); - geometry = await stitchRouteGeometry(db, row.members); + geometry = await stitchRouteGeometry({ db, members: row.members }); } return { @@ -253,7 +244,7 @@ export const adminTrailsRoutes = new Elysia({ prefix: '/trails' }) const limit = query.limit ?? 50; const offset = query.offset ?? 0; const search = query.q; - const includeDeleted = query.includeDeleted === 'true'; + const includeDeleted = query.includeDeleted ?? false; try { const deletedFilter = includeDeleted ? undefined : eq(trailConditionReports.deleted, false); @@ -310,9 +301,10 @@ export const adminTrailsRoutes = new Elysia({ prefix: '/trails' }) { query: z.object({ q: z.string().optional(), - limit: z.coerce.number().int().min(1).max(100).optional().default(50), - offset: z.coerce.number().int().min(0).optional().default(0), - includeDeleted: z.string().optional(), + // Handler defaults limit to 50, offset to 0; keep schema truly optional. + limit: z.coerce.number().int().min(1).max(100).optional(), + offset: z.coerce.number().int().min(0).optional(), + includeDeleted: queryBoolean(), }), response: { 200: TrailConditionsListSchema, ...AdminErrorResponses }, detail: { tags: ['Admin'], summary: 'List all trail condition reports' }, diff --git a/packages/api/src/routes/ai/index.ts b/packages/api/src/routes/ai/index.ts index e20013328c..1cd909c7f7 100644 --- a/packages/api/src/routes/ai/index.ts +++ b/packages/api/src/routes/ai/index.ts @@ -1,9 +1,9 @@ import { authPlugin } from '@packrat/api/middleware/auth'; -import { RagSearchQuerySchema, WebSearchQuerySchema } from '@packrat/api/schemas/ai'; import { AIService } from '@packrat/api/services/aiService'; import { executeSqlAiTool } from '@packrat/api/services/executeSqlAiTool'; import { getSchemaInfo } from '@packrat/api/utils/DbUtils'; import { isString } from '@packrat/guards'; +import { RagSearchQuerySchema, WebSearchQuerySchema } from '@packrat/schemas/ai'; import { Elysia, status } from 'elysia'; import { z } from 'zod'; @@ -17,7 +17,7 @@ export const aiRoutes = new Elysia({ prefix: '/ai' }) try { const { q, limit } = query; const aiService = new AIService(); - const result = await aiService.searchPackratOutdoorGuidesRAG(q, limit); + const result = await aiService.searchPackratOutdoorGuidesRAG({ query: q, limit }); return result; } catch (error) { console.error('RAG search error:', error); diff --git a/packages/api/src/routes/alltrails.ts b/packages/api/src/routes/alltrails.ts index 98a9e97a4a..7989fe5145 100644 --- a/packages/api/src/routes/alltrails.ts +++ b/packages/api/src/routes/alltrails.ts @@ -4,7 +4,7 @@ import { z } from 'zod'; const ALLTRAILS_HOSTNAME_RE = /^(?:[a-z0-9-]+\.)?alltrails\.com$/; const UA = 'Mozilla/5.0 (compatible; PackRat/1.0; +https://packrat.world)'; -function extractOgTag(html: string, property: string): string | null { +function extractOgTag({ html, property }: { html: string; property: string }): string | null { const match = html.match( new RegExp(`]+property=["']${property}["'][^>]+content=["']([^"']+)["']`, 'i'), @@ -92,13 +92,13 @@ export const alltrailsRoutes = new Elysia({ prefix: '/alltrails' }).post( const html = await response.text(); - const title = extractOgTag(html, 'og:title'); + const title = extractOgTag({ html, property: 'og:title' }); if (!title) { return status(422, { error: 'No og:title found in AllTrails page' }); } - const description = extractOgTag(html, 'og:description'); - const image = extractOgTag(html, 'og:image'); + const description = extractOgTag({ html, property: 'og:description' }); + const image = extractOgTag({ html, property: 'og:image' }); return { title, description, image, url: response.url || url }; }, diff --git a/packages/api/src/routes/catalog/index.ts b/packages/api/src/routes/catalog/index.ts index adb9f7f32f..76c937a296 100644 --- a/packages/api/src/routes/catalog/index.ts +++ b/packages/api/src/routes/catalog/index.ts @@ -1,18 +1,25 @@ import { createDb } from '@packrat/api/db'; -import { catalogItems, etlJobs, packItems } from '@packrat/api/db/schema'; import { apiKeyAuthPlugin, authPlugin } from '@packrat/api/middleware/auth'; -import { - CatalogItemsQuerySchema, - CreateCatalogItemRequestSchema, - UpdateCatalogItemRequestSchema, - VectorSearchQuerySchema, -} from '@packrat/api/schemas/catalog'; import { CatalogService } from '@packrat/api/services'; import { generateEmbedding } from '@packrat/api/services/embeddingService'; import { queueCatalogETL } from '@packrat/api/services/etl/queue'; +import { R2BucketService } from '@packrat/api/services/r2-bucket'; import { getEmbeddingText } from '@packrat/api/utils/embeddingHelper'; import { getEnv } from '@packrat/api/utils/env-validation'; +import { catalogItems, etlJobs, packItems } from '@packrat/db'; import { isString } from '@packrat/guards'; +import { + CatalogCategoriesResponseSchema, + CatalogCompareRequestSchema, + CatalogETLSchema, + CatalogItemSchema, + CatalogItemsQuerySchema, + CatalogItemsResponseSchema, + CreateCatalogItemRequestSchema, + UpdateCatalogItemRequestSchema, + VectorSearchQuerySchema, +} from '@packrat/schemas/catalog'; +import { ErrorResponseSchema } from '@packrat/schemas/shared'; import { and, cosineDistance, @@ -21,21 +28,15 @@ import { eq, getTableColumns, gt, + inArray, isNotNull, isNull, ne, sql, } from 'drizzle-orm'; -import { Elysia, status } from 'elysia'; +import { Elysia, NotFoundError, status } from 'elysia'; import { z } from 'zod'; -const catalogETLSchema = z.object({ - filename: z.string().min(1, 'Filename is required'), - chunks: z.array(z.string()).min(1, 'At least one object key is required'), - source: z.string().min(1, 'Source name is required'), - scraperRevision: z.string().min(1, 'Scraper revision ID is required'), -}); - export const catalogRoutes = new Elysia({ prefix: '/catalog' }) .use(authPlugin) .use(apiKeyAuthPlugin) @@ -44,7 +45,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) .get( '/', async ({ query }) => { - const { page, limit, q, category: encodedCategory, sort } = query; + const { page = 1, limit = 20, q, category: encodedCategory, sort } = query; let category: string | undefined; if (isString(encodedCategory) && encodedCategory.length > 0) { try { @@ -67,16 +68,17 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) const totalPages = Math.ceil(result.total / limit); - return { + return CatalogItemsResponseSchema.parse({ items: result.items, totalCount: result.total, page, limit, totalPages, - }; + }); }, { query: CatalogItemsQuerySchema, + response: { 200: CatalogItemsResponseSchema }, isAuthenticated: true, detail: { tags: ['Catalog'], @@ -93,7 +95,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) try { const { q: searchQuery, limit = 10, offset = 0 } = query; const catalogService = new CatalogService(); - return await catalogService.vectorSearch(searchQuery, { limit, offset }); + return await catalogService.vectorSearch({ q: searchQuery, opts: { limit, offset } }); } catch (error) { console.error('Vector search error:', error); return status(500, { error: 'Failed to search catalog items' }); @@ -101,11 +103,11 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) }, { query: VectorSearchQuerySchema, - isValidApiKey: true, + isAuthenticated: true, detail: { tags: ['Catalog'], summary: 'Vector search catalog items', - security: [{ apiKey: [] }], + security: [{ bearerAuth: [] }], }, }, ) @@ -115,12 +117,14 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) '/categories', async ({ query }) => { const categories = await new CatalogService().getCategories(query.limit); - return categories; + return CatalogCategoriesResponseSchema.parse(categories); }, { + // Service applies its own default (10); keep schema truly optional. query: z.object({ - limit: z.coerce.number().int().positive().optional().default(10), + limit: z.coerce.number().int().positive().optional(), }), + response: { 200: CatalogCategoriesResponseSchema }, isAuthenticated: true, detail: { tags: ['Catalog'], @@ -130,6 +134,77 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) }, ) + // -- Compare items side-by-side (static path, register before /:id) + .post( + '/compare', + async ({ body }) => { + const db = createDb(); + const { ids } = body; + const uniqueIds = Array.from(new Set(ids)); + // `ids.min(2)` accepts [1, 1] which collapses to 1 unique ID after + // dedupe; enforce the 2+ floor on the deduped set so the response + // actually contains a comparison. + if (uniqueIds.length < 2) { + return status(400, { error: 'Compare requires at least 2 distinct catalog IDs' }); + } + const items = await db + .select({ + id: catalogItems.id, + name: catalogItems.name, + brand: catalogItems.brand, + weight: catalogItems.weight, + weightUnit: catalogItems.weightUnit, + price: catalogItems.price, + ratingValue: catalogItems.ratingValue, + productUrl: catalogItems.productUrl, + categories: catalogItems.categories, + }) + .from(catalogItems) + .where(inArray(catalogItems.id, uniqueIds)); + + const foundIds = new Set(items.map((it) => it.id)); + const missing = uniqueIds.filter((id) => !foundIds.has(id)); + if (missing.length > 0) { + return status(404, { + error: `Catalog item(s) not found: ${missing.join(', ')}`, + }); + } + + const rank = ({ + key, + order, + }: { + key: K; + order: 'asc' | 'desc'; + }): number | null => { + const ranked = [...items] + .filter((it) => it[key] != null) + .sort((a, b) => { + const av = Number(a[key]); + const bv = Number(b[key]); + return order === 'asc' ? av - bv : bv - av; + }); + return ranked[0]?.id ?? null; + }; + + return { + items, + lightestId: rank({ key: 'weight', order: 'asc' }), + cheapestId: rank({ key: 'price', order: 'asc' }), + highestRatedId: rank({ key: 'ratingValue', order: 'desc' }), + }; + }, + { + body: CatalogCompareRequestSchema, + isAuthenticated: true, + detail: { + tags: ['Catalog'], + summary: 'Compare 2–10 catalog items side-by-side', + security: [{ bearerAuth: [] }], + }, + }, + ) + // -- Embeddings stats .get( '/embeddings-stats', @@ -176,9 +251,31 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) startedAt: new Date(), }); + // Split large files into 20 MB byte-range chunks so each Worker + // invocation stays within the CPU time budget (~30k rows / chunk). + const CHUNK_BYTES = 20 * 1024 * 1024; + const r2 = new R2BucketService({ env, bucketType: 'catalog' }); + const queueChunks: Array<{ objectKey: string; byteStart?: number; byteEnd?: number }> = []; + + for (const objectKey of chunks) { + const meta = await r2.head(objectKey); + if (!meta || meta.size <= CHUNK_BYTES) { + queueChunks.push({ objectKey }); + } else { + const n = Math.ceil(meta.size / CHUNK_BYTES); + for (let i = 0; i < n; i++) { + queueChunks.push({ + objectKey, + byteStart: i * CHUNK_BYTES, + byteEnd: Math.min((i + 1) * CHUNK_BYTES - 1, meta.size - 1), + }); + } + } + } + await queueCatalogETL({ queue: env.ETL_QUEUE, - objectKeys: chunks, + chunks: queueChunks, jobId, }); @@ -189,7 +286,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) }; }, { - body: catalogETLSchema, + body: CatalogETLSchema, isValidApiKey: true, detail: { tags: ['Catalog'], @@ -218,26 +315,23 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) async ({ body }) => { const db = createDb(); const data = body; - if (!data.name || data.weight === undefined || data.weight === null || !data.weightUnit) { - return status(400, { error: 'name, weight, and weightUnit are required' }); - } - if (data.weight <= 0) { - return status(400, { error: 'weight must be a positive number' }); - } - const { OPENAI_API_KEY, AI_PROVIDER, CLOUDFLARE_ACCOUNT_ID, CLOUDFLARE_AI_GATEWAY_ID, AI } = - getEnv(); - - if (!OPENAI_API_KEY) { - return status(500, { error: 'OpenAI API key not configured' }); - } - - const embeddingText = getEmbeddingText(data); + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + + const embeddingText = getEmbeddingText({ item: data }); const embedding = await generateEmbedding({ openAiApiKey: OPENAI_API_KEY, value: embeddingText, provider: AI_PROVIDER, cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, cloudflareAiBinding: AI, }); @@ -271,10 +365,11 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) }) .returning(); - return newItem; + return CatalogItemSchema.parse(newItem); }, { body: CreateCatalogItemRequestSchema, + response: { 200: CatalogItemSchema, 400: ErrorResponseSchema, 500: ErrorResponseSchema }, isAuthenticated: true, detail: { tags: ['Catalog'], @@ -296,7 +391,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) itemId <= 0 || itemId > 2147483647 ) { - return status(404, { error: 'Catalog item not found' }); + throw new NotFoundError('Catalog item not found'); } const item = await db.query.catalogItems.findFirst({ @@ -310,15 +405,16 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) }); if (!item) { - return status(404, { error: 'Catalog item not found' }); + throw new NotFoundError('Catalog item not found'); } const usageCount = item.packItems?.length || 0; const { packItems: _packItems, ...itemData } = item; - return { ...itemData, usageCount }; + return CatalogItemSchema.parse({ ...itemData, usageCount }); }, { params: z.object({ id: z.string() }), + response: { 200: CatalogItemSchema }, isAuthenticated: true, detail: { tags: ['Catalog'], @@ -406,30 +502,29 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) itemId <= 0 || itemId > 2147483647 ) { - return status(404, { error: 'Catalog item not found' }); + throw new NotFoundError('Catalog item not found'); } const data = body; - if (data.weight !== undefined && data.weight !== null && data.weight <= 0) { - return status(400, { error: 'weight must be a positive number' }); - } - const { OPENAI_API_KEY, AI_PROVIDER, CLOUDFLARE_ACCOUNT_ID, CLOUDFLARE_AI_GATEWAY_ID, AI } = - getEnv(); - - if (!OPENAI_API_KEY) { - return status(500, { error: 'OpenAI API key not configured' }); - } + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); const existingItem = await db.query.catalogItems.findFirst({ where: eq(catalogItems.id, itemId), }); if (!existingItem) { - return status(404, { error: 'Catalog item not found' }); + throw new NotFoundError('Catalog item not found'); } let embedding: number[] | null = null; - const newEmbeddingText = getEmbeddingText(data, existingItem); - const oldEmbeddingText = getEmbeddingText(existingItem); + const newEmbeddingText = getEmbeddingText({ item: data, existingItem }); + const oldEmbeddingText = getEmbeddingText({ item: existingItem }); if (newEmbeddingText !== oldEmbeddingText) { embedding = await generateEmbedding({ @@ -438,6 +533,7 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) provider: AI_PROVIDER, cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, cloudflareAiBinding: AI, }); } @@ -452,11 +548,12 @@ export const catalogRoutes = new Elysia({ prefix: '/catalog' }) .where(eq(catalogItems.id, itemId)) .returning(); - return updatedItem; + return CatalogItemSchema.parse(updatedItem); }, { params: z.object({ id: z.string() }), body: UpdateCatalogItemRequestSchema, + response: { 200: CatalogItemSchema, 400: ErrorResponseSchema, 500: ErrorResponseSchema }, isAuthenticated: true, detail: { tags: ['Catalog'], diff --git a/packages/api/src/routes/chat.ts b/packages/api/src/routes/chat.ts index 7114373d2d..6e608d2cc4 100644 --- a/packages/api/src/routes/chat.ts +++ b/packages/api/src/routes/chat.ts @@ -1,14 +1,15 @@ import { createDb } from '@packrat/api/db'; -import { reportedContent } from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; +import { createAIProvider } from '@packrat/api/utils/ai/provider'; +import { createTools } from '@packrat/api/utils/ai/tools'; +import { getEnv } from '@packrat/api/utils/env-validation'; +import { apiAddBreadcrumb, captureApiException } from '@packrat/api/utils/sentry'; +import { reportedContent } from '@packrat/db'; import { ChatRequestSchema, CreateReportRequestSchema, UpdateReportStatusRequestSchema, -} from '@packrat/api/schemas/chat'; -import { createAIProvider } from '@packrat/api/utils/ai/provider'; -import { createTools } from '@packrat/api/utils/ai/tools'; -import { getEnv } from '@packrat/api/utils/env-validation'; +} from '@packrat/schemas/chat'; import { convertToModelMessages, stepCountIs, streamText, type UIMessage } from 'ai'; import { eq } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; @@ -22,7 +23,7 @@ export const chatRoutes = new Elysia({ prefix: '/chat' }) // Chat streaming .post( '/', - async ({ body, user }) => { + async ({ body, user, request }) => { const typedBody = body as { messages?: UIMessage[] | undefined; contextType?: string; @@ -57,30 +58,67 @@ export const chatRoutes = new Elysia({ prefix: '/chat' }) - Current date is ${date}`; if (contextType === 'pack' && packId) { - systemPrompt += `\n- You are currently helping with a pack with ID: ${packId}.`; + systemPrompt += `\n- You are currently helping with a pack with ID: ${packId}. Use the getPackDetails tool to fetch its contents.`; } else if (contextType === 'item' && itemId) { - systemPrompt += `\n- You are currently helping with an item with ID: ${itemId}.`; + systemPrompt += `\n- You are currently helping with an item with ID: ${itemId}. Use the getPackItemDetails tool to fetch its details.`; } if (location) { systemPrompt += `\n- The current location of the user is: ${location}.`; } - const { AI_PROVIDER, OPENAI_API_KEY, CLOUDFLARE_ACCOUNT_ID, CLOUDFLARE_AI_GATEWAY_ID, AI } = - getEnv(); + const { + AI_PROVIDER, + OPENAI_API_KEY, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + TOKEN_RATE_LIMITER, + } = getEnv(); + + if (TOKEN_RATE_LIMITER) { + const ip = request.headers.get('cf-connecting-ip') ?? 'unknown'; + const rateLimitKey = `chat:${user.userId}:${ip}`; + const { success } = await TOKEN_RATE_LIMITER.limit({ key: rateLimitKey }); + if (!success) { + return status(429, { error: 'Too many chat requests, please try again shortly.' }); + } + } const aiProvider = createAIProvider({ openAiApiKey: OPENAI_API_KEY, provider: AI_PROVIDER, cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, cloudflareAiBinding: AI, }); if (!aiProvider) { + captureApiException({ + error: new Error('AI provider not configured'), + operation: 'chat.stream', + userId: user.userId, + tags: { ai_provider: AI_PROVIDER }, + extra: { httpStatus: 500, errorCode: 'AI_PROVIDER_NOT_CONFIGURED' }, + }); return status(500, { error: 'AI provider not configured' }); } + apiAddBreadcrumb({ + category: 'ai.chat', + message: 'Starting AI chat stream', + level: 'info', + data: { + userId: user.userId, + contextType, + packId, + itemId, + messageCount: messages?.length ?? 0, + }, + }); + const result = streamText({ model: aiProvider(DEFAULT_MODELS.OPENAI_CHAT), system: systemPrompt, @@ -90,7 +128,13 @@ export const chatRoutes = new Elysia({ prefix: '/chat' }) temperature: 0.7, stopWhen: stepCountIs(5), onError: ({ error }) => { - console.error('streaming error', error); + captureApiException({ + error: error, + operation: 'chat.stream.onError', + userId: user.userId, + tags: { ai_provider: AI_PROVIDER, context_type: contextType ?? 'none' }, + extra: { packId, itemId, messageCount: messages?.length ?? 0 }, + }); }, }); diff --git a/packages/api/src/routes/feed/index.ts b/packages/api/src/routes/feed/index.ts index bece1afa17..1d5f48b885 100644 --- a/packages/api/src/routes/feed/index.ts +++ b/packages/api/src/routes/feed/index.ts @@ -1,7 +1,11 @@ import { createDb } from '@packrat/api/db'; -import { commentLikes, postComments, postLikes, posts, users } from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; -import { CreateCommentRequestSchema, CreatePostRequestSchema } from '@packrat/api/schemas/feed'; +import { commentLikes, postComments, postLikes, posts, users } from '@packrat/db'; +import { + CreateCommentRequestSchema, + CreatePostRequestSchema, + FeedResponseSchema, +} from '@packrat/schemas/feed'; import { and, count, desc, eq, inArray } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; import { z } from 'zod'; @@ -18,7 +22,7 @@ export const feedRoutes = new Elysia({ prefix: '/feed' }) .get( '/', async ({ query, user }) => { - const { page, limit } = query; + const { page = 1, limit = 20 } = query; const db = createDb(); const offset = (page - 1) * limit; @@ -44,8 +48,10 @@ export const feedRoutes = new Elysia({ prefix: '/feed' }) const total = totalResult[0]?.count ?? 0; + const totalPages = Math.ceil(total / limit); + if (items.length === 0) { - return { items: [], page, limit, total, totalPages: Math.ceil(total / limit) }; + return FeedResponseSchema.parse({ items: [], page, limit, total, totalPages }); } const postIds = items.map((p) => p.id); @@ -84,13 +90,15 @@ export const feedRoutes = new Elysia({ prefix: '/feed' }) likedByMe: myLikeSet.has(p.id), })); - return { items: result, page, limit, total, totalPages: Math.ceil(total / limit) }; + return FeedResponseSchema.parse({ items: result, page, limit, total, totalPages }); }, { query: z.object({ - page: z.coerce.number().int().min(1).optional().default(1), - limit: z.coerce.number().int().min(1).max(50).optional().default(20), + // Defaults applied in handler so Treaty types these as truly optional. + page: z.coerce.number().int().min(1).optional(), + limit: z.coerce.number().int().min(1).max(50).optional(), }), + response: { 200: FeedResponseSchema }, isAuthenticated: true, detail: { tags: ['Feed'], summary: 'List social feed posts', security: [{ bearerAuth: [] }] }, }, @@ -242,7 +250,7 @@ export const feedRoutes = new Elysia({ prefix: '/feed' }) '/:postId/comments', async ({ params, query, user }) => { const postId = Number(params.postId); - const { page, limit } = query; + const { page = 1, limit = 20 } = query; const db = createDb(); const post = await db.query.posts.findFirst({ where: eq(posts.id, postId) }); @@ -315,8 +323,9 @@ export const feedRoutes = new Elysia({ prefix: '/feed' }) { params: z.object({ postId: z.coerce.number().int() }), query: z.object({ - page: z.coerce.number().int().min(1).optional().default(1), - limit: z.coerce.number().int().min(1).max(50).optional().default(20), + // Defaults applied in handler so Treaty types these as truly optional. + page: z.coerce.number().int().min(1).optional(), + limit: z.coerce.number().int().min(1).max(50).optional(), }), isAuthenticated: true, detail: { diff --git a/packages/api/src/routes/guides/index.ts b/packages/api/src/routes/guides/index.ts index c327787e3d..63dd074fb3 100644 --- a/packages/api/src/routes/guides/index.ts +++ b/packages/api/src/routes/guides/index.ts @@ -1,13 +1,20 @@ import { authPlugin } from '@packrat/api/middleware/auth'; -import { GuideSearchQuerySchema, GuidesQuerySchema } from '@packrat/api/schemas/guides'; import { R2BucketService } from '@packrat/api/services/r2-bucket'; import { getEnv } from '@packrat/api/utils/env-validation'; import { asNumber, asString, isArray } from '@packrat/guards'; +import { + GuideCategoriesResponseSchema, + GuideDetailSchema, + GuideSearchQuerySchema, + GuideSearchResponseSchema, + GuidesQuerySchema, + GuidesResponseSchema, +} from '@packrat/schemas/guides'; const MDX_EXT_RE = /\.(mdx?|md)$/; const DASH_RE = /-/g; -import { Elysia, status } from 'elysia'; +import { Elysia, NotFoundError, status } from 'elysia'; import matter from 'gray-matter'; import { z } from 'zod'; @@ -18,7 +25,7 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) .get( '/', async ({ query, request }) => { - const { page, limit, category } = query; + const { page = 1, limit = 20, category } = query; // Manually parse `sort[field]` / `sort[order]` from the raw query string. // Elysia's query parser leaves bracketed keys as-is rather than @@ -110,20 +117,21 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) const paginatedGuides = filteredGuides.slice(offset, offset + limit); const totalPages = Math.ceil(total / limit); - return { + return GuidesResponseSchema.parse({ items: paginatedGuides, totalCount: total, page, limit, totalPages, - }; + }); } catch (error) { console.error('Error listing guides:', error); - return status(500, { error: 'Failed to list guides' }); + throw error; } }, { query: GuidesQuerySchema, + response: { 200: GuidesResponseSchema }, isAuthenticated: true, detail: { tags: ['Guides'], @@ -170,13 +178,14 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) } const categories = Array.from(categoriesSet).sort(); - return { categories, count: categories.length }; + return GuideCategoriesResponseSchema.parse({ categories, count: categories.length }); } catch (error) { console.error('Error getting guide categories:', error); - return status(500, { error: 'Failed to get guide categories' }); + throw error; } }, { + response: { 200: GuideCategoriesResponseSchema }, isAuthenticated: true, detail: { tags: ['Guides'], @@ -190,7 +199,7 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) .get( '/search', async ({ query }) => { - const { q, page, limit, category } = query; + const { q, page = 1, limit = 20, category } = query; if (!q || q.trim() === '') { return status(400, { error: 'Search query parameter q is required' }); } @@ -261,17 +270,17 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) const paginatedGuides = guides.slice(offset, offset + limit); const totalPages = Math.ceil(total / limit); - return { + return GuideSearchResponseSchema.parse({ items: paginatedGuides, totalCount: total, page, limit, totalPages, query: q, - }; + }); } catch (error) { console.error('Error searching guides:', error); - return status(500, { error: 'Failed to search guides' }); + throw error; } }, { @@ -306,7 +315,7 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) } if (!object) { - return status(404, { error: 'Guide not found' }); + throw new NotFoundError('Guide not found'); } const headResult = await bucket.head(key); @@ -314,7 +323,7 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) const rawContent = await object.text(); const { data: frontmatter, content } = matter(rawContent); - return { + return GuideDetailSchema.parse({ id, key, title: frontmatter.title || metadata.title || id.replace(DASH_RE, ' '), @@ -327,14 +336,15 @@ export const guidesRoutes = new Elysia({ prefix: '/guides' }) content, createdAt: object.uploaded.toISOString(), updatedAt: object.uploaded.toISOString(), - }; + }); } catch (error) { console.error('Error fetching guide:', error); - return status(500, { error: 'Failed to fetch guide' }); + throw error; } }, { params: z.object({ id: z.string() }), + response: { 200: GuideDetailSchema }, isAuthenticated: true, detail: { tags: ['Guides'], diff --git a/packages/api/src/routes/index.ts b/packages/api/src/routes/index.ts index db72d1d13f..ed9ffdac47 100644 --- a/packages/api/src/routes/index.ts +++ b/packages/api/src/routes/index.ts @@ -9,6 +9,7 @@ import { guidesRoutes } from './guides'; import { knowledgeBaseRoutes } from './knowledgeBase'; import { packsRoutes } from './packs'; import { packTemplatesRoutes } from './packTemplates'; +import { passwordResetRoutes } from './passwordReset'; import { seasonSuggestionsRoutes } from './seasonSuggestions'; import { trailConditionsRoutes } from './trailConditions'; import { trailsRoutes } from './trails'; @@ -35,6 +36,7 @@ export const routes = new Elysia({ prefix: '/api' }) .use(weatherRoutes) .use(packTemplatesRoutes) .use(seasonSuggestionsRoutes) + .use(passwordResetRoutes) .use(userRoutes) .use(uploadRoutes) .use(trailConditionsRoutes) diff --git a/packages/api/src/routes/packTemplates/index.ts b/packages/api/src/routes/packTemplates/index.ts index 56fbab9342..be2ff601da 100644 --- a/packages/api/src/routes/packTemplates/index.ts +++ b/packages/api/src/routes/packTemplates/index.ts @@ -1,18 +1,19 @@ -import { createGoogleGenerativeAI } from '@ai-sdk/google'; import { getContainer } from '@cloudflare/containers'; import { createDb } from '@packrat/api/db'; -import { type PackTemplate, packTemplateItems, packTemplates } from '@packrat/api/db/schema'; -import { authPlugin } from '@packrat/api/middleware/auth'; +import { adminAuthPlugin, authPlugin } from '@packrat/api/middleware/auth'; +import { CatalogService } from '@packrat/api/services/catalogService'; +import { createGoogleAIProvider } from '@packrat/api/utils/ai/provider'; +import { getEnv } from '@packrat/api/utils/env-validation'; +import { type PackTemplate, packTemplateItems, packTemplates } from '@packrat/db'; +import { assertDefined } from '@packrat/guards'; import { + AIPackAnalysisSchema, CreatePackTemplateItemRequestSchema, CreatePackTemplateRequestSchema, GenerateFromOnlineContentRequestSchema, UpdatePackTemplateItemRequestSchema, UpdatePackTemplateRequestSchema, -} from '@packrat/api/schemas/packTemplates'; -import { CatalogService } from '@packrat/api/services/catalogService'; -import { getEnv } from '@packrat/api/utils/env-validation'; -import { assertDefined } from '@packrat/guards'; +} from '@packrat/schemas/packTemplates'; import { generateObject } from 'ai'; import { and, eq, or, sql } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; @@ -107,39 +108,13 @@ function getYouTubeId(url: string): string | null { } } -const analysisSchema = z.object({ - templateName: z.string(), - templateCategory: z.enum([ - 'hiking', - 'backpacking', - 'camping', - 'climbing', - 'winter', - 'desert', - 'custom', - 'water sports', - 'skiing', - ]), - templateDescription: z.string(), - items: z.array( - z.object({ - name: z.string(), - description: z.string(), - quantity: z.number().int().positive().default(1), - category: z.string(), - weightGrams: z.number().nonnegative().default(0), - consumable: z.boolean().default(false), - worn: z.boolean().default(false), - }), - ), -}); - // --------------------------------------------------------------------------- // Routes // --------------------------------------------------------------------------- export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) .use(authPlugin) + .use(adminAuthPlugin) // List all templates .get( @@ -213,10 +188,6 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) async ({ body, user }) => { let contentUrl: string | undefined; try { - if (user.role !== 'ADMIN') { - return status(403, { error: 'Forbidden: Admin access required' }); - } - const { isAppTemplate } = body; contentUrl = body.contentUrl; @@ -229,8 +200,20 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) return status(400, { error: 'contentUrl must be a valid URL' }); } - const { GOOGLE_GENERATIVE_AI_API_KEY } = getEnv(); - const google = createGoogleGenerativeAI({ apiKey: GOOGLE_GENERATIVE_AI_API_KEY }); + const { + GOOGLE_GENERATIVE_AI_API_KEY, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + const google = createGoogleAIProvider({ + googleApiKey: GOOGLE_GENERATIVE_AI_API_KEY, + cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: AI, + }); let imageUrls: string[] = []; let videoUrl: string | undefined; @@ -316,7 +299,7 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) const { object: analysis } = await generateObject({ model: google('gemini-3-flash-preview'), - schema: analysisSchema, + schema: AIPackAnalysisSchema, system: SYSTEM_PROMPT, prompt: [{ role: 'user', content: contentParts }], temperature: 0.2, @@ -329,7 +312,7 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) const batchResult = searchQueries.length > 0 - ? await catalogService.batchVectorSearch(searchQueries, 1) + ? await catalogService.batchVectorSearch({ queries: searchQueries, limit: 1 }) : { items: [] as never[] }; const now = new Date(); @@ -413,10 +396,10 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) }, { body: GenerateFromOnlineContentRequestSchema, - isAuthenticated: true, + isAdmin: true, detail: { tags: ['Pack Templates'], - summary: 'Generate a pack template from an online content URL', + summary: 'Generate a pack template from an online content URL (Admin only)', security: [{ bearerAuth: [] }], }, }, @@ -698,8 +681,8 @@ export const packTemplatesRoutes = new Elysia({ prefix: '/pack-templates' }) weightUnit: data.weightUnit, quantity: data.quantity || 1, category: data.category, - consumable: data.consumable, - worn: data.worn, + consumable: data.consumable ?? false, + worn: data.worn ?? false, image: data.image, notes: data.notes, userId: user.userId, diff --git a/packages/api/src/routes/packs/index.ts b/packages/api/src/routes/packs/index.ts index 1bdf287ca5..e1935aec52 100644 --- a/packages/api/src/routes/packs/index.ts +++ b/packages/api/src/routes/packs/index.ts @@ -1,5 +1,18 @@ import { GetObjectCommand } from '@aws-sdk/client-s3'; import { createDb } from '@packrat/api/db'; +import { adminAuthPlugin, authPlugin } from '@packrat/api/middleware/auth'; +import { ImageDetectionService, PackService } from '@packrat/api/services'; +import { generateEmbedding } from '@packrat/api/services/embeddingService'; +import { + computePackBreakdown, + computePacksWeights, + computePackWeights, +} from '@packrat/api/utils/compute-pack'; +import { getPackDetails } from '@packrat/api/utils/DbUtils'; +import { getEmbeddingText } from '@packrat/api/utils/embeddingHelper'; +import { getEnv } from '@packrat/api/utils/env-validation'; +import { getPresignedUrl } from '@packrat/api/utils/getPresignedUrl'; +import { captureApiException } from '@packrat/api/utils/sentry'; import { catalogItems, type NewPack, @@ -8,23 +21,19 @@ import { packItems, packs, packWeightHistory, -} from '@packrat/api/db/schema'; -import { adminAuthPlugin, authPlugin } from '@packrat/api/middleware/auth'; -import { AnalyzeImageRequestSchema } from '@packrat/api/schemas/imageDetection'; +} from '@packrat/db'; +import { AnalyzeImageRequestSchema } from '@packrat/schemas/imageDetection'; import { - CreatePackItemRequestSchema, - CreatePackRequestSchema, + AddPackItemBodySchema, + CreatePackBodySchema, + CreatePackWeightHistoryBodySchema, GapAnalysisRequestSchema, + PackItemSchema, + PackWithWeightsSchema, UpdatePackItemRequestSchema, UpdatePackRequestSchema, -} from '@packrat/api/schemas/packs'; -import { ImageDetectionService, PackService } from '@packrat/api/services'; -import { generateEmbedding } from '@packrat/api/services/embeddingService'; -import { computePacksWeights, computePackWeights } from '@packrat/api/utils/compute-pack'; -import { getPackDetails } from '@packrat/api/utils/DbUtils'; -import { getEmbeddingText } from '@packrat/api/utils/embeddingHelper'; -import { getEnv } from '@packrat/api/utils/env-validation'; -import { getPresignedUrl } from '@packrat/api/utils/getPresignedUrl'; +} from '@packrat/schemas/packs'; +import { ErrorResponseSchema } from '@packrat/schemas/shared'; import { and, cosineDistance, @@ -37,19 +46,9 @@ import { or, sql, } from 'drizzle-orm'; -import { Elysia, status } from 'elysia'; +import { Elysia, NotFoundError, status } from 'elysia'; import { z } from 'zod'; -const CreatePackBodySchema = CreatePackRequestSchema.extend({ - id: z.string(), - localCreatedAt: z.string(), - localUpdatedAt: z.string(), -}); - -const AddPackItemBodySchema = CreatePackItemRequestSchema.extend({ - id: z.string(), -}); - export const packsRoutes = new Elysia({ prefix: '/packs' }) .use(authPlugin) .use(adminAuthPlugin) @@ -72,12 +71,14 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) }, }); - return computePacksWeights(result); + return z.array(PackWithWeightsSchema).parse(computePacksWeights({ packs: result })); }, { query: z.object({ - includePublic: z.coerce.number().int().min(0).max(1).optional().default(0), + // Handler defaults this to 0; keep schema truly optional for clients. + includePublic: z.coerce.number().int().min(0).max(1).optional(), }), + response: { 200: z.array(PackWithWeightsSchema) }, isAuthenticated: true, detail: { tags: ['Packs'], summary: 'List user packs', security: [{ bearerAuth: [] }] }, }, @@ -90,20 +91,17 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) const db = createDb(); const data = body; - const packId = data.id as string; - if (!packId) return status(400, { error: 'Pack ID is required' }); - // Zod validates all fields at runtime; cast through the Standard Schema // inference gap so drizzle's insert accepts the values. const [newPack] = await db .insert(packs) .values({ - id: packId, + id: data.id, userId: user.userId, name: data.name, description: data.description, category: data.category, - isPublic: data.isPublic, + isPublic: data.isPublic ?? false, image: data.image, tags: data.tags, localCreatedAt: new Date(data.localCreatedAt as string), @@ -111,13 +109,14 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) } as typeof packs.$inferInsert) .returning(); - if (!newPack) return status(400, { error: 'Failed to create pack' }); + if (!newPack) return status(500, { error: 'Failed to create pack' }); const packWithItems: PackWithItems = { ...newPack, items: [] }; - return computePacksWeights([packWithItems])[0]; + return PackWithWeightsSchema.parse(computePackWeights({ pack: packWithItems })); }, { body: CreatePackBodySchema, + response: { 200: PackWithWeightsSchema, 400: ErrorResponseSchema, 500: ErrorResponseSchema }, isAuthenticated: true, detail: { tags: ['Packs'], summary: 'Create new pack', security: [{ bearerAuth: [] }] }, }, @@ -191,13 +190,12 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) }); const imageDetectionService = new ImageDetectionService(); - const result = await imageDetectionService.detectAndMatchItems(imageUrl, matchLimit); + const result = await imageDetectionService.detectAndMatchItems({ imageUrl, matchLimit }); await PACKRAT_BUCKET.delete(image); return result; } catch (error) { - console.error('Error analyzing image:', error); if (error instanceof Error) { if ( error.message.includes('Invalid image') || @@ -206,8 +204,13 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) ) { return status(400, { error: error.message }); } - return status(500, { error: `Failed to analyze image: ${error.message}` }); } + captureApiException({ + error: error, + operation: 'packs.analyzeImage', + tags: { feature: 'packs' }, + extra: { httpStatus: 500, errorCode: 'PACKS_ANALYZE_IMAGE_ERROR' }, + }); return status(500, { error: 'Failed to analyze image' }); } }, @@ -226,24 +229,62 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) .get( '/:packId', async ({ params }) => { + const db = createDb(); + const pack = await db.query.packs.findFirst({ + where: eq(packs.id, params.packId), + with: { items: { where: eq(packItems.deleted, false) } }, + }); + + if (!pack) throw new NotFoundError('Pack not found'); + return PackWithWeightsSchema.parse(computePackWeights({ pack })); + }, + { + params: z.object({ packId: z.string() }), + response: { 200: PackWithWeightsSchema }, + isAuthenticated: true, + detail: { tags: ['Packs'], summary: 'Get pack by ID', security: [{ bearerAuth: [] }] }, + }, + ) + + // Weight breakdown — total/base/worn/consumable + per-category aggregation. + // Edge apps were computing this by walking pack.items locally; centralising + // here keeps MCP/CLI tools as one-line passthroughs. Matches the + // owner-or-public access pattern used by GET /:packId/items. + .get( + '/:packId/weight-breakdown', + async ({ params, user }) => { const db = createDb(); try { const pack = await db.query.packs.findFirst({ where: eq(packs.id, params.packId), with: { items: { where: eq(packItems.deleted, false) } }, }); - if (!pack) return status(404, { error: 'Pack not found' }); - return computePackWeights(pack); + const canAccess = pack.isPublic || pack.userId === user.userId; + if (!canAccess) return status(403, { error: 'Unauthorized' }); + return computePackBreakdown(pack); } catch (error) { - console.error('Error fetching pack:', error); - return status(500, { error: 'Failed to fetch pack' }); + captureApiException({ + error: error, + operation: 'packs.weightBreakdown', + tags: { feature: 'packs' }, + extra: { + packId: params.packId, + httpStatus: 500, + errorCode: 'PACKS_WEIGHT_BREAKDOWN_ERROR', + }, + }); + return status(500, { error: 'Failed to compute breakdown' }); } }, { params: z.object({ packId: z.string() }), isAuthenticated: true, - detail: { tags: ['Packs'], summary: 'Get pack by ID', security: [{ bearerAuth: [] }] }, + detail: { + tags: ['Packs'], + summary: 'Per-category weight breakdown', + security: [{ bearerAuth: [] }], + }, }, ) @@ -279,9 +320,19 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) }); if (!updatedPack) return status(404, { error: 'Pack not found' }); - return computePackWeights(updatedPack); + return computePackWeights({ pack: updatedPack }); } catch (error) { - console.error('Error updating pack:', error); + captureApiException({ + error: error, + operation: 'packs.update', + tags: { feature: 'packs' }, + extra: { + packId: params.packId, + userId: user.userId, + httpStatus: 500, + errorCode: 'PACKS_UPDATE_ERROR', + }, + }); return status(500, { error: 'Failed to update pack' }); } }, @@ -402,17 +453,23 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) updatedAt: entry.createdAt, })); } catch (error) { - console.error('Pack weight history API error:', error); + captureApiException({ + error: error, + operation: 'packs.createWeightHistory', + tags: { feature: 'packs' }, + extra: { + packId: params.packId, + userId: user.userId, + httpStatus: 500, + errorCode: 'PACKS_WEIGHT_HISTORY_ERROR', + }, + }); return status(500, { error: 'Failed to create weight history entry' }); } }, { params: z.object({ packId: z.string() }), - body: z.object({ - id: z.string(), - weight: z.number(), - localCreatedAt: z.string().datetime(), - }), + body: CreatePackWeightHistoryBodySchema, isAuthenticated: true, detail: { tags: ['Packs'], @@ -435,7 +492,7 @@ export const packsRoutes = new Elysia({ prefix: '/packs' }) const packDetails = await getPackDetails({ packId: params.packId }); if (!packDetails) return status(404, { error: 'Pack not found' }); - const pack = computePackWeights(packDetails); + const pack = computePackWeights({ pack: packDetails }); if (pack.userId !== user.userId) { return status(403, { error: 'Forbidden' }); @@ -506,14 +563,21 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s const { generateObject } = await import('ai'); const { DEFAULT_MODELS } = await import('@packrat/api/utils/ai/models'); - const { AI_PROVIDER, OPENAI_API_KEY, CLOUDFLARE_ACCOUNT_ID, CLOUDFLARE_AI_GATEWAY_ID, AI } = - getEnv(); + const { + AI_PROVIDER, + OPENAI_API_KEY, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); const aiProvider = createAIProvider({ openAiApiKey: OPENAI_API_KEY, provider: AI_PROVIDER, cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, cloudflareAiBinding: AI, }); @@ -604,26 +668,31 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s const db = createDb(); const packId = params.packId; const data = body; - const { OPENAI_API_KEY, AI_PROVIDER, CLOUDFLARE_ACCOUNT_ID, CLOUDFLARE_AI_GATEWAY_ID, AI } = - getEnv(); - - if (!OPENAI_API_KEY) return status(400, { error: 'OpenAI API key not configured' }); - if (!data.id) return status(400, { error: 'Item ID is required' }); - - const embeddingText = getEmbeddingText(data); + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + const itemId = data.id; + + const embeddingText = getEmbeddingText({ item: data }); const embedding = await generateEmbedding({ openAiApiKey: OPENAI_API_KEY, value: embeddingText, provider: AI_PROVIDER, cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, cloudflareAiBinding: AI, }); const [newItem] = await db .insert(packItems) .values({ - id: data.id, + id: itemId, packId, catalogItemId: data.catalogItemId ? Number(data.catalogItemId) : null, name: data.name, @@ -671,17 +740,17 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s const db = createDb(); const item = await db.query.packItems.findFirst({ where: eq(packItems.id, params.itemId), - with: { catalogItem: true, pack: true }, + with: { pack: true }, }); - if (!item) return status(404, { error: 'Item not found' }); + if (!item) throw new NotFoundError('Item not found'); const isOwner = item.userId === user.userId; const isPublic = item.pack.isPublic; - if (!isOwner && !isPublic) return status(403, { error: 'Unauthorized' }); + if (!isOwner && !isPublic) return status(403, { error: 'Forbidden' }); - return item; + return PackItemSchema.parse(item); }, { params: z.object({ itemId: z.string() }), @@ -701,19 +770,23 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s const db = createDb(); const itemId = params.itemId; const data = body; - const { OPENAI_API_KEY, AI_PROVIDER, CLOUDFLARE_ACCOUNT_ID, CLOUDFLARE_AI_GATEWAY_ID, AI } = - getEnv(); - - if (!OPENAI_API_KEY) return status(500, { error: 'OpenAI API key not configured' }); + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); const existingItem = await db.query.packItems.findFirst({ where: and(eq(packItems.id, itemId), eq(packItems.userId, user.userId)), }); - if (!existingItem) return status(404, { error: 'Pack item not found' }); + if (!existingItem) throw new NotFoundError('Pack item not found'); - const newEmbeddingText = getEmbeddingText(data, existingItem); - const oldEmbeddingText = getEmbeddingText(existingItem); + const newEmbeddingText = getEmbeddingText({ item: data, existingItem }); + const oldEmbeddingText = getEmbeddingText({ item: existingItem }); const updateData: Partial = {}; if ('name' in data) updateData.name = data.name; @@ -735,6 +808,7 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s provider: AI_PROVIDER, cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, cloudflareAiBinding: AI, }); } @@ -763,16 +837,17 @@ Limit to maximum 6 recommendations, prioritizing the most important gaps. Only s .where(and(eq(packItems.id, itemId), eq(packItems.userId, user.userId))) .returning(); - if (!updatedItem) return status(404, { error: 'Pack item not found' }); + if (!updatedItem) throw new NotFoundError('Pack item not found'); await db.update(packs).set({ updatedAt: new Date() }).where(eq(packs.id, updatedItem.packId)); updatedItem.embedding = null; - return updatedItem; + return PackItemSchema.parse(updatedItem); }, { params: z.object({ itemId: z.string() }), body: UpdatePackItemRequestSchema, + response: { 200: PackItemSchema, 500: ErrorResponseSchema }, isAuthenticated: true, detail: { tags: ['Pack Items'], diff --git a/packages/api/src/routes/passwordReset.ts b/packages/api/src/routes/passwordReset.ts new file mode 100644 index 0000000000..094e9d8272 --- /dev/null +++ b/packages/api/src/routes/passwordReset.ts @@ -0,0 +1,47 @@ +import { + requestPasswordReset, + verifyOtpAndResetPassword, +} from '@packrat/api/services/passwordResetService'; +import { ForgotPasswordRequestSchema, ResetPasswordRequestSchema } from '@packrat/schemas/auth'; +import { Elysia, status } from 'elysia'; + +export const passwordResetRoutes = new Elysia({ prefix: '/password-reset' }) + // public-route: unauthenticated users need this to initiate a password reset + .post( + '/request', + async ({ body }) => { + await requestPasswordReset(body.email); + return { success: true, message: 'If an account exists, a reset code has been sent.' }; + }, + { + body: ForgotPasswordRequestSchema, + detail: { + tags: ['Auth'], + summary: 'Request password reset', + description: + 'Send a 6-digit OTP to the user email. Always returns success to prevent email enumeration.', + }, + }, + ) + // public-route: unauthenticated users need this to verify OTP and set a new password + .post( + '/verify', + async ({ body }) => { + try { + await verifyOtpAndResetPassword(body); + return { success: true, message: 'Password reset successfully.' }; + } catch (error) { + return status(400, { + error: error instanceof Error ? error.message : 'Password reset failed', + }); + } + }, + { + body: ResetPasswordRequestSchema, + detail: { + tags: ['Auth'], + summary: 'Verify OTP and reset password', + description: 'Validate the 6-digit OTP and set a new password.', + }, + }, + ); diff --git a/packages/api/src/routes/seasonSuggestions.ts b/packages/api/src/routes/seasonSuggestions.ts index a74c784665..d76e524db3 100644 --- a/packages/api/src/routes/seasonSuggestions.ts +++ b/packages/api/src/routes/seasonSuggestions.ts @@ -1,9 +1,9 @@ -import { createOpenAI } from '@ai-sdk/openai'; import { createDb } from '@packrat/api/db'; -import { type PackItem, packItems } from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; -import { SeasonSuggestionsRequestSchema } from '@packrat/api/schemas/seasonSuggestions'; +import { createAIProvider } from '@packrat/api/utils/ai/provider'; import { getEnv } from '@packrat/api/utils/env-validation'; +import { type PackItem, packItems } from '@packrat/db'; +import { SeasonSuggestionsRequestSchema } from '@packrat/schemas/seasonSuggestions'; import { generateObject } from 'ai'; import { and, eq } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; @@ -53,10 +53,24 @@ Date: ${date} Available Inventory Items: ${inventoryFormatted}`; - const { OPENAI_API_KEY } = getEnv(); - const openai = createOpenAI({ apiKey: OPENAI_API_KEY }); + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + const aiProvider = createAIProvider({ + openAiApiKey: OPENAI_API_KEY, + provider: AI_PROVIDER, + cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: AI, + }); const { object } = await generateObject({ - model: openai(DEFAULT_MODELS.OPENAI_CHAT), + model: aiProvider(DEFAULT_MODELS.OPENAI_CHAT), schema: z.object({ season: z.string(), suggestions: z.array( diff --git a/packages/api/src/routes/trailConditions/reports.ts b/packages/api/src/routes/trailConditions/reports.ts index 47b854582c..b17b08ed5e 100644 --- a/packages/api/src/routes/trailConditions/reports.ts +++ b/packages/api/src/routes/trailConditions/reports.ts @@ -1,7 +1,12 @@ import { createDb } from '@packrat/api/db'; -import type { NewTrailConditionReport } from '@packrat/api/db/schema'; -import { trailConditionReports } from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; +import { captureApiException } from '@packrat/api/utils/sentry'; +import type { NewTrailConditionReport } from '@packrat/db'; +import { trailConditionReports } from '@packrat/db'; +import { + CreateTrailConditionReportRequestSchema, + UpdateTrailConditionReportRequestSchema, +} from '@packrat/schemas/trailConditions'; import { and, desc, eq, gte, ilike, type SQL } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; import { z } from 'zod'; @@ -11,27 +16,6 @@ const LIKE_ESCAPE_BACKSLASH = /\\/g; const LIKE_ESCAPE_PERCENT = /%/g; const LIKE_ESCAPE_UNDERSCORE = /_/g; -const CreateReportRequestSchema = z.object({ - id: z.string().describe('Client-generated report ID'), - trailName: z.string().min(1), - trailRegion: z.string().optional().nullable(), - surface: z.enum(['paved', 'gravel', 'dirt', 'rocky', 'snow', 'mud']), - overallCondition: z.enum(['excellent', 'good', 'fair', 'poor']), - hazards: z.array(z.string()).optional().default([]), - waterCrossings: z.number().int().min(0).max(20).optional().default(0), - waterCrossingDifficulty: z.enum(['easy', 'moderate', 'difficult']).optional().nullable(), - notes: z.string().optional().nullable(), - photos: z.array(z.string()).optional().default([]), - tripId: z.string().optional().nullable(), - localCreatedAt: z.string().datetime(), - localUpdatedAt: z.string().datetime(), -}); - -const UpdateReportRequestSchema = CreateReportRequestSchema.omit({ - id: true, - localCreatedAt: true, -}).partial(); - function toReportResponse(row: Record): Record { return { ...row, @@ -78,14 +62,20 @@ export const trailConditionRoutes = new Elysia() return reports.map(toReportResponse); } catch (error) { - console.error('Error listing trail condition reports:', error); + captureApiException({ + error: error, + operation: 'trailConditions.list', + tags: { feature: 'trailConditions' }, + extra: { trailName, limit, httpStatus: 500, errorCode: 'TRAIL_CONDITIONS_LIST_ERROR' }, + }); return status(500, { error: 'Failed to list trail condition reports' }); } }, { query: z.object({ trailName: z.string().optional(), - limit: z.coerce.number().int().min(1).max(100).optional().default(50), + // Handler defaults to 50 via `?? 50`; keep schema truly optional. + limit: z.coerce.number().int().min(1).max(100).optional(), }), isAuthenticated: true, detail: { @@ -138,12 +128,22 @@ export const trailConditionRoutes = new Elysia() if (existing) return toReportResponse(existing); return status(409, { error: 'Report ID already in use by another user' }); } - console.error('Error creating trail condition report:', error); + captureApiException({ + error: error, + operation: 'trailConditions.create', + tags: { feature: 'trailConditions' }, + extra: { + reportId: data.id, + userId: user.userId, + httpStatus: 500, + errorCode: 'TRAIL_CONDITIONS_CREATE_ERROR', + }, + }); return status(500, { error: 'Failed to submit trail condition report' }); } }, { - body: CreateReportRequestSchema, + body: CreateTrailConditionReportRequestSchema, isAuthenticated: true, detail: { tags: ['Trail Conditions'], @@ -175,7 +175,17 @@ export const trailConditionRoutes = new Elysia() return reports.map(toReportResponse); } catch (error) { - console.error('Error listing user trail condition reports:', error); + captureApiException({ + error: error, + operation: 'trailConditions.listMine', + tags: { feature: 'trailConditions' }, + extra: { + userId: user.userId, + updatedAt, + httpStatus: 500, + errorCode: 'TRAIL_CONDITIONS_LIST_MINE_ERROR', + }, + }); return status(500, { error: 'Failed to list trail condition reports' }); } }, @@ -230,13 +240,23 @@ export const trailConditionRoutes = new Elysia() return toReportResponse(updated); } catch (error) { - console.error('Error updating trail condition report:', error); + captureApiException({ + error: error, + operation: 'trailConditions.update', + tags: { feature: 'trailConditions' }, + extra: { + reportId, + userId: user.userId, + httpStatus: 500, + errorCode: 'TRAIL_CONDITIONS_UPDATE_ERROR', + }, + }); return status(500, { error: 'Failed to update trail condition report' }); } }, { params: z.object({ reportId: z.string() }), - body: UpdateReportRequestSchema, + body: UpdateTrailConditionReportRequestSchema, isAuthenticated: true, detail: { tags: ['Trail Conditions'], @@ -267,7 +287,17 @@ export const trailConditionRoutes = new Elysia() return { success: true }; } catch (error) { - console.error('Error deleting trail condition report:', error); + captureApiException({ + error: error, + operation: 'trailConditions.delete', + tags: { feature: 'trailConditions' }, + extra: { + reportId, + userId: user.userId, + httpStatus: 500, + errorCode: 'TRAIL_CONDITIONS_DELETE_ERROR', + }, + }); return status(500, { error: 'Failed to delete trail condition report' }); } }, diff --git a/packages/api/src/routes/trails/index.ts b/packages/api/src/routes/trails/index.ts index 9229623482..e1e0d606e9 100644 --- a/packages/api/src/routes/trails/index.ts +++ b/packages/api/src/routes/trails/index.ts @@ -1,37 +1,12 @@ import { createOsmDb } from '@packrat/api/db'; import { authPlugin } from '@packrat/api/middleware/auth'; import { stitchRouteGeometry } from '@packrat/api/services/trails'; +import { captureApiException } from '@packrat/api/utils/sentry'; +import { RouteDetailRowSchema, RouteSearchRowSchema } from '@packrat/schemas/trails'; import { sql } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; import { z } from 'zod'; -// ── Zod schemas ───────────────────────────────────────────────────────────── - -const OsmMemberSchema = z.object({ - type: z.string(), - ref: z.coerce.bigint(), - role: z.string(), -}); - -const RouteBaseRowSchema = z.object({ - osm_id: z.string(), - name: z.string().nullable(), - sport: z.string().nullable(), - network: z.string().nullable(), - distance: z.string().nullable(), - difficulty: z.string().nullable(), - description: z.string().nullable(), -}); - -const RouteSearchRowSchema = RouteBaseRowSchema.extend({ - bbox: z.string().nullable(), -}); - -const RouteDetailRowSchema = RouteBaseRowSchema.extend({ - members: z.array(OsmMemberSchema).nullable(), - geojson: z.string().nullable(), -}); - // ── Routes ───────────────────────────────────────────────────────────────── export const trailsRoutes = new Elysia({ prefix: '/trails' }) @@ -115,7 +90,12 @@ export const trailsRoutes = new Elysia({ prefix: '/trails' }) if (error instanceof Error && error.message.includes('not configured')) { return status(503, { error: 'Trail features are not enabled on this server' }); } - console.error('Trail search error:', error); + captureApiException({ + error: error, + operation: 'trails.search', + tags: { feature: 'trails' }, + extra: { q, lat, lon, radius, sport, httpStatus: 500, errorCode: 'TRAILS_SEARCH_ERROR' }, + }); return status(500, { error: 'Trail search failed' }); } }, @@ -180,7 +160,7 @@ export const trailsRoutes = new Elysia({ prefix: '/trails' }) if (row.geojson) { geometry = JSON.parse(row.geojson); } else if (row.members && row.members.length > 0) { - geometry = await stitchRouteGeometry(db, row.members); + geometry = await stitchRouteGeometry({ db, members: row.members }); } return { @@ -197,7 +177,12 @@ export const trailsRoutes = new Elysia({ prefix: '/trails' }) if (error instanceof Error && error.message.includes('not configured')) { return status(503, { error: 'Trail features are not enabled on this server' }); } - console.error('Trail geometry error:', error); + captureApiException({ + error: error, + operation: 'trails.geometry', + tags: { feature: 'trails' }, + extra: { osmId: String(osmId), httpStatus: 500, errorCode: 'TRAILS_GEOMETRY_ERROR' }, + }); return status(500, { error: 'Failed to fetch trail geometry' }); } }, @@ -260,7 +245,12 @@ export const trailsRoutes = new Elysia({ prefix: '/trails' }) if (error instanceof Error && error.message.includes('not configured')) { return status(503, { error: 'Trail features are not enabled on this server' }); } - console.error('Trail fetch error:', error); + captureApiException({ + error: error, + operation: 'trails.getById', + tags: { feature: 'trails' }, + extra: { osmId: String(osmId), httpStatus: 500, errorCode: 'TRAILS_GET_BY_ID_ERROR' }, + }); return status(500, { error: 'Failed to fetch trail' }); } }, diff --git a/packages/api/src/routes/trips/index.ts b/packages/api/src/routes/trips/index.ts index 906449f306..7ddd6c66c3 100644 --- a/packages/api/src/routes/trips/index.ts +++ b/packages/api/src/routes/trips/index.ts @@ -1,36 +1,11 @@ import { createDb } from '@packrat/api/db'; -import { type Trip, trips } from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; +import { trips } from '@packrat/db'; +import { CreateTripBodySchema, TripSchema, UpdateTripBodySchema } from '@packrat/schemas/trips'; import { and, eq } from 'drizzle-orm'; -import { Elysia, status } from 'elysia'; +import { Elysia, NotFoundError, status } from 'elysia'; import { z } from 'zod'; -const LocationSchema = z - .object({ - latitude: z.number(), - longitude: z.number(), - name: z.string().optional(), - }) - .nullable() - .optional(); - -const CreateTripRequestSchema = z.object({ - id: z.string(), - name: z.string().min(1), - description: z.string().optional().nullable(), - location: LocationSchema, - startDate: z.string().optional().nullable(), - endDate: z.string().optional().nullable(), - notes: z.string().optional().nullable(), - packId: z.string().optional().nullable(), - localCreatedAt: z.string().datetime(), - localUpdatedAt: z.string().datetime(), -}); - -const UpdateTripRequestSchema = CreateTripRequestSchema.partial().extend({ - deleted: z.boolean().optional(), -}); - export const tripsRoutes = new Elysia({ prefix: '/trips' }) .use(authPlugin) @@ -43,17 +18,17 @@ export const tripsRoutes = new Elysia({ prefix: '/trips' }) try { const allTrips = await db.query.trips.findMany({ where: and(eq(trips.userId, user.userId), eq(trips.deleted, false)), - with: { pack: true }, orderBy: (t) => t.createdAt, }); - return allTrips; + return z.array(TripSchema).parse(allTrips); } catch (error) { console.error('Error listing trips:', error); - return status(500, { error: 'Failed to list trips' }); + throw error; } }, { + response: { 200: z.array(TripSchema) }, isAuthenticated: true, detail: { tags: ['Trips'], @@ -70,8 +45,6 @@ export const tripsRoutes = new Elysia({ prefix: '/trips' }) const db = createDb(); const data = body; - if (!data.id) return status(400, { error: 'Trip ID is required' }); - try { const [newTrip] = await db .insert(trips) @@ -91,23 +64,17 @@ export const tripsRoutes = new Elysia({ prefix: '/trips' }) }) .returning(); - if (!newTrip) return status(400, { error: 'Failed to create trip' }); - - const tripWithPack = data.packId - ? await db.query.trips.findFirst({ - where: eq(trips.id, newTrip.id), - with: { pack: true }, - }) - : newTrip; + if (!newTrip) throw new Error('Failed to create trip'); - return tripWithPack; + return TripSchema.parse(newTrip); } catch (error) { console.error('Error creating trip:', error); - return status(500, { error: 'Failed to create trip' }); + throw error; } }, { - body: CreateTripRequestSchema, + body: CreateTripBodySchema, + response: { 200: TripSchema }, isAuthenticated: true, detail: { tags: ['Trips'], @@ -126,13 +93,13 @@ export const tripsRoutes = new Elysia({ prefix: '/trips' }) const trip = await db.query.trips.findFirst({ where: and(eq(trips.id, tripId), eq(trips.userId, user.userId)), - with: { pack: true }, }); - if (!trip) return status(404, { error: 'Trip not found' }); - return trip; + if (!trip) throw new NotFoundError('Trip not found'); + return TripSchema.parse(trip); }, { params: z.object({ tripId: z.string() }), + response: { 200: TripSchema }, isAuthenticated: true, detail: { tags: ['Trips'], @@ -172,20 +139,21 @@ export const tripsRoutes = new Elysia({ prefix: '/trips' }) .set(updateData) .where(and(eq(trips.id, tripId), eq(trips.userId, user.userId))); - const updatedTrip: Trip | undefined = await db.query.trips.findFirst({ + const updatedTrip = await db.query.trips.findFirst({ where: and(eq(trips.id, tripId), eq(trips.userId, user.userId)), }); - if (!updatedTrip) return status(404, { error: 'Trip not found' }); - return updatedTrip; + if (!updatedTrip) throw new NotFoundError('Trip not found'); + return TripSchema.parse(updatedTrip); } catch (error) { console.error('Error updating trip:', error); - return status(500, { error: 'Failed to update trip' }); + throw error; } }, { params: z.object({ tripId: z.string() }), - body: UpdateTripRequestSchema, + body: UpdateTripBodySchema, + response: { 200: TripSchema }, isAuthenticated: true, detail: { tags: ['Trips'], @@ -202,21 +170,14 @@ export const tripsRoutes = new Elysia({ prefix: '/trips' }) const db = createDb(); const tripId = params.tripId; - try { - const trip = await db.query.trips.findFirst({ - where: eq(trips.id, tripId), - }); + const [deleted] = await db + .update(trips) + .set({ deleted: true, updatedAt: new Date() }) + .where(and(eq(trips.id, tripId), eq(trips.userId, user.userId))) + .returning(); - if (!trip) return status(404, { error: 'Trip not found' }); - if (trip.userId !== user.userId) return status(403, { error: 'Forbidden' }); - - await db.delete(trips).where(eq(trips.id, tripId)); - - return { success: true }; - } catch (error) { - console.error('Error deleting trip:', error); - return status(500, { error: 'Failed to delete trip' }); - } + if (!deleted) return status(404, { error: 'Trip not found' }); + return { success: true }; }, { params: z.object({ tripId: z.string() }), diff --git a/packages/api/src/routes/upload.ts b/packages/api/src/routes/upload.ts index 87558dc09c..9129504b60 100644 --- a/packages/api/src/routes/upload.ts +++ b/packages/api/src/routes/upload.ts @@ -1,8 +1,8 @@ import { PutObjectCommand } from '@aws-sdk/client-s3'; import { authPlugin } from '@packrat/api/middleware/auth'; -import { PresignedUploadQuerySchema } from '@packrat/api/schemas/upload'; import { getEnv } from '@packrat/api/utils/env-validation'; import { getPresignedUrl } from '@packrat/api/utils/getPresignedUrl'; +import { PresignedUploadQuerySchema, PresignedUploadResponseSchema } from '@packrat/schemas/upload'; import { Elysia, status } from 'elysia'; const ALLOWED_IMAGE_TYPES = [ @@ -65,11 +65,11 @@ export const uploadRoutes = new Elysia({ prefix: '/upload' }).use(authPlugin).ge } })(); - return { + return PresignedUploadResponseSchema.parse({ url: presignedUrl, objectKey: fileName, publicUrl, - }; + }); }, { query: PresignedUploadQuerySchema, diff --git a/packages/api/src/routes/user/index.ts b/packages/api/src/routes/user/index.ts index 8c1d1b9522..1543929982 100644 --- a/packages/api/src/routes/user/index.ts +++ b/packages/api/src/routes/user/index.ts @@ -1,7 +1,13 @@ import { createDb } from '@packrat/api/db'; -import { users } from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; -import { UpdateUserRequestSchema } from '@packrat/api/schemas/users'; +import { captureApiException } from '@packrat/api/utils/sentry'; +import { users } from '@packrat/db'; +import { ErrorResponseSchema } from '@packrat/schemas/shared'; +import { + UpdateUserRequestSchema, + UpdateUserResponseSchema, + UserProfileSchema, +} from '@packrat/schemas/users'; import { eq } from 'drizzle-orm'; import { Elysia, status } from 'elysia'; @@ -34,20 +40,26 @@ export const userRoutes = new Elysia({ prefix: '/user' }) return status(404, { error: 'User not found', code: 'USER_NOT_FOUND' }); } - return { + return UserProfileSchema.parse({ success: true, user: { ...userRecord, createdAt: userRecord.createdAt?.toISOString() || null, updatedAt: userRecord.updatedAt?.toISOString() || null, }, - }; + }); } catch (error) { - console.error('Error fetching user profile:', error); - return status(500, { error: 'Failed to fetch user profile', code: 'FETCH_ERROR' }); + captureApiException({ + error: error, + operation: 'user.getProfile', + userId: user.userId, + tags: { feature: 'user' }, + }); + throw error; } }, { + response: { 200: UserProfileSchema, 404: ErrorResponseSchema }, isAuthenticated: true, detail: { tags: ['Users'], summary: 'Get user profile', security: [{ bearerAuth: [] }] }, }, @@ -69,10 +81,7 @@ export const userRoutes = new Elysia({ prefix: '/user' }) .limit(1); if (existingUser && existingUser.id !== user.userId) { - return status(409, { - error: 'Email already in use by another user', - code: 'EMAIL_CONFLICT', - }); + return status(409, { error: 'Email already in use by another user' }); } } @@ -101,7 +110,7 @@ export const userRoutes = new Elysia({ prefix: '/user' }) ? 'Profile updated successfully. Please verify your new email address.' : 'Profile updated successfully'; - return { + return UpdateUserResponseSchema.parse({ success: true, message, user: { @@ -115,10 +124,15 @@ export const userRoutes = new Elysia({ prefix: '/user' }) createdAt: updatedUser.createdAt?.toISOString() || null, updatedAt: updatedUser.updatedAt?.toISOString() || null, }, - }; + }); } catch (error) { - console.error('Error updating user profile:', error); - return status(500, { error: 'Failed to update user profile', code: 'UPDATE_ERROR' }); + captureApiException({ + error: error, + operation: 'user.updateProfile', + userId: user.userId, + tags: { feature: 'user' }, + }); + throw error; } }, { diff --git a/packages/api/src/routes/weather.ts b/packages/api/src/routes/weather.ts index 1574f24ab8..cdeec1758a 100644 --- a/packages/api/src/routes/weather.ts +++ b/packages/api/src/routes/weather.ts @@ -1,15 +1,19 @@ import { authPlugin } from '@packrat/api/middleware/auth'; +import { getEnv } from '@packrat/api/utils/env-validation'; +import { captureApiException } from '@packrat/api/utils/sentry'; +import { isString } from '@packrat/guards'; import { type WeatherAPICurrentResponse, type WeatherAPIForecastResponse, + WeatherAPIForecastResponseSchema, type WeatherAPISearchResponse, + WeatherByNameQuerySchema, WeatherCoordinateQuerySchema, WeatherLocationIdSchema, WeatherSearchQuerySchema, -} from '@packrat/api/schemas/weather'; -import { getEnv } from '@packrat/api/utils/env-validation'; -import { isString } from '@packrat/guards'; +} from '@packrat/schemas/weather'; import { Elysia, status } from 'elysia'; +import { ZodError } from 'zod'; const WEATHER_API_BASE_URL = 'https://api.weatherapi.com/v1'; @@ -17,7 +21,7 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) .use(authPlugin) .get( '/search', - async ({ query }) => { + async ({ query, user }) => { const { WEATHER_API_KEY } = getEnv(); const q = query.q; @@ -29,7 +33,7 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) const response = await fetch( `${WEATHER_API_BASE_URL}/search.json?key=${WEATHER_API_KEY}&q=${encodeURIComponent(q)}`, ); - if (!response.ok) throw new Error(`API error: ${response.status}`); + if (!response.ok) throw new Error(`WeatherAPI HTTP ${response.status}`); const data = (await response.json()) as WeatherAPISearchResponse; // safe-cast: WeatherAPI.com response shape matches this type return data.map((item) => ({ @@ -41,7 +45,13 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) lon: isString(item.lon) ? Number.parseFloat(item.lon) : item.lon, })); } catch (error) { - console.error('Error searching weather locations:', error); + captureApiException({ + error: error, + operation: 'weather.search', + userId: user?.userId, + tags: { weather_operation: 'search' }, + extra: { query: q, httpStatus: 500, errorCode: 'WEATHER_SEARCH_ERROR' }, + }); return status(500, { error: 'Internal server error', code: 'WEATHER_SEARCH_ERROR' }); } }, @@ -58,7 +68,7 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) ) .get( '/search-by-coordinates', - async ({ query }) => { + async ({ query, user }) => { const { WEATHER_API_KEY } = getEnv(); const latitude = Number.parseFloat(String(query.lat ?? '')); const longitude = Number.parseFloat(String(query.lon ?? '')); @@ -74,14 +84,14 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) const response = await fetch( `${WEATHER_API_BASE_URL}/search.json?key=${WEATHER_API_KEY}&q=${encodeURIComponent(q)}`, ); - if (!response.ok) throw new Error(`API error: ${response.status}`); + if (!response.ok) throw new Error(`WeatherAPI HTTP ${response.status}`); const data = (await response.json()) as WeatherAPISearchResponse; // safe-cast: WeatherAPI.com response shape matches this type if (!data || data.length === 0) { const currentResponse = await fetch( `${WEATHER_API_BASE_URL}/current.json?key=${WEATHER_API_KEY}&q=${encodeURIComponent(q)}`, ); - if (!currentResponse.ok) throw new Error(`API error: ${currentResponse.status}`); + if (!currentResponse.ok) throw new Error(`WeatherAPI HTTP ${currentResponse.status}`); const currentData = (await currentResponse.json()) as WeatherAPICurrentResponse; // safe-cast: WeatherAPI.com response shape matches this type if (currentData?.location) { @@ -108,7 +118,13 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) lon: isString(item.lon) ? Number.parseFloat(item.lon) : item.lon, })); } catch (error) { - console.error('Error searching weather locations by coordinates:', error); + captureApiException({ + error: error, + operation: 'weather.searchByCoordinates', + userId: user?.userId, + tags: { weather_operation: 'search_by_coordinates' }, + extra: { latitude, longitude, httpStatus: 500, errorCode: 'WEATHER_COORD_SEARCH_ERROR' }, + }); return status(500, { error: 'Internal server error', code: 'WEATHER_COORD_SEARCH_ERROR', @@ -127,7 +143,7 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) ) .get( '/forecast', - async ({ query }) => { + async ({ query, user }) => { const { WEATHER_API_KEY } = getEnv(); const idParam = query.id; const id = Number(idParam); @@ -141,22 +157,41 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) const response = await fetch( `${WEATHER_API_BASE_URL}/forecast.json?key=${WEATHER_API_KEY}&q=${encodeURIComponent(q)}&days=10&aqi=yes&alerts=yes`, ); - if (!response.ok) throw new Error(`API error: ${response.status}`); + if (!response.ok) throw new Error(`WeatherAPI HTTP ${response.status}`); const data = (await response.json()) as WeatherAPIForecastResponse; // safe-cast: WeatherAPI.com response shape matches this type - return { + return WeatherAPIForecastResponseSchema.parse({ ...data, location: { ...data.location, id: Number(id), }, - }; + }); } catch (error) { - console.error('Error fetching weather forecast:', error); - return status(500, { - error: 'Internal server error', - code: 'WEATHER_FORECAST_ERROR', + if (error instanceof ZodError) { + const invalidPaths = error.errors.map((e) => e.path.join('.')).join(', '); + captureApiException({ + error: error, + operation: 'weather.forecast.schemaValidation', + userId: user?.userId, + tags: { weather_operation: 'forecast', error_type: 'schema_validation' }, + extra: { + locationId: id, + invalidPaths, + httpStatus: 500, + errorCode: 'WEATHER_FORECAST_SCHEMA_ERROR', + }, + }); + return status(500, { error: 'Internal server error', code: 'WEATHER_FORECAST_ERROR' }); + } + captureApiException({ + error: error, + operation: 'weather.forecast', + userId: user?.userId, + tags: { weather_operation: 'forecast' }, + extra: { locationId: id, httpStatus: 500, errorCode: 'WEATHER_FORECAST_ERROR' }, }); + return status(500, { error: 'Internal server error', code: 'WEATHER_FORECAST_ERROR' }); } }, { @@ -170,4 +205,59 @@ export const weatherRoutes = new Elysia({ prefix: '/weather' }) security: [{ bearerAuth: [] }], }, }, + ) + // Combined search + forecast — pass a location name and get the forecast + // directly. Saves the typical two-step (`/search` → `/forecast`) clients + // were doing. Returns 404 if no location matches. + .get( + '/by-name', + async ({ query, user }) => { + const { WEATHER_API_KEY } = getEnv(); + // Schema enforces z.string().min(2); Elysia rejects shorter values + // before the handler runs. + const q = query.q; + try { + const searchResponse = await fetch( + `${WEATHER_API_BASE_URL}/search.json?key=${WEATHER_API_KEY}&q=${encodeURIComponent(q)}`, + ); + if (!searchResponse.ok) throw new Error(`WeatherAPI HTTP ${searchResponse.status}`); + const matches = (await searchResponse.json()) as WeatherAPISearchResponse; // safe-cast: WeatherAPI.com response shape matches this type + const first = Array.isArray(matches) ? matches[0] : null; + if (!first) { + return status(404, { error: `No weather location matched "${q}"` }); + } + const forecastResponse = await fetch( + `${WEATHER_API_BASE_URL}/forecast.json?key=${WEATHER_API_KEY}&q=${encodeURIComponent(`id:${first.id}`)}&days=10&aqi=yes&alerts=yes`, + ); + if (!forecastResponse.ok) throw new Error(`WeatherAPI HTTP ${forecastResponse.status}`); + const data = (await forecastResponse.json()) as WeatherAPIForecastResponse; // safe-cast: WeatherAPI.com response shape matches this type + return { + ...data, + location: { ...data.location, id: Number(first.id) }, + }; + } catch (error) { + captureApiException({ + error: error, + operation: 'weather.byName', + userId: user?.userId, + tags: { weather_operation: 'by_name' }, + extra: { query: q, httpStatus: 500, errorCode: 'WEATHER_BY_NAME_ERROR' }, + }); + return status(500, { + error: 'Internal server error', + code: 'WEATHER_BY_NAME_ERROR', + }); + } + }, + { + query: WeatherByNameQuerySchema, + isAuthenticated: true, + detail: { + tags: ['Weather'], + summary: 'Search and fetch forecast in one call', + description: + 'Resolve the location query to the first match and return its 10-day forecast.', + security: [{ bearerAuth: [] }], + }, + }, ); diff --git a/packages/api/src/routes/wildlife/index.ts b/packages/api/src/routes/wildlife/index.ts index 13af169724..2752e2ec00 100644 --- a/packages/api/src/routes/wildlife/index.ts +++ b/packages/api/src/routes/wildlife/index.ts @@ -3,17 +3,14 @@ import { authPlugin } from '@packrat/api/middleware/auth'; import { WildlifeIdentificationService } from '@packrat/api/services/wildlifeIdentificationService'; import { getEnv } from '@packrat/api/utils/env-validation'; import { getPresignedUrl } from '@packrat/api/utils/getPresignedUrl'; +import { captureApiException } from '@packrat/api/utils/sentry'; +import { WildlifeIdentifyRequestSchema } from '@packrat/schemas/wildlife'; import { Elysia, status } from 'elysia'; -import { z } from 'zod'; // ── Slug normalization patterns ─────────────────────────────────────── const SPACES_AND_DOTS = /[\s.]+/g; const NON_SLUG_CHARS = /[^a-z0-9-]/g; -const IdentifyRequestSchema = z.object({ - image: z.string().describe('Uploaded image key in R2'), -}); - export const wildlifeRoutes = new Elysia({ prefix: '/wildlife' }).use(authPlugin).post( '/identify', async ({ body, user }) => { @@ -38,8 +35,6 @@ export const wildlifeRoutes = new Elysia({ prefix: '/wildlife' }).use(authPlugin try { identification = await service.identifySpecies(imageUrl); } catch (error) { - console.error('Error identifying wildlife:', error); - // Clean up temp upload on error await PACKRAT_BUCKET.delete(image).catch((err: unknown) => { console.error('Failed to delete temp upload from R2:', err); @@ -54,6 +49,12 @@ export const wildlifeRoutes = new Elysia({ prefix: '/wildlife' }).use(authPlugin } } + captureApiException({ + error: error, + operation: 'wildlife.identify', + userId: user.userId, + tags: { feature: 'wildlife' }, + }); return status(500, { error: 'Failed to identify species' }); } @@ -93,7 +94,7 @@ export const wildlifeRoutes = new Elysia({ prefix: '/wildlife' }).use(authPlugin return { results }; }, { - body: IdentifyRequestSchema, + body: WildlifeIdentifyRequestSchema, isAuthenticated: true, detail: { tags: ['Wildlife'], diff --git a/packages/api/src/schemas/admin.ts b/packages/api/src/schemas/admin.ts deleted file mode 100644 index c874fa222a..0000000000 --- a/packages/api/src/schemas/admin.ts +++ /dev/null @@ -1,218 +0,0 @@ -import { t } from 'elysia'; - -// t.Unsafe keeps the JSON Schema shape for OpenAPI docs while giving -// TypeScript type `any`. ElysiaCustomStatusResponse has T in both covariant -// and contravariant positions (invariant), so a literal error body literal -// can never unify with { error: string } without `any` bypassing invariance. -// biome-ignore lint/suspicious/noExplicitAny: intentional — see comment above -const Err = t.Unsafe(t.Object({ error: t.String() }, { additionalProperties: true })); -export const AdminErrorResponses = { - 400: Err, - 401: Err, - 404: Err, - 409: Err, - 429: Err, - 500: Err, - 503: Err, -} as const; - -// ─── Stats ──────────────────────────────────────────────────────────────────── - -export const AdminStatsSchema = t.Object({ - users: t.Number(), - packs: t.Number(), - items: t.Number(), -}); - -// ─── Users ──────────────────────────────────────────────────────────────────── - -export const AdminUserItemSchema = t.Object({ - id: t.Number(), - email: t.String(), - firstName: t.Nullable(t.String()), - lastName: t.Nullable(t.String()), - role: t.Nullable(t.String()), - emailVerified: t.Nullable(t.Boolean()), - avatarUrl: t.Nullable(t.String()), - createdAt: t.Nullable(t.String()), - updatedAt: t.Nullable(t.String()), -}); - -// ─── Packs ──────────────────────────────────────────────────────────────────── - -export const AdminPackItemSchema = t.Object({ - id: t.String(), - name: t.String(), - description: t.Nullable(t.String()), - category: t.String(), - isPublic: t.Nullable(t.Boolean()), - isAIGenerated: t.Nullable(t.Boolean()), - tags: t.Nullable(t.Array(t.String())), - image: t.Nullable(t.String()), - createdAt: t.Nullable(t.String()), - updatedAt: t.Nullable(t.String()), - userEmail: t.Nullable(t.String()), -}); - -// ─── Catalog ───────────────────────────────────────────────────────────────── - -export const AdminCatalogItemSchema = t.Object({ - id: t.Number(), - name: t.String(), - description: t.Nullable(t.String()), - categories: t.Nullable(t.Array(t.String())), - brand: t.Nullable(t.String()), - model: t.Nullable(t.String()), - price: t.Nullable(t.Number()), - currency: t.Nullable(t.String()), - weight: t.Number(), - weightUnit: t.String(), - availability: t.Nullable(t.String()), - ratingValue: t.Nullable(t.Number()), - reviewCount: t.Nullable(t.Number()), - productUrl: t.Nullable(t.String()), - images: t.Nullable(t.Array(t.String())), - createdAt: t.Nullable(t.String()), -}); - -// ─── Paginated wrappers ─────────────────────────────────────────────────────── - -const Paginated = >(item: T) => - t.Object({ data: t.Array(item), total: t.Number(), limit: t.Number(), offset: t.Number() }); - -export const AdminUsersListSchema = Paginated(AdminUserItemSchema); -export const AdminPacksListSchema = Paginated(AdminPackItemSchema); -export const AdminCatalogListSchema = Paginated(AdminCatalogItemSchema); - -// ─── Mutations ──────────────────────────────────────────────────────────────── - -export const SuccessSchema = t.Object({ success: t.Literal(true) }); -export const HardDeleteSuccessSchema = t.Object({ - success: t.Literal(true), - purged: t.Literal(true), -}); -export const CatalogUpdateSchema = t.Object({ id: t.Number(), name: t.String() }); - -// ─── Analytics — Platform ───────────────────────────────────────────────────── - -export const GrowthPointSchema = t.Object({ - period: t.String(), - users: t.Number(), - packs: t.Number(), - catalogItems: t.Number(), -}); - -export const ActivityPointSchema = t.Object({ - period: t.String(), - trips: t.Number(), - trailReports: t.Number(), - posts: t.Number(), -}); - -export const ActiveUsersSchema = t.Object({ dau: t.Number(), wau: t.Number(), mau: t.Number() }); - -export const BreakdownItemSchema = t.Object({ category: t.String(), count: t.Number() }); - -// ─── Analytics — Catalog ───────────────────────────────────────────────────── - -export const CatalogOverviewSchema = t.Object({ - totalItems: t.Number(), - totalBrands: t.Number(), - avgPrice: t.Nullable(t.Number()), - minPrice: t.Nullable(t.Number()), - maxPrice: t.Nullable(t.Number()), - embeddingCoverage: t.Object({ total: t.Number(), withEmbedding: t.Number(), pct: t.Number() }), - availability: t.Array(t.Object({ status: t.Nullable(t.String()), count: t.Number() })), - addedLast30Days: t.Number(), -}); - -export const BrandRowSchema = t.Object({ - brand: t.String(), - itemCount: t.Number(), - avgPrice: t.Nullable(t.Number()), - minPrice: t.Nullable(t.Number()), - maxPrice: t.Nullable(t.Number()), - avgRating: t.Nullable(t.Number()), -}); - -export const PriceBucketSchema = t.Object({ bucket: t.String(), count: t.Number() }); - -export const EtlJobSchema = t.Object({ - id: t.String(), - status: t.Union([t.Literal('running'), t.Literal('completed'), t.Literal('failed')]), - source: t.String(), - filename: t.String(), - scraperRevision: t.String(), - startedAt: t.String(), - completedAt: t.Nullable(t.String()), - totalProcessed: t.Nullable(t.Number()), - totalValid: t.Nullable(t.Number()), - totalInvalid: t.Nullable(t.Number()), - successRate: t.Nullable(t.Number()), -}); - -export const EtlResponseSchema = t.Object({ - jobs: t.Array(EtlJobSchema), - summary: t.Object({ - totalRuns: t.Number(), - completed: t.Number(), - failed: t.Number(), - totalItemsIngested: t.Number(), - }), -}); - -export const EmbeddingStatsSchema = t.Object({ - total: t.Number(), - withEmbedding: t.Number(), - pending: t.Number(), - coveragePct: t.Number(), -}); - -// ─── Trails ─────────────────────────────────────────────────────────────────── - -export const TrailSearchItemSchema = t.Object({ - osmId: t.String(), - name: t.Nullable(t.String()), - sport: t.Nullable(t.String()), - network: t.Nullable(t.String()), - distance: t.Nullable(t.String()), - difficulty: t.Nullable(t.String()), - description: t.Nullable(t.String()), - bbox: t.Nullable(t.Unknown()), -}); - -export const TrailSearchResultSchema = t.Object({ - trails: t.Array(TrailSearchItemSchema), - hasMore: t.Boolean(), - offset: t.Number(), - limit: t.Number(), -}); - -export const TrailGeometrySchema = t.Object({ - osmId: t.String(), - name: t.Nullable(t.String()), - sport: t.Nullable(t.String()), - network: t.Nullable(t.String()), - distance: t.Nullable(t.String()), - difficulty: t.Nullable(t.String()), - description: t.Nullable(t.String()), - geometry: t.Nullable(t.Unknown()), -}); - -export const TrailConditionReportSchema = t.Object({ - id: t.String(), - trailName: t.String(), - trailRegion: t.Nullable(t.String()), - surface: t.String(), - overallCondition: t.String(), - hazards: t.Array(t.String()), - waterCrossings: t.Number(), - notes: t.Nullable(t.String()), - deleted: t.Boolean(), - deletedAt: t.Nullable(t.String()), - createdAt: t.String(), - userId: t.Number(), - userEmail: t.Nullable(t.String()), -}); - -export const TrailConditionsListSchema = Paginated(TrailConditionReportSchema); diff --git a/packages/api/src/services/__tests__/embeddingService.test.ts b/packages/api/src/services/__tests__/embeddingService.test.ts index 489aef01f7..576a83d86a 100644 --- a/packages/api/src/services/__tests__/embeddingService.test.ts +++ b/packages/api/src/services/__tests__/embeddingService.test.ts @@ -29,6 +29,7 @@ const baseParams = { provider: 'openai' as const, cloudflareAccountId: 'test-account', cloudflareGatewayId: 'test-gateway', + cloudflareApiToken: 'cf-token', cloudflareAiBinding: {} as any, }; @@ -115,6 +116,7 @@ describe('embeddingService', () => { provider: 'openai', cloudflareAccountId: 'test-account', cloudflareGatewayId: 'test-gateway', + cloudflareApiToken: 'cf-token', cloudflareAiBinding: expect.anything(), }); }); diff --git a/packages/api/src/services/__tests__/imageDetectionService.test.ts b/packages/api/src/services/__tests__/imageDetectionService.test.ts new file mode 100644 index 0000000000..ab4492e4b6 --- /dev/null +++ b/packages/api/src/services/__tests__/imageDetectionService.test.ts @@ -0,0 +1,73 @@ +import { generateObject } from 'ai'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { ImageDetectionService } from '../imageDetectionService'; + +const { mockCreateAIProvider, mockModel } = vi.hoisted(() => { + const mockModel = vi.fn((modelName: string) => ({ name: modelName })); + return { + mockCreateAIProvider: vi.fn(() => mockModel), + mockModel, + }; +}); + +vi.mock('@packrat/api/utils/ai/provider', () => ({ + createAIProvider: mockCreateAIProvider, +})); + +vi.mock('@packrat/api/utils/env-validation', () => ({ + getEnv: vi.fn(() => ({ + OPENAI_API_KEY: undefined, + AI_PROVIDER: 'openai', + CLOUDFLARE_ACCOUNT_ID: 'test-account', + CLOUDFLARE_AI_GATEWAY_ID: 'test-gateway', + CLOUDFLARE_API_TOKEN: 'cf-token', + AI: {}, + })), +})); + +vi.mock('ai', () => ({ + generateObject: vi.fn(), +})); + +describe('ImageDetectionService', () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it('analyzes images through the shared AI provider without a direct OpenAI key', async () => { + vi.mocked(generateObject).mockResolvedValue({ + object: { + items: [ + { + name: 'Tent', + description: 'One-person backpacking tent', + quantity: 1, + category: 'Shelter', + consumable: false, + worn: false, + notes: null, + confidence: 0.9, + }, + ], + }, + } as Awaited>); + + const result = await new ImageDetectionService().analyzeImage('https://example.com/gear.jpg'); + + expect(result.items).toHaveLength(1); + expect(mockCreateAIProvider).toHaveBeenCalledWith({ + openAiApiKey: undefined, + provider: 'openai', + cloudflareAccountId: 'test-account', + cloudflareGatewayId: 'test-gateway', + cloudflareApiToken: 'cf-token', + cloudflareAiBinding: {}, + }); + expect(mockModel).toHaveBeenCalledWith('gpt-4o'); + expect(generateObject).toHaveBeenCalledWith( + expect.objectContaining({ + model: { name: 'gpt-4o' }, + }), + ); + }); +}); diff --git a/packages/api/src/services/__tests__/packService.test.ts b/packages/api/src/services/__tests__/packService.test.ts index b1557eaf8e..02d5568791 100644 --- a/packages/api/src/services/__tests__/packService.test.ts +++ b/packages/api/src/services/__tests__/packService.test.ts @@ -1,3 +1,5 @@ +import { createAIProvider } from '@packrat/api/utils/ai/provider'; +import { generateObject } from 'ai'; import { beforeEach, describe, expect, it, vi } from 'vitest'; import { PackService } from '../packService'; @@ -22,8 +24,8 @@ vi.mock('@packrat/api/db', () => ({ })); // Prevent real AI calls -vi.mock('@ai-sdk/openai', () => ({ - createOpenAI: vi.fn(() => vi.fn((modelName) => ({ name: modelName }))), +vi.mock('@packrat/api/utils/ai/provider', () => ({ + createAIProvider: vi.fn(() => vi.fn((modelName) => ({ name: modelName }))), })); vi.mock('ai', () => ({ @@ -44,6 +46,10 @@ vi.mock('@packrat/api/utils/env-validation', () => ({ getEnv: vi.fn(() => ({ OPENAI_API_KEY: 'test-key', AI_PROVIDER: 'openai', + CLOUDFLARE_ACCOUNT_ID: 'test-account', + CLOUDFLARE_AI_GATEWAY_ID: 'test-gateway', + CLOUDFLARE_API_TOKEN: 'cf-token', + AI: {}, })), })); @@ -146,5 +152,34 @@ describe('PackService', () => { it('throws for negative count', async () => { await expect(service.generatePacks(-1)).rejects.toThrow('Count must be a positive integer'); }); + + it('creates the AI provider with Cloudflare gateway configuration', async () => { + vi.mocked(generateObject).mockResolvedValue({ + object: [ + { + name: 'Weekend Hiking Kit', + description: 'A compact day-hike setup', + category: 'hiking', + tags: ['hiking'], + items: [], + }, + ], + } as Awaited>); + + await ( + service as unknown as { + generatePackConcepts(count: number): Promise; + } + ).generatePackConcepts(1); + + expect(createAIProvider).toHaveBeenCalledWith({ + openAiApiKey: 'test-key', + provider: 'openai', + cloudflareAccountId: 'test-account', + cloudflareGatewayId: 'test-gateway', + cloudflareApiToken: 'cf-token', + cloudflareAiBinding: {}, + }); + }); }); }); diff --git a/packages/api/src/services/__tests__/passwordResetService.test.ts b/packages/api/src/services/__tests__/passwordResetService.test.ts new file mode 100644 index 0000000000..4c6fb3f909 --- /dev/null +++ b/packages/api/src/services/__tests__/passwordResetService.test.ts @@ -0,0 +1,255 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + +const mocks = vi.hoisted(() => { + const deleteWhere = vi.fn().mockResolvedValue(undefined); + const deleteFn = vi.fn(() => ({ where: deleteWhere })); + + const insertValues = vi.fn().mockResolvedValue(undefined); + const insertFn = vi.fn(() => ({ values: insertValues })); + + const updateReturning = vi.fn().mockResolvedValue([]); + const updateWhere = vi.fn(() => ({ returning: updateReturning })); + const updateSet = vi.fn(() => ({ where: updateWhere })); + const updateFn = vi.fn(() => ({ set: updateSet })); + + const findFirstUser = vi.fn(); + const findFirstVerification = vi.fn(); + + return { + deleteWhere, + deleteFn, + insertValues, + insertFn, + updateReturning, + updateWhere, + updateSet, + updateFn, + findFirstUser, + findFirstVerification, + createDb: vi.fn(() => ({ + query: { + users: { findFirst: findFirstUser }, + verification: { findFirst: findFirstVerification }, + }, + delete: deleteFn, + insert: insertFn, + update: updateFn, + })), + sendPasswordResetEmail: vi.fn().mockResolvedValue(undefined), + timingSafeEqual: vi.fn(({ a, b }: { a: string; b: string }) => a === b), + hashPassword: vi.fn((p: string) => Promise.resolve(`hashed_${p}`)), + }; +}); + +vi.mock('@packrat/api/db', () => ({ createDb: mocks.createDb })); +vi.mock('@packrat/api/utils/email', () => ({ + sendPasswordResetEmail: mocks.sendPasswordResetEmail, +})); +vi.mock('@packrat/api/utils/auth', () => ({ + timingSafeEqual: mocks.timingSafeEqual, +})); +vi.mock('@better-auth/utils/password', () => ({ + hashPassword: mocks.hashPassword, +})); +vi.mock('@packrat/db', () => ({ + users: {}, + verification: {}, + account: {}, +})); +vi.mock('drizzle-orm', () => ({ + and: vi.fn(), + eq: vi.fn(), + gt: vi.fn(), +})); + +import { requestPasswordReset, verifyOtpAndResetPassword } from '../passwordResetService'; + +describe('requestPasswordReset()', () => { + beforeEach(() => { + vi.clearAllMocks(); + mocks.deleteWhere.mockResolvedValue(undefined); + mocks.insertValues.mockResolvedValue(undefined); + mocks.sendPasswordResetEmail.mockResolvedValue(undefined); + }); + + it('does nothing for an unknown email address', async () => { + mocks.findFirstUser.mockResolvedValue(undefined); + await requestPasswordReset('unknown@example.com'); + expect(mocks.sendPasswordResetEmail).not.toHaveBeenCalled(); + expect(mocks.insertFn).not.toHaveBeenCalled(); + }); + + it('deletes the existing verification record before inserting a new one', async () => { + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + await requestPasswordReset('user@example.com'); + expect(mocks.deleteFn).toHaveBeenCalled(); + expect(mocks.deleteWhere).toHaveBeenCalled(); + expect(mocks.insertValues).toHaveBeenCalled(); + expect(mocks.deleteWhere.mock.invocationCallOrder[0] ?? 0).toBeLessThan( + mocks.insertValues.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY, + ); + }); + + it('inserts a new verification record for a known user', async () => { + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + await requestPasswordReset('user@example.com'); + expect(mocks.insertFn).toHaveBeenCalled(); + expect(mocks.insertValues).toHaveBeenCalledWith( + expect.objectContaining({ + identifier: 'password-reset:user@example.com', + }), + ); + }); + + it('sends the password reset email to the correct address', async () => { + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + await requestPasswordReset('user@example.com'); + expect(mocks.sendPasswordResetEmail).toHaveBeenCalledWith( + expect.objectContaining({ to: 'user@example.com' }), + ); + }); + + it('sends a 6-digit OTP in the email', async () => { + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + await requestPasswordReset('user@example.com'); + const emailCalls = mocks.sendPasswordResetEmail.mock.calls as Array< + [{ to: string; code: string }] + >; + const emailArg = emailCalls[0]?.[0]; + expect(emailArg?.code).toMatch(/^\d{6}$/); + }); + + it('stores the OTP value in the verification record', async () => { + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + await requestPasswordReset('user@example.com'); + const insertCalls = mocks.insertValues.mock.calls as Array<[{ value: string }]>; + const insertArg = insertCalls[0]?.[0]; + expect(insertArg?.value).toMatch(/^\d{6}$/); + }); + + it('stores the same OTP in both the record and the email', async () => { + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + await requestPasswordReset('user@example.com'); + const insertCalls = mocks.insertValues.mock.calls as Array<[{ value: string }]>; + const emailCalls = mocks.sendPasswordResetEmail.mock.calls as Array<[{ code: string }]>; + const insertedCode = insertCalls[0]?.[0]?.value; + const emailedCode = emailCalls[0]?.[0]?.code; + expect(insertedCode).toBe(emailedCode); + }); + + it('sets an expiry date in the future on the verification record', async () => { + vi.useFakeTimers(); + vi.setSystemTime(new Date('2026-01-01T00:00:00.000Z')); + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + try { + const before = Date.now(); + await requestPasswordReset('user@example.com'); + const insertCalls = mocks.insertValues.mock.calls as Array< + [{ value: string; expiresAt: Date }] + >; + const insertArg = insertCalls[0]?.[0]; + expect(insertArg?.expiresAt.getTime()).toBeGreaterThan(before); + } finally { + vi.useRealTimers(); + } + }); +}); + +describe('verifyOtpAndResetPassword()', () => { + beforeEach(() => { + vi.clearAllMocks(); + mocks.deleteWhere.mockResolvedValue(undefined); + mocks.updateReturning.mockResolvedValue([]); + }); + + it('throws for a missing or expired verification record', async () => { + mocks.findFirstVerification.mockResolvedValue(null); + await expect( + verifyOtpAndResetPassword({ email: 'user@example.com', code: '123456', newPassword: 'new' }), + ).rejects.toThrow('Invalid or expired reset code'); + }); + + it('throws when the OTP does not match', async () => { + mocks.findFirstVerification.mockResolvedValue({ value: '999999' }); + // timingSafeEqual is mocked as strict equality; '999999' !== '123456' + await expect( + verifyOtpAndResetPassword({ email: 'user@example.com', code: '123456', newPassword: 'new' }), + ).rejects.toThrow('Invalid or expired reset code'); + }); + + it('throws when the user cannot be found after OTP passes', async () => { + mocks.findFirstVerification.mockResolvedValue({ value: '123456' }); + mocks.findFirstUser.mockResolvedValue(null); + await expect( + verifyOtpAndResetPassword({ email: 'user@example.com', code: '123456', newPassword: 'new' }), + ).rejects.toThrow('User not found'); + }); + + it('hashes the new password before persisting it', async () => { + mocks.findFirstVerification.mockResolvedValue({ value: '123456' }); + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + mocks.updateReturning.mockResolvedValue([{ id: 'account-1' }]); + + await verifyOtpAndResetPassword({ + email: 'user@example.com', + code: '123456', + newPassword: 'plaintext', + }); + expect(mocks.hashPassword).toHaveBeenCalledWith('plaintext'); + }); + + it('updates the account table with the hashed password on success', async () => { + mocks.findFirstVerification.mockResolvedValue({ value: '123456' }); + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + mocks.updateReturning.mockResolvedValue([{ id: 'account-1' }]); + + await verifyOtpAndResetPassword({ + email: 'user@example.com', + code: '123456', + newPassword: 'newpass', + }); + expect(mocks.updateFn).toHaveBeenCalled(); + expect(mocks.updateSet).toHaveBeenCalledWith( + expect.objectContaining({ password: 'hashed_newpass' }), + ); + }); + + it('deletes the verification record after a successful reset', async () => { + mocks.findFirstVerification.mockResolvedValue({ value: '123456' }); + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + mocks.updateReturning.mockResolvedValue([{ id: 'account-1' }]); + + await verifyOtpAndResetPassword({ + email: 'user@example.com', + code: '123456', + newPassword: 'newpass', + }); + expect(mocks.deleteFn).toHaveBeenCalled(); + expect(mocks.deleteWhere).toHaveBeenCalled(); + }); + + it('falls back to updating the users table when no account record is found', async () => { + mocks.findFirstVerification.mockResolvedValue({ value: '123456' }); + mocks.findFirstUser.mockResolvedValue({ id: 'u1', email: 'user@example.com' }); + + // First update call (account table) returns empty — triggers fallback + mocks.updateReturning.mockResolvedValueOnce([]); + + // Second update call (users table) — where() is awaited directly, no .returning() + const usersUpdateWhere = vi.fn().mockResolvedValue(undefined); + const usersUpdateSet = vi.fn(() => ({ where: usersUpdateWhere })); + mocks.updateFn + .mockReturnValueOnce({ set: mocks.updateSet }) + .mockReturnValueOnce({ set: usersUpdateSet }); + + await verifyOtpAndResetPassword({ + email: 'user@example.com', + code: '123456', + newPassword: 'newpass', + }); + expect(mocks.updateFn).toHaveBeenCalledTimes(2); + expect(usersUpdateSet).toHaveBeenCalledWith( + expect.objectContaining({ passwordHash: 'hashed_newpass' }), + ); + }); +}); diff --git a/packages/api/src/services/__tests__/userService.test.ts b/packages/api/src/services/__tests__/userService.test.ts new file mode 100644 index 0000000000..4bccbda13e --- /dev/null +++ b/packages/api/src/services/__tests__/userService.test.ts @@ -0,0 +1,151 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + +const mocks = vi.hoisted(() => { + const limitFn = vi.fn(); + const whereFn = vi.fn(() => ({ limit: limitFn })); + const fromFn = vi.fn(() => ({ where: whereFn })); + const selectFn = vi.fn(() => ({ from: fromFn })); + + const returningFn = vi.fn(); + const valuesFn = vi.fn(() => ({ returning: returningFn })); + const insertFn = vi.fn(() => ({ values: valuesFn })); + + return { + limitFn, + whereFn, + fromFn, + selectFn, + returningFn, + valuesFn, + insertFn, + createDb: vi.fn(() => ({ select: selectFn, insert: insertFn })), + hashPassword: vi.fn((p: string) => Promise.resolve(`hashed_${p}`)), + }; +}); + +vi.mock('@packrat/api/db', () => ({ createDb: mocks.createDb })); +vi.mock('@packrat/api/utils/auth', () => ({ hashPassword: mocks.hashPassword })); +vi.mock('@packrat/db', () => ({ users: { email: 'email', id: 'id' } })); +vi.mock('drizzle-orm', () => ({ eq: vi.fn() })); + +import { UserService } from '../userService'; + +describe('UserService', () => { + let service: UserService; + + beforeEach(() => { + vi.clearAllMocks(); + service = new UserService(); + }); + + describe('findByEmail()', () => { + it('returns the user when found', async () => { + const fakeUser = { id: 'u1', email: 'alice@example.com' }; + mocks.limitFn.mockResolvedValue([fakeUser]); + + const result = await service.findByEmail('alice@example.com'); + expect(result).toEqual(fakeUser); + }); + + it('returns null when no user is found', async () => { + mocks.limitFn.mockResolvedValue([]); + const result = await service.findByEmail('nobody@example.com'); + expect(result).toBeNull(); + }); + + it('fetches only the first matching record', async () => { + const fakeUser = { id: 'u-x', email: 'test@example.com' }; + mocks.limitFn.mockResolvedValue([fakeUser]); + const result = await service.findByEmail('test@example.com'); + expect(result).toEqual(fakeUser); + expect(mocks.limitFn).toHaveBeenCalledWith(1); + }); + + it('lowercases the email before querying', async () => { + mocks.limitFn.mockResolvedValue([]); + await service.findByEmail('ALICE@EXAMPLE.COM'); + // UserService calls eq(users.email, email.toLowerCase()), which is called with the lowercased value + const { eq } = await import('drizzle-orm'); + const { users } = await import('@packrat/db'); + expect(vi.mocked(eq)).toHaveBeenCalledWith(users.email, 'alice@example.com'); + }); + }); + + describe('create()', () => { + it('creates a user and returns it', async () => { + const fakeUser = { id: 'u2', email: 'bob@example.com', role: 'USER' }; + mocks.returningFn.mockResolvedValue([fakeUser]); + + const result = await service.create({ email: 'Bob@Example.com', password: 'secret' }); + expect(result).toEqual(fakeUser); + }); + + it('lowercases the email before inserting', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u3', email: 'charlie@example.com' }]); + await service.create({ email: 'CHARLIE@EXAMPLE.COM' }); + expect(mocks.valuesFn).toHaveBeenCalledWith( + expect.objectContaining({ email: 'charlie@example.com' }), + ); + }); + + it('hashes the password when provided', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u4', email: 'test@example.com' }]); + await service.create({ email: 'test@example.com', password: 'mypassword' }); + expect(mocks.hashPassword).toHaveBeenCalledWith('mypassword'); + expect(mocks.valuesFn).toHaveBeenCalledWith( + expect.objectContaining({ passwordHash: 'hashed_mypassword' }), + ); + }); + + it('sets passwordHash to null when no password is provided', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u5', email: 'test@example.com' }]); + await service.create({ email: 'test@example.com' }); + expect(mocks.valuesFn).toHaveBeenCalledWith(expect.objectContaining({ passwordHash: null })); + }); + + it('defaults role to USER when not specified', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u6', email: 'test@example.com', role: 'USER' }]); + await service.create({ email: 'test@example.com' }); + expect(mocks.valuesFn).toHaveBeenCalledWith(expect.objectContaining({ role: 'USER' })); + }); + + it('accepts an explicit ADMIN role', async () => { + mocks.returningFn.mockResolvedValue([ + { id: 'u7', email: 'admin@example.com', role: 'ADMIN' }, + ]); + await service.create({ email: 'admin@example.com', role: 'ADMIN' }); + expect(mocks.valuesFn).toHaveBeenCalledWith(expect.objectContaining({ role: 'ADMIN' })); + }); + + it('defaults emailVerified to false', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u8', email: 'test@example.com' }]); + await service.create({ email: 'test@example.com' }); + expect(mocks.valuesFn).toHaveBeenCalledWith( + expect.objectContaining({ emailVerified: false }), + ); + }); + + it('accepts an explicit emailVerified: true', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u9', email: 'test@example.com' }]); + await service.create({ email: 'test@example.com', emailVerified: true }); + expect(mocks.valuesFn).toHaveBeenCalledWith(expect.objectContaining({ emailVerified: true })); + }); + + it('throws "Failed to create user" when insert returns no rows', async () => { + mocks.returningFn.mockResolvedValue([]); + await expect(service.create({ email: 'fail@example.com' })).rejects.toThrow( + 'Failed to create user', + ); + }); + + it('generates a UUID for the user id', async () => { + mocks.returningFn.mockResolvedValue([{ id: 'u10', email: 'test@example.com' }]); + await service.create({ email: 'test@example.com' }); + const insertCalls = mocks.valuesFn.mock.calls as unknown as Array<[{ id: string }]>; + const insertArg = insertCalls[0]?.[0]; + expect(insertArg?.id).toMatch( + /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/, + ); + }); + }); +}); diff --git a/packages/api/src/services/__tests__/wildlifeIdentificationService.test.ts b/packages/api/src/services/__tests__/wildlifeIdentificationService.test.ts new file mode 100644 index 0000000000..375a060be9 --- /dev/null +++ b/packages/api/src/services/__tests__/wildlifeIdentificationService.test.ts @@ -0,0 +1,76 @@ +import { generateObject } from 'ai'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { WildlifeIdentificationService } from '../wildlifeIdentificationService'; + +const { mockCreateAIProvider, mockModel } = vi.hoisted(() => { + const mockModel = vi.fn((modelName: string) => ({ name: modelName })); + return { + mockCreateAIProvider: vi.fn(() => mockModel), + mockModel, + }; +}); + +vi.mock('@packrat/api/utils/ai/provider', () => ({ + createAIProvider: mockCreateAIProvider, +})); + +vi.mock('@packrat/api/utils/env-validation', () => ({ + getEnv: vi.fn(() => ({ + OPENAI_API_KEY: undefined, + AI_PROVIDER: 'openai', + CLOUDFLARE_ACCOUNT_ID: 'test-account', + CLOUDFLARE_AI_GATEWAY_ID: 'test-gateway', + CLOUDFLARE_API_TOKEN: 'cf-token', + AI: {}, + })), +})); + +vi.mock('ai', () => ({ + generateObject: vi.fn(), +})); + +describe('WildlifeIdentificationService', () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it('identifies species through the shared AI provider without a direct OpenAI key', async () => { + vi.mocked(generateObject).mockResolvedValue({ + object: { + results: [ + { + commonName: 'Douglas Fir', + scientificName: 'Pseudotsuga menziesii', + category: 'tree', + description: 'Conifer with flat needles and distinctive cones', + habitat: ['forest'], + regions: ['western North America'], + dangerLevel: 'safe', + characteristics: ['flat needles'], + confidence: 0.86, + }, + ], + }, + } as Awaited>); + + const result = await new WildlifeIdentificationService().identifySpecies( + 'https://example.com/tree.jpg', + ); + + expect(result.results).toHaveLength(1); + expect(mockCreateAIProvider).toHaveBeenCalledWith({ + openAiApiKey: undefined, + provider: 'openai', + cloudflareAccountId: 'test-account', + cloudflareGatewayId: 'test-gateway', + cloudflareApiToken: 'cf-token', + cloudflareAiBinding: {}, + }); + expect(mockModel).toHaveBeenCalledWith('gpt-4o'); + expect(generateObject).toHaveBeenCalledWith( + expect.objectContaining({ + model: { name: 'gpt-4o' }, + }), + ); + }); +}); diff --git a/packages/api/src/services/aiService.ts b/packages/api/src/services/aiService.ts index ac000542a5..3ae247f750 100644 --- a/packages/api/src/services/aiService.ts +++ b/packages/api/src/services/aiService.ts @@ -1,6 +1,6 @@ -import { createPerplexity } from '@ai-sdk/perplexity'; -import type { Env } from '@packrat/api/types/env'; import { DEFAULT_MODELS } from '@packrat/api/utils/ai/models'; +import { createPerplexityAIProvider } from '@packrat/api/utils/ai/provider'; +import type { Env } from '@packrat/api/utils/env-validation'; import { getEnv } from '@packrat/api/utils/env-validation'; import { isFunction } from '@packrat/guards'; import { generateText } from 'ai'; @@ -26,8 +26,12 @@ export class AIService { } async perplexitySearch(query: string): Promise { - const perplexity = createPerplexity({ - apiKey: this.env.PERPLEXITY_API_KEY, + const perplexity = createPerplexityAIProvider({ + perplexityApiKey: this.env.PERPLEXITY_API_KEY, + cloudflareAccountId: this.env.CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: this.env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: this.env.CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: this.env.AI, }); try { @@ -44,10 +48,13 @@ export class AIService { } } - async searchPackratOutdoorGuidesRAG( - query: string, - limit: number = 5, - ): Promise< + async searchPackratOutdoorGuidesRAG({ + query, + limit = 5, + }: { + query: string; + limit?: number; + }): Promise< Omit & { data: (AutoRagSearchResponse['data'][0] & { url: string })[]; } diff --git a/packages/api/src/services/catalogService.ts b/packages/api/src/services/catalogService.ts index 5fb5d15b13..21d7490cda 100644 --- a/packages/api/src/services/catalogService.ts +++ b/packages/api/src/services/catalogService.ts @@ -1,13 +1,13 @@ import { createDb, createDbClient } from '@packrat/api/db'; +import { generateEmbedding, generateManyEmbeddings } from '@packrat/api/services/embeddingService'; +import type { Env } from '@packrat/api/utils/env-validation'; +import { getEnv } from '@packrat/api/utils/env-validation'; import { type CatalogItem, catalogItemEtlJobs, catalogItems, type NewCatalogItem, -} from '@packrat/api/db/schema'; -import { generateEmbedding, generateManyEmbeddings } from '@packrat/api/services/embeddingService'; -import type { Env } from '@packrat/api/types/env'; -import { getEnv } from '@packrat/api/utils/env-validation'; +} from '@packrat/db'; import { and, asc, @@ -32,11 +32,14 @@ export class CatalogService { /** * - `new CatalogService()` – reads the isolate-level env (Elysia routes). - * - `new CatalogService(env, true)` – queue handler path: caller passes the - * raw validated env, and we use the HTTP-only Neon driver (which is + * - `new CatalogService({ explicitEnv, useHttpDriver: true })` – queue handler path: caller + * passes the raw validated env, and we use the HTTP-only Neon driver (which is * better suited for short-lived queue workers). */ - constructor(explicitEnv?: Env, useHttpDriver: boolean = false) { + constructor({ + explicitEnv, + useHttpDriver = false, + }: { explicitEnv?: Env; useHttpDriver?: boolean } = {}) { if (explicitEnv && useHttpDriver) { this.env = explicitEnv; this.db = createDbClient(explicitEnv); @@ -190,10 +193,13 @@ export class CatalogService { }; } - async vectorSearch( - q: string, - opts: { limit?: number; offset?: number } = {}, - ): Promise<{ + async vectorSearch({ + q, + opts = {}, + }: { + q: string; + opts?: { limit?: number; offset?: number }; + }): Promise<{ items: (Omit & { similarity: number })[]; total: number; limit: number; @@ -217,6 +223,7 @@ export class CatalogService { provider: this.env.AI_PROVIDER, cloudflareAccountId: this.env.CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: this.env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: this.env.CLOUDFLARE_API_TOKEN, cloudflareAiBinding: this.env.AI, }); @@ -263,10 +270,7 @@ export class CatalogService { }; } - async batchVectorSearch( - queries: string[], - limit: number = 5, - ): Promise<{ + async batchVectorSearch({ queries, limit = 5 }: { queries: string[]; limit?: number }): Promise<{ items: (Omit & { similarity: number })[][]; }> { if (!queries || queries.length === 0) { @@ -280,6 +284,7 @@ export class CatalogService { openAiApiKey: this.env.OPENAI_API_KEY, cloudflareAccountId: this.env.CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: this.env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: this.env.CLOUDFLARE_API_TOKEN, provider: this.env.AI_PROVIDER, cloudflareAiBinding: this.env.AI, }); @@ -382,12 +387,13 @@ export class CatalogService { if (itemsToUpdate.length > 0) { // Regenerate embeddings for updated items - const embeddingTexts = itemsToUpdate.map((item) => getEmbeddingText(item)); + const embeddingTexts = itemsToUpdate.map((item) => getEmbeddingText({ item })); const embeddings = await generateManyEmbeddings({ openAiApiKey: this.env.OPENAI_API_KEY, values: embeddingTexts, cloudflareAccountId: this.env.CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: this.env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: this.env.CLOUDFLARE_API_TOKEN, provider: this.env.AI_PROVIDER, cloudflareAiBinding: this.env.AI, }); @@ -406,7 +412,13 @@ export class CatalogService { return upsertedItems; } - async trackEtlJob(itemIds: Pick[], jobId: string): Promise { + async trackEtlJob({ + itemIds, + jobId, + }: { + itemIds: Pick[]; + jobId: string; + }): Promise { await this.db.insert(catalogItemEtlJobs).values( itemIds.map((item) => ({ catalogItemId: item.id, @@ -473,7 +485,7 @@ export class CatalogService { ); // Prepare texts for batch embedding - const embeddingTexts = itemsToEmbed.map((item) => getEmbeddingText(item)); + const embeddingTexts = itemsToEmbed.map((item) => getEmbeddingText({ item })); try { // Generate embeddings in batch @@ -482,6 +494,7 @@ export class CatalogService { values: embeddingTexts, cloudflareAccountId: this.env.CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: this.env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: this.env.CLOUDFLARE_API_TOKEN, provider: this.env.AI_PROVIDER, cloudflareAiBinding: this.env.AI, }); diff --git a/packages/api/src/services/embeddingService.ts b/packages/api/src/services/embeddingService.ts index 4af4c63a53..8119178663 100644 --- a/packages/api/src/services/embeddingService.ts +++ b/packages/api/src/services/embeddingService.ts @@ -1,16 +1,17 @@ -import type { Env } from '@packrat/api/types/env'; import { DEFAULT_MODELS } from '@packrat/api/utils/ai/models'; import { type AIProvider, createAIProvider } from '@packrat/api/utils/ai/provider'; +import type { Env } from '@packrat/api/utils/env-validation'; import { embed, embedMany } from 'ai'; // ── Embedding text normalization ────────────────────────────────────── const NEWLINE = /\n/g; type GenerateEmbeddingBaseParams = { - openAiApiKey: string; + openAiApiKey?: string; provider: AIProvider; - cloudflareAccountId: string; - cloudflareGatewayId: string; + cloudflareAccountId?: string; + cloudflareGatewayId?: string; + cloudflareApiToken?: string; cloudflareAiBinding: Env['AI']; }; diff --git a/packages/api/src/services/etl/CatalogItemValidator.ts b/packages/api/src/services/etl/CatalogItemValidator.ts index 6788ba475d..b700d74120 100644 --- a/packages/api/src/services/etl/CatalogItemValidator.ts +++ b/packages/api/src/services/etl/CatalogItemValidator.ts @@ -1,6 +1,7 @@ -import type { NewCatalogItem } from '@packrat/api/db/schema'; -import type { ValidatedCatalogItem, ValidationError } from '@packrat/api/types/etl'; +import type { ValidatedCatalogItem } from '@packrat/api/types/etl'; +import type { NewCatalogItem } from '@packrat/db'; import { isNumber, isString } from '@packrat/guards'; +import type { ValidationError } from '@packrat/schemas/validation'; export class CatalogItemValidator { validateItem(item: Partial): ValidatedCatalogItem { diff --git a/packages/api/src/services/etl/mergeItemsBySku.ts b/packages/api/src/services/etl/mergeItemsBySku.ts index acdc8875aa..21642f3eff 100644 --- a/packages/api/src/services/etl/mergeItemsBySku.ts +++ b/packages/api/src/services/etl/mergeItemsBySku.ts @@ -1,4 +1,4 @@ -import type { NewCatalogItem } from '@packrat/api/db/schema'; +import type { NewCatalogItem } from '@packrat/db'; /** * Merges all occurrences of each SKU into a single item diff --git a/packages/api/src/services/etl/processCatalogEtl.ts b/packages/api/src/services/etl/processCatalogEtl.ts index 01a8f77f2d..77f7b088d4 100644 --- a/packages/api/src/services/etl/processCatalogEtl.ts +++ b/packages/api/src/services/etl/processCatalogEtl.ts @@ -1,9 +1,9 @@ import { createDbClient } from '@packrat/api/db'; -import { etlJobs, type NewCatalogItem, type NewInvalidItemLog } from '@packrat/api/db/schema'; -import type { Env } from '@packrat/api/types/env'; import { mapCsvRowToItem } from '@packrat/api/utils/csv-utils'; +import type { Env } from '@packrat/api/utils/env-validation'; +import { etlJobs, type NewCatalogItem, type NewInvalidItemLog } from '@packrat/db'; import { parse } from 'csv-parse'; -import { eq, sql } from 'drizzle-orm'; +import { eq } from 'drizzle-orm'; import { R2BucketService } from '../r2-bucket'; import { CatalogItemValidator } from './CatalogItemValidator'; import { processLogsBatch } from './processLogsBatch'; @@ -33,21 +33,42 @@ export async function processCatalogETL({ message: CatalogETLMessage; env: Env; }): Promise { - const { objectKey } = message.data; + const { objectKey, byteStart, byteEnd } = message.data; const jobId = message.id; const db = createDbClient(env); try { - console.log(`🔄 Processing file ${objectKey}, job ${jobId}`); + const chunkDesc = byteStart !== undefined ? ` [bytes ${byteStart}-${byteEnd ?? 'end'}]` : ''; + console.log(`🔄 Processing file ${objectKey}${chunkDesc}, job ${jobId}`); const r2Service = new R2BucketService({ env, bucketType: 'catalog', }); - console.log(`🔍 [TRACE] Getting stream for object: ${objectKey}`); - const r2Object = await r2Service.get(objectKey); + // For non-first chunks (byteStart > 0): fetch the header row separately via a + // cheap 4 KB range request so the CSV parser sees a valid header. + let injectedHeader = ''; + if (byteStart !== undefined && byteStart > 0) { + const headerSlice = await r2Service.get(objectKey, { range: { offset: 0, length: 4096 } }); + if (!headerSlice) throw new Error(`Failed to fetch header for ${objectKey}`); + const headerText = await headerSlice.text(); + injectedHeader = headerText.split('\n')[0] ?? ''; + } + + const rangeOptions = + byteStart !== undefined + ? { + range: { + offset: byteStart, + length: byteEnd !== undefined ? byteEnd - byteStart + 1 : undefined, + }, + } + : undefined; + + console.log(`🔍 [TRACE] Getting stream for object: ${objectKey}${chunkDesc}`); + const r2Object = await r2Service.get(objectKey, rangeOptions); if (!r2Object) { throw new Error(`Failed to get stream for object: ${objectKey}`); } @@ -66,14 +87,37 @@ export async function processCatalogETL({ }); (async () => { + // Non-first chunks: inject the header row so csv-parse sees a valid header, + // then skip the partial row at the chunk boundary (tail of the previous chunk). + if (injectedHeader) { + parser.write(`${injectedHeader}\n`); + } + let skipPartialRow = byteStart !== undefined && byteStart > 0; + for await (const chunk of streamToText(r2Object.body)) { - parser.write(chunk); + let text = chunk; + + if (skipPartialRow) { + // Discard bytes up to and including the first newline — those bytes are + // the tail of the row that the previous chunk already processed. + const nl = text.indexOf('\n'); + if (nl === -1) continue; // entire buffer is still the partial row tail + text = text.slice(nl + 1); + skipPartialRow = false; + if (!text) continue; + } + + // Respect backpressure: if the parser buffer is full, wait for drain before + // pushing more data. Without this, R2 fills the parser buffer for the entire + // file (up to 600 MB) before the main loop processes any rows → Worker OOM. + const ok = parser.write(text); + if (!ok) await new Promise((resolve) => parser.once('drain', resolve)); } parser.end(); })(); for await (const record of parser) { - await new Promise((resolve) => setTimeout(resolve, 1)); // Yield to event loop for GC Opportunities to prevent memory bloat + if (rowIndex % 100 === 0) await new Promise((resolve) => setTimeout(resolve, 1)); // Yield every 100 rows for GC; per-row yield hits the CF Worker wall-clock limit on large files const row = record as string[]; if (!isHeaderProcessed) { fieldMap = row.reduce>((acc, header, idx) => { @@ -108,62 +152,49 @@ export async function processCatalogETL({ rowIndex++; - // Flush valid batch to DB every BATCH_SIZE rows to avoid Worker OOM on large files + // Flush valid batch to DB every BATCH_SIZE rows to avoid Worker OOM on large files. + // totalProcessed is incremented atomically inside processValidItemsBatch via updateEtlJobProgress. if (validItemsBatch.length >= BATCH_SIZE) { await processValidItemsBatch({ jobId, items: [...validItemsBatch], env }); - await db - .update(etlJobs) - .set({ totalProcessed: sql`COALESCE(${etlJobs.totalProcessed}, 0) + ${BATCH_SIZE}` }) - .where(eq(etlJobs.id, jobId)); validItemsBatch.length = 0; } - // Flush invalid batch to DB every BATCH_SIZE rows + // Flush invalid batch to DB every BATCH_SIZE rows. + // totalProcessed is incremented atomically inside processLogsBatch via updateEtlJobProgress. if (invalidItemsBatch.length >= BATCH_SIZE) { await processLogsBatch({ jobId, logs: [...invalidItemsBatch], env }); - await db - .update(etlJobs) - .set({ totalProcessed: sql`COALESCE(${etlJobs.totalProcessed}, 0) + ${BATCH_SIZE}` }) - .where(eq(etlJobs.id, jobId)); invalidItemsBatch.length = 0; } } console.log(`🔍 [TRACE] Streaming complete - processing remaining batches`); - // Flush remaining items after the stream ends - const remainingItems = validItemsBatch.length + invalidItemsBatch.length; - - if (remainingItems > 0) { - await db - .update(etlJobs) - .set({ totalProcessed: sql`COALESCE(${etlJobs.totalProcessed}, 0) + ${remainingItems}` }) - .where(eq(etlJobs.id, jobId)); - } - + // Flush remaining items. totalProcessed is updated atomically inside each batch function. if (validItemsBatch.length > 0) { console.log(`🔍 [TRACE] Processing valid items batch - size: ${validItemsBatch.length}`); - await processValidItemsBatch({ - jobId, - items: validItemsBatch, - env, - }); + await processValidItemsBatch({ jobId, items: validItemsBatch, env }); } if (invalidItemsBatch.length > 0) { console.log(`🔍 [TRACE] Processing invalid items batch - size: ${invalidItemsBatch.length}`); - await processLogsBatch({ - jobId, - logs: invalidItemsBatch, - env, - }); + await processLogsBatch({ jobId, logs: invalidItemsBatch, env }); } const totalRows = rowIndex; - await db - .update(etlJobs) - .set({ status: 'completed', completedAt: new Date() }) - .where(eq(etlJobs.id, jobId)); + // Mark completed using Drizzle ORM (same as the failed path below) — avoids the + // silent failure that ::etl_job_status raw SQL casts produced in some Neon HTTP driver versions. + // Isolated try-catch so a transient DB hiccup here doesn't cascade to status='failed'. + try { + await db + .update(etlJobs) + .set({ status: 'completed', completedAt: new Date() }) + .where(eq(etlJobs.id, jobId)); + } catch (completionErr) { + console.error( + `[ETL] Failed to mark job ${jobId} completed — will be reset by stuck-job sweep:`, + completionErr, + ); + } console.log(`🔍 [TRACE] ✅ Done processing ${objectKey} - ${totalRows} rows processed`); } catch (error) { diff --git a/packages/api/src/services/etl/processLogsBatch.ts b/packages/api/src/services/etl/processLogsBatch.ts index 661755850b..f8e7868107 100644 --- a/packages/api/src/services/etl/processLogsBatch.ts +++ b/packages/api/src/services/etl/processLogsBatch.ts @@ -1,6 +1,6 @@ -import type { Env } from '@packrat/api/types/env'; +import type { Env } from '@packrat/api/utils/env-validation'; +import { invalidItemLogs, type NewInvalidItemLog } from '@packrat/db'; import { createDbClient } from '../../db'; -import { invalidItemLogs, type NewInvalidItemLog } from '../../db/schema'; import { updateEtlJobProgress } from './updateEtlJobProgress'; export async function processLogsBatch({ @@ -15,9 +15,13 @@ export async function processLogsBatch({ const db = createDbClient(env); try { await db.insert(invalidItemLogs).values(logs); - await updateEtlJobProgress(env, { - jobId, - invalid: logs.length, + await updateEtlJobProgress({ + env, + params: { + jobId, + invalid: logs.length, + processed: logs.length, + }, }); console.log(`📝 Processed and wrote ${logs.length} invalid items for job ${jobId}`); diff --git a/packages/api/src/services/etl/processValidItemsBatch.ts b/packages/api/src/services/etl/processValidItemsBatch.ts index 51a6d36f2e..96232c080e 100644 --- a/packages/api/src/services/etl/processValidItemsBatch.ts +++ b/packages/api/src/services/etl/processValidItemsBatch.ts @@ -1,6 +1,6 @@ -import type { NewCatalogItem } from '@packrat/api/db/schema'; -import type { Env } from '@packrat/api/types/env'; import { getEmbeddingText } from '@packrat/api/utils/embeddingHelper'; +import type { Env } from '@packrat/api/utils/env-validation'; +import type { NewCatalogItem } from '@packrat/db'; import { CatalogService } from '../catalogService'; import { generateManyEmbeddings } from '../embeddingService'; import { mergeItemsBySku } from './mergeItemsBySku'; @@ -15,12 +15,12 @@ export async function processValidItemsBatch({ items: Partial[]; env: Env; }): Promise { - const catalogService = new CatalogService(env, true); + const catalogService = new CatalogService({ explicitEnv: env, useHttpDriver: true }); const mergedItems = mergeItemsBySku(items as NewCatalogItem[]); // safe-cast: items are Partial at the type level, but all required fields have been confirmed present by CatalogItemValidator before reaching here // Prepare texts for batch embedding - const embeddingTexts = mergedItems.map((item) => getEmbeddingText(item)); + const embeddingTexts = mergedItems.map((item) => getEmbeddingText({ item })); try { // Generate embeddings in batch @@ -29,6 +29,7 @@ export async function processValidItemsBatch({ values: embeddingTexts, cloudflareAccountId: env.CLOUDFLARE_ACCOUNT_ID, cloudflareGatewayId: env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: env.CLOUDFLARE_API_TOKEN, provider: env.AI_PROVIDER, cloudflareAiBinding: env.AI, }); @@ -41,20 +42,29 @@ export async function processValidItemsBatch({ const upsertedItems = await catalogService.upsertCatalogItems(itemsWithEmbeddings); // Track the ETL job that processed these items - await catalogService.trackEtlJob(upsertedItems, jobId); - // Update the ETL job progress - await updateEtlJobProgress(env, { - jobId, - valid: items.length, + await catalogService.trackEtlJob({ itemIds: upsertedItems, jobId }); + // Update the ETL job progress — processed is incremented atomically with valid to prevent + // totalValid > totalProcessed if the Worker dies between two separate DB updates. + await updateEtlJobProgress({ + env, + params: { + jobId, + valid: items.length, + processed: items.length, + }, }); } catch (error) { console.error(`Error generating embeddings for batch ${jobId}:`, error); // Fall back to processing without embeddings const upsertedItems = await catalogService.upsertCatalogItems(mergedItems); - await catalogService.trackEtlJob(upsertedItems, jobId); - await updateEtlJobProgress(env, { - jobId, - valid: items.length, + await catalogService.trackEtlJob({ itemIds: upsertedItems, jobId }); + await updateEtlJobProgress({ + env, + params: { + jobId, + valid: items.length, + processed: items.length, + }, }); } finally { console.log(`📦 Batch ${jobId}: Processed ${items.length} valid items`); diff --git a/packages/api/src/services/etl/queue.ts b/packages/api/src/services/etl/queue.ts index 0bc5f99db9..94c0ede465 100644 --- a/packages/api/src/services/etl/queue.ts +++ b/packages/api/src/services/etl/queue.ts @@ -1,15 +1,15 @@ import type { MessageBatch, Queue } from '@cloudflare/workers-types'; -import type { Env } from '@packrat/api/types/env'; +import type { Env } from '@packrat/api/utils/env-validation'; import { processCatalogETL } from './processCatalogEtl'; import type { CatalogETLMessage } from './types'; export async function queueCatalogETL({ queue, - objectKeys, + chunks, jobId, }: { queue: Queue; - objectKeys: string[]; + chunks: Array<{ objectKey: string; byteStart?: number; byteEnd?: number }>; jobId: string; }): Promise { const promises: Promise[] = []; @@ -17,14 +17,14 @@ export async function queueCatalogETL({ const batchSize = 100; // maximum batch size Cloudflare allows let batch: { body: CatalogETLMessage }[] = []; - for (const objectKey of objectKeys) { + for (const { objectKey, byteStart, byteEnd } of chunks) { if (batch.length === batchSize) { promises.push(queue.sendBatch(batch)); batch = []; } const message: CatalogETLMessage = { - data: { objectKey }, + data: { objectKey, byteStart, byteEnd }, timestamp: Date.now(), id: jobId, }; diff --git a/packages/api/src/services/etl/types.ts b/packages/api/src/services/etl/types.ts index 1bcd906c8b..be35e39eaf 100644 --- a/packages/api/src/services/etl/types.ts +++ b/packages/api/src/services/etl/types.ts @@ -5,13 +5,13 @@ export interface CatalogETLMessage { id: string; data: { objectKey: string; + byteStart?: number; + byteEnd?: number; }; } export interface QueueCatalogETLParams { queue: Queue; - objectKey: string; - userId: string; - source: string; - scraperRevision: string; + chunks: Array<{ objectKey: string; byteStart?: number; byteEnd?: number }>; + jobId: string; } diff --git a/packages/api/src/services/etl/updateEtlJobProgress.ts b/packages/api/src/services/etl/updateEtlJobProgress.ts index 7bc5c623eb..b4089432b0 100644 --- a/packages/api/src/services/etl/updateEtlJobProgress.ts +++ b/packages/api/src/services/etl/updateEtlJobProgress.ts @@ -1,32 +1,27 @@ import { createDbClient } from '@packrat/api/db'; -import { etlJobs } from '@packrat/api/db/schema'; -import type { Env } from '@packrat/api/types/env'; +import type { Env } from '@packrat/api/utils/env-validation'; +import { etlJobs } from '@packrat/db'; import { eq, sql } from 'drizzle-orm'; -export async function updateEtlJobProgress( - env: Env, - params: { jobId: string; valid?: number; invalid?: number }, -): Promise { +export async function updateEtlJobProgress({ + env, + params, +}: { + env: Env; + params: { jobId: string; valid?: number; invalid?: number; processed?: number }; +}): Promise { const db = createDbClient(env); const valid = params?.valid ?? 0; const invalid = params?.invalid ?? 0; + const processed = params?.processed ?? 0; await db .update(etlJobs) .set({ totalValid: sql`COALESCE(${etlJobs.totalValid}, 0) + ${valid}`, totalInvalid: sql`COALESCE(${etlJobs.totalInvalid}, 0) + ${invalid}`, - status: sql`CASE - WHEN COALESCE(${etlJobs.totalProcessed}, 0) = COALESCE(${etlJobs.totalValid}, 0) + ${valid} + COALESCE(${etlJobs.totalInvalid}, 0) + ${invalid} - THEN 'completed' - ELSE ${etlJobs.status} - END`, - completedAt: sql`CASE - WHEN COALESCE(${etlJobs.totalProcessed}, 0) = COALESCE(${etlJobs.totalValid}, 0) + ${valid} + COALESCE(${etlJobs.totalInvalid}, 0) + ${invalid} - THEN CURRENT_TIMESTAMP - ELSE ${etlJobs.completedAt} - END`, + totalProcessed: sql`COALESCE(${etlJobs.totalProcessed}, 0) + ${processed}`, }) .where(eq(etlJobs.id, params.jobId)); } diff --git a/packages/api/src/services/imageDetectionService.ts b/packages/api/src/services/imageDetectionService.ts index b83d74f8b5..71cfe51eb4 100644 --- a/packages/api/src/services/imageDetectionService.ts +++ b/packages/api/src/services/imageDetectionService.ts @@ -1,9 +1,9 @@ -import { createOpenAI } from '@ai-sdk/openai'; import { DEFAULT_MODELS } from '@packrat/api/utils/ai/models'; +import { createAIProvider } from '@packrat/api/utils/ai/provider'; import { getEnv } from '@packrat/api/utils/env-validation'; +import type { CatalogItem } from '@packrat/db'; import { generateObject } from 'ai'; import { z } from 'zod'; -import type { CatalogItem } from '../db/schema'; import { CatalogService } from './catalogService'; const ITEM_DETECTION_SYSTEM_PROMPT = `You are an expert gear identification assistant specializing in outdoor and adventure equipment. @@ -49,13 +49,25 @@ export class ImageDetectionService { * Analyze an image to detect outdoor gear items */ async analyzeImage(imageUrl: string): Promise { - const { OPENAI_API_KEY } = getEnv(); - const openai = createOpenAI({ - apiKey: OPENAI_API_KEY, + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + const aiProvider = createAIProvider({ + openAiApiKey: OPENAI_API_KEY, + provider: AI_PROVIDER, + cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: AI, }); const { object } = await generateObject({ - model: openai(DEFAULT_MODELS.OPENAI_CHAT), + model: aiProvider(DEFAULT_MODELS.OPENAI_CHAT), schema: imageAnalysisSchema, system: ITEM_DETECTION_SYSTEM_PROMPT, prompt: [ @@ -83,10 +95,13 @@ export class ImageDetectionService { * Detect items in an image and find matching catalog items */ - async detectAndMatchItems( - imageUrl: string, - matchLimit: number = 3, - ): Promise { + async detectAndMatchItems({ + imageUrl, + matchLimit = 3, + }: { + imageUrl: string; + matchLimit?: number; + }): Promise { try { // First, detect items in the image const analysis = await this.analyzeImage(imageUrl); @@ -105,7 +120,10 @@ export class ImageDetectionService { const searchQueries = highConfidenceItems.map((detected) => `${detected.name} ${detected.description}`.trim(), ); - const result = await catalogService.batchVectorSearch(searchQueries, matchLimit); + const result = await catalogService.batchVectorSearch({ + queries: searchQueries, + limit: matchLimit, + }); // Combine detected items with their catalog matches const itemsWithMatches: DetectedItemWithMatches[] = highConfidenceItems diff --git a/packages/api/src/services/packItemService.ts b/packages/api/src/services/packItemService.ts index bb1c0ffdde..dbca1f4c53 100644 --- a/packages/api/src/services/packItemService.ts +++ b/packages/api/src/services/packItemService.ts @@ -1,5 +1,5 @@ import { createDb } from '@packrat/api/db'; -import { packItems } from '@packrat/api/db/schema'; +import { packItems } from '@packrat/db'; import { and, eq } from 'drizzle-orm'; export class PackItemService { diff --git a/packages/api/src/services/packService.ts b/packages/api/src/services/packService.ts index 72f21addfe..bf83b30d0d 100644 --- a/packages/api/src/services/packService.ts +++ b/packages/api/src/services/packService.ts @@ -1,15 +1,9 @@ -import { createOpenAI } from '@ai-sdk/openai'; import { createDb } from '@packrat/api/db'; -import { - type NewPack, - type NewPackItem, - type PackWithItems, - packItems, - packs, -} from '@packrat/api/db/schema'; -import { PACK_CATEGORIES } from '@packrat/api/types'; import { DEFAULT_MODELS } from '@packrat/api/utils/ai/models'; +import { createAIProvider } from '@packrat/api/utils/ai/provider'; import { getEnv } from '@packrat/api/utils/env-validation'; +import { PACK_CATEGORIES } from '@packrat/constants'; +import { type NewPack, type NewPackItem, type PackWithItems, packItems, packs } from '@packrat/db'; import { generateObject } from 'ai'; import { and, eq } from 'drizzle-orm'; import { z } from 'zod'; @@ -61,7 +55,7 @@ export class PackService { }); if (!pack) return null; - return computePackWeights(pack); + return computePackWeights({ pack }); } async generatePacks(count: number) { @@ -116,11 +110,25 @@ export class PackService { } private async generatePackConcepts(count: number): Promise { - const { OPENAI_API_KEY } = getEnv(); - const openai = createOpenAI({ apiKey: OPENAI_API_KEY }); + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + const aiProvider = createAIProvider({ + openAiApiKey: OPENAI_API_KEY, + provider: AI_PROVIDER, + cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: AI, + }); const { object } = await generateObject({ - model: openai(DEFAULT_MODELS.OPENAI_CHAT), + model: aiProvider(DEFAULT_MODELS.OPENAI_CHAT), output: 'array', schema: packConceptSchema, system: PACK_CONCEPTS_SYSTEM_PROMPT, @@ -135,10 +143,10 @@ export class PackService { packItemConcepts: PackItemConceptSchema[], ): Promise[]> { const catalogService = new CatalogService(); - const searchResults = await catalogService.batchVectorSearch( - packItemConcepts.map((item) => item.item), - 1, - ); + const searchResults = await catalogService.batchVectorSearch({ + queries: packItemConcepts.map((item) => item.item), + limit: 1, + }); return packItemConcepts .map((item, idx) => { @@ -150,8 +158,8 @@ export class PackService { catalogItemId: catalogItem.id, name: catalogItem.name, description: catalogItem.description, - weight: catalogItem.weight, - weightUnit: catalogItem.weightUnit, + weight: catalogItem.weight ?? 0, + weightUnit: catalogItem.weightUnit ?? 'g', image: catalogItem.images?.[0], }; }) diff --git a/packages/api/src/services/passwordResetService.ts b/packages/api/src/services/passwordResetService.ts new file mode 100644 index 0000000000..a71087435d --- /dev/null +++ b/packages/api/src/services/passwordResetService.ts @@ -0,0 +1,82 @@ +import { hashPassword } from '@better-auth/utils/password'; +import { createDb } from '@packrat/api/db'; +import { timingSafeEqual } from '@packrat/api/utils/auth'; +import { sendPasswordResetEmail } from '@packrat/api/utils/email'; +import { account, users, verification } from '@packrat/db'; +import { and, eq, gt } from 'drizzle-orm'; + +const OTP_LENGTH = 6; +const OTP_TTL_MS = 15 * 60 * 1000; // 15 minutes +const IDENTIFIER_PREFIX = 'password-reset:'; + +function generateOtp(): string { + return Array.from({ length: OTP_LENGTH }, () => Math.floor(Math.random() * 10)).join(''); +} + +export async function requestPasswordReset(email: string): Promise { + const db = createDb(); + + const user = await db.query.users.findFirst({ where: eq(users.email, email) }); + if (!user) return; // Don't reveal whether the email is registered + + const code = generateOtp(); + const identifier = `${IDENTIFIER_PREFIX}${email}`; + const now = new Date(); + const expiresAt = new Date(now.getTime() + OTP_TTL_MS); + + await db.delete(verification).where(eq(verification.identifier, identifier)); + await db.insert(verification).values({ + id: crypto.randomUUID(), + identifier, + value: code, + expiresAt, + createdAt: now, + updatedAt: now, + }); + + await sendPasswordResetEmail({ to: email, code }); +} + +export async function verifyOtpAndResetPassword({ + email, + code, + newPassword, +}: { + email: string; + code: string; + newPassword: string; +}): Promise { + const db = createDb(); + const identifier = `${IDENTIFIER_PREFIX}${email}`; + + const record = await db.query.verification.findFirst({ + where: and(eq(verification.identifier, identifier), gt(verification.expiresAt, new Date())), + }); + + if (!record || !timingSafeEqual({ a: record.value, b: code })) { + throw new Error('Invalid or expired reset code'); + } + + const user = await db.query.users.findFirst({ where: eq(users.email, email) }); + if (!user) throw new Error('User not found'); + + const hashedPassword = await hashPassword(newPassword); + const now = new Date(); + + // Update the credential account record (Better Auth email/password users) + const updated = await db + .update(account) + .set({ password: hashedPassword, updatedAt: now }) + .where(and(eq(account.userId, user.id), eq(account.providerId, 'credential'))) + .returning(); + + // Fallback for legacy users whose password lives on the users row + if (updated.length === 0) { + await db + .update(users) + .set({ passwordHash: hashedPassword, updatedAt: now }) + .where(eq(users.id, user.id)); + } + + await db.delete(verification).where(eq(verification.identifier, identifier)); +} diff --git a/packages/api/src/services/r2-bucket.ts b/packages/api/src/services/r2-bucket.ts index 1a7c0fb624..6349776c08 100644 --- a/packages/api/src/services/r2-bucket.ts +++ b/packages/api/src/services/r2-bucket.ts @@ -12,7 +12,7 @@ import { S3Client, UploadPartCommand, } from '@aws-sdk/client-s3'; -import type { Env } from '@packrat/api/types/env'; +import type { Env } from '@packrat/api/utils/env-validation'; import { isDate, isFunction, isNumber, isObject, isString } from '@packrat/guards'; // ── ETag normalization ──────────────────────────────────────────────── diff --git a/packages/api/src/services/trails.ts b/packages/api/src/services/trails.ts index 4dfc8b0cb7..8b0709b433 100644 --- a/packages/api/src/services/trails.ts +++ b/packages/api/src/services/trails.ts @@ -1,14 +1,9 @@ import type { createOsmDb } from '@packrat/api/db'; +import type { OsmMember } from '@packrat/schemas/trails'; import { sql } from 'drizzle-orm'; import { z } from 'zod'; -const OsmMemberSchema = z.object({ - type: z.string(), - ref: z.coerce.bigint(), - role: z.string(), -}); - -export type OsmMember = z.infer; +export type { OsmMember }; /** * Stitches a MultiLineString geometry from member way IDs using ST_LineMerge. @@ -21,10 +16,13 @@ export type OsmMember = z.infer; * will return null for those routes. This only affects the rare null-geometry * fallback path — osm2pgsql assembles geometry for >99% of routes directly. */ -export async function stitchRouteGeometry( - db: ReturnType, - members: OsmMember[], -): Promise { +export async function stitchRouteGeometry({ + db, + members, +}: { + db: ReturnType; + members: OsmMember[]; +}): Promise { const wayRefs = members.filter((m) => m.type === 'w').map((m) => m.ref); if (wayRefs.length === 0) return null; diff --git a/packages/api/src/services/userService.ts b/packages/api/src/services/userService.ts index 755a708153..af277b9b0d 100644 --- a/packages/api/src/services/userService.ts +++ b/packages/api/src/services/userService.ts @@ -1,6 +1,6 @@ import { createDb } from '@packrat/api/db'; -import { type User, users } from '@packrat/api/db/schema'; import { hashPassword } from '@packrat/api/utils/auth'; +import { type User, users } from '@packrat/db'; import { eq } from 'drizzle-orm'; export type CreateUserInput = { diff --git a/packages/api/src/services/weatherService.ts b/packages/api/src/services/weatherService.ts index feffb9f3c0..3f057f5477 100644 --- a/packages/api/src/services/weatherService.ts +++ b/packages/api/src/services/weatherService.ts @@ -1,4 +1,5 @@ import { getEnv } from '@packrat/api/utils/env-validation'; +import { captureApiException } from '@packrat/api/utils/sentry'; type WeatherData = { location: string; @@ -30,9 +31,21 @@ export class WeatherService { } catch { // response body not parseable — fall back to statusText } - throw new Error( + const error = new Error( `Weather API error ${response.status}: ${apiMessage} (location: "${location}")`, ); + captureApiException({ + error: error, + operation: 'weatherService.getWeatherForLocation', + tags: { weather_api: 'openweathermap' }, + extra: { + location, + apiMessage, + httpStatus: response.status, + errorCode: 'OPENWEATHERMAP_HTTP_ERROR', + }, + }); + throw error; } const data = (await response.json()) as { diff --git a/packages/api/src/services/wildlifeIdentificationService.ts b/packages/api/src/services/wildlifeIdentificationService.ts index 61529fd5bd..7e365d6d6d 100644 --- a/packages/api/src/services/wildlifeIdentificationService.ts +++ b/packages/api/src/services/wildlifeIdentificationService.ts @@ -1,5 +1,5 @@ -import { createOpenAI } from '@ai-sdk/openai'; import { DEFAULT_MODELS } from '@packrat/api/utils/ai/models'; +import { createAIProvider } from '@packrat/api/utils/ai/provider'; import { getEnv } from '@packrat/api/utils/env-validation'; import { generateObject } from 'ai'; import { z } from 'zod'; @@ -57,12 +57,26 @@ export type IdentificationResponse = z.infer { - const { OPENAI_API_KEY } = getEnv(); - const openai = createOpenAI({ apiKey: OPENAI_API_KEY }); + const { + OPENAI_API_KEY, + AI_PROVIDER, + CLOUDFLARE_ACCOUNT_ID, + CLOUDFLARE_AI_GATEWAY_ID, + CLOUDFLARE_API_TOKEN, + AI, + } = getEnv(); + const aiProvider = createAIProvider({ + openAiApiKey: OPENAI_API_KEY, + provider: AI_PROVIDER, + cloudflareAccountId: CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: AI, + }); try { const { object } = await generateObject({ - model: openai(DEFAULT_MODELS.OPENAI_CHAT), + model: aiProvider(DEFAULT_MODELS.OPENAI_CHAT), schema: identificationResponseSchema, system: SPECIES_IDENTIFICATION_SYSTEM_PROMPT, messages: [ diff --git a/packages/api/src/types/env.ts b/packages/api/src/types/env.ts deleted file mode 100644 index d84c25ecad..0000000000 --- a/packages/api/src/types/env.ts +++ /dev/null @@ -1 +0,0 @@ -export type { ValidatedEnv as Env } from '@packrat/api/utils/env-validation'; diff --git a/packages/api/src/types/etl.ts b/packages/api/src/types/etl.ts index 6d31e97fca..5e588cc69e 100644 --- a/packages/api/src/types/etl.ts +++ b/packages/api/src/types/etl.ts @@ -1,7 +1,5 @@ -import type { NewCatalogItem } from '@packrat/api/db/schema'; -import type { ValidationError } from './validation'; - -export type { ValidationError } from './validation'; +import type { NewCatalogItem } from '@packrat/db'; +import type { ValidationError } from '@packrat/schemas/validation'; export interface ValidatedCatalogItem { item: Partial; diff --git a/packages/api/src/types/index.ts b/packages/api/src/types/index.ts deleted file mode 100644 index bb81848c97..0000000000 --- a/packages/api/src/types/index.ts +++ /dev/null @@ -1,187 +0,0 @@ -import { z } from 'zod'; - -// --- User Schema --- -export const UserSchema = z.object({ - id: z.number().int().positive(), - name: z.string(), - email: z.string().email(), - avatar: z.string().url(), - experience: z.enum(['beginner', 'intermediate', 'expert']), - joinedAt: z.string().datetime(), - bio: z.string().optional(), -}); - -export type User = z.infer; - -// --- Pack Category Enum --- -export const PACK_CATEGORIES = Object.freeze([ - 'hiking', - 'backpacking', - 'camping', - 'climbing', - 'winter', - 'desert', - 'custom', - 'water sports', - 'skiing', -] as const); - -export const PackCategorySchema = z.enum(PACK_CATEGORIES); -export type PackCategory = z.infer; - -// --- Item Category Enum --- -export const ITEM_CATEGORIES = Object.freeze([ - 'clothing', - 'shelter', - 'sleep', - 'kitchen', - 'water', - 'electronics', - 'first-aid', - 'navigation', - 'tools', - 'consumables', - 'miscellaneous', -] as const); - -export const ItemCategorySchema = z.enum(ITEM_CATEGORIES); -export type ItemCategory = z.infer; - -// --- Weight Unit Enum --- -export const WEIGHT_UNITS = Object.freeze(['g', 'oz', 'kg', 'lb'] as const); -export const WeightUnitSchema = z.enum(WEIGHT_UNITS); -export type WeightUnit = z.infer; - -// --- Availability Enum --- -export const AVAILABILITY_VALUES = Object.freeze(['in_stock', 'out_of_stock', 'preorder'] as const); -export const AvailabilitySchema = z.enum(AVAILABILITY_VALUES); -export type Availability = z.infer; - -export type ItemLink = { - id: string; - title: string; - url: string; - type: 'official' | 'review' | 'guide' | 'purchase' | 'other'; -}; - -export type ItemReview = { - id: string; - userId: string; - userName: string; - userAvatar?: string; - rating: number; - text: string; - date: string; - helpful?: number; - verified?: boolean; -}; - -// --- Catalog Item Schema --- -export const CatalogItemSchema = z.object({ - id: z.number().int().positive(), - name: z.string(), - productUrl: z.string(), - sku: z.string(), - weight: z.number().nonnegative(), - weightUnit: z.string(), - description: z.string().optional(), - categories: z.array(z.string()).optional(), - images: z.array(z.string()).optional(), - brand: z.string().optional(), - model: z.string().optional(), - ratingValue: z.number().optional(), - color: z.string().optional(), - size: z.string().optional(), - price: z.number().optional(), - availability: z.enum(['in_stock', 'out_of_stock', 'preorder']).optional(), - seller: z.string().optional(), - productSku: z.string().optional(), - material: z.string().optional(), - currency: z.string().optional(), - condition: z.string().optional(), - reviewCount: z.number().int().optional(), - variants: z - .array( - z.object({ - attribute: z.string(), - values: z.array(z.string()), - }), - ) - .optional(), - techs: z.record(z.string(), z.string()).optional(), - links: z - .array( - z.object({ - title: z.string(), - url: z.string(), - }), - ) - .optional(), - reviews: z - .array( - z.object({ - user_name: z.string(), - user_avatar: z.string().optional(), - context: z.record(z.string(), z.string()).optional(), - recommends: z.boolean().optional(), - rating: z.number(), - title: z.string(), - text: z.string(), - date: z.string(), - images: z.array(z.string()).optional(), - upvotes: z.number().optional(), - downvotes: z.number().optional(), - verified: z.boolean().optional(), - }), - ) - .optional(), - createdAt: z.string().datetime(), - updatedAt: z.string().datetime(), -}); - -export type CatalogItem = z.infer; -// --- Pack Item Schema --- -export const PackItemSchema = z.object({ - id: z.string(), - name: z.string(), - description: z.string().optional(), - weight: z.number().nonnegative(), - weightUnit: WeightUnitSchema, - quantity: z.number().int().positive(), - category: z.string(), - consumable: z.boolean(), - worn: z.boolean(), - image: z.string().url().optional(), - notes: z.string().optional(), - packId: z.string(), - catalogItemId: z.number().int().positive().optional(), // Reference to original catalog item - createdAt: z.string().datetime(), - updatedAt: z.string().datetime(), - userId: z.number().int().positive(), -}); - -export type PackItem = z.infer; - -// --- Pack Schema --- -export const PackSchema = z.object({ - id: z.string(), - name: z.string(), - description: z.string().optional(), - category: PackCategorySchema, - baseWeight: z.number().nonnegative().optional(), // Weight without consumables (computed) - totalWeight: z.number().nonnegative().optional(), // Total weight including consumables (computed) - items: z.array(PackItemSchema).optional(), - userId: z.number().int().positive(), - createdAt: z.string().datetime(), - updatedAt: z.string().datetime(), - isPublic: z.boolean(), - image: z.string().url().optional(), - tags: z.array(z.string()).optional(), -}); - -export type Pack = z.infer; - -// --- Arrays for Mock Data Validation --- -export const UsersArraySchema = z.array(UserSchema); -export const PacksArraySchema = z.array(PackSchema); -export const PackItemsArraySchema = z.array(PackItemSchema); diff --git a/packages/api/src/types/variables.ts b/packages/api/src/types/variables.ts index 80d6ade8b9..dad411514b 100644 --- a/packages/api/src/types/variables.ts +++ b/packages/api/src/types/variables.ts @@ -1,6 +1,6 @@ export type Variables = { user: { - userId: number; + userId: string; role: 'USER' | 'ADMIN'; }; }; diff --git a/packages/api/src/utils/DbUtils.ts b/packages/api/src/utils/DbUtils.ts index 05edbc90b3..346bafa4b1 100644 --- a/packages/api/src/utils/DbUtils.ts +++ b/packages/api/src/utils/DbUtils.ts @@ -1,5 +1,5 @@ import { createDb } from '@packrat/api/db'; -import { catalogItems, packs } from '@packrat/api/db/schema'; +import { catalogItems, packs } from '@packrat/db'; import { and, arrayOverlaps, eq, inArray, type SQL, sql } from 'drizzle-orm'; // Get pack details from the database diff --git a/packages/api/src/utils/__tests__/auth.test.ts b/packages/api/src/utils/__tests__/auth.test.ts index 3043193d01..0da7fc960a 100644 --- a/packages/api/src/utils/__tests__/auth.test.ts +++ b/packages/api/src/utils/__tests__/auth.test.ts @@ -22,11 +22,13 @@ describe('auth utilities', () => { }); it('verifies a matching password', async () => { - expect(await verifyPassword('password123', 'hashed_password123')).toBe(true); + expect(await verifyPassword({ password: 'password123', hash: 'hashed_password123' })).toBe( + true, + ); }); it('rejects a non-matching password', async () => { - expect(await verifyPassword('password123', 'hashed_wrong')).toBe(false); + expect(await verifyPassword({ password: 'password123', hash: 'hashed_wrong' })).toBe(false); }); }); @@ -56,5 +58,9 @@ describe('auth utilities', () => { } as never); expect(isValidApiKey(new Headers({ 'x-api-key': 'anything' }))).toBe(false); }); + + it('accepts a plain header map with uppercase X-API-Key', () => { + expect(isValidApiKey({ 'X-API-Key': 'test-api-key' })).toBe(true); + }); }); }); diff --git a/packages/api/src/utils/__tests__/chatContextHelpers.test.ts b/packages/api/src/utils/__tests__/chatContextHelpers.test.ts index 7a59c597b0..dd852993c6 100644 --- a/packages/api/src/utils/__tests__/chatContextHelpers.test.ts +++ b/packages/api/src/utils/__tests__/chatContextHelpers.test.ts @@ -7,28 +7,39 @@ import { describe('generatePromptWithContext', () => { it('returns the raw message when no context is provided', () => { - expect(generatePromptWithContext('Hello')).toBe('Hello'); + expect(generatePromptWithContext({ userMessage: 'Hello' })).toBe('Hello'); }); it('returns the raw message for a general context', () => { - expect(generatePromptWithContext('Hello', { contextType: 'general' })).toBe('Hello'); + expect( + generatePromptWithContext({ userMessage: 'Hello', context: { contextType: 'general' } }), + ).toBe('Hello'); }); it('prefixes message with item name for item context', () => { - const result = generatePromptWithContext('Tell me more', { - contextType: 'item', - itemName: 'Tent', + const result = generatePromptWithContext({ + userMessage: 'Tell me more', + context: { + contextType: 'item', + itemName: 'Tent', + }, }); expect(result).toBe('[About item: Tent] Tell me more'); }); it('returns raw message for item context without an item name', () => { - const result = generatePromptWithContext('Tell me more', { contextType: 'item' }); + const result = generatePromptWithContext({ + userMessage: 'Tell me more', + context: { contextType: 'item' }, + }); expect(result).toBe('Tell me more'); }); it('prefixes message for pack context', () => { - const result = generatePromptWithContext('Analyze my pack', { contextType: 'pack' }); + const result = generatePromptWithContext({ + userMessage: 'Analyze my pack', + context: { contextType: 'pack' }, + }); expect(result).toBe('[About my pack] Analyze my pack'); }); }); @@ -58,6 +69,11 @@ describe('getContextualSuggestions', () => { const suggestions = getContextualSuggestions({ contextType: 'pack' }); expect(suggestions.length).toBeGreaterThan(0); }); + + it('returns empty array for item context without an item name', () => { + const suggestions = getContextualSuggestions({ contextType: 'item' }); + expect(suggestions).toEqual([]); + }); }); describe('getContextualGreeting', () => { @@ -82,4 +98,9 @@ describe('getContextualGreeting', () => { expect(typeof greeting).toBe('string'); expect(greeting.length).toBeGreaterThan(0); }); + + it('includes the pack name in the greeting when packName is provided', () => { + const greeting = getContextualGreeting({ contextType: 'pack', packName: 'My Hiking Pack' }); + expect(greeting).toContain('My Hiking Pack'); + }); }); diff --git a/packages/api/src/utils/__tests__/compute-pack.test.ts b/packages/api/src/utils/__tests__/compute-pack.test.ts index 1eec9d5099..00d1f1b153 100644 --- a/packages/api/src/utils/__tests__/compute-pack.test.ts +++ b/packages/api/src/utils/__tests__/compute-pack.test.ts @@ -1,6 +1,6 @@ -import type { PackItem, PackWithItems } from '@packrat/api/db/schema'; +import type { PackItem, PackWithItems } from '@packrat/db'; import { describe, expect, it } from 'vitest'; -import { computePacksWeights, computePackWeights } from '../compute-pack'; +import { computePackBreakdown, computePacksWeights, computePackWeights } from '../compute-pack'; // --------------------------------------------------------------------------- // Minimal factory helpers @@ -59,7 +59,7 @@ function makePackItem( describe('computePackWeights', () => { it('returns zero base and total weight for an empty pack', () => { const pack = makePack({ items: [] }); - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.baseWeight).toBe(0); expect(result.totalWeight).toBe(0); }); @@ -67,7 +67,7 @@ describe('computePackWeights', () => { it('throws when items is null/undefined', () => { // Force the missing-items scenario by casting to bypass TS const pack = makePack({ items: undefined as unknown as PackItem[] }); - expect(() => computePackWeights(pack)).toThrow(`Pack with ID pack-1 has no items`); + expect(() => computePackWeights({ pack })).toThrow(`Pack with ID pack-1 has no items`); }); it('calculates correct base and total weight in grams', () => { @@ -75,7 +75,7 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 200, weightUnit: 'g' }), makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }), ]; - const result = computePackWeights(makePack({ items })); + const result = computePackWeights({ pack: makePack({ items }) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(300); }); @@ -85,7 +85,7 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', consumable: true }), makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }), ]; - const result = computePackWeights(makePack({ items })); + const result = computePackWeights({ pack: makePack({ items }) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(100); }); @@ -95,14 +95,14 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 200, weightUnit: 'g', worn: true }), makePackItem({ id: 'i2', weight: 100, weightUnit: 'g' }), ]; - const result = computePackWeights(makePack({ items })); + const result = computePackWeights({ pack: makePack({ items }) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(100); }); it('multiplies weight by item quantity', () => { const items = [makePackItem({ weight: 100, weightUnit: 'g', quantity: 3 })]; - const result = computePackWeights(makePack({ items })); + const result = computePackWeights({ pack: makePack({ items }) }); expect(result.totalWeight).toBe(300); expect(result.baseWeight).toBe(300); }); @@ -112,26 +112,26 @@ describe('computePackWeights', () => { makePackItem({ id: 'i1', weight: 1, weightUnit: 'kg' }), // 1000 g makePackItem({ id: 'i2', weight: 1000, weightUnit: 'g' }), // 1000 g ]; - const result = computePackWeights(makePack({ items })); + const result = computePackWeights({ pack: makePack({ items }) }); expect(result.totalWeight).toBe(2000); expect(result.baseWeight).toBe(2000); }); it('respects the preferredUnit parameter (oz)', () => { const items = [makePackItem({ weight: 28.35, weightUnit: 'g' })]; - const result = computePackWeights(makePack({ items }), 'oz'); + const result = computePackWeights({ pack: makePack({ items }), preferredUnit: 'oz' }); expect(result.totalWeight).toBeCloseTo(1, 1); }); it('respects the preferredUnit parameter (kg)', () => { const items = [makePackItem({ weight: 1000, weightUnit: 'g' })]; - const result = computePackWeights(makePack({ items }), 'kg'); + const result = computePackWeights({ pack: makePack({ items }), preferredUnit: 'kg' }); expect(result.totalWeight).toBe(1); }); it('preserves all other pack properties', () => { const pack = makePack({ name: 'My Pack', category: 'backpacking', items: [] }); - const result = computePackWeights(pack); + const result = computePackWeights({ pack }); expect(result.name).toBe('My Pack'); expect(result.category).toBe('backpacking'); }); @@ -139,7 +139,7 @@ describe('computePackWeights', () => { it('rounds computed weights to 2 decimal places', () => { // 100g in oz = 3.527... rounded to 2 decimals const items = [makePackItem({ weight: 100, weightUnit: 'g' })]; - const result = computePackWeights(makePack({ items }), 'oz'); + const result = computePackWeights({ pack: makePack({ items }), preferredUnit: 'oz' }); const decimals = result.totalWeight.toString().split('.')[1]; expect(decimals === undefined || decimals.length <= 2).toBe(true); }); @@ -150,7 +150,7 @@ describe('computePackWeights', () => { // --------------------------------------------------------------------------- describe('computePacksWeights', () => { it('returns an empty array for no packs', () => { - expect(computePacksWeights([])).toEqual([]); + expect(computePacksWeights({ packs: [] })).toEqual([]); }); it('computes weights for multiple packs', () => { @@ -164,8 +164,140 @@ describe('computePacksWeights', () => { items: [makePackItem({ weight: 1000, weightUnit: 'g' })], }), ]; - const results = computePacksWeights(packs); + const results = computePacksWeights({ packs }); expect(results[0]?.totalWeight).toBe(500); expect(results[1]?.totalWeight).toBe(1000); }); }); + +// --------------------------------------------------------------------------- +// computePackBreakdown +// --------------------------------------------------------------------------- +describe('computePackBreakdown', () => { + it('throws when items is undefined', () => { + const pack = makePack({ items: undefined as unknown as PackItem[] }); + expect(() => computePackBreakdown(pack)).toThrow('Pack with ID pack-1 has no items'); + }); + + it('returns zero totals and empty byCategory for an empty pack', () => { + const result = computePackBreakdown(makePack({ items: [] })); + expect(result.packId).toBe('pack-1'); + expect(result.totalGrams).toBe(0); + expect(result.baseGrams).toBe(0); + expect(result.wornGrams).toBe(0); + expect(result.consumableGrams).toBe(0); + expect(result.itemCount).toBe(0); + expect(result.byCategory).toEqual([]); + }); + + it('computes base, worn, and consumable grams correctly', () => { + const items = [ + makePackItem({ id: 'i1', weight: 500, weightUnit: 'g' }), // base + makePackItem({ id: 'i2', weight: 200, weightUnit: 'g', worn: true }), + makePackItem({ id: 'i3', weight: 100, weightUnit: 'g', consumable: true }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(result.totalGrams).toBe(800); + expect(result.baseGrams).toBe(500); + expect(result.wornGrams).toBe(200); + expect(result.consumableGrams).toBe(100); + }); + + it('groups items into a single category entry', () => { + const items = [ + makePackItem({ id: 'i1', weight: 300, weightUnit: 'g', category: 'Shelter' }), + makePackItem({ id: 'i2', weight: 200, weightUnit: 'g', category: 'Shelter' }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(result.byCategory).toHaveLength(1); + expect(result.byCategory[0]?.category).toBe('Shelter'); + expect(result.byCategory[0]?.totalGrams).toBe(500); + }); + + it('falls back to "Uncategorized" when category is null', () => { + const items = [makePackItem({ weight: 100, weightUnit: 'g', category: null })]; + const result = computePackBreakdown(makePack({ items })); + expect(result.byCategory[0]?.category).toBe('Uncategorized'); + }); + + it('sorts byCategory heaviest first', () => { + const items = [ + makePackItem({ id: 'i1', weight: 100, weightUnit: 'g', category: 'Light' }), + makePackItem({ id: 'i2', weight: 500, weightUnit: 'g', category: 'Heavy' }), + makePackItem({ id: 'i3', weight: 300, weightUnit: 'g', category: 'Medium' }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(result.byCategory.map((c) => c.category)).toEqual(['Heavy', 'Medium', 'Light']); + }); + + it('computes totalLbs from totalGrams (rounded to 2 decimals)', () => { + const items = [makePackItem({ weight: 453.592, weightUnit: 'g', category: 'Pack' })]; + const result = computePackBreakdown(makePack({ items })); + // 453.592 g = 1 lb exactly + expect(result.byCategory[0]?.totalLbs).toBe(1); + }); + + it('counts items by quantity for itemCount', () => { + const items = [ + makePackItem({ id: 'i1', weight: 100, weightUnit: 'g', quantity: 3 }), + makePackItem({ id: 'i2', weight: 200, weightUnit: 'g', quantity: 2 }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(result.itemCount).toBe(5); + }); + + it('counts itemCount in byCategory by quantity', () => { + const items = [makePackItem({ weight: 100, weightUnit: 'g', quantity: 4, category: 'Food' })]; + const result = computePackBreakdown(makePack({ items })); + expect(result.byCategory[0]?.itemCount).toBe(4); + }); + + it('builds item strings in the expected format', () => { + const items = [ + makePackItem({ + name: 'Tent', + weight: 1000, + weightUnit: 'g', + quantity: 1, + category: 'Shelter', + }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(result.byCategory[0]?.items[0]).toBe('Tent (1000g × 1)'); + }); + + it('uses "g" as fallback unit in item string when weightUnit is null', () => { + const items = [ + makePackItem({ + name: 'Snack', + weight: 50, + weightUnit: null as unknown as 'g', + category: 'Food', + }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(result.byCategory[0]?.items[0]).toBe('Snack (50g × 1)'); + }); + + it('converts weights across units (kg → g) before accumulating', () => { + const items = [makePackItem({ weight: 1, weightUnit: 'kg', category: 'Pack' })]; + const result = computePackBreakdown(makePack({ items })); + expect(result.totalGrams).toBe(1000); + }); + + it('multiplies item weight by quantity before accumulating', () => { + const items = [makePackItem({ weight: 100, weightUnit: 'g', quantity: 5, category: 'Food' })]; + const result = computePackBreakdown(makePack({ items })); + expect(result.totalGrams).toBe(500); + expect(result.byCategory[0]?.totalGrams).toBe(500); + }); + + it('rounds totalGrams to the nearest integer', () => { + // 0.1 oz ≈ 2.835 g — repeated accumulation can introduce floating-point noise + const items = [ + makePackItem({ id: 'i1', weight: 0.1, weightUnit: 'oz', quantity: 1, category: 'Misc' }), + ]; + const result = computePackBreakdown(makePack({ items })); + expect(Number.isInteger(result.totalGrams)).toBe(true); + }); +}); diff --git a/packages/api/src/utils/__tests__/csv-utils.test.ts b/packages/api/src/utils/__tests__/csv-utils.test.ts index 14aa053104..a9eef86948 100644 --- a/packages/api/src/utils/__tests__/csv-utils.test.ts +++ b/packages/api/src/utils/__tests__/csv-utils.test.ts @@ -419,38 +419,41 @@ describe('csv-utils', () => { describe('parseWeight', () => { it('parses grams correctly', () => { - expect(parseWeight('100')).toEqual({ weight: 100, unit: 'g' }); - expect(parseWeight('150', 'g')).toEqual({ weight: 150, unit: 'g' }); + expect(parseWeight({ weightStr: '100' })).toEqual({ weight: 100, unit: 'g' }); + expect(parseWeight({ weightStr: '150', unitStr: 'g' })).toEqual({ weight: 150, unit: 'g' }); }); it('parses ounces correctly', () => { - expect(parseWeight('10', 'oz')).toEqual({ weight: 284, unit: 'oz' }); - expect(parseWeight('5 oz')).toEqual({ weight: 142, unit: 'oz' }); + expect(parseWeight({ weightStr: '10', unitStr: 'oz' })).toEqual({ weight: 284, unit: 'oz' }); + expect(parseWeight({ weightStr: '5 oz' })).toEqual({ weight: 142, unit: 'oz' }); }); it('parses pounds correctly', () => { - expect(parseWeight('2', 'lb')).toEqual({ weight: 907, unit: 'lb' }); - expect(parseWeight('3 lbs')).toEqual({ weight: 1361, unit: 'lb' }); + expect(parseWeight({ weightStr: '2', unitStr: 'lb' })).toEqual({ weight: 907, unit: 'lb' }); + expect(parseWeight({ weightStr: '3 lbs' })).toEqual({ weight: 1361, unit: 'lb' }); }); it('parses kilograms correctly', () => { - expect(parseWeight('1.5', 'kg')).toEqual({ weight: 1500, unit: 'kg' }); - expect(parseWeight('2 kg')).toEqual({ weight: 2000, unit: 'kg' }); + expect(parseWeight({ weightStr: '1.5', unitStr: 'kg' })).toEqual({ + weight: 1500, + unit: 'kg', + }); + expect(parseWeight({ weightStr: '2 kg' })).toEqual({ weight: 2000, unit: 'kg' }); }); it('handles empty or invalid input', () => { - expect(parseWeight('')).toEqual({ weight: null, unit: null }); - expect(parseWeight('invalid')).toEqual({ weight: null, unit: null }); - expect(parseWeight('-10')).toEqual({ weight: null, unit: null }); + expect(parseWeight({ weightStr: '' })).toEqual({ weight: null, unit: null }); + expect(parseWeight({ weightStr: 'invalid' })).toEqual({ weight: null, unit: null }); + expect(parseWeight({ weightStr: '-10' })).toEqual({ weight: null, unit: null }); }); it('defaults to grams when no unit is specified', () => { - expect(parseWeight('250')).toEqual({ weight: 250, unit: 'g' }); + expect(parseWeight({ weightStr: '250' })).toEqual({ weight: 250, unit: 'g' }); }); it('is case-insensitive for units', () => { - expect(parseWeight('10', 'OZ')).toEqual({ weight: 284, unit: 'oz' }); - expect(parseWeight('1', 'KG')).toEqual({ weight: 1000, unit: 'kg' }); + expect(parseWeight({ weightStr: '10', unitStr: 'OZ' })).toEqual({ weight: 284, unit: 'oz' }); + expect(parseWeight({ weightStr: '1', unitStr: 'KG' })).toEqual({ weight: 1000, unit: 'kg' }); }); }); diff --git a/packages/api/src/utils/__tests__/embeddingHelper.test.ts b/packages/api/src/utils/__tests__/embeddingHelper.test.ts index a59329979a..b5bcf803be 100644 --- a/packages/api/src/utils/__tests__/embeddingHelper.test.ts +++ b/packages/api/src/utils/__tests__/embeddingHelper.test.ts @@ -14,7 +14,7 @@ describe('embeddingHelper', () => { model: 'Pro 2000', }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('Test Tent'); expect(result).toContain('A great tent for camping'); @@ -28,7 +28,7 @@ describe('embeddingHelper', () => { categories: ['camping', 'backpacking', 'cold-weather'], }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('camping, backpacking, cold-weather'); }); @@ -39,7 +39,7 @@ describe('embeddingHelper', () => { category: 'water-treatment', }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('water-treatment'); }); @@ -53,7 +53,7 @@ describe('embeddingHelper', () => { ], }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('Size: S, M, L'); expect(result).toContain('Color: Red, Blue'); @@ -69,7 +69,7 @@ describe('embeddingHelper', () => { }, }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('Battery Life: 20 hours'); expect(result).toContain('Waterproof: IPX7'); @@ -84,7 +84,7 @@ describe('embeddingHelper', () => { material: 'Ripstop Nylon', }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('Green'); expect(result).toContain('50L'); @@ -100,7 +100,7 @@ describe('embeddingHelper', () => { ], }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('Great boots Very comfortable and durable'); expect(result).toContain('Perfect fit Excellent traction on trails'); @@ -117,7 +117,7 @@ describe('embeddingHelper', () => { ], }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('What fuel does it use?'); expect(result).toContain('Propane or butane'); @@ -133,7 +133,7 @@ describe('embeddingHelper', () => { ], }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toContain('Is it dishwasher safe? Yes, top rack only'); expect(result).toContain('What is the capacity? 1 liter'); @@ -147,7 +147,7 @@ describe('embeddingHelper', () => { model: '', }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); expect(result).toBe('Item'); }); @@ -164,7 +164,7 @@ describe('embeddingHelper', () => { categories: ['outdoor', 'gear'], }; - const result = getEmbeddingText(item, existingItem); + const result = getEmbeddingText({ item, existingItem }); expect(result).toContain('Updated Name'); expect(result).toContain('ExistingBrand'); @@ -183,7 +183,7 @@ describe('embeddingHelper', () => { brand: 'OldBrand', }; - const result = getEmbeddingText(item, existingItem); + const result = getEmbeddingText({ item, existingItem }); expect(result).toContain('New Name'); expect(result).toContain('NewBrand'); @@ -192,7 +192,7 @@ describe('embeddingHelper', () => { }); it('returns empty string for completely empty item', () => { - const result = getEmbeddingText({}); + const result = getEmbeddingText({ item: {} }); expect(result).toBe(''); }); @@ -203,7 +203,7 @@ describe('embeddingHelper', () => { brand: 'Brand', }; - const result = getEmbeddingText(item); + const result = getEmbeddingText({ item }); const lines = result.split('\n'); expect(lines).toHaveLength(3); @@ -211,5 +211,73 @@ describe('embeddingHelper', () => { expect(lines[1]).toBe('Description'); expect(lines[2]).toBe('Brand'); }); + + it('falls back to existingItem for techs when item has none', () => { + const item = { name: 'Gadget' }; + const existingItem = { + techs: { Waterproof: 'IPX8', Weight: '150g' }, + }; + const result = getEmbeddingText({ item, existingItem }); + expect(result).toContain('Waterproof: IPX8'); + expect(result).toContain('Weight: 150g'); + }); + + it('falls back to existingItem for reviews when item has none', () => { + const item = { name: 'Boots' }; + const existingItem = { + reviews: [{ title: 'Solid boot', text: 'Great grip on wet rock' }], + }; + const result = getEmbeddingText({ item, existingItem: existingItem as never }); + expect(result).toContain('Solid boot Great grip on wet rock'); + }); + + it('falls back to existingItem for qas when item has none', () => { + const item = { name: 'Stove' }; + const existingItem = { + qas: [ + { + question: 'Does it work at altitude?', + answers: [{ a: 'Yes, up to 5000m' }], + }, + ], + }; + const result = getEmbeddingText({ item, existingItem: existingItem as never }); + expect(result).toContain('Does it work at altitude?'); + expect(result).toContain('Yes, up to 5000m'); + }); + + it('falls back to existingItem for faqs when item has none', () => { + const item = { name: 'Bottle' }; + const existingItem = { + faqs: [{ question: 'BPA free?', answer: 'Yes, completely BPA-free' }], + }; + const result = getEmbeddingText({ item, existingItem }); + expect(result).toContain('BPA free? Yes, completely BPA-free'); + }); + + it('falls back to existingItem for variants when item has none', () => { + const item = { name: 'Jacket' }; + const existingItem = { + variants: [{ attribute: 'Color', values: ['Navy', 'Olive'] }], + }; + const result = getEmbeddingText({ item, existingItem: existingItem as never }); + expect(result).toContain('Color: Navy, Olive'); + }); + + it('falls back to existingItem for color, size, and material', () => { + const item = { name: 'Glove' }; + const existingItem = { color: 'Black', size: 'L', material: 'Fleece' }; + const result = getEmbeddingText({ item, existingItem }); + expect(result).toContain('Black'); + expect(result).toContain('L'); + expect(result).toContain('Fleece'); + }); + + it('falls back to existingItem category when item has none', () => { + const item = { name: 'Hat' }; + const existingItem = { category: 'Headwear' }; + const result = getEmbeddingText({ item, existingItem }); + expect(result).toContain('Headwear'); + }); }); }); diff --git a/packages/api/src/utils/__tests__/env-validation.test.ts b/packages/api/src/utils/__tests__/env-validation.test.ts index 49a75039ad..54d2c79f84 100644 --- a/packages/api/src/utils/__tests__/env-validation.test.ts +++ b/packages/api/src/utils/__tests__/env-validation.test.ts @@ -1,5 +1,10 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { apiEnvSchema, getEnv, validateCloudflareApiEnv } from '../env-validation'; +import { + apiEnvObjectSchema, + apiEnvSchema, + getEnv, + validateCloudflareApiEnv, +} from '../env-validation'; // Minimal helper – returns a plain record matching the shape of CF Worker env bindings. function makeRawEnv(overrides: Record = {}): Record { @@ -32,6 +37,7 @@ function makeRawEnv(overrides: Record = {}): Record = {}): Record { }); it('validates SENTRY_DSN as URL', () => { - expect(apiEnvSchema.shape.SENTRY_DSN.safeParse('https://sentry.io/123').success).toBe(true); + expect(apiEnvObjectSchema.shape.SENTRY_DSN.safeParse('https://sentry.io/123').success).toBe( + true, + ); }); it('rejects invalid SENTRY_DSN', () => { - expect(apiEnvSchema.shape.SENTRY_DSN.safeParse('not-a-url').success).toBe(false); + expect(apiEnvObjectSchema.shape.SENTRY_DSN.safeParse('not-a-url').success).toBe(false); + }); + + it('accepts missing SENTRY_DSN for local development', () => { + expect(apiEnvObjectSchema.shape.SENTRY_DSN.safeParse(undefined).success).toBe(true); }); it('validates OPENAI_API_KEY starts with sk-', () => { - expect(apiEnvSchema.shape.OPENAI_API_KEY.safeParse('sk-test123').success).toBe(true); + expect(apiEnvObjectSchema.shape.OPENAI_API_KEY.safeParse('sk-test123').success).toBe(true); }); it('rejects OPENAI_API_KEY without sk- prefix', () => { - expect(apiEnvSchema.shape.OPENAI_API_KEY.safeParse('invalid-key').success).toBe(false); + expect(apiEnvObjectSchema.shape.OPENAI_API_KEY.safeParse('invalid-key').success).toBe(false); + }); + + it('requires provider keys even when Cloudflare unified billing is configured', () => { + const result = apiEnvSchema.safeParse( + makeRawEnv({ OPENAI_API_KEY: undefined, GOOGLE_GENERATIVE_AI_API_KEY: undefined }), + ); + expect(result.success).toBe(false); + }); + + it('validates direct OpenAI fallback with OPENAI_API_KEY and no Cloudflare token', () => { + const result = apiEnvSchema.safeParse(makeRawEnv({ CLOUDFLARE_API_TOKEN: undefined })); + expect(result.success).toBe(true); + }); + + it('validates direct OpenAI fallback without Cloudflare AI Gateway config', () => { + const result = apiEnvSchema.safeParse( + makeRawEnv({ + CLOUDFLARE_AI_GATEWAY_ID: undefined, + CLOUDFLARE_API_TOKEN: undefined, + }), + ); + expect(result.success).toBe(true); + }); + + it('requires OPENAI_API_KEY', () => { + const result = apiEnvSchema.safeParse(makeRawEnv({ OPENAI_API_KEY: undefined })); + expect(result.success).toBe(false); + if (!result.success) { + expect(result.error.message).toContain('Required'); + } + }); + + it('requires GOOGLE_GENERATIVE_AI_API_KEY', () => { + const result = apiEnvSchema.safeParse( + makeRawEnv({ GOOGLE_GENERATIVE_AI_API_KEY: undefined }), + ); + expect(result.success).toBe(false); + if (!result.success) { + expect(result.error.message).toContain('Required'); + } }); it('validates AI_PROVIDER enum', () => { - expect(apiEnvSchema.shape.AI_PROVIDER.safeParse('openai').success).toBe(true); - expect(apiEnvSchema.shape.AI_PROVIDER.safeParse('cloudflare-workers-ai').success).toBe(true); - expect(apiEnvSchema.shape.AI_PROVIDER.safeParse('invalid').success).toBe(false); + expect(apiEnvObjectSchema.shape.AI_PROVIDER.safeParse('openai').success).toBe(true); + expect(apiEnvObjectSchema.shape.AI_PROVIDER.safeParse('cloudflare-workers-ai').success).toBe( + true, + ); + expect(apiEnvObjectSchema.shape.AI_PROVIDER.safeParse('invalid').success).toBe(false); }); it('validates EMAIL_PROVIDER enum', () => { - expect(apiEnvSchema.shape.EMAIL_PROVIDER.safeParse('resend').success).toBe(true); - expect(apiEnvSchema.shape.EMAIL_PROVIDER.safeParse('ses').success).toBe(true); - expect(apiEnvSchema.shape.EMAIL_PROVIDER.safeParse('invalid').success).toBe(false); + expect(apiEnvObjectSchema.shape.EMAIL_PROVIDER.safeParse('resend').success).toBe(true); + expect(apiEnvObjectSchema.shape.EMAIL_PROVIDER.safeParse('ses').success).toBe(true); + expect(apiEnvObjectSchema.shape.EMAIL_PROVIDER.safeParse('invalid').success).toBe(false); }); it('validates CONTAINER_PORT as numeric string', () => { - expect(apiEnvSchema.shape.CONTAINER_PORT.safeParse('8080').success).toBe(true); + expect(apiEnvObjectSchema.shape.CONTAINER_PORT.safeParse('8080').success).toBe(true); }); it('rejects non-numeric CONTAINER_PORT', () => { - expect(apiEnvSchema.shape.CONTAINER_PORT.safeParse('not-a-port').success).toBe(false); + expect(apiEnvObjectSchema.shape.CONTAINER_PORT.safeParse('not-a-port').success).toBe(false); }); it('makes CONTAINER_PORT optional', () => { - expect(apiEnvSchema.shape.CONTAINER_PORT.safeParse(undefined).success).toBe(true); + expect(apiEnvObjectSchema.shape.CONTAINER_PORT.safeParse(undefined).success).toBe(true); }); }); diff --git a/packages/api/src/utils/__tests__/itemCalculations.test.ts b/packages/api/src/utils/__tests__/itemCalculations.test.ts index d9cd91ddb8..de5fee5d61 100644 --- a/packages/api/src/utils/__tests__/itemCalculations.test.ts +++ b/packages/api/src/utils/__tests__/itemCalculations.test.ts @@ -1,4 +1,4 @@ -import type { CatalogItem, PackItem } from '@packrat/api/types'; +import type { CatalogItem, PackItem } from '@packrat/types'; import { describe, expect, it } from 'vitest'; import { calculateTotalWeight, @@ -21,17 +21,25 @@ function makePackItem(overrides: Partial = {}): PackItem { id: 'pack-item-1', packId: 'pack-1', name: 'Test Pack Item', + description: null, weight: 100, weightUnit: 'g', quantity: 1, + category: null, consumable: false, worn: false, - userId: 1, - category: 'tools', - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), + image: null, + notes: null, + catalogItemId: null, + userId: 'user-1', + deleted: false, + isAIGenerated: false, + templateItemId: null, + embedding: null, + createdAt: new Date(), + updatedAt: new Date(), ...overrides, - }; + } as PackItem; } function makeCatalogItem(overrides: Partial = {}): CatalogItem { @@ -48,24 +56,27 @@ function makeCatalogItem(overrides: Partial = {}): CatalogItem { brand: 'TestBrand', model: 'TestModel', ratingValue: 4.5, - color: undefined, - size: undefined, + color: null, + size: null, price: 99.99, availability: 'in_stock', - seller: undefined, - productSku: undefined, - material: undefined, + seller: null, + productSku: null, + material: null, currency: 'USD', - condition: undefined, + condition: null, reviewCount: 0, - variants: undefined, - techs: undefined, - links: undefined, - reviews: undefined, - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), + variants: null, + techs: null, + links: null, + reviews: null, + qas: null, + faqs: null, + embedding: null, + createdAt: new Date(), + updatedAt: new Date(), ...overrides, - }; + } as CatalogItem; } // --------------------------------------------------------------------------- @@ -146,9 +157,9 @@ describe('itemCalculations', () => { expect(getNotes(item)).toBe('Important notes'); }); - it('returns undefined for pack items without notes', () => { + it('returns null/undefined for pack items without notes', () => { const item = makePackItem(); - expect(getNotes(item)).toBeUndefined(); + expect(getNotes(item)).toBeFalsy(); }); it('returns undefined for catalog items', () => { diff --git a/packages/api/src/utils/__tests__/routeParams.test.ts b/packages/api/src/utils/__tests__/routeParams.test.ts new file mode 100644 index 0000000000..0eddf3655a --- /dev/null +++ b/packages/api/src/utils/__tests__/routeParams.test.ts @@ -0,0 +1,103 @@ +import { describe, expect, it } from 'vitest'; +import { integerIdSchema, parseIntegerId } from '../routeParams'; + +describe('integerIdSchema', () => { + it('accepts a valid positive integer string', () => { + expect(integerIdSchema.safeParse('1').success).toBe(true); + expect(integerIdSchema.safeParse('42').success).toBe(true); + expect(integerIdSchema.safeParse('2147483647').success).toBe(true); // PG_INT4_MAX + }); + + it('rejects zero', () => { + expect(integerIdSchema.safeParse('0').success).toBe(false); + }); + + it('rejects negative numbers', () => { + expect(integerIdSchema.safeParse('-1').success).toBe(false); + expect(integerIdSchema.safeParse('-100').success).toBe(false); + }); + + it('rejects non-numeric strings', () => { + expect(integerIdSchema.safeParse('abc').success).toBe(false); + expect(integerIdSchema.safeParse('').success).toBe(false); + }); + + it('rejects leading zeros', () => { + expect(integerIdSchema.safeParse('007').success).toBe(false); + expect(integerIdSchema.safeParse('01').success).toBe(false); + }); + + it('rejects hex format', () => { + expect(integerIdSchema.safeParse('0x10').success).toBe(false); + }); + + it('rejects scientific notation', () => { + expect(integerIdSchema.safeParse('1e2').success).toBe(false); + }); + + it('rejects floats', () => { + expect(integerIdSchema.safeParse('4.0').success).toBe(false); + expect(integerIdSchema.safeParse('3.14').success).toBe(false); + }); + + it('rejects values exceeding PG_INT4_MAX', () => { + expect(integerIdSchema.safeParse('2147483648').success).toBe(false); + expect(integerIdSchema.safeParse('9999999999').success).toBe(false); + }); + + it('rejects whitespace-padded numbers', () => { + expect(integerIdSchema.safeParse(' 42 ').success).toBe(false); + expect(integerIdSchema.safeParse(' 1').success).toBe(false); + }); + + it('coerces valid string to number in output', () => { + const result = integerIdSchema.safeParse('99'); + expect(result.success).toBe(true); + if (result.success) expect(typeof result.data).toBe('number'); + }); +}); + +describe('parseIntegerId', () => { + it('returns the parsed number for a valid id', () => { + expect(parseIntegerId('1')).toBe(1); + expect(parseIntegerId('42')).toBe(42); + expect(parseIntegerId('2147483647')).toBe(2147483647); + }); + + it('returns null for undefined', () => { + expect(parseIntegerId(undefined)).toBeNull(); + }); + + it('returns null for non-numeric strings', () => { + expect(parseIntegerId('abc')).toBeNull(); + expect(parseIntegerId('')).toBeNull(); + }); + + it('returns null for zero', () => { + expect(parseIntegerId('0')).toBeNull(); + }); + + it('returns null for negative numbers', () => { + expect(parseIntegerId('-1')).toBeNull(); + }); + + it('returns null for values exceeding PG_INT4_MAX', () => { + expect(parseIntegerId('2147483648')).toBeNull(); + }); + + it('returns null for leading-zero strings', () => { + expect(parseIntegerId('007')).toBeNull(); + }); + + it('returns null for floats', () => { + expect(parseIntegerId('3.14')).toBeNull(); + }); + + it('returns null for hex-format strings', () => { + expect(parseIntegerId('0x1A')).toBeNull(); + }); + + it('returns null for scientific notation', () => { + expect(parseIntegerId('1e5')).toBeNull(); + }); +}); diff --git a/packages/api/src/utils/__tests__/weight.test.ts b/packages/api/src/utils/__tests__/weight.test.ts index 624e055ecd..0c980a7940 100644 --- a/packages/api/src/utils/__tests__/weight.test.ts +++ b/packages/api/src/utils/__tests__/weight.test.ts @@ -1,4 +1,4 @@ -import type { PackItem } from '@packrat/api/types'; +import type { PackItem } from '@packrat/types'; import { describe, expect, it } from 'vitest'; import { calculateBaseWeight, @@ -17,17 +17,24 @@ function makeItem( return { id: 'item-1', name: 'Test Item', - weight: overrides.weight, - weightUnit: overrides.weightUnit, + description: null, quantity: overrides.quantity ?? 1, + category: null, consumable: overrides.consumable ?? false, worn: overrides.worn ?? false, + image: null, + notes: null, packId: 'pack-1', - userId: 1, - category: 'tools', - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), - }; + catalogItemId: null, + userId: 'user-1', + deleted: false, + isAIGenerated: false, + templateItemId: null, + embedding: null, + createdAt: new Date(), + updatedAt: new Date(), + ...overrides, + } as PackItem; } // --------------------------------------------------------------------------- @@ -35,34 +42,37 @@ function makeItem( // --------------------------------------------------------------------------- describe('convertWeight', () => { it('returns the same value when from === to', () => { - expect(convertWeight(100, 'g', 'g')).toBe(100); - expect(convertWeight(5, 'oz', 'oz')).toBe(5); - expect(convertWeight(2, 'kg', 'kg')).toBe(2); - expect(convertWeight(1, 'lb', 'lb')).toBe(1); + expect(convertWeight({ weight: 100, units: { from: 'g', to: 'g' } })).toBe(100); + expect(convertWeight({ weight: 5, units: { from: 'oz', to: 'oz' } })).toBe(5); + expect(convertWeight({ weight: 2, units: { from: 'kg', to: 'kg' } })).toBe(2); + expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'lb' } })).toBe(1); }); it('converts grams to ounces', () => { - expect(convertWeight(100, 'g', 'oz')).toBeCloseTo(3.53, 1); + expect(convertWeight({ weight: 100, units: { from: 'g', to: 'oz' } })).toBeCloseTo(3.53, 1); }); it('converts ounces to grams', () => { - expect(convertWeight(1, 'oz', 'g')).toBeCloseTo(28.349523125, 8); + expect(convertWeight({ weight: 1, units: { from: 'oz', to: 'g' } })).toBeCloseTo( + 28.349523125, + 8, + ); }); it('converts grams to kilograms', () => { - expect(convertWeight(1000, 'g', 'kg')).toBe(1); + expect(convertWeight({ weight: 1000, units: { from: 'g', to: 'kg' } })).toBe(1); }); it('converts kilograms to grams', () => { - expect(convertWeight(1, 'kg', 'g')).toBe(1000); + expect(convertWeight({ weight: 1, units: { from: 'kg', to: 'g' } })).toBe(1000); }); it('converts grams to pounds', () => { - expect(convertWeight(453.59, 'g', 'lb')).toBeCloseTo(1, 1); + expect(convertWeight({ weight: 453.59, units: { from: 'g', to: 'lb' } })).toBeCloseTo(1, 1); }); it('converts pounds to grams', () => { - expect(convertWeight(1, 'lb', 'g')).toBeCloseTo(453.59237, 4); + expect(convertWeight({ weight: 1, units: { from: 'lb', to: 'g' } })).toBeCloseTo(453.59237, 4); }); }); @@ -71,9 +81,9 @@ describe('convertWeight', () => { // --------------------------------------------------------------------------- describe('formatWeight', () => { it('formats weight with unit', () => { - expect(formatWeight(100, 'g')).toBe('100g'); - expect(formatWeight(3.5, 'oz')).toBe('3.5oz'); - expect(formatWeight(0, 'kg')).toBe('0kg'); + expect(formatWeight({ weight: 100, unit: 'g' })).toBe('100g'); + expect(formatWeight({ weight: 3.5, unit: 'oz' })).toBe('3.5oz'); + expect(formatWeight({ weight: 0, unit: 'kg' })).toBe('0kg'); }); }); @@ -82,28 +92,28 @@ describe('formatWeight', () => { // --------------------------------------------------------------------------- describe('convertToGrams', () => { it('returns the same value for grams', () => { - expect(convertToGrams(100, 'g')).toBe(100); + expect(convertToGrams({ weight: 100, unit: 'g' })).toBe(100); }); it('converts kilograms to grams', () => { - expect(convertToGrams(1, 'kg')).toBe(1000); + expect(convertToGrams({ weight: 1, unit: 'kg' })).toBe(1000); }); it('converts ounces to grams', () => { - expect(convertToGrams(1, 'oz')).toBeCloseTo(28.35, 1); + expect(convertToGrams({ weight: 1, unit: 'oz' })).toBeCloseTo(28.35, 1); }); it('converts pounds to grams', () => { - expect(convertToGrams(1, 'lb')).toBeCloseTo(453.59, 0); + expect(convertToGrams({ weight: 1, unit: 'lb' })).toBeCloseTo(453.59, 0); }); it('returns weight unchanged for unknown units', () => { - expect(convertToGrams(50, 'unknown')).toBe(50); + expect(convertToGrams({ weight: 50, unit: 'unknown' })).toBe(50); }); it('returns weight unchanged for mixed-case units (case-sensitive)', () => { - expect(convertToGrams(1, 'KG')).toBe(1); // unknown → treated as grams passthrough - expect(convertToGrams(1, 'OZ')).toBe(1); + expect(convertToGrams({ weight: 1, unit: 'KG' })).toBe(1); // unknown → treated as grams passthrough + expect(convertToGrams({ weight: 1, unit: 'OZ' })).toBe(1); }); }); @@ -112,12 +122,12 @@ describe('convertToGrams', () => { // --------------------------------------------------------------------------- describe('calculateBaseWeight', () => { it('returns 0 for an empty item list', () => { - expect(calculateBaseWeight([])).toBe(0); + expect(calculateBaseWeight({ items: [] })).toBe(0); }); it('sums non-consumable, non-worn items', () => { const items = [makeItem({ weight: 200, weightUnit: 'g' })]; - expect(calculateBaseWeight(items, 'g')).toBe(200); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(200); }); it('excludes consumable items from base weight', () => { @@ -125,7 +135,7 @@ describe('calculateBaseWeight', () => { makeItem({ weight: 200, weightUnit: 'g', consumable: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateBaseWeight(items, 'g')).toBe(100); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100); }); it('excludes worn items from base weight', () => { @@ -133,12 +143,12 @@ describe('calculateBaseWeight', () => { makeItem({ weight: 200, weightUnit: 'g', worn: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateBaseWeight(items, 'g')).toBe(100); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(100); }); it('accounts for item quantity', () => { const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 3 })]; - expect(calculateBaseWeight(items, 'g')).toBe(300); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(300); }); it('returns 0 when all items are consumable or worn', () => { @@ -146,7 +156,7 @@ describe('calculateBaseWeight', () => { makeItem({ weight: 200, weightUnit: 'g', consumable: true }), makeItem({ weight: 100, weightUnit: 'g', worn: true }), ]; - expect(calculateBaseWeight(items, 'g')).toBe(0); + expect(calculateBaseWeight({ items, unit: 'g' })).toBe(0); }); }); @@ -155,7 +165,7 @@ describe('calculateBaseWeight', () => { // --------------------------------------------------------------------------- describe('calculateTotalWeight', () => { it('returns 0 for an empty item list', () => { - expect(calculateTotalWeight([])).toBe(0); + expect(calculateTotalWeight({ items: [] })).toBe(0); }); it('includes consumable items in total weight', () => { @@ -163,7 +173,7 @@ describe('calculateTotalWeight', () => { makeItem({ weight: 200, weightUnit: 'g', consumable: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateTotalWeight(items, 'g')).toBe(300); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300); }); it('includes worn items in total weight', () => { @@ -171,7 +181,7 @@ describe('calculateTotalWeight', () => { makeItem({ weight: 200, weightUnit: 'g', worn: true }), makeItem({ weight: 100, weightUnit: 'g' }), ]; - expect(calculateTotalWeight(items, 'g')).toBe(300); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(300); }); it('converts mixed weight units correctly', () => { @@ -179,11 +189,11 @@ describe('calculateTotalWeight', () => { makeItem({ weight: 1000, weightUnit: 'g' }), // 1000 g makeItem({ weight: 1, weightUnit: 'kg' }), // 1000 g ]; - expect(calculateTotalWeight(items, 'g')).toBe(2000); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(2000); }); it('accounts for item quantity', () => { const items = [makeItem({ weight: 100, weightUnit: 'g', quantity: 5 })]; - expect(calculateTotalWeight(items, 'g')).toBe(500); + expect(calculateTotalWeight({ items, unit: 'g' })).toBe(500); }); }); diff --git a/packages/api/src/utils/ai/__tests__/logging.test.ts b/packages/api/src/utils/ai/__tests__/logging.test.ts new file mode 100644 index 0000000000..c844d49939 --- /dev/null +++ b/packages/api/src/utils/ai/__tests__/logging.test.ts @@ -0,0 +1,73 @@ +import { describe, expect, it } from 'vitest'; +import type { Env } from '../../env-validation'; +import { logAIRequest } from '../logging'; + +const baseEnv = { + ENVIRONMENT: 'production', + AI_PROVIDER: 'openai', + OPENAI_API_KEY: 'sk-test', + CLOUDFLARE_ACCOUNT_ID: 'test-account', + CLOUDFLARE_AI_GATEWAY_ID: 'test-gateway', + CLOUDFLARE_API_TOKEN: 'cf-token', + AI: {}, +} as Env; + +describe('logAIRequest', () => { + it('records Cloudflare unified billing metadata when Cloudflare config is complete', () => { + const headers = new Headers({ 'cf-aig-log-id': 'log-123' }); + + const log = logAIRequest({ + env: baseEnv, + opts: { + headers, + log: { model: 'gpt-4o' }, + }, + }); + + expect(log).toMatchObject({ + provider: 'openai', + model: 'gpt-4o', + billingPath: 'cloudflare-unified', + cloudflareGatewayId: 'test-gateway', + cloudflareLogId: 'log-123', + }); + }); + + it('records direct provider billing path when Cloudflare config is incomplete', () => { + const log = logAIRequest({ + env: { ...baseEnv, CLOUDFLARE_API_TOKEN: undefined } as Env, + opts: { + headers: new Headers(), + log: { model: 'gpt-4o' }, + }, + }); + + expect(log.billingPath).toBe('direct-provider'); + expect(log.cloudflareGatewayId).toBeUndefined(); + expect(log.cloudflareLogId).toBeUndefined(); + }); + + it('preserves computed billing metadata over caller-provided log fields', () => { + const log = logAIRequest({ + env: baseEnv, + opts: { + headers: new Headers({ 'cf-aig-log-id': 'log-456' }), + log: { + billingPath: 'direct-provider', + provider: 'manual-provider', + model: 'gpt-4o-mini', + timestamp: new Date('2024-01-01T00:00:00.000Z'), + }, + }, + }); + + expect(log).toMatchObject({ + provider: 'openai', + model: 'gpt-4o-mini', + billingPath: 'cloudflare-unified', + cloudflareGatewayId: 'test-gateway', + cloudflareLogId: 'log-456', + }); + expect(log.timestamp.toISOString()).not.toBe('2024-01-01T00:00:00.000Z'); + }); +}); diff --git a/packages/api/src/utils/ai/__tests__/provider.test.ts b/packages/api/src/utils/ai/__tests__/provider.test.ts new file mode 100644 index 0000000000..2daf1d70a5 --- /dev/null +++ b/packages/api/src/utils/ai/__tests__/provider.test.ts @@ -0,0 +1,232 @@ +import { createGoogleGenerativeAI } from '@ai-sdk/google'; +import { createOpenAI } from '@ai-sdk/openai'; +import { createPerplexity } from '@ai-sdk/perplexity'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { + createAIProvider, + createGoogleAIProvider, + createPerplexityAIProvider, + getAIBillingPath, + getGoogleBillingPath, + getPerplexityBillingPath, +} from '../provider'; + +vi.mock('@ai-sdk/google', () => ({ + createGoogleGenerativeAI: vi.fn(() => ({ provider: 'google-ai-studio' })), +})); + +vi.mock('@ai-sdk/openai', () => ({ + createOpenAI: vi.fn(() => ({ provider: 'openai' })), +})); + +vi.mock('@ai-sdk/perplexity', () => ({ + createPerplexity: vi.fn(() => ({ provider: 'perplexity' })), +})); + +const baseConfig = { + provider: 'openai' as const, + openAiApiKey: 'sk-test', + googleApiKey: 'google-test', + perplexityApiKey: 'pplx-test', + cloudflareAccountId: 'test-account', + cloudflareGatewayId: 'test-gateway', + cloudflareApiToken: 'cf-token', + cloudflareAiBinding: {} as never, +}; + +const consoleInfoSpy = vi.spyOn(console, 'info').mockImplementation(() => {}); +const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}); + +describe('createAIProvider', () => { + beforeEach(() => { + vi.clearAllMocks(); + vi.resetModules(); + }); + + it('uses Cloudflare AI Gateway unified billing when Cloudflare config is complete', () => { + createAIProvider(baseConfig); + + expect(createOpenAI).toHaveBeenCalledWith({ + apiKey: 'cf-token', + baseURL: 'https://gateway.ai.cloudflare.com/v1/test-account/test-gateway/openai', + }); + expect(consoleInfoSpy).toHaveBeenCalledWith('ai.provider.selected', { + provider: 'openai', + configuredProvider: 'openai', + billingPath: 'cloudflare-unified', + cloudflareGatewayId: 'test-gateway', + }); + }); + + it('falls back to direct OpenAI when Cloudflare API token is absent', () => { + createAIProvider({ ...baseConfig, cloudflareApiToken: undefined }); + + expect(createOpenAI).toHaveBeenCalledWith({ + apiKey: 'sk-test', + }); + expect(consoleInfoSpy).toHaveBeenCalledWith('ai.provider.selected', { + provider: 'openai', + configuredProvider: 'openai', + billingPath: 'direct-provider', + cloudflareGatewayId: undefined, + }); + }); + + it('throws a direct OpenAI configuration error when neither path is configured', () => { + expect(() => + createAIProvider({ ...baseConfig, cloudflareApiToken: undefined, openAiApiKey: undefined }), + ).toThrow('OpenAI API key is required'); + }); + + it('throws when a non-OpenAI provider is configured for an OpenAI-backed path', () => { + expect(() => createAIProvider({ ...baseConfig, provider: 'cloudflare-workers-ai' })).toThrow( + 'Unsupported AI_PROVIDER "cloudflare-workers-ai"', + ); + + expect(consoleWarnSpy).toHaveBeenCalledWith('ai.provider.unsupported_openai_path', { + configuredProvider: 'cloudflare-workers-ai', + billingPath: 'cloudflare-unified', + }); + }); +}); + +describe('createPerplexityAIProvider', () => { + beforeEach(() => { + vi.clearAllMocks(); + vi.resetModules(); + }); + + it('uses Cloudflare AI Gateway BYOK routing when Cloudflare gateway config is present', () => { + createPerplexityAIProvider(baseConfig); + + expect(createPerplexity).toHaveBeenCalledWith({ + apiKey: 'pplx-test', + baseURL: 'https://gateway.ai.cloudflare.com/v1/test-account/test-gateway/perplexity-ai', + headers: { + 'cf-aig-authorization': 'Bearer cf-token', + }, + }); + expect(consoleInfoSpy).toHaveBeenCalledWith('ai.provider.selected', { + provider: 'perplexity', + billingPath: 'cloudflare-gateway-byok', + cloudflareGatewayId: 'test-gateway', + }); + }); + + it('falls back to direct Perplexity when Cloudflare gateway config is absent', () => { + createPerplexityAIProvider({ + ...baseConfig, + cloudflareAccountId: undefined, + cloudflareGatewayId: undefined, + }); + + expect(createPerplexity).toHaveBeenCalledWith({ + apiKey: 'pplx-test', + }); + }); + + it('falls back to direct Perplexity when Cloudflare API token is absent', () => { + createPerplexityAIProvider({ + ...baseConfig, + cloudflareApiToken: undefined, + }); + + expect(createPerplexity).toHaveBeenCalledWith({ + apiKey: 'pplx-test', + }); + }); + + it('throws when the Perplexity key is absent', () => { + expect(() => + createPerplexityAIProvider({ + ...baseConfig, + perplexityApiKey: undefined, + }), + ).toThrow('PERPLEXITY_API_KEY is required'); + }); +}); + +describe('createGoogleAIProvider', () => { + beforeEach(() => { + vi.clearAllMocks(); + vi.resetModules(); + }); + + it('uses Cloudflare AI Gateway unified billing when Cloudflare config is complete', () => { + createGoogleAIProvider(baseConfig); + + expect(createGoogleGenerativeAI).toHaveBeenCalledWith({ + apiKey: 'cf-token', + baseURL: 'https://gateway.ai.cloudflare.com/v1/test-account/test-gateway/google-ai-studio', + }); + expect(consoleInfoSpy).toHaveBeenCalledWith('ai.provider.selected', { + provider: 'google-ai-studio', + billingPath: 'cloudflare-unified', + cloudflareGatewayId: 'test-gateway', + }); + }); + + it('falls back to direct Google AI Studio when Cloudflare API token is absent', () => { + createGoogleAIProvider({ ...baseConfig, cloudflareApiToken: undefined }); + + expect(createGoogleGenerativeAI).toHaveBeenCalledWith({ + apiKey: 'google-test', + }); + expect(consoleInfoSpy).toHaveBeenCalledWith('ai.provider.selected', { + provider: 'google-ai-studio', + configuredProvider: undefined, + billingPath: 'direct-provider', + cloudflareGatewayId: undefined, + }); + }); + + it('throws a Google configuration error when neither path is configured', () => { + expect(() => + createGoogleAIProvider({ + ...baseConfig, + cloudflareApiToken: undefined, + googleApiKey: undefined, + }), + ).toThrow('Google Generative AI API key is required'); + }); +}); + +describe('getAIBillingPath', () => { + it('returns cloudflare-unified when Cloudflare account, gateway, and token are present', () => { + expect(getAIBillingPath(baseConfig)).toBe('cloudflare-unified'); + }); + + it('returns direct-provider when Cloudflare config is incomplete', () => { + expect(getAIBillingPath({ ...baseConfig, cloudflareGatewayId: '' })).toBe('direct-provider'); + }); +}); + +describe('getPerplexityBillingPath', () => { + it('returns cloudflare-gateway-byok when Cloudflare gateway config is present', () => { + expect(getPerplexityBillingPath(baseConfig)).toBe('cloudflare-gateway-byok'); + }); + + it('returns direct-provider when Cloudflare gateway config is incomplete', () => { + expect(getPerplexityBillingPath({ ...baseConfig, cloudflareAccountId: undefined })).toBe( + 'direct-provider', + ); + }); + + it('returns direct-provider when Cloudflare API token is absent', () => { + expect(getPerplexityBillingPath({ ...baseConfig, cloudflareApiToken: undefined })).toBe( + 'direct-provider', + ); + }); +}); + +describe('getGoogleBillingPath', () => { + it('returns cloudflare-unified when Cloudflare account, gateway, and token are present', () => { + expect(getGoogleBillingPath(baseConfig)).toBe('cloudflare-unified'); + }); + + it('returns direct-provider when Cloudflare config is incomplete', () => { + expect(getGoogleBillingPath({ ...baseConfig, cloudflareApiToken: undefined })).toBe( + 'direct-provider', + ); + }); +}); diff --git a/packages/api/src/utils/ai/logging.ts b/packages/api/src/utils/ai/logging.ts index a93e57b87d..3c2b93347c 100644 --- a/packages/api/src/utils/ai/logging.ts +++ b/packages/api/src/utils/ai/logging.ts @@ -1,9 +1,11 @@ -import type { Env } from '@packrat/api/types/env'; -import { extractCloudflareLogId } from './provider'; +import type { Env } from '@packrat/api/utils/env-validation'; +import { type AIBillingPath, extractCloudflareLogId, getAIBillingPath } from './provider'; export interface AIRequestLog { provider: string; model: string; + billingPath: AIBillingPath; + cloudflareGatewayId?: string; cloudflareLogId?: string | null; timestamp: Date; userId?: string; @@ -11,20 +13,32 @@ export interface AIRequestLog { error?: string; } -export function logAIRequest( - env: Env, - opts: { headers: Headers; log: Partial }, -): AIRequestLog { +export function logAIRequest({ + env, + opts, +}: { + env: Env; + opts: { headers: Headers; log: Partial }; +}): AIRequestLog { const { headers, log: options } = opts; + const billingPath = getAIBillingPath({ + openAiApiKey: env.OPENAI_API_KEY, + cloudflareAccountId: env.CLOUDFLARE_ACCOUNT_ID, + cloudflareGatewayId: env.CLOUDFLARE_AI_GATEWAY_ID, + cloudflareApiToken: env.CLOUDFLARE_API_TOKEN, + cloudflareAiBinding: env.AI, + }); const log: AIRequestLog = { + ...options, provider: env.AI_PROVIDER || 'openai', model: options.model || 'gpt-4o', + billingPath, timestamp: new Date(), - ...options, }; // Extract Cloudflare log ID if using Cloudflare Gateway - if (env.AI_PROVIDER === 'cloudflare-workers-ai') { + if (billingPath === 'cloudflare-unified') { + log.cloudflareGatewayId = env.CLOUDFLARE_AI_GATEWAY_ID; log.cloudflareLogId = extractCloudflareLogId(headers); } diff --git a/packages/api/src/utils/ai/provider.ts b/packages/api/src/utils/ai/provider.ts index c7d4cfcccb..de453de25f 100644 --- a/packages/api/src/utils/ai/provider.ts +++ b/packages/api/src/utils/ai/provider.ts @@ -1,14 +1,18 @@ +import { createGoogleGenerativeAI, type GoogleGenerativeAIProvider } from '@ai-sdk/google'; import type { OpenAIProvider } from '@ai-sdk/openai'; import { createOpenAI } from '@ai-sdk/openai'; -import type { Env } from '@packrat/api/types/env'; -// import type { createWorkersAI } from 'workers-ai-provider'; +import { createPerplexity, type PerplexityProvider } from '@ai-sdk/perplexity'; +import type { Env } from '@packrat/api/utils/env-validation'; export type AIProvider = 'openai' | 'cloudflare-workers-ai'; interface BaseProviderConfig { - openAiApiKey: string; - cloudflareAccountId: string; - cloudflareGatewayId: string; + openAiApiKey?: string; + googleApiKey?: string; + perplexityApiKey?: string; + cloudflareAccountId?: string; + cloudflareGatewayId?: string; + cloudflareApiToken?: string; cloudflareAiBinding: Env['AI']; } @@ -22,45 +26,163 @@ interface WorkersAIProviderConfig extends BaseProviderConfig { export type AIProviderConfig = OpenAIProviderConfig | WorkersAIProviderConfig; -// Define return type for Workers AI -// type WorkersAIProvider = ReturnType; - type CreateAIProviderReturn = OpenAIProvider; +export type ProviderBillingPath = + | 'cloudflare-unified' + | 'cloudflare-gateway-byok' + | 'direct-provider'; +export type AIBillingPath = Extract; +export type GoogleBillingPath = AIBillingPath; + +export function getAIBillingPath(config: BaseProviderConfig): AIBillingPath { + if (config.cloudflareAccountId && config.cloudflareGatewayId && config.cloudflareApiToken) { + return 'cloudflare-unified'; + } + + return 'direct-provider'; +} + +export function getGoogleBillingPath(config: BaseProviderConfig): GoogleBillingPath { + if (config.cloudflareAccountId && config.cloudflareGatewayId && config.cloudflareApiToken) { + return 'cloudflare-unified'; + } + + return 'direct-provider'; +} + +const providerSelectionLogKeys = new Set(); + +function logProviderSelectionOnce({ + provider, + billingPath, + cloudflareGatewayId, + configuredProvider, +}: { + provider: string; + billingPath: string; + cloudflareGatewayId?: string; + configuredProvider?: string; +}): void { + const logKey = `${provider}:${configuredProvider ?? provider}:${billingPath}:${cloudflareGatewayId ?? ''}`; + if (providerSelectionLogKeys.has(logKey)) return; + providerSelectionLogKeys.add(logKey); + + console.info('ai.provider.selected', { + provider, + configuredProvider, + billingPath, + cloudflareGatewayId, + }); +} + // Function to create an AI provider based on the config export function createAIProvider(config: AIProviderConfig): CreateAIProviderReturn { - const { openAiApiKey, provider, cloudflareAccountId, cloudflareGatewayId } = config; + const { openAiApiKey, provider, cloudflareAccountId, cloudflareGatewayId, cloudflareApiToken } = + config; + const billingPath = getAIBillingPath(config); - // All providers go through Cloudflare Gateway if configured - if (!cloudflareAccountId || !cloudflareGatewayId) { - throw new Error('Cloudflare account ID and gateway ID are required'); + if (provider !== 'openai') { + console.warn('ai.provider.unsupported_openai_path', { + configuredProvider: provider, + billingPath, + }); + throw new Error(`Unsupported AI_PROVIDER "${provider}" for OpenAI-backed provider path`); } - // Route through Cloudflare AI Gateway based on provider - if (provider === 'cloudflare-workers-ai') { - // Future: When adding Cloudflare Workers AI support - // return createWorkersAI({ - // baseURL: `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareGatewayId}/workers-ai`, - // }); + logProviderSelectionOnce({ + provider: 'openai', + billingPath, + cloudflareGatewayId: billingPath === 'cloudflare-unified' ? cloudflareGatewayId : undefined, + configuredProvider: provider, + }); - // For now, continue using OpenAI through gateway + if (billingPath === 'cloudflare-unified') { return createOpenAI({ - apiKey: openAiApiKey, + apiKey: cloudflareApiToken, baseURL: `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareGatewayId}/openai`, }); } - // OpenAI through Cloudflare Gateway if (!openAiApiKey) { - throw new Error('OpenAI API key is required for OpenAI provider'); + throw new Error( + 'OpenAI API key is required when Cloudflare AI Gateway unified billing is not configured', + ); } + // Direct OpenAI fallback for local development and emergency rollback. return createOpenAI({ apiKey: openAiApiKey, - baseURL: `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareGatewayId}/openai`, }); } +export function createGoogleAIProvider(config: BaseProviderConfig): GoogleGenerativeAIProvider { + const { googleApiKey, cloudflareAccountId, cloudflareGatewayId, cloudflareApiToken } = config; + const billingPath = getGoogleBillingPath(config); + + logProviderSelectionOnce({ + provider: 'google-ai-studio', + billingPath, + cloudflareGatewayId: billingPath === 'cloudflare-unified' ? cloudflareGatewayId : undefined, + }); + + if (billingPath === 'cloudflare-unified') { + return createGoogleGenerativeAI({ + apiKey: cloudflareApiToken, + baseURL: `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareGatewayId}/google-ai-studio`, + }); + } + + if (!googleApiKey) { + throw new Error( + 'Google Generative AI API key is required when Cloudflare AI Gateway unified billing is not configured', + ); + } + + return createGoogleGenerativeAI({ apiKey: googleApiKey }); +} + +export type PerplexityBillingPath = Extract< + ProviderBillingPath, + 'cloudflare-gateway-byok' | 'direct-provider' +>; + +export function getPerplexityBillingPath(config: BaseProviderConfig): PerplexityBillingPath { + if (config.cloudflareAccountId && config.cloudflareGatewayId && config.cloudflareApiToken) { + return 'cloudflare-gateway-byok'; + } + + return 'direct-provider'; +} + +export function createPerplexityAIProvider(config: BaseProviderConfig): PerplexityProvider { + const { perplexityApiKey, cloudflareAccountId, cloudflareGatewayId, cloudflareApiToken } = config; + const billingPath = getPerplexityBillingPath(config); + + if (!perplexityApiKey) { + throw new Error('PERPLEXITY_API_KEY is required for Perplexity search'); + } + + logProviderSelectionOnce({ + provider: 'perplexity', + billingPath, + cloudflareGatewayId: + billingPath === 'cloudflare-gateway-byok' ? cloudflareGatewayId : undefined, + }); + + if (billingPath === 'cloudflare-gateway-byok') { + return createPerplexity({ + apiKey: perplexityApiKey, + baseURL: `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareGatewayId}/perplexity-ai`, + headers: { + 'cf-aig-authorization': `Bearer ${cloudflareApiToken}`, + }, + }); + } + + return createPerplexity({ apiKey: perplexityApiKey }); +} + export function extractCloudflareLogId(headers: Headers): string | null { return headers.get('cf-aig-log-id'); } diff --git a/packages/api/src/utils/ai/tools.ts b/packages/api/src/utils/ai/tools.ts index 9b0e30c4c6..9a581e1bb1 100644 --- a/packages/api/src/utils/ai/tools.ts +++ b/packages/api/src/utils/ai/tools.ts @@ -1,17 +1,9 @@ -import { - AIService, - CatalogService, - PackItemService, - PackService, - WeatherService, -} from '@packrat/api/services'; +import { AIService, CatalogService, WeatherService } from '@packrat/api/services'; import { executeSqlAiTool } from '@packrat/api/services/executeSqlAiTool'; import { tool } from 'ai'; import { z } from 'zod'; export function createTools(userId: string) { - const packService = new PackService(userId); - const packItemService = new PackItemService(userId); const weatherService = new WeatherService(); const catalogService = new CatalogService(); const aiService = new AIService(); @@ -19,49 +11,18 @@ export function createTools(userId: string) { return { getPackDetails: tool({ description: - 'Get detailed information about a specific pack including all items, weights, and categories.', + 'Get detailed information about a specific pack including all items, weights, and categories. Executed client-side from local device data.', inputSchema: z.object({ packId: z.string().describe('The ID of the pack to get details for'), }), - execute: async ({ packId }) => { - try { - const pack = await packService.getPackDetails(packId); - if (!pack) return { success: false, error: 'Pack not found' }; - - const categories = Array.from( - new Set(pack.items.map((item) => item.category || 'Uncategorized')), - ); - - return { success: true, data: { ...pack, categories } }; - } catch (error) { - console.error('getPackDetails tool error', error); - return { - success: false, - error: error instanceof Error ? error.message : 'Failed to get pack details', - }; - } - }, }), getPackItemDetails: tool({ description: - 'Get detailed information about a specific item in a pack including its catalog details.', + 'Get detailed information about a specific item in a pack including its catalog details. Executed client-side from local device data.', inputSchema: z.object({ itemId: z.string().describe('The ID of the item to get details for'), }), - execute: async ({ itemId }) => { - try { - const item = await packItemService.getPackItemDetails(itemId); - if (!item) return { success: false, error: 'Item not found' }; - return { success: true, data: item }; - } catch (error) { - console.error('getPackItemDetails tool error', error); - return { - success: false, - error: error instanceof Error ? error.message : 'Failed to get item details', - }; - } - }, }), getWeatherForLocation: tool({ @@ -132,9 +93,12 @@ export function createTools(userId: string) { }), execute: async ({ query, limit, offset }) => { try { - const data = await catalogService.vectorSearch(query, { - limit: limit || 10, - offset: offset || 0, + const data = await catalogService.vectorSearch({ + q: query, + opts: { + limit: limit || 10, + offset: offset || 0, + }, }); return { success: true, data }; } catch (error) { @@ -161,7 +125,10 @@ export function createTools(userId: string) { }), execute: async ({ query, limit }) => { try { - const results = await aiService.searchPackratOutdoorGuidesRAG(query, limit || 5); + const results = await aiService.searchPackratOutdoorGuidesRAG({ + query, + limit: limit || 5, + }); return { success: true, data: results }; } catch (error) { console.error('searchPackratOutdoorGuidesRAG', error); diff --git a/packages/api/src/utils/auth.ts b/packages/api/src/utils/auth.ts index 3a9aca74da..db52d5b493 100644 --- a/packages/api/src/utils/auth.ts +++ b/packages/api/src/utils/auth.ts @@ -5,7 +5,13 @@ export async function hashPassword(password: string): Promise { return bcrypt.hash(password, 10); } -export async function verifyPassword(password: string, hash: string): Promise { +export async function verifyPassword({ + password, + hash, +}: { + password: string; + hash: string; +}): Promise { return bcrypt.compare(password, hash); } @@ -14,7 +20,7 @@ export async function verifyPassword(password: string, hash: string): Promise { +export const computePackWeights = ({ + pack, + preferredUnit = 'g', +}: { + pack: PackWithItems; + preferredUnit?: WeightUnit; +}): PackWithItems & { baseWeight: number; totalWeight: number } => { if (!pack.items) { throw new Error(`Pack with ID ${pack.id} has no items`); } @@ -15,7 +18,8 @@ export const computePackWeights = ( for (const item of pack.items) { const itemWeightInGrams = - normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity; + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity; totalWeightGrams += itemWeightInGrams; if (!item.consumable && !item.worn) { baseWeightGrams += itemWeightInGrams; @@ -24,13 +28,93 @@ export const computePackWeights = ( return { ...pack, - baseWeight: displayWeight(baseWeightGrams, preferredUnit), - totalWeight: displayWeight(totalWeightGrams, preferredUnit), + baseWeight: displayWeight({ grams: baseWeightGrams, unit: preferredUnit }), + totalWeight: displayWeight({ grams: totalWeightGrams, unit: preferredUnit }), }; }; -export const computePacksWeights = ( - packs: PackWithItems[], - preferredUnit: WeightUnit = 'g', -): (PackWithItems & { baseWeight: number; totalWeight: number })[] => - packs.map((pack) => computePackWeights(pack, preferredUnit)); +export const computePacksWeights = ({ + packs, + preferredUnit = 'g', +}: { + packs: PackWithItems[]; + preferredUnit?: WeightUnit; +}): (PackWithItems & { baseWeight: number; totalWeight: number })[] => + packs.map((pack) => computePackWeights({ pack, preferredUnit })); + +export interface PackCategoryBreakdown { + category: string; + totalGrams: number; + totalLbs: number; + itemCount: number; + items: string[]; +} + +export interface PackWeightBreakdown { + packId: string; + totalGrams: number; + baseGrams: number; + wornGrams: number; + consumableGrams: number; + itemCount: number; + byCategory: PackCategoryBreakdown[]; +} + +const GRAMS_PER_LB = 453.592; + +/** + * Full weight breakdown including worn/consumable totals and a per-category + * grouping sorted heaviest first. Replaces ad-hoc breakdowns the edge apps + * were computing client-side. + */ +export const computePackBreakdown = (pack: PackWithItems): PackWeightBreakdown => { + if (!pack.items) { + throw new Error(`Pack with ID ${pack.id} has no items`); + } + + let totalGrams = 0; + let baseGrams = 0; + let wornGrams = 0; + let consumableGrams = 0; + const byCategory: Record = {}; + + for (const item of pack.items) { + const itemGrams = + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity; + totalGrams += itemGrams; + if (item.worn) wornGrams += itemGrams; + if (item.consumable) consumableGrams += itemGrams; + if (!item.worn && !item.consumable) baseGrams += itemGrams; + + const cat = item.category || 'Uncategorized'; + const entry = byCategory[cat] ?? { + category: cat, + totalGrams: 0, + totalLbs: 0, + itemCount: 0, + items: [], + }; + entry.totalGrams += itemGrams; + entry.itemCount += item.quantity; + entry.items.push(`${item.name} (${item.weight}${item.weightUnit ?? 'g'} × ${item.quantity})`); + byCategory[cat] = entry; + } + + for (const entry of Object.values(byCategory)) { + entry.totalLbs = Math.round((entry.totalGrams / GRAMS_PER_LB) * 100) / 100; + } + + // Quantity-aware so the top-level total matches the sum of byCategory + // itemCount values (a pack with `qty: 3` of a single row counts as 3). + const itemCount = pack.items.reduce((sum, item) => sum + item.quantity, 0); + return { + packId: pack.id, + totalGrams: Math.round(totalGrams), + baseGrams: Math.round(baseGrams), + wornGrams: Math.round(wornGrams), + consumableGrams: Math.round(consumableGrams), + itemCount, + byCategory: Object.values(byCategory).sort((a, b) => b.totalGrams - a.totalGrams), + }; +}; diff --git a/packages/api/src/utils/csv-utils.ts b/packages/api/src/utils/csv-utils.ts index a6e1e0a688..43daf4deb4 100644 --- a/packages/api/src/utils/csv-utils.ts +++ b/packages/api/src/utils/csv-utils.ts @@ -1,6 +1,6 @@ +import type { NewCatalogItem } from '@packrat/db'; import { isString } from '@packrat/guards'; -import type { NewCatalogItem } from '../db/schema'; -import { AvailabilitySchema, WeightUnitSchema } from '../types'; +import { AvailabilitySchema, WeightUnitSchema } from '@packrat/schemas/constants'; // ── CSV sanitization regex constants ── const NEWLINE_CHARS = /[\r\n]+/g; @@ -96,7 +96,7 @@ export function mapCsvRowToItem({ const weightStr = fieldMap.weight !== undefined ? values[fieldMap.weight] : undefined; const unitStr = fieldMap.weightUnit !== undefined ? values[fieldMap.weightUnit] : undefined; if (weightStr && parseFloat(weightStr) > 0) { - const { weight, unit } = parseWeight(weightStr, unitStr); + const { weight, unit } = parseWeight({ weightStr, unitStr }); item.weight = weight || undefined; const parsedUnit = WeightUnitSchema.safeParse(unit); item.weightUnit = parsedUnit.success ? parsedUnit.data : undefined; @@ -161,7 +161,7 @@ export function mapCsvRowToItem({ if (!item.weight && !Array.isArray(parsed)) { const claimedWeight = parsed['Claimed Weight'] || parsed.weight; if (claimedWeight) { - const { weight, unit } = parseWeight(claimedWeight); + const { weight, unit } = parseWeight({ weightStr: claimedWeight }); item.weight = weight || undefined; const parsedUnit = WeightUnitSchema.safeParse(unit); item.weightUnit = parsedUnit.success ? parsedUnit.data : undefined; @@ -207,10 +207,10 @@ export function mapCsvRowToItem({ return item; } -export function parseWeight( - weightStr: string, - unitStr?: string, -): { weight: number | null; unit: string | null } { +export function parseWeight({ weightStr, unitStr }: { weightStr: string; unitStr?: string }): { + weight: number | null; + unit: string | null; +} { if (!weightStr) return { weight: null, unit: null }; const weightVal = parseFloat(weightStr); diff --git a/packages/api/src/utils/embeddingHelper.ts b/packages/api/src/utils/embeddingHelper.ts index e937afb344..be6aa9e37d 100644 --- a/packages/api/src/utils/embeddingHelper.ts +++ b/packages/api/src/utils/embeddingHelper.ts @@ -1,11 +1,14 @@ -import type { CatalogItem, PackItem } from '../db/schema'; +import type { CatalogItem, PackItem } from '@packrat/db'; type ItemForEmbedding = Partial | Partial; -export const getEmbeddingText = ( - item: ItemForEmbedding, - existingItem?: Partial | Partial, -): string => { +export const getEmbeddingText = ({ + item, + existingItem, +}: { + item: ItemForEmbedding; + existingItem?: Partial | Partial; +}): string => { const embeddingInput = [ item.name, item.description, diff --git a/packages/api/src/utils/env-validation.ts b/packages/api/src/utils/env-validation.ts index 9c2028d65b..92631749d1 100644 --- a/packages/api/src/utils/env-validation.ts +++ b/packages/api/src/utils/env-validation.ts @@ -3,10 +3,11 @@ import { isObject } from '@packrat/guards'; import { z } from 'zod'; // Define the Zod schema for all environment variables -export const apiEnvSchema = z.object({ +export const apiEnvObjectSchema = z.object({ // Environment & Deployment ENVIRONMENT: z.enum(['development', 'production']).default('production'), - SENTRY_DSN: z.string().url(), + SENTRY_DSN: z.string().url().optional(), + SENTRY_RELEASE: z.string().optional(), // Database NEON_DATABASE_URL: z.string().url(), @@ -57,7 +58,8 @@ export const apiEnvSchema = z.object({ // Cloudflare R2 Storage (config values) CLOUDFLARE_ACCOUNT_ID: z.string(), - CLOUDFLARE_AI_GATEWAY_ID: z.string(), + CLOUDFLARE_AI_GATEWAY_ID: z.string().optional(), + CLOUDFLARE_API_TOKEN: z.string().min(1).optional(), R2_ACCESS_KEY_ID: z.string(), R2_SECRET_ACCESS_KEY: z.string(), PACKRAT_BUCKET_R2_BUCKET_NAME: z.string(), @@ -92,8 +94,10 @@ export const apiEnvSchema = z.object({ AUTH_KV: z.unknown(), }); +export const apiEnvSchema = apiEnvObjectSchema; + // Relaxed schema for test environments -const testEnvSchema = apiEnvSchema.partial().extend({ +const testEnvSchema = apiEnvObjectSchema.partial().extend({ ENVIRONMENT: z.enum(['development', 'production']).default('development'), SENTRY_DSN: z.string().url().optional().default('https://test@test.ingest.sentry.io/test'), NEON_DATABASE_URL: z.string().optional().default('postgres://user:pass@localhost/db'), @@ -144,6 +148,8 @@ export type ValidatedEnv = Omit< AUTH_KV: KVNamespace; }; +export type Env = ValidatedEnv; + // Cache for validated envs keyed by the raw env reference. const envCache = new WeakMap(); diff --git a/packages/api/src/utils/itemCalculations.ts b/packages/api/src/utils/itemCalculations.ts index c664b9cf20..c65eaa63cf 100644 --- a/packages/api/src/utils/itemCalculations.ts +++ b/packages/api/src/utils/itemCalculations.ts @@ -1,4 +1,5 @@ -import type { CatalogItem, PackItem, WeightUnit } from '@packrat/api/types'; +import type { WeightUnit } from '@packrat/constants'; +import type { CatalogItem, PackItem } from '@packrat/types'; /** * Checks if an item is a pack item @@ -32,7 +33,7 @@ export function getWeightUnit(item: CatalogItem | PackItem): WeightUnit { } /** Gets the notes of an item */ -export function getNotes(item: CatalogItem | PackItem): string | undefined { +export function getNotes(item: CatalogItem | PackItem): string | null | undefined { return isPackItem(item) ? item.notes : undefined; } @@ -68,5 +69,5 @@ export function isWorn(item: CatalogItem | PackItem): boolean { * Check if the item has a notes field */ export function hasNotes(item: CatalogItem | PackItem): boolean { - return 'notes' in item && item.notes !== undefined && item.notes !== ''; + return 'notes' in item && item.notes != null && item.notes !== ''; } diff --git a/packages/api/src/utils/routeParams.ts b/packages/api/src/utils/routeParams.ts index b69f85c6da..d4a85184b2 100644 --- a/packages/api/src/utils/routeParams.ts +++ b/packages/api/src/utils/routeParams.ts @@ -7,7 +7,7 @@ const PG_INT4_MAX = 2_147_483_647; // Accept only a digits-only string starting with 1-9 so `Number()`-accepted // forms like `0x10`, `1e2`, ` 42 `, `4.0`, and leading-zero `007` are rejected. -// Pipe into z.coerce.number for the int range check. +// Piped into z.coerce.number via .pipe() for the int range check. export const integerIdSchema = z .string() .regex(/^[1-9]\d*$/) diff --git a/packages/api/src/utils/sentry.ts b/packages/api/src/utils/sentry.ts new file mode 100644 index 0000000000..04bb5114c1 --- /dev/null +++ b/packages/api/src/utils/sentry.ts @@ -0,0 +1,73 @@ +/** + * Sentry helpers for the PackRat API (Cloudflare Workers). + * + * `withSentry` in index.ts initialises Sentry per-request via AsyncLocalStorage, + * so every function here safely operates on the current request scope. + */ + +import { + addBreadcrumb, + captureException, + captureMessage, + setUser, + withScope, +} from '@sentry/cloudflare'; + +export { addBreadcrumb, captureException, captureMessage, setUser, withScope }; + +export type SentryOperationContext = { + operation: string; + userId?: string; + tags?: Record; + extra?: Record; +}; + +/** + * Capture an exception with structured operation context. + * Logs to console as well so wrangler dev output is still useful. + */ +export function captureApiException(opts: { error: unknown } & SentryOperationContext): void { + const { error, operation, userId, tags, extra } = opts; + + withScope((scope) => { + scope.setTag('operation', operation); + // Use a tag for userId rather than setUser to avoid overwriting richer + // user context (email/role) already set on the scope by setApiUser. + if (userId) scope.setTag('user_id', userId); + if (tags) { + for (const [k, v] of Object.entries(tags)) scope.setTag(k, v); + } + if (extra) { + for (const [k, v] of Object.entries(extra)) scope.setExtra(k, v); + } + captureException(error); + }); + + console.error(`[sentry][${operation}]`, error); +} + +/** + * Add a structured breadcrumb. Falls back gracefully when Sentry is not init. + */ +export function apiAddBreadcrumb(opts: { + category: string; + message: string; + level?: 'debug' | 'info' | 'warning' | 'error'; + data?: Record; +}): void { + addBreadcrumb({ type: 'default', ...opts }); +} + +/** + * Set the authenticated user on the current request scope. + */ +export function setApiUser(user: { id: string; email: string; role: string }): void { + setUser({ id: user.id, email: user.email, username: user.role }); +} + +/** + * Clear user context (e.g. on sign-out or 401). + */ +export function clearApiUser(): void { + setUser(null); +} diff --git a/packages/api/src/utils/weight.ts b/packages/api/src/utils/weight.ts index d3f8543067..2d1f7a0159 100644 --- a/packages/api/src/utils/weight.ts +++ b/packages/api/src/utils/weight.ts @@ -1,29 +1,46 @@ -import type { PackItem } from '@packrat/api/types'; +import type { PackItem } from '@packrat/types'; import type { WeightUnit } from '@packrat/units'; import { convert, displayWeight, fromGrams, normalize, parseWeightUnit } from '@packrat/units'; export { fromGrams as convertFromGrams, convert as convertWeight }; -export const convertToGrams = (weight: number, unit: string): number => - normalize(weight, parseWeightUnit(unit)); +export const convertToGrams = ({ weight, unit }: { weight: number; unit: string }): number => + normalize({ weight, unit: parseWeightUnit({ value: unit }) }); -export const formatWeight = (weight: number, unit: WeightUnit): string => `${weight}${unit}`; +export const formatWeight = ({ weight, unit }: { weight: number; unit: WeightUnit }): string => + `${weight}${unit}`; -export const calculateBaseWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => { +export const calculateBaseWeight = ({ + items, + unit = 'g', +}: { + items: PackItem[]; + unit?: WeightUnit; +}): number => { const grams = items .filter((item) => !item.consumable && !item.worn) .reduce( (total, item) => - total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity, + total + + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity, 0, ); - return displayWeight(grams, unit); + return displayWeight({ grams, unit }); }; -export const calculateTotalWeight = (items: PackItem[], unit: WeightUnit = 'g'): number => { +export const calculateTotalWeight = ({ + items, + unit = 'g', +}: { + items: PackItem[]; + unit?: WeightUnit; +}): number => { const grams = items.reduce( (total, item) => - total + normalize(item.weight, parseWeightUnit(item.weightUnit)) * item.quantity, + total + + normalize({ weight: item.weight, unit: parseWeightUnit({ value: item.weightUnit }) }) * + item.quantity, 0, ); - return displayWeight(grams, unit); + return displayWeight({ grams, unit }); }; diff --git a/packages/api/test/auth.test.ts b/packages/api/test/auth.test.ts index ae24d04299..c41a242647 100644 --- a/packages/api/test/auth.test.ts +++ b/packages/api/test/auth.test.ts @@ -22,8 +22,8 @@ import { drizzleAdapter } from '@better-auth/drizzle-adapter'; import { getAuth } from '@packrat/api/auth'; import { createDb } from '@packrat/api/db'; -import * as schema from '@packrat/api/db/schema'; import { authPlugin } from '@packrat/api/middleware/auth'; +import * as schema from '@packrat/db/schema'; import { betterAuth } from 'better-auth'; import { bearer, jwt } from 'better-auth/plugins'; import { eq } from 'drizzle-orm'; diff --git a/packages/api/test/chat.test.ts b/packages/api/test/chat.test.ts index 391ee405ac..45beb0e674 100644 --- a/packages/api/test/chat.test.ts +++ b/packages/api/test/chat.test.ts @@ -49,7 +49,7 @@ describe('Chat Routes', () => { // Rate limiting is not implemented on /chat yet — keeping a placeholder for // when it is so we don't forget to cover it. Skip for now to avoid noise. - describe.skip('Rate Limiting (TODO: once implemented)', () => { + describe('Rate Limiting', () => { it('caps concurrent requests', async () => { const requests = Array(5) .fill(null) diff --git a/packages/api/test/db-test-helper.ts b/packages/api/test/db-test-helper.ts index 277a6f9f75..a94113e251 100644 --- a/packages/api/test/db-test-helper.ts +++ b/packages/api/test/db-test-helper.ts @@ -1,6 +1,6 @@ +import * as schema from '@packrat/db/schema'; import { drizzle } from 'drizzle-orm/node-postgres'; import { Client } from 'pg'; -import * as schema from '../src/db/schema'; // Create a PostgreSQL client for testing export const createTestDbConnection = () => { diff --git a/packages/api/test/etl.test.ts b/packages/api/test/etl.test.ts new file mode 100644 index 0000000000..0f1baa0539 --- /dev/null +++ b/packages/api/test/etl.test.ts @@ -0,0 +1,258 @@ +import { createDbClient } from '@packrat/api/db'; +import { processCatalogETL } from '@packrat/api/services/etl/processCatalogEtl'; +import { processValidItemsBatch } from '@packrat/api/services/etl/processValidItemsBatch'; +import { R2BucketService } from '@packrat/api/services/r2-bucket'; +import { catalogItems, etlJobs, invalidItemLogs } from '@packrat/db'; +import { count, eq } from 'drizzle-orm'; +import { describe, expect, it, vi } from 'vitest'; + +// ── CSV helpers ─────────────────────────────────────────────────────────────── + +const CSV_HEADER = 'name,sku,productUrl,brand,price,weight,weightUnit\n'; +const CSV_ROW = (i: number) => + `Test Item ${i},SKU-${i},https://example.com/item-${i},TestBrand,49.99,500,g\n`; + +function makeCsv(rows: number): string { + return CSV_HEADER + Array.from({ length: rows }, (_, i) => CSV_ROW(i)).join(''); +} + +function makeReadableStream(text: string): ReadableStream { + const encoder = new TextEncoder(); + const bytes = encoder.encode(text); + return new ReadableStream({ + start(controller) { + controller.enqueue(bytes); + controller.close(); + }, + }); +} + +// ── Mock R2BucketService to return a CSV stream ─────────────────────────────── + +function mockR2WithCsv(csv: string) { + vi.mocked(R2BucketService).mockImplementationOnce( + () => + ({ + get: vi.fn().mockResolvedValue({ body: makeReadableStream(csv) }), + }) as any, + ); +} + +function mockR2WithNull() { + vi.mocked(R2BucketService).mockImplementationOnce( + () => + ({ + get: vi.fn().mockResolvedValue(null), + }) as any, + ); +} + +// ── DB helpers ──────────────────────────────────────────────────────────────── + +async function insertJob(jobId: string) { + const db = createDbClient({} as any); + await db.insert(etlJobs).values({ + id: jobId, + status: 'running', + source: 'test', + filename: 'test.csv', + scraperRevision: 'abc123', + startedAt: new Date(), + }); +} + +async function getJob(jobId: string) { + const db = createDbClient({} as any); + const rows = await db.select().from(etlJobs).where(eq(etlJobs.id, jobId)); + return rows[0]; +} + +// minimal env — createDbClient and R2BucketService are both globally mocked +const TEST_ENV = { + NEON_DATABASE_URL: 'postgres://test_user:test_password@localhost:5432/packrat_test', + OPENAI_API_KEY: 'sk-test', + AI_PROVIDER: 'openai', + CLOUDFLARE_ACCOUNT_ID: 'test-account-id', + CLOUDFLARE_AI_GATEWAY_ID: 'test-gateway-id', + CLOUDFLARE_API_TOKEN: 'test-cloudflare-token', +} as unknown as Parameters[0]['env']; + +function makeMessage(jobId: string) { + return { id: jobId, data: { objectKey: 'v2/test/test.csv' } }; +} + +// ───────────────────────────────────────────────────────────────────────────── + +describe('processCatalogETL', () => { + it('marks job as completed after processing a valid CSV', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + mockR2WithCsv(makeCsv(5)); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const job = await getJob(jobId); + expect(job?.status, 'job should be completed, not failed').toBe('completed'); + expect(job?.completedAt).not.toBeNull(); + expect(job?.totalProcessed).toBe(5); + }); + + it('writes catalog items to the DB', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + mockR2WithCsv(makeCsv(3)); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const db = createDbClient({} as any); + const [result] = await db.select({ total: count() }).from(catalogItems); + expect(result?.total).toBeGreaterThanOrEqual(3); + }); + + it('marks job as completed when all rows are invalid (writes invalid logs)', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + // Missing sku and productUrl → all rows invalid + mockR2WithCsv('name,brand\nItem Without SKU,TestBrand\n'); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const job = await getJob(jobId); + expect(job?.status, 'job with only invalid rows should still complete').toBe('completed'); + + const db = createDbClient({} as any); + const [logResult] = await db + .select({ total: count() }) + .from(invalidItemLogs) + .where(eq(invalidItemLogs.jobId, jobId)); + expect(logResult?.total).toBeGreaterThan(0); + }); + + it('marks job as failed and rethrows when R2 object is missing', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + mockR2WithNull(); + + await expect( + processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }), + ).rejects.toThrow(); + + const job = await getJob(jobId); + expect(job?.status).toBe('failed'); + }); + + it('handles exactly BATCH_SIZE rows (no remainder flush — edge case)', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + mockR2WithCsv(makeCsv(100)); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const job = await getJob(jobId); + expect(job?.status, 'exact BATCH_SIZE rows should complete').toBe('completed'); + expect(job?.totalProcessed).toBe(100); + }); + + it('handles rows spanning multiple batches', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + mockR2WithCsv(makeCsv(250)); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const job = await getJob(jobId); + expect(job?.status).toBe('completed'); + expect(job?.totalProcessed).toBe(250); + }); + + it('totalProcessed never exceeds totalValid + totalInvalid after completion', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + mockR2WithCsv(makeCsv(10)); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const job = await getJob(jobId); + const processed = job?.totalProcessed ?? 0; + const valid = job?.totalValid ?? 0; + const invalid = job?.totalInvalid ?? 0; + expect(processed).toBe(valid + invalid); + }); + + it('marks job as completed even when items have no weight', async () => { + const jobId = crypto.randomUUID(); + await insertJob(jobId); + // No weight column — valid items that previously caused NOT NULL DB failures + mockR2WithCsv( + 'name,sku,productUrl,brand\nNo Weight Item,SKU-NW,https://example.com/nw,TestBrand\n', + ); + + await processCatalogETL({ message: makeMessage(jobId) as any, env: TEST_ENV }); + + const job = await getJob(jobId); + expect(job?.status, 'items without weight should not cause job failure').toBe('completed'); + }); +}); + +describe('processValidItemsBatch', () => { + it('does not throw when embedding generation fails (falls back gracefully)', async () => { + const jobId = crypto.randomUUID(); + const db = createDbClient({} as any); + await db.insert(etlJobs).values({ + id: jobId, + status: 'running', + source: 'test', + filename: 'test.csv', + scraperRevision: 'abc123', + startedAt: new Date(), + }); + + const { generateManyEmbeddings } = await import('@packrat/api/services/embeddingService'); + vi.mocked(generateManyEmbeddings).mockRejectedValueOnce(new Error('OpenAI rate limit')); + + await expect( + processValidItemsBatch({ + jobId, + items: [ + { + name: 'Test Item', + sku: 'SKU-EMBED-001', + productUrl: 'https://example.com/item', + brand: 'TestBrand', + weight: 500, + weightUnit: 'g', + } as any, + ], + env: TEST_ENV, + }), + ).resolves.not.toThrow(); + }); + + it('does not throw when items have no weight', async () => { + const jobId = crypto.randomUUID(); + const db = createDbClient({} as any); + await db.insert(etlJobs).values({ + id: jobId, + status: 'running', + source: 'test', + filename: 'test.csv', + scraperRevision: 'abc123', + startedAt: new Date(), + }); + + await expect( + processValidItemsBatch({ + jobId, + items: [ + { + name: 'No Weight Item', + sku: 'SKU-NW-002', + productUrl: 'https://example.com/nw', + brand: 'TestBrand', + } as any, + ], + env: TEST_ENV, + }), + ).resolves.not.toThrow(); + }); +}); diff --git a/packages/api/test/fixtures/catalog-fixtures.ts b/packages/api/test/fixtures/catalog-fixtures.ts index 636b172ca8..0be04b1617 100644 --- a/packages/api/test/fixtures/catalog-fixtures.ts +++ b/packages/api/test/fixtures/catalog-fixtures.ts @@ -1,5 +1,5 @@ +import type { catalogItems } from '@packrat/db'; import type { InferInsertModel } from 'drizzle-orm'; -import type { catalogItems } from '../../src/db/schema'; /** * Test fixture for creating a minimal valid catalog item diff --git a/packages/api/test/fixtures/pack-fixtures.ts b/packages/api/test/fixtures/pack-fixtures.ts index 0abc349be1..ea1ae72c50 100644 --- a/packages/api/test/fixtures/pack-fixtures.ts +++ b/packages/api/test/fixtures/pack-fixtures.ts @@ -1,5 +1,5 @@ +import type { packItems, packs } from '@packrat/db'; import type { InferInsertModel } from 'drizzle-orm'; -import type { packItems, packs } from '../../src/db/schema'; type PackOverrides = Partial> & { userId: string }; type PackItemOverrides = Partial> & { userId: string }; diff --git a/packages/api/test/fixtures/pack-template-fixtures.ts b/packages/api/test/fixtures/pack-template-fixtures.ts index 4afc7eae0e..43c8c64eab 100644 --- a/packages/api/test/fixtures/pack-template-fixtures.ts +++ b/packages/api/test/fixtures/pack-template-fixtures.ts @@ -1,5 +1,5 @@ +import type { packTemplateItems, packTemplates } from '@packrat/db'; import type { InferInsertModel } from 'drizzle-orm'; -import type { packTemplateItems, packTemplates } from '../../src/db/schema'; type PackTemplateOverrides = Partial> & { userId: string }; diff --git a/packages/api/test/packs.test.ts b/packages/api/test/packs.test.ts index acf67167c7..5ecfb3382e 100644 --- a/packages/api/test/packs.test.ts +++ b/packages/api/test/packs.test.ts @@ -1,4 +1,4 @@ -import type { Pack } from '@packrat/api/db/schema'; +import type { Pack } from '@packrat/db'; import { beforeEach, describe, expect, it, vi } from 'vitest'; import { seedAndLoginTestUser, diff --git a/packages/api/test/setup.ts b/packages/api/test/setup.ts index 8d3544cb6c..1b68fd9537 100644 --- a/packages/api/test/setup.ts +++ b/packages/api/test/setup.ts @@ -1,9 +1,9 @@ import { neonConfig, Pool } from '@neondatabase/serverless'; +import * as schema from '@packrat/db/schema'; import { isFunction, isObject } from '@packrat/guards'; import { sql } from 'drizzle-orm'; import { drizzle } from 'drizzle-orm/neon-serverless'; import { afterAll, beforeAll, beforeEach, vi } from 'vitest'; -import * as schema from '../src/db/schema'; import { clearCurrentTestUsers } from './utils/test-helpers'; // ── Setup regex constants ── @@ -50,6 +50,7 @@ const testEnv = { CLOUDFLARE_ACCOUNT_ID: 'test-account-id', CLOUDFLARE_AI_GATEWAY_ID: 'test-gateway-id', + CLOUDFLARE_API_TOKEN: 'test-cloudflare-token', R2_ACCESS_KEY_ID: 'test-access-key', R2_SECRET_ACCESS_KEY: 'test-secret-key', PACKRAT_BUCKET_R2_BUCKET_NAME: 'test-bucket', @@ -342,10 +343,13 @@ vi.mock('@packrat/api/services/catalogService', async (importOriginal) => { return { ...actual, CatalogService: class extends actual.CatalogService { - async batchVectorSearch( - queries: string[], - _limit?: number, - ): Promise { + async batchVectorSearch({ + queries, + limit: _limit, + }: { + queries: string[]; + limit?: number; + }): Promise { return { items: queries.map(() => [ { diff --git a/packages/api/test/utils/db-helpers.ts b/packages/api/test/utils/db-helpers.ts index 046540f955..d576676290 100644 --- a/packages/api/test/utils/db-helpers.ts +++ b/packages/api/test/utils/db-helpers.ts @@ -1,9 +1,5 @@ import { createDb } from '@packrat/api/db'; import { hashPassword } from '@packrat/api/utils/auth'; -import { assertDefined } from '@packrat/guards'; -import type { InferInsertModel } from 'drizzle-orm'; - -import * as schema from '../../src/db/schema'; import { catalogItems, packItems, @@ -11,7 +7,10 @@ import { packTemplateItems, packTemplates, type users, -} from '../../src/db/schema'; +} from '@packrat/db'; +import * as schema from '@packrat/db/schema'; +import { assertDefined } from '@packrat/guards'; +import type { InferInsertModel } from 'drizzle-orm'; import { createTestCatalogItem } from '../fixtures/catalog-fixtures'; import { createTestPack, createTestPackItem } from '../fixtures/pack-fixtures'; import { diff --git a/packages/api/test/utils/user-helpers.ts b/packages/api/test/utils/user-helpers.ts index 946a41a4a4..55a4b9d163 100644 --- a/packages/api/test/utils/user-helpers.ts +++ b/packages/api/test/utils/user-helpers.ts @@ -1,6 +1,6 @@ import { createDb } from '@packrat/api/db'; -import { users } from '@packrat/api/db/schema'; import { hashPassword } from '@packrat/api/utils/auth'; +import { users } from '@packrat/db'; import type { InferInsertModel } from 'drizzle-orm'; /** diff --git a/packages/api/vitest.unit.config.ts b/packages/api/vitest.unit.config.ts index 14aad0cdd9..d8db428f52 100644 --- a/packages/api/vitest.unit.config.ts +++ b/packages/api/vitest.unit.config.ts @@ -38,6 +38,8 @@ export default defineConfig({ 'src/**/*.d.ts', 'src/index.ts', 'src/db/migrations/**', + // Test infrastructure stubs (not production code) + 'src/__test-stubs__/**', // Pure type/schema definitions (no runtime logic to test) 'src/schemas/**', 'src/types/**', @@ -48,6 +50,12 @@ export default defineConfig({ 'src/containers/**', // Index files (just exports, no business logic) 'src/**/index.ts', + // CLI stub for `bunx auth generate` — not production logic + 'src/auth/auth.config.ts', + // getAuth() factory requires live Neon DB, CF KV, and OAuth credentials; + // not unit-testable without the full CF runtime. Pure helpers live in + // auth.helpers.ts and are covered by their own unit tests. + 'src/auth/index.ts', // ETL and AI utilities (defer to integration tests) 'src/services/etl/**', 'src/utils/ai/**', @@ -58,6 +66,10 @@ export default defineConfig({ 'src/services/catalogService.ts', 'src/services/packService.ts', 'src/services/imageDetectionService.ts', + // PostGIS-dependent service (requires live DB with PostGIS extension) + 'src/services/trails.ts', + // Intentionally thin pass-through (no business logic to unit-test) + 'src/services/refreshTokenService.ts', // Database utilities (require complex mocking, covered by integration tests) 'src/utils/DbUtils.ts', // External service utilities (better tested via integration tests) @@ -72,7 +84,10 @@ export default defineConfig({ 'src/utils/openapi.ts', ], thresholds: { - statements: 65, + statements: 95, + branches: 92, + functions: 97, + lines: 95, }, }, }, diff --git a/packages/api/wrangler.jsonc b/packages/api/wrangler.jsonc index 6ca2ec58df..d1058c53c8 100644 --- a/packages/api/wrangler.jsonc +++ b/packages/api/wrangler.jsonc @@ -16,7 +16,7 @@ "head_sampling_rate": 1 }, "limits": { - "cpu_ms": 300000 // 300,000 milliseconds = 5 minutes + "cpu_ms": 300000 // 300,000 milliseconds = max allowed by Cloudflare (code: 10206) }, // Environment variables are managed via: // - Production: Cloudflare dashboard @@ -128,6 +128,13 @@ ], "env": { "dev": { + "kv_namespaces": [ + { + "binding": "AUTH_KV", + "id": "0d0dd76cec764c81be58ae7b871b47cb", + "preview_id": "f3441ec9f4b044e6b6c6a087251e3f00" + } + ], "rate_limiting": [ { "binding": "TOKEN_RATE_LIMITER", diff --git a/packages/app/package.json b/packages/app/package.json index 0a09b434a9..6c361fefbf 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/app", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { @@ -14,8 +14,9 @@ }, "dependencies": { "@packrat/api-client": "workspace:*", - "@tanstack/react-query": "^5.70.0", - "jotai": "^2.12.2", + "@packrat/schemas": "workspace:*", + "@tanstack/react-query": "catalog:", + "jotai": "catalog:", "react": "catalog:", "zod": "catalog:" }, @@ -24,8 +25,8 @@ "steiger": "^0.5.11" }, "peerDependencies": { - "@tanstack/react-query": "^5.70.0", - "jotai": "^2.12.2", + "@tanstack/react-query": "catalog:", + "jotai": "catalog:", "react": "catalog:" } } diff --git a/packages/app/src/browser.ts b/packages/app/src/browser.ts index b5f1d7b8de..c2abb4aa58 100644 --- a/packages/app/src/browser.ts +++ b/packages/app/src/browser.ts @@ -5,7 +5,7 @@ export const safeLocalStorage = { if (!isBrowser()) return null; return localStorage.getItem(key); }, - setItem(key: string, value: string): void { + setItem({ key, value }: { key: string; value: string }): void { if (!isBrowser()) return; localStorage.setItem(key, value); }, @@ -20,7 +20,7 @@ export const safeSessionStorage = { if (!isBrowser()) return null; return sessionStorage.getItem(key); }, - setItem(key: string, value: string): void { + setItem({ key, value }: { key: string; value: string }): void { if (!isBrowser()) return; sessionStorage.setItem(key, value); }, diff --git a/packages/app/src/entities/catalog/schema.ts b/packages/app/src/entities/catalog/schema.ts index c676ca5181..ca51bc3d29 100644 --- a/packages/app/src/entities/catalog/schema.ts +++ b/packages/app/src/entities/catalog/schema.ts @@ -1,46 +1 @@ -import { z } from 'zod'; -import { dateField } from '../../shared/lib/date'; - -export const CatalogItemSchema = z.object({ - id: z.number().int().positive(), - name: z.string(), - productUrl: z.string(), - sku: z.string(), - weight: z.number(), - weightUnit: z.string(), - description: z.string().nullable(), - categories: z.array(z.string()).nullable(), - images: z.array(z.string()).nullable(), - brand: z.string().nullable(), - model: z.string().nullable(), - ratingValue: z.number().nullable(), - color: z.string().nullable(), - size: z.string().nullable(), - price: z.number().nullable(), - availability: z.enum(['in_stock', 'out_of_stock', 'preorder']).nullable(), - seller: z.string().nullable(), - productSku: z.string().nullable(), - material: z.string().nullable(), - currency: z.string().nullable(), - condition: z.string().nullable(), - reviewCount: z.number().int().nullable(), - createdAt: dateField.optional(), - updatedAt: dateField.optional(), - variants: z - .array(z.object({ attribute: z.string(), values: z.array(z.string()) })) - .nullable() - .optional(), - techs: z.record(z.string(), z.string()).nullable().optional(), - links: z - .array(z.object({ title: z.string(), url: z.string() })) - .nullable() - .optional(), -}); - -export const CatalogItemsResponseSchema = z.object({ - items: z.array(CatalogItemSchema), - totalCount: z.number(), - page: z.number(), - limit: z.number(), - totalPages: z.number(), -}); +export { CatalogItemSchema, CatalogItemsResponseSchema } from '@packrat/schemas/catalog'; diff --git a/packages/app/src/entities/feed/schema.ts b/packages/app/src/entities/feed/schema.ts index 7d14eece86..5cd7093e7e 100644 --- a/packages/app/src/entities/feed/schema.ts +++ b/packages/app/src/entities/feed/schema.ts @@ -1,42 +1,6 @@ -import { z } from 'zod'; -import { dateField } from '../../shared/lib/date'; - -export const PostAuthorSchema = z.object({ - id: z.number().int(), - firstName: z.string().nullable(), - lastName: z.string().nullable(), -}); - -export const PostSchema = z.object({ - id: z.number().int(), - userId: z.number().int(), - caption: z.string().nullable(), - images: z.array(z.string()), - createdAt: dateField, - updatedAt: dateField, - author: PostAuthorSchema.optional(), - likeCount: z.number().int(), - commentCount: z.number().int(), - likedByMe: z.boolean(), -}); - -export const FeedResponseSchema = z.object({ - items: z.array(PostSchema), - page: z.number().int(), - limit: z.number().int(), - total: z.number().int(), - totalPages: z.number().int(), -}); - -export const CommentSchema = z.object({ - id: z.number().int(), - postId: z.number().int(), - userId: z.number().int(), - content: z.string(), - parentCommentId: z.number().int().nullable(), - createdAt: dateField, - updatedAt: dateField, - author: PostAuthorSchema.optional(), - likeCount: z.number().int(), - likedByMe: z.boolean(), -}); +export { + CommentSchema, + FeedResponseSchema, + PostAuthorSchema, + PostSchema, +} from '@packrat/schemas/feed'; diff --git a/packages/app/src/entities/pack/schema.ts b/packages/app/src/entities/pack/schema.ts index 66351866f4..1259969ce3 100644 --- a/packages/app/src/entities/pack/schema.ts +++ b/packages/app/src/entities/pack/schema.ts @@ -1,57 +1,6 @@ -import { z } from 'zod'; -import { dateField } from '../../shared/lib/date'; - -export const PackItemSchema = z.object({ - id: z.string(), - name: z.string(), - description: z.string().nullable(), - weight: z.number(), - weightUnit: z.string(), - quantity: z.number().int().min(1), - category: z.string().nullable(), - consumable: z.boolean(), - worn: z.boolean(), - image: z.string().nullable(), - notes: z.string().nullable(), - packId: z.string(), - catalogItemId: z.number().int().nullable(), - userId: z.number().int(), - deleted: z.boolean(), - isAIGenerated: z.boolean(), - templateItemId: z.string().nullable(), - createdAt: dateField, - updatedAt: dateField, -}); - -export const PackSchema = z.object({ - id: z.string(), - userId: z.number(), - name: z.string(), - description: z.string().nullable(), - category: z.string().nullable(), - isPublic: z.boolean(), - image: z.string().nullable(), - tags: z.array(z.string()).nullable(), - templateId: z.string().nullable().optional(), - deleted: z.boolean(), - isAIGenerated: z.boolean(), - localCreatedAt: dateField.optional(), - localUpdatedAt: dateField.optional(), - createdAt: dateField, - updatedAt: dateField, - items: z.array(PackItemSchema).optional(), -}); - -// totalWeight and baseWeight are computed server-side, not locally derived -export const PackWithWeightsSchema = PackSchema.extend({ - totalWeight: z.number(), - baseWeight: z.number(), -}); - -export const PackListResponseSchema = z.object({ - packs: z.array(PackWithWeightsSchema), - total: z.number(), - page: z.number(), - limit: z.number(), - totalPages: z.number(), -}); +export { + PackItemSchema, + PackListResponseSchema, + PackSchema, + PackWithWeightsSchema, +} from '@packrat/schemas/packs'; diff --git a/packages/app/src/entities/trip/schema.ts b/packages/app/src/entities/trip/schema.ts index 33959e68e6..36afacba9d 100644 --- a/packages/app/src/entities/trip/schema.ts +++ b/packages/app/src/entities/trip/schema.ts @@ -1,25 +1 @@ -import { z } from 'zod'; -import { dateField } from '../../shared/lib/date'; - -export const TripLocationSchema = z.object({ - latitude: z.number(), - longitude: z.number(), - name: z.string().optional(), -}); - -export const TripSchema = z.object({ - id: z.string(), - name: z.string(), - description: z.string().nullable().optional(), - notes: z.string().nullable().optional(), - location: TripLocationSchema.nullable().optional(), - startDate: z.string().nullable().optional(), - endDate: z.string().nullable().optional(), - userId: z.number().optional(), - packId: z.string().nullable().optional(), - deleted: z.boolean(), - localCreatedAt: dateField.optional(), - localUpdatedAt: dateField.optional(), - createdAt: dateField.optional(), - updatedAt: dateField.optional(), -}); +export { TripLocationSchema, TripSchema } from '@packrat/schemas/trips'; diff --git a/packages/app/src/entities/user/schema.ts b/packages/app/src/entities/user/schema.ts index 75dcc2f724..759e3c079c 100644 --- a/packages/app/src/entities/user/schema.ts +++ b/packages/app/src/entities/user/schema.ts @@ -1,19 +1 @@ -import { z } from 'zod'; -import { dateField } from '../../shared/lib/date'; - -export const UserSchema = z.object({ - id: z.number().int().positive(), - email: z.string().email(), - firstName: z.string().nullable(), - lastName: z.string().nullable(), - role: z.string().nullable().default('USER'), - emailVerified: z.boolean().nullable(), - createdAt: dateField.nullable(), - updatedAt: dateField.nullable(), - avatarUrl: z.string().nullable().optional(), -}); - -export const UserProfileSchema = z.object({ - success: z.boolean(), - user: UserSchema, -}); +export { UserProfileSchema, UserSchema } from '@packrat/schemas/users'; diff --git a/packages/app/src/shared/api/query-keys.ts b/packages/app/src/shared/api/query-keys.ts index e4994ac5b7..f21699e0cb 100644 --- a/packages/app/src/shared/api/query-keys.ts +++ b/packages/app/src/shared/api/query-keys.ts @@ -1,6 +1,7 @@ export const queryKeys = { user: ['user'] as const, - packs: (page = 1, limit = 20) => ['packs', { page, limit }] as const, + packs: ({ page = 1, limit = 20 }: { page?: number; limit?: number } = {}) => + ['packs', { page, limit }] as const, pack: (id: string) => ['pack', id] as const, trips: ['trips'] as const, trip: (id: string) => ['trip', id] as const, @@ -15,7 +16,12 @@ export const queryKeys = { } = {}, ) => ['catalogInfinite', opts] as const, catalogItem: (id: number) => ['catalogItem', id] as const, - feed: (page = 1, filter?: 'trending' | 'recent' | 'following') => - ['feed', { page, filter }] as const, + feed: ({ + page = 1, + filter, + }: { + page?: number; + filter?: 'trending' | 'recent' | 'following'; + } = {}) => ['feed', { page, filter }] as const, post: (id: number) => ['post', id] as const, }; diff --git a/packages/app/src/shared/lib/weight.ts b/packages/app/src/shared/lib/weight.ts index 25defbdda2..bac63998c4 100644 --- a/packages/app/src/shared/lib/weight.ts +++ b/packages/app/src/shared/lib/weight.ts @@ -4,7 +4,7 @@ export type WeightUnit = 'g' | 'oz' | 'kg' | 'lb'; export const weightUnitAtom = atom('oz'); -export function toGrams(weight: number, unit: WeightUnit): number { +export function toGrams({ weight, unit }: { weight: number; unit: WeightUnit }): number { switch (unit) { case 'oz': return Math.round(weight * 28.3495); @@ -17,7 +17,7 @@ export function toGrams(weight: number, unit: WeightUnit): number { } } -export function fromGrams(grams: number, unit: WeightUnit): number { +export function fromGrams({ grams, unit }: { grams: number; unit: WeightUnit }): number { switch (unit) { case 'oz': return Math.round((grams / 28.3495) * 10) / 10; @@ -30,8 +30,8 @@ export function fromGrams(grams: number, unit: WeightUnit): number { } } -export function formatWeight(grams: number, unit: WeightUnit): string { - const value = fromGrams(grams, unit); +export function formatWeight({ grams, unit }: { grams: number; unit: WeightUnit }): string { + const value = fromGrams({ grams, unit }); return `${value}${unit}`; } diff --git a/packages/checks/package.json b/packages/checks/package.json index 10c105548f..fd4ff919a5 100644 --- a/packages/checks/package.json +++ b/packages/checks/package.json @@ -1,11 +1,13 @@ { "name": "@packrat/checks", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "scripts": { "check:casts": "bun ./src/check-type-casts.ts", "check:casts:strict": "bun ./src/check-type-casts.ts --strict", - "check:magic-strings": "bun ./src/check-magic-strings.ts" + "check:magic-strings": "bun ./src/check-magic-strings.ts", + "check:route-schemas": "bun ./src/check-route-schemas.ts", + "check:route-schemas:strict": "bun ./src/check-route-schemas.ts --strict" } } diff --git a/packages/checks/src/check-magic-strings.ts b/packages/checks/src/check-magic-strings.ts index d895a2de4e..0848188323 100644 --- a/packages/checks/src/check-magic-strings.ts +++ b/packages/checks/src/check-magic-strings.ts @@ -140,7 +140,7 @@ const literalFiles = new Map>(); const allFiles: string[] = []; -function collectFiles(dir: string, relDir: string): void { +function collectFiles({ dir, relDir }: { dir: string; relDir: string }): void { let entries: string[]; try { entries = readdirSync(dir); @@ -158,7 +158,7 @@ function collectFiles(dir: string, relDir: string): void { continue; } if (isDir) { - collectFiles(full, rel); + collectFiles({ dir: full, relDir: rel }); } else if (isTargetFile(rel)) { allFiles.push(rel); } @@ -194,7 +194,7 @@ function scanFile(relPath: string): void { } for (const root of SCAN_ROOTS) { - collectFiles(join(ROOT, root), root); + collectFiles({ dir: join(ROOT, root), relDir: root }); } for (const f of allFiles) { diff --git a/packages/checks/src/check-route-schemas.ts b/packages/checks/src/check-route-schemas.ts new file mode 100644 index 0000000000..8a66d00ca6 --- /dev/null +++ b/packages/checks/src/check-route-schemas.ts @@ -0,0 +1,92 @@ +#!/usr/bin/env bun +/** + * check-route-schemas.ts — enforces that no named Zod schema is defined + * inside packages/api/src/routes/ or packages/api/src/services/. + * + * All schemas must live in @packrat/schemas (packages/schemas/src/). + * Route files must only import — never define. + * + * A "named schema" is a top-level const at column 0: + * const FooSchema = z. ← VIOLATION + * + * Inline anonymous schemas in route config are fine: + * body: z.object({...}) ← OK (indented) + * + * Run: bun ./src/check-route-schemas.ts + * Strict mode: bun ./src/check-route-schemas.ts --strict + */ + +import { readdirSync, readFileSync, statSync } from 'node:fs'; +import { join } from 'node:path'; + +const ROOT = join(import.meta.dir, '..', '..', '..'); +const SCAN_ROOTS = ['packages/api/src/routes', 'packages/api/src/services']; +const EXCLUDED_DIRS = new Set(['node_modules', 'dist', 'build', '__tests__']); +const TARGET_EXTENSIONS = new Set(['.ts', '.tsx']); + +// Top-level named schema: starts at column 0, no leading whitespace +const NAMED_SCHEMA_PATTERN = /^const \w+Schema\s*=\s*z\./; + +// Legitimate exceptions: AI response parsing schemas and auth middleware internals +// that validate private service boundaries, not API wire types. +const ALLOWED_FILES = new Set([ + 'packages/api/src/services/packService.ts', + 'packages/api/src/services/imageDetectionService.ts', + 'packages/api/src/services/wildlifeIdentificationService.ts', + 'packages/api/src/middleware/cfAccess.ts', +]); + +interface Violation { + file: string; + line: number; + text: string; +} + +function collectFiles(dir: string): string[] { + const files: string[] = []; + for (const entry of readdirSync(dir)) { + if (EXCLUDED_DIRS.has(entry)) continue; + const full = join(dir, entry); + const stat = statSync(full); + if (stat.isDirectory()) { + files.push(...collectFiles(full)); + } else if (TARGET_EXTENSIONS.has(entry.slice(entry.lastIndexOf('.')))) { + files.push(full); + } + } + return files; +} + +const violations: Violation[] = []; + +for (const root of SCAN_ROOTS) { + const absRoot = join(ROOT, root); + for (const file of collectFiles(absRoot)) { + const rel = file.slice(ROOT.length + 1); + if (ALLOWED_FILES.has(rel)) continue; + const lines = readFileSync(file, 'utf-8').split('\n'); + for (let i = 0; i < lines.length; i++) { + const line = lines[i]; + if (line && NAMED_SCHEMA_PATTERN.test(line)) { + violations.push({ file: rel, line: i + 1, text: line.trim() }); + } + } + } +} + +if (violations.length === 0) { + console.log('✓ No inline route/service schemas found.'); + process.exit(0); +} + +console.log(`Found ${violations.length} inline schema definition(s) in route/service files.\n`); +console.log('All Zod schemas must live in packages/schemas/src/.\n'); +for (const v of violations) { + console.log(` ${v.file}:${v.line}`); + console.log(` ${v.text}\n`); +} + +const strict = process.argv.includes('--strict'); +if (strict) { + process.exit(1); +} diff --git a/packages/checks/src/check-type-casts.ts b/packages/checks/src/check-type-casts.ts index 2c6ea2adaa..2a08f90cad 100644 --- a/packages/checks/src/check-type-casts.ts +++ b/packages/checks/src/check-type-casts.ts @@ -71,7 +71,7 @@ interface Violation { source: string; } -function isSafeCast(_line: string, castMatch: string): boolean { +function isSafeCast({ castMatch }: { _line?: string; castMatch: string }): boolean { const full = `as ${castMatch}`; return SAFE_CAST_PATTERNS.some((p) => p.test(full)); } @@ -126,7 +126,7 @@ function collectViolations(filePath: string): Violation[] { CAST_PATTERN.lastIndex = 0; for (let match = CAST_PATTERN.exec(line); match !== null; match = CAST_PATTERN.exec(line)) { const castType = match[1]?.trim(); - if (!castType || isSafeCast(line, castType)) continue; + if (!castType || isSafeCast({ castMatch: castType })) continue; // Skip single-word lowercase types (string, number, boolean, void, etc.) if (LOWERCASE_TYPE.test(castType)) continue; diff --git a/packages/cli/package.json b/packages/cli/package.json index 3b87ca1a2a..4c40f617e1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/cli", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "bin": { @@ -11,17 +11,20 @@ "packrat": "bun run src/index.ts" }, "dependencies": { - "@duckdb/node-api": "1.5.0-r.1", + "@duckdb/node-api": "catalog:", "@packrat/analytics": "workspace:*", + "@packrat/api-client": "workspace:*", "@packrat/env": "workspace:*", "@packrat/guards": "workspace:*", "chalk": "catalog:", "citty": "^0.2.1", "cli-table3": "^0.6.5", - "consola": "^3.4.2", + "consola": "catalog:", + "uuid": "^11.0.5", "zod": "catalog:" }, "devDependencies": { - "@types/bun": "latest" + "@types/bun": "catalog:", + "@types/uuid": "^11.0.0" } } diff --git a/packages/cli/src/api/client.ts b/packages/cli/src/api/client.ts new file mode 100644 index 0000000000..371fc69c43 --- /dev/null +++ b/packages/cli/src/api/client.ts @@ -0,0 +1,78 @@ +/** + * Eden Treaty client factory for the CLI. + * + * Two clients are exposed: + * + * - `user` — authenticated as the Better Auth user whose tokens are stored in + * `~/.packrat/config.json`. Uses `createApiClient` so 401s trigger a + * transparent refresh, with both new tokens persisted back to config. + * - `admin` — authenticated with the short-lived admin JWT minted by + * `POST /api/admin/token`. No refresh — the user just runs + * `packrat admin login` again when it expires. + * + * Both clients share a base URL resolved from config (or `PACKRAT_API_URL`). + */ + +import { type ApiClient, createApiClient } from '@packrat/api-client'; +import { type CliConfig, loadConfig, saveConfig } from './config'; + +let cachedUser: ApiClient | null = null; +let cachedAdmin: ApiClient | null = null; + +/** Get (and cache) the user-scope Treaty client. */ +export async function getUserClient(): Promise { + if (cachedUser) return cachedUser; + const config = await loadConfig(); + cachedUser = createApiClient({ + baseUrl: config.baseUrl, + auth: { + getAccessToken: () => loadConfig().then((c) => c.accessToken), + getRefreshToken: () => loadConfig().then((c) => c.refreshToken), + onAccessTokenRefreshed: async (token) => { + await saveConfig({ accessToken: token }); + }, + onRefreshTokenRefreshed: async (token) => { + await saveConfig({ refreshToken: token }); + }, + onNeedsReauth: async () => { + await saveConfig({ + accessToken: null, + refreshToken: null, + userEmail: null, + userId: null, + }); + }, + }, + }); + return cachedUser; +} + +/** Get (and cache) the admin-scope Treaty client. */ +export async function getAdminClient(): Promise { + if (cachedAdmin) return cachedAdmin; + const config = await loadConfig(); + cachedAdmin = createApiClient({ + baseUrl: config.baseUrl, + auth: { + getAccessToken: () => loadConfig().then((c) => c.adminToken), + // Admin tokens are not refreshable; on 401 we just surface the error. + getRefreshToken: () => null, + onAccessTokenRefreshed: () => {}, + onNeedsReauth: async () => { + await saveConfig({ adminToken: null, adminTokenExpiresAt: null }); + }, + }, + }); + return cachedAdmin; +} + +/** Convenience accessor for the base URL (mostly for raw Better Auth calls). */ +export async function getBaseUrl(): Promise { + const config = await loadConfig(); + return config.baseUrl; +} + +/** Returns a snapshot of the current config — read-only. */ +export async function getConfigSnapshot(): Promise { + return loadConfig(); +} diff --git a/packages/cli/src/api/config.ts b/packages/cli/src/api/config.ts new file mode 100644 index 0000000000..d9de3e3bf1 --- /dev/null +++ b/packages/cli/src/api/config.ts @@ -0,0 +1,114 @@ +/** + * `~/.packrat/config.json` store. + * + * Persists the CLI's session-level state: API base URL, the Better Auth + * access/refresh token pair, and the admin JWT. Refresh-on-401 is handled by + * `createApiClient`, which calls back into this module via the AuthHooks in + * `./client.ts` whenever new tokens arrive. + * + * On a fresh machine the config file may not exist; we lazily create the + * `~/.packrat` directory the first time we need to write. + */ + +import { mkdir, readFile, writeFile } from 'node:fs/promises'; +import { homedir } from 'node:os'; +import { dirname, join } from 'node:path'; +import { nodeEnv } from '@packrat/env/node'; +import { z } from 'zod'; + +const DEFAULT_BASE_URL = 'https://packrat.world'; + +const CONFIG_DIR = join(homedir(), '.packrat'); +const CONFIG_PATH = join(CONFIG_DIR, 'config.json'); + +export const CliConfigSchema = z.object({ + baseUrl: z.string().url().default(DEFAULT_BASE_URL), + accessToken: z.string().nullable().default(null), + refreshToken: z.string().nullable().default(null), + adminToken: z.string().nullable().default(null), + adminTokenExpiresAt: z.number().nullable().default(null), + userEmail: z.string().nullable().default(null), + userId: z.string().nullable().default(null), +}); + +export type CliConfig = z.infer; + +const emptyConfig: CliConfig = { + baseUrl: DEFAULT_BASE_URL, + accessToken: null, + refreshToken: null, + adminToken: null, + adminTokenExpiresAt: null, + userEmail: null, + userId: null, +}; + +// Persisted state — exactly what's in (or will be in) ~/.packrat/config.json. +let persisted: CliConfig | null = null; + +/** Load the persisted config from disk (cached for the lifetime of the process). */ +async function loadPersisted(): Promise { + if (persisted) return persisted; + try { + const raw = await readFile(CONFIG_PATH, 'utf8'); + const parsed = CliConfigSchema.safeParse(JSON.parse(raw)); + persisted = parsed.success ? parsed.data : emptyConfig; + } catch (e) { + if (isNotFound(e)) persisted = { ...emptyConfig }; + else throw e; + } + return persisted; +} + +/** + * Return the effective runtime config — the persisted state with the + * `PACKRAT_API_URL` env override layered on top. Callers that need to know + * the persisted baseUrl (e.g. a future `packrat config show`) should use + * `loadPersisted` directly; almost everyone wants the effective value. + */ +export async function loadConfig(): Promise { + const base = await loadPersisted(); + const envOverride = nodeEnv.PACKRAT_API_URL?.trim(); + // Return a copy so accidental mutation can't leak back into the persisted + // cache and end up written to disk via saveConfig(). + if (envOverride) return { ...base, baseUrl: envOverride }; + return { ...base }; +} + +/** Merge a partial update into the config and persist atomically. */ +export async function saveConfig(patch: Partial): Promise { + // Merge into the *persisted* state, not the effective config — otherwise a + // PACKRAT_API_URL env override would get written to disk and stick. + const current = await loadPersisted(); + const next: CliConfig = { ...current, ...patch }; + await mkdir(dirname(CONFIG_PATH), { recursive: true }); + const tmp = `${CONFIG_PATH}.tmp`; + await writeFile(tmp, JSON.stringify(next, null, 2), { mode: 0o600 }); + const { rename } = await import('node:fs/promises'); + await rename(tmp, CONFIG_PATH); + persisted = next; + return loadConfig(); +} + +/** Clear all session-level tokens but keep `baseUrl`. */ +export async function clearSession(): Promise { + await saveConfig({ + accessToken: null, + refreshToken: null, + adminToken: null, + adminTokenExpiresAt: null, + userEmail: null, + userId: null, + }); +} + +/** Path to the config file, exposed for `packrat auth status`. */ +export const CONFIG_FILE_PATH = CONFIG_PATH; + +function isNotFound(error: unknown): boolean { + // Node fs errors are Error instances (not plain objects), so isObject() + // from radash returns false. Check by instance. + return ( + error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT' + ); +} diff --git a/packages/cli/src/api/ids.ts b/packages/cli/src/api/ids.ts new file mode 100644 index 0000000000..d1a6b801e9 --- /dev/null +++ b/packages/cli/src/api/ids.ts @@ -0,0 +1,16 @@ +/** + * ID helpers for client-side creation. The API expects the client to supply + * IDs (so offline-first stores can write before sync). UUIDv7 is time-ordered + * for good B-tree locality if/when the id becomes the actual PK on disk. + * Using the `uuid` npm package (not Bun.randomUUIDv7) so the same helper + * works in any JS runtime — useful if this ever moves to MCP / Workers. + */ +import { v7 as uuidv7 } from 'uuid'; + +export function shortId(prefix: string): string { + return `${prefix}_${uuidv7()}`; +} + +export function nowIso(): string { + return new Date().toISOString(); +} diff --git a/packages/cli/src/api/prompt.ts b/packages/cli/src/api/prompt.ts new file mode 100644 index 0000000000..2b97e75296 --- /dev/null +++ b/packages/cli/src/api/prompt.ts @@ -0,0 +1,64 @@ +/** + * Password prompt helper. + * + * `consola.prompt({ type: 'text' })` echoes the typed value to the terminal, + * which leaks credentials over the user's scrollback / clipboard. Consola + * doesn't expose a password type, so this wraps `node:readline` with raw + * stdin mode to mask the input. + * + * Falls back to a plain prompt when stdin isn't a TTY (CI, piped input). + */ + +import { stdin, stdout } from 'node:process'; +import { createInterface } from 'node:readline'; + +export async function promptPassword(label: string): Promise { + // Non-TTY (CI, piped) — read a line as-is. + if (!stdin.isTTY || !stdin.setRawMode) { + const rl = createInterface({ input: stdin, output: stdout }); + try { + return await new Promise((resolve) => { + rl.question(`${label}: `, (answer) => resolve(answer)); + }); + } finally { + rl.close(); + } + } + + stdout.write(`${label}: `); + stdin.setRawMode(true); + stdin.resume(); + stdin.setEncoding('utf8'); + + return new Promise((resolve) => { + let password = ''; + const onData = (chunk: string): void => { + for (const ch of chunk) { + const code = ch.charCodeAt(0); + if (ch === '\r' || ch === '\n' || code === 4) { + // Enter or Ctrl-D — submit + stdin.setRawMode(false); + stdin.pause(); + stdin.off('data', onData); + stdout.write('\n'); + resolve(password); + return; + } + if (code === 3) { + // Ctrl-C — abort + stdin.setRawMode(false); + stdin.pause(); + stdout.write('\n'); + process.exit(130); + } + if (ch === '' || ch === '\b') { + // Backspace + if (password.length > 0) password = password.slice(0, -1); + } else if (code >= 32) { + password += ch; + } + } + }; + stdin.on('data', onData); + }); +} diff --git a/packages/cli/src/api/run.ts b/packages/cli/src/api/run.ts new file mode 100644 index 0000000000..51ba8f4520 --- /dev/null +++ b/packages/cli/src/api/run.ts @@ -0,0 +1,179 @@ +/** + * Helpers that translate Eden Treaty's `{ data, error, status }` responses + * into CLI behaviour: print friendly errors, return clean data, exit non-zero + * when ACL/auth fails. Used by every API-talking command. + */ + +import { isObject, isString } from '@packrat/guards'; +import chalk from 'chalk'; +import consola from 'consola'; +import { loadConfig } from './config'; + +/** + * Treaty's actual return shape is a discriminated union: + * `({ data: T; error: null } | { data: null; error: EdenFetchError })` + * `& { status; response; headers }`. + * + * We don't try to recreate that here — the helpers below accept anything that + * structurally looks like a Treaty result and operate on `data`/`error`/`status` + * with light runtime checks. Callers get back the success-branch `data`. + */ +export type TreatyLike = { + data: unknown; + error: unknown; + status: number; +}; + +export type RunOptions = { + /** Verb phrase shown in error messages, e.g. "list packs". */ + action: string; + /** Resource hint shown when 403/404 fires. */ + resourceHint?: string; + /** True when the call hits an admin-only route. */ + requiresAdmin?: boolean; +}; + +/** + * Await a Treaty call, return `data` on success, or print a friendly error and + * `process.exit(1)`. Never returns null. + */ +export async function runApi( + args: { promise: Promise } & RunOptions, +): Promise> { + const { promise, ...opts } = args; + let result: R; + try { + result = await promise; + } catch (e) { + // fetch throws on DNS / refused / TLS / API down — surface a friendly + // message instead of an unhandled stack trace. + const message = e instanceof Error ? e.message : String(e); + consola.error(`${opts.action} failed: could not reach the PackRat API. ${chalk.dim(message)}`); + process.exit(1); + } + if (result.error || result.data == null) { + printError({ status: result.status, body: errorValue(result.error), opts }); + process.exit(1); + } + return result.data as NonNullable; // safe-cast: validated above +} + +/** + * Variant that does NOT exit on error — returns a discriminated union. Useful + * when the command wants to react to a failure (e.g. retry, fallback). + */ +export async function tryApi( + promise: Promise, +): Promise< + | { ok: true; data: NonNullable } + | { ok: false; status: number; value: unknown } + | { ok: false; status: 0; value: { networkError: string } } +> { + let result: R; + try { + result = await promise; + } catch (e) { + return { + ok: false, + status: 0, + value: { networkError: e instanceof Error ? e.message : String(e) }, + }; + } + if (result.error || result.data == null) { + return { ok: false, status: result.status, value: errorValue(result.error) }; + } + return { ok: true, data: result.data as NonNullable }; +} + +function errorValue(error: unknown): unknown { + if (isObject(error) && 'value' in error) { + return (error as { value: unknown }).value; + } + return error; +} + +/** Confirm a user is signed in; exit with a helpful hint if not. */ +export async function requireAuth(): Promise { + const config = await loadConfig(); + if (!config.accessToken) { + consola.error(`Not signed in. Run ${chalk.cyan('packrat auth login')} to authenticate first.`); + process.exit(1); + } +} + +/** Confirm an admin JWT is on disk and hasn't visibly expired. */ +export async function requireAdmin(): Promise { + const config = await loadConfig(); + if (!config.adminToken) { + consola.error( + `No admin token. Run ${chalk.cyan('packrat admin login')} to mint one (you'll need the admin Basic credentials).`, + ); + process.exit(1); + } + if (config.adminTokenExpiresAt && config.adminTokenExpiresAt < Date.now()) { + consola.error( + `Admin token expired. Run ${chalk.cyan('packrat admin login')} to re-authenticate.`, + ); + process.exit(1); + } +} + +function printError(args: { status: number; body: unknown; opts: RunOptions }): void { + const { status, body, opts } = args; + const action = opts.action; + const resource = opts.resourceHint ? ` (${opts.resourceHint})` : ''; + const detail = extractMessage(body); + const suffix = detail ? `\n ${chalk.dim(detail)}` : ''; + + if (status === 401) { + if (opts.requiresAdmin) { + consola.error( + `Admin authentication required to ${action}${resource}. ` + + `Run ${chalk.cyan('packrat admin login')} first.${suffix}`, + ); + return; + } + consola.error( + `Not signed in or session expired (${action}${resource}). ` + + `Run ${chalk.cyan('packrat auth login')}.${suffix}`, + ); + return; + } + if (status === 403) { + if (opts.requiresAdmin) { + consola.error( + `Forbidden: this is an admin-only operation (${action}${resource}). ` + + `Your account lacks the admin role.${suffix}`, + ); + return; + } + consola.error( + `Forbidden: you don't own this resource (${action}${resource}), or the API rejected the call.${suffix}`, + ); + return; + } + if (status === 404) { + consola.error(`Not found: ${action}${resource} returned 404.${suffix}`); + return; + } + if (status === 409) consola.error(`Conflict on ${action}${resource}.${suffix}`); + else if (status === 422) consola.error(`Validation failed on ${action}${resource}.${suffix}`); + else if (status === 429) consola.error(`Rate limited on ${action}${resource}.${suffix}`); + else consola.error(`${action}${resource} failed (HTTP ${status})${suffix}`); +} + +function extractMessage(body: unknown): string | null { + if (body == null) return null; + if (isString(body)) return body; + if (isObject(body)) { + const obj = body as Record; // safe-cast: isObject() guard above narrows body + if (isString(obj.message)) return obj.message; + if (isString(obj.error)) return obj.error; + try { + return JSON.stringify(body); + } catch { + return null; + } + } + return String(body); +} diff --git a/packages/cli/src/args.ts b/packages/cli/src/args.ts index 5b1d6aa31d..e33c441fb8 100644 --- a/packages/cli/src/args.ts +++ b/packages/cli/src/args.ts @@ -37,7 +37,13 @@ const optionalNumber = z.preprocess( z.coerce.number().finite().optional(), ); -export function parsePositiveIntArg(value: unknown, argName: string): number { +export function parsePositiveIntArg({ + value, + argName, +}: { + value: unknown; + argName: string; +}): number { return parseWithMessage({ schema: positiveInteger, value, @@ -46,7 +52,13 @@ export function parsePositiveIntArg(value: unknown, argName: string): number { }); } -export function parseNonNegativeNumberArg(value: unknown, argName: string): number { +export function parseNonNegativeNumberArg({ + value, + argName, +}: { + value: unknown; + argName: string; +}): number { return parseWithMessage({ schema: nonNegativeNumber, value, @@ -55,7 +67,13 @@ export function parseNonNegativeNumberArg(value: unknown, argName: string): numb }); } -export function parseOptionalNumberArg(value: unknown, argName: string): number | undefined { +export function parseOptionalNumberArg({ + value, + argName, +}: { + value: unknown; + argName: string; +}): number | undefined { return parseWithMessage({ schema: optionalNumber, value, @@ -64,7 +82,13 @@ export function parseOptionalNumberArg(value: unknown, argName: string): number }); } -export function parsePercentageArg(value: unknown, argName: string): number { +export function parsePercentageArg({ + value, + argName, +}: { + value: unknown; + argName: string; +}): number { return parseWithMessage({ schema: percentage, value, @@ -73,7 +97,13 @@ export function parsePercentageArg(value: unknown, argName: string): number { }); } -export function parseConfidenceArg(value: unknown, argName: string): number { +export function parseConfidenceArg({ + value, + argName, +}: { + value: unknown; + argName: string; +}): number { return parseWithMessage({ schema: confidence, value, diff --git a/packages/cli/src/commands/admin/analytics.ts b/packages/cli/src/commands/admin/analytics.ts new file mode 100644 index 0000000000..a1644ffbbb --- /dev/null +++ b/packages/cli/src/commands/admin/analytics.ts @@ -0,0 +1,154 @@ +import { defineCommand } from 'citty'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; + +function dump(value: unknown): void { + process.stdout.write(`${JSON.stringify(value, null, 2)}\n`); +} + +const growthCmd = defineCommand({ + meta: { name: 'growth', description: 'Platform growth metrics.' }, + args: { + period: { type: 'string', description: 'day | week | month' }, + range: { type: 'string', description: 'Numeric range' }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.platform.growth.get({ + query: { + period: args.period as 'day' | 'week' | 'month' | undefined, + range: args.range ? Number.parseInt(args.range, 10) : undefined, + }, + }), + action: 'admin growth analytics', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const activityCmd = defineCommand({ + meta: { name: 'activity', description: 'Platform activity metrics.' }, + args: { + period: { type: 'string' }, + range: { type: 'string' }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.platform.activity.get({ + query: { + period: args.period as 'day' | 'week' | 'month' | undefined, + range: args.range ? Number.parseInt(args.range, 10) : undefined, + }, + }), + action: 'admin activity analytics', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const activeUsersCmd = defineCommand({ + meta: { name: 'active-users', description: 'DAU / WAU / MAU.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.platform['active-users'].get(), + action: 'admin active users', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const breakdownCmd = defineCommand({ + meta: { name: 'breakdown', description: 'Packs by category distribution.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.platform.breakdown.get(), + action: 'admin breakdown', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const catalogOverviewCmd = defineCommand({ + meta: { name: 'catalog-overview', description: 'Catalog-wide overview.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.overview.get(), + action: 'admin catalog overview', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const brandsCmd = defineCommand({ + meta: { name: 'top-brands', description: 'Top gear brands.' }, + args: { limit: { type: 'string', default: '20' } }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.brands.get({ + query: { limit: Number.parseInt(args.limit, 10) }, + }), + action: 'admin top brands', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const pricesCmd = defineCommand({ + meta: { name: 'prices', description: 'Catalog price distribution.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.prices.get(), + action: 'admin price distribution', + requiresAdmin: true, + }); + dump(data); + }, +}); + +const embeddingsCmd = defineCommand({ + meta: { name: 'embeddings', description: 'Embedding coverage stats.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.embeddings.get(), + action: 'admin embedding stats', + requiresAdmin: true, + }); + dump(data); + }, +}); + +export default defineCommand({ + meta: { name: 'analytics', description: 'Admin analytics dashboards.' }, + subCommands: { + growth: () => Promise.resolve(growthCmd), + activity: () => Promise.resolve(activityCmd), + 'active-users': () => Promise.resolve(activeUsersCmd), + breakdown: () => Promise.resolve(breakdownCmd), + 'catalog-overview': () => Promise.resolve(catalogOverviewCmd), + 'top-brands': () => Promise.resolve(brandsCmd), + prices: () => Promise.resolve(pricesCmd), + embeddings: () => Promise.resolve(embeddingsCmd), + }, +}); diff --git a/packages/cli/src/commands/admin/catalog.ts b/packages/cli/src/commands/admin/catalog.ts new file mode 100644 index 0000000000..cbecb68e14 --- /dev/null +++ b/packages/cli/src/commands/admin/catalog.ts @@ -0,0 +1,109 @@ +import { isString, toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'Search/list catalog items (admin view).' }, + args: { + q: { type: 'string' }, + limit: { type: 'string', default: '50' }, + offset: { type: 'string', default: '0' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin['catalog-list'].get({ + query: { + q: args.q, + limit: Number.parseInt(args.limit, 10), + offset: Number.parseInt(args.offset, 10), + }, + }), + action: 'admin list catalog', + requiresAdmin: true, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + // Endpoint returns { data: [...], total, limit, offset } + printTable({ + rows: toRecordArray(toRecord(data).data).map((it) => ({ + id: it.id, + name: isString(it.name) ? it.name.slice(0, 60) : it.name, + brand: it.brand, + weight: it.weight, + price: it.price, + })), + options: { title: 'Catalog (admin)' }, + }); + }, +}); + +const updateCmd = defineCommand({ + meta: { name: 'update', description: 'Update a catalog item (admin).' }, + args: { + id: { type: 'positional', required: true, description: 'Catalog item ID' }, + name: { type: 'string' }, + brand: { type: 'string' }, + description: { type: 'string' }, + weight: { type: 'string', description: 'Weight (numeric)' }, + 'weight-unit': { type: 'string', description: 'g | oz | kg | lb' }, + price: { type: 'string', description: 'Price (numeric)' }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const body: Record = {}; + if (args.name) body.name = args.name; + if (args.brand) body.brand = args.brand; + if (args.description) body.description = args.description; + if (args.weight) body.weight = Number.parseFloat(args.weight); + if (args['weight-unit']) body.weightUnit = args['weight-unit']; + if (args.price) body.price = Number.parseFloat(args.price); + await runApi({ + promise: client.admin.catalog({ id: args.id }).patch(body), + action: 'admin update catalog item', + resourceHint: `item ${args.id}`, + requiresAdmin: true, + }); + consola.success(`Updated ${args.id}.`); + }, +}); + +const deleteCmd = defineCommand({ + meta: { name: 'delete', description: 'Delete a catalog item (admin).' }, + args: { + id: { type: 'positional', required: true }, + yes: { type: 'boolean', alias: 'y', default: false }, + }, + async run({ args }) { + await requireAdmin(); + if (!args.yes) { + const confirm = await consola.prompt(`Delete catalog item ${args.id}?`, { type: 'confirm' }); + if (!confirm) return consola.info('Aborted.'); + } + const client = await getAdminClient(); + await runApi({ + promise: client.admin.catalog({ id: args.id }).delete(), + action: 'admin delete catalog item', + resourceHint: `item ${args.id}`, + requiresAdmin: true, + }); + consola.success(`Deleted ${args.id}.`); + }, +}); + +export default defineCommand({ + meta: { name: 'catalog', description: 'Admin catalog ops.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + update: () => Promise.resolve(updateCmd), + delete: () => Promise.resolve(deleteCmd), + }, +}); diff --git a/packages/cli/src/commands/admin/etl.ts b/packages/cli/src/commands/admin/etl.ts new file mode 100644 index 0000000000..3fa6bb5676 --- /dev/null +++ b/packages/cli/src/commands/admin/etl.ts @@ -0,0 +1,100 @@ +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'List recent ETL jobs.' }, + args: { limit: { type: 'string', default: '20' } }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.etl.get({ + query: { limit: Number.parseInt(args.limit, 10) }, + }), + action: 'admin list ETL jobs', + requiresAdmin: true, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const failureSummaryCmd = defineCommand({ + meta: { name: 'failure-summary', description: 'Top recent failure patterns.' }, + args: { limit: { type: 'string', default: '10' } }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.etl['failure-summary'].get({ + query: { limit: Number.parseInt(args.limit, 10) }, + }), + action: 'admin ETL failure summary', + requiresAdmin: true, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const jobFailuresCmd = defineCommand({ + meta: { name: 'job-failures', description: 'Per-job failure drill-down.' }, + args: { + id: { type: 'positional', required: true, description: 'ETL job ID' }, + limit: { type: 'string', default: '50' }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.etl({ jobId: args.id }).failures.get({ + query: { limit: Number.parseInt(args.limit, 10) }, + }), + action: 'admin ETL job failures', + resourceHint: `job ${args.id}`, + requiresAdmin: true, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const resetStuckCmd = defineCommand({ + meta: { name: 'reset-stuck', description: 'Mark stuck-running jobs as failed.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.etl['reset-stuck'].post({}), + action: 'admin reset stuck ETL', + requiresAdmin: true, + }); + consola.success(`Done: ${JSON.stringify(data)}`); + }, +}); + +const retryCmd = defineCommand({ + meta: { name: 'retry', description: 'Retry a failed ETL job.' }, + args: { id: { type: 'positional', required: true, description: 'ETL job ID' } }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.analytics.catalog.etl({ jobId: args.id }).retry.post({}), + action: 'admin retry ETL job', + resourceHint: `job ${args.id}`, + requiresAdmin: true, + }); + consola.success(`Retried: ${JSON.stringify(data)}`); + }, +}); + +export default defineCommand({ + meta: { name: 'etl', description: 'Admin ETL operations.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + 'failure-summary': () => Promise.resolve(failureSummaryCmd), + 'job-failures': () => Promise.resolve(jobFailuresCmd), + 'reset-stuck': () => Promise.resolve(resetStuckCmd), + retry: () => Promise.resolve(retryCmd), + }, +}); diff --git a/packages/cli/src/commands/admin/index.ts b/packages/cli/src/commands/admin/index.ts new file mode 100644 index 0000000000..26fb68f1ee --- /dev/null +++ b/packages/cli/src/commands/admin/index.ts @@ -0,0 +1,16 @@ +import { defineCommand } from 'citty'; + +export default defineCommand({ + meta: { name: 'admin', description: 'Admin-only PackRat operations (requires admin JWT).' }, + subCommands: { + login: () => import('./login').then((m) => m.default), + logout: () => import('./logout').then((m) => m.default), + stats: () => import('./stats').then((m) => m.default), + users: () => import('./users').then((m) => m.default), + packs: () => import('./packs').then((m) => m.default), + catalog: () => import('./catalog').then((m) => m.default), + trails: () => import('./trails').then((m) => m.default), + analytics: () => import('./analytics').then((m) => m.default), + etl: () => import('./etl').then((m) => m.default), + }, +}); diff --git a/packages/cli/src/commands/admin/login.ts b/packages/cli/src/commands/admin/login.ts new file mode 100644 index 0000000000..a86b38e2ef --- /dev/null +++ b/packages/cli/src/commands/admin/login.ts @@ -0,0 +1,33 @@ +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getUserClient } from '../../api/client'; +import { saveConfig } from '../../api/config'; +import { promptPassword } from '../../api/prompt'; +import { runApi } from '../../api/run'; + +export default defineCommand({ + meta: { + name: 'login', + description: 'Exchange admin credentials for a short-lived admin JWT (60 min).', + }, + args: { + username: { type: 'string', alias: 'u', description: 'Admin username' }, + password: { type: 'string', alias: 'p', description: 'Admin password (prompted if omitted)' }, + }, + async run({ args }) { + const username = args.username ?? (await consola.prompt('Admin username', { type: 'text' })); + const password = args.password ?? (await promptPassword('Admin password')); + + // The user-scope Treaty client is fine here — /admin/login is the + // credential-exchange route and ignores any Bearer header. + const client = await getUserClient(); + const { token, expiresIn } = await runApi({ + promise: client.admin.login.post({ username, password }), + action: 'admin login', + }); + + const expiresAt = Date.now() + expiresIn * 1000; + await saveConfig({ adminToken: token, adminTokenExpiresAt: expiresAt }); + consola.success(`Admin token stored (valid for ${Math.round(expiresIn / 60)} min).`); + }, +}); diff --git a/packages/cli/src/commands/admin/logout.ts b/packages/cli/src/commands/admin/logout.ts new file mode 100644 index 0000000000..0d6d9ea8ef --- /dev/null +++ b/packages/cli/src/commands/admin/logout.ts @@ -0,0 +1,11 @@ +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { saveConfig } from '../../api/config'; + +export default defineCommand({ + meta: { name: 'logout', description: 'Forget the stored admin JWT.' }, + async run() { + await saveConfig({ adminToken: null, adminTokenExpiresAt: null }); + consola.success('Admin token cleared.'); + }, +}); diff --git a/packages/cli/src/commands/admin/packs.ts b/packages/cli/src/commands/admin/packs.ts new file mode 100644 index 0000000000..b39c865e85 --- /dev/null +++ b/packages/cli/src/commands/admin/packs.ts @@ -0,0 +1,78 @@ +import { toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'Search/list packs across all users.' }, + args: { + q: { type: 'string' }, + limit: { type: 'string', default: '50' }, + offset: { type: 'string', default: '0' }, + 'include-deleted': { type: 'boolean', default: false }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin['packs-list'].get({ + query: { + q: args.q, + limit: Number.parseInt(args.limit, 10), + offset: Number.parseInt(args.offset, 10), + includeDeleted: args['include-deleted'], + }, + }), + action: 'admin list packs', + requiresAdmin: true, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + // Endpoint returns { data: [...], total, limit, offset } + printTable({ + rows: toRecordArray(toRecord(data).data).map((p) => ({ + id: p.id, + name: p.name, + userId: p.userId, + deleted: p.deleted, + })), + options: { title: 'Packs (admin)' }, + }); + }, +}); + +const deleteCmd = defineCommand({ + meta: { name: 'delete', description: 'Soft-delete any pack (admin).' }, + args: { + id: { type: 'positional', required: true, description: 'Pack ID' }, + yes: { type: 'boolean', alias: 'y', default: false }, + }, + async run({ args }) { + await requireAdmin(); + if (!args.yes) { + const confirm = await consola.prompt(`Delete pack ${args.id}?`, { type: 'confirm' }); + if (!confirm) return consola.info('Aborted.'); + } + const client = await getAdminClient(); + await runApi({ + promise: client.admin.packs({ id: args.id }).delete(), + action: 'admin delete pack', + resourceHint: `pack ${args.id}`, + requiresAdmin: true, + }); + consola.success(`Deleted ${args.id}.`); + }, +}); + +export default defineCommand({ + meta: { name: 'packs', description: 'Admin pack ops.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + delete: () => Promise.resolve(deleteCmd), + }, +}); diff --git a/packages/cli/src/commands/admin/stats.ts b/packages/cli/src/commands/admin/stats.ts new file mode 100644 index 0000000000..da2137c08e --- /dev/null +++ b/packages/cli/src/commands/admin/stats.ts @@ -0,0 +1,19 @@ +import { toRecord } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; +import { printSummary } from '../../shared'; + +export default defineCommand({ + meta: { name: 'stats', description: 'High-level platform stats.' }, + async run() { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.stats.get(), + action: 'admin stats', + requiresAdmin: true, + }); + printSummary({ data: toRecord(data), title: 'Admin stats' }); + }, +}); diff --git a/packages/cli/src/commands/admin/trails.ts b/packages/cli/src/commands/admin/trails.ts new file mode 100644 index 0000000000..58228a2897 --- /dev/null +++ b/packages/cli/src/commands/admin/trails.ts @@ -0,0 +1,107 @@ +import { toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +const searchCmd = defineCommand({ + meta: { name: 'search', description: 'Admin trail search.' }, + args: { + q: { type: 'positional', required: true }, + sport: { type: 'string' }, + limit: { type: 'string', default: '50' }, + offset: { type: 'string', default: '0' }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.trails.search.get({ + query: { + q: args.q, + sport: args.sport, + limit: Number.parseInt(args.limit, 10), + offset: Number.parseInt(args.offset, 10), + }, + }), + action: 'admin search trails', + requiresAdmin: true, + }); + printTable({ + rows: toRecordArray(toRecord(data).trails).map((t) => ({ + osmId: t.osmId, + name: t.name, + sport: t.sport, + })), + options: { title: 'Trails (admin)' }, + }); + }, +}); + +const reportsCmd = defineCommand({ + meta: { name: 'reports', description: 'List trail condition reports (admin).' }, + args: { + q: { type: 'string' }, + limit: { type: 'string', default: '50' }, + offset: { type: 'string', default: '0' }, + 'include-deleted': { type: 'boolean', default: false }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin.trails.conditions.get({ + query: { + q: args.q, + limit: Number.parseInt(args.limit, 10), + offset: Number.parseInt(args.offset, 10), + includeDeleted: args['include-deleted'], + }, + }), + action: 'admin list trail reports', + requiresAdmin: true, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + // Endpoint returns { data: [...], total, limit, offset } + printTable({ + rows: toRecordArray(toRecord(data).data).map((r) => ({ + id: r.id, + trailName: r.trailName, + condition: r.overallCondition, + userId: r.userId, + deleted: r.deleted, + })), + options: { title: 'Trail reports (admin)' }, + }); + }, +}); + +const deleteReportCmd = defineCommand({ + meta: { name: 'delete-report', description: 'Soft-delete a trail condition report (admin).' }, + args: { id: { type: 'positional', required: true } }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + await runApi({ + promise: client.admin.trails.conditions({ reportId: args.id }).delete(), + action: 'admin delete trail report', + resourceHint: `report ${args.id}`, + requiresAdmin: true, + }); + consola.success(`Deleted ${args.id}.`); + }, +}); + +export default defineCommand({ + meta: { name: 'trails', description: 'Admin trail / trail-condition ops.' }, + subCommands: { + search: () => Promise.resolve(searchCmd), + reports: () => Promise.resolve(reportsCmd), + 'delete-report': () => Promise.resolve(deleteReportCmd), + }, +}); diff --git a/packages/cli/src/commands/admin/users.ts b/packages/cli/src/commands/admin/users.ts new file mode 100644 index 0000000000..501d056b3e --- /dev/null +++ b/packages/cli/src/commands/admin/users.ts @@ -0,0 +1,83 @@ +import { toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getAdminClient } from '../../api/client'; +import { requireAdmin, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'Search/list users.' }, + args: { + q: { type: 'string', description: 'Email/name filter' }, + limit: { type: 'string', default: '50' }, + offset: { type: 'string', default: '0' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAdmin(); + const client = await getAdminClient(); + const data = await runApi({ + promise: client.admin['users-list'].get({ + query: { + q: args.q, + limit: Number.parseInt(args.limit, 10), + offset: Number.parseInt(args.offset, 10), + }, + }), + action: 'admin list users', + requiresAdmin: true, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + // Endpoint returns { data: [...], total, limit, offset } + const items = toRecordArray(toRecord(data).data); + printTable({ + rows: items.map((u) => ({ + id: u.id, + email: u.email, + name: u.name ?? u.firstName, + createdAt: u.createdAt, + })), + options: { title: 'Users' }, + }); + }, +}); + +const hardDeleteCmd = defineCommand({ + meta: { name: 'hard-delete', description: 'GDPR-style hard delete (irreversible).' }, + args: { + id: { type: 'positional', required: true, description: 'User ID' }, + reason: { type: 'string', required: true, description: 'Audit reason (required)' }, + yes: { type: 'boolean', alias: 'y', default: false }, + }, + async run({ args }) { + await requireAdmin(); + if (!args.yes) { + const confirm = await consola.prompt(`Hard-delete user ${args.id}? This is irreversible.`, { + type: 'confirm', + }); + if (!confirm) { + consola.info('Aborted.'); + return; + } + } + const client = await getAdminClient(); + await runApi({ + promise: client.admin.users({ id: args.id }).hard.delete({ reason: args.reason }), + action: 'hard delete user', + resourceHint: `user ${args.id}`, + requiresAdmin: true, + }); + consola.success(`Hard-deleted ${args.id}.`); + }, +}); + +export default defineCommand({ + meta: { name: 'users', description: 'Admin user operations.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + 'hard-delete': () => Promise.resolve(hardDeleteCmd), + }, +}); diff --git a/packages/cli/src/commands/ai/index.ts b/packages/cli/src/commands/ai/index.ts new file mode 100644 index 0000000000..cdc224d884 --- /dev/null +++ b/packages/cli/src/commands/ai/index.ts @@ -0,0 +1,79 @@ +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; + +const ragCmd = defineCommand({ + meta: { name: 'rag', description: 'Search the outdoor guides RAG corpus.' }, + args: { + q: { type: 'positional', required: true, description: 'Question or topic' }, + limit: { type: 'string', default: '5' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.ai['rag-search'].get({ + query: { q: args.q, limit: Number.parseInt(args.limit, 10) }, + }), + action: 'rag search', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const webCmd = defineCommand({ + meta: { name: 'web', description: 'Perplexity-powered web search.' }, + args: { q: { type: 'positional', required: true, description: 'Search query' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.ai['web-search'].get({ query: { q: args.q } }), + action: 'web search', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const sqlCmd = defineCommand({ + meta: { name: 'sql', description: 'Execute a read-only SQL SELECT against the API DB.' }, + args: { + query: { type: 'positional', required: true, description: 'SQL statement' }, + limit: { type: 'string', default: '100' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.ai['execute-sql'].post({ + query: args.query, + limit: Number.parseInt(args.limit, 10), + }), + action: 'execute sql', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const schemaCmd = defineCommand({ + meta: { name: 'schema', description: 'Print the API database schema.' }, + async run() { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ promise: client.ai['db-schema'].get(), action: 'fetch db schema' }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +export default defineCommand({ + meta: { + name: 'ai', + description: 'AI / RAG / SQL / web-search helpers (renamed from analytics SQL).', + }, + subCommands: { + rag: () => Promise.resolve(ragCmd), + web: () => Promise.resolve(webCmd), + sql: () => Promise.resolve(sqlCmd), + schema: () => Promise.resolve(schemaCmd), + }, +}); diff --git a/packages/cli/src/commands/auth/index.ts b/packages/cli/src/commands/auth/index.ts new file mode 100644 index 0000000000..f621272291 --- /dev/null +++ b/packages/cli/src/commands/auth/index.ts @@ -0,0 +1,12 @@ +import { defineCommand } from 'citty'; + +export default defineCommand({ + meta: { name: 'auth', description: 'Sign in, sign out, and inspect the PackRat session.' }, + subCommands: { + login: () => import('./login').then((m) => m.default), + logout: () => import('./logout').then((m) => m.default), + register: () => import('./register').then((m) => m.default), + refresh: () => import('./refresh').then((m) => m.default), + whoami: () => import('./whoami').then((m) => m.default), + }, +}); diff --git a/packages/cli/src/commands/auth/login.ts b/packages/cli/src/commands/auth/login.ts new file mode 100644 index 0000000000..505e9fe793 --- /dev/null +++ b/packages/cli/src/commands/auth/login.ts @@ -0,0 +1,67 @@ +import chalk from 'chalk'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { z } from 'zod'; +import { getBaseUrl } from '../../api/client'; +import { saveConfig } from '../../api/config'; +import { promptPassword } from '../../api/prompt'; + +const SignInResponseSchema = z.object({ + session: z.object({ token: z.string() }).optional(), + user: z.object({ id: z.string(), email: z.string().email().optional() }).optional(), + // Better Auth may also return a refresh token at top level. + refreshToken: z.string().optional(), +}); + +export default defineCommand({ + meta: { + name: 'login', + description: 'Sign in to PackRat (email + password). Token stored in ~/.packrat/config.json.', + }, + args: { + email: { type: 'string', alias: 'e', description: 'Email address' }, + password: { type: 'string', alias: 'p', description: 'Password (prompted if omitted)' }, + }, + async run({ args }) { + const email = args.email ?? (await consola.prompt('Email', { type: 'text' })); + const password = args.password ?? (await promptPassword('Password')); + + if (!email || !password) { + consola.error('Email and password are required.'); + process.exit(1); + } + + const baseUrl = await getBaseUrl(); + const response = await fetch(`${baseUrl}/api/auth/sign-in/email`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email, password }), + }); + + if (!response.ok) { + consola.error(`Sign-in failed (HTTP ${response.status})`); + const body = await response.text().catch(() => ''); + if (body) consola.error(chalk.dim(body)); + process.exit(1); + } + + const parsed = SignInResponseSchema.safeParse(await response.json().catch(() => null)); + const token = parsed.success ? parsed.data.session?.token : undefined; + const userId = parsed.success ? parsed.data.user?.id : undefined; + const refreshToken = parsed.success ? parsed.data.refreshToken : undefined; + + if (!token || !userId) { + consola.error('Sign-in succeeded but session payload was missing token/user.'); + process.exit(1); + } + + await saveConfig({ + accessToken: token, + refreshToken: refreshToken ?? null, + userEmail: email, + userId, + }); + + consola.success(`Signed in as ${chalk.cyan(email)}.`); + }, +}); diff --git a/packages/cli/src/commands/auth/logout.ts b/packages/cli/src/commands/auth/logout.ts new file mode 100644 index 0000000000..786fc930f1 --- /dev/null +++ b/packages/cli/src/commands/auth/logout.ts @@ -0,0 +1,34 @@ +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getBaseUrl } from '../../api/client'; +import { clearSession, loadConfig } from '../../api/config'; + +export default defineCommand({ + meta: { + name: 'logout', + description: 'Clear the local PackRat session. Optionally signs out on the server too.', + }, + args: { + 'keep-server-session': { + type: 'boolean', + description: 'Skip POST /api/auth/sign-out — only clear local tokens', + default: false, + }, + }, + async run({ args }) { + const config = await loadConfig(); + if (!args['keep-server-session'] && config.accessToken) { + try { + const baseUrl = await getBaseUrl(); + await fetch(`${baseUrl}/api/auth/sign-out`, { + method: 'POST', + headers: { Authorization: `Bearer ${config.accessToken}` }, + }); + } catch (e) { + consola.warn(`Server sign-out failed: ${e instanceof Error ? e.message : String(e)}`); + } + } + await clearSession(); + consola.success('Signed out.'); + }, +}); diff --git a/packages/cli/src/commands/auth/refresh.ts b/packages/cli/src/commands/auth/refresh.ts new file mode 100644 index 0000000000..35326a1aed --- /dev/null +++ b/packages/cli/src/commands/auth/refresh.ts @@ -0,0 +1,42 @@ +import chalk from 'chalk'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { z } from 'zod'; +import { getBaseUrl } from '../../api/client'; +import { loadConfig, saveConfig } from '../../api/config'; + +const RefreshResponseSchema = z.object({ + success: z.boolean().optional(), + accessToken: z.string().optional(), + refreshToken: z.string().optional(), +}); + +export default defineCommand({ + meta: { + name: 'refresh', + description: 'Force a token refresh using the stored refresh token.', + }, + async run() { + const config = await loadConfig(); + if (!config.refreshToken) { + consola.error(`No refresh token. Run ${chalk.cyan('packrat auth login')} first.`); + process.exit(1); + } + const baseUrl = await getBaseUrl(); + const response = await fetch(`${baseUrl}/api/auth/refresh`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ refreshToken: config.refreshToken }), + }); + const parsed = RefreshResponseSchema.safeParse(await response.json().catch(() => null)); + if (!response.ok || !parsed.success || !parsed.data.accessToken) { + consola.error(`Refresh failed (HTTP ${response.status}). Sign in again.`); + process.exit(1); + } + await saveConfig({ + accessToken: parsed.data.accessToken, + refreshToken: parsed.data.refreshToken ?? config.refreshToken, + }); + consola.success('Refreshed access token.'); + }, +}); diff --git a/packages/cli/src/commands/auth/register.ts b/packages/cli/src/commands/auth/register.ts new file mode 100644 index 0000000000..55cb05d6cc --- /dev/null +++ b/packages/cli/src/commands/auth/register.ts @@ -0,0 +1,62 @@ +import chalk from 'chalk'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { z } from 'zod'; +import { getBaseUrl } from '../../api/client'; +import { saveConfig } from '../../api/config'; +import { promptPassword } from '../../api/prompt'; + +const SignUpResponseSchema = z.object({ + session: z.object({ token: z.string() }).optional(), + user: z.object({ id: z.string(), email: z.string().email().optional() }).optional(), + refreshToken: z.string().optional(), +}); + +export default defineCommand({ + meta: { + name: 'register', + description: 'Create a new PackRat account (Better Auth email + password).', + }, + args: { + email: { type: 'string', alias: 'e', description: 'Email address' }, + password: { type: 'string', alias: 'p', description: 'Password (prompted if omitted)' }, + name: { type: 'string', alias: 'n', description: 'Display name' }, + }, + async run({ args }) { + const email = args.email ?? (await consola.prompt('Email', { type: 'text' })); + const name = args.name ?? (await consola.prompt('Name', { type: 'text' })); + const password = args.password ?? (await promptPassword('Password')); + + const baseUrl = await getBaseUrl(); + const response = await fetch(`${baseUrl}/api/auth/sign-up/email`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ email, password, name }), + }); + + if (!response.ok) { + consola.error(`Sign-up failed (HTTP ${response.status})`); + const body = await response.text().catch(() => ''); + if (body) consola.error(chalk.dim(body)); + process.exit(1); + } + + const parsed = SignUpResponseSchema.safeParse(await response.json().catch(() => null)); + const token = parsed.success ? parsed.data.session?.token : undefined; + const userId = parsed.success ? parsed.data.user?.id : undefined; + const refreshToken = parsed.success ? parsed.data.refreshToken : undefined; + + if (!token || !userId) { + consola.success('Account created. Run `packrat auth login` to sign in.'); + return; + } + + await saveConfig({ + accessToken: token, + refreshToken: refreshToken ?? null, + userEmail: email, + userId, + }); + consola.success(`Account created and signed in as ${chalk.cyan(email)}.`); + }, +}); diff --git a/packages/cli/src/commands/auth/whoami.ts b/packages/cli/src/commands/auth/whoami.ts new file mode 100644 index 0000000000..73937b7995 --- /dev/null +++ b/packages/cli/src/commands/auth/whoami.ts @@ -0,0 +1,33 @@ +import { toRecord } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getUserClient } from '../../api/client'; +import { CONFIG_FILE_PATH, loadConfig } from '../../api/config'; +import { requireAuth, runApi } from '../../api/run'; +import { printSummary } from '../../shared'; + +export default defineCommand({ + meta: { name: 'whoami', description: 'Show the current PackRat user and config path.' }, + async run() { + await requireAuth(); + const client = await getUserClient(); + const response = toRecord( + await runApi({ promise: client.user.profile.get(), action: 'fetch profile' }), + ); + const user = toRecord(response.user); + const config = await loadConfig(); + printSummary({ + data: { + baseUrl: config.baseUrl, + userId: config.userId ?? '—', + email: config.userEmail ?? user.email ?? '—', + firstName: user.firstName ?? '—', + lastName: user.lastName ?? '—', + adminTokenSet: Boolean(config.adminToken), + configFile: CONFIG_FILE_PATH, + }, + title: 'PackRat session', + }); + consola.success('Session looks healthy.'); + }, +}); diff --git a/packages/cli/src/commands/brand.ts b/packages/cli/src/commands/brand.ts index f94d510dc9..60806c50ef 100644 --- a/packages/cli/src/commands/brand.ts +++ b/packages/cli/src/commands/brand.ts @@ -10,9 +10,12 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const rows = await cache.analyzeBrand(args.name, parseCsvArg(args.sites)); - printTable(rows, { - title: `Brand Analysis: "${args.name}"`, + const rows = await cache.analyzeBrand({ brandName: args.name, sites: parseCsvArg(args.sites) }); + printTable({ + rows, + options: { + title: `Brand Analysis: "${args.name}"`, + }, }); }, }); diff --git a/packages/cli/src/commands/brands.ts b/packages/cli/src/commands/brands.ts index e78e11b4c9..7eb05d63dc 100644 --- a/packages/cli/src/commands/brands.ts +++ b/packages/cli/src/commands/brands.ts @@ -10,7 +10,10 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const rows = await cache.getTopBrands(parsePositiveIntArg(args.limit, '--limit'), args.site); - printTable(rows, { title: 'Top Brands' }); + const rows = await cache.getTopBrands({ + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), + site: args.site, + }); + printTable({ rows, options: { title: 'Top Brands' } }); }, }); diff --git a/packages/cli/src/commands/build-specs.ts b/packages/cli/src/commands/build-specs.ts index 375cbc5149..da6fb0a6ec 100644 --- a/packages/cli/src/commands/build-specs.ts +++ b/packages/cli/src/commands/build-specs.ts @@ -10,7 +10,7 @@ export default defineCommand({ const conn = cache.getConnection(); consola.start('Building spec table...'); - const parser = new SpecParser(conn); + const parser = new SpecParser({ conn }); const stats = await parser.build(); consola.success( `Parsed ${stats.parsed.toLocaleString()} / ${stats.total.toLocaleString()} products`, diff --git a/packages/cli/src/commands/cache.ts b/packages/cli/src/commands/cache.ts index e7f834d5b0..1be2a9dcd6 100644 --- a/packages/cli/src/commands/cache.ts +++ b/packages/cli/src/commands/cache.ts @@ -59,29 +59,29 @@ async function showStatus(): Promise { } consola.start('Fetching catalog stats...'); const stats = await cache.getLiveStats(); - printSummary( - { + printSummary({ + data: { Mode: 'catalog (R2 Data Catalog / Iceberg)', Records: stats.recordCount.toLocaleString(), Sites: stats.sites.join(', ') || '(none)', }, - 'Cache Status', - ); + title: 'Cache Status', + }); } else { const cache = await getCache(); const stats = cache.getCacheStats(); if (stats.recordCount === 0) { consola.info('Cache is empty. Run with --refresh to populate.'); } else { - printSummary( - { + printSummary({ + data: { Mode: 'local (DuckDB file)', Records: stats.recordCount.toLocaleString(), Sites: stats.sites.join(', '), 'Last Updated': stats.updatedAt ?? 'Never', }, - 'Cache Status', - ); + title: 'Cache Status', + }); } } } diff --git a/packages/cli/src/commands/catalog/index.ts b/packages/cli/src/commands/catalog/index.ts new file mode 100644 index 0000000000..15e3f07613 --- /dev/null +++ b/packages/cli/src/commands/catalog/index.ts @@ -0,0 +1,132 @@ +import { isString, toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; +import { printSummary, printTable } from '../../shared'; + +const searchCmd = defineCommand({ + meta: { name: 'search', description: 'Text search the gear catalog.' }, + args: { + q: { type: 'positional', required: true, description: 'Search keyword' }, + category: { type: 'string', alias: 'c' }, + limit: { type: 'string', alias: 'l', default: '10' }, + page: { type: 'string', default: '1' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const limit = Number.parseInt(args.limit, 10); + const page = Number.parseInt(args.page, 10); + const data = await runApi({ + promise: client.catalog.get({ + query: { q: args.q, category: args.category, limit, page }, + }), + action: 'search catalog', + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(toRecord(data).items).map((it) => ({ + id: it.id, + name: isString(it.name) ? it.name.slice(0, 60) : it.name, + brand: it.brand, + weight: it.weight, + price: it.price, + rating: it.ratingValue, + })), + options: { title: `Catalog "${args.q}"` }, + }); + }, +}); + +const semanticCmd = defineCommand({ + meta: { name: 'semantic', description: 'Semantic / vector search.' }, + args: { + q: { type: 'positional', required: true, description: 'Natural-language query' }, + limit: { type: 'string', alias: 'l', default: '8' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const limit = Number.parseInt(args.limit, 10); + const data = await runApi({ + promise: client.catalog['vector-search'].get({ query: { q: args.q, limit, offset: 0 } }), + action: 'semantic catalog search', + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(toRecord(data).items).map((it) => ({ + id: it.id, + name: isString(it.name) ? it.name.slice(0, 60) : it.name, + brand: it.brand, + similarity: it.similarity, + })), + options: { title: `Semantic: "${args.q}"` }, + }); + }, +}); + +const getCmd = defineCommand({ + meta: { name: 'get', description: 'Get a catalog item by ID.' }, + args: { + id: { type: 'positional', required: true, description: 'Catalog item ID (numeric)' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const item = await runApi({ + promise: client.catalog({ id: args.id }).get(), + action: 'get catalog item', + resourceHint: `item ${args.id}`, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(item, null, 2)}\n`); + return; + } + const r = toRecord(item); + printSummary({ + data: { + id: r.id, + name: r.name, + brand: r.brand, + weight: r.weight, + price: r.price, + rating: r.ratingValue, + reviewCount: r.reviewCount, + productUrl: r.productUrl, + }, + title: `Item ${r.id}`, + }); + }, +}); + +const categoriesCmd = defineCommand({ + meta: { name: 'categories', description: 'List catalog categories.' }, + async run() { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.catalog.categories.get({ query: { limit: 50 } }), + action: 'list catalog categories', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'catalog', description: 'Search and inspect the PackRat gear catalog.' }, + subCommands: { + search: () => Promise.resolve(searchCmd), + semantic: () => Promise.resolve(semanticCmd), + get: () => Promise.resolve(getCmd), + categories: () => Promise.resolve(categoriesCmd), + }, +}); diff --git a/packages/cli/src/commands/category.ts b/packages/cli/src/commands/category.ts index 016a9cbad6..c4c42464b2 100644 --- a/packages/cli/src/commands/category.ts +++ b/packages/cli/src/commands/category.ts @@ -10,7 +10,10 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const rows = await cache.categoryInsights(args.name, parseCsvArg(args.sites)); - printTable(rows, { title: `Category: "${args.name}"` }); + const rows = await cache.categoryInsights({ + categoryKeyword: args.name, + sites: parseCsvArg(args.sites), + }); + printTable({ rows, options: { title: `Category: "${args.name}"` } }); }, }); diff --git a/packages/cli/src/commands/compare.ts b/packages/cli/src/commands/compare.ts index e8f8691ede..80575c2a2b 100644 --- a/packages/cli/src/commands/compare.ts +++ b/packages/cli/src/commands/compare.ts @@ -10,9 +10,15 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const rows = await cache.comparePrices(args.keyword, parseCsvArg(args.sites)); - printTable(rows, { - title: `Price Comparison: "${args.keyword}"`, + const rows = await cache.comparePrices({ + keyword: args.keyword, + sites: parseCsvArg(args.sites), + }); + printTable({ + rows, + options: { + title: `Price Comparison: "${args.keyword}"`, + }, }); }, }); diff --git a/packages/cli/src/commands/deals.ts b/packages/cli/src/commands/deals.ts index 66003374a5..f151ded793 100644 --- a/packages/cli/src/commands/deals.ts +++ b/packages/cli/src/commands/deals.ts @@ -12,23 +12,29 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const maxPrice = parseNonNegativeNumberArg(args['max-price'], '--max-price'); - const rows = await cache.findDeals(maxPrice, { - category: args.category, - sites: parseCsvArg(args.sites), - limit: parsePositiveIntArg(args.limit, '--limit'), + const maxPrice = parseNonNegativeNumberArg({ + value: args['max-price'], + argName: '--max-price', }); - printTable( - rows.map(({ site, name, brand, price, category }) => ({ + const rows = await cache.findDeals({ + maxPrice, + options: { + category: args.category, + sites: parseCsvArg(args.sites), + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), + }, + }); + printTable({ + rows: rows.map(({ site, name, brand, price, category }) => ({ site, name: name.slice(0, 50), brand, price, category, })), - { + options: { title: `Deals under $${maxPrice}`, }, - ); + }); }, }); diff --git a/packages/cli/src/commands/export.ts b/packages/cli/src/commands/export.ts index daedd6d204..d4d86592a0 100644 --- a/packages/cli/src/commands/export.ts +++ b/packages/cli/src/commands/export.ts @@ -45,14 +45,14 @@ export default defineCommand({ const summary = await exporter.export({ format, outputDir: args['output-dir'], - sample: parseOptionalNumberArg(args.sample, '--sample'), + sample: parseOptionalNumberArg({ value: args.sample, argName: '--sample' }), dedup, includeQuality: args.quality ?? dedup !== 'none', skuFilter: args.sku, }); - printSummary( - { + printSummary({ + data: { File: summary.filepath, Records: summary.totalRecords, 'Unique SKUs': summary.uniqueSkus, @@ -60,7 +60,7 @@ export default defineCommand({ Brands: summary.brands, Strategy: summary.strategy, }, - 'Export Complete', - ); + title: 'Export Complete', + }); }, }); diff --git a/packages/cli/src/commands/feed/index.ts b/packages/cli/src/commands/feed/index.ts new file mode 100644 index 0000000000..ff5417641d --- /dev/null +++ b/packages/cli/src/commands/feed/index.ts @@ -0,0 +1,92 @@ +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'List feed posts.' }, + args: { + page: { type: 'string', default: '1' }, + limit: { type: 'string', default: '20' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.feed.get({ + query: { page: Number.parseInt(args.page, 10), limit: Number.parseInt(args.limit, 10) }, + }), + action: 'list feed', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const postCmd = defineCommand({ + meta: { name: 'post', description: 'Create a feed post.' }, + args: { + caption: { type: 'positional', required: true, description: 'Caption text' }, + images: { type: 'string', description: 'Comma-separated image keys' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const images = args.images + ? args.images + .split(',') + .map((s) => s.trim()) + .filter(Boolean) + : []; + const data = await runApi({ + promise: client.feed.post({ caption: args.caption, images }), + action: 'create feed post', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const likeCmd = defineCommand({ + meta: { name: 'like', description: 'Toggle like on a feed post.' }, + args: { id: { type: 'positional', required: true, description: 'Post ID' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.feed({ postId: args.id }).like.post({}), + action: 'toggle post like', + resourceHint: `post ${args.id}`, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const commentCmd = defineCommand({ + meta: { name: 'comment', description: 'Comment on a feed post.' }, + args: { + id: { type: 'positional', required: true, description: 'Post ID' }, + content: { type: 'string', required: true, description: 'Comment text' }, + parent: { type: 'string', description: 'Parent comment ID for replies' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.feed({ postId: args.id }).comments.post({ + content: args.content, + parentCommentId: args.parent ? Number.parseInt(args.parent, 10) : undefined, + }), + action: 'create feed comment', + resourceHint: `post ${args.id}`, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'feed', description: 'Social feed posts, likes, and comments.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + post: () => Promise.resolve(postCmd), + like: () => Promise.resolve(likeCmd), + comment: () => Promise.resolve(commentCmd), + }, +}); diff --git a/packages/cli/src/commands/filter.ts b/packages/cli/src/commands/filter.ts index e3f6e7110b..1275fa0d6f 100644 --- a/packages/cli/src/commands/filter.ts +++ b/packages/cli/src/commands/filter.ts @@ -26,24 +26,24 @@ export default defineCommand({ temp: 'temp_rating_f', }; - const parser = new SpecParser(conn); + const parser = new SpecParser({ conn }); const rows = await parser.filterProducts({ category: args.category, maxWeightG: args['max-weight'] - ? parseNonNegativeNumberArg(args['max-weight'], '--max-weight') + ? parseNonNegativeNumberArg({ value: args['max-weight'], argName: '--max-weight' }) : undefined, maxTempF: args['max-temp'] - ? parseOptionalNumberArg(args['max-temp'], '--max-temp') + ? parseOptionalNumberArg({ value: args['max-temp'], argName: '--max-temp' }) : undefined, - maxPrice: parseOptionalNumberArg(args['max-price'], '--max-price'), - minPrice: parseOptionalNumberArg(args['min-price'], '--min-price'), + maxPrice: parseOptionalNumberArg({ value: args['max-price'], argName: '--max-price' }), + minPrice: parseOptionalNumberArg({ value: args['min-price'], argName: '--min-price' }), gender: args.gender, seasons: args.seasons, sortBy: sortMap[args.sort] ?? 'price', - limit: parsePositiveIntArg(args.limit, '--limit'), + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), }); - printTable( - rows.map(({ name, brand, price, weight_grams, temp_rating_f, seasons, gender }) => ({ + printTable({ + rows: rows.map(({ name, brand, price, weight_grams, temp_rating_f, seasons, gender }) => ({ name: String(name).slice(0, 40), brand, price, @@ -52,7 +52,7 @@ export default defineCommand({ seasons, gender, })), - { title: 'Filtered Products' }, - ); + options: { title: 'Filtered Products' }, + }); }, }); diff --git a/packages/cli/src/commands/images.ts b/packages/cli/src/commands/images.ts index 3a2eaa2d68..298bedfa38 100644 --- a/packages/cli/src/commands/images.ts +++ b/packages/cli/src/commands/images.ts @@ -14,21 +14,21 @@ export default defineCommand({ async run({ args }) { const cache = await ensureCache(); const conn = cache.getConnection(); - const limit = parsePositiveIntArg(args.limit, '--limit'); + const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' }); - const enrichment = new Enrichment(conn); + const enrichment = new Enrichment({ conn }); if (args.build) { consola.start('Building image aggregation...'); const stats = await enrichment.buildImages(); - printSummary( - { + printSummary({ + data: { 'Total images': stats.total_images, 'Products with images': stats.products_with_images, 'Unique URLs': stats.unique_urls, }, - 'Image Aggregation Complete', - ); + title: 'Image Aggregation Complete', + }); return; } @@ -37,19 +37,19 @@ export default defineCommand({ return; } - const images = await enrichment.getProductImages(args.product, limit); + const images = await enrichment.getProductImages({ query: args.product, limit }); if (images.length === 0) { consola.warn('No images found. Run `packrat images --build` first.'); return; } - printTable( - images.map((img) => ({ + printTable({ + rows: images.map((img) => ({ Site: img.site, Name: String(img.name).slice(0, 40), URL: String(img.url).slice(0, 60), })), - { title: `Images: "${args.product}"` }, - ); + options: { title: `Images: "${args.product}"` }, + }); }, }); diff --git a/packages/cli/src/commands/lightweight.ts b/packages/cli/src/commands/lightweight.ts index 2b9af32bea..55c4ff960a 100644 --- a/packages/cli/src/commands/lightweight.ts +++ b/packages/cli/src/commands/lightweight.ts @@ -17,15 +17,18 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const maxWeight = parseNonNegativeNumberArg(args['max-weight'], '--max-weight'); + const maxWeight = parseNonNegativeNumberArg({ + value: args['max-weight'], + argName: '--max-weight', + }); const rows = await cache.findLightweight({ category: args.category, maxWeightG: maxWeight, sites: parseCsvArg(args.sites), - limit: parsePositiveIntArg(args.limit, '--limit'), + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), }); - printTable( - rows.map(({ site, name, brand, weight_g, price, weight_per_dollar }) => ({ + printTable({ + rows: rows.map(({ site, name, brand, weight_g, price, weight_per_dollar }) => ({ site, name: String(name).slice(0, 40), brand, @@ -33,7 +36,7 @@ export default defineCommand({ price, 'g/$': weight_per_dollar, })), - { title: `Lightweight Gear (≤${maxWeight}g)` }, - ); + options: { title: `Lightweight Gear (≤${maxWeight}g)` }, + }); }, }); diff --git a/packages/cli/src/commands/market-share.ts b/packages/cli/src/commands/market-share.ts index f2d8604682..de20919575 100644 --- a/packages/cli/src/commands/market-share.ts +++ b/packages/cli/src/commands/market-share.ts @@ -12,8 +12,8 @@ export default defineCommand({ const cache = await ensureCache(); const rows = await cache.getMarketShare({ category: args.category, - topN: parsePositiveIntArg(args.top, '--top'), + topN: parsePositiveIntArg({ value: args.top, argName: '--top' }), }); - printTable(rows, { title: 'Market Share' }); + printTable({ rows, options: { title: 'Market Share' } }); }, }); diff --git a/packages/cli/src/commands/packs/create.ts b/packages/cli/src/commands/packs/create.ts new file mode 100644 index 0000000000..e3032ae3a3 --- /dev/null +++ b/packages/cli/src/commands/packs/create.ts @@ -0,0 +1,47 @@ +import { toRecord } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getUserClient } from '../../api/client'; +import { nowIso, shortId } from '../../api/ids'; +import { requireAuth, runApi } from '../../api/run'; + +export default defineCommand({ + meta: { name: 'create', description: 'Create a new pack.' }, + args: { + name: { type: 'positional', description: 'Pack name', required: true }, + category: { + type: 'string', + alias: 'c', + description: 'Pack category (backpacking, camping, hiking, ...)', + default: 'general', + }, + description: { type: 'string', alias: 'd', description: 'Optional description' }, + public: { type: 'boolean', description: 'Make pack public', default: false }, + tags: { type: 'string', description: 'Comma-separated tags' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const now = nowIso(); + const tags = args.tags + ? args.tags + .split(',') + .map((t) => t.trim()) + .filter(Boolean) + : undefined; + const pack = await runApi({ + promise: client.packs.post({ + id: shortId('p'), + name: args.name, + description: args.description, + category: args.category, + isPublic: args.public, + tags, + localCreatedAt: now, + localUpdatedAt: now, + }), + action: 'create pack', + }); + consola.success(`Created pack ${toRecord(pack).id ?? '(unknown id)'}`); + }, +}); diff --git a/packages/cli/src/commands/packs/delete.ts b/packages/cli/src/commands/packs/delete.ts new file mode 100644 index 0000000000..1382c07984 --- /dev/null +++ b/packages/cli/src/commands/packs/delete.ts @@ -0,0 +1,29 @@ +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; + +export default defineCommand({ + meta: { name: 'delete', description: 'Soft-delete a pack.' }, + args: { + id: { type: 'positional', description: 'Pack ID', required: true }, + yes: { type: 'boolean', alias: 'y', description: 'Skip confirmation', default: false }, + }, + async run({ args }) { + await requireAuth(); + if (!args.yes) { + const confirm = await consola.prompt(`Delete pack ${args.id}?`, { type: 'confirm' }); + if (!confirm) { + consola.info('Aborted.'); + return; + } + } + const client = await getUserClient(); + await runApi({ + promise: client.packs({ packId: args.id }).delete(), + action: 'delete pack', + resourceHint: `pack ${args.id}`, + }); + consola.success(`Deleted ${args.id}.`); + }, +}); diff --git a/packages/cli/src/commands/packs/gap-analysis.ts b/packages/cli/src/commands/packs/gap-analysis.ts new file mode 100644 index 0000000000..831ad8b943 --- /dev/null +++ b/packages/cli/src/commands/packs/gap-analysis.ts @@ -0,0 +1,48 @@ +import { defineCommand } from 'citty'; +import consola from 'consola'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; + +export default defineCommand({ + meta: { + name: 'gap-analysis', + description: 'Run gear gap analysis for a pack against a planned trip.', + }, + args: { + id: { type: 'positional', description: 'Pack ID', required: true }, + destination: { type: 'string', required: true, description: 'Trip destination' }, + 'trip-type': { + type: 'string', + default: 'backpacking', + description: 'Trip / activity type (backpacking, camping, hiking, ...)', + }, + duration: { + type: 'string', + default: '3', + description: 'Trip duration in days', + }, + start: { type: 'string', description: 'ISO start date' }, + end: { type: 'string', description: 'ISO end date' }, + }, + async run({ args }) { + await requireAuth(); + const duration = Number.parseInt(args.duration, 10); + if (!Number.isInteger(duration) || duration < 1) { + consola.error(`Invalid --duration "${args.duration}" — must be a positive integer (days).`); + process.exit(1); + } + const client = await getUserClient(); + const result = await runApi({ + promise: client.packs({ packId: args.id })['gap-analysis'].post({ + destination: args.destination, + tripType: args['trip-type'], + duration, + startDate: args.start, + endDate: args.end, + }), + action: 'analyze pack gaps', + resourceHint: `pack ${args.id}`, + }); + process.stdout.write(`${JSON.stringify(result, null, 2)}\n`); + }, +}); diff --git a/packages/cli/src/commands/packs/get.ts b/packages/cli/src/commands/packs/get.ts new file mode 100644 index 0000000000..eaa39372cc --- /dev/null +++ b/packages/cli/src/commands/packs/get.ts @@ -0,0 +1,42 @@ +import { toRecord } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; +import { printSummary } from '../../shared'; + +export default defineCommand({ + meta: { name: 'get', description: 'Get a single pack with items and weight totals.' }, + args: { + id: { type: 'positional', description: 'Pack ID', required: true }, + json: { type: 'boolean', description: 'Print raw JSON', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const pack = await runApi({ + promise: client.packs({ packId: args.id }).get(), + action: 'get pack', + resourceHint: `pack ${args.id}`, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(pack, null, 2)}\n`); + return; + } + const p = toRecord(pack); + printSummary({ + data: { + id: p.id, + name: p.name, + category: p.category, + description: p.description, + totalGrams: p.totalWeight, + baseGrams: p.baseWeight, + wornGrams: p.wornWeight, + consumableGrams: p.consumableWeight, + isPublic: p.isPublic, + items: Array.isArray(p.items) ? p.items.length : 0, + }, + title: `Pack ${p.name ?? args.id}`, + }); + }, +}); diff --git a/packages/cli/src/commands/packs/index.ts b/packages/cli/src/commands/packs/index.ts new file mode 100644 index 0000000000..3712f22e5d --- /dev/null +++ b/packages/cli/src/commands/packs/index.ts @@ -0,0 +1,13 @@ +import { defineCommand } from 'citty'; + +export default defineCommand({ + meta: { name: 'packs', description: 'List, create, and manage your PackRat packs.' }, + subCommands: { + list: () => import('./list').then((m) => m.default), + get: () => import('./get').then((m) => m.default), + create: () => import('./create').then((m) => m.default), + delete: () => import('./delete').then((m) => m.default), + items: () => import('./items').then((m) => m.default), + 'gap-analysis': () => import('./gap-analysis').then((m) => m.default), + }, +}); diff --git a/packages/cli/src/commands/packs/items.ts b/packages/cli/src/commands/packs/items.ts new file mode 100644 index 0000000000..6e94b3e0c0 --- /dev/null +++ b/packages/cli/src/commands/packs/items.ts @@ -0,0 +1,38 @@ +import { toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +export default defineCommand({ + meta: { name: 'items', description: 'List items in a pack.' }, + args: { + id: { type: 'positional', description: 'Pack ID', required: true }, + json: { type: 'boolean', description: 'Print raw JSON', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const items = await runApi({ + promise: client.packs({ packId: args.id }).items.get(), + action: 'list pack items', + resourceHint: `pack ${args.id}`, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(items, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(items).map((r) => ({ + id: r.id, + name: r.name, + category: r.category, + weight: r.weight, + qty: r.quantity, + worn: r.worn, + consumable: r.consumable, + })), + options: { title: `Items in ${args.id}` }, + }); + }, +}); diff --git a/packages/cli/src/commands/packs/list.ts b/packages/cli/src/commands/packs/list.ts new file mode 100644 index 0000000000..68921b1a67 --- /dev/null +++ b/packages/cli/src/commands/packs/list.ts @@ -0,0 +1,41 @@ +import { toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +export default defineCommand({ + meta: { name: 'list', description: 'List your packs.' }, + args: { + 'include-public': { + type: 'boolean', + description: 'Include public packs from other users', + default: false, + }, + json: { type: 'boolean', description: 'Print raw JSON', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const includePublic = args['include-public'] ? 1 : 0; + const packs = await runApi({ + promise: client.packs.get({ query: { includePublic } }), + action: 'list packs', + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(packs, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(packs).map((r) => ({ + id: r.id, + name: r.name, + category: r.category, + items: r.itemCount, + totalGrams: r.totalWeight, + isPublic: r.isPublic, + })), + options: { title: 'Your packs' }, + }); + }, +}); diff --git a/packages/cli/src/commands/prices.ts b/packages/cli/src/commands/prices.ts index 40b242a60c..856f66eb2b 100644 --- a/packages/cli/src/commands/prices.ts +++ b/packages/cli/src/commands/prices.ts @@ -9,6 +9,6 @@ export default defineCommand({ async run({ args }) { const cache = await ensureCache(); const rows = await cache.getPriceDistribution(args.site); - printTable(rows, { title: 'Price Distribution' }); + printTable({ rows, options: { title: 'Price Distribution' } }); }, }); diff --git a/packages/cli/src/commands/ratings.ts b/packages/cli/src/commands/ratings.ts index b42d008165..5bcdf27925 100644 --- a/packages/cli/src/commands/ratings.ts +++ b/packages/cli/src/commands/ratings.ts @@ -14,12 +14,15 @@ export default defineCommand({ const cache = await ensureCache(); const rows = await cache.getTopRated({ category: args.category, - minReviews: parseNonNegativeNumberArg(args['min-reviews'], '--min-reviews'), + minReviews: parseNonNegativeNumberArg({ + value: args['min-reviews'], + argName: '--min-reviews', + }), sites: parseCsvArg(args.sites), - limit: parsePositiveIntArg(args.limit, '--limit'), + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), }); - printTable( - rows.map(({ site, name, brand, rating_value, review_count, price, score }) => ({ + printTable({ + rows: rows.map(({ site, name, brand, rating_value, review_count, price, score }) => ({ site, name: String(name).slice(0, 40), brand, @@ -28,7 +31,7 @@ export default defineCommand({ price, score, })), - { title: 'Top Rated Products' }, - ); + options: { title: 'Top Rated Products' }, + }); }, }); diff --git a/packages/cli/src/commands/resolve.ts b/packages/cli/src/commands/resolve.ts index 72c14c11d4..7331188812 100644 --- a/packages/cli/src/commands/resolve.ts +++ b/packages/cli/src/commands/resolve.ts @@ -27,22 +27,25 @@ export default defineCommand({ async run({ args }) { const cache = await ensureCache(); const conn = cache.getConnection(); - const limit = parsePositiveIntArg(args.limit, '--limit'); + const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' }); - const resolver = new EntityResolver(conn); + const resolver = new EntityResolver({ conn }); if (args.build) { - const minConfidence = parseConfidenceArg(args['min-confidence'], '--min-confidence'); + const minConfidence = parseConfidenceArg({ + value: args['min-confidence'], + argName: '--min-confidence', + }); consola.start('Running entity resolution (this may take a while)...'); const stats = await resolver.build(minConfidence); - printSummary( - { + printSummary({ + data: { 'Total listings': stats.total, 'Unique products': stats.entities, 'Dedup ratio': `${stats.dedupRatio}%`, }, - 'Entity Resolution Complete', - ); + title: 'Entity Resolution Complete', + }); return; } @@ -51,14 +54,14 @@ export default defineCommand({ return; } - const matches = await resolver.identifyProduct(args.product, limit); + const matches = await resolver.identifyProduct({ query: args.product, limit }); if (matches.length === 0) { consola.warn('No matches. Run `packrat resolve --build` first.'); return; } - printTable( - matches.map((m) => ({ + printTable({ + rows: matches.map((m) => ({ 'Canonical ID': String(m.canonical_id).slice(0, 8), Site: m.site, Name: String(m.name).slice(0, 35), @@ -67,7 +70,7 @@ export default defineCommand({ Confidence: m.confidence, Method: m.match_method, })), - { title: `Cross-site listings: "${args.product}"` }, - ); + options: { title: `Cross-site listings: "${args.product}"` }, + }); }, }); diff --git a/packages/cli/src/commands/reviews.ts b/packages/cli/src/commands/reviews.ts index 8fe34f4665..cf08d19c75 100644 --- a/packages/cli/src/commands/reviews.ts +++ b/packages/cli/src/commands/reviews.ts @@ -14,22 +14,22 @@ export default defineCommand({ async run({ args }) { const cache = await ensureCache(); const conn = cache.getConnection(); - const limit = parsePositiveIntArg(args.limit, '--limit'); + const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' }); - const enrichment = new Enrichment(conn); + const enrichment = new Enrichment({ conn }); if (args.build) { consola.start('Building review aggregation...'); const stats = await enrichment.buildReviews(); - printSummary( - { + printSummary({ + data: { 'Total review entries': stats.total_reviews, 'Products with reviews': stats.products_with_reviews, 'Sites with reviews': stats.sites_with_reviews, 'Average rating': stats.avg_rating, }, - 'Review Aggregation Complete', - ); + title: 'Review Aggregation Complete', + }); return; } @@ -38,14 +38,14 @@ export default defineCommand({ return; } - const reviews = await enrichment.getProductReviews(args.product, limit); + const reviews = await enrichment.getProductReviews({ query: args.product, limit }); if (reviews.length === 0) { consola.warn('No reviews found. Run `packrat reviews --build` first.'); return; } - printTable( - reviews.map((r) => ({ + printTable({ + rows: reviews.map((r) => ({ Site: r.site, Name: String(r.name).slice(0, 40), Brand: r.brand, @@ -55,7 +55,7 @@ export default defineCommand({ 'Wtd Avg': r.weighted_avg_rating, 'Total Reviews': r.total_reviews, })), - { title: `Reviews: "${args.product}"` }, - ); + options: { title: `Reviews: "${args.product}"` }, + }); }, }); diff --git a/packages/cli/src/commands/sales.ts b/packages/cli/src/commands/sales.ts index 5b2e877426..e5f66c57a8 100644 --- a/packages/cli/src/commands/sales.ts +++ b/packages/cli/src/commands/sales.ts @@ -13,20 +13,23 @@ export default defineCommand({ async run({ args }) { const cache = await ensureCache(); const rows = await cache.findSales({ - minDiscountPct: parsePercentageArg(args['min-discount'], '--min-discount'), + minDiscountPct: parsePercentageArg({ + value: args['min-discount'], + argName: '--min-discount', + }), category: args.category, sites: parseCsvArg(args.sites), - limit: parsePositiveIntArg(args.limit, '--limit'), + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), }); - printTable( - rows.map(({ site, name, price, compare_at_price, discount_pct }) => ({ + printTable({ + rows: rows.map(({ site, name, price, compare_at_price, discount_pct }) => ({ site, name: String(name).slice(0, 40), price, was: compare_at_price, 'off%': discount_pct, })), - { title: 'Items on Sale' }, - ); + options: { title: 'Items on Sale' }, + }); }, }); diff --git a/packages/cli/src/commands/schema.ts b/packages/cli/src/commands/schema.ts index e791a5e414..45b5b34939 100644 --- a/packages/cli/src/commands/schema.ts +++ b/packages/cli/src/commands/schema.ts @@ -57,6 +57,6 @@ export default defineCommand({ return; } - printTable(rows, { title: 'Field Coverage by Site (%)' }); + printTable({ rows, options: { title: 'Field Coverage by Site (%)' } }); }, }); diff --git a/packages/cli/src/commands/search.ts b/packages/cli/src/commands/search.ts index 6c78695cc4..ff73e75074 100644 --- a/packages/cli/src/commands/search.ts +++ b/packages/cli/src/commands/search.ts @@ -13,18 +13,26 @@ export default defineCommand({ }, async run({ args }) { const cache = await ensureCache(); - const limit = parsePositiveIntArg(args.limit, '--limit'); - const rows = await cache.search(args.keyword, { - maxPrice: parseOptionalNumberArg(args['max-price'], '--max-price'), - minPrice: parseOptionalNumberArg(args['min-price'], '--min-price'), - sites: parseCsvArg(args.sites), - limit, + const limit = parsePositiveIntArg({ value: args.limit, argName: '--limit' }); + const rows = await cache.search({ + keyword: args.keyword, + options: { + maxPrice: parseOptionalNumberArg({ value: args['max-price'], argName: '--max-price' }), + minPrice: parseOptionalNumberArg({ value: args['min-price'], argName: '--min-price' }), + sites: parseCsvArg(args.sites), + limit, + }, }); - printTable( - rows.map(({ site, name, brand, price }) => ({ site, name: name.slice(0, 50), brand, price })), - { + printTable({ + rows: rows.map(({ site, name, brand, price }) => ({ + site, + name: name.slice(0, 50), + brand, + price, + })), + options: { title: `Search: "${args.keyword}"`, }, - ); + }); }, }); diff --git a/packages/cli/src/commands/seasons/index.ts b/packages/cli/src/commands/seasons/index.ts new file mode 100644 index 0000000000..40c4ae8d01 --- /dev/null +++ b/packages/cli/src/commands/seasons/index.ts @@ -0,0 +1,23 @@ +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; + +export default defineCommand({ + meta: { + name: 'seasons', + description: 'Generate season-appropriate pack suggestions for a location + date.', + }, + args: { + location: { type: 'string', required: true, description: 'Geocodable location string' }, + date: { type: 'string', required: true, description: 'ISO date or month label' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client['season-suggestions'].post({ location: args.location, date: args.date }), + action: 'season suggestions', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); diff --git a/packages/cli/src/commands/specs.ts b/packages/cli/src/commands/specs.ts index 90279cf33b..e247752af3 100644 --- a/packages/cli/src/commands/specs.ts +++ b/packages/cli/src/commands/specs.ts @@ -13,13 +13,13 @@ export default defineCommand({ const cache = await ensureCache(); const conn = cache.getConnection(); - const parser = new SpecParser(conn); - const rows = await parser.getProductSpecs( - args.product, - parsePositiveIntArg(args.limit, '--limit'), - ); - printTable( - rows.map( + const parser = new SpecParser({ conn }); + const rows = await parser.getProductSpecs({ + query: args.product, + limit: parsePositiveIntArg({ value: args.limit, argName: '--limit' }), + }); + printTable({ + rows: rows.map( ({ name, brand, @@ -42,7 +42,7 @@ export default defineCommand({ fabric, }), ), - { title: `Specs: "${args.product}"` }, - ); + options: { title: `Specs: "${args.product}"` }, + }); }, }); diff --git a/packages/cli/src/commands/stats.ts b/packages/cli/src/commands/stats.ts index 55d9583cd8..55ff887eaf 100644 --- a/packages/cli/src/commands/stats.ts +++ b/packages/cli/src/commands/stats.ts @@ -6,6 +6,6 @@ export default defineCommand({ async run() { const cache = await ensureCache(); const rows = await cache.getSiteStats(); - printTable(rows, { title: 'Site Statistics' }); + printTable({ rows, options: { title: 'Site Statistics' } }); }, }); diff --git a/packages/cli/src/commands/summary.ts b/packages/cli/src/commands/summary.ts index bbf95b451f..5828b4d8b7 100644 --- a/packages/cli/src/commands/summary.ts +++ b/packages/cli/src/commands/summary.ts @@ -6,8 +6,8 @@ export default defineCommand({ async run() { const cache = await ensureCache(); const data = await cache.getMarketSummary(); - printSummary( - { + printSummary({ + data: { 'Total Items': data.totalItems.toLocaleString(), Sites: data.totalSites, Brands: data.totalBrands.toLocaleString(), @@ -15,7 +15,7 @@ export default defineCommand({ 'Avg Price': `$${data.avgPrice.toFixed(2)}`, 'In Stock': `${data.inStockPct}%`, }, - 'Market Summary', - ); + title: 'Market Summary', + }); }, }); diff --git a/packages/cli/src/commands/templates/index.ts b/packages/cli/src/commands/templates/index.ts new file mode 100644 index 0000000000..319a961d57 --- /dev/null +++ b/packages/cli/src/commands/templates/index.ts @@ -0,0 +1,104 @@ +import { toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { nowIso, shortId } from '../../api/ids'; +import { requireAuth, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'List pack templates (user + app curated).' }, + args: { json: { type: 'boolean', default: false } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client['pack-templates'].get(), + action: 'list pack templates', + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(data).map((r) => ({ + id: r.id, + name: r.name, + category: r.category, + isApp: r.isAppTemplate, + })), + options: { title: 'Pack templates' }, + }); + }, +}); + +const getCmd = defineCommand({ + meta: { name: 'get', description: 'Get a pack template with its items.' }, + args: { id: { type: 'positional', required: true, description: 'Template ID' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client['pack-templates']({ templateId: args.id }).get(), + action: 'get pack template', + resourceHint: `template ${args.id}`, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const createCmd = defineCommand({ + meta: { name: 'create', description: 'Create a pack template.' }, + args: { + name: { type: 'positional', required: true }, + category: { type: 'string', default: 'general' }, + description: { type: 'string', alias: 'd' }, + 'app-template': { + type: 'boolean', + default: false, + description: 'Mark as app template (admin)', + }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const now = nowIso(); + const data = await runApi({ + promise: client['pack-templates'].post({ + id: shortId('pt'), + name: args.name, + description: args.description, + category: args.category, + isAppTemplate: args['app-template'], + localCreatedAt: now, + localUpdatedAt: now, + }), + action: 'create pack template', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +const deleteCmd = defineCommand({ + meta: { name: 'delete', description: 'Delete a pack template.' }, + args: { id: { type: 'positional', required: true } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + await runApi({ + promise: client['pack-templates']({ templateId: args.id }).delete(), + action: 'delete pack template', + resourceHint: `template ${args.id}`, + }); + process.stdout.write(`Deleted ${args.id}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'templates', description: 'Pack templates.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + get: () => Promise.resolve(getCmd), + create: () => Promise.resolve(createCmd), + delete: () => Promise.resolve(deleteCmd), + }, +}); diff --git a/packages/cli/src/commands/trails/index.ts b/packages/cli/src/commands/trails/index.ts new file mode 100644 index 0000000000..f3899d477f --- /dev/null +++ b/packages/cli/src/commands/trails/index.ts @@ -0,0 +1,89 @@ +import { toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; +import { printTable } from '../../shared'; + +const searchCmd = defineCommand({ + meta: { name: 'search', description: 'Search OSM trails by name, sport, or geography.' }, + args: { + q: { type: 'string', description: 'Text query' }, + lat: { type: 'string', description: 'Latitude (with --lon for spatial search)' }, + lon: { type: 'string', description: 'Longitude' }, + radius: { type: 'string', description: 'Search radius in km' }, + sport: { type: 'string' }, + limit: { type: 'string', default: '20' }, + offset: { type: 'string', default: '0' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.trails.search.get({ + query: { + q: args.q, + lat: args.lat ? Number.parseFloat(args.lat) : undefined, + lon: args.lon ? Number.parseFloat(args.lon) : undefined, + radius: args.radius ? Number.parseFloat(args.radius) : undefined, + sport: args.sport, + limit: Number.parseInt(args.limit, 10), + offset: Number.parseInt(args.offset, 10), + }, + }), + action: 'search trails', + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(toRecord(data).trails).map((t) => ({ + osmId: t.osmId, + name: t.name, + sport: t.sport, + distance: t.distance, + })), + options: { title: 'Trails' }, + }); + }, +}); + +const getCmd = defineCommand({ + meta: { name: 'get', description: 'Get trail metadata by OSM ID.' }, + args: { id: { type: 'positional', required: true, description: 'OSM relation ID' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const trail = await runApi({ + promise: client.trails({ osmId: args.id }).get(), + action: 'get trail', + resourceHint: `trail ${args.id}`, + }); + process.stdout.write(`${JSON.stringify(trail, null, 2)}\n`); + }, +}); + +const geometryCmd = defineCommand({ + meta: { name: 'geometry', description: 'Full GeoJSON geometry for a trail.' }, + args: { id: { type: 'positional', required: true, description: 'OSM relation ID' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.trails({ osmId: args.id }).geometry.get(), + action: 'get trail geometry', + resourceHint: `trail ${args.id}`, + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'trails', description: 'OSM trail search and details.' }, + subCommands: { + search: () => Promise.resolve(searchCmd), + get: () => Promise.resolve(getCmd), + geometry: () => Promise.resolve(geometryCmd), + }, +}); diff --git a/packages/cli/src/commands/trends.ts b/packages/cli/src/commands/trends.ts index 63ec2795d3..ceeff55438 100644 --- a/packages/cli/src/commands/trends.ts +++ b/packages/cli/src/commands/trends.ts @@ -10,14 +10,20 @@ export default defineCommand({ site: { type: 'string', alias: 's', description: 'Filter to specific site' }, }, async run({ args }) { - const days = parsePositiveIntArg(args.days, '--days'); + const days = parsePositiveIntArg({ value: args.days, argName: '--days' }); const cache = await ensureCache(); - const rows = await cache.searchTrends(args.keyword, { - site: args.site, - days, + const rows = await cache.searchTrends({ + keyword: args.keyword, + options: { + site: args.site, + days, + }, }); - printTable(rows, { - title: `Price Trends: "${args.keyword}"`, + printTable({ + rows, + options: { + title: `Price Trends: "${args.keyword}"`, + }, }); }, }); diff --git a/packages/cli/src/commands/trips/index.ts b/packages/cli/src/commands/trips/index.ts new file mode 100644 index 0000000000..e6f7f60752 --- /dev/null +++ b/packages/cli/src/commands/trips/index.ts @@ -0,0 +1,131 @@ +import { toRecord, toRecordArray } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { nowIso, shortId } from '../../api/ids'; +import { requireAuth, runApi } from '../../api/run'; +import { printSummary, printTable } from '../../shared'; + +const listCmd = defineCommand({ + meta: { name: 'list', description: 'List your trips.' }, + args: { json: { type: 'boolean', default: false } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const trips = await runApi({ promise: client.trips.get(), action: 'list trips' }); + if (args.json) { + process.stdout.write(`${JSON.stringify(trips, null, 2)}\n`); + return; + } + printTable({ + rows: toRecordArray(trips).map((r) => ({ + id: r.id, + name: r.name, + startDate: r.startDate, + endDate: r.endDate, + packId: r.packId, + })), + options: { title: 'Your trips' }, + }); + }, +}); + +const getCmd = defineCommand({ + meta: { name: 'get', description: 'Get a trip by ID.' }, + args: { + id: { type: 'positional', required: true, description: 'Trip ID' }, + json: { type: 'boolean', default: false }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const trip = await runApi({ + promise: client.trips({ tripId: args.id }).get(), + action: 'get trip', + resourceHint: `trip ${args.id}`, + }); + if (args.json) { + process.stdout.write(`${JSON.stringify(trip, null, 2)}\n`); + return; + } + const t = toRecord(trip); + printSummary({ + data: { + id: t.id, + name: t.name, + description: t.description, + startDate: t.startDate, + endDate: t.endDate, + packId: t.packId, + notes: t.notes, + }, + title: `Trip ${t.name ?? args.id}`, + }); + }, +}); + +const createCmd = defineCommand({ + meta: { name: 'create', description: 'Create a new trip.' }, + args: { + name: { type: 'positional', required: true, description: 'Trip name' }, + description: { type: 'string', alias: 'd' }, + start: { type: 'string', description: 'ISO start date' }, + end: { type: 'string', description: 'ISO end date' }, + pack: { type: 'string', description: 'Optional pack ID to link' }, + notes: { type: 'string' }, + lat: { type: 'string' }, + lon: { type: 'string' }, + 'location-name': { type: 'string' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const now = nowIso(); + const lat = args.lat ? Number.parseFloat(args.lat) : null; + const lon = args.lon ? Number.parseFloat(args.lon) : null; + const location = + lat != null && lon != null && !Number.isNaN(lat) && !Number.isNaN(lon) + ? { latitude: lat, longitude: lon, name: args['location-name'] } + : null; + const trip = await runApi({ + promise: client.trips.post({ + id: shortId('t'), + name: args.name, + description: args.description, + location, + startDate: args.start, + endDate: args.end, + notes: args.notes, + packId: args.pack, + localCreatedAt: now, + localUpdatedAt: now, + }), + action: 'create trip', + }); + process.stdout.write(`${JSON.stringify(trip, null, 2)}\n`); + }, +}); + +const deleteCmd = defineCommand({ + meta: { name: 'delete', description: 'Delete a trip.' }, + args: { id: { type: 'positional', required: true, description: 'Trip ID' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + await runApi({ + promise: client.trips({ tripId: args.id }).delete(), + action: 'delete trip', + resourceHint: `trip ${args.id}`, + }); + process.stdout.write(`Deleted ${args.id}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'trips', description: 'List, create, and manage trips.' }, + subCommands: { + list: () => Promise.resolve(listCmd), + get: () => Promise.resolve(getCmd), + create: () => Promise.resolve(createCmd), + delete: () => Promise.resolve(deleteCmd), + }, +}); diff --git a/packages/cli/src/commands/user/index.ts b/packages/cli/src/commands/user/index.ts new file mode 100644 index 0000000000..96af7dd03f --- /dev/null +++ b/packages/cli/src/commands/user/index.ts @@ -0,0 +1,54 @@ +import { toRecord } from '@packrat/guards'; +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; +import { printSummary } from '../../shared'; + +const getCmd = defineCommand({ + meta: { name: 'profile', description: 'Print the current user profile.' }, + async run() { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ promise: client.user.profile.get(), action: 'get profile' }); + // Endpoint returns { success, user: { firstName, ... } } + const user = toRecord(toRecord(data).user); + printSummary({ + data: { + firstName: user.firstName, + lastName: user.lastName, + email: user.email, + avatarUrl: user.avatarUrl, + }, + title: 'Profile', + }); + }, +}); + +const updateCmd = defineCommand({ + meta: { name: 'update', description: 'Update profile fields.' }, + args: { + 'first-name': { type: 'string' }, + 'last-name': { type: 'string' }, + email: { type: 'string' }, + avatar: { type: 'string', description: 'Avatar URL' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const body: Record = {}; + if (args['first-name']) body.firstName = args['first-name']; + if (args['last-name']) body.lastName = args['last-name']; + if (args.email) body.email = args.email; + if (args.avatar) body.avatarUrl = args.avatar; + const data = await runApi({ promise: client.user.profile.put(body), action: 'update profile' }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'user', description: 'View or update the signed-in user profile.' }, + subCommands: { + profile: () => Promise.resolve(getCmd), + update: () => Promise.resolve(updateCmd), + }, +}); diff --git a/packages/cli/src/commands/weather/index.ts b/packages/cli/src/commands/weather/index.ts new file mode 100644 index 0000000000..0649994212 --- /dev/null +++ b/packages/cli/src/commands/weather/index.ts @@ -0,0 +1,45 @@ +import { defineCommand } from 'citty'; +import { getUserClient } from '../../api/client'; +import { requireAuth, runApi } from '../../api/run'; + +const forecastCmd = defineCommand({ + meta: { + name: 'forecast', + description: 'Get a 10-day forecast for a named location (single API call).', + }, + args: { + location: { type: 'positional', required: true, description: 'Location string' }, + }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const forecast = await runApi({ + promise: client.weather['by-name'].get({ query: { q: args.location } }), + action: 'get weather forecast', + resourceHint: args.location, + }); + process.stdout.write(`${JSON.stringify(forecast, null, 2)}\n`); + }, +}); + +const searchCmd = defineCommand({ + meta: { name: 'search', description: 'Search weather locations by name.' }, + args: { q: { type: 'positional', required: true, description: 'Location query' } }, + async run({ args }) { + await requireAuth(); + const client = await getUserClient(); + const data = await runApi({ + promise: client.weather.search.get({ query: { q: args.q } }), + action: 'search weather', + }); + process.stdout.write(`${JSON.stringify(data, null, 2)}\n`); + }, +}); + +export default defineCommand({ + meta: { name: 'weather', description: 'Search weather locations + fetch forecasts.' }, + subCommands: { + forecast: () => Promise.resolve(forecastCmd), + search: () => Promise.resolve(searchCmd), + }, +}); diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 43ce9a9c7f..d800ace122 100755 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,9 +1,8 @@ #!/usr/bin/env bun /** - * PackRat Analytics CLI — outdoor gear market intelligence. - * - * Built with citty (UnJS) for modern CLI ergonomics. + * PackRat CLI — analytics (DuckDB) plus a thin Eden Treaty wrapper around the + * PackRat API for user + admin operations. */ import { readFileSync } from 'node:fs'; @@ -39,48 +38,46 @@ const main = defineCommand({ meta: { name: 'packrat', version: getCliVersion(), - description: 'Outdoor gear analytics powered by DuckDB', + description: 'PackRat CLI — gear analytics + API client', }, subCommands: { - // Core search & discovery + // ── Session / API ────────────────────────────────────────────────────── + auth: () => import('./commands/auth').then((m) => m.default), + admin: () => import('./commands/admin').then((m) => m.default), + packs: () => import('./commands/packs').then((m) => m.default), + trips: () => import('./commands/trips').then((m) => m.default), + catalog: () => import('./commands/catalog').then((m) => m.default), + trails: () => import('./commands/trails').then((m) => m.default), + weather: () => import('./commands/weather').then((m) => m.default), + feed: () => import('./commands/feed').then((m) => m.default), + templates: () => import('./commands/templates').then((m) => m.default), + seasons: () => import('./commands/seasons').then((m) => m.default), + user: () => import('./commands/user').then((m) => m.default), + ai: () => import('./commands/ai').then((m) => m.default), + + // ── Local analytics (DuckDB-backed) ──────────────────────────────────── search: () => import('./commands/search').then((m) => m.default), compare: () => import('./commands/compare').then((m) => m.default), trends: () => import('./commands/trends').then((m) => m.default), brand: () => import('./commands/brand').then((m) => m.default), category: () => import('./commands/category').then((m) => m.default), deals: () => import('./commands/deals').then((m) => m.default), - - // Ratings & weight sales: () => import('./commands/sales').then((m) => m.default), ratings: () => import('./commands/ratings').then((m) => m.default), lightweight: () => import('./commands/lightweight').then((m) => m.default), - - // Dashboards stats: () => import('./commands/stats').then((m) => m.default), summary: () => import('./commands/summary').then((m) => m.default), brands: () => import('./commands/brands').then((m) => m.default), prices: () => import('./commands/prices').then((m) => m.default), - - // Data management cache: () => import('./commands/cache').then((m) => m.default), - - // Specs specs: () => import('./commands/specs').then((m) => m.default), 'build-specs': () => import('./commands/build-specs').then((m) => m.default), filter: () => import('./commands/filter').then((m) => m.default), - - // Advanced analytics 'market-share': () => import('./commands/market-share').then((m) => m.default), - - // Enrichment & dedup resolve: () => import('./commands/resolve').then((m) => m.default), reviews: () => import('./commands/reviews').then((m) => m.default), images: () => import('./commands/images').then((m) => m.default), - - // Schema analysis schema: () => import('./commands/schema').then((m) => m.default), - - // Export export: () => import('./commands/export').then((m) => m.default), }, }); diff --git a/packages/cli/src/shared.ts b/packages/cli/src/shared.ts index 2480e63acb..9d60431170 100644 --- a/packages/cli/src/shared.ts +++ b/packages/cli/src/shared.ts @@ -46,7 +46,13 @@ export async function ensureCache(forceRefresh = false): Promise, title?: string): void { +export function printSummary({ + data, + title, +}: { + data: Record; + title?: string; +}): void { if (title) console.log(`\n${chalk.bold(title)}`); const table = new Table({ style: { head: [], border: [] } }); diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index b81e5c5e28..7fe621eb1f 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -7,10 +7,19 @@ "esModuleInterop": true, "skipLibCheck": true, "noEmit": true, + "types": ["bun", "@cloudflare/workers-types/2022-10-31"], "baseUrl": ".", "paths": { "@packrat/analytics": ["../analytics/src"], - "@packrat/analytics/*": ["../analytics/src/*"] + "@packrat/analytics/*": ["../analytics/src/*"], + "@packrat/api-client": ["../api-client/src/index.ts"], + "@packrat/api-client/*": ["../api-client/src/*"], + "@packrat/api": ["../api/src/index.ts"], + "@packrat/api/*": ["../api/src/*"], + "@packrat/env": ["../env/src"], + "@packrat/env/*": ["../env/src/*"], + "@packrat/guards": ["../guards/src"], + "@packrat/guards/*": ["../guards/src/*"] } }, "include": ["src/**/*.ts", "scripts/**/*.ts"], diff --git a/packages/config/package.json b/packages/config/package.json index 5ee821bf82..61b6d02575 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/config", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { diff --git a/packages/config/src/config.ts b/packages/config/src/config.ts index afb633768b..4960388f0b 100644 --- a/packages/config/src/config.ts +++ b/packages/config/src/config.ts @@ -68,10 +68,10 @@ const APP_CONFIG_SOURCE = { [FeatureFlag.EnableShoppingList]: false, [FeatureFlag.EnableSharedPacks]: false, [FeatureFlag.EnablePackTemplates]: true, - [FeatureFlag.EnableTrailConditions]: false, + [FeatureFlag.EnableTrailConditions]: true, [FeatureFlag.EnableFeed]: false, [FeatureFlag.EnableWildlifeIdentification]: false, - [FeatureFlag.EnableLocalAI]: false, + [FeatureFlag.EnableLocalAI]: true, [FeatureFlag.EnableTrails]: false, }, dashboard: { diff --git a/packages/constants/package.json b/packages/constants/package.json new file mode 100644 index 0000000000..3162cad936 --- /dev/null +++ b/packages/constants/package.json @@ -0,0 +1,17 @@ +{ + "name": "@packrat/constants", + "version": "0.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./src/index.ts" + }, + "main": "./src/index.ts", + "types": "./src/index.ts", + "scripts": { + "check-types": "tsc --noEmit" + }, + "devDependencies": { + "typescript": "catalog:" + } +} diff --git a/packages/constants/src/index.ts b/packages/constants/src/index.ts new file mode 100644 index 0000000000..42ab143c25 --- /dev/null +++ b/packages/constants/src/index.ts @@ -0,0 +1,55 @@ +export const PACK_CATEGORIES = Object.freeze([ + 'hiking', + 'backpacking', + 'camping', + 'climbing', + 'winter', + 'desert', + 'custom', + 'water sports', + 'skiing', +] as const); + +export type PackCategory = (typeof PACK_CATEGORIES)[number]; + +export const ITEM_CATEGORIES = Object.freeze([ + 'clothing', + 'shelter', + 'sleep', + 'kitchen', + 'water', + 'electronics', + 'first-aid', + 'navigation', + 'tools', + 'consumables', + 'miscellaneous', +] as const); + +export type ItemCategory = (typeof ITEM_CATEGORIES)[number]; + +export const WEIGHT_UNITS = Object.freeze(['g', 'oz', 'kg', 'lb'] as const); +export type WeightUnit = (typeof WEIGHT_UNITS)[number]; + +export const AVAILABILITY_VALUES = Object.freeze(['in_stock', 'out_of_stock', 'preorder'] as const); + +export type Availability = (typeof AVAILABILITY_VALUES)[number]; + +export interface ItemLink { + id: string; + title: string; + url: string; + type: 'official' | 'review' | 'guide' | 'purchase' | 'other'; +} + +export interface ItemReview { + id: string; + userId: string; + userName: string; + userAvatar?: string; + rating: number; + text: string; + date: string; + helpful?: number; + verified?: boolean; +} diff --git a/packages/constants/tsconfig.json b/packages/constants/tsconfig.json new file mode 100644 index 0000000000..a086b149de --- /dev/null +++ b/packages/constants/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src" + }, + "include": ["src"] +} diff --git a/packages/db/package.json b/packages/db/package.json new file mode 100644 index 0000000000..43aafc6b19 --- /dev/null +++ b/packages/db/package.json @@ -0,0 +1,27 @@ +{ + "name": "@packrat/db", + "version": "0.0.0", + "private": true, + "type": "module", + "exports": { + ".": { + "types": "./src/index.ts", + "default": "./src/index.ts" + }, + "./*": { + "types": "./src/*.ts", + "default": "./src/*.ts" + } + }, + "scripts": { + "check-types": "tsc --noEmit" + }, + "dependencies": { + "@packrat/constants": "workspace:*", + "drizzle-orm": "catalog:", + "drizzle-zod": "catalog:" + }, + "devDependencies": { + "typescript": "catalog:" + } +} diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts new file mode 100644 index 0000000000..537e1903ca --- /dev/null +++ b/packages/db/src/index.ts @@ -0,0 +1,3 @@ +export * from './schema'; +export * from './validation'; +export * from './zod-schemas'; diff --git a/packages/api/src/db/schema.ts b/packages/db/src/schema.ts similarity index 85% rename from packages/api/src/db/schema.ts rename to packages/db/src/schema.ts index d59a4ff314..6f8b9d807a 100644 --- a/packages/api/src/db/schema.ts +++ b/packages/db/src/schema.ts @@ -1,4 +1,4 @@ -import type { PackCategory, WeightUnit } from '@packrat/api/types'; +import type { PackCategory, WeightUnit } from '@packrat/constants'; import { type InferInsertModel, type InferSelectModel, relations, sql } from 'drizzle-orm'; import { type AnyPgColumn, @@ -16,7 +16,7 @@ import { unique, vector, } from 'drizzle-orm/pg-core'; -import type { ValidationError } from '../types/validation'; +import type { ValidationError } from './validation'; const availabilityEnum = pgEnum('availability', ['in_stock', 'out_of_stock', 'preorder']); @@ -124,8 +124,8 @@ export const packs = pgTable('packs', { isAIGenerated: boolean('is_ai_generated').notNull().default(false), localCreatedAt: timestamp('local_created_at').notNull(), localUpdatedAt: timestamp('local_updated_at').notNull(), - createdAt: timestamp('created_at').defaultNow().notNull(), // for controlling sync. controlled by server. - updatedAt: timestamp('updated_at').defaultNow().notNull(), // for controlling sync. controlled by server. + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), }); // Catalog items table @@ -136,8 +136,8 @@ export const catalogItems = pgTable( name: text('name').notNull(), productUrl: text('product_url').notNull(), sku: text('sku').unique().notNull(), - weight: real('weight').notNull(), - weightUnit: text('weight_unit').notNull().$type(), + weight: real('weight'), + weightUnit: text('weight_unit').$type(), description: text('description'), categories: jsonb('categories').$type(), images: jsonb('images').$type(), @@ -271,7 +271,6 @@ export const packWeightHistory = pgTable('weight_history', { createdAt: timestamp('created_at').defaultNow().notNull(), }); -//Pack Template table export const packTemplates = pgTable('pack_templates', { id: text('id').primaryKey(), name: text('name').notNull(), @@ -294,7 +293,6 @@ export const packTemplates = pgTable('pack_templates', { updatedAt: timestamp('updated_at').defaultNow().notNull(), }); -//Pack Template Item table export const packTemplateItems = pgTable('pack_template_items', { id: text('id').primaryKey(), name: text('name').notNull(), @@ -327,11 +325,11 @@ export const trailConditionReports = pgTable( id: text('id').primaryKey(), trailName: text('trail_name').notNull(), trailRegion: text('trail_region'), - surface: text('surface').notNull(), // paved | gravel | dirt | rocky | snow | mud - overallCondition: text('overall_condition').notNull(), // excellent | good | fair | poor + surface: text('surface').notNull(), + overallCondition: text('overall_condition').notNull(), hazards: jsonb('hazards').$type().notNull().default([]), waterCrossings: integer('water_crossings').notNull().default(0), - waterCrossingDifficulty: text('water_crossing_difficulty'), // easy | moderate | difficult + waterCrossingDifficulty: text('water_crossing_difficulty'), notes: text('notes'), photos: jsonb('photos').$type().notNull().default([]), userId: text('user_id') @@ -351,8 +349,6 @@ export const trailConditionReports = pgTable( table.createdAt.desc(), ), trailNameIdx: index('trail_condition_reports_trail_name_idx').on(table.trailName), - // Partial index used to keep trip deletes (ON DELETE SET NULL) fast by - // avoiding a sequential scan on trail_condition_reports. tripIdIdx: index('trail_condition_reports_trip_id_idx') .on(table.tripId) .where(sql`${table.tripId} IS NOT NULL`), @@ -379,25 +375,16 @@ export const trips = pgTable('trips', { updatedAt: timestamp('updated_at').defaultNow().notNull(), }); -// Define relations +// Relations export const packsRelations = relations(packs, ({ one, many }) => ({ - user: one(users, { - fields: [packs.userId], - references: [users.id], - }), + user: one(users, { fields: [packs.userId], references: [users.id] }), items: many(packItems), })); export const packItemsRelations = relations(packItems, ({ one }) => ({ - pack: one(packs, { - fields: [packItems.packId], - references: [packs.id], - }), - user: one(users, { - fields: [packItems.userId], - references: [users.id], - }), + pack: one(packs, { fields: [packItems.packId], references: [packs.id] }), + user: one(users, { fields: [packItems.userId], references: [users.id] }), catalogItem: one(catalogItems, { fields: [packItems.catalogItemId], references: [catalogItems.id], @@ -410,24 +397,14 @@ export const catalogItemsRelations = relations(catalogItems, ({ many }) => ({ })); export const packWeightHistoryRelations = relations(packWeightHistory, ({ one }) => ({ - pack: one(packs, { - fields: [packWeightHistory.packId], - references: [packs.id], - }), + pack: one(packs, { fields: [packWeightHistory.packId], references: [packs.id] }), })); -// Trips relations + export const tripsRelations = relations(trips, ({ one }) => ({ - user: one(users, { - fields: [trips.userId], - references: [users.id], - }), - pack: one(packs, { - fields: [trips.packId], - references: [packs.id], - }), + user: one(users, { fields: [trips.userId], references: [users.id] }), + pack: one(packs, { fields: [trips.packId], references: [packs.id] }), })); -// Reported content table export const reportedContent = pgTable('reported_content', { id: serial('id').primaryKey(), userId: text('user_id') @@ -437,7 +414,7 @@ export const reportedContent = pgTable('reported_content', { aiResponse: text('ai_response').notNull(), reason: text('reason').notNull(), userComment: text('user_comment'), - status: text('status').default('pending').notNull(), // pending, reviewed, dismissed + status: text('status').default('pending').notNull(), reviewed: boolean('reviewed').default(false), reviewedBy: text('reviewed_by').references(() => users.id), reviewedAt: timestamp('reviewed_at'), @@ -445,21 +422,12 @@ export const reportedContent = pgTable('reported_content', { }); export const reportedContentRelations = relations(reportedContent, ({ one }) => ({ - user: one(users, { - fields: [reportedContent.userId], - references: [users.id], - }), - reviewer: one(users, { - fields: [reportedContent.reviewedBy], - references: [users.id], - }), + user: one(users, { fields: [reportedContent.userId], references: [users.id] }), + reviewer: one(users, { fields: [reportedContent.reviewedBy], references: [users.id] }), })); export const packTemplatesRelations = relations(packTemplates, ({ one, many }) => ({ - user: one(users, { - fields: [packTemplates.userId], - references: [users.id], - }), + user: one(users, { fields: [packTemplates.userId], references: [users.id] }), items: many(packTemplateItems), })); @@ -468,10 +436,7 @@ export const packTemplateItemsRelations = relations(packTemplateItems, ({ one }) fields: [packTemplateItems.packTemplateId], references: [packTemplates.id], }), - user: one(users, { - fields: [packTemplateItems.userId], - references: [users.id], - }), + user: one(users, { fields: [packTemplateItems.userId], references: [users.id] }), catalogItem: one(catalogItems, { fields: [packTemplateItems.catalogItemId], references: [catalogItems.id], @@ -506,7 +471,7 @@ export const etlJobs = pgTable( totalProcessed: integer('total_processed'), totalValid: integer('total_valid'), totalInvalid: integer('total_invalid'), - scraperRevision: text('scraper_revision').notNull(), // Git commit SHA or tag + scraperRevision: text('scraper_revision').notNull(), }, (table) => ({ scraperRevisionIdx: index('etl_jobs_scraper_revision_idx').on(table.scraperRevision), @@ -522,10 +487,7 @@ export const etlJobsRelations = relations(etlJobs, ({ many }) => ({ })); export const invalidItemLogsRelations = relations(invalidItemLogs, ({ one }) => ({ - job: one(etlJobs, { - fields: [invalidItemLogs.jobId], - references: [etlJobs.id], - }), + job: one(etlJobs, { fields: [invalidItemLogs.jobId], references: [etlJobs.id] }), })); export const catalogItemEtlJobs = pgTable('catalog_item_etl_jobs', { @@ -544,73 +506,40 @@ export const catalogItemEtlJobsRelations = relations(catalogItemEtlJobs, ({ one fields: [catalogItemEtlJobs.catalogItemId], references: [catalogItems.id], }), - etlJob: one(etlJobs, { - fields: [catalogItemEtlJobs.etlJobId], - references: [etlJobs.id], - }), + etlJob: one(etlJobs, { fields: [catalogItemEtlJobs.etlJobId], references: [etlJobs.id] }), })); -// Infer models from tables +// Infer model types export type User = InferSelectModel; export type NewUser = InferInsertModel; - export type Session = InferSelectModel; export type NewSession = InferInsertModel; - export type Account = InferSelectModel; export type NewAccount = InferInsertModel; - export type Verification = InferSelectModel; export type NewVerification = InferInsertModel; - export type Jwks = InferSelectModel; export type NewJwks = InferInsertModel; - export type Pack = InferSelectModel; -export type PackWithItems = Pack & { - items: PackItem[]; -}; +export type PackWithItems = Pack & { items: PackItem[] }; export type NewPack = InferInsertModel; - export type CatalogItem = InferSelectModel; export type NewCatalogItem = InferInsertModel; - export type PackItem = InferSelectModel; export type NewPackItem = InferInsertModel; - export type ReportedContent = InferSelectModel; export type NewReportedContent = InferInsertModel; - export type PackTemplate = InferSelectModel; export type NewPackTemplate = InferInsertModel; - export type PackTemplateItem = InferSelectModel; export type NewPackTemplateItem = InferInsertModel; - -export const trailConditionReportsRelations = relations(trailConditionReports, ({ one }) => ({ - user: one(users, { - fields: [trailConditionReports.userId], - references: [users.id], - }), - trip: one(trips, { - fields: [trailConditionReports.tripId], - references: [trips.id], - }), -})); - export type TrailConditionReport = InferSelectModel; export type NewTrailConditionReport = InferInsertModel; - export type Trip = InferSelectModel; export type NewTrip = InferInsertModel; - -export type PackTemplateWithItems = PackTemplate & { - items: PackTemplateItem[]; -}; +export type PackTemplateWithItems = PackTemplate & { items: PackTemplateItem[] }; // Social Feed tables - -// Posts table export const posts = pgTable('posts', { id: serial('id').primaryKey(), userId: text('user_id') @@ -622,7 +551,6 @@ export const posts = pgTable('posts', { updatedAt: timestamp('updated_at').defaultNow().notNull(), }); -// Post likes table export const postLikes = pgTable( 'post_likes', { @@ -640,7 +568,6 @@ export const postLikes = pgTable( }), ); -// Post comments table export const postComments = pgTable('post_comments', { id: serial('id').primaryKey(), postId: integer('post_id') @@ -657,7 +584,6 @@ export const postComments = pgTable('post_comments', { updatedAt: timestamp('updated_at').defaultNow().notNull(), }); -// Comment likes table export const commentLikes = pgTable( 'comment_likes', { @@ -678,59 +604,33 @@ export const commentLikes = pgTable( }), ); -// Relations export const postsRelations = relations(posts, ({ one, many }) => ({ - user: one(users, { - fields: [posts.userId], - references: [users.id], - }), + user: one(users, { fields: [posts.userId], references: [users.id] }), likes: many(postLikes), comments: many(postComments), })); export const postLikesRelations = relations(postLikes, ({ one }) => ({ - post: one(posts, { - fields: [postLikes.postId], - references: [posts.id], - }), - user: one(users, { - fields: [postLikes.userId], - references: [users.id], - }), + post: one(posts, { fields: [postLikes.postId], references: [posts.id] }), + user: one(users, { fields: [postLikes.userId], references: [users.id] }), })); export const postCommentsRelations = relations(postComments, ({ one, many }) => ({ - post: one(posts, { - fields: [postComments.postId], - references: [posts.id], - }), - user: one(users, { - fields: [postComments.userId], - references: [users.id], - }), + post: one(posts, { fields: [postComments.postId], references: [posts.id] }), + user: one(users, { fields: [postComments.userId], references: [users.id] }), likes: many(commentLikes), })); export const commentLikesRelations = relations(commentLikes, ({ one }) => ({ - comment: one(postComments, { - fields: [commentLikes.commentId], - references: [postComments.id], - }), - user: one(users, { - fields: [commentLikes.userId], - references: [users.id], - }), + comment: one(postComments, { fields: [commentLikes.commentId], references: [postComments.id] }), + user: one(users, { fields: [commentLikes.userId], references: [users.id] }), })); -// Infer types for social feed export type Post = InferSelectModel; export type NewPost = InferInsertModel; - export type PostLike = InferSelectModel; export type NewPostLike = InferInsertModel; - export type PostComment = InferSelectModel; export type NewPostComment = InferInsertModel; - export type CommentLike = InferSelectModel; export type NewCommentLike = InferInsertModel; diff --git a/packages/db/src/validation.ts b/packages/db/src/validation.ts new file mode 100644 index 0000000000..e2d273875b --- /dev/null +++ b/packages/db/src/validation.ts @@ -0,0 +1,5 @@ +export interface ValidationError { + field: string; + reason: string; + value?: string | number | boolean | null | undefined; +} diff --git a/packages/api/src/db/zod-schemas.ts b/packages/db/src/zod-schemas.ts similarity index 94% rename from packages/api/src/db/zod-schemas.ts rename to packages/db/src/zod-schemas.ts index fcf00731bf..edc351c112 100644 --- a/packages/api/src/db/zod-schemas.ts +++ b/packages/db/src/zod-schemas.ts @@ -13,11 +13,9 @@ import { users, } from './schema'; -// User schemas export const selectUserSchema = createSelectSchema(users); export const insertUserSchema = createInsertSchema(users); -// Pack schemas export const selectPackSchema = createSelectSchema(packs); export const insertPackSchema = createInsertSchema(packs); export const selectPackItemSchema = createSelectSchema(packItems); @@ -25,17 +23,14 @@ export const insertPackItemSchema = createInsertSchema(packItems); export const selectPackWeightHistorySchema = createSelectSchema(packWeightHistory); export const insertPackWeightHistorySchema = createInsertSchema(packWeightHistory); -// Catalog schemas export const selectCatalogItemSchema = createSelectSchema(catalogItems); export const insertCatalogItemSchema = createInsertSchema(catalogItems); -// Pack template schemas export const selectPackTemplateSchema = createSelectSchema(packTemplates); export const insertPackTemplateSchema = createInsertSchema(packTemplates); export const selectPackTemplateItemSchema = createSelectSchema(packTemplateItems); export const insertPackTemplateItemSchema = createInsertSchema(packTemplateItems); -// ETL and reporting schemas export const selectReportedContentSchema = createSelectSchema(reportedContent); export const insertReportedContentSchema = createInsertSchema(reportedContent); export const selectInvalidItemLogSchema = createSelectSchema(invalidItemLogs); diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json new file mode 100644 index 0000000000..753a3038e6 --- /dev/null +++ b/packages/db/tsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "bundler", + "strict": true, + "skipLibCheck": true, + "noUncheckedIndexedAccess": true + }, + "include": ["src"] +} diff --git a/packages/env/package.json b/packages/env/package.json index c90ede46a5..413e55ac22 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/env", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { diff --git a/packages/env/scripts/no-raw-process-env.ts b/packages/env/scripts/no-raw-process-env.ts index af55366592..43d0a9f25c 100644 --- a/packages/env/scripts/no-raw-process-env.ts +++ b/packages/env/scripts/no-raw-process-env.ts @@ -49,6 +49,18 @@ const ALLOWED: string[] = [ 'packages/api/scripts/validate-cloudflare-api-env.ts', // One-off sync script, not app code 'apps/guides/scripts/sync-to-r2.ts', + // Test-only gate flag: reads RUN_OG_PIPELINE_TEST to opt into the heavy + // OG-image pipeline test from `bun run --cwd apps/guides test:og`. + 'apps/guides/__tests__/og-images.test.ts', + // Test-only gate flag: reads OG_LIVE_CHECK_URL to opt into live OG meta + // validation against a deployed guides URL. + 'apps/guides/__tests__/og-meta.test.ts', + // Test-only gate flag: reads OG_LIVE_CHECK_URL to opt into live OG meta + // validation against a deployed landing URL. + 'apps/landing/__tests__/og-meta.test.ts', + // Test-only gate flag: reads OG_LIVE_CHECK_URL to opt into live OG meta + // validation against a deployed trails URL. + 'apps/trails/__tests__/og-meta.test.ts', // Test files that mutate process.env to exercise env-validation logic 'packages/api/src/utils/__tests__/', // Admin env shim — parses process.env once at module load @@ -88,7 +100,7 @@ interface Violation { const violations: Violation[] = []; -function walkDir(dir: string, relPath: string): void { +function walkDir({ dir, relPath }: { dir: string; relPath: string }): void { let entries: string[]; try { entries = readdirSync(dir); @@ -110,7 +122,7 @@ function walkDir(dir: string, relPath: string): void { } if (isDir) { - walkDir(entryFull, entryRel); + walkDir({ dir: entryFull, relPath: entryRel }); } else if (isTargetFile(entry)) { if (isAllowed(entryRel)) continue; @@ -135,7 +147,7 @@ for (const root of SCAN_ROOTS) { const absRoot = join(ROOT, root); // For .github/scripts we use the relative path directly const relRoot = relative(ROOT, absRoot); - walkDir(absRoot, relRoot); + walkDir({ dir: absRoot, relPath: relRoot }); } if (violations.length > 0) { diff --git a/packages/env/src/node.ts b/packages/env/src/node.ts index de87be390d..ed10e1ef82 100644 --- a/packages/env/src/node.ts +++ b/packages/env/src/node.ts @@ -66,6 +66,9 @@ export const nodeEnvSchema = z.object({ // ── Test runner flags ───────────────────────────────────────────── VITEST: z.string().optional(), + // ── PackRat API (CLI base URL override) ─────────────────────────── + PACKRAT_API_URL: z.string().url().optional(), + // ── Debug / verbose ─────────────────────────────────────────────── DEBUG: z.string().optional(), @@ -107,6 +110,7 @@ export const nodeEnv = nodeEnvSchema.parse({ CLOUDFLARE_CONTAINER_ID: process.env.CLOUDFLARE_CONTAINER_ID, PORT: process.env.PORT, VITEST: process.env.VITEST, + PACKRAT_API_URL: process.env.PACKRAT_API_URL, DEBUG: process.env.DEBUG, E2E_TEST_EMAIL: process.env.E2E_TEST_EMAIL, E2E_TEST_PASSWORD: process.env.E2E_TEST_PASSWORD, diff --git a/packages/guards/package.json b/packages/guards/package.json index a6a92314d8..eb3e79f325 100644 --- a/packages/guards/package.json +++ b/packages/guards/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/guards", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { diff --git a/packages/guards/src/assertions.ts b/packages/guards/src/assertions.ts index 86145d9a56..e55e643f8d 100644 --- a/packages/guards/src/assertions.ts +++ b/packages/guards/src/assertions.ts @@ -48,10 +48,13 @@ export function assertIsBoolean( if (typeof value !== 'boolean') throw new Error(message); } -export function assertAllDefined( - values: readonly unknown[], +export function assertAllDefined({ + values, message = 'All values must be defined', -): void { +}: { + values: readonly unknown[]; + message?: string; +}): void { for (let i = 0; i < values.length; i++) { if (values[i] === undefined) { throw new Error(`${message} (index ${i})`); diff --git a/packages/guards/src/narrow.ts b/packages/guards/src/narrow.ts index 3518e00cdb..adb377c991 100644 --- a/packages/guards/src/narrow.ts +++ b/packages/guards/src/narrow.ts @@ -1,48 +1,40 @@ /** - * Narrowing helpers that return `T | undefined` instead of throwing, - * and coercion helpers that massage values into well-typed shapes. + * Narrowing helpers for system boundaries. * - * Use these at system boundaries (API responses, CSV rows, unknown records) - * instead of `as` casts. + * Two flavours, both named `to*`: + * + * - **Strict narrow**: returns `T | undefined` (`toString`, `toNumber`, + * `toBoolean`, `toDate`). The caller decides what to do when the value + * doesn't match the type. + * - **Coercive narrow**: returns `T` with a safe default (`toArray`, + * `toRecord`, `toRecordArray`, `toStringRecord`). Use when the call site + * wants to keep working with empty data rather than branch. + * + * The legacy `asString` / `asNumber` / `asBoolean` / `asDate` / + * `asStringRecord` / `asArray` names are kept as aliases for back-compat so + * existing call sites compile unchanged. */ +// ── Strict narrow (T | undefined) ───────────────────────────────────────── + /** Returns the value if it's a string, otherwise undefined. */ -export const asString = (value: unknown): string | undefined => +// biome-ignore lint/suspicious/noShadowRestrictedNames: intentional — paired with toNumber/toBoolean/toDate as the package's narrow-or-undefined API +export const toString = (value: unknown): string | undefined => typeof value === 'string' ? value : undefined; /** Returns the value if it's a finite number, otherwise undefined. */ -export const asNumber = (value: unknown): number | undefined => +export const toNumber = (value: unknown): number | undefined => typeof value === 'number' && Number.isFinite(value) ? value : undefined; /** Returns the value if it's a boolean, otherwise undefined. */ -export const asBoolean = (value: unknown): boolean | undefined => +export const toBoolean = (value: unknown): boolean | undefined => typeof value === 'boolean' ? value : undefined; -/** - * Coerces null → undefined for use with `exactOptionalPropertyTypes` - * stores that only accept `string | undefined`, not `string | null`. - */ -export const nullToUndefined = (value: T | null): T | undefined => - value === null ? undefined : value; - -/** - * Type-safe indexOf — searches an array for an unknown value and returns its - * index, or -1 if the value is not a member of the array. - * - * Avoids `as ElementType` casts when the call site only has a `string` (or - * other broad type) but the array is typed as a specific union or tuple. - * - * @example - * safeIndexOf(['g', 'oz', 'kg', 'lb'], field.state.value) // 0-3 or -1 - */ -export const safeIndexOf = (array: readonly T[], value: unknown): number => - (array as readonly unknown[]).indexOf(value); - /** * Returns the value if it's a Date, parses it if it's a string/number, * otherwise undefined. */ -export const asDate = (value: unknown): Date | undefined => { +export const toDate = (value: unknown): Date | undefined => { if (value instanceof Date) return value; if (typeof value === 'string' || typeof value === 'number') { const parsed = new Date(value); @@ -51,11 +43,54 @@ export const asDate = (value: unknown): Date | undefined => { return undefined; }; +// ── Coercive narrow (always returns T, with a safe default) ─────────────── + +/** + * Wraps a single value in an array if it isn't one already. + * Useful for normalising API fields that can be `T | T[]`. + * + * @example + * toArray('foo') // ['foo'] + * toArray(['foo']) // ['foo'] + * toArray(undefined) // [] + */ +export const toArray = (value: T | T[] | null | undefined): T[] => { + if (value === null || value === undefined) return []; + return Array.isArray(value) ? value : [value]; +}; + +/** + * Narrow an unknown value to `Record` for keyed display, or + * return `{}` if it isn't a plain object. Use this at API/JSON boundaries + * where you only need to read string-keyed fields rather than re-validate + * the full shape with a Zod parser. + * + * @example + * toRecord(unknown) // { ... } or {} + * toRecord({ a: 1 }).a // 1 + */ +export const toRecord = (value: unknown): Record => { + if (value === null || typeof value !== 'object' || Array.isArray(value)) return {}; + // safe-cast: guards package internal narrowing — value confirmed non-null, non-array object above + return value as Record; +}; + +/** + * Narrow an unknown value to `Record[]` — useful for + * tabular rendering of API list responses where Treaty's exact element type + * isn't worth threading through every printTable call site. + * + * @example + * toRecordArray(apiResponse).map(r => ({ id: r.id, name: r.name })) + */ +export const toRecordArray = (value: unknown): Record[] => + Array.isArray(value) ? value.map(toRecord) : []; + /** * Returns a `Record` from an unknown value, keeping only * string-valued entries. Returns `{}` if the input isn't a plain object. */ -export const asStringRecord = (value: unknown): Record => { +export const toStringRecord = (value: unknown): Record => { if (value === null || typeof value !== 'object') return {}; const out: Record = {}; // safe-cast: guards package internal narrowing — value is confirmed non-null object by preceding check @@ -65,22 +100,42 @@ export const asStringRecord = (value: unknown): Record => { return out; }; +// ── Back-compat aliases (use the to* name in new code) ───────────────────── + +/** @deprecated Use `toString` instead. */ +export const asString = toString; +/** @deprecated Use `toNumber` instead. */ +export const asNumber = toNumber; +/** @deprecated Use `toBoolean` instead. */ +export const asBoolean = toBoolean; +/** @deprecated Use `toDate` instead. */ +export const asDate = toDate; +/** @deprecated Use `toStringRecord` instead. */ +export const asStringRecord = toStringRecord; +/** @deprecated Use `toArray` instead. */ +export const asArray = toArray; + +// ── Other utilities ─────────────────────────────────────────────────────── + /** - * Wraps a single value in an array if it isn't one already. - * Useful for normalising API fields that can be `T | T[]`. + * Coerces null → undefined for use with `exactOptionalPropertyTypes` + * stores that only accept `string | undefined`, not `string | null`. + */ +export const nullToUndefined = (value: T | null): T | undefined => + value === null ? undefined : value; + +/** + * Type-safe indexOf — searches an array for an unknown value and returns its + * index, or -1 if the value is not a member of the array. + * + * Avoids `as ElementType` casts when the call site only has a `string` (or + * other broad type) but the array is typed as a specific union or tuple. * * @example - * toArray('foo') // ['foo'] - * toArray(['foo']) // ['foo'] - * toArray(undefined) // [] + * safeIndexOf({ array: ['g', 'oz', 'kg', 'lb'], value: field.state.value }) // 0-3 or -1 */ -export const toArray = (value: T | T[] | null | undefined): T[] => { - if (value === null || value === undefined) return []; - return Array.isArray(value) ? value : [value]; -}; - -/** Alias for toArray — prefer whichever reads more clearly at the call site. */ -export const asArray = toArray; +export const safeIndexOf = ({ array, value }: { array: readonly T[]; value: unknown }): number => + (array as readonly unknown[]).indexOf(value); // safe-cast: search is read-only; result is a numeric index, no narrowing on T /** * Filters nullish values out of an array and narrows the element type. diff --git a/packages/guards/src/parse.ts b/packages/guards/src/parse.ts index 5a98413eeb..c0c23ae455 100644 --- a/packages/guards/src/parse.ts +++ b/packages/guards/src/parse.ts @@ -5,7 +5,7 @@ * don't need to unpack `{ success, data }` everywhere, and so the * pattern is consistent across the codebase. */ -import type { ZodSchema } from 'zod'; +import { type ZodSchema, z } from 'zod'; /** * Returns a parser function `(value: unknown) => T | undefined`. @@ -37,3 +37,24 @@ export const zodGuard = (schema: ZodSchema) => (value: unknown): value is T => schema.safeParse(value).success; + +/** + * Strict boolean parser for HTTP query strings — `'true' / '1'` → true, + * `'false' / '0' / ''` → false, anything else fails validation. + * + * Why a custom parser: `z.coerce.boolean()` treats every non-empty string as + * truthy, so `?includeDeleted=false` arrives at the handler as `true`. That + * silently bypasses ACL filters that gate on "include soft-deleted" flags. + * + * @example + * query: z.object({ includeDeleted: queryBoolean() }) + */ +export const queryBoolean = () => + z + .preprocess((v) => { + if (typeof v === 'boolean') return v; + if (v === 'true' || v === '1') return true; + if (v === 'false' || v === '0' || v === '' || v === undefined || v === null) return false; + return v; + }, z.boolean()) + .optional(); diff --git a/packages/mcp/package.json b/packages/mcp/package.json index 37024f4fed..b631f3c7b9 100644 --- a/packages/mcp/package.json +++ b/packages/mcp/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/mcp", - "version": "2.0.25", + "version": "2.0.26", "private": true, "description": "PackRat MCP Server — outdoor adventure planning via Model Context Protocol", "scripts": { @@ -20,11 +20,11 @@ "zod": "catalog:" }, "devDependencies": { - "@cloudflare/workers-types": "^4.20250405.0", - "@vitest/coverage-v8": "~3.1.4", + "@cloudflare/workers-types": "catalog:", + "@vitest/coverage-v8": "catalog:", "partyserver": "^0.4.1", "typescript": "catalog:", - "vitest": "~3.1.4", - "wrangler": "^4.21.2" + "vitest": "catalog:", + "wrangler": "catalog:" } } diff --git a/packages/mcp/src/__tests__/auth.test.ts b/packages/mcp/src/__tests__/auth.test.ts deleted file mode 100644 index 1568b2e800..0000000000 --- a/packages/mcp/src/__tests__/auth.test.ts +++ /dev/null @@ -1,412 +0,0 @@ -/** - * Tests for the PackRat MCP Worker OAuth flow. - * - * The worker is now wrapped with OAuthProvider, which: - * - Serves GET/POST /token, POST /register, /.well-known/* automatically - * - Routes /mcp (and sub-paths) to mcpApiHandler after token validation - * - Routes everything else to PackRatAuthHandler (/, /health, /authorize, /login, /callback) - * - * Because OAuthProvider requires a real KV namespace (OAUTH_KV) and performs - * cryptographic operations, we test the auth handler sub-units in isolation - * and use a lightweight integration harness that mocks OAuthProvider + KV. - */ - -import { describe, expect, it, vi } from 'vitest'; - -// ── Mock cloudflare:workers before any imports ──────────────────────────────── - -vi.mock('cloudflare:workers', () => ({ - WorkerEntrypoint: class {}, - DurableObject: class {}, -})); - -// ── Mock agents/mcp ─────────────────────────────────────────────────────────── - -vi.mock('agents/mcp', () => { - class McpAgent { - fetch(_request: Request): Promise { - return Promise.resolve(new Response('{}', { status: 200 })); - } - static serve(_path: string) { - return { - fetch: vi.fn().mockResolvedValue(new Response('{"jsonrpc":"2.0"}', { status: 200 })), - }; - } - } - return { McpAgent }; -}); - -vi.mock('@modelcontextprotocol/sdk/server/mcp.js', () => ({ - McpServer: class { - registerTool = vi.fn(); - registerResource = vi.fn(); - registerPrompt = vi.fn(); - }, - ResourceTemplate: class { - constructor( - public uriTemplate: string, - _opts?: unknown, - ) {} - }, -})); - -// ── Mock OAuthProvider — returns a simple fetch handler for testing ──────────── - -vi.mock('@cloudflare/workers-oauth-provider', () => { - class OAuthProvider { - private opts: Record; - constructor(opts: Record) { - this.opts = opts; - } - // biome-ignore lint/complexity/useMaxParams: mirrors Cloudflare Workers fetch signature - async fetch(request: Request, env: Record, ctx: unknown): Promise { - const url = new URL(request.url); - - // Simulate OAuthProvider routing: - // - /token → token endpoint (handled by OAuthProvider itself) - // - /mcp* → apiHandler (with props injected) - // - others → defaultHandler - - if (url.pathname === '/token') { - // Simulate token endpoint — return a minimal token response - return Response.json({ access_token: 'test-token', token_type: 'Bearer' }); - } - - if (url.pathname === '/mcp' || url.pathname.startsWith('/mcp/')) { - const authHeader = request.headers.get('Authorization'); - const token = authHeader?.match(/^Bearer\s+(\S+)/i)?.[1] ?? ''; - - if (!token) { - return Response.json( - { error: 'unauthorized', error_description: 'Missing access token' }, - { - status: 401, - headers: { 'WWW-Authenticate': 'Bearer realm="packrat-mcp"' }, - }, - ); - } - - // Call the apiHandler with a props-augmented ctx - const apiHandler = this.opts.apiHandler as { - fetch: (req: Request, env: unknown, ctx: unknown) => Promise; - }; - const augCtx = Object.assign({}, ctx, { props: { betterAuthToken: token, userId: 'u1' } }); - return apiHandler.fetch(request, env, augCtx); - } - - // Route all other paths to defaultHandler - const defaultHandler = this.opts.defaultHandler as { - fetch: (req: Request, env: unknown) => Promise; - }; - return defaultHandler.fetch(request, env); - } - } - return { OAuthProvider, default: OAuthProvider }; -}); - -// ── Helpers ─────────────────────────────────────────────────────────────────── - -function makeKv(initial: Record = {}): KVNamespace { - const store = new Map( - Object.entries(initial).map(([k, v]) => [k, { value: v }]), - ); - return { - get: vi.fn(async (key: string) => store.get(key)?.value ?? null), - // biome-ignore lint/complexity/useMaxParams: mirrors KVNamespace.put signature - put: vi.fn(async (key: string, value: string, opts?: { expirationTtl?: number }) => { - store.set(key, { value, expiration: opts?.expirationTtl }); - }), - delete: vi.fn(async (key: string) => { - store.delete(key); - }), - getWithMetadata: vi.fn(), - list: vi.fn(), - } as unknown as KVNamespace; -} - -function makeOAuthProvider() { - return { - parseAuthRequest: vi.fn().mockResolvedValue({ - responseType: 'code', - clientId: 'test-client', - redirectUri: 'https://client.example.com/cb', - scope: ['mcp'], - state: 'xyz', - }), - lookupClient: vi.fn().mockResolvedValue({ - clientId: 'test-client', - redirectUris: ['https://client.example.com/cb'], - }), - completeAuthorization: vi.fn().mockResolvedValue({ - redirectTo: 'https://client.example.com/cb?code=abc&state=xyz', - }), - }; -} - -function makeEnv(kvOverrides: Record = {}): import('../types').Env { - return { - PACKRAT_API_URL: 'https://api.example.com', - OAUTH_KV: makeKv(kvOverrides), - OAUTH_PROVIDER: makeOAuthProvider() as unknown as import('../types').Env['OAUTH_PROVIDER'], - PackRatMCP: {} as unknown as DurableObjectNamespace, - }; -} - -function req(url: string, init: RequestInit = {}): Request { - return new Request(url, init); -} - -// ── Import worker after all mocks ───────────────────────────────────────────── - -const { default: worker } = await import('../index'); -const fakeCtx = { - waitUntil: vi.fn(), - passThroughOnException: vi.fn(), -} as unknown as ExecutionContext; - -// ── Tests ───────────────────────────────────────────────────────────────────── - -describe('health check', () => { - it('returns 200 for GET /', async () => { - const env = makeEnv(); - const res = await worker.fetch(req('https://mcp.example.com/'), env, fakeCtx); - expect(res.status).toBe(200); - const body = (await res.json()) as Record; - expect(body.status).toBe('ok'); - expect(body.service).toBe('packrat-mcp'); - }); - - it('returns 200 for GET /health', async () => { - const env = makeEnv(); - const res = await worker.fetch(req('https://mcp.example.com/health'), env, fakeCtx); - expect(res.status).toBe(200); - }); -}); - -describe('/mcp auth guard', () => { - it('returns 401 when Authorization header is absent', async () => { - const env = makeEnv(); - const res = await worker.fetch(req('https://mcp.example.com/mcp'), env, fakeCtx); - expect(res.status).toBe(401); - expect(res.headers.get('WWW-Authenticate')).toMatch(/Bearer/); - }); - - it('returns 401 for empty Bearer token', async () => { - const env = makeEnv(); - const res = await worker.fetch( - req('https://mcp.example.com/mcp', { headers: { Authorization: 'Bearer ' } }), - env, - fakeCtx, - ); - expect(res.status).toBe(401); - }); - - it('forwards request to McpAgent when a valid Bearer token is provided', async () => { - const env = makeEnv(); - const res = await worker.fetch( - req('https://mcp.example.com/mcp', { - method: 'POST', - headers: { - Authorization: 'Bearer valid-token', - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ jsonrpc: '2.0', method: 'tools/list', id: 1 }), - }), - env, - fakeCtx, - ); - expect(res.status).toBe(200); - }); -}); - -describe('PackRatAuthHandler – /authorize', () => { - it('redirects to /login with a generated state key', async () => { - const env = makeEnv(); - const res = await worker.fetch( - req( - 'https://mcp.example.com/authorize?response_type=code&client_id=test-client&redirect_uri=https%3A%2F%2Fclient.example.com%2Fcb&scope=mcp&state=abc', - ), - env, - fakeCtx, - ); - expect(res.status).toBe(302); - const location = res.headers.get('Location') ?? ''; - expect(location).toMatch(/\/login\?state=/); - }); - - it('stores OAuth state in KV', async () => { - const env = makeEnv(); - await worker.fetch( - req( - 'https://mcp.example.com/authorize?response_type=code&client_id=test-client&redirect_uri=https%3A%2F%2Fclient.example.com%2Fcb&scope=mcp&state=abc', - ), - env, - fakeCtx, - ); - expect(env.OAUTH_KV.put).toHaveBeenCalledWith( - expect.stringMatching(/^oauth_state:/), - expect.any(String), - expect.objectContaining({ expirationTtl: 600 }), - ); - }); -}); - -describe('PackRatAuthHandler – /login', () => { - it('GET /login serves an HTML form', async () => { - const env = makeEnv(); - const res = await worker.fetch( - req('https://mcp.example.com/login?state=some-key'), - env, - fakeCtx, - ); - expect(res.status).toBe(200); - expect(res.headers.get('Content-Type')).toMatch(/text\/html/); - const body = await res.text(); - expect(body).toContain(' { - const stateKey = 'test-state-key'; - const env = makeEnv({ - [`oauth_state:${stateKey}`]: JSON.stringify({ - clientId: 'test-client', - scope: ['mcp'], - state: 'xyz', - redirectUri: 'https://client.example.com/cb', - responseType: 'code', - }), - }); - - const origFetch = globalThis.fetch; - globalThis.fetch = vi - .fn() - .mockResolvedValue( - new Response( - JSON.stringify({ user: { id: 'user-123' }, session: { token: 'ba-token-abc' } }), - { status: 200, headers: { 'Content-Type': 'application/json' } }, - ), - ) as unknown as typeof fetch; - - const form = new URLSearchParams({ - email: 'test@example.com', - password: 'secret', - state: stateKey, - }); - const res = await worker.fetch( - req('https://mcp.example.com/login', { - method: 'POST', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - body: form.toString(), - }), - env, - fakeCtx, - ); - - expect(res.status).toBe(302); - expect(res.headers.get('Location')).toMatch(/\/callback\?state=/); - expect(env.OAUTH_KV.put).toHaveBeenCalledWith( - `session:${stateKey}`, - expect.stringContaining('ba-token-abc'), - expect.any(Object), - ); - - globalThis.fetch = origFetch; - }); - - it('POST /login with invalid credentials returns 401 HTML', async () => { - const stateKey = 'test-state-key'; - const env = makeEnv({ - [`oauth_state:${stateKey}`]: JSON.stringify({ - clientId: 'c', - scope: ['mcp'], - state: 'x', - redirectUri: 'https://x.com', - responseType: 'code', - }), - }); - - const origFetch = globalThis.fetch; - globalThis.fetch = vi.fn().mockResolvedValue( - new Response(JSON.stringify({ error: 'invalid_credentials' }), { - status: 401, - headers: { 'Content-Type': 'application/json' }, - }), - ) as unknown as typeof fetch; - - const form = new URLSearchParams({ - email: 'bad@example.com', - password: 'wrong', - state: stateKey, - }); - const res = await worker.fetch( - req('https://mcp.example.com/login', { - method: 'POST', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - body: form.toString(), - }), - env, - fakeCtx, - ); - - expect(res.status).toBe(401); - const body = await res.text(); - expect(body).toContain('Invalid email or password'); - - globalThis.fetch = origFetch; - }); -}); - -describe('PackRatAuthHandler – /callback', () => { - it('completes OAuth authorization and redirects', async () => { - const stateKey = 'cb-state-key'; - const env = makeEnv({ - [`oauth_state:${stateKey}`]: JSON.stringify({ - clientId: 'test-client', - scope: ['mcp'], - state: 'xyz', - redirectUri: 'https://client.example.com/cb', - responseType: 'code', - }), - [`session:${stateKey}`]: JSON.stringify({ token: 'ba-token', userId: 'user-123' }), - }); - - const res = await worker.fetch( - req(`https://mcp.example.com/callback?state=${stateKey}`), - env, - fakeCtx, - ); - - expect(res.status).toBe(302); - expect(res.headers.get('Location')).toContain('code=abc'); - expect(env.OAUTH_PROVIDER.completeAuthorization).toHaveBeenCalledWith( - expect.objectContaining({ - userId: 'user-123', - props: { betterAuthToken: 'ba-token', userId: 'user-123' }, - }), - ); - }); - - it('returns 400 when state is missing from KV', async () => { - const env = makeEnv(); // empty KV - - const res = await worker.fetch( - req('https://mcp.example.com/callback?state=nonexistent'), - env, - fakeCtx, - ); - - expect(res.status).toBe(400); - const body = (await res.json()) as Record; - expect(body.error).toBe('invalid_request'); - }); -}); - -describe('unknown paths', () => { - it('returns 404 for unknown paths', async () => { - const env = makeEnv(); - const res = await worker.fetch(req('https://mcp.example.com/unknown'), env, fakeCtx); - expect(res.status).toBe(404); - }); -}); diff --git a/packages/mcp/src/__tests__/client.test.ts b/packages/mcp/src/__tests__/client.test.ts index 2c763e55b5..af5454c14f 100644 --- a/packages/mcp/src/__tests__/client.test.ts +++ b/packages/mcp/src/__tests__/client.test.ts @@ -1,226 +1,348 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { ApiError, err, ok, PackRatApiClient } from '../client'; +import { describe, expect, it, vi } from 'vitest'; +import { call, createMcpClients, errMessage, nowIso, ok, shortId } from '../client'; -// ── ok() / err() helpers ────────────────────────────────────────────────────── +vi.mock('@packrat/api-client', () => ({ + createApiClient: vi.fn((opts: unknown) => ({ _opts: opts })), +})); describe('ok()', () => { - it('wraps data as JSON text content', () => { - const result = ok({ id: 1, name: 'My Pack' }); + it('wraps data as pretty-printed JSON in MCP text content', () => { + const result = ok({ id: 'pack-1', name: 'My Pack' }); expect(result.content).toHaveLength(1); expect(result.content[0].type).toBe('text'); - expect(JSON.parse(result.content[0].text)).toEqual({ id: 1, name: 'My Pack' }); + expect(result.content[0].text).toContain('"id": "pack-1"'); + expect(result.isError).toBeUndefined(); }); - it('handles arrays', () => { - const result = ok([1, 2, 3]); - expect(JSON.parse(result.content[0].text)).toEqual([1, 2, 3]); - }); - - it('handles null', () => { + it('handles null data', () => { const result = ok(null); expect(result.content[0].text).toBe('null'); }); -}); -describe('err()', () => { - it('formats an ApiError with status code', () => { - const result = err(new ApiError('Not Found', { status: 404, body: { error: 'Not Found' } })); - expect(result.isError).toBe(true); - expect(result.content[0].text).toBe('Error: API Error (404): Not Found'); + it('handles array data', () => { + const result = ok([1, 2, 3]); + expect(result.content[0].text).toContain('1'); }); +}); - it('formats a generic Error', () => { - const result = err(new Error('Something broke')); +describe('errMessage()', () => { + it('returns an error result with isError: true', () => { + const result = errMessage('something went wrong'); expect(result.isError).toBe(true); - expect(result.content[0].text).toBe('Error: Something broke'); + expect(result.content[0].type).toBe('text'); + expect(result.content[0].text).toContain('Error: something went wrong'); }); - it('formats a string error', () => { - const result = err('raw string error'); - expect(result.isError).toBe(true); - expect(result.content[0].text).toBe('Error: raw string error'); + it('prefixes the message with "Error:"', () => { + const result = errMessage('not found'); + expect(result.content[0].text).toMatch(/^Error:/); }); }); -// ── ApiError ────────────────────────────────────────────────────────────────── - -describe('ApiError', () => { - it('sets name, status, and body', () => { - const body = { error: 'Unauthorized' }; - const e = new ApiError('Unauthorized', { status: 401, body }); - expect(e.name).toBe('ApiError'); - expect(e.message).toBe('Unauthorized'); - expect(e.status).toBe(401); - expect(e.body).toBe(body); - expect(e instanceof Error).toBe(true); +describe('shortId()', () => { + it('returns a string prefixed with the provided prefix', () => { + const id = shortId('pack'); + expect(id.startsWith('pack_')).toBe(true); }); -}); - -// ── PackRatApiClient ────────────────────────────────────────────────────────── -describe('PackRatApiClient', () => { - const BASE = 'https://api.example.com'; - let token = 'test-jwt-token'; - let client: PackRatApiClient; - let fetchMock: ReturnType; + it('returns a unique id on each call', () => { + const id1 = shortId('item'); + const id2 = shortId('item'); + expect(id1).not.toBe(id2); + }); - beforeEach(() => { - token = 'test-jwt-token'; // reset between tests to avoid mutation leaking - fetchMock = vi.fn(); - vi.stubGlobal('fetch', fetchMock); - client = new PackRatApiClient(BASE, () => token); + it('strips hyphens from the UUID portion', () => { + const id = shortId('trip'); + // The suffix after the prefix should not contain hyphens + const suffix = id.slice('trip_'.length); + expect(suffix).not.toContain('-'); }); - afterEach(() => { - vi.unstubAllGlobals(); + it('produces a 12-character suffix', () => { + const id = shortId('x'); + const suffix = id.slice('x_'.length); + expect(suffix).toHaveLength(12); }); +}); - function mockResponse(body: unknown, status = 200): Response { - return { - ok: status >= 200 && status < 300, - status, - statusText: status === 200 ? 'OK' : 'Error', - text: async () => JSON.stringify(body), - } as unknown as Response; - } +describe('nowIso()', () => { + it('returns a valid ISO 8601 timestamp', () => { + const iso = nowIso(); + expect(() => new Date(iso)).not.toThrow(); + expect(new Date(iso).toISOString()).toBe(iso); + }); - describe('GET', () => { - it('sends a GET request with auth header', async () => { - fetchMock.mockResolvedValue(mockResponse({ items: [] })); + it('returns a string ending in Z (UTC)', () => { + expect(nowIso().endsWith('Z')).toBe(true); + }); +}); - await client.get('/packs'); +describe('call()', () => { + it('returns ok result when promise resolves with data', async () => { + const mockPromise = Promise.resolve({ data: { id: 'pack-1' }, error: null, status: 200 }); + const result = await call(mockPromise); + expect(result.isError).toBeUndefined(); + expect(result.content[0].text).toContain('"id": "pack-1"'); + }); - expect(fetchMock).toHaveBeenCalledOnce(); - const [url, init] = fetchMock.mock.calls[0] as [string, RequestInit]; - expect(url).toBe(`${BASE}/packs`); - expect(init.method).toBe('GET'); - expect((init.headers as Record).Authorization).toBe(`Bearer ${token}`); + it('returns error result when promise resolves with error', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 404, value: 'Not Found' }, + status: 404, }); + const result = await call(mockPromise); + expect(result.isError).toBe(true); + expect(result.content[0].text).toContain('404'); + }); - it('appends query params', async () => { - fetchMock.mockResolvedValue(mockResponse([])); - - await client.get('/packs', { limit: 10, offset: 0, category: 'backpacking' }); - - const [url] = fetchMock.mock.calls[0] as [string]; - const parsed = new URL(url); - expect(parsed.searchParams.get('limit')).toBe('10'); - expect(parsed.searchParams.get('offset')).toBe('0'); - expect(parsed.searchParams.get('category')).toBe('backpacking'); - }); + it('returns error result when data is null', async () => { + const mockPromise = Promise.resolve({ data: null, error: null, status: 200 }); + const result = await call(mockPromise); + expect(result.isError).toBe(true); + }); - it('skips undefined params', async () => { - fetchMock.mockResolvedValue(mockResponse([])); + it('returns error result when promise rejects', async () => { + const mockPromise = Promise.reject(new Error('network failure')); + const result = await call(mockPromise); + expect(result.isError).toBe(true); + expect(result.content[0].text).toContain('network failure'); + }); - await client.get('/packs', { limit: 10, category: undefined }); + it('uses action from options in error messages', async () => { + const mockPromise = Promise.reject(new Error('timeout')); + const result = await call(mockPromise, { action: 'fetch pack' }); + expect(result.content[0].text).toContain('fetch pack'); + }); - const [url] = fetchMock.mock.calls[0] as [string]; - const parsed = new URL(url); - expect(parsed.searchParams.has('category')).toBe(false); - expect(parsed.searchParams.get('limit')).toBe('10'); + it('formats 401 error with auth guidance', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 401, value: null }, + status: 401, }); + const result = await call(mockPromise, { action: 'list packs' }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('authentication'); + }); - it('omits Authorization header when token is empty', async () => { - token = ''; - fetchMock.mockResolvedValue(mockResponse({})); - - await client.get('/public'); - - const [, init] = fetchMock.mock.calls[0] as [string, RequestInit]; - expect((init.headers as Record).Authorization).toBeUndefined(); + it('formats 401 admin error with admin guidance when requiresAdmin is set', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 401, value: null }, + status: 401, }); + const result = await call(mockPromise, { action: 'list packs', requiresAdmin: true }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('admin'); + }); - it('throws ApiError on non-ok response with JSON error body', async () => { - fetchMock.mockResolvedValue(mockResponse({ error: 'Not found' }, 404)); - - await expect(client.get('/packs/nope')).rejects.toThrow(ApiError); - - try { - await client.get('/packs/nope'); - } catch (e) { - expect(e instanceof ApiError).toBe(true); - expect((e as ApiError).status).toBe(404); - expect((e as ApiError).message).toBe('Not found'); - } + it('formats 403 error', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 403, value: null }, + status: 403, }); + const result = await call(mockPromise, { action: 'delete pack' }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('forbidden'); + }); - it('throws ApiError with HTTP status message when body has no error field', async () => { - fetchMock.mockResolvedValue(mockResponse({ message: 'gone' }, 410)); - - await expect(client.get('/gone')).rejects.toThrow('HTTP 410:'); + it('formats 404 error', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 404, value: null }, + status: 404, }); + const result = await call(mockPromise, { action: 'get pack', resourceHint: 'pack p_123' }); + expect(result.isError).toBe(true); + expect(result.content[0].text).toContain('404'); + }); - it('returns parsed JSON on success', async () => { - const pack = { id: 'p_1', name: 'Test Pack' }; - fetchMock.mockResolvedValue(mockResponse(pack)); + it('formats 409 conflict error', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 409, value: null }, + status: 409, + }); + const result = await call(mockPromise, { action: 'create pack' }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('conflict'); + }); - const result = await client.get('/packs/p_1'); - expect(result).toEqual(pack); + it('formats 422 validation error', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 422, value: null }, + status: 422, }); + const result = await call(mockPromise, { action: 'update pack' }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('validation'); }); - describe('POST', () => { - it('sends POST with JSON body', async () => { - fetchMock.mockResolvedValue(mockResponse({ id: 'p_new' })); + it('formats 429 rate limit error', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 429, value: null }, + status: 429, + }); + const result = await call(mockPromise, { action: 'search' }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('rate limit'); + }); - await client.post('/packs', { name: 'New Pack', category: 'backpacking' }); + it('formats generic HTTP error for unknown status codes', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 503, value: null }, + status: 503, + }); + const result = await call(mockPromise, { action: 'fetch data' }); + expect(result.isError).toBe(true); + expect(result.content[0].text).toContain('503'); + }); - const [url, init] = fetchMock.mock.calls[0] as [string, RequestInit]; - expect(url).toBe(`${BASE}/packs`); - expect(init.method).toBe('POST'); - expect(JSON.parse(init.body as string)).toEqual({ - name: 'New Pack', - category: 'backpacking', - }); + it('includes error body message when available', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 400, value: { message: 'invalid input' } }, + status: 400, }); + const result = await call(mockPromise); + expect(result.content[0].text).toContain('invalid input'); + }); - it('sends POST with no body when omitted', async () => { - fetchMock.mockResolvedValue(mockResponse({ ok: true })); + it('handles non-Error thrown exceptions', async () => { + const mockPromise = Promise.reject('string error'); + const result = await call(mockPromise); + expect(result.isError).toBe(true); + expect(result.content[0].text).toContain('string error'); + }); - await client.post('/action'); + it('formats 403 admin error when requiresAdmin is set', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 403, value: null }, + status: 403, + }); + const result = await call(mockPromise, { action: 'delete user', requiresAdmin: true }); + expect(result.isError).toBe(true); + expect(result.content[0].text.toLowerCase()).toContain('admin'); + expect(result.content[0].text.toLowerCase()).toContain('forbidden'); + }); - const [, init] = fetchMock.mock.calls[0] as [string, RequestInit]; - expect(init.body).toBeUndefined(); + it('extracts error body from obj.error field when obj.message is absent', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 400, value: { error: 'bad request detail' } }, + status: 400, }); + const result = await call(mockPromise); + expect(result.content[0].text).toContain('bad request detail'); }); - describe('PATCH', () => { - it('sends PATCH with JSON body', async () => { - fetchMock.mockResolvedValue(mockResponse({ id: 'p_1' })); + it('JSON-stringifies error body object when no message/error field present', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 400, value: { code: 42, detail: 'some info' } }, + status: 400, + }); + const result = await call(mockPromise); + expect(result.content[0].text).toContain('42'); + }); - await client.patch('/packs/p_1', { name: 'Updated' }); + it('converts numeric error body to string', async () => { + const mockPromise = Promise.resolve({ + data: null, + error: { status: 500, value: 12345 }, + status: 500, + }); + const result = await call(mockPromise); + expect(result.content[0].text).toContain('12345'); + }); +}); - const [url, init] = fetchMock.mock.calls[0] as [string, RequestInit]; - expect(url).toBe(`${BASE}/packs/p_1`); - expect(init.method).toBe('PATCH'); - expect(JSON.parse(init.body as string)).toEqual({ name: 'Updated' }); +describe('createMcpClients()', () => { + it('returns user and admin clients', () => { + const clients = createMcpClients({ + baseUrl: 'https://api.example.com', + getUserToken: () => 'user-token', + getAdminToken: () => 'admin-token', }); + expect(clients).toHaveProperty('user'); + expect(clients).toHaveProperty('admin'); }); - describe('DELETE', () => { - it('sends DELETE request', async () => { - fetchMock.mockResolvedValue(mockResponse({ deleted: true })); + it('passes the base URL to each client', async () => { + const mod = await import('@packrat/api-client'); + const spy = vi.mocked(mod.createApiClient); + spy.mockClear(); + createMcpClients({ + baseUrl: 'https://api.test.com', + getUserToken: () => null, + getAdminToken: () => null, + }); + expect(spy).toHaveBeenCalledTimes(2); + for (const c of spy.mock.calls) { + expect((c[0] as { baseUrl: string }).baseUrl).toBe('https://api.test.com'); + } + }); - await client.delete('/packs/p_1'); + it('noopHooks getAccessToken returns null when token provider returns null', async () => { + const mod = await import('@packrat/api-client'); + const spy = vi.mocked(mod.createApiClient); + spy.mockClear(); + createMcpClients({ + baseUrl: 'https://api.test.com', + getUserToken: () => null, + getAdminToken: () => null, + }); + const auth = (spy.mock.calls[0]?.[0] as { auth: { getAccessToken: () => string | null } }).auth; + expect(auth.getAccessToken()).toBeNull(); + }); - const [url, init] = fetchMock.mock.calls[0] as [string, RequestInit]; - expect(url).toBe(`${BASE}/packs/p_1`); - expect(init.method).toBe('DELETE'); + it('noopHooks getAccessToken returns the token when provider returns one', async () => { + const mod = await import('@packrat/api-client'); + const spy = vi.mocked(mod.createApiClient); + spy.mockClear(); + createMcpClients({ + baseUrl: 'https://api.test.com', + getUserToken: () => 'my-token', + getAdminToken: () => null, }); + const auth = (spy.mock.calls[0]?.[0] as { auth: { getAccessToken: () => string | null } }).auth; + expect(auth.getAccessToken()).toBe('my-token'); }); - describe('non-JSON response', () => { - it('returns raw string when response is not JSON', async () => { - const raw = { - ok: true, - status: 200, - statusText: 'OK', - text: async () => 'plain text response', - } as unknown as Response; - fetchMock.mockResolvedValue(raw); + it('noopHooks getRefreshToken always returns null', async () => { + const mod = await import('@packrat/api-client'); + const spy = vi.mocked(mod.createApiClient); + spy.mockClear(); + createMcpClients({ + baseUrl: 'https://api.test.com', + getUserToken: () => 'tok', + getAdminToken: () => null, + }); + const auth = (spy.mock.calls[0]?.[0] as { auth: { getRefreshToken: () => null } }).auth; + expect(auth.getRefreshToken()).toBeNull(); + }); - const result = await client.get('/text-endpoint'); - expect(result).toBe('plain text response'); + it('noopHooks lifecycle callbacks are no-ops', async () => { + const mod = await import('@packrat/api-client'); + const spy = vi.mocked(mod.createApiClient); + spy.mockClear(); + createMcpClients({ + baseUrl: 'https://api.test.com', + getUserToken: () => null, + getAdminToken: () => null, }); + const auth = ( + spy.mock.calls[0]?.[0] as { + auth: { onAccessTokenRefreshed: () => void; onNeedsReauth: () => void }; + } + ).auth; + expect(() => auth.onAccessTokenRefreshed()).not.toThrow(); + expect(() => auth.onNeedsReauth()).not.toThrow(); }); }); diff --git a/packages/mcp/src/__tests__/constants.test.ts b/packages/mcp/src/__tests__/constants.test.ts new file mode 100644 index 0000000000..fdbfba86ac --- /dev/null +++ b/packages/mcp/src/__tests__/constants.test.ts @@ -0,0 +1,65 @@ +import { describe, expect, it } from 'vitest'; +import { ServiceMeta, WorkerRoute } from '../constants'; + +describe('WorkerRoute', () => { + it('defines the root path', () => { + expect(WorkerRoute.Root).toBe('/'); + }); + + it('defines the health endpoint', () => { + expect(WorkerRoute.Health).toBe('/health'); + }); + + it('defines the MCP endpoint', () => { + expect(WorkerRoute.Mcp).toBe('/mcp'); + }); + + it('defines the OAuth authorize endpoint', () => { + expect(WorkerRoute.Authorize).toBe('/authorize'); + }); + + it('defines the login endpoint', () => { + expect(WorkerRoute.Login).toBe('/login'); + }); + + it('defines the OAuth callback endpoint', () => { + expect(WorkerRoute.Callback).toBe('/callback'); + }); + + it('defines the token endpoint', () => { + expect(WorkerRoute.Token).toBe('/token'); + }); + + it('defines the register endpoint', () => { + expect(WorkerRoute.Register).toBe('/register'); + }); + + it('has exactly 8 route entries', () => { + expect(Object.keys(WorkerRoute)).toHaveLength(8); + }); + + it('all routes start with /', () => { + for (const route of Object.values(WorkerRoute)) { + expect(route.startsWith('/')).toBe(true); + } + }); + + it('all route values are unique', () => { + const values = Object.values(WorkerRoute); + expect(new Set(values).size).toBe(values.length); + }); +}); + +describe('ServiceMeta', () => { + it('has the correct service name', () => { + expect(ServiceMeta.Name).toBe('packrat-mcp'); + }); + + it('has a semver-formatted version', () => { + expect(ServiceMeta.Version).toMatch(/^\d+\.\d+\.\d+$/); + }); + + it('uses streamable-http transport', () => { + expect(ServiceMeta.Transport).toBe('streamable-http'); + }); +}); diff --git a/packages/mcp/src/__tests__/enums.test.ts b/packages/mcp/src/__tests__/enums.test.ts new file mode 100644 index 0000000000..4e1e179d29 --- /dev/null +++ b/packages/mcp/src/__tests__/enums.test.ts @@ -0,0 +1,125 @@ +import { describe, expect, it } from 'vitest'; +import { + CatalogSortField, + CrossingDifficulty, + ExperienceLevel, + ItemCategory, + PackCategory, + PackStyle, + SortOrder, + TrailCondition, + TrailSurface, + WeightPriority, +} from '../enums'; + +describe('PackCategory', () => { + it('maps all expected categories to their string values', () => { + expect(PackCategory.Backpacking).toBe('backpacking'); + expect(PackCategory.Camping).toBe('camping'); + expect(PackCategory.Climbing).toBe('climbing'); + expect(PackCategory.Cycling).toBe('cycling'); + expect(PackCategory.Hiking).toBe('hiking'); + expect(PackCategory.Skiing).toBe('skiing'); + expect(PackCategory.Travel).toBe('travel'); + expect(PackCategory.General).toBe('general'); + }); + + it('has 8 members', () => { + const values = Object.values(PackCategory); + expect(values).toHaveLength(8); + }); +}); + +describe('ItemCategory', () => { + it('maps all expected item categories to their string values', () => { + expect(ItemCategory.Shelter).toBe('shelter'); + expect(ItemCategory.Sleep).toBe('sleep'); + expect(ItemCategory.Clothing).toBe('clothing'); + expect(ItemCategory.Footwear).toBe('footwear'); + expect(ItemCategory.Navigation).toBe('navigation'); + expect(ItemCategory.Safety).toBe('safety'); + expect(ItemCategory.Food).toBe('food'); + expect(ItemCategory.Water).toBe('water'); + expect(ItemCategory.Hygiene).toBe('hygiene'); + expect(ItemCategory.Tools).toBe('tools'); + }); + + it('has 10 members', () => { + expect(Object.values(ItemCategory)).toHaveLength(10); + }); +}); + +describe('TrailSurface', () => { + it('maps all expected trail surfaces to their string values', () => { + expect(TrailSurface.Paved).toBe('paved'); + expect(TrailSurface.Gravel).toBe('gravel'); + expect(TrailSurface.Dirt).toBe('dirt'); + expect(TrailSurface.Rocky).toBe('rocky'); + expect(TrailSurface.Snow).toBe('snow'); + expect(TrailSurface.Mud).toBe('mud'); + }); +}); + +describe('TrailCondition', () => { + it('maps all expected conditions to their string values', () => { + expect(TrailCondition.Excellent).toBe('excellent'); + expect(TrailCondition.Good).toBe('good'); + expect(TrailCondition.Fair).toBe('fair'); + expect(TrailCondition.Poor).toBe('poor'); + }); +}); + +describe('CrossingDifficulty', () => { + it('maps all expected difficulties to their string values', () => { + expect(CrossingDifficulty.Easy).toBe('easy'); + expect(CrossingDifficulty.Moderate).toBe('moderate'); + expect(CrossingDifficulty.Difficult).toBe('difficult'); + }); +}); + +describe('SortOrder', () => { + it('has ascending and descending variants', () => { + expect(SortOrder.Asc).toBe('asc'); + expect(SortOrder.Desc).toBe('desc'); + }); +}); + +describe('ExperienceLevel', () => { + it('maps all experience levels to their string values', () => { + expect(ExperienceLevel.Beginner).toBe('beginner'); + expect(ExperienceLevel.Intermediate).toBe('intermediate'); + expect(ExperienceLevel.Advanced).toBe('advanced'); + }); +}); + +describe('PackStyle', () => { + it('maps all pack styles to their string values', () => { + expect(PackStyle.Ultralight).toBe('ultralight'); + expect(PackStyle.Lightweight).toBe('lightweight'); + expect(PackStyle.Traditional).toBe('traditional'); + }); +}); + +describe('WeightPriority', () => { + it('maps all weight priorities to their string values', () => { + expect(WeightPriority.Ultralight).toBe('ultralight'); + expect(WeightPriority.WeightConscious).toBe('weight-conscious'); + expect(WeightPriority.DurabilityFirst).toBe('durability-first'); + }); +}); + +describe('CatalogSortField', () => { + it('maps all sort fields to their string values', () => { + expect(CatalogSortField.Name).toBe('name'); + expect(CatalogSortField.Brand).toBe('brand'); + expect(CatalogSortField.Price).toBe('price'); + expect(CatalogSortField.Rating).toBe('ratingValue'); + expect(CatalogSortField.CreatedAt).toBe('createdAt'); + expect(CatalogSortField.UpdatedAt).toBe('updatedAt'); + expect(CatalogSortField.Usage).toBe('usage'); + }); + + it('has 7 members', () => { + expect(Object.values(CatalogSortField)).toHaveLength(7); + }); +}); diff --git a/packages/mcp/src/__tests__/helpers.ts b/packages/mcp/src/__tests__/helpers.ts deleted file mode 100644 index 0262acd54a..0000000000 --- a/packages/mcp/src/__tests__/helpers.ts +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Test helpers — create lightweight fakes for McpServer and PackRatApiClient. - * - * Tool handlers are extracted from the `registerTool` calls so they can be - * invoked directly in tests without spinning up a Durable Object or MCP session. - */ -import { vi } from 'vitest'; -import type { PackRatApiClient } from '../client'; -import type { PackRatMCP } from '../index'; - -/** Captured tool registration. */ -export interface RegisteredTool { - name: string; - config: { description?: string; inputSchema: Record }; - handler: (args: Record) => Promise; -} - -/** Captured resource registration. */ -export interface RegisteredResource { - name: string; -} - -/** Captured prompt registration. */ -export interface RegisteredPrompt { - name: string; -} - -/** - * Build a fake McpServer that records `registerTool` calls. - * Returns the registry map so tests can pull out and invoke handlers directly. - */ -export function buildMockServer() { - const tools = new Map(); - const resources = new Map(); - const prompts = new Map(); - - const server = { - registerTool: vi.fn( - // biome-ignore lint/complexity/useMaxParams: mirrors MCP SDK's positional registerTool signature - (name: string, config: RegisteredTool['config'], handler: RegisteredTool['handler']) => { - tools.set(name, { name, config, handler }); - }, - ), - registerResource: vi.fn((name: string, ..._rest: unknown[]) => { - resources.set(name, { name }); - }), - registerPrompt: vi.fn((name: string, ..._rest: unknown[]) => { - prompts.set(name, { name }); - }), - }; - - return { server, tools, resources, prompts }; -} - -/** - * Build a mock PackRatApiClient where every method is a vi.fn(). - */ -export function buildMockApiClient() { - return { - get: vi.fn(), - post: vi.fn(), - put: vi.fn(), - patch: vi.fn(), - delete: vi.fn(), - } as unknown as PackRatApiClient; -} - -/** - * Build a minimal fake PackRatMCP agent with mocked server and api. - */ -export function buildMockAgent(): { - agent: PackRatMCP; - tools: Map; - resources: Map; - prompts: Map; - api: PackRatApiClient; -} { - const { server, tools, resources, prompts } = buildMockServer(); - const api = buildMockApiClient(); - - const agent = { - server, - api, - state: { authToken: 'test-token' }, - env: { PACKRAT_API_URL: 'https://api.example.com', PackRatMCP: {} }, - } as unknown as PackRatMCP; - - return { agent, tools, resources, prompts, api }; -} - -/** Invoke a registered tool by name, returning its result. */ -export async function callTool(options: { - tools: Map; - name: string; - args: Record; -}): Promise<{ content: Array<{ type: string; text: string }>; isError?: boolean }> { - const { tools, name, args } = options; - const tool = tools.get(name); - if (!tool) throw new Error(`Tool "${name}" not registered`); - return tool.handler(args) as Promise<{ - content: Array<{ type: string; text: string }>; - isError?: boolean; - }>; -} - -/** Parse the JSON text from a tool result's first content block. */ -export function parseToolResult(result: { - content: Array<{ type: string; text: string }>; -}): unknown { - return JSON.parse(result.content[0].text); -} diff --git a/packages/mcp/src/__tests__/tools/catalog.test.ts b/packages/mcp/src/__tests__/tools/catalog.test.ts deleted file mode 100644 index 35051d6345..0000000000 --- a/packages/mcp/src/__tests__/tools/catalog.test.ts +++ /dev/null @@ -1,200 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackRatApiClient } from '../../client'; -import { ApiError } from '../../client'; -import { registerCatalogTools } from '../../tools/catalog'; -import type { RegisteredTool } from '../helpers'; -import { buildMockAgent, callTool, parseToolResult } from '../helpers'; - -describe('catalog tools', () => { - let api: PackRatApiClient; - let tools: Map; - - beforeEach(() => { - const mock = buildMockAgent(); - api = mock.api; - tools = mock.tools; - registerCatalogTools(mock.agent); - }); - - // ── search_gear_catalog ───────────────────────────────────────────────────── - - describe('search_gear_catalog', () => { - it('is registered', () => { - expect(tools.has('search_gear_catalog')).toBe(true); - }); - - it('calls GET /catalog with all params', async () => { - vi.mocked(api.get).mockResolvedValue({ items: [] }); - - await callTool({ - tools, - name: 'search_gear_catalog', - args: { - query: 'ultralight tent', - category: 'tents', - limit: 5, - page: 1, - sort_by: 'price', - sort_order: 'asc', - }, - }); - - expect(api.get).toHaveBeenCalledWith('/catalog', { - q: 'ultralight tent', - category: 'tents', - limit: 5, - page: 1, - 'sort[field]': 'price', - 'sort[order]': 'asc', - }); - }); - - it('returns error result on API failure', async () => { - vi.mocked(api.get).mockRejectedValue(new ApiError('Server Error', { status: 500, body: {} })); - - const result = await callTool({ - tools, - name: 'search_gear_catalog', - args: { limit: 10, page: 1, sort_order: 'asc' }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('500'); - }); - }); - - // ── semantic_gear_search ──────────────────────────────────────────────────── - - describe('semantic_gear_search', () => { - it('calls GET /catalog/vector-search', async () => { - vi.mocked(api.get).mockResolvedValue({ items: [], total: 0 }); - - await callTool({ - tools, - name: 'semantic_gear_search', - args: { query: 'warm puffy jacket for winter camping', limit: 5 }, - }); - - expect(api.get).toHaveBeenCalledWith('/catalog/vector-search', { - q: 'warm puffy jacket for winter camping', - limit: 5, - }); - }); - - it('returns items from the semantic search', async () => { - const items = [{ id: 1, name: "Arc'teryx Atom LT" }]; - vi.mocked(api.get).mockResolvedValue({ items }); - - const result = await callTool({ - tools, - name: 'semantic_gear_search', - args: { query: 'midlayer fleece', limit: 8 }, - }); - - expect(parseToolResult(result)).toEqual({ items }); - }); - }); - - // ── get_catalog_item ──────────────────────────────────────────────────────── - - describe('get_catalog_item', () => { - it('calls GET /catalog/:id', async () => { - const item = { id: 42, name: 'Big Agnes Copper Spur' }; - vi.mocked(api.get).mockResolvedValue(item); - - const result = await callTool({ tools, name: 'get_catalog_item', args: { item_id: 42 } }); - - expect(api.get).toHaveBeenCalledWith('/catalog/42'); - expect(parseToolResult(result)).toEqual(item); - }); - - it('propagates 404 as error result', async () => { - vi.mocked(api.get).mockRejectedValue(new ApiError('Not Found', { status: 404, body: {} })); - - const result = await callTool({ tools, name: 'get_catalog_item', args: { item_id: 9999 } }); - - expect(result.isError).toBe(true); - }); - }); - - // ── list_gear_categories ──────────────────────────────────────────────────── - - describe('list_gear_categories', () => { - it('calls GET /catalog/categories with no params', async () => { - vi.mocked(api.get).mockResolvedValue([{ name: 'tents', count: 120 }]); - - const result = await callTool({ tools, name: 'list_gear_categories', args: {} }); - - expect(api.get).toHaveBeenCalledWith('/catalog/categories'); - expect(Array.isArray(parseToolResult(result))).toBe(true); - }); - }); - - // ── compare_gear_items ────────────────────────────────────────────────────── - - describe('compare_gear_items', () => { - it('fetches all items and returns sorted comparison', async () => { - // Items returned in order of ids 1, 2, 3 - vi.mocked(api.get) - .mockResolvedValueOnce({ - id: 1, - name: 'Heavy Tent', - brand: 'GenericBrand', - category: 'tents', - weight: 2000, - price: 20000, - ratingValue: 4.0, - ratingCount: 50, - productUrl: 'https://x.com', - }) - .mockResolvedValueOnce({ - id: 2, - name: 'Ultralight Tent', - brand: 'GossamerGear', - category: 'tents', - weight: 700, - price: 55000, - ratingValue: 4.8, - ratingCount: 200, - productUrl: 'https://y.com', - }) - .mockResolvedValueOnce({ - id: 3, - name: 'Mid Tent', - brand: 'MSR', - category: 'tents', - weight: 1200, - price: 35000, - ratingValue: 4.5, - ratingCount: 150, - productUrl: 'https://z.com', - }); - - const result = await callTool({ - tools, - name: 'compare_gear_items', - args: { item_ids: [1, 2, 3] }, - }); - const comparison = parseToolResult(result) as Record; - - expect((comparison.items as unknown[]).length).toBe(3); - // sorted by weight asc → Ultralight first - expect((comparison.items as Array>)[0].name).toBe('Ultralight Tent'); - expect(comparison.lightest).toBe('Ultralight Tent'); - expect(comparison.highestRated).toBe('Ultralight Tent'); - expect(comparison.cheapest).toBe('Heavy Tent'); - }); - - it('returns error result if any item fetch fails', async () => { - vi.mocked(api.get).mockRejectedValue(new ApiError('Not Found', { status: 404, body: {} })); - - const result = await callTool({ - tools, - name: 'compare_gear_items', - args: { item_ids: [1, 2] }, - }); - - expect(result.isError).toBe(true); - }); - }); -}); diff --git a/packages/mcp/src/__tests__/tools/knowledge.test.ts b/packages/mcp/src/__tests__/tools/knowledge.test.ts deleted file mode 100644 index 1ad7fa0678..0000000000 --- a/packages/mcp/src/__tests__/tools/knowledge.test.ts +++ /dev/null @@ -1,161 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackRatApiClient } from '../../client'; -import { ApiError } from '../../client'; -import { registerKnowledgeTools } from '../../tools/knowledge'; -import type { RegisteredTool } from '../helpers'; -import { buildMockAgent, callTool, parseToolResult } from '../helpers'; - -describe('knowledge tools', () => { - let api: PackRatApiClient; - let tools: Map; - - beforeEach(() => { - const mock = buildMockAgent(); - api = mock.api; - tools = mock.tools; - registerKnowledgeTools(mock.agent); - }); - - // ── search_outdoor_guides ─────────────────────────────────────────────────── - - describe('search_outdoor_guides', () => { - it('is registered', () => { - expect(tools.has('search_outdoor_guides')).toBe(true); - }); - - it('calls GET /ai/rag-search with query and limit', async () => { - const guides = { results: [{ title: 'Bear Hang Guide', content: '...' }] }; - vi.mocked(api.get).mockResolvedValue(guides); - - const result = await callTool({ - tools, - name: 'search_outdoor_guides', - args: { - query: 'how to set up a bear hang', - limit: 3, - }, - }); - - expect(api.get).toHaveBeenCalledWith('/ai/rag-search', { - q: 'how to set up a bear hang', - limit: 3, - }); - expect(parseToolResult(result)).toEqual(guides); - }); - - it('returns error result on API failure', async () => { - vi.mocked(api.get).mockRejectedValue( - new ApiError('Service Unavailable', { status: 503, body: {} }), - ); - - const result = await callTool({ - tools, - name: 'search_outdoor_guides', - args: { - query: 'water treatment methods', - limit: 5, - }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('503'); - }); - }); - - // ── web_search ────────────────────────────────────────────────────────────── - - describe('web_search', () => { - it('is registered', () => { - expect(tools.has('web_search')).toBe(true); - }); - - it('calls GET /ai/web-search with query', async () => { - const webResult = { answer: 'JMT permits are available...', sources: [] }; - vi.mocked(api.get).mockResolvedValue(webResult); - - const result = await callTool({ - tools, - name: 'web_search', - args: { - query: 'John Muir Trail permit availability 2025', - }, - }); - - expect(api.get).toHaveBeenCalledWith('/ai/web-search', { - q: 'John Muir Trail permit availability 2025', - }); - expect(parseToolResult(result)).toEqual(webResult); - }); - - it('returns error when network fails', async () => { - vi.mocked(api.get).mockRejectedValue(new Error('fetch failed')); - - const result = await callTool({ tools, name: 'web_search', args: { query: 'test query' } }); - - expect(result.isError).toBe(true); - }); - }); - - // ── execute_sql_query ─────────────────────────────────────────────────────── - - describe('execute_sql_query', () => { - it('is registered', () => { - expect(tools.has('execute_sql_query')).toBe(true); - }); - - it('calls POST /ai/execute-sql with query and limit', async () => { - const rows = [{ name: 'Zpacks Duplex', weight: 510 }]; - vi.mocked(api.post).mockResolvedValue({ rows, rowCount: 1 }); - - const sql = - "SELECT name, weight FROM catalog_items WHERE category = 'tents' ORDER BY weight ASC LIMIT 5"; - const result = await callTool({ - tools, - name: 'execute_sql_query', - args: { query: sql, limit: 50 }, - }); - - const [path, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(path).toBe('/ai/execute-sql'); - expect(body.query).toBe(sql); - expect(body.limit).toBe(50); - expect((parseToolResult(result) as Record).rowCount).toBe(1); - }); - - it('returns error for failed queries', async () => { - vi.mocked(api.post).mockRejectedValue( - new ApiError('Syntax error in SQL', { status: 400, body: {} }), - ); - - const result = await callTool({ - tools, - name: 'execute_sql_query', - args: { - query: 'SELECT * FROM nonexistent_table', - limit: 100, - }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('400'); - }); - }); - - // ── get_database_schema ───────────────────────────────────────────────────── - - describe('get_database_schema', () => { - it('is registered', () => { - expect(tools.has('get_database_schema')).toBe(true); - }); - - it('calls GET /ai/db-schema with no params', async () => { - const schema = { tables: [{ name: 'catalog_items', columns: ['id', 'name', 'weight'] }] }; - vi.mocked(api.get).mockResolvedValue(schema); - - const result = await callTool({ tools, name: 'get_database_schema', args: {} }); - - expect(api.get).toHaveBeenCalledWith('/ai/db-schema'); - expect(parseToolResult(result)).toEqual(schema); - }); - }); -}); diff --git a/packages/mcp/src/__tests__/tools/packs.test.ts b/packages/mcp/src/__tests__/tools/packs.test.ts deleted file mode 100644 index a4951119a9..0000000000 --- a/packages/mcp/src/__tests__/tools/packs.test.ts +++ /dev/null @@ -1,292 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackRatApiClient } from '../../client'; -import { ApiError } from '../../client'; -import { registerPackTools } from '../../tools/packs'; -import type { RegisteredTool } from '../helpers'; -import { buildMockAgent, callTool, parseToolResult } from '../helpers'; - -describe('pack tools', () => { - let api: PackRatApiClient; - let tools: Map; - - beforeEach(() => { - const mock = buildMockAgent(); - api = mock.api; - tools = mock.tools; - registerPackTools(mock.agent); - }); - - // ── list_packs ────────────────────────────────────────────────────────────── - - describe('list_packs', () => { - it('is registered', () => { - expect(tools.has('list_packs')).toBe(true); - }); - - it('calls GET /packs with includePublic param', async () => { - const mockData = { items: [], total: 0 }; - vi.mocked(api.get).mockResolvedValue(mockData); - - const result = await callTool({ tools, name: 'list_packs', args: { include_public: true } }); - - expect(api.get).toHaveBeenCalledWith('/packs', { includePublic: 1 }); - expect(parseToolResult(result)).toEqual(mockData); - }); - - it('returns error result on API failure', async () => { - vi.mocked(api.get).mockRejectedValue(new ApiError('Forbidden', { status: 403, body: {} })); - - const result = await callTool({ tools, name: 'list_packs', args: {} }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('403'); - }); - }); - - // ── get_pack ──────────────────────────────────────────────────────────────── - - describe('get_pack', () => { - it('calls GET /packs/:id', async () => { - const pack = { id: 'p_abc', name: 'Test Pack', items: [] }; - vi.mocked(api.get).mockResolvedValue(pack); - - const result = await callTool({ tools, name: 'get_pack', args: { pack_id: 'p_abc' } }); - - expect(api.get).toHaveBeenCalledWith('/packs/p_abc'); - expect(parseToolResult(result)).toEqual(pack); - }); - - it('propagates 404 as error result', async () => { - vi.mocked(api.get).mockRejectedValue(new ApiError('Not Found', { status: 404, body: {} })); - - const result = await callTool({ tools, name: 'get_pack', args: { pack_id: 'nope' } }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('404'); - }); - }); - - // ── create_pack ───────────────────────────────────────────────────────────── - - describe('create_pack', () => { - it('calls POST /packs with mapped fields', async () => { - const created = { id: 'p_new', name: 'Summer Trek' }; - vi.mocked(api.post).mockResolvedValue(created); - - const result = await callTool({ - tools, - name: 'create_pack', - args: { - name: 'Summer Trek', - category: 'backpacking', - is_public: true, - tags: ['summer', 'california'], - }, - }); - - expect(api.post).toHaveBeenCalledOnce(); - const [path, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(path).toBe('/packs'); - expect(body.name).toBe('Summer Trek'); - expect(body.category).toBe('backpacking'); - expect(body.isPublic).toBe(true); - expect(body.tags).toEqual(['summer', 'california']); - expect(typeof body.id).toBe('string'); - expect((body.id as string).startsWith('p_')).toBe(true); - expect(parseToolResult(result)).toEqual(created); - }); - }); - - // ── update_pack ───────────────────────────────────────────────────────────── - - describe('update_pack', () => { - it('calls PUT /packs/:id with only provided fields', async () => { - vi.mocked(api.put).mockResolvedValue({ id: 'p_1' }); - - await callTool({ - tools, - name: 'update_pack', - args: { - pack_id: 'p_1', - name: 'Renamed Pack', - is_public: false, - }, - }); - - const [path, body] = vi.mocked(api.put).mock.calls[0] as [string, Record]; - expect(path).toBe('/packs/p_1'); - expect(body.name).toBe('Renamed Pack'); - expect(body.isPublic).toBe(false); - expect(body.category).toBeUndefined(); - }); - - it('does not include undefined optional fields', async () => { - vi.mocked(api.put).mockResolvedValue({ id: 'p_1' }); - - await callTool({ tools, name: 'update_pack', args: { pack_id: 'p_1', name: 'Only Name' } }); - - const [, body] = vi.mocked(api.put).mock.calls[0] as [string, Record]; - expect(body.description).toBeUndefined(); - expect(body.tags).toBeUndefined(); - }); - }); - - // ── delete_pack ───────────────────────────────────────────────────────────── - - describe('delete_pack', () => { - it('calls DELETE /packs/:id', async () => { - vi.mocked(api.delete).mockResolvedValue({ deleted: true }); - - const result = await callTool({ tools, name: 'delete_pack', args: { pack_id: 'p_del' } }); - - expect(api.delete).toHaveBeenCalledWith('/packs/p_del'); - expect(parseToolResult(result)).toEqual({ deleted: true }); - }); - }); - - // ── add_pack_item ─────────────────────────────────────────────────────────── - - describe('add_pack_item', () => { - it('calls POST /packs/:id/items with mapped fields', async () => { - vi.mocked(api.post).mockResolvedValue({ id: 'i_new' }); - - await callTool({ - tools, - name: 'add_pack_item', - args: { - pack_id: 'p_1', - name: 'Down Sleeping Bag', - category: 'sleep', - weight_grams: 900, - quantity: 1, - is_consumable: false, - is_worn: false, - }, - }); - - const [path, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(path).toBe('/packs/p_1/items'); - expect(body.name).toBe('Down Sleeping Bag'); - expect(body.weight).toBe(900); - expect(body.category).toBe('sleep'); - expect(body.quantity).toBe(1); - expect(typeof body.id).toBe('string'); - }); - }); - - // ── remove_pack_item ──────────────────────────────────────────────────────── - - describe('remove_pack_item', () => { - it('calls DELETE /packs/items/:itemId', async () => { - vi.mocked(api.delete).mockResolvedValue({ deleted: true }); - - await callTool({ tools, name: 'remove_pack_item', args: { item_id: 'i_99' } }); - - expect(api.delete).toHaveBeenCalledWith('/packs/items/i_99'); - }); - }); - - // ── analyze_pack_weight ───────────────────────────────────────────────────── - - describe('analyze_pack_weight', () => { - it('computes per-category weight breakdown', async () => { - vi.mocked(api.get).mockResolvedValue({ - totalWeight: 3200, - baseWeight: 2800, - wornWeight: 400, - consumableWeight: 0, - items: [ - { - name: 'Tent', - category: 'shelter', - weight: 1200, - quantity: 1, - worn: false, - consumable: false, - }, - { - name: 'Sleeping Bag', - category: 'sleep', - weight: 900, - quantity: 1, - worn: false, - consumable: false, - }, - { - name: 'Jacket', - category: 'clothing', - weight: 400, - quantity: 1, - worn: true, - consumable: false, - }, - { - name: 'Stove', - category: 'kitchen', - weight: 400, - quantity: 2, - worn: false, - consumable: false, - }, - ], - }); - - const result = await callTool({ - tools, - name: 'analyze_pack_weight', - args: { pack_id: 'p_1' }, - }); - const analysis = parseToolResult(result) as Record; - - expect(analysis.packId).toBe('p_1'); - expect(analysis.totalWeight).toBe(3200); - expect(analysis.itemCount).toBe(4); - - const categories = analysis.byCategory as Array>; - // shelter (1200g) should be first - expect(categories[0].category).toBe('shelter'); - expect(categories[0].totalGrams).toBe(1200); - // kitchen has 2×400 = 800g - const kitchen = categories.find((c) => c.category === 'kitchen'); - expect(kitchen?.totalGrams).toBe(800); - }); - - it('handles empty items array gracefully', async () => { - vi.mocked(api.get).mockResolvedValue({ items: [] }); - - const result = await callTool({ - tools, - name: 'analyze_pack_weight', - args: { pack_id: 'p_empty' }, - }); - const analysis = parseToolResult(result) as Record; - - expect(analysis.itemCount).toBe(0); - expect((analysis.byCategory as unknown[]).length).toBe(0); - }); - }); - - // ── analyze_pack_gaps ─────────────────────────────────────────────────────── - - describe('analyze_pack_gaps', () => { - it('calls POST /packs/:id/gap-analysis', async () => { - vi.mocked(api.post).mockResolvedValue({ missing: ['first_aid', 'navigation'] }); - - const result = await callTool({ - tools, - name: 'analyze_pack_gaps', - args: { - pack_id: 'p_1', - activity: 'backpacking', - duration_days: 3, - }, - }); - - const [path, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(path).toBe('/packs/p_1/gap-analysis'); - expect(body.activity).toBe('backpacking'); - expect(body.durationDays).toBe(3); - expect(parseToolResult(result)).toEqual({ missing: ['first_aid', 'navigation'] }); - }); - }); -}); diff --git a/packages/mcp/src/__tests__/tools/trail-conditions.test.ts b/packages/mcp/src/__tests__/tools/trail-conditions.test.ts deleted file mode 100644 index d0dc1e7dfc..0000000000 --- a/packages/mcp/src/__tests__/tools/trail-conditions.test.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackRatApiClient } from '../../client'; -import { ApiError } from '../../client'; -import { registerTrailConditionTools } from '../../tools/trail-conditions'; -import type { RegisteredTool } from '../helpers'; -import { buildMockAgent, callTool, parseToolResult } from '../helpers'; - -describe('trail condition tools', () => { - let api: PackRatApiClient; - let tools: Map; - - beforeEach(() => { - const mock = buildMockAgent(); - api = mock.api; - tools = mock.tools; - registerTrailConditionTools(mock.agent); - }); - - // ── get_trail_conditions ──────────────────────────────────────────────────── - - describe('get_trail_conditions', () => { - it('is registered', () => { - expect(tools.has('get_trail_conditions')).toBe(true); - }); - - it('calls GET /trail-conditions with trailName and limit', async () => { - const reports = { items: [{ id: 1, overallCondition: 'good' }] }; - vi.mocked(api.get).mockResolvedValue(reports); - - const result = await callTool({ - tools, - name: 'get_trail_conditions', - args: { - trail_name: 'John Muir Trail', - limit: 5, - }, - }); - - expect(api.get).toHaveBeenCalledWith('/trail-conditions', { - trailName: 'John Muir Trail', - limit: 5, - }); - expect(parseToolResult(result)).toEqual(reports); - }); - - it('works without any params', async () => { - vi.mocked(api.get).mockResolvedValue({ items: [] }); - - await callTool({ tools, name: 'get_trail_conditions', args: { limit: 20 } }); - - const [, params] = vi.mocked(api.get).mock.calls[0] as [string, Record]; - expect(params.trailName).toBeUndefined(); - expect(params.limit).toBe(20); - }); - - it('returns error result on API failure', async () => { - vi.mocked(api.get).mockRejectedValue( - new ApiError('Internal Server Error', { status: 500, body: {} }), - ); - - const result = await callTool({ tools, name: 'get_trail_conditions', args: { limit: 10 } }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('500'); - }); - }); - - // ── submit_trail_condition ────────────────────────────────────────────────── - - describe('submit_trail_condition', () => { - it('is registered', () => { - expect(tools.has('submit_trail_condition')).toBe(true); - }); - - it('calls POST /trail-conditions with correctly mapped API fields', async () => { - vi.mocked(api.post).mockResolvedValue({ id: 'tcr_abc', submitted: true }); - - const result = await callTool({ - tools, - name: 'submit_trail_condition', - args: { - trail_name: 'Mt Whitney Trail', - trail_region: 'California', - surface: 'rocky', - overall_condition: 'good', - hazards: ['loose rocks', 'snow'], - water_crossings: 3, - water_crossing_difficulty: 'moderate', - notes: 'Trail is clear above 10k, some snow patches near the summit', - }, - }); - - const [path, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(path).toBe('/trail-conditions'); - expect(body.trailName).toBe('Mt Whitney Trail'); - expect(body.trailRegion).toBe('California'); - expect(body.surface).toBe('rocky'); - expect(body.overallCondition).toBe('good'); - expect(body.hazards).toEqual(['loose rocks', 'snow']); - expect(body.waterCrossings).toBe(3); - expect(body.waterCrossingDifficulty).toBe('moderate'); - expect(body.notes).toContain('summit'); - expect(body.photos).toEqual([]); - expect(typeof body.id).toBe('string'); - expect((body.id as string).startsWith('tcr_')).toBe(true); - expect(typeof body.localCreatedAt).toBe('string'); - expect(typeof body.localUpdatedAt).toBe('string'); - expect(parseToolResult(result)).toEqual({ id: 'tcr_abc', submitted: true }); - }); - - it('submits with defaults when optional fields are absent', async () => { - vi.mocked(api.post).mockResolvedValue({ id: 'tcr_2' }); - - await callTool({ - tools, - name: 'submit_trail_condition', - args: { - trail_name: 'Simple Trail', - surface: 'dirt', - overall_condition: 'excellent', - }, - }); - - const [, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(body.hazards).toEqual([]); - expect(body.waterCrossings).toBe(0); - expect(body.waterCrossingDifficulty).toBeNull(); - expect(body.notes).toBeNull(); - expect(body.trailRegion).toBeNull(); - expect(body.photos).toEqual([]); - }); - - it('returns error when user is not authenticated (401)', async () => { - vi.mocked(api.post).mockRejectedValue( - new ApiError('Unauthorized', { status: 401, body: {} }), - ); - - const result = await callTool({ - tools, - name: 'submit_trail_condition', - args: { - trail_name: 'Test Trail', - surface: 'paved', - overall_condition: 'fair', - }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('401'); - }); - }); -}); diff --git a/packages/mcp/src/__tests__/tools/trips.test.ts b/packages/mcp/src/__tests__/tools/trips.test.ts deleted file mode 100644 index 80ef35ce42..0000000000 --- a/packages/mcp/src/__tests__/tools/trips.test.ts +++ /dev/null @@ -1,182 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackRatApiClient } from '../../client'; -import { ApiError } from '../../client'; -import { registerTripTools } from '../../tools/trips'; -import type { RegisteredTool } from '../helpers'; -import { buildMockAgent, callTool, parseToolResult } from '../helpers'; - -describe('trip tools', () => { - let api: PackRatApiClient; - let tools: Map; - - beforeEach(() => { - const mock = buildMockAgent(); - api = mock.api; - tools = mock.tools; - registerTripTools(mock.agent); - }); - - // ── list_trips ────────────────────────────────────────────────────────────── - - describe('list_trips', () => { - it('is registered', () => { - expect(tools.has('list_trips')).toBe(true); - }); - - it('calls GET /trips with includePublic param', async () => { - vi.mocked(api.get).mockResolvedValue({ items: [] }); - - await callTool({ tools, name: 'list_trips', args: { include_public: true } }); - - expect(api.get).toHaveBeenCalledWith('/trips', { includePublic: 1 }); - }); - - it('returns error result on API failure', async () => { - vi.mocked(api.get).mockRejectedValue(new Error('Network error')); - - const result = await callTool({ tools, name: 'list_trips', args: {} }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('Network error'); - }); - }); - - // ── get_trip ──────────────────────────────────────────────────────────────── - - describe('get_trip', () => { - it('calls GET /trips/:id', async () => { - const trip = { id: 't_abc', name: 'JMT 2025' }; - vi.mocked(api.get).mockResolvedValue(trip); - - const result = await callTool({ tools, name: 'get_trip', args: { trip_id: 't_abc' } }); - - expect(api.get).toHaveBeenCalledWith('/trips/t_abc'); - expect(parseToolResult(result)).toEqual(trip); - }); - }); - - // ── create_trip ───────────────────────────────────────────────────────────── - - describe('create_trip', () => { - it('calls POST /trips with required fields and generated ID', async () => { - const created = { id: 't_new', name: 'PCT Section J' }; - vi.mocked(api.post).mockResolvedValue(created); - - await callTool({ - tools, - name: 'create_trip', - args: { - name: 'PCT Section J', - description: 'Southern Sierra trip', - start_date: '2025-09-01T00:00:00Z', - end_date: '2025-09-07T00:00:00Z', - }, - }); - - const [path, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(path).toBe('/trips'); - expect(body.name).toBe('PCT Section J'); - expect(body.description).toBe('Southern Sierra trip'); - expect(body.startDate).toBe('2025-09-01T00:00:00Z'); - expect(body.endDate).toBe('2025-09-07T00:00:00Z'); - expect(typeof body.id).toBe('string'); - expect((body.id as string).startsWith('t_')).toBe(true); - }); - - it('builds location object when lat/lng are provided', async () => { - vi.mocked(api.post).mockResolvedValue({ id: 't_1' }); - - await callTool({ - tools, - name: 'create_trip', - args: { - name: 'Yosemite', - latitude: 37.8651, - longitude: -119.5383, - location_name: 'Yosemite Valley', - }, - }); - - const [, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - const loc = body.location as Record; - expect(loc).not.toBeNull(); - expect(loc.latitude).toBe(37.8651); - expect(loc.longitude).toBe(-119.5383); - expect(loc.name).toBe('Yosemite Valley'); - }); - - it('sets location to null when no coordinates or name provided', async () => { - vi.mocked(api.post).mockResolvedValue({ id: 't_2' }); - - await callTool({ tools, name: 'create_trip', args: { name: 'Nameless Trip' } }); - - const [, body] = vi.mocked(api.post).mock.calls[0] as [string, Record]; - expect(body.location).toBeNull(); - }); - }); - - // ── update_trip ───────────────────────────────────────────────────────────── - - describe('update_trip', () => { - it('calls PATCH /trips/:id with provided fields only', async () => { - vi.mocked(api.patch).mockResolvedValue({ id: 't_1' }); - - await callTool({ - tools, - name: 'update_trip', - args: { - trip_id: 't_1', - name: 'Renamed Trip', - notes: 'Bring bear canister', - }, - }); - - const [path, body] = vi.mocked(api.patch).mock.calls[0] as [string, Record]; - expect(path).toBe('/trips/t_1'); - expect(body.name).toBe('Renamed Trip'); - expect(body.notes).toBe('Bring bear canister'); - expect(body.startDate).toBeUndefined(); - }); - - it('sends just name when only location_name is provided (no 0,0 coords)', async () => { - vi.mocked(api.patch).mockResolvedValue({ id: 't_1' }); - - await callTool({ - tools, - name: 'update_trip', - args: { - trip_id: 't_1', - location_name: 'New Location', - }, - }); - - const [, body] = vi.mocked(api.patch).mock.calls[0] as [string, Record]; - const loc = body.location as Record; - expect(loc.name).toBe('New Location'); - expect(loc.latitude).toBeUndefined(); - expect(loc.longitude).toBeUndefined(); - }); - }); - - // ── delete_trip ───────────────────────────────────────────────────────────── - - describe('delete_trip', () => { - it('calls DELETE /trips/:id', async () => { - vi.mocked(api.delete).mockResolvedValue({ deleted: true }); - - const result = await callTool({ tools, name: 'delete_trip', args: { trip_id: 't_del' } }); - - expect(api.delete).toHaveBeenCalledWith('/trips/t_del'); - expect(parseToolResult(result)).toEqual({ deleted: true }); - }); - - it('returns error when API fails', async () => { - vi.mocked(api.delete).mockRejectedValue(new ApiError('Forbidden', { status: 403, body: {} })); - - const result = await callTool({ tools, name: 'delete_trip', args: { trip_id: 't_x' } }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('403'); - }); - }); -}); diff --git a/packages/mcp/src/__tests__/tools/weather.test.ts b/packages/mcp/src/__tests__/tools/weather.test.ts deleted file mode 100644 index b25234cef6..0000000000 --- a/packages/mcp/src/__tests__/tools/weather.test.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { PackRatApiClient } from '../../client'; -import { ApiError } from '../../client'; -import { registerWeatherTools } from '../../tools/weather'; -import type { RegisteredTool } from '../helpers'; -import { buildMockAgent, callTool, parseToolResult } from '../helpers'; - -describe('weather tools', () => { - let api: PackRatApiClient; - let tools: Map; - - beforeEach(() => { - const mock = buildMockAgent(); - api = mock.api; - tools = mock.tools; - registerWeatherTools(mock.agent); - }); - - // ── get_weather ───────────────────────────────────────────────────────────── - - describe('get_weather', () => { - it('is registered', () => { - expect(tools.has('get_weather')).toBe(true); - }); - - it('performs search then forecast (two-step flow)', async () => { - const searchResult = { id: 'loc_123', name: 'Yosemite Valley' }; - const forecast = { location: 'Yosemite', temp: 55, forecast: [] }; - vi.mocked(api.get) - .mockResolvedValueOnce(searchResult) // step 1: search - .mockResolvedValueOnce(forecast); // step 2: forecast - - const result = await callTool({ - tools, - name: 'get_weather', - args: { location: 'Yosemite Valley, CA' }, - }); - - expect(api.get).toHaveBeenCalledTimes(2); - expect(vi.mocked(api.get).mock.calls[0]).toEqual([ - '/weather/search', - { q: 'Yosemite Valley, CA' }, - ]); - expect(vi.mocked(api.get).mock.calls[1]).toEqual(['/weather/forecast', { id: 'loc_123' }]); - expect(parseToolResult(result)).toEqual(forecast); - }); - - it('returns error when location search finds nothing', async () => { - vi.mocked(api.get).mockResolvedValueOnce({}); // no id in response - - const result = await callTool({ - tools, - name: 'get_weather', - args: { location: 'Nowhere Special' }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('No weather location found'); - }); - - it('returns error result when search API fails', async () => { - vi.mocked(api.get).mockRejectedValue(new ApiError('Bad Request', { status: 400, body: {} })); - - const result = await callTool({ - tools, - name: 'get_weather', - args: { location: 'Bad Location' }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('400'); - }); - }); - - // ── search_weather_location ───────────────────────────────────────────────── - - describe('search_weather_location', () => { - it('is registered', () => { - expect(tools.has('search_weather_location')).toBe(true); - }); - - it('calls GET /weather/search with q param', async () => { - vi.mocked(api.get).mockResolvedValue([{ id: 'loc_1', name: 'Seattle' }]); - - const result = await callTool({ - tools, - name: 'search_weather_location', - args: { query: 'Seattle, WA' }, - }); - - expect(api.get).toHaveBeenCalledWith('/weather/search', { q: 'Seattle, WA' }); - expect(Array.isArray(parseToolResult(result))).toBe(true); - }); - }); - - // ── get_season_suggestions ────────────────────────────────────────────────── - - describe('get_season_suggestions', () => { - it('is registered', () => { - expect(tools.has('get_season_suggestions')).toBe(true); - }); - - it('calls POST /season-suggestions with destination', async () => { - const suggestions = { - destination: 'Patagonia', - seasons: [{ name: 'Summer', months: 'Dec-Feb', conditions: 'best' }], - }; - vi.mocked(api.post).mockResolvedValue(suggestions); - - const result = await callTool({ - tools, - name: 'get_season_suggestions', - args: { destination: 'Patagonia' }, - }); - - expect(api.post).toHaveBeenCalledWith('/season-suggestions', { destination: 'Patagonia' }); - expect(parseToolResult(result)).toEqual(suggestions); - }); - - it('returns error when API fails', async () => { - vi.mocked(api.post).mockRejectedValue(new Error('Timeout')); - - const result = await callTool({ - tools, - name: 'get_season_suggestions', - args: { destination: 'Nowhere' }, - }); - - expect(result.isError).toBe(true); - expect(result.content[0].text).toContain('Timeout'); - }); - }); -}); diff --git a/packages/mcp/src/auth.ts b/packages/mcp/src/auth.ts index aff3cc0d39..7a18b6eafd 100644 --- a/packages/mcp/src/auth.ts +++ b/packages/mcp/src/auth.ts @@ -65,7 +65,7 @@ function escapeHtml(s: string): string { .replace(QUOT_RE, '"'); } -function loginPage(state: string, error?: string): string { +function loginPage({ state, error }: { state: string; error?: string }): string { return ` @@ -105,7 +105,13 @@ function loginPage(state: string, error?: string): string { } /** FormData.get() returns FormDataEntryValue | null (string | File | null). Extract string only. */ -function getFormString(data: { get(name: string): string | File | null }, key: string): string { +function getFormString({ + data, + key, +}: { + data: { get(name: string): string | File | null }; + key: string; +}): string { const val = data.get(key); return isString(val) ? val : ''; } @@ -129,15 +135,17 @@ export const PackRatAuthHandler = { } if (url.pathname === '/authorize') { - return handleAuthorize(request, env); + return handleAuthorize({ request, env }); } if (url.pathname === '/login') { - return request.method === 'POST' ? handleLoginPost(request, env) : handleLoginGet(request); + return request.method === 'POST' + ? handleLoginPost({ request, env }) + : handleLoginGet(request); } if (url.pathname === '/callback') { - return handleCallback(request, env); + return handleCallback({ request, env }); } return Response.json({ error: 'Not Found' }, { status: 404 }); @@ -146,7 +154,13 @@ export const PackRatAuthHandler = { // ── /authorize ──────────────────────────────────────────────────────────────── -async function handleAuthorize(request: Request, env: Env): Promise { +async function handleAuthorize({ + request, + env, +}: { + request: Request; + env: Env; +}): Promise { let oauthReq: z.infer; try { const parsed = await env.OAUTH_PROVIDER.parseAuthRequest(request); @@ -174,32 +188,38 @@ async function handleAuthorize(request: Request, env: Env): Promise { function handleLoginGet(request: Request): Response { const state = new URL(request.url).searchParams.get('state') ?? ''; - return new Response(loginPage(state), { + return new Response(loginPage({ state }), { headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); } // ── /login POST ─────────────────────────────────────────────────────────────── -async function handleLoginPost(request: Request, env: Env): Promise { +async function handleLoginPost({ + request, + env, +}: { + request: Request; + env: Env; +}): Promise { let email: string; let password: string; let state: string; try { const form = await request.formData(); - email = getFormString(form, 'email'); - password = getFormString(form, 'password'); - state = getFormString(form, 'state'); + email = getFormString({ data: form, key: 'email' }); + password = getFormString({ data: form, key: 'password' }); + state = getFormString({ data: form, key: 'state' }); } catch { - return new Response(loginPage('', 'Invalid form submission.'), { + return new Response(loginPage({ state: '', error: 'Invalid form submission.' }), { status: 400, headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); } if (!email || !password || !state) { - return new Response(loginPage(state, 'Email and password are required.'), { + return new Response(loginPage({ state, error: 'Email and password are required.' }), { status: 400, headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); @@ -207,7 +227,7 @@ async function handleLoginPost(request: Request, env: Env): Promise { const oauthReqStr = await env.OAUTH_KV.get(oauthStateKey(state)); if (!oauthReqStr) { - return new Response(loginPage(state, 'Session expired. Please start over.'), { + return new Response(loginPage({ state, error: 'Session expired. Please start over.' }), { status: 400, headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); @@ -221,14 +241,14 @@ async function handleLoginPost(request: Request, env: Env): Promise { body: JSON.stringify({ email, password }), }); } catch { - return new Response(loginPage(state, 'Could not reach PackRat. Try again.'), { + return new Response(loginPage({ state, error: 'Could not reach PackRat. Try again.' }), { status: 502, headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); } if (!signInRes.ok) { - return new Response(loginPage(state, 'Invalid email or password.'), { + return new Response(loginPage({ state, error: 'Invalid email or password.' }), { status: 401, headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); @@ -239,10 +259,13 @@ async function handleLoginPost(request: Request, env: Env): Promise { const userId = signInResult.success ? signInResult.data.user?.id : undefined; if (!betterAuthToken || !userId) { - return new Response(loginPage(state, 'Sign-in succeeded but session data was missing.'), { - status: 502, - headers: { 'Content-Type': 'text/html; charset=utf-8' }, - }); + return new Response( + loginPage({ state, error: 'Sign-in succeeded but session data was missing.' }), + { + status: 502, + headers: { 'Content-Type': 'text/html; charset=utf-8' }, + }, + ); } await env.OAUTH_KV.put(sessionKey(state), JSON.stringify({ token: betterAuthToken, userId }), { @@ -256,7 +279,7 @@ async function handleLoginPost(request: Request, env: Env): Promise { // ── /callback ───────────────────────────────────────────────────────────────── -async function handleCallback(request: Request, env: Env): Promise { +async function handleCallback({ request, env }: { request: Request; env: Env }): Promise { const state = new URL(request.url).searchParams.get('state') ?? ''; const [oauthReqStr, sessionStr] = await Promise.all([ diff --git a/packages/mcp/src/client.ts b/packages/mcp/src/client.ts index 0a3d3d4de8..4ab69eaa6e 100644 --- a/packages/mcp/src/client.ts +++ b/packages/mcp/src/client.ts @@ -1,17 +1,189 @@ /** - * Re-export the PackRat API client primitives from the shared api-client package. - * MCP tool files import from here to keep their dependencies clean. + * MCP API client layer — Eden Treaty based. + * + * Two typed clients are exposed: + * + * - `user`: authenticated as the OAuth-signed-in PackRat user via the Better + * Auth bearer that OAuthProvider injects into each request. + * - `admin`: authenticated as a PackRat admin via the short-lived admin JWT + * issued by `POST /api/admin/token` (or by passing an env-provided token). + * + * Tool files import these from `agent.api` and call the API with end-to-end + * type safety. The `call()` helper converts Treaty's + * `{ data, error, status }` response shape into MCP tool results and maps + * 401/403 to actionable, ACL-aware error messages. */ -export type { - ApiErrorOptions, - PackRatApiClient as PackRatClient, - QueryParams, -} from '@packrat/api-client'; -export { - ApiError, - createPackRatClient, - err, - ok, - PackRatApiClient, -} from '@packrat/api-client'; +import { type ApiClient, createApiClient } from '@packrat/api-client'; +import { isObject, isString } from '@packrat/guards'; + +export type TokenProvider = () => string | null | undefined; + +export type McpClients = { + /** Calls authenticated as the OAuth-signed-in PackRat user. */ + user: ApiClient; + /** Calls authenticated with a PackRat admin JWT. */ + admin: ApiClient; +}; + +/** + * Build user and admin Eden Treaty clients sharing a single base URL. + * + * The user client uses the Better Auth bearer that the OAuth provider + * (or a manual `Authorization` header) injected into the current request. + * The admin client uses the short-lived admin JWT minted by + * `POST /api/admin/token`. + * + * Refresh/reauth hooks are no-ops here: the MCP transport does not own session + * lifecycle (the OAuth layer / caller does), so on 401 we surface the error + * to the tool rather than attempting a refresh. + */ +export function createMcpClients(opts: { + baseUrl: string; + getUserToken: TokenProvider; + getAdminToken: TokenProvider; +}): McpClients { + return { + user: createApiClient({ baseUrl: opts.baseUrl, auth: noopHooks(opts.getUserToken) }), + admin: createApiClient({ baseUrl: opts.baseUrl, auth: noopHooks(opts.getAdminToken) }), + }; +} + +function noopHooks(getToken: TokenProvider) { + return { + getAccessToken: () => getToken() ?? null, + getRefreshToken: () => null, + onAccessTokenRefreshed: () => {}, + onNeedsReauth: () => {}, + }; +} + +// ── MCP tool result helpers ─────────────────────────────────────────────────── + +export type McpToolResult = { + content: [{ type: 'text'; text: string }]; + isError?: true; +}; + +export function ok(data: unknown): McpToolResult { + return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] }; +} + +export function errMessage(message: string): McpToolResult { + return { content: [{ type: 'text', text: `Error: ${message}` }], isError: true }; +} + +/** + * Treaty response shape used by `call()`. Defined structurally so we don't + * have to import internal Eden types. + */ +export type TreatyResponse = { + data: T | null; + error: { status: number; value: unknown } | null; + status: number; +}; + +export type CallOptions = { + /** Verb-phrase shown in error messages, e.g. "list packs". */ + action?: string; + /** Optional resource hint for ACL errors, e.g. `pack p_abc123`. */ + resourceHint?: string; + /** Marks this call as admin-only; refines 401/403 messaging. */ + requiresAdmin?: boolean; +}; + +/** + * Await a Treaty promise and convert the result into an MCP tool result. + * Thrown errors and `{ error: ... }` responses both surface as `isError: true`. + */ +export async function call( + args: { promise: Promise> } & CallOptions, +): Promise { + const { promise, ...options } = args; + try { + const result = await promise; + if (result.error || result.data == null) { + return formatError({ status: result.status, body: result.error?.value, opts: options }); + } + return ok(result.data); + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + return errMessage(`${options.action ?? 'request'} failed: ${message}`); + } +} + +function formatError(args: { status: number; body: unknown; opts: CallOptions }): McpToolResult { + const { status, body, opts } = args; + const action = opts.action ?? 'request'; + const resource = opts.resourceHint ? ` (${opts.resourceHint})` : ''; + const detail = extractErrorMessage(body); + const suffix = detail ? ` — ${detail}` : ''; + + if (status === 401) { + if (opts.requiresAdmin) { + return errMessage( + `Admin authentication required to ${action}${resource}. Call admin_login first, ` + + `or provide an admin JWT via the X-PackRat-Admin-Token header.${suffix}`, + ); + } + return errMessage( + `Authentication required to ${action}${resource}. Sign in via OAuth or refresh your ` + + `MCP session.${suffix}`, + ); + } + if (status === 403) { + if (opts.requiresAdmin) { + return errMessage( + `Forbidden: this operation is admin-only (${action}${resource}). Your token does not ` + + `carry the admin role.${suffix}`, + ); + } + return errMessage( + `Forbidden: you don't own this resource (${action}${resource}), or the API rejected ` + + `access. Soft-deleted or other-user resources are not visible.${suffix}`, + ); + } + if (status === 404) { + return errMessage(`Not found: ${action}${resource} returned 404.${suffix}`); + } + if (status === 409) { + return errMessage(`Conflict on ${action}${resource}.${suffix}`); + } + if (status === 422) { + return errMessage(`Validation failed on ${action}${resource}.${suffix}`); + } + if (status === 429) { + return errMessage(`Rate limited on ${action}${resource}. Try again shortly.${suffix}`); + } + return errMessage(`${action}${resource} failed (HTTP ${status})${suffix}`); +} + +function extractErrorMessage(body: unknown): string | null { + if (body == null) return null; + if (isString(body)) return body; + if (isObject(body)) { + const obj = body as Record; // safe-cast: isObject() guard above narrows body + if (isString(obj.message)) return obj.message; + if (isString(obj.error)) return obj.error; + try { + return JSON.stringify(body); + } catch { + return null; + } + } + return String(body); +} + +// ── ID helpers (replicated here so tool files don't need their own RNG) ─────── + +const STRIP_HYPHENS_RE = /-/g; + +/** Generate a short ID prefixed for stable client-side creation. */ +export function shortId(prefix: string): string { + return `${prefix}_${crypto.randomUUID().replace(STRIP_HYPHENS_RE, '').slice(0, 12)}`; +} + +/** ISO 8601 timestamp for `localCreatedAt` / `localUpdatedAt` fields. */ +export function nowIso(): string { + return new Date().toISOString(); +} diff --git a/packages/mcp/src/index.ts b/packages/mcp/src/index.ts index 0cd3bafc0d..2c4feb4c46 100644 --- a/packages/mcp/src/index.ts +++ b/packages/mcp/src/index.ts @@ -4,14 +4,22 @@ * A full-featured Model Context Protocol server for outdoor adventure planning, * built on Cloudflare Workers + Durable Objects using the Cloudflare Agents SDK. * + * The MCP server is intentionally a *lean* layer on top of the PackRat API. + * All business logic lives in the API (`@packrat/api`); this package just + * surfaces typed tool wrappers via Eden Treaty, plus per-session auth state. + * * Features: - * - 20+ tools: packs, gear catalog, trips, weather, trail conditions, outdoor knowledge - * - MCP resources: pack/trip/gear data accessible by URI - * - Guided prompts: trip planning, pack optimization, gear recommendations - * - Stateful sessions with hibernation (via Durable Objects) - * - OAuth 2.1 + PKCE authorization via @cloudflare/workers-oauth-provider + * - 60+ tools across user + admin surfaces — packs, gear catalog, trips, + * weather, trail conditions, outdoor knowledge, feed, pack templates, + * season suggestions, wildlife, alltrails, uploads, guides, AI, admin. + * - End-to-end typed Eden Treaty calls to the PackRat API. + * - MCP resources: pack/trip/gear data accessible by URI. + * - Guided prompts: trip planning, pack optimization, gear recommendations. + * - Stateful sessions with hibernation (via Durable Objects). + * - OAuth 2.1 + PKCE authorization via @cloudflare/workers-oauth-provider. + * - Per-session admin JWT, supplied via `X-PackRat-Admin-Token` or `admin_login`. * - * Transport: Streamable HTTP (default) and SSE + * Transport: Streamable HTTP (default) and SSE. * * OAuth flow: * GET /authorize → login form redirect @@ -22,31 +30,42 @@ */ import { OAuthProvider } from '@cloudflare/workers-oauth-provider'; -import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; +import { McpServer, type RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js'; import { McpAgent } from 'agents/mcp'; import { z } from 'zod'; import { PackRatAuthHandler } from './auth'; -import type { PackRatApiClient } from './client'; -import { createPackRatClient } from './client'; +import { createMcpClients, type McpClients } from './client'; import { registerPrompts } from './prompts'; import { registerResources } from './resources'; +import { registerAdminTools } from './tools/admin'; +import { registerAiTools } from './tools/ai'; +import { registerAlltrailsTools } from './tools/alltrails'; +import { registerAuthTools } from './tools/auth'; import { registerCatalogTools } from './tools/catalog'; +import { registerFeedTools } from './tools/feed'; +import { registerGuidesTools } from './tools/guides'; import { registerKnowledgeTools } from './tools/knowledge'; import { registerPackTools } from './tools/packs'; +import { registerPackTemplateTools } from './tools/packTemplates'; +import { registerSeasonTools } from './tools/seasons'; import { registerTrailConditionTools } from './tools/trail-conditions'; import { registerTrailTools } from './tools/trails'; import { registerTripTools } from './tools/trips'; +import { registerUploadTools } from './tools/upload'; +import { registerUserTools } from './tools/user'; import { registerWeatherTools } from './tools/weather'; -import type { Env } from './types'; +import { registerWildlifeTools } from './tools/wildlife'; +import type { AgentContext, Env } from './types'; -// Re-export Env for consumers (e.g. tests) export type { Env }; // ── Session state ───────────────────────────────────────────────────────────── export interface State { - /** Better Auth session token, injected per-request from OAuth props or legacy Bearer header */ + /** Better Auth session token, injected per-request from OAuth props or a Bearer header. */ authToken: string; + /** Admin JWT, populated by `admin_login` or injected via `X-PackRat-Admin-Token`. */ + adminToken: string; } // ── MCP Agent (Durable Object) ──────────────────────────────────────────────── @@ -54,39 +73,136 @@ export interface State { export class PackRatMCP extends McpAgent> { server = new McpServer({ name: 'packrat', - version: '1.0.0', + version: '2.0.0', }); - initialState: State = { authToken: '' }; + initialState: State = { authToken: '', adminToken: '' }; - private _api: PackRatApiClient | null = null; + private _api: McpClients | null = null; + private _adminTools: RegisteredTool[] = []; + private _flaggedTools: Map = new Map(); + private _flagState: Map = new Map(); - get api(): PackRatApiClient { + get api(): McpClients { if (!this._api) { - this._api = createPackRatClient(this.env.PACKRAT_API_URL, () => this.state.authToken); + this._api = createMcpClients({ + baseUrl: this.apiBaseUrl, + getUserToken: () => this.state.authToken, + getAdminToken: () => this.state.adminToken, + }); } return this._api; } + get apiBaseUrl(): string { + return this.env.PACKRAT_API_URL; + } + + /** Replace the per-session admin token. Toggles visibility of admin tools. */ + setAdminToken(token: string): void { + if (token === this.state.adminToken) return; + this.setState({ ...this.state, adminToken: token }); + this.syncAdminToolVisibility(); + } + + /** + * Register a tool that's only listed when an admin JWT is on the session. + * Mirrors `server.registerTool` and toggles visibility via the MCP SDK's + * `enable()/disable()` (which emits `tools/list_changed`). + */ + registerAdminTool: McpServer['registerTool'] = (...args) => { + // safe-cast: McpServer.registerTool's overloads collapse at the implementation level; + // forwarding via spread requires a single call signature here. + const tool = (this.server.registerTool as (...a: unknown[]) => RegisteredTool)(...args); + this._adminTools.push(tool); + if (!this.state.adminToken) tool.disable(); + return tool; + }; + + private syncAdminToolVisibility(): void { + const enabled = Boolean(this.state.adminToken); + for (const tool of this._adminTools) { + if (enabled && !tool.enabled) tool.enable(); + else if (!enabled && tool.enabled) tool.disable(); + } + } + + /** + * Register a tool gated on a feature flag. The tool is hidden unless the + * flag is present in `MCP_FEATURE_FLAGS` or enabled via `setFeatureFlag`. + */ + registerFlaggedTool: AgentContext['registerFlaggedTool'] = ({ flag, args }) => { + // safe-cast: McpServer.registerTool's overloads collapse at the implementation level; + // forwarding via spread requires a single call signature here. + const tool = (this.server.registerTool as (...a: unknown[]) => RegisteredTool)(...args); + const bucket = this._flaggedTools.get(flag) ?? []; + bucket.push(tool); + this._flaggedTools.set(flag, bucket); + if (!this.isFlagEnabled(flag)) tool.disable(); + return tool; + }; + + setFeatureFlag({ flag, enabled }: { flag: string; enabled: boolean }): void { + this._flagState.set(flag, enabled); + for (const tool of this._flaggedTools.get(flag) ?? []) { + if (enabled && !tool.enabled) tool.enable(); + else if (!enabled && tool.enabled) tool.disable(); + } + } + + private isFlagEnabled(flag: string): boolean { + const runtime = this._flagState.get(flag); + if (runtime !== undefined) return runtime; + const envList = (this.env.MCP_FEATURE_FLAGS ?? '') + .split(',') + .map((s) => s.trim()) + .filter(Boolean); + return envList.includes(flag); + } + override async fetch(request: Request): Promise { const authHeader = request.headers.get('Authorization'); - const token = authHeader?.match(BEARER_REGEX)?.[1] ?? ''; + const userToken = authHeader?.match(BEARER_REGEX)?.[1] ?? ''; + const adminToken = request.headers.get('X-PackRat-Admin-Token') ?? ''; - if (token !== this.state.authToken) { - this.setState({ ...this.state, authToken: token }); + const nextAuth = userToken || this.state.authToken; + const nextAdmin = adminToken || this.state.adminToken; + if (nextAuth !== this.state.authToken || nextAdmin !== this.state.adminToken) { + const adminChanged = nextAdmin !== this.state.adminToken; + this.setState({ ...this.state, authToken: nextAuth, adminToken: nextAdmin }); + // Mirror setAdminToken: when the header path swaps the admin JWT, the + // tools/list visibility must follow. Without this the model can't see + // admin tools even after a valid header was supplied. + if (adminChanged) this.syncAdminToolVisibility(); } return super.fetch(request); } async init(): Promise { + // ── User-level (Bearer) ──────────────────────────────────────────────── + registerAuthTools(this); + registerUserTools(this); registerPackTools(this); + registerPackTemplateTools(this); registerCatalogTools(this); registerTripTools(this); registerWeatherTools(this); registerKnowledgeTools(this); registerTrailConditionTools(this); registerTrailTools(this); + registerFeedTools(this); + registerSeasonTools(this); + registerWildlifeTools(this); + registerAlltrailsTools(this); + registerUploadTools(this); + registerGuidesTools(this); + registerAiTools(this); + + // ── Admin (admin JWT) ────────────────────────────────────────────────── + registerAdminTools(this); + + // ── Resources + prompts ──────────────────────────────────────────────── registerResources(this); registerPrompts(this); } @@ -103,6 +219,7 @@ const mcpDoHandler = PackRatMCP.serve('/mcp'); const PropsSchema = z.object({ betterAuthToken: z.string(), userId: z.string(), + adminToken: z.string().optional(), }); // ── API handler: wraps McpAgent, injecting the Better Auth token from OAuth props ── @@ -111,11 +228,13 @@ const mcpApiHandler = { async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise { const rawCtx = ctx as unknown as Record; // safe-cast: OAuth provider injects props at runtime; ExecutionContext has no index signature const propsResult = PropsSchema.safeParse(rawCtx.props); - const token = propsResult.success ? propsResult.data.betterAuthToken : ''; + const userToken = propsResult.success ? propsResult.data.betterAuthToken : ''; + const adminToken = propsResult.success ? (propsResult.data.adminToken ?? '') : ''; const headers = new Headers(request.headers); - if (token) { - headers.set('Authorization', `Bearer ${token}`); + if (userToken) headers.set('Authorization', `Bearer ${userToken}`); + if (adminToken && !headers.has('X-PackRat-Admin-Token')) { + headers.set('X-PackRat-Admin-Token', adminToken); } return mcpDoHandler.fetch(new Request(request, { headers }), env, ctx); diff --git a/packages/mcp/src/resources.ts b/packages/mcp/src/resources.ts index cdcb093656..e5785a81f3 100644 --- a/packages/mcp/src/resources.ts +++ b/packages/mcp/src/resources.ts @@ -1,19 +1,60 @@ import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js'; -import { ApiError } from './client'; +import { isObject, isString } from '@packrat/guards'; import type { AgentContext } from './types'; -function resourceError(opts: { uri: string; context: string; error: unknown }): object { - const { uri, context, error } = opts; - if (error instanceof ApiError) { - return { uri, error: error.message, status: error.status, context }; +type TreatyResult = { + data: unknown; + error: { status: number; value: unknown } | null; + status: number; +}; + +function resourceError(opts: { uri: string; context: string; status: number; value: unknown }) { + const { uri, context, status, value } = opts; + const message = isString(value) + ? value + : isObject(value) && 'error' in value + ? String((value as { error: unknown }).error) + : `HTTP ${status}`; + return { uri, context, status, error: message }; +} + +function asContent({ uri, body }: { uri: string; body: object }): { + contents: Array<{ uri: string; mimeType: string; text: string }>; +} { + return { + contents: [{ uri, mimeType: 'application/json', text: JSON.stringify(body, null, 2) }], + }; +} + +async function settle(args: { + uri: string; + context: string; + promise: Promise; +}): Promise<{ contents: Array<{ uri: string; mimeType: string; text: string }> }> { + const { uri, context, promise } = args; + try { + const { data, error, status } = await promise; + if (error || data == null) { + return asContent({ + uri, + body: resourceError({ uri, context, status, value: error?.value ?? null }), + }); + } + return asContent({ uri, body: data as object }); + } catch (e) { + return asContent({ + uri, + body: { + uri, + context, + error: e instanceof Error ? e.message : String(e), + }, + }); } - return { uri, error: error instanceof Error ? error.message : String(error), context }; } export function registerResources(agent: AgentContext): void { - // ── Pack resource (URI template) ────────────────────────────────────────── - // Clients can read: packrat://packs/ - + // ── Pack resource ───────────────────────────────────────────────────────── agent.server.registerResource( 'pack', new ResourceTemplate('packrat://packs/{packId}', { list: undefined }), @@ -22,32 +63,15 @@ export function registerResources(agent: AgentContext): void { 'A PackRat packing list. Contains all items with weights, categories, and computed weight totals.', mimeType: 'application/json', }, - async (uri, { packId }) => { - try { - const pack = await agent.api.get(`/packs/${String(packId)}`); - return { - contents: [ - { uri: uri.href, mimeType: 'application/json', text: JSON.stringify(pack, null, 2) }, - ], - }; - } catch (e) { - return { - contents: [ - { - uri: uri.href, - mimeType: 'application/json', - text: JSON.stringify( - resourceError({ uri: uri.href, context: `pack:${String(packId)}`, error: e }), - ), - }, - ], - }; - } - }, + (uri, { packId }) => + settle({ + uri: uri.href, + context: `pack:${String(packId)}`, + promise: agent.api.user.packs({ packId: String(packId) }).get(), + }), ); // ── Trip resource ───────────────────────────────────────────────────────── - agent.server.registerResource( 'trip', new ResourceTemplate('packrat://trips/{tripId}', { list: undefined }), @@ -56,32 +80,15 @@ export function registerResources(agent: AgentContext): void { 'A PackRat trip plan. Contains destination, dates, notes, and linked pack information.', mimeType: 'application/json', }, - async (uri, { tripId }) => { - try { - const trip = await agent.api.get(`/trips/${String(tripId)}`); - return { - contents: [ - { uri: uri.href, mimeType: 'application/json', text: JSON.stringify(trip, null, 2) }, - ], - }; - } catch (e) { - return { - contents: [ - { - uri: uri.href, - mimeType: 'application/json', - text: JSON.stringify( - resourceError({ uri: uri.href, context: `trip:${String(tripId)}`, error: e }), - ), - }, - ], - }; - } - }, + (uri, { tripId }) => + settle({ + uri: uri.href, + context: `trip:${String(tripId)}`, + promise: agent.api.user.trips({ tripId: String(tripId) }).get(), + }), ); // ── Catalog item resource ───────────────────────────────────────────────── - agent.server.registerResource( 'catalog_item', new ResourceTemplate('packrat://catalog/{itemId}', { list: undefined }), @@ -90,32 +97,15 @@ export function registerResources(agent: AgentContext): void { 'A gear catalog item with full specifications, weight, price, availability, and user reviews.', mimeType: 'application/json', }, - async (uri, { itemId }) => { - try { - const item = await agent.api.get(`/catalog/${String(itemId)}`); - return { - contents: [ - { uri: uri.href, mimeType: 'application/json', text: JSON.stringify(item, null, 2) }, - ], - }; - } catch (e) { - return { - contents: [ - { - uri: uri.href, - mimeType: 'application/json', - text: JSON.stringify( - resourceError({ uri: uri.href, context: `catalog:${String(itemId)}`, error: e }), - ), - }, - ], - }; - } - }, + (uri, { itemId }) => + settle({ + uri: uri.href, + context: `catalog:${String(itemId)}`, + promise: agent.api.user.catalog({ id: String(itemId) }).get(), + }), ); // ── Gear categories list (static URI) ───────────────────────────────────── - agent.server.registerResource( 'gear_categories', 'packrat://catalog/categories', @@ -124,31 +114,11 @@ export function registerResources(agent: AgentContext): void { 'Complete list of gear categories available in the PackRat catalog. Use this to discover what types of gear are available.', mimeType: 'application/json', }, - async (uri) => { - try { - const categories = await agent.api.get('/catalog/categories'); - return { - contents: [ - { - uri: uri.href, - mimeType: 'application/json', - text: JSON.stringify(categories, null, 2), - }, - ], - }; - } catch (e) { - return { - contents: [ - { - uri: uri.href, - mimeType: 'application/json', - text: JSON.stringify( - resourceError({ uri: uri.href, context: 'gear_categories', error: e }), - ), - }, - ], - }; - } - }, + (uri) => + settle({ + uri: uri.href, + context: 'gear_categories', + promise: agent.api.user.catalog.categories.get(), + }), ); } diff --git a/packages/mcp/src/tools/admin.ts b/packages/mcp/src/tools/admin.ts new file mode 100644 index 0000000000..51e813ef5c --- /dev/null +++ b/packages/mcp/src/tools/admin.ts @@ -0,0 +1,454 @@ +/** + * Admin tools. + * + * All tools here use the admin Treaty client (`agent.api.admin`) which sends + * the admin JWT minted by `admin_login` (or supplied via `X-PackRat-Admin-Token`). + * Errors with status 401/403 are surfaced with `requiresAdmin: true` so the + * caller gets a clear message about needing to authenticate as admin. + */ + +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +const ADMIN = { requiresAdmin: true as const }; + +export function registerAdminTools(agent: AgentContext): void { + // ── Stats / users / packs / catalog ─────────────────────────────────────── + + agent.registerAdminTool( + 'admin_stats', + { + description: 'Get high-level platform stats: user, pack, and catalog counts.', + inputSchema: {}, + }, + async () => + call({ promise: agent.api.admin.admin.stats.get(), action: 'fetch admin stats', ...ADMIN }), + ); + + agent.registerAdminTool( + 'admin_list_users', + { + description: 'Search/list users (paginated). Use `q` to filter by email or name.', + inputSchema: { + q: z.string().optional(), + limit: z.number().int().min(1).max(200).default(50), + offset: z.number().int().min(0).default(0), + }, + }, + async ({ q, limit, offset }) => + call({ + promise: agent.api.admin.admin['users-list'].get({ query: { q, limit, offset } }), + action: 'list users', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_hard_delete_user', + { + description: + 'GDPR-style hard-delete of a user. Irrevocable. Requires a non-empty `reason` for the audit log.', + inputSchema: { user_id: z.string(), reason: z.string().min(1) }, + }, + async ({ user_id, reason }) => + call({ + promise: agent.api.admin.admin.users({ id: user_id }).hard.delete({ reason }), + action: 'hard-delete user', + resourceHint: `user ${user_id}`, + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_list_packs', + { + description: 'Search/list packs across all users (admin view).', + inputSchema: { + q: z.string().optional(), + limit: z.number().int().min(1).max(200).default(50), + offset: z.number().int().min(0).default(0), + include_deleted: z.boolean().default(false), + }, + }, + async ({ q, limit, offset, include_deleted }) => + call({ + promise: agent.api.admin.admin['packs-list'].get({ + query: { q, limit, offset, includeDeleted: include_deleted }, + }), + action: 'list packs (admin)', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_delete_pack', + { + description: 'Soft-delete a pack as admin (bypasses ownership).', + inputSchema: { pack_id: z.string() }, + }, + async ({ pack_id }) => + call({ + promise: agent.api.admin.admin.packs({ id: pack_id }).delete(), + action: 'admin delete pack', + resourceHint: `pack ${pack_id}`, + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_list_catalog', + { + description: 'Search/list catalog items across the platform.', + inputSchema: { + q: z.string().optional(), + limit: z.number().int().min(1).max(200).default(50), + offset: z.number().int().min(0).default(0), + }, + }, + async ({ q, limit, offset }) => + call({ + promise: agent.api.admin.admin['catalog-list'].get({ query: { q, limit, offset } }), + action: 'list catalog (admin)', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_update_catalog_item', + { + description: 'Update a catalog item (name, brand, price, weight, etc.) as admin.', + inputSchema: { + item_id: z.union([z.string(), z.number()]), + name: z.string().optional(), + brand: z.string().optional(), + categories: z.array(z.string()).optional(), + weight: z.number().min(0).optional(), + weight_unit: z.enum(['g', 'oz', 'kg', 'lb']).optional(), + price: z.number().min(0).optional(), + description: z.string().optional(), + }, + }, + async ({ item_id, name, brand, categories, weight, weight_unit, price, description }) => { + const body: Record = {}; + if (name !== undefined) body.name = name; + if (brand !== undefined) body.brand = brand; + if (categories !== undefined) body.categories = categories; + if (weight !== undefined) body.weight = weight; + if (weight_unit !== undefined) body.weightUnit = weight_unit; + if (price !== undefined) body.price = price; + if (description !== undefined) body.description = description; + return call({ + promise: agent.api.admin.admin.catalog({ id: String(item_id) }).patch(body), + action: 'admin update catalog item', + resourceHint: `catalog item ${item_id}`, + ...ADMIN, + }); + }, + ); + + agent.registerAdminTool( + 'admin_delete_catalog_item', + { + description: 'Delete a catalog item as admin.', + inputSchema: { item_id: z.union([z.string(), z.number()]) }, + }, + async ({ item_id }) => + call({ + promise: agent.api.admin.admin.catalog({ id: String(item_id) }).delete(), + action: 'admin delete catalog item', + resourceHint: `catalog item ${item_id}`, + ...ADMIN, + }), + ); + + // ── Trails (admin) ──────────────────────────────────────────────────────── + + agent.registerAdminTool( + 'admin_search_trails', + { + description: 'Search OSM trails by name/sport (admin view).', + inputSchema: { + q: z.string().min(1), + sport: z.string().optional(), + limit: z.number().int().min(1).max(200).default(50), + offset: z.number().int().min(0).default(0), + }, + }, + async ({ q, sport, limit, offset }) => + call({ + promise: agent.api.admin.admin.trails.search.get({ query: { q, sport, limit, offset } }), + action: 'admin search trails', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_get_trail', + { + description: 'Get a trail by OSM relation ID (admin).', + inputSchema: { osm_id: z.string() }, + }, + async ({ osm_id }) => + call({ + promise: agent.api.admin.admin.trails({ osmId: osm_id }).get(), + action: 'admin get trail', + resourceHint: `trail ${osm_id}`, + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_get_trail_geometry', + { + description: 'Get full GeoJSON geometry for a trail (admin).', + inputSchema: { osm_id: z.string() }, + }, + async ({ osm_id }) => + call({ + promise: agent.api.admin.admin.trails({ osmId: osm_id }).geometry.get(), + action: 'admin get trail geometry', + resourceHint: `trail ${osm_id}`, + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_list_trail_condition_reports', + { + description: 'List trail condition reports across all users (admin).', + inputSchema: { + q: z.string().optional(), + limit: z.number().int().min(1).max(200).default(50), + offset: z.number().int().min(0).default(0), + include_deleted: z.boolean().default(false), + }, + }, + async ({ q, limit, offset, include_deleted }) => + call({ + promise: agent.api.admin.admin.trails.conditions.get({ + query: { q, limit, offset, includeDeleted: include_deleted }, + }), + action: 'list trail condition reports (admin)', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_delete_trail_condition_report', + { + description: 'Soft-delete a trail condition report as admin.', + inputSchema: { report_id: z.string() }, + }, + async ({ report_id }) => + call({ + promise: agent.api.admin.admin.trails.conditions({ reportId: report_id }).delete(), + action: 'admin delete trail report', + resourceHint: `report ${report_id}`, + ...ADMIN, + }), + ); + + // ── Analytics: platform ─────────────────────────────────────────────────── + + agent.registerAdminTool( + 'admin_analytics_growth', + { + description: 'Platform user/pack growth metrics.', + inputSchema: { + period: z.enum(['day', 'week', 'month']).optional(), + range: z.number().int().min(1).optional(), + }, + }, + async ({ period, range }) => + call({ + promise: agent.api.admin.admin.analytics.platform.growth.get({ query: { period, range } }), + action: 'admin analytics growth', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_activity', + { + description: 'Platform activity metrics over a time period.', + inputSchema: { + period: z.enum(['day', 'week', 'month']).optional(), + range: z.number().int().min(1).optional(), + }, + }, + async ({ period, range }) => + call({ + promise: agent.api.admin.admin.analytics.platform.activity.get({ + query: { period, range }, + }), + action: 'admin analytics activity', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_active_users', + { + description: 'Daily/weekly/monthly active user counts.', + inputSchema: {}, + }, + async () => + call({ + promise: agent.api.admin.admin.analytics.platform['active-users'].get(), + action: 'admin analytics active users', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_pack_breakdown', + { + description: 'Distribution of packs by category.', + inputSchema: {}, + }, + async () => + call({ + promise: agent.api.admin.admin.analytics.platform.breakdown.get(), + action: 'admin analytics breakdown', + ...ADMIN, + }), + ); + + // ── Analytics: catalog ──────────────────────────────────────────────────── + + agent.registerAdminTool( + 'admin_analytics_catalog_overview', + { + description: 'Catalog-wide overview: item count, brands, price ranges, embedding coverage.', + inputSchema: {}, + }, + async () => + call({ + promise: agent.api.admin.admin.analytics.catalog.overview.get(), + action: 'admin catalog overview', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_top_brands', + { + description: 'Top gear brands in the catalog by item count.', + inputSchema: { limit: z.number().int().min(1).max(200).default(20) }, + }, + async ({ limit }) => + call({ + promise: agent.api.admin.admin.analytics.catalog.brands.get({ query: { limit } }), + action: 'admin catalog brands', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_catalog_prices', + { + description: 'Price distribution across the catalog.', + inputSchema: {}, + }, + async () => + call({ + promise: agent.api.admin.admin.analytics.catalog.prices.get(), + action: 'admin catalog prices', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_catalog_embeddings', + { + description: 'Catalog embedding coverage stats.', + inputSchema: {}, + }, + async () => + call({ + promise: agent.api.admin.admin.analytics.catalog.embeddings.get(), + action: 'admin catalog embedding stats', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_etl_jobs', + { + description: 'Recent ETL pipeline jobs.', + inputSchema: { limit: z.number().int().min(1).max(200).default(20) }, + }, + async ({ limit }) => + call({ + promise: agent.api.admin.admin.analytics.catalog.etl.get({ query: { limit } }), + action: 'admin ETL jobs', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_etl_failure_summary', + { + description: 'Top recent ETL failure patterns.', + inputSchema: { limit: z.number().int().min(1).max(50).default(10) }, + }, + async ({ limit }) => + call({ + promise: agent.api.admin.admin.analytics.catalog.etl['failure-summary'].get({ + query: { limit }, + }), + action: 'admin ETL failure summary', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_analytics_etl_job_failures', + { + description: 'Per-job ETL failure drill-down.', + inputSchema: { + job_id: z.string(), + limit: z.number().int().min(1).max(200).default(50), + }, + }, + async ({ job_id, limit }) => + call({ + promise: agent.api.admin.admin.analytics.catalog.etl({ jobId: job_id }).failures.get({ + query: { limit }, + }), + action: 'admin ETL job failures', + resourceHint: `job ${job_id}`, + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_etl_reset_stuck', + { + description: 'Mark stuck-running ETL jobs as failed (admin maintenance).', + inputSchema: {}, + }, + async () => + call({ + promise: agent.api.admin.admin.analytics.catalog.etl['reset-stuck'].post({}), + action: 'admin ETL reset stuck', + ...ADMIN, + }), + ); + + agent.registerAdminTool( + 'admin_etl_retry_job', + { + description: 'Retry a specific failed ETL job.', + inputSchema: { job_id: z.string() }, + }, + async ({ job_id }) => + call({ + promise: agent.api.admin.admin.analytics.catalog.etl({ jobId: job_id }).retry.post({}), + action: 'admin ETL retry job', + resourceHint: `job ${job_id}`, + ...ADMIN, + }), + ); +} diff --git a/packages/mcp/src/tools/ai.ts b/packages/mcp/src/tools/ai.ts new file mode 100644 index 0000000000..af17ea552b --- /dev/null +++ b/packages/mcp/src/tools/ai.ts @@ -0,0 +1,51 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerAiTools(agent: AgentContext): void { + // ── Web search (Perplexity) ─────────────────────────────────────────────── + + agent.server.registerTool( + 'web_search', + { + description: + 'Search the web for current, real-time information using Perplexity AI. Use this for current trail conditions, recent news, current gear prices and deals, permit availability, or anything requiring up-to-date info not in the PackRat knowledge base.', + inputSchema: { query: z.string().min(3) }, + }, + async ({ query }) => + call({ + promise: agent.api.user.ai['web-search'].get({ query: { q: query } }), + action: 'web search', + }), + ); + + // ── Execute SQL (read-only) ─────────────────────────────────────────────── + + agent.server.registerTool( + 'execute_sql_query', + { + description: + 'Execute a read-only SQL SELECT query against the PackRat database for advanced analytics. Only SELECT statements are allowed.', + inputSchema: { + query: z.string().min(10), + limit: z.number().int().min(1).max(500).default(100), + }, + }, + async ({ query, limit }) => + call({ + promise: agent.api.user.ai['execute-sql'].post({ query, limit }), + action: 'execute SQL', + }), + ); + + // ── DB schema ───────────────────────────────────────────────────────────── + + agent.server.registerTool( + 'get_database_schema', + { + description: 'Get the PackRat DB schema — table names, columns, types.', + inputSchema: {}, + }, + async () => call({ promise: agent.api.user.ai['db-schema'].get(), action: 'fetch DB schema' }), + ); +} diff --git a/packages/mcp/src/tools/alltrails.ts b/packages/mcp/src/tools/alltrails.ts new file mode 100644 index 0000000000..1e0f7c3b66 --- /dev/null +++ b/packages/mcp/src/tools/alltrails.ts @@ -0,0 +1,20 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerAlltrailsTools(agent: AgentContext): void { + agent.server.registerTool( + 'preview_alltrails_url', + { + description: + 'Fetch trail metadata (title, description, image) from an AllTrails URL using OpenGraph tags.', + inputSchema: { url: z.string().url() }, + }, + async ({ url }) => + call({ + promise: agent.api.user.alltrails.preview.post({ url }), + action: 'preview AllTrails URL', + resourceHint: url, + }), + ); +} diff --git a/packages/mcp/src/tools/auth.ts b/packages/mcp/src/tools/auth.ts new file mode 100644 index 0000000000..c13c0f0af5 --- /dev/null +++ b/packages/mcp/src/tools/auth.ts @@ -0,0 +1,71 @@ +/** + * Auth tools. + * + * The MCP transport authenticates the user via OAuth 2.1, so MCP doesn't need + * to implement email/password login itself. These tools expose the parts of + * the auth surface a model may want to call: + * + * - `whoami` — return the signed-in user profile. + * - `admin_login` — exchange Basic credentials for a short-lived admin JWT + * and store it on the session so admin tools can use it. + * - `admin_logout` — clear the stored admin JWT. + */ + +import { isObject } from '@packrat/guards'; +import { z } from 'zod'; +import { call, errMessage, ok } from '../client'; +import type { AgentContext } from '../types'; + +export function registerAuthTools(agent: AgentContext): void { + // ── Whoami ──────────────────────────────────────────────────────────────── + + agent.server.registerTool( + 'whoami', + { + description: 'Return the currently authenticated PackRat user profile.', + inputSchema: {}, + }, + async () => call({ promise: agent.api.user.user.profile.get(), action: 'fetch profile' }), + ); + + // ── Admin login ─────────────────────────────────────────────────────────── + // Uses the body-credential variant of /api/admin/token (POST /admin/login) + // so the call goes straight through Treaty — no Basic-header bypass. + + agent.server.registerTool( + 'admin_login', + { + description: + 'Exchange admin credentials (username + password) for a short-lived admin JWT and store it for the current MCP session. Required before calling any admin_* tool unless an admin JWT was already supplied via the X-PackRat-Admin-Token header.', + inputSchema: { + username: z.string().min(1), + password: z.string().min(1), + }, + }, + async ({ username, password }) => { + const result = await agent.api.user.admin.login.post({ username, password }); + if (result.error || !result.data) { + const detail = isObject(result.error) ? (result.error.value ?? null) : null; + return errMessage( + `Admin login failed (HTTP ${result.status})${detail ? `: ${JSON.stringify(detail)}` : ''}`, + ); + } + agent.setAdminToken(result.data.token); + return ok({ ok: true, expiresIn: result.data.expiresIn }); + }, + ); + + // ── Admin logout / clear token ──────────────────────────────────────────── + + agent.server.registerTool( + 'admin_logout', + { + description: 'Clear the stored admin JWT for this MCP session.', + inputSchema: {}, + }, + async () => { + agent.setAdminToken(''); + return ok({ ok: true }); + }, + ); +} diff --git a/packages/mcp/src/tools/catalog.ts b/packages/mcp/src/tools/catalog.ts index 003daefe1e..89d8ac6f10 100644 --- a/packages/mcp/src/tools/catalog.ts +++ b/packages/mcp/src/tools/catalog.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call } from '../client'; import { CatalogSortField, SortOrder } from '../enums'; import type { AgentContext } from '../types'; @@ -22,33 +22,25 @@ export function registerCatalogTools(agent: AgentContext): void { .describe( 'Filter by category (e.g. "sleeping bags", "tents", "backpacks", "footwear", "apparel")', ), - limit: z - .number() - .int() - .min(1) - .max(50) - .default(10) - .describe('Number of results to return (default 10)'), - page: z.number().int().min(1).default(1).describe('Page number (default 1)'), - sort_by: z.nativeEnum(CatalogSortField).optional().describe('Sort field'), - sort_order: z.nativeEnum(SortOrder).default(SortOrder.Asc).describe('Sort direction'), + limit: z.number().int().min(1).max(50).default(10), + page: z.number().int().min(1).default(1), + sort_by: z.nativeEnum(CatalogSortField).optional(), + sort_order: z.nativeEnum(SortOrder).default(SortOrder.Asc), }, }, - async ({ query, category, limit, page, sort_by, sort_order }) => { - try { - const data = await agent.api.get('/catalog', { - q: query, - category, - limit, - page, - 'sort[field]': sort_by, - 'sort[order]': sort_order, - }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ query, category, limit, page, sort_by, sort_order }) => + call({ + promise: agent.api.user.catalog.get({ + query: { + q: query, + category, + limit, + page, + sort: sort_by ? { field: sort_by, order: sort_order } : undefined, + }, + }), + action: 'search catalog', + }), ); // ── Semantic/vector search ──────────────────────────────────────────────── @@ -57,31 +49,17 @@ export function registerCatalogTools(agent: AgentContext): void { 'semantic_gear_search', { description: - 'Search the gear catalog using AI-powered semantic/vector search. Unlike keyword search, this understands context and meaning — great for queries like "warm but lightweight insulation layer for cold shoulder-season camping" or "minimalist trail running shoe for rocky terrain".', + 'Search the gear catalog using AI-powered semantic/vector search. Great for natural-language queries like "warm but lightweight insulation layer for cold shoulder-season camping" or "minimalist trail running shoe for rocky terrain".', inputSchema: { - query: z - .string() - .min(3) - .describe( - 'Natural language description of the gear you need. Be specific about use-case, conditions, weight preferences, or features.', - ), - limit: z - .number() - .int() - .min(1) - .max(30) - .default(8) - .describe('Number of results to return (default 8)'), + query: z.string().min(3), + limit: z.number().int().min(1).max(30).default(8), }, }, - async ({ query, limit }) => { - try { - const data = await agent.api.get('/catalog/vector-search', { q: query, limit }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ query, limit }) => + call({ + promise: agent.api.user.catalog['vector-search'].get({ query: { q: query, limit } }), + action: 'semantic catalog search', + }), ); // ── Get single item ─────────────────────────────────────────────────────── @@ -92,20 +70,37 @@ export function registerCatalogTools(agent: AgentContext): void { description: 'Retrieve full details for a specific gear catalog item by ID. Returns all specs, dimensions, weight, price, availability, user reviews, Q&A, and product URL.', inputSchema: { - item_id: z - .number() - .int() - .describe('The catalog item ID (from search_gear_catalog or semantic_gear_search)'), + item_id: z.number().int().describe('The catalog item ID'), }, }, - async ({ item_id }) => { - try { - const data = await agent.api.get(`/catalog/${item_id}`); - return ok(data); - } catch (e) { - return err(e); - } + async ({ item_id }) => + call({ + promise: agent.api.user.catalog({ id: String(item_id) }).get(), + action: 'get catalog item', + resourceHint: `catalog item ${item_id}`, + }), + ); + + // ── Similar catalog items ───────────────────────────────────────────────── + + agent.server.registerTool( + 'similar_catalog_items', + { + description: 'Find items similar to a given catalog item by embedding similarity.', + inputSchema: { + item_id: z.number().int(), + limit: z.number().int().min(1).max(50).default(10), + threshold: z.number().min(0).max(1).optional(), + }, }, + async ({ item_id, limit, threshold }) => + call({ + promise: agent.api.user.catalog({ id: String(item_id) }).similar.get({ + query: { limit, ...(threshold !== undefined ? { threshold } : {}) }, + }), + action: 'find similar catalog items', + resourceHint: `catalog item ${item_id}`, + }), ); // ── List categories ─────────────────────────────────────────────────────── @@ -115,67 +110,81 @@ export function registerCatalogTools(agent: AgentContext): void { { description: 'List all available gear categories in the catalog with item counts. Use this to explore what gear types are available before searching.', - inputSchema: {}, - }, - async () => { - try { - const data = await agent.api.get('/catalog/categories'); - return ok(data); - } catch (e) { - return err(e); - } + inputSchema: { limit: z.number().int().min(1).max(200).optional() }, }, + async ({ limit }) => + call({ + promise: agent.api.user.catalog.categories.get({ query: { limit } }), + action: 'list catalog categories', + }), ); - // ── Compare items ───────────────────────────────────────────────────────── + // ── Create a catalog item (user-submitted) ──────────────────────────────── agent.server.registerTool( - 'compare_gear_items', + 'create_catalog_item', { description: - 'Compare multiple gear items side-by-side on key attributes: weight, price, rating, and specs. Returns a structured comparison table. Provide 2–5 item IDs.', + 'Submit a new gear item to the catalog. The API will embed and dedupe automatically. Use this for custom items not yet in the catalog.', inputSchema: { - item_ids: z - .array(z.number().int()) - .min(2) - .max(5) - .describe('Array of 2–5 catalog item IDs to compare'), + name: z.string().min(1), + description: z.string().optional(), + brand: z.string().optional(), + model: z.string().optional(), + weight: z.number().min(0).optional(), + weight_unit: z.enum(['g', 'oz', 'kg', 'lb']).optional(), + categories: z.array(z.string()).optional(), + images: z.array(z.string()).optional(), + rating: z.number().min(0).max(5).optional(), + product_url: z.string().url().optional(), }, }, - async ({ item_ids }) => { - try { - const items = await Promise.all( - item_ids.map((id) => agent.api.get>(`/catalog/${id}`)), - ); - const comparison = items.map((it) => ({ - id: it.id, - name: it.name, - brand: it.brand, - category: it.category, - weightGrams: it.weight, - priceCents: it.price, - rating: it.ratingValue, - reviewCount: it.ratingCount, - productUrl: it.productUrl, - })); + async ({ + name, + description, + brand, + model, + weight, + weight_unit, + categories, + images, + rating, + product_url, + }) => + call({ + promise: agent.api.user.catalog.post({ + name, + description, + brand, + model, + weight, + weightUnit: weight_unit, + categories, + images, + rating, + productUrl: product_url, + }), + action: 'create catalog item', + }), + ); - comparison.sort( - (a, b) => (Number(a.weightGrams) || 999999) - (Number(b.weightGrams) || 999999), - ); + // ── Compare items (API-side path proposed; until then, multi-fetch) ─────── + // NOTE: this duplicates work the API could do in a single `/catalog/compare` + // endpoint that accepts an `ids[]` query. Tracked in the API thickening list. - return ok({ - items: comparison, - lightest: comparison[0]?.name, - cheapest: [...comparison].sort( - (a, b) => (Number(a.priceCents) || 999999) - (Number(b.priceCents) || 999999), - )[0]?.name, - highestRated: [...comparison].sort( - (a, b) => (Number(b.rating) || 0) - (Number(a.rating) || 0), - )[0]?.name, - }); - } catch (e) { - return err(e); - } + agent.server.registerTool( + 'compare_gear_items', + { + description: + 'Compare multiple gear items side-by-side on weight, price, and rating. Provide 2–10 catalog item IDs.', + inputSchema: { + item_ids: z.array(z.number().int()).min(2).max(10), + }, }, + async ({ item_ids }) => + call({ + promise: agent.api.user.catalog.compare.post({ ids: item_ids }), + action: 'compare catalog items', + }), ); } diff --git a/packages/mcp/src/tools/feed.ts b/packages/mcp/src/tools/feed.ts new file mode 100644 index 0000000000..6c2562a72e --- /dev/null +++ b/packages/mcp/src/tools/feed.ts @@ -0,0 +1,153 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerFeedTools(agent: AgentContext): void { + // ── Posts ───────────────────────────────────────────────────────────────── + + agent.server.registerTool( + 'list_feed', + { + description: 'List social feed posts (paginated).', + inputSchema: { + page: z.number().int().min(1).default(1), + limit: z.number().int().min(1).max(50).default(20), + }, + }, + async ({ page, limit }) => + call({ promise: agent.api.user.feed.get({ query: { page, limit } }), action: 'list feed' }), + ); + + agent.server.registerTool( + 'create_feed_post', + { + description: 'Create a feed post with a caption and optional image keys.', + inputSchema: { + caption: z.string().min(1), + images: z.array(z.string()).optional(), + }, + }, + async ({ caption, images }) => + call({ + promise: agent.api.user.feed.post({ caption, images: images ?? [] }), + action: 'create feed post', + }), + ); + + agent.server.registerTool( + 'get_feed_post', + { + description: 'Get a specific feed post by ID.', + inputSchema: { post_id: z.string() }, + }, + async ({ post_id }) => + call({ + promise: agent.api.user.feed({ postId: post_id }).get(), + action: 'get feed post', + resourceHint: `post ${post_id}`, + }), + ); + + agent.server.registerTool( + 'delete_feed_post', + { + description: 'Delete one of your own feed posts.', + inputSchema: { post_id: z.string() }, + }, + async ({ post_id }) => + call({ + promise: agent.api.user.feed({ postId: post_id }).delete(), + action: 'delete feed post', + resourceHint: `post ${post_id}`, + }), + ); + + agent.server.registerTool( + 'toggle_feed_post_like', + { + description: 'Like or unlike a feed post (toggle).', + inputSchema: { post_id: z.string() }, + }, + async ({ post_id }) => + call({ + promise: agent.api.user.feed({ postId: post_id }).like.post({}), + action: 'toggle feed post like', + resourceHint: `post ${post_id}`, + }), + ); + + // ── Comments ────────────────────────────────────────────────────────────── + + agent.server.registerTool( + 'list_feed_comments', + { + description: 'List comments on a feed post.', + inputSchema: { + post_id: z.string(), + page: z.number().int().min(1).default(1), + limit: z.number().int().min(1).max(100).default(20), + }, + }, + async ({ post_id, page, limit }) => + call({ + promise: agent.api.user.feed({ postId: post_id }).comments.get({ query: { page, limit } }), + action: 'list feed comments', + resourceHint: `post ${post_id}`, + }), + ); + + agent.server.registerTool( + 'create_feed_comment', + { + description: 'Add a comment to a feed post (or reply to a parent comment).', + inputSchema: { + post_id: z.string(), + content: z.string().min(1), + parent_comment_id: z.number().int().optional(), + }, + }, + async ({ post_id, content, parent_comment_id }) => + call({ + promise: agent.api.user.feed({ postId: post_id }).comments.post({ + content, + parentCommentId: parent_comment_id, + }), + action: 'create feed comment', + resourceHint: `post ${post_id}`, + }), + ); + + agent.server.registerTool( + 'delete_feed_comment', + { + description: 'Delete one of your own feed comments.', + inputSchema: { post_id: z.string(), comment_id: z.string() }, + }, + async ({ post_id, comment_id }) => + call({ + promise: agent.api.user + .feed({ postId: post_id }) + .comments({ commentId: comment_id }) + .delete(), + action: 'delete feed comment', + resourceHint: `comment ${comment_id}`, + }), + ); + + agent.server.registerTool( + 'toggle_feed_comment_like', + { + description: 'Like or unlike a feed comment (toggle).', + inputSchema: { post_id: z.string(), comment_id: z.string() }, + }, + async ({ post_id, comment_id }) => + call({ + promise: agent.api.user + .feed({ postId: post_id }) + .comments({ commentId: comment_id }) + .like.post({}), + action: 'toggle feed comment like', + resourceHint: `comment ${comment_id}`, + }), + ); +} diff --git a/packages/mcp/src/tools/guides.ts b/packages/mcp/src/tools/guides.ts new file mode 100644 index 0000000000..cdcc1eda6f --- /dev/null +++ b/packages/mcp/src/tools/guides.ts @@ -0,0 +1,75 @@ +import { z } from 'zod'; +import { call } from '../client'; +import { SortOrder } from '../enums'; +import type { AgentContext } from '../types'; + +export function registerGuidesTools(agent: AgentContext): void { + agent.server.registerTool( + 'list_guides', + { + description: 'List PackRat outdoor guides (paginated, filterable by category).', + inputSchema: { + page: z.number().int().min(1).default(1), + limit: z.number().int().min(1).max(50).default(20), + category: z.string().optional(), + sort_field: z.string().optional(), + sort_order: z.nativeEnum(SortOrder).optional(), + }, + }, + async ({ page, limit, category, sort_field, sort_order }) => + call({ + promise: agent.api.user.guides.get({ + query: { + page, + limit, + category, + 'sort[field]': sort_field, + 'sort[order]': sort_order, + }, + }), + action: 'list guides', + }), + ); + + agent.server.registerTool( + 'list_guide_categories', + { + description: 'List all guide categories.', + inputSchema: {}, + }, + async () => + call({ promise: agent.api.user.guides.categories.get(), action: 'list guide categories' }), + ); + + agent.server.registerTool( + 'search_guides', + { + description: 'Full-text search across PackRat outdoor guides.', + inputSchema: { + query: z.string().min(2), + page: z.number().int().min(1).default(1), + limit: z.number().int().min(1).max(50).default(20), + category: z.string().optional(), + }, + }, + async ({ query, page, limit, category }) => + call({ + promise: agent.api.user.guides.search.get({ query: { q: query, page, limit, category } }), + action: 'search guides', + }), + ); + + agent.server.registerTool( + 'get_guide', + { + description: 'Get a specific guide by ID. Returns MDX/Markdown content.', + inputSchema: { guide_id: z.string() }, + }, + async ({ guide_id }) => + call({ + promise: agent.api.user.guides({ id: guide_id }).get(), + action: 'get guide', + resourceHint: `guide ${guide_id}`, + }), + ); +} diff --git a/packages/mcp/src/tools/knowledge.ts b/packages/mcp/src/tools/knowledge.ts index bdc98b9e77..d1ee3087cd 100644 --- a/packages/mcp/src/tools/knowledge.ts +++ b/packages/mcp/src/tools/knowledge.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call } from '../client'; import type { AgentContext } from '../types'; export function registerKnowledgeTools(agent: AgentContext): void { @@ -11,106 +11,31 @@ export function registerKnowledgeTools(agent: AgentContext): void { description: 'Search the PackRat outdoor knowledge base using AI-powered retrieval. Contains expert guides on outdoor skills, safety, Leave No Trace principles, gear techniques, navigation, first aid, and outdoor activities. Use this for "how-to" questions, technique guidance, or safety information.', inputSchema: { - query: z - .string() - .min(5) - .describe( - 'Your question or search topic. Examples: "how to set up a bear hang", "layering system for cold weather camping", "water treatment methods for backcountry"', - ), - limit: z - .number() - .int() - .min(1) - .max(10) - .default(5) - .describe('Number of guide sections to return (default 5)'), + query: z.string().min(5).describe('Your question or search topic'), + limit: z.number().int().min(1).max(10).default(5), }, }, - async ({ query, limit }) => { - try { - const data = await agent.api.get('/ai/rag-search', { q: query, limit }); - return ok(data); - } catch (e) { - return err(e); - } - }, - ); - - // ── Web search ──────────────────────────────────────────────────────────── - - agent.server.registerTool( - 'web_search', - { - description: - 'Search the web for current, real-time information using Perplexity AI. Use this for: current trail conditions, recent news about parks/trails, current gear prices and deals, recent reviews, event schedules, permit availability, or anything requiring up-to-date information not in the PackRat knowledge base.', - inputSchema: { - query: z - .string() - .min(3) - .describe( - 'Search query — be specific. Examples: "John Muir Trail permit availability 2025", "best ultralight tent reviews 2025", "Yosemite Valley campground reservations"', - ), - }, - }, - async ({ query }) => { - try { - const data = await agent.api.get('/ai/web-search', { q: query }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ query, limit }) => + call({ + promise: agent.api.user.ai['rag-search'].get({ query: { q: query, limit } }), + action: 'search outdoor guides', + }), ); - // ── Execute SQL (power user tool) ───────────────────────────────────────── + // ── Knowledge-base reader (URL extraction) ──────────────────────────────── agent.server.registerTool( - 'execute_sql_query', + 'extract_url_content', { description: - 'Execute a read-only SQL SELECT query against the PackRat database. Use this for advanced analytics, custom gear searches by specs, or exploring the data schema. Only SELECT statements are allowed — no INSERT, UPDATE, or DELETE.', - inputSchema: { - query: z - .string() - .min(10) - .describe( - 'A valid SQL SELECT statement. Example: "SELECT name, brand, weight FROM catalog_items WHERE category = \'sleeping bags\' AND weight < 500 ORDER BY weight ASC LIMIT 10"', - ), - limit: z - .number() - .int() - .min(1) - .max(500) - .default(100) - .describe('Maximum rows to return (default 100, max 500)'), - }, - }, - async ({ query, limit }) => { - try { - const data = await agent.api.post('/ai/execute-sql', { query, limit }); - return ok(data); - } catch (e) { - return err(e); - } - }, - ); - - // ── Get DB schema ───────────────────────────────────────────────────────── - - agent.server.registerTool( - 'get_database_schema', - { - description: - 'Get the PackRat database schema — table names, column names, and types. Use this before writing SQL queries to understand available data structures.', - inputSchema: {}, - }, - async () => { - try { - const data = await agent.api.get('/ai/db-schema'); - return ok(data); - } catch (e) { - return err(e); - } - }, + 'Extract the readable article content from any URL using Readability. Useful for ingesting blog posts, trip reports, or gear reviews.', + inputSchema: { url: z.string().url() }, + }, + async ({ url }) => + call({ + promise: agent.api.user['knowledge-base'].reader.extract.post({ url }), + action: 'extract URL content', + resourceHint: url, + }), ); } diff --git a/packages/mcp/src/tools/packTemplates.ts b/packages/mcp/src/tools/packTemplates.ts new file mode 100644 index 0000000000..2b21dccb49 --- /dev/null +++ b/packages/mcp/src/tools/packTemplates.ts @@ -0,0 +1,242 @@ +import { z } from 'zod'; +import { call, nowIso } from '../client'; +import { ItemCategory, PackCategory } from '../enums'; +import type { AgentContext } from '../types'; + +export function registerPackTemplateTools(agent: AgentContext): void { + // ── Templates ───────────────────────────────────────────────────────────── + + agent.server.registerTool( + 'list_pack_templates', + { + description: 'List both user-owned and app-curated pack templates.', + inputSchema: {}, + }, + async () => + call({ promise: agent.api.user['pack-templates'].get(), action: 'list pack templates' }), + ); + + agent.server.registerTool( + 'get_pack_template', + { + description: 'Get a pack template with its items.', + inputSchema: { template_id: z.string() }, + }, + async ({ template_id }) => + call({ + promise: agent.api.user['pack-templates']({ templateId: template_id }).get(), + action: 'get pack template', + resourceHint: `template ${template_id}`, + }), + ); + + agent.server.registerTool( + 'create_pack_template', + { + description: + 'Create a pack template. Set is_app_template=true to create a curated app template (admin only).', + inputSchema: { + name: z.string().min(1), + description: z.string().optional(), + category: z.nativeEnum(PackCategory), + image: z.string().optional(), + tags: z.array(z.string()).optional(), + is_app_template: z.boolean().default(false), + }, + }, + async ({ name, description, category, image, tags, is_app_template }) => { + const now = nowIso(); + return call({ + promise: agent.api.user['pack-templates'].post({ + name, + description, + category, + image, + tags, + isAppTemplate: is_app_template, + localCreatedAt: now, + localUpdatedAt: now, + }), + action: 'create pack template', + }); + }, + ); + + agent.server.registerTool( + 'update_pack_template', + { + description: 'Update a pack template.', + inputSchema: { + template_id: z.string(), + name: z.string().min(1).optional(), + description: z.string().optional(), + category: z.nativeEnum(PackCategory).optional(), + image: z.string().optional(), + tags: z.array(z.string()).optional(), + }, + }, + async ({ template_id, name, description, category, image, tags }) => { + const body: Record = { localUpdatedAt: nowIso() }; + if (name !== undefined) body.name = name; + if (description !== undefined) body.description = description; + if (category !== undefined) body.category = category; + if (image !== undefined) body.image = image; + if (tags !== undefined) body.tags = tags; + return call({ + promise: agent.api.user['pack-templates']({ templateId: template_id }).put(body), + action: 'update pack template', + resourceHint: `template ${template_id}`, + }); + }, + ); + + agent.server.registerTool( + 'delete_pack_template', + { + description: 'Delete a pack template.', + inputSchema: { template_id: z.string() }, + }, + async ({ template_id }) => + call({ + promise: agent.api.user['pack-templates']({ templateId: template_id }).delete(), + action: 'delete pack template', + resourceHint: `template ${template_id}`, + }), + ); + + // ── Template items ──────────────────────────────────────────────────────── + + agent.server.registerTool( + 'list_pack_template_items', + { + description: 'List items inside a pack template.', + inputSchema: { template_id: z.string() }, + }, + async ({ template_id }) => + call({ + promise: agent.api.user['pack-templates']({ templateId: template_id }).items.get(), + action: 'list pack template items', + resourceHint: `template ${template_id}`, + }), + ); + + agent.server.registerTool( + 'add_pack_template_item', + { + description: 'Add an item to a pack template.', + inputSchema: { + template_id: z.string(), + name: z.string().min(1), + description: z.string().optional(), + weight: z.number().min(0), + weight_unit: z.enum(['g', 'oz', 'kg', 'lb']).default('g'), + quantity: z.number().int().min(1).default(1), + category: z.nativeEnum(ItemCategory), + consumable: z.boolean().default(false), + worn: z.boolean().default(false), + image: z.string().optional(), + notes: z.string().optional(), + }, + }, + async ({ + template_id, + name, + description, + weight, + weight_unit, + quantity, + category, + consumable, + worn, + image, + notes, + }) => + call({ + promise: agent.api.user['pack-templates']({ templateId: template_id }).items.post({ + name, + description, + weight, + weightUnit: weight_unit, + quantity, + category, + consumable, + worn, + image, + notes, + }), + action: 'add template item', + resourceHint: `template ${template_id}`, + }), + ); + + agent.server.registerTool( + 'update_pack_template_item', + { + description: 'Update a pack template item.', + inputSchema: { + item_id: z.string(), + name: z.string().min(1).optional(), + description: z.string().optional(), + weight: z.number().min(0).optional(), + weight_unit: z.enum(['g', 'oz', 'kg', 'lb']).optional(), + quantity: z.number().int().min(1).optional(), + category: z.nativeEnum(ItemCategory).optional(), + consumable: z.boolean().optional(), + worn: z.boolean().optional(), + image: z.string().optional(), + notes: z.string().optional(), + }, + }, + async ({ item_id, ...fields }) => { + // Explicit snake→camel rename avoids a raw regex; keys are stable + // because the input schema is fixed at registration time. + const SNAKE_TO_CAMEL: Record = { weight_unit: 'weightUnit' }; + const body: Record = {}; + for (const [k, v] of Object.entries(fields)) { + if (v === undefined) continue; + body[SNAKE_TO_CAMEL[k] ?? k] = v; + } + return call({ + promise: agent.api.user['pack-templates'].items({ itemId: item_id }).patch(body), + action: 'update template item', + resourceHint: `item ${item_id}`, + }); + }, + ); + + agent.server.registerTool( + 'delete_pack_template_item', + { + description: 'Delete a pack template item.', + inputSchema: { item_id: z.string() }, + }, + async ({ item_id }) => + call({ + promise: agent.api.user['pack-templates'].items({ itemId: item_id }).delete(), + action: 'delete template item', + resourceHint: `item ${item_id}`, + }), + ); + + // ── Generate from online content (admin-only on the API side) ───────────── + + agent.server.registerTool( + 'generate_pack_template_from_url', + { + description: + 'Generate a pack template from a TikTok or YouTube link. The server gates this on `user.role === "ADMIN"` on the OAuth-authenticated user — the admin_login JWT does NOT authorize this call. Your signed-in PackRat account must be an admin.', + inputSchema: { + content_url: z.string().url(), + is_app_template: z.boolean().default(false), + }, + }, + async ({ content_url, is_app_template }) => + call({ + promise: agent.api.user['pack-templates']['generate-from-online-content'].post({ + contentUrl: content_url, + isAppTemplate: is_app_template, + }), + action: 'generate pack template from URL', + }), + ); +} diff --git a/packages/mcp/src/tools/packs.ts b/packages/mcp/src/tools/packs.ts index 38608be5f2..5a10c86efc 100644 --- a/packages/mcp/src/tools/packs.ts +++ b/packages/mcp/src/tools/packs.ts @@ -1,26 +1,8 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call, nowIso } from '../client'; import { ItemCategory, PackCategory } from '../enums'; import type { AgentContext } from '../types'; -// ── Tool regex constants ── -const STRIP_HYPHENS = /-/g; - -interface PackDetailResponse { - items?: Array<{ - name: string; - category: string; - weight: number; - quantity: number; - worn: boolean; - consumable: boolean; - }>; - totalWeight?: number; - baseWeight?: number; - wornWeight?: number; - consumableWeight?: number; -} - export function registerPackTools(agent: AgentContext): void { // ── List packs ──────────────────────────────────────────────────────────── @@ -36,14 +18,11 @@ export function registerPackTools(agent: AgentContext): void { .describe('Include public packs from other users'), }, }, - async ({ include_public }) => { - try { - const data = await agent.api.get('/packs', { includePublic: include_public ? 1 : 0 }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ include_public }) => + call({ + promise: agent.api.user.packs.get({ query: { includePublic: include_public ? 1 : 0 } }), + action: 'list packs', + }), ); // ── Get pack details ────────────────────────────────────────────────────── @@ -57,14 +36,12 @@ export function registerPackTools(agent: AgentContext): void { pack_id: z.string().describe('The unique pack ID (e.g. "p_abc123")'), }, }, - async ({ pack_id }) => { - try { - const data = await agent.api.get(`/packs/${pack_id}`); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ pack_id }) => + call({ + promise: agent.api.user.packs({ packId: pack_id }).get(), + action: 'get pack', + resourceHint: `pack ${pack_id}`, + }), ); // ── Create pack ─────────────────────────────────────────────────────────── @@ -86,11 +63,9 @@ export function registerPackTools(agent: AgentContext): void { }, }, async ({ name, description, category, is_public, tags }) => { - try { - const id = `p_${crypto.randomUUID().replace(STRIP_HYPHENS, '').slice(0, 12)}`; - const now = new Date().toISOString(); - const data = await agent.api.post('/packs', { - id, + const now = nowIso(); + return call({ + promise: agent.api.user.packs.post({ name, description, category, @@ -98,11 +73,9 @@ export function registerPackTools(agent: AgentContext): void { tags, localCreatedAt: now, localUpdatedAt: now, - }); - return ok(data); - } catch (e) { - return err(e); - } + }), + action: 'create pack', + }); }, ); @@ -122,18 +95,17 @@ export function registerPackTools(agent: AgentContext): void { }, }, async ({ pack_id, name, description, category, is_public, tags }) => { - try { - const body: Record = { localUpdatedAt: new Date().toISOString() }; - if (name !== undefined) body.name = name; - if (description !== undefined) body.description = description; - if (category !== undefined) body.category = category; - if (is_public !== undefined) body.isPublic = is_public; - if (tags !== undefined) body.tags = tags; - const data = await agent.api.put(`/packs/${pack_id}`, body); - return ok(data); - } catch (e) { - return err(e); - } + const body: Record = { localUpdatedAt: nowIso() }; + if (name !== undefined) body.name = name; + if (description !== undefined) body.description = description; + if (category !== undefined) body.category = category; + if (is_public !== undefined) body.isPublic = is_public; + if (tags !== undefined) body.tags = tags; + return call({ + promise: agent.api.user.packs({ packId: pack_id }).put(body), + action: 'update pack', + resourceHint: `pack ${pack_id}`, + }); }, ); @@ -147,14 +119,44 @@ export function registerPackTools(agent: AgentContext): void { pack_id: z.string().describe('The unique pack ID to delete'), }, }, - async ({ pack_id }) => { - try { - const data = await agent.api.delete(`/packs/${pack_id}`); - return ok(data); - } catch (e) { - return err(e); - } + async ({ pack_id }) => + call({ + promise: agent.api.user.packs({ packId: pack_id }).delete(), + action: 'delete pack', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── List pack items ─────────────────────────────────────────────────────── + + agent.server.registerTool( + 'list_pack_items', + { + description: 'List all items in a pack.', + inputSchema: { pack_id: z.string().describe('The pack ID') }, + }, + async ({ pack_id }) => + call({ + promise: agent.api.user.packs({ packId: pack_id }).items.get(), + action: 'list pack items', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── Get a single pack item ──────────────────────────────────────────────── + + agent.server.registerTool( + 'get_pack_item', + { + description: 'Get full details of a single pack item.', + inputSchema: { item_id: z.string().describe('The pack item ID') }, }, + async ({ item_id }) => + call({ + promise: agent.api.user.packs.items({ itemId: item_id }).get(), + action: 'get pack item', + resourceHint: `item ${item_id}`, + }), ); // ── Add item to pack ────────────────────────────────────────────────────── @@ -193,12 +195,9 @@ export function registerPackTools(agent: AgentContext): void { is_consumable, is_worn, notes, - }) => { - try { - const id = `i_${crypto.randomUUID().replace(STRIP_HYPHENS, '').slice(0, 12)}`; - const now = new Date().toISOString(); - const data = await agent.api.post(`/packs/${pack_id}/items`, { - id, + }) => + call({ + promise: agent.api.user.packs({ packId: pack_id }).items.post({ name, category, weight: weight_grams, @@ -207,13 +206,43 @@ export function registerPackTools(agent: AgentContext): void { consumable: is_consumable, worn: is_worn, notes, - localCreatedAt: now, - localUpdatedAt: now, - }); - return ok(data); - } catch (e) { - return err(e); - } + }), + action: 'add pack item', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── Update pack item ────────────────────────────────────────────────────── + + agent.server.registerTool( + 'update_pack_item', + { + description: 'Update fields on an existing pack item.', + inputSchema: { + item_id: z.string().describe('The pack item ID'), + name: z.string().min(1).optional(), + category: z.nativeEnum(ItemCategory).optional(), + weight_grams: z.number().min(0).optional(), + quantity: z.number().int().min(1).optional(), + is_consumable: z.boolean().optional(), + is_worn: z.boolean().optional(), + notes: z.string().nullable().optional(), + }, + }, + async ({ item_id, name, category, weight_grams, quantity, is_consumable, is_worn, notes }) => { + const body: Record = { localUpdatedAt: nowIso() }; + if (name !== undefined) body.name = name; + if (category !== undefined) body.category = category; + if (weight_grams !== undefined) body.weight = weight_grams; + if (quantity !== undefined) body.quantity = quantity; + if (is_consumable !== undefined) body.consumable = is_consumable; + if (is_worn !== undefined) body.worn = is_worn; + if (notes !== undefined) body.notes = notes; + return call({ + promise: agent.api.user.packs.items({ itemId: item_id }).patch(body), + action: 'update pack item', + resourceHint: `item ${item_id}`, + }); }, ); @@ -223,101 +252,164 @@ export function registerPackTools(agent: AgentContext): void { 'remove_pack_item', { description: 'Remove an item from a pack (soft-delete).', + inputSchema: { item_id: z.string().describe('The item ID to remove') }, + }, + async ({ item_id }) => + call({ + promise: agent.api.user.packs.items({ itemId: item_id }).delete(), + action: 'delete pack item', + resourceHint: `item ${item_id}`, + }), + ); + + // ── Similar items for an item in a pack ─────────────────────────────────── + + agent.server.registerTool( + 'similar_pack_items', + { + description: 'Find catalog gear similar to a specific item in a pack (semantic similarity).', inputSchema: { - item_id: z.string().describe('The item ID to remove'), + pack_id: z.string(), + item_id: z.string(), + limit: z.number().int().min(1).max(50).default(10), + threshold: z.number().min(0).max(1).optional().describe('Similarity threshold (0-1)'), }, }, - async ({ item_id }) => { - try { - const data = await agent.api.delete(`/packs/items/${item_id}`); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ pack_id, item_id, limit, threshold }) => + call({ + promise: agent.api.user + .packs({ packId: pack_id }) + .items({ itemId: item_id }) + .similar.get({ query: { limit, ...(threshold !== undefined ? { threshold } : {}) } }), + action: 'find similar items', + resourceHint: `item ${item_id}`, + }), ); - // ── Pack weight analysis ────────────────────────────────────────────────── + // ── Pack item suggestions ───────────────────────────────────────────────── agent.server.registerTool( - 'analyze_pack_weight', + 'suggest_pack_items', { description: - 'Get a detailed weight breakdown for a pack by category. Returns base weight, worn weight, consumable weight, and total weight with per-category summaries. Useful for identifying the heaviest items and optimization opportunities.', + 'Get AI-driven catalog item suggestions for a pack based on the items already in it.', inputSchema: { - pack_id: z.string().describe('The pack ID to analyze'), + pack_id: z.string(), + existing_catalog_item_ids: z.array(z.number().int()).default([]), }, }, - async ({ pack_id }) => { - try { - const pack = await agent.api.get(`/packs/${pack_id}`); - - const byCategory: Record = - {}; - const items = pack.items ?? []; - - for (const item of items) { - const cat = item.category || 'Uncategorized'; - const entry = byCategory[cat] ?? { items: [], totalGrams: 0, count: 0 }; - entry.items.push(`${item.name} (${item.weight}g × ${item.quantity})`); - entry.totalGrams += item.weight * item.quantity; - entry.count += item.quantity; - byCategory[cat] = entry; - } - - const analysis = { - packId: pack_id, - totalWeight: pack.totalWeight ?? 0, - baseWeight: pack.baseWeight ?? 0, - wornWeight: pack.wornWeight ?? 0, - consumableWeight: pack.consumableWeight ?? 0, - itemCount: items.length, - byCategory: Object.entries(byCategory) - .sort((a, b) => b[1].totalGrams - a[1].totalGrams) - .map(([category, stats]) => ({ - category, - totalGrams: stats.totalGrams, - totalLbs: (stats.totalGrams / 453.592).toFixed(2), - itemCount: stats.count, - items: stats.items, - })), - }; - - return ok(analysis); - } catch (e) { - return err(e); - } + async ({ pack_id, existing_catalog_item_ids }) => + call({ + promise: agent.api.user + .packs({ packId: pack_id }) + ['item-suggestions'].post({ existingCatalogItemIds: existing_catalog_item_ids }), + action: 'suggest pack items', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── Weight history ──────────────────────────────────────────────────────── + + agent.server.registerTool( + 'get_pack_weight_history', + { + description: "Get the weight history for all of the user's packs over time.", + inputSchema: {}, }, + async () => + call({ + promise: agent.api.user.packs['weight-history'].get(), + action: 'list pack weight history', + }), ); - // ── Pack gap analysis ───────────────────────────────────────────────────── + agent.server.registerTool( + 'record_pack_weight', + { + description: 'Record a weight measurement for a pack at a specific point in time.', + inputSchema: { pack_id: z.string(), weight_grams: z.number().min(0) }, + }, + async ({ pack_id, weight_grams }) => + call({ + promise: agent.api.user + .packs({ packId: pack_id }) + ['weight-history'].post({ weight: weight_grams, localCreatedAt: nowIso() }), + action: 'record pack weight', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── Pack weight analysis (server-computed breakdown) ───────────────────── + agent.server.registerTool( + 'analyze_pack_weight', + { + description: + 'Get a detailed weight breakdown for a pack: total / base / worn / consumable grams plus a per-category aggregation sorted heaviest first.', + inputSchema: { pack_id: z.string().describe('The pack ID to analyze') }, + }, + async ({ pack_id }) => + call({ + promise: agent.api.user.packs({ packId: pack_id })['weight-breakdown'].get(), + action: 'analyze pack weight', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── Gap analysis ────────────────────────────────────────────────────────── agent.server.registerTool( 'analyze_pack_gaps', { description: - "Identify missing essential gear categories for a specific activity type. Compares the pack's current categories against recommended essentials and returns what's missing.", + "Identify missing essential gear categories for a specific trip context. Compares the pack's current categories against recommended essentials and returns what's missing.", inputSchema: { pack_id: z.string().describe('The pack ID to analyze'), - activity: z.nativeEnum(PackCategory).describe('Activity type to check gear gaps for'), - duration_days: z + destination: z.string().describe('Trip destination'), + trip_type: z.nativeEnum(PackCategory).describe('Trip / activity type'), + duration_days: z.number().int().min(1).describe('Trip duration in days'), + start_date: z.string().optional().describe('ISO date for trip start'), + end_date: z.string().optional().describe('ISO date for trip end'), + }, + }, + async ({ pack_id, destination, trip_type, duration_days, start_date, end_date }) => + call({ + promise: agent.api.user.packs({ packId: pack_id })['gap-analysis'].post({ + destination, + tripType: trip_type, + duration: duration_days, + startDate: start_date, + endDate: end_date, + }), + action: 'analyze pack gaps', + resourceHint: `pack ${pack_id}`, + }), + ); + + // ── Image-based gear detection ─────────────────────────────────────────── + + agent.server.registerTool( + 'analyze_pack_image', + { + description: + 'Submit a gear image (R2 key from upload_image_url) for AI-powered item detection. Returns detected items with catalog matches.', + inputSchema: { + image_key: z.string().describe('R2 image key from a presigned upload'), + match_limit: z .number() .int() .min(1) - .optional() - .describe('Trip duration in days (affects consumable recommendations)'), + .max(20) + .default(5) + .describe('Max catalog matches per detected item'), }, }, - async ({ pack_id, activity, duration_days }) => { - try { - const data = await agent.api.post(`/packs/${pack_id}/gap-analysis`, { - activity, - durationDays: duration_days, - }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ image_key, match_limit }) => + call({ + promise: agent.api.user.packs['analyze-image'].post({ + image: image_key, + matchLimit: match_limit, + }), + action: 'analyze pack image', + }), ); } diff --git a/packages/mcp/src/tools/seasons.ts b/packages/mcp/src/tools/seasons.ts new file mode 100644 index 0000000000..73edebde5f --- /dev/null +++ b/packages/mcp/src/tools/seasons.ts @@ -0,0 +1,24 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerSeasonTools(agent: AgentContext): void { + // Note: the API requires a user with 20+ inventory items before serving + // suggestions — the call may 422 for new users. + agent.server.registerTool( + 'get_season_suggestions', + { + description: + 'Generate season-appropriate pack suggestions for a location + date. Requires at least 20 inventory items on the signed-in user.', + inputSchema: { + location: z.string().min(1).describe('Location string the API can geocode'), + date: z.string().describe('ISO 8601 date or month label'), + }, + }, + async ({ location, date }) => + call({ + promise: agent.api.user['season-suggestions'].post({ location, date }), + action: 'fetch season suggestions', + }), + ); +} diff --git a/packages/mcp/src/tools/trail-conditions.ts b/packages/mcp/src/tools/trail-conditions.ts index 111f9bd13f..73ccd37cf9 100644 --- a/packages/mcp/src/tools/trail-conditions.ts +++ b/packages/mcp/src/tools/trail-conditions.ts @@ -1,41 +1,50 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call, nowIso } from '../client'; import { CrossingDifficulty, TrailCondition, TrailSurface } from '../enums'; import type { AgentContext } from '../types'; -// ── Tool regex constants ── -const STRIP_HYPHENS = /-/g; - export function registerTrailConditionTools(agent: AgentContext): void { - // ── Get trail conditions ────────────────────────────────────────────────── + // ── List trail condition reports ────────────────────────────────────────── agent.server.registerTool( 'get_trail_conditions', { description: - 'Get user-submitted trail condition reports. Filter by trail name to find reports for a specific trail or area. Reports include overall condition, surface type, hazards, water crossings, and notes.', + 'Get user-submitted trail condition reports. Filter by trail name to find reports for a specific trail or area.', inputSchema: { - trail_name: z + trail_name: z.string().optional(), + limit: z.number().int().min(1).max(100).default(20), + }, + }, + async ({ trail_name, limit }) => + call({ + promise: agent.api.user['trail-conditions'].get({ + query: { trailName: trail_name, limit }, + }), + action: 'list trail conditions', + }), + ); + + // ── List user's own trail reports ───────────────────────────────────────── + + agent.server.registerTool( + 'list_my_trail_reports', + { + description: 'List trail condition reports authored by the signed-in user.', + inputSchema: { + updated_since: z .string() .optional() - .describe('Trail or area name to search for (e.g. "John Muir Trail", "Half Dome")'), - limit: z - .number() - .int() - .min(1) - .max(100) - .default(20) - .describe('Maximum reports to return (default 20)'), + .describe('Only include reports updated after this ISO timestamp'), }, }, - async ({ trail_name, limit }) => { - try { - const data = await agent.api.get('/trail-conditions', { trailName: trail_name, limit }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ updated_since }) => + call({ + promise: agent.api.user['trail-conditions'].mine.get({ + query: updated_since ? { updatedAt: updated_since } : {}, + }), + action: 'list my trail reports', + }), ); // ── Submit trail condition ──────────────────────────────────────────────── @@ -44,36 +53,18 @@ export function registerTrailConditionTools(agent: AgentContext): void { 'submit_trail_condition', { description: - 'Submit a trail condition report to help the community. Provide your observations about current trail surface, overall condition, hazards, and water crossings. Requires user authentication.', + 'Submit a trail condition report to help the community. Requires user authentication.', inputSchema: { - trail_name: z.string().min(1).describe('Name of the trail or area'), - trail_region: z - .string() - .optional() - .describe('Region or state (e.g. "California", "Maine")'), - surface: z.nativeEnum(TrailSurface).describe('Current trail surface type'), - overall_condition: z.nativeEnum(TrailCondition).describe('Overall trail condition'), - hazards: z - .array(z.string()) - .optional() - .describe( - 'List of current hazards (e.g. ["loose rocks", "fallen trees", "slippery surface"])', - ), - water_crossings: z - .number() - .int() - .min(0) - .max(20) - .optional() - .describe('Number of water crossings on the trail (0–20)'), - water_crossing_difficulty: z - .nativeEnum(CrossingDifficulty) - .optional() - .describe('Difficulty of water crossings if present'), - notes: z - .string() - .optional() - .describe('Detailed observations about conditions, hazards, or recommendations'), + trail_name: z.string().min(1), + trail_region: z.string().optional(), + surface: z.nativeEnum(TrailSurface), + overall_condition: z.nativeEnum(TrailCondition), + hazards: z.array(z.string()).optional(), + water_crossings: z.number().int().min(0).max(20).optional(), + water_crossing_difficulty: z.nativeEnum(CrossingDifficulty).optional(), + notes: z.string().optional(), + photos: z.array(z.string()).optional(), + trip_id: z.string().optional(), }, }, async ({ @@ -85,12 +76,12 @@ export function registerTrailConditionTools(agent: AgentContext): void { water_crossings, water_crossing_difficulty, notes, + photos, + trip_id, }) => { - try { - const id = `tcr_${crypto.randomUUID().replace(STRIP_HYPHENS, '').slice(0, 12)}`; - const now = new Date().toISOString(); - const data = await agent.api.post('/trail-conditions', { - id, + const now = nowIso(); + return call({ + promise: agent.api.user['trail-conditions'].post({ trailName: trail_name, trailRegion: trail_region ?? null, surface, @@ -99,14 +90,80 @@ export function registerTrailConditionTools(agent: AgentContext): void { waterCrossings: water_crossings ?? 0, waterCrossingDifficulty: water_crossing_difficulty ?? null, notes: notes ?? null, - photos: [], + photos: photos ?? [], + tripId: trip_id, localCreatedAt: now, localUpdatedAt: now, - }); - return ok(data); - } catch (e) { - return err(e); + }), + action: 'submit trail condition report', + }); + }, + ); + + // ── Update trail report ─────────────────────────────────────────────────── + + agent.server.registerTool( + 'update_trail_condition', + { + description: 'Update one of your own trail condition reports.', + inputSchema: { + report_id: z.string(), + trail_name: z.string().optional(), + trail_region: z.string().nullable().optional(), + surface: z.nativeEnum(TrailSurface).optional(), + overall_condition: z.nativeEnum(TrailCondition).optional(), + hazards: z.array(z.string()).optional(), + water_crossings: z.number().int().min(0).max(20).optional(), + water_crossing_difficulty: z.nativeEnum(CrossingDifficulty).nullable().optional(), + notes: z.string().nullable().optional(), + photos: z.array(z.string()).optional(), + }, + }, + async ({ + report_id, + trail_name, + trail_region, + surface, + overall_condition, + hazards, + water_crossings, + water_crossing_difficulty, + notes, + photos, + }) => { + const body: Record = { localUpdatedAt: nowIso() }; + if (trail_name !== undefined) body.trailName = trail_name; + if (trail_region !== undefined) body.trailRegion = trail_region; + if (surface !== undefined) body.surface = surface; + if (overall_condition !== undefined) body.overallCondition = overall_condition; + if (hazards !== undefined) body.hazards = hazards; + if (water_crossings !== undefined) body.waterCrossings = water_crossings; + if (water_crossing_difficulty !== undefined) { + body.waterCrossingDifficulty = water_crossing_difficulty; } + if (notes !== undefined) body.notes = notes; + if (photos !== undefined) body.photos = photos; + return call({ + promise: agent.api.user['trail-conditions']({ reportId: report_id }).put(body), + action: 'update trail report', + resourceHint: `report ${report_id}`, + }); + }, + ); + + // ── Delete trail report ─────────────────────────────────────────────────── + + agent.server.registerTool( + 'delete_trail_condition', + { + description: 'Soft-delete one of your trail condition reports.', + inputSchema: { report_id: z.string() }, }, + async ({ report_id }) => + call({ + promise: agent.api.user['trail-conditions']({ reportId: report_id }).delete(), + action: 'delete trail report', + resourceHint: `report ${report_id}`, + }), ); } diff --git a/packages/mcp/src/tools/trails.ts b/packages/mcp/src/tools/trails.ts index 0720f9158d..759a937644 100644 --- a/packages/mcp/src/tools/trails.ts +++ b/packages/mcp/src/tools/trails.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call } from '../client'; import type { AgentContext } from '../types'; export function registerTrailTools(agent: AgentContext): void { @@ -9,60 +9,24 @@ export function registerTrailTools(agent: AgentContext): void { 'search_trails', { description: - 'Search outdoor trails and routes from OpenStreetMap. Filter by name, sport type, and/or proximity to a location. Returns { trails: [...], hasMore: boolean } — use hasMore with offset to paginate.', + 'Search outdoor trails and routes from OpenStreetMap. Filter by name, sport type, and/or proximity to a location. Returns { trails, hasMore } — paginate via offset.', inputSchema: { - q: z - .string() - .optional() - .describe('Text to search in route names (e.g. "John Muir Trail", "Pacific Crest")'), - lat: z - .number() - .min(-90) - .max(90) - .optional() - .describe('Latitude for spatial search (requires lon)'), - lon: z - .number() - .min(-180) - .max(180) - .optional() - .describe('Longitude for spatial search (requires lat)'), - radius: z - .number() - .positive() - .max(500) - .optional() - .describe('Search radius in kilometres (default 50, max 500)'), - sport: z - .string() - .optional() - .describe('Filter by sport type: hiking, cycling, skiing, or other OSM sport values'), - limit: z - .number() - .int() - .min(1) - .max(200) - .optional() - .describe('Maximum results to return (default 50)'), - offset: z.number().int().min(0).optional().describe('Pagination offset (default 0)'), + q: z.string().optional(), + lat: z.number().min(-90).max(90).optional(), + lon: z.number().min(-180).max(180).optional(), + radius: z.number().positive().max(500).optional().describe('Radius in km (default 50)'), + sport: z.string().optional(), + limit: z.number().int().min(1).max(200).optional(), + offset: z.number().int().min(0).optional(), }, }, - async ({ q, lat, lon, radius, sport, limit, offset }) => { - try { - const data = await agent.api.get('/trails/search', { - q, - lat, - lon, - radius, - sport, - limit, - offset, - }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ q, lat, lon, radius, sport, limit, offset }) => + call({ + promise: agent.api.user.trails.search.get({ + query: { q, lat, lon, radius, sport, limit, offset }, + }), + action: 'search trails', + }), ); // ── Get trail metadata ──────────────────────────────────────────────────── @@ -71,21 +35,15 @@ export function registerTrailTools(agent: AgentContext): void { 'get_trail', { description: - 'Get metadata for a specific trail by its OSM relation ID. Returns name, sport, difficulty, distance, and bounding box. Does not include full geometry — use get_trail_geometry for that.', - inputSchema: { - osm_id: z - .string() - .describe('OSM relation ID of the route (e.g. "12345678"). Get from search_trails.'), - }, - }, - async ({ osm_id }) => { - try { - const data = await agent.api.get(`/trails/${osm_id}`); - return ok(data); - } catch (e) { - return err(e); - } + 'Get metadata for a specific trail by its OSM relation ID. Returns name, sport, difficulty, distance, and bounding box.', + inputSchema: { osm_id: z.string() }, }, + async ({ osm_id }) => + call({ + promise: agent.api.user.trails({ osmId: osm_id }).get(), + action: 'get trail', + resourceHint: `trail ${osm_id}`, + }), ); // ── Get trail geometry ──────────────────────────────────────────────────── @@ -94,44 +52,14 @@ export function registerTrailTools(agent: AgentContext): void { 'get_trail_geometry', { description: - 'Get the full GeoJSON geometry for a trail. Uses pre-built geometry when available; otherwise stitches it from member OSM ways. May be slow for large routes with many segments.', - inputSchema: { - osm_id: z - .string() - .describe('OSM relation ID of the route (e.g. "12345678"). Get from search_trails.'), - }, - }, - async ({ osm_id }) => { - try { - const data = await agent.api.get(`/trails/${osm_id}/geometry`); - return ok(data); - } catch (e) { - return err(e); - } - }, - ); - - // ── AllTrails preview ───────────────────────────────────────────────────── - - agent.server.registerTool( - 'preview_alltrails_url', - { - description: - 'Fetch trail metadata (title, description, image) from an AllTrails URL using OpenGraph tags. Use this to enrich a trip or pack with information from an AllTrails link a user shares.', - inputSchema: { - url: z - .string() - .url() - .describe('Full AllTrails URL (must be https://alltrails.com/... or a subdomain)'), - }, - }, - async ({ url }) => { - try { - const data = await agent.api.post('/alltrails/preview', { url }); - return ok(data); - } catch (e) { - return err(e); - } + 'Get full GeoJSON geometry for a trail. May be slow for large routes with many segments.', + inputSchema: { osm_id: z.string() }, }, + async ({ osm_id }) => + call({ + promise: agent.api.user.trails({ osmId: osm_id }).geometry.get(), + action: 'get trail geometry', + resourceHint: `trail ${osm_id}`, + }), ); } diff --git a/packages/mcp/src/tools/trips.ts b/packages/mcp/src/tools/trips.ts index adbaa46483..f218051380 100644 --- a/packages/mcp/src/tools/trips.ts +++ b/packages/mcp/src/tools/trips.ts @@ -1,9 +1,12 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call, nowIso } from '../client'; import type { AgentContext } from '../types'; -// ── Tool regex constants ── -const STRIP_HYPHENS = /-/g; +const LocationInput = z.object({ + latitude: z.number().min(-90).max(90), + longitude: z.number().min(-180).max(180), + name: z.string().optional(), +}); export function registerTripTools(agent: AgentContext): void { // ── List trips ──────────────────────────────────────────────────────────── @@ -13,21 +16,9 @@ export function registerTripTools(agent: AgentContext): void { { description: "List all of the user's planned trips. Returns trip summaries including name, destination, dates, and linked pack.", - inputSchema: { - include_public: z - .boolean() - .default(false) - .describe('Include public trips from other users'), - }, - }, - async ({ include_public }) => { - try { - const data = await agent.api.get('/trips', { includePublic: include_public ? 1 : 0 }); - return ok(data); - } catch (e) { - return err(e); - } + inputSchema: {}, }, + async () => call({ promise: agent.api.user.trips.get(), action: 'list trips' }), ); // ── Get trip ────────────────────────────────────────────────────────────── @@ -37,18 +28,14 @@ export function registerTripTools(agent: AgentContext): void { { description: 'Get full details for a single trip including location coordinates, dates, notes, and linked pack information.', - inputSchema: { - trip_id: z.string().describe('The unique trip ID (e.g. "t_abc123")'), - }, - }, - async ({ trip_id }) => { - try { - const data = await agent.api.get(`/trips/${trip_id}`); - return ok(data); - } catch (e) { - return err(e); - } + inputSchema: { trip_id: z.string().describe('The unique trip ID (e.g. "t_abc123")') }, }, + async ({ trip_id }) => + call({ + promise: agent.api.user.trips({ tripId: trip_id }).get(), + action: 'get trip', + resourceHint: `trip ${trip_id}`, + }), ); // ── Create trip ─────────────────────────────────────────────────────────── @@ -61,57 +48,29 @@ export function registerTripTools(agent: AgentContext): void { inputSchema: { name: z.string().min(1).describe('Trip name (e.g. "PCT Section J — Fall 2025")'), description: z.string().optional().describe('Trip description or notes'), - location_name: z - .string() - .optional() - .describe('Human-readable location name (e.g. "John Muir Trail, CA")'), - latitude: z.number().min(-90).max(90).optional().describe('Location latitude'), - longitude: z.number().min(-180).max(180).optional().describe('Location longitude'), - start_date: z - .string() - .optional() - .describe('Trip start date in ISO 8601 format (e.g. "2025-07-15T00:00:00Z")'), - end_date: z - .string() - .optional() - .describe('Trip end date in ISO 8601 format (e.g. "2025-07-22T00:00:00Z")'), + location: LocationInput.optional().describe('Optional structured location'), + start_date: z.string().optional().describe('Trip start date in ISO 8601 format'), + end_date: z.string().optional().describe('Trip end date in ISO 8601 format'), notes: z.string().optional().describe('Planning notes, permits needed, logistics'), pack_id: z.string().optional().describe('Optionally link an existing pack to this trip'), }, }, - async ({ - name, - description, - location_name, - latitude, - longitude, - start_date, - end_date, - notes, - pack_id, - }) => { - try { - const id = `t_${crypto.randomUUID().replace(STRIP_HYPHENS, '').slice(0, 12)}`; - const now = new Date().toISOString(); - const data = await agent.api.post('/trips', { - id, + async ({ name, description, location, start_date, end_date, notes, pack_id }) => { + const now = nowIso(); + return call({ + promise: agent.api.user.trips.post({ name, description, - location: - latitude !== undefined && longitude !== undefined - ? { latitude, longitude, name: location_name } - : null, + location: location ?? null, startDate: start_date, endDate: end_date, notes, packId: pack_id, localCreatedAt: now, localUpdatedAt: now, - }); - return ok(data); - } catch (e) { - return err(e); - } + }), + action: 'create trip', + }); }, ); @@ -122,52 +81,30 @@ export function registerTripTools(agent: AgentContext): void { { description: "Update an existing trip's details, dates, location, or linked pack.", inputSchema: { - trip_id: z.string().describe('The trip ID to update'), - name: z.string().min(1).optional().describe('New trip name'), - description: z.string().optional().nullable().describe('New description'), - location_name: z.string().optional().describe('New location name'), - latitude: z.number().min(-90).max(90).optional().describe('New latitude'), - longitude: z.number().min(-180).max(180).optional().describe('New longitude'), - start_date: z.string().optional().nullable().describe('New start date (ISO 8601)'), - end_date: z.string().optional().nullable().describe('New end date (ISO 8601)'), - notes: z.string().optional().nullable().describe('Updated notes'), - pack_id: z - .string() - .optional() - .nullable() - .describe('New linked pack ID (or null to unlink)'), + trip_id: z.string(), + name: z.string().min(1).optional(), + description: z.string().nullable().optional(), + location: LocationInput.nullable().optional(), + start_date: z.string().nullable().optional(), + end_date: z.string().nullable().optional(), + notes: z.string().nullable().optional(), + pack_id: z.string().nullable().optional(), }, }, - async ({ - trip_id, - name, - description, - location_name, - latitude, - longitude, - start_date, - end_date, - notes, - pack_id, - }) => { - try { - const body: Record = { localUpdatedAt: new Date().toISOString() }; - if (name !== undefined) body.name = name; - if (description !== undefined) body.description = description; - if (start_date !== undefined) body.startDate = start_date; - if (end_date !== undefined) body.endDate = end_date; - if (notes !== undefined) body.notes = notes; - if (pack_id !== undefined) body.packId = pack_id; - if (latitude !== undefined && longitude !== undefined) { - body.location = { latitude, longitude, name: location_name }; - } else if (location_name !== undefined) { - body.location = { name: location_name }; - } - const data = await agent.api.patch(`/trips/${trip_id}`, body); - return ok(data); - } catch (e) { - return err(e); - } + async ({ trip_id, name, description, location, start_date, end_date, notes, pack_id }) => { + const body: Record = { localUpdatedAt: nowIso() }; + if (name !== undefined) body.name = name; + if (description !== undefined) body.description = description; + if (location !== undefined) body.location = location; + if (start_date !== undefined) body.startDate = start_date; + if (end_date !== undefined) body.endDate = end_date; + if (notes !== undefined) body.notes = notes; + if (pack_id !== undefined) body.packId = pack_id; + return call({ + promise: agent.api.user.trips({ tripId: trip_id }).put(body), + action: 'update trip', + resourceHint: `trip ${trip_id}`, + }); }, ); @@ -176,18 +113,14 @@ export function registerTripTools(agent: AgentContext): void { agent.server.registerTool( 'delete_trip', { - description: 'Delete a trip (soft-delete). The trip will no longer appear in listings.', - inputSchema: { - trip_id: z.string().describe('The trip ID to delete'), - }, - }, - async ({ trip_id }) => { - try { - const data = await agent.api.delete(`/trips/${trip_id}`); - return ok(data); - } catch (e) { - return err(e); - } + description: 'Delete a trip. The trip will no longer appear in listings.', + inputSchema: { trip_id: z.string() }, }, + async ({ trip_id }) => + call({ + promise: agent.api.user.trips({ tripId: trip_id }).delete(), + action: 'delete trip', + resourceHint: `trip ${trip_id}`, + }), ); } diff --git a/packages/mcp/src/tools/upload.ts b/packages/mcp/src/tools/upload.ts new file mode 100644 index 0000000000..0da10f7457 --- /dev/null +++ b/packages/mcp/src/tools/upload.ts @@ -0,0 +1,29 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerUploadTools(agent: AgentContext): void { + agent.server.registerTool( + 'upload_image_url', + { + description: + 'Generate a presigned R2 URL the caller can PUT an image to (jpeg/png/webp, ≤10MB). Returns { uploadUrl, key } — use `key` in downstream tools (analyze_pack_image, identify_wildlife, etc.).', + inputSchema: { + file_name: z.string().min(1), + content_type: z.string().min(1), + size: z + .number() + .int() + .min(1) + .max(10 * 1024 * 1024), + }, + }, + async ({ file_name, content_type, size }) => + call({ + promise: agent.api.user.upload.presigned.get({ + query: { fileName: file_name, contentType: content_type, size }, + }), + action: 'create presigned upload URL', + }), + ); +} diff --git a/packages/mcp/src/tools/user.ts b/packages/mcp/src/tools/user.ts new file mode 100644 index 0000000000..3dfaef94ed --- /dev/null +++ b/packages/mcp/src/tools/user.ts @@ -0,0 +1,37 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerUserTools(agent: AgentContext): void { + // ── Profile ─────────────────────────────────────────────────────────────── + + agent.server.registerTool( + 'get_profile', + { + description: "Get the authenticated user's profile (firstName, lastName, email, avatar).", + inputSchema: {}, + }, + async () => call({ promise: agent.api.user.user.profile.get(), action: 'get profile' }), + ); + + agent.server.registerTool( + 'update_profile', + { + description: "Update the authenticated user's profile fields.", + inputSchema: { + first_name: z.string().min(1).optional(), + last_name: z.string().min(1).optional(), + email: z.string().email().optional(), + avatar_url: z.string().url().optional(), + }, + }, + async ({ first_name, last_name, email, avatar_url }) => { + const body: Record = {}; + if (first_name !== undefined) body.firstName = first_name; + if (last_name !== undefined) body.lastName = last_name; + if (email !== undefined) body.email = email; + if (avatar_url !== undefined) body.avatarUrl = avatar_url; + return call({ promise: agent.api.user.user.profile.put(body), action: 'update profile' }); + }, + ); +} diff --git a/packages/mcp/src/tools/weather.ts b/packages/mcp/src/tools/weather.ts index e77c5f1737..ff41923750 100644 --- a/packages/mcp/src/tools/weather.ts +++ b/packages/mcp/src/tools/weather.ts @@ -1,97 +1,79 @@ import { z } from 'zod'; -import { err, ok } from '../client'; +import { call } from '../client'; import type { AgentContext } from '../types'; export function registerWeatherTools(agent: AgentContext): void { - // ── Get weather ─────────────────────────────────────────────────────────── - // The PackRat weather API is a two-step flow: - // 1. GET /weather/search?q= → returns location matches with IDs - // 2. GET /weather/forecast?id= → returns the actual forecast - // This tool combines both steps for a seamless experience. - + // ── Get weather (single API call) ───────────────────────────────────────── agent.server.registerTool( 'get_weather', { description: - 'Get current weather conditions and multi-day forecast for any location. Returns temperature, precipitation, wind, humidity, and outdoor conditions relevant to trip planning. Works with city names, trail names, park names, or coordinates.', + 'Get current weather conditions and multi-day forecast for any location. Returns temperature, precipitation, wind, humidity, and outdoor conditions relevant to trip planning.', inputSchema: { location: z .string() .min(2) - .describe( - 'Location to get weather for. Examples: "Yosemite Valley, CA", "Mt. Whitney Summit", "Seattle, WA", "37.8651,-119.5383"', - ), + .describe('Location to get weather for (city, trail, park, etc.)'), }, }, - async ({ location }) => { - try { - // Step 1: search for the location to get its ID - const searchResults = await agent.api.get>('/weather/search', { - q: location, - }); - - const locationId = - searchResults.id ?? (searchResults.results as Array<{ id: string }>)?.[0]?.id; + async ({ location }) => + call({ + promise: agent.api.user.weather['by-name'].get({ query: { q: location } }), + action: 'fetch weather forecast', + resourceHint: location, + }), + ); - if (!locationId) { - return err(new Error(`No weather location found for: ${location}`)); - } + // ── Search weather location ─────────────────────────────────────────────── - // Step 2: fetch the forecast for that location - const forecast = await agent.api.get('/weather/forecast', { - id: String(locationId), - }); - return ok(forecast); - } catch (e) { - return err(e); - } + agent.server.registerTool( + 'search_weather_location', + { + description: 'Search for weather locations by name. Returns matching locations with IDs.', + inputSchema: { query: z.string().min(2) }, }, + async ({ query }) => + call({ + promise: agent.api.user.weather.search.get({ query: { q: query } }), + action: 'search weather location', + resourceHint: query, + }), ); - // ── Search weather location ─────────────────────────────────────────────── + // ── Search weather location by coordinates ──────────────────────────────── agent.server.registerTool( - 'search_weather_location', + 'search_weather_by_coordinates', { - description: - 'Search for weather locations by name. Returns matching locations with their IDs. Use get_weather instead for a combined search+forecast in one call — use this only if you need to pick from multiple location matches.', + description: 'Find weather locations near a latitude/longitude pair.', inputSchema: { - query: z.string().min(2).describe('Location search query (e.g. "Yosemite", "Seattle, WA")'), + latitude: z.number().min(-90).max(90), + longitude: z.number().min(-180).max(180), }, }, - async ({ query }) => { - try { - const data = await agent.api.get('/weather/search', { q: query }); - return ok(data); - } catch (e) { - return err(e); - } - }, + async ({ latitude, longitude }) => + call({ + promise: agent.api.user.weather['search-by-coordinates'].get({ + query: { lat: latitude, lon: longitude }, + }), + action: 'search weather by coordinates', + }), ); - // ── Season suggestion ───────────────────────────────────────────────────── + // ── Forecast by location id ─────────────────────────────────────────────── agent.server.registerTool( - 'get_season_suggestions', + 'get_weather_forecast', { description: - 'Get AI-powered suggestions for the best seasons to visit a destination and recommended activities per season. Useful for trip planning.', - inputSchema: { - destination: z - .string() - .min(2) - .describe( - 'Destination to get season suggestions for (e.g. "Patagonia", "Zion National Park")', - ), - }, - }, - async ({ destination }) => { - try { - const data = await agent.api.post('/season-suggestions', { destination }); - return ok(data); - } catch (e) { - return err(e); - } + 'Fetch a 10-day forecast given a WeatherAPI location ID (returned by search_weather_location).', + inputSchema: { location_id: z.union([z.string(), z.number()]) }, }, + async ({ location_id }) => + call({ + promise: agent.api.user.weather.forecast.get({ query: { id: String(location_id) } }), + action: 'get weather forecast', + resourceHint: `location ${location_id}`, + }), ); } diff --git a/packages/mcp/src/tools/wildlife.ts b/packages/mcp/src/tools/wildlife.ts new file mode 100644 index 0000000000..f4e9cd0b7d --- /dev/null +++ b/packages/mcp/src/tools/wildlife.ts @@ -0,0 +1,19 @@ +import { z } from 'zod'; +import { call } from '../client'; +import type { AgentContext } from '../types'; + +export function registerWildlifeTools(agent: AgentContext): void { + agent.server.registerTool( + 'identify_wildlife', + { + description: + 'Identify the plant or animal species in an uploaded image (provide the R2 image key from upload_image_url).', + inputSchema: { image_key: z.string() }, + }, + async ({ image_key }) => + call({ + promise: agent.api.user.wildlife.identify.post({ image: image_key }), + action: 'identify wildlife', + }), + ); +} diff --git a/packages/mcp/src/types.ts b/packages/mcp/src/types.ts index 327a608d8e..4aa6db1e50 100644 --- a/packages/mcp/src/types.ts +++ b/packages/mcp/src/types.ts @@ -3,16 +3,57 @@ * * Using a structural interface rather than the concrete PackRatMCP class avoids * the circular dependency: index.ts → tools/* → index.ts. - * PackRatMCP satisfies this interface structurally via its `server` and `api` fields. + * PackRatMCP satisfies this interface structurally via its `server`, `api`, + * `apiBaseUrl`, and `setAdminToken` fields. */ import type { OAuthHelpers } from '@cloudflare/workers-oauth-provider'; import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; -import type { PackRatApiClient } from './client'; +import type { McpClients } from './client'; + +/** Subset of McpServer.registerTool we use — same signature, no narrower types needed downstream. */ +export type RegisterToolFn = McpServer['registerTool']; + +/** + * Wrap `server.registerTool` with a feature-flag gate. The first argument is + * the flag name; the tool is only visible when that flag is enabled. Flag + * names match `MCP_FEATURE_FLAGS` (comma-separated env binding) or the + * runtime-toggled set passed to `setFeatureFlag`. + */ +export type RegisterFlaggedToolFn = < + // The TS types here mirror McpServer['registerTool']; we accept any args after + // the flag name and rely on the SDK to validate downstream. + TArgs extends Parameters, +>(args: { + flag: string; + args: TArgs; +}) => ReturnType; export interface AgentContext { server: McpServer; - api: PackRatApiClient; + /** Eden Treaty clients — `api.user` for the signed-in user, `api.admin` for admin ops. */ + api: McpClients; + /** Base URL of the PackRat API (e.g. "https://packrat.world"). */ + apiBaseUrl: string; + /** Replace the per-session admin token (set by `admin_login`). */ + setAdminToken: (token: string) => void; + /** Toggle a feature flag at runtime (debug / admin-set). */ + setFeatureFlag: (args: { flag: string; enabled: boolean }) => void; + /** + * Register a tool that's only visible when the session holds an admin JWT. + * Has the same signature as `server.registerTool`. The MCP SDK's + * `enable()/disable()` toggles `tools/list_changed` notifications so the + * client's tool list stays in sync. + */ + registerAdminTool: RegisterToolFn; + /** + * Register a tool gated on a named feature flag. The tool is hidden unless + * the flag is present in `MCP_FEATURE_FLAGS` or has been toggled on at + * runtime via `setFeatureFlag`. + */ + registerFlaggedTool: RegisterFlaggedToolFn; + /** Best-effort PackRat user ID (from OAuth props). May be empty for legacy bearer flows. */ + userId?: string; } /** Cloudflare Worker environment bindings */ @@ -27,6 +68,8 @@ export interface Env { OAUTH_PROVIDER: OAuthHelpers; /** Optional pre-shared secret for dynamic client registration */ MCP_INITIAL_ACCESS_TOKEN?: string; + /** Comma-separated feature flags enabled at boot (e.g. "wildlife_id,season_suggestions"). */ + MCP_FEATURE_FLAGS?: string; } /** Properties embedded in OAuth access tokens and passed to API handlers */ @@ -35,4 +78,6 @@ export interface Props { betterAuthToken: string; /** PackRat user ID */ userId: string; + /** Optional admin JWT carried over from a successful admin login. */ + adminToken?: string; } diff --git a/packages/mcp/vitest.config.ts b/packages/mcp/vitest.config.ts index c77be4aa6e..c76e9760b4 100644 --- a/packages/mcp/vitest.config.ts +++ b/packages/mcp/vitest.config.ts @@ -22,7 +22,27 @@ export default defineConfig({ reporter: ['text', 'json-summary', 'json'], reportsDirectory: resolve(__dirname, 'coverage'), include: ['src/**/*.ts'], - exclude: ['src/**/*.test.ts', 'src/**/*.spec.ts', 'src/index.ts'], + exclude: [ + 'src/**/*.test.ts', + 'src/**/*.spec.ts', + // Barrel file (just re-exports) + 'src/index.ts', + // Type definitions — no runtime logic + 'src/types.ts', + // MCP tool/resource/prompt wrappers — API-client-only code, better + // covered by integration tests against a live server + 'src/tools/**', + 'src/resources.ts', + 'src/prompts.ts', + // Auth wrapper (requires live auth token flow) + 'src/auth.ts', + ], + thresholds: { + statements: 95, + branches: 90, + functions: 95, + lines: 95, + }, }, }, }); diff --git a/packages/osm-db/package.json b/packages/osm-db/package.json index b334975ccb..172194d623 100644 --- a/packages/osm-db/package.json +++ b/packages/osm-db/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/osm-db", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { @@ -9,8 +9,8 @@ "default": "./src/index.ts" }, "./*": { - "types": "./src/*", - "default": "./src/*" + "types": "./src/*.ts", + "default": "./src/*.ts" } }, "scripts": { @@ -19,13 +19,13 @@ "db:migrate": "bun run ./migrate.ts" }, "dependencies": { - "@neondatabase/serverless": "^1.0.0", - "drizzle-orm": "^0.45.2", - "pg": "^8.16.3", - "ws": "^8.18.1" + "@neondatabase/serverless": "catalog:", + "drizzle-orm": "catalog:", + "pg": "catalog:", + "ws": "catalog:" }, "devDependencies": { - "drizzle-kit": "^0.31.10", + "drizzle-kit": "catalog:", "typescript": "catalog:" } } diff --git a/packages/osm-import/package.json b/packages/osm-import/package.json index 980e5aa684..58b8e16c4f 100644 --- a/packages/osm-import/package.json +++ b/packages/osm-import/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/osm-import", - "version": "2.0.25", + "version": "2.0.26", "private": true, "description": "osm2pgsql flex config and import tooling for PackRat outdoor routes", "type": "module", @@ -10,6 +10,6 @@ }, "dependencies": { "@packrat/env": "workspace:*", - "pg": "^8.16.3" + "pg": "catalog:" } } diff --git a/packages/overpass/package.json b/packages/overpass/package.json index 9a3cf91048..2b8662a748 100644 --- a/packages/overpass/package.json +++ b/packages/overpass/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/overpass", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { @@ -9,8 +9,8 @@ "default": "./src/index.ts" }, "./*": { - "types": "./src/*", - "default": "./src/*" + "types": "./src/*.ts", + "default": "./src/*.ts" } }, "scripts": { @@ -23,6 +23,6 @@ }, "devDependencies": { "typescript": "catalog:", - "vitest": "~3.1.4" + "vitest": "catalog:" } } diff --git a/packages/overpass/src/builder.test.ts b/packages/overpass/src/builder.test.ts index cb6522804a..c2f51b15fa 100644 --- a/packages/overpass/src/builder.test.ts +++ b/packages/overpass/src/builder.test.ts @@ -14,7 +14,11 @@ describe('TrailQueryBuilder', () => { }); it('ignores sport/name/spatial filters when id is set', () => { - const ql = new TrailQueryBuilder().sport('hiking').around(37.7, -122.4, 50000).id(42).build(); + const ql = new TrailQueryBuilder() + .sport('hiking') + .around({ lat: 37.7, lon: -122.4, radiusM: 50000 }) + .id(42) + .build(); expect(ql).toBe('[out:json][timeout:25];\nrelation(42);\nout geom;'); }); }); @@ -60,19 +64,23 @@ describe('TrailQueryBuilder', () => { describe('around()', () => { it('adds around spatial filter', () => { - const ql = new TrailQueryBuilder().around(37.7749, -122.4194, 50000).build(); + const ql = new TrailQueryBuilder() + .around({ lat: 37.7749, lon: -122.4194, radiusM: 50000 }) + .build(); expect(ql).toContain('(around:50000,37.7749,-122.4194)'); }); it('rounds radius to nearest integer', () => { - const ql = new TrailQueryBuilder().around(0, 0, 12345.6).build(); + const ql = new TrailQueryBuilder().around({ lat: 0, lon: 0, radiusM: 12345.6 }).build(); expect(ql).toContain('(around:12346,0,0)'); }); }); describe('bbox()', () => { it('adds bbox spatial filter', () => { - const ql = new TrailQueryBuilder().bbox(37.5, -122.5, 37.9, -122.1).build(); + const ql = new TrailQueryBuilder() + .bbox({ south: 37.5, west: -122.5, north: 37.9, east: -122.1 }) + .build(); expect(ql).toContain('(37.5,-122.5,37.9,-122.1)'); }); }); @@ -104,7 +112,7 @@ describe('TrailQueryBuilder', () => { const ql = new TrailQueryBuilder() .sport('hiking') .name('JMT') - .around(36.5, -118.5, 100000) + .around({ lat: 36.5, lon: -118.5, radiusM: 100000 }) .build(); expect(ql).toContain( 'relation["type"="route"]["route"="hiking"]["name"~"JMT",i](around:100000,36.5,-118.5)', diff --git a/packages/overpass/src/builder.ts b/packages/overpass/src/builder.ts index 45a2892569..285d20d411 100644 --- a/packages/overpass/src/builder.ts +++ b/packages/overpass/src/builder.ts @@ -28,14 +28,22 @@ export class TrailQueryBuilder { return this; } - // biome-ignore lint/complexity/useMaxParams: geographic coords require 3 args - around(lat: number, lon: number, radiusM: number): this { + around({ lat, lon, radiusM }: { lat: number; lon: number; radiusM: number }): this { this._spatial = `(around:${Math.round(radiusM)},${lat},${lon})`; return this; } - // biome-ignore lint/complexity/useMaxParams: bbox requires 4 coordinate args - bbox(south: number, west: number, north: number, east: number): this { + bbox({ + south, + west, + north, + east, + }: { + south: number; + west: number; + north: number; + east: number; + }): this { this._spatial = `(${south},${west},${north},${east})`; return this; } diff --git a/packages/overpass/src/client.test.ts b/packages/overpass/src/client.test.ts new file mode 100644 index 0000000000..b74b733276 --- /dev/null +++ b/packages/overpass/src/client.test.ts @@ -0,0 +1,134 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; +import { queryOverpass } from './client'; + +const mockFetch = vi.fn(); +let originalFetch: typeof globalThis.fetch; + +beforeEach(() => { + originalFetch = globalThis.fetch; + globalThis.fetch = mockFetch as typeof globalThis.fetch; +}); + +afterEach(() => { + globalThis.fetch = originalFetch; + vi.clearAllMocks(); +}); + +function makeResponse(body: unknown, status = 200) { + const ok = status < 400; + return { + ok, + status, + statusText: ok ? 'OK' : 'Service Unavailable', + json: vi.fn().mockResolvedValue(body), + }; +} + +const validResponse = { + version: 0.6, + generator: 'Overpass API 0.7.61.8 (244012)', + osm3s: { + timestamp_osm_base: '2024-01-01T00:00:00Z', + copyright: 'The data included in this document is from www.openstreetmap.org.', + }, + elements: [ + { + type: 'relation', + id: 12345, + tags: { name: 'Pacific Crest Trail', route: 'hiking' }, + bounds: { minlat: 32.5, minlon: -120.8, maxlat: 49.0, maxlon: -117.1 }, + members: [], + }, + ], +}; + +describe('queryOverpass', () => { + describe('HTTP request construction', () => { + it('sends a POST to the default Overpass endpoint', async () => { + mockFetch.mockResolvedValue(makeResponse(validResponse)); + await queryOverpass('[out:json];relation(12345);out geom;'); + expect(mockFetch).toHaveBeenCalledWith( + 'https://overpass-api.de/api/interpreter', + expect.objectContaining({ method: 'POST' }), + ); + }); + + it('uses a custom endpoint when provided', async () => { + mockFetch.mockResolvedValue(makeResponse(validResponse)); + await queryOverpass('ql', { endpoint: 'https://custom.example.com/api' }); + expect(mockFetch).toHaveBeenCalledWith('https://custom.example.com/api', expect.any(Object)); + }); + + it('encodes the QL query as form-urlencoded body', async () => { + mockFetch.mockResolvedValue(makeResponse(validResponse)); + const ql = '[out:json];relation(42);out geom;'; + await queryOverpass(ql); + const firstCall = mockFetch.mock.calls.at(0) as [string, RequestInit] | undefined; + const init = firstCall?.[1]; + expect(init?.body).toBe(`data=${encodeURIComponent(ql)}`); + }); + + it('sets Content-Type to application/x-www-form-urlencoded', async () => { + mockFetch.mockResolvedValue(makeResponse(validResponse)); + await queryOverpass('ql'); + const firstCall = mockFetch.mock.calls.at(0) as [string, RequestInit] | undefined; + const headers = firstCall?.[1]?.headers as Record | undefined; + expect(headers?.['Content-Type']).toBe('application/x-www-form-urlencoded'); + }); + + it('sets a User-Agent header', async () => { + mockFetch.mockResolvedValue(makeResponse(validResponse)); + await queryOverpass('ql'); + const firstCall = mockFetch.mock.calls.at(0) as [string, RequestInit] | undefined; + const headers = firstCall?.[1]?.headers as Record | undefined; + expect(headers?.['User-Agent']).toBeDefined(); + expect(typeof headers?.['User-Agent']).toBe('string'); + }); + }); + + describe('error handling', () => { + it('throws when response status is not ok (429)', async () => { + mockFetch.mockResolvedValue(makeResponse({}, 429)); + await expect(queryOverpass('ql')).rejects.toThrow( + 'Overpass request failed: 429 Service Unavailable', + ); + }); + + it('throws when response status is not ok (500)', async () => { + mockFetch.mockResolvedValue(makeResponse({}, 500)); + await expect(queryOverpass('ql')).rejects.toThrow( + 'Overpass request failed: 500 Service Unavailable', + ); + }); + + it('throws when response JSON does not match expected schema', async () => { + mockFetch.mockResolvedValue(makeResponse({ unexpected: 'data' })); + await expect(queryOverpass('ql')).rejects.toThrow( + 'Overpass response did not match expected schema', + ); + }); + + it('throws when response is missing elements field', async () => { + mockFetch.mockResolvedValue(makeResponse({ version: 0.6 })); + await expect(queryOverpass('ql')).rejects.toThrow( + 'Overpass response did not match expected schema', + ); + }); + }); + + describe('successful response', () => { + it('returns the parsed response data', async () => { + mockFetch.mockResolvedValue(makeResponse(validResponse)); + const result = await queryOverpass('[out:json];relation(12345);out geom;'); + expect(result.elements).toHaveLength(1); + const [firstElement] = result.elements; + expect(firstElement?.id).toBe(12345); + }); + + it('returns empty elements array for no results', async () => { + mockFetch.mockResolvedValue(makeResponse({ ...validResponse, elements: [] })); + const result = await queryOverpass('ql'); + expect(result.elements).toHaveLength(0); + }); + }); +}); diff --git a/packages/overpass/src/client.ts b/packages/overpass/src/client.ts index 4278060e26..b45e5b986d 100644 --- a/packages/overpass/src/client.ts +++ b/packages/overpass/src/client.ts @@ -8,10 +8,13 @@ export interface OverpassClientConfig { endpoint?: string; } -export async function queryOverpass( - ql: string, - config?: OverpassClientConfig, -): Promise { +export async function queryOverpass({ + ql, + config, +}: { + ql: string; + config?: OverpassClientConfig; +}): Promise { const endpoint = config?.endpoint ?? DEFAULT_ENDPOINT; const response = await fetch(endpoint, { diff --git a/packages/overpass/vitest.config.ts b/packages/overpass/vitest.config.ts index 3eab4a706f..0bc71fe768 100644 --- a/packages/overpass/vitest.config.ts +++ b/packages/overpass/vitest.config.ts @@ -7,5 +7,18 @@ export default defineConfig({ environment: 'node', globals: true, include: [resolve(__dirname, 'src/**/*.test.ts')], + coverage: { + provider: 'v8', + reporter: ['text', 'json-summary'], + reportsDirectory: resolve(__dirname, 'coverage'), + include: ['src/**/*.ts'], + exclude: ['src/**/*.test.ts', 'src/index.ts'], + thresholds: { + statements: 80, + branches: 70, + functions: 80, + lines: 80, + }, + }, }, }); diff --git a/packages/schemas/package.json b/packages/schemas/package.json new file mode 100644 index 0000000000..627dece8c8 --- /dev/null +++ b/packages/schemas/package.json @@ -0,0 +1,28 @@ +{ + "name": "@packrat/schemas", + "version": "0.0.0", + "private": true, + "type": "module", + "exports": { + ".": { + "types": "./src/index.ts", + "default": "./src/index.ts" + }, + "./*": { + "types": "./src/*.ts", + "default": "./src/*.ts" + } + }, + "scripts": { + "check-types": "tsc --noEmit" + }, + "dependencies": { + "@packrat/constants": "workspace:*", + "@packrat/db": "workspace:*", + "@packrat/guards": "workspace:*", + "zod": "catalog:" + }, + "devDependencies": { + "typescript": "catalog:" + } +} diff --git a/packages/schemas/src/admin.ts b/packages/schemas/src/admin.ts new file mode 100644 index 0000000000..17b2fe4a72 --- /dev/null +++ b/packages/schemas/src/admin.ts @@ -0,0 +1,302 @@ +import { z } from 'zod'; + +// ─── Error responses ────────────────────────────────────────────────────────── + +// z.any() mirrors t.Unsafe — Elysia invariance requires the handler return +// type to be assignable to the declared response type, and error bodies frequently +// carry extra fields (e.g. `code`). Using any sidesteps the invariance check the +// same way t.Unsafe did with TypeBox. +const Err = z.any(); +export const AdminErrorResponses = { + 400: Err, + 401: Err, + 404: Err, + 409: Err, + 429: Err, + 500: Err, + 503: Err, +} as const; + +// ─── Stats ──────────────────────────────────────────────────────────────────── + +export const AdminStatsSchema = z.object({ + users: z.number(), + packs: z.number(), + items: z.number(), +}); +export type AdminStats = z.infer; + +// ─── Users ──────────────────────────────────────────────────────────────────── + +export const AdminUserItemSchema = z.object({ + id: z.string(), + email: z.string(), + firstName: z.string().nullable(), + lastName: z.string().nullable(), + role: z.string().nullable(), + emailVerified: z.boolean().nullable(), + avatarUrl: z.string().nullable(), + createdAt: z.string().nullable(), + updatedAt: z.string().nullable(), +}); +export type AdminUserItem = z.infer; + +// ─── Packs ──────────────────────────────────────────────────────────────────── + +export const AdminPackItemSchema = z.object({ + id: z.string(), + name: z.string(), + description: z.string().nullable(), + category: z.string(), + isPublic: z.boolean().nullable(), + isAIGenerated: z.boolean(), + tags: z.array(z.string()).nullable(), + image: z.string().nullable(), + createdAt: z.string().nullable(), + updatedAt: z.string().nullable(), + userEmail: z.string().nullable(), +}); +export type AdminPackItem = z.infer; + +// ─── Catalog ───────────────────────────────────────────────────────────────── + +export const AdminCatalogItemSchema = z.object({ + id: z.number(), + name: z.string(), + description: z.string().nullable(), + categories: z.array(z.string()).nullable(), + brand: z.string().nullable(), + model: z.string().nullable(), + sku: z.string(), + price: z.number().nullable(), + currency: z.string().nullable(), + weight: z.number().nullable(), + weightUnit: z.string().nullable(), + availability: z.string().nullable(), + ratingValue: z.number().nullable(), + reviewCount: z.number().nullable(), + color: z.string().nullable(), + size: z.string().nullable(), + material: z.string().nullable(), + seller: z.string().nullable(), + productUrl: z.string(), + images: z.array(z.string()).nullable(), + variants: z.array(z.object({ attribute: z.string(), values: z.array(z.string()) })).nullable(), + techs: z.record(z.string(), z.string()).nullable(), + links: z.array(z.object({ title: z.string(), url: z.string() })).nullable(), + createdAt: z.string().nullable(), +}); + +// ─── Paginated wrappers ─────────────────────────────────────────────────────── + +const paginated = (item: T) => + z.object({ + data: z.array(item), + total: z.number(), + limit: z.number(), + offset: z.number(), + }); + +export const AdminUsersListSchema = paginated(AdminUserItemSchema); +export const AdminPacksListSchema = paginated(AdminPackItemSchema); +export const AdminCatalogListSchema = paginated(AdminCatalogItemSchema); +export type AdminCatalogItem = z.infer; + +// ─── Mutations ──────────────────────────────────────────────────────────────── + +export const SuccessSchema = z.object({ success: z.literal(true) }); +export const HardDeleteSuccessSchema = z.object({ + success: z.literal(true), + purged: z.literal(true), +}); +export const CatalogUpdateSchema = z.object({ id: z.number(), name: z.string() }); + +// ─── Analytics — Platform ───────────────────────────────────────────────────── + +// Handler defaults period to 'month' and range to 12; keep schema truly +// optional so the Treaty type doesn't mark these as required-with-default. +export const AnalyticsPeriodSchema = z.object({ + period: z.enum(['day', 'week', 'month']).optional(), + range: z.coerce.number().int().min(1).max(365).optional(), +}); + +export const GrowthPointSchema = z.object({ + period: z.string(), + users: z.number(), + packs: z.number(), + catalogItems: z.number(), +}); +export type GrowthPoint = z.infer; + +export const ActivityPointSchema = z.object({ + period: z.string(), + trips: z.number(), + trailReports: z.number(), + posts: z.number(), +}); + +export const ActiveUsersSchema = z.object({ + dau: z.number(), + wau: z.number(), + mau: z.number(), +}); + +export const BreakdownItemSchema = z.object({ category: z.string(), count: z.number() }); + +// ─── Analytics — Catalog ───────────────────────────────────────────────────── + +export const CatalogOverviewSchema = z.object({ + totalItems: z.number(), + totalBrands: z.number(), + avgPrice: z.number().nullable(), + minPrice: z.number().nullable(), + maxPrice: z.number().nullable(), + embeddingCoverage: z.object({ total: z.number(), withEmbedding: z.number(), pct: z.number() }), + availability: z.array(z.object({ status: z.string().nullable(), count: z.number() })), + addedLast30Days: z.number(), +}); + +export const BrandRowSchema = z.object({ + brand: z.string(), + itemCount: z.number(), + avgPrice: z.number().nullable(), + minPrice: z.number().nullable(), + maxPrice: z.number().nullable(), + avgRating: z.number().nullable(), +}); + +export const PriceBucketSchema = z.object({ bucket: z.string(), count: z.number() }); + +export const EtlJobSchema = z.object({ + id: z.string(), + status: z.union([z.literal('running'), z.literal('completed'), z.literal('failed')]), + source: z.string(), + filename: z.string(), + scraperRevision: z.string(), + startedAt: z.string(), + completedAt: z.string().nullable(), + totalProcessed: z.number().nullable(), + totalValid: z.number().nullable(), + totalInvalid: z.number().nullable(), + successRate: z.number().nullable(), +}); + +export const EtlResponseSchema = z.object({ + jobs: z.array(EtlJobSchema), + summary: z.object({ + totalRuns: z.number(), + completed: z.number(), + failed: z.number(), + totalItemsIngested: z.number(), + }), +}); + +export const EmbeddingStatsSchema = z.object({ + total: z.number(), + withEmbedding: z.number(), + pending: z.number(), + coveragePct: z.number(), +}); + +const EtlErrorRowSchema = z.object({ field: z.string(), reason: z.string(), count: z.number() }); + +export const EtlFailureSummarySchema = z.object({ + topErrors: z.array(EtlErrorRowSchema), + totalInvalidItems: z.number(), +}); + +export const EtlJobFailuresSchema = z.object({ + jobId: z.string(), + errorBreakdown: z.array(EtlErrorRowSchema), + samples: z.array( + z.object({ + rowIndex: z.number(), + errors: z.array( + z.object({ + field: z.string(), + reason: z.string(), + value: z.unknown().optional(), + }), + ), + rawData: z.unknown(), + }), + ), + totalShown: z.number(), +}); + +export const EtlResetStuckSchema = z.object({ reset: z.number(), ids: z.array(z.string()) }); + +export const EtlRetrySchema = z.object({ + success: z.literal(true), + newJobId: z.string(), + objectKey: z.string(), +}); + +// ─── Trails ─────────────────────────────────────────────────────────────────── + +export const TrailSearchItemSchema = z.object({ + osmId: z.string(), + name: z.string().nullable(), + sport: z.string().nullable(), + network: z.string().nullable(), + distance: z.string().nullable(), + difficulty: z.string().nullable(), + description: z.string().nullable(), + bbox: z.unknown().nullable(), +}); + +export const TrailSearchResultSchema = z.object({ + trails: z.array(TrailSearchItemSchema), + hasMore: z.boolean(), + offset: z.number(), + limit: z.number(), +}); + +export const TrailGeometrySchema = z.object({ + osmId: z.string(), + name: z.string().nullable(), + sport: z.string().nullable(), + network: z.string().nullable(), + distance: z.string().nullable(), + difficulty: z.string().nullable(), + description: z.string().nullable(), + geometry: z.unknown().nullable(), +}); + +// Named with "Admin" prefix to avoid collision with the user-facing +// TrailConditionReportSchema in packages/schemas/src/trailConditions.ts. +export const AdminTrailConditionReportSchema = z.object({ + id: z.string(), + trailName: z.string(), + trailRegion: z.string().nullable(), + surface: z.string(), + overallCondition: z.string(), + hazards: z.array(z.string()), + waterCrossings: z.number(), + notes: z.string().nullable(), + deleted: z.boolean(), + deletedAt: z.string().nullable(), + createdAt: z.string(), + userId: z.number(), + userEmail: z.string().nullable(), +}); + +export const TrailConditionsListSchema = paginated(AdminTrailConditionReportSchema); + +// ─── Inferred types ─────────────────────────────────────────────────────────── + +export type ActivityPoint = z.infer; +export type BreakdownItem = z.infer; +export type ActiveUsers = z.infer; +export type CatalogOverview = z.infer; +export type BrandRow = z.infer; +export type PriceBucket = z.infer; +export type EtlJob = z.infer; +export type EtlResponse = z.infer; +export type EmbeddingStats = z.infer; +export type EtlFailureSummary = z.infer; +export type EtlJobFailures = z.infer; +export type TrailSearchItem = z.infer; +export type TrailSearchResult = z.infer; +export type TrailGeometry = z.infer; +export type AdminTrailConditionReport = z.infer; diff --git a/packages/api/src/schemas/ai.ts b/packages/schemas/src/ai.ts similarity index 81% rename from packages/api/src/schemas/ai.ts rename to packages/schemas/src/ai.ts index 1b63c5ca22..358da4f7f5 100644 --- a/packages/api/src/schemas/ai.ts +++ b/packages/schemas/src/ai.ts @@ -2,7 +2,8 @@ import { z } from 'zod'; export const RagSearchQuerySchema = z.object({ q: z.string().min(1), - limit: z.coerce.number().int().min(1).max(100).optional().default(5), + // Service applies its own default (5); keep schema truly optional. + limit: z.coerce.number().int().min(1).max(100).optional(), }); export const WebSearchQuerySchema = z.object({ @@ -28,7 +29,3 @@ export const WebSearchResponseSchema = z.object({ answer: z.string(), sources: z.array(z.unknown()), }); - -export const ErrorResponseSchema = z.object({ - error: z.string(), -}); diff --git a/packages/api/src/schemas/auth.ts b/packages/schemas/src/auth.ts similarity index 95% rename from packages/api/src/schemas/auth.ts rename to packages/schemas/src/auth.ts index b6784b07fb..eb89fd44e0 100644 --- a/packages/api/src/schemas/auth.ts +++ b/packages/schemas/src/auth.ts @@ -79,7 +79,7 @@ export const ForgotPasswordResponseSchema = z.object({ export const ResetPasswordRequestSchema = z.object({ email: z.string().email(), - code: z.string().length(5), + code: z.string().length(6), newPassword: z.string().min(8), }); @@ -131,8 +131,3 @@ export const MeResponseSchema = z.object({ emailVerified: z.boolean().nullable(), }), }); - -export const ErrorResponseSchema = z.object({ - error: z.string(), - code: z.string().optional(), -}); diff --git a/packages/api/src/schemas/catalog.ts b/packages/schemas/src/catalog.ts similarity index 82% rename from packages/api/src/schemas/catalog.ts rename to packages/schemas/src/catalog.ts index 7fcef4990b..627dad23d1 100644 --- a/packages/api/src/schemas/catalog.ts +++ b/packages/schemas/src/catalog.ts @@ -1,11 +1,7 @@ -import { WEIGHT_UNITS } from '@packrat/api/types'; +import { WEIGHT_UNITS } from '@packrat/constants'; import { isString } from '@packrat/guards'; import { z } from 'zod'; - -export const ErrorResponseSchema = z.object({ - error: z.string(), - code: z.string().optional(), -}); +import { datetimeString } from './utils'; export const CatalogItemSchema = z.object({ id: z.number().int().positive(), @@ -96,20 +92,8 @@ export const CatalogItemSchema = z.object({ .nullable() .optional(), usageCount: z.number().int().min(0).optional(), - createdAt: z.union([ - z.date(), - z - .string() - .datetime() - .transform((val) => new Date(val)), - ]), - updatedAt: z.union([ - z.date(), - z - .string() - .datetime() - .transform((val) => new Date(val)), - ]), + createdAt: datetimeString, + updatedAt: datetimeString, }); const SortSchema = z.object({ @@ -126,9 +110,13 @@ const SortSchema = z.object({ order: z.enum(['asc', 'desc']), }); +export type CatalogItem = z.infer; + export const CatalogItemsQuerySchema = z.object({ - page: z.coerce.number().int().positive().optional().default(1), - limit: z.coerce.number().int().min(1).max(100).optional().default(20), + // Defaults applied in the handler so Treaty types these as truly optional + // rather than required-with-default (which forces every caller to pass them). + page: z.coerce.number().int().positive().optional(), + limit: z.coerce.number().int().min(1).max(100).optional(), q: z.string().optional(), category: z.string().optional(), // Eden Treaty serializes nested objects as JSON strings in query params. @@ -243,7 +231,7 @@ export const UpdateCatalogItemRequestSchema = z.object({ name: z.string().min(1).max(255).optional(), productUrl: z.string().url().optional(), sku: z.string().optional(), - weight: z.number().optional(), + weight: z.number().positive().optional(), weightUnit: z.enum(WEIGHT_UNITS).optional(), description: z.string().optional(), categories: z.array(z.string()).optional(), @@ -327,8 +315,9 @@ export const CatalogCategoriesResponseSchema = z.array(z.string()); export const VectorSearchQuerySchema = z.object({ q: z.string().min(1), - limit: z.coerce.number().int().min(1).max(50).optional().default(10), - offset: z.coerce.number().int().min(0).optional().default(0), + // Defaults applied in the handler — see CatalogItemsQuerySchema for rationale. + limit: z.coerce.number().int().min(1).max(50).optional(), + offset: z.coerce.number().int().min(0).optional(), }); export const SimilarItemSchema = CatalogItemSchema.extend({ @@ -342,3 +331,33 @@ export const VectorSearchResponseSchema = z.object({ offset: z.number(), nextOffset: z.number(), }); + +export const CatalogCompareRequestSchema = z.object({ + ids: z.array(z.number().int()).min(2).max(10), +}); + +export const CatalogCompareRowSchema = z.object({ + id: z.number().int(), + name: z.string(), + brand: z.string().nullable(), + weight: z.number().nullable(), + weightUnit: z.string().nullable(), + price: z.number().nullable(), + ratingValue: z.number().nullable(), + productUrl: z.string().nullable(), + categories: z.array(z.string()).nullable(), +}); + +export const CatalogCompareResponseSchema = z.object({ + items: z.array(CatalogCompareRowSchema), + lightestId: z.number().int().nullable(), + cheapestId: z.number().int().nullable(), + highestRatedId: z.number().int().nullable(), +}); + +export const CatalogETLSchema = z.object({ + filename: z.string().min(1, 'Filename is required'), + chunks: z.array(z.string()).min(1, 'At least one object key is required'), + source: z.string().min(1, 'Source name is required'), + scraperRevision: z.string().min(1, 'Scraper revision ID is required'), +}); diff --git a/packages/api/src/schemas/chat.ts b/packages/schemas/src/chat.ts similarity index 88% rename from packages/api/src/schemas/chat.ts rename to packages/schemas/src/chat.ts index 9c408b969f..194ffb1134 100644 --- a/packages/api/src/schemas/chat.ts +++ b/packages/schemas/src/chat.ts @@ -1,14 +1,5 @@ import { z } from 'zod'; -export const ErrorResponseSchema = z.object({ - error: z.string(), - code: z.string().optional(), -}); - -export const SuccessResponseSchema = z.object({ - success: z.boolean(), -}); - export const ChatMessageSchema = z.object({ role: z.enum(['user', 'assistant', 'system']), content: z.string(), diff --git a/packages/schemas/src/constants.ts b/packages/schemas/src/constants.ts new file mode 100644 index 0000000000..cc4f3efd60 --- /dev/null +++ b/packages/schemas/src/constants.ts @@ -0,0 +1,12 @@ +import { + AVAILABILITY_VALUES, + ITEM_CATEGORIES, + PACK_CATEGORIES, + WEIGHT_UNITS, +} from '@packrat/constants'; +import { z } from 'zod'; + +export const PackCategorySchema = z.enum(PACK_CATEGORIES); +export const ItemCategorySchema = z.enum(ITEM_CATEGORIES); +export const WeightUnitSchema = z.enum(WEIGHT_UNITS); +export const AvailabilitySchema = z.enum(AVAILABILITY_VALUES); diff --git a/packages/api/src/schemas/feed.ts b/packages/schemas/src/feed.ts similarity index 100% rename from packages/api/src/schemas/feed.ts rename to packages/schemas/src/feed.ts diff --git a/packages/api/src/schemas/guides.ts b/packages/schemas/src/guides.ts similarity index 61% rename from packages/api/src/schemas/guides.ts rename to packages/schemas/src/guides.ts index 25569e8dc9..d84a7dec36 100644 --- a/packages/api/src/schemas/guides.ts +++ b/packages/schemas/src/guides.ts @@ -1,10 +1,6 @@ +import { isString } from '@packrat/guards'; import { z } from 'zod'; -export const ErrorResponseSchema = z.object({ - error: z.string(), - code: z.string().optional(), -}); - export const GuideSchema = z.object({ id: z.string(), key: z.string(), @@ -13,7 +9,11 @@ export const GuideSchema = z.object({ categories: z.array(z.string()).optional(), description: z.string(), author: z.string().optional(), - readingTime: z.number().optional(), + readingTime: z.preprocess((val) => { + if (val === undefined || val === null) return undefined; + const n = isString(val) ? parseFloat(val) : val; + return Number.isFinite(n) ? n : undefined; + }, z.number().optional()), difficulty: z.string().optional(), content: z.string().optional(), createdAt: z.string().datetime(), @@ -25,8 +25,9 @@ export const GuideDetailSchema = GuideSchema.extend({ }); export const GuidesQuerySchema = z.object({ - page: z.coerce.number().int().positive().optional().default(1), - limit: z.coerce.number().int().positive().optional().default(20), + // Defaults applied in the handler so Treaty types these as truly optional. + page: z.coerce.number().int().positive().optional(), + limit: z.coerce.number().int().positive().optional(), category: z.string().optional(), sort: z .object({ @@ -46,8 +47,9 @@ export const GuidesResponseSchema = z.object({ export const GuideSearchQuerySchema = z.object({ q: z.string().min(1), - page: z.coerce.number().int().positive().optional().default(1), - limit: z.coerce.number().int().positive().optional().default(20), + // Defaults applied in the handler so Treaty types these as truly optional. + page: z.coerce.number().int().positive().optional(), + limit: z.coerce.number().int().positive().optional(), category: z.string().optional(), }); @@ -59,3 +61,8 @@ export const GuideSearchResponseSchema = z.object({ totalPages: z.number(), query: z.string(), }); + +export const GuideCategoriesResponseSchema = z.object({ + categories: z.array(z.string()), + count: z.number().int(), +}); diff --git a/packages/api/src/schemas/imageDetection.ts b/packages/schemas/src/imageDetection.ts similarity index 91% rename from packages/api/src/schemas/imageDetection.ts rename to packages/schemas/src/imageDetection.ts index 4d4b399256..ff5e335b28 100644 --- a/packages/api/src/schemas/imageDetection.ts +++ b/packages/schemas/src/imageDetection.ts @@ -19,7 +19,7 @@ export const DetectedItemWithMatchesSchema = z.object({ export const AnalyzeImageRequestSchema = z.object({ image: z.string(), - matchLimit: z.number().int().min(1).max(10).optional().default(3), + matchLimit: z.number().int().min(1).max(10).optional(), }); export const AnalyzeImageResponseSchema = z.array(DetectedItemWithMatchesSchema); diff --git a/packages/schemas/src/index.ts b/packages/schemas/src/index.ts new file mode 100644 index 0000000000..6d315b0ba2 --- /dev/null +++ b/packages/schemas/src/index.ts @@ -0,0 +1,22 @@ +export * from './admin'; +export * from './ai'; +export * from './auth'; +export * from './catalog'; +export * from './chat'; +export * from './constants'; +export * from './feed'; +export * from './guides'; +export * from './imageDetection'; +export * from './packs'; +export * from './packTemplates'; +export * from './seasonSuggestions'; +export * from './shared'; +export * from './trailConditions'; +export * from './trails'; +export * from './trips'; +export * from './upload'; +export * from './users'; +export * from './utils'; +export * from './validation'; +export * from './weather'; +export * from './wildlife'; diff --git a/packages/api/src/schemas/packTemplates.ts b/packages/schemas/src/packTemplates.ts similarity index 77% rename from packages/api/src/schemas/packTemplates.ts rename to packages/schemas/src/packTemplates.ts index 6ffe2de886..445deaa590 100644 --- a/packages/api/src/schemas/packTemplates.ts +++ b/packages/schemas/src/packTemplates.ts @@ -1,11 +1,7 @@ import { z } from 'zod'; +import { datetimeString } from './utils'; -const datetimeString = z.preprocess( - (v) => (v instanceof Date ? v.toISOString() : v), - z.string().datetime(), -); - -export const ErrorResponseSchema = z.object({ +export const PackTemplateErrorResponseSchema = z.object({ error: z.string(), code: z.string().optional(), existingTemplateId: z.string().optional(), @@ -82,10 +78,10 @@ export const CreatePackTemplateItemRequestSchema = z.object({ description: z.string().optional(), weight: z.number().min(0), weightUnit: z.enum(['g', 'kg', 'lb', 'oz']), - quantity: z.number().int().min(1).optional().default(1), + quantity: z.number().int().min(1).optional(), category: z.string().optional(), - consumable: z.boolean().optional().default(false), - worn: z.boolean().optional().default(false), + consumable: z.boolean().optional(), + worn: z.boolean().optional(), image: z.string().nullish(), notes: z.string().optional(), }); @@ -104,13 +100,36 @@ export const UpdatePackTemplateItemRequestSchema = z.object({ deleted: z.boolean().optional(), }); -export const SuccessResponseSchema = z.object({ - success: z.boolean(), -}); - export const GenerateFromOnlineContentRequestSchema = z.object({ contentUrl: z.string().url(), - isAppTemplate: z.boolean().optional().default(true), + isAppTemplate: z.boolean().optional(), }); export const GenerateFromOnlineContentResponseSchema = PackTemplateWithItemsSchema; + +export const AIPackAnalysisItemSchema = z.object({ + name: z.string(), + description: z.string(), + quantity: z.number().int().positive().default(1), + category: z.string(), + weightGrams: z.number().nonnegative().default(0), + consumable: z.boolean().default(false), + worn: z.boolean().default(false), +}); + +export const AIPackAnalysisSchema = z.object({ + templateName: z.string(), + templateCategory: z.enum([ + 'hiking', + 'backpacking', + 'camping', + 'climbing', + 'winter', + 'desert', + 'custom', + 'water sports', + 'skiing', + ]), + templateDescription: z.string(), + items: z.array(AIPackAnalysisItemSchema), +}); diff --git a/packages/api/src/schemas/packs.ts b/packages/schemas/src/packs.ts similarity index 79% rename from packages/api/src/schemas/packs.ts rename to packages/schemas/src/packs.ts index 3414d227da..f9495c95ad 100644 --- a/packages/api/src/schemas/packs.ts +++ b/packages/schemas/src/packs.ts @@ -1,10 +1,6 @@ -import { PACK_CATEGORIES, WEIGHT_UNITS } from '@packrat/api/types'; +import { PACK_CATEGORIES, WEIGHT_UNITS } from '@packrat/constants'; import { z } from 'zod'; - -const datetimeString = z.preprocess( - (v) => (v instanceof Date ? v.toISOString() : v), - z.string().datetime(), -); +import { datetimeString } from './utils'; export const PackItemSchema = z.object({ id: z.string(), @@ -47,16 +43,25 @@ export const PackSchema = z.object({ items: z.array(PackItemSchema).optional(), }); +export const PackWithItemsSchema = PackSchema.extend({ + items: z.array(PackItemSchema), +}); + export const PackWithWeightsSchema = PackSchema.extend({ totalWeight: z.number(), baseWeight: z.number(), }); +export type PackItem = z.infer; +export type Pack = z.infer; +export type PackWithItems = z.infer; +export type PackWithWeights = z.infer; + export const CreatePackRequestSchema = z.object({ name: z.string().min(1).max(255), description: z.string().optional(), category: z.string().optional(), - isPublic: z.boolean().optional().default(false), + isPublic: z.boolean().optional(), image: z.string().nullish(), tags: z.array(z.string()).optional(), }); @@ -78,8 +83,8 @@ export const CreatePackItemRequestSchema = z.object({ weightUnit: z.enum(WEIGHT_UNITS).default('g'), quantity: z.number().int().min(1).default(1), category: z.string().optional(), - consumable: z.boolean().optional().default(false), - worn: z.boolean().optional().default(false), + consumable: z.boolean().optional(), + worn: z.boolean().optional(), image: z.string().nullish(), notes: z.string().nullish(), catalogItemId: z.number().int().nullish(), @@ -120,10 +125,29 @@ export const ItemSuggestionsResponseSchema = z.object({ ), }); +export const PackCategoryBreakdownSchema = z.object({ + category: z.string(), + totalGrams: z.number(), + totalLbs: z.number(), + itemCount: z.number(), + items: z.array(z.string()), +}); + +export const PackWeightBreakdownSchema = z.object({ + packId: z.string(), + totalGrams: z.number(), + baseGrams: z.number(), + wornGrams: z.number(), + consumableGrams: z.number(), + itemCount: z.number(), + byCategory: z.array(PackCategoryBreakdownSchema), +}); + export const GapAnalysisRequestSchema = z.object({ destination: z.string().optional(), tripType: z.string().optional(), - duration: z.string().optional(), + // Duration is days. Coerce so JSON numbers and string form-data both work. + duration: z.coerce.number().int().positive().optional(), startDate: z.string().optional(), endDate: z.string().optional(), }); @@ -150,6 +174,10 @@ export const CreatePackBodySchema = CreatePackRequestSchema.extend({ localUpdatedAt: z.string().datetime(), }); +export const AddPackItemBodySchema = CreatePackItemRequestSchema.extend({ + id: z.string(), +}); + export const UpdatePackBodySchema = UpdatePackRequestSchema.extend({ localUpdatedAt: z.string().datetime().optional(), }); diff --git a/packages/api/src/schemas/seasonSuggestions.ts b/packages/schemas/src/seasonSuggestions.ts similarity index 92% rename from packages/api/src/schemas/seasonSuggestions.ts rename to packages/schemas/src/seasonSuggestions.ts index 9d7813e494..296919c6c2 100644 --- a/packages/api/src/schemas/seasonSuggestions.ts +++ b/packages/schemas/src/seasonSuggestions.ts @@ -32,7 +32,3 @@ export const SeasonSuggestionsResponseSchema = z.object({ location: z.string(), season: z.string(), }); - -export const ErrorResponseSchema = z.object({ - error: z.string(), -}); diff --git a/packages/schemas/src/shared.ts b/packages/schemas/src/shared.ts new file mode 100644 index 0000000000..487097150a --- /dev/null +++ b/packages/schemas/src/shared.ts @@ -0,0 +1,13 @@ +import { z } from 'zod'; + +export const ErrorResponseSchema = z.object({ + error: z.string(), + code: z.string().optional(), +}); + +export const SuccessResponseSchema = z.object({ + success: z.boolean(), +}); + +export type ErrorResponse = z.infer; +export type SuccessResponse = z.infer; diff --git a/packages/api/src/schemas/trailConditions.ts b/packages/schemas/src/trailConditions.ts similarity index 58% rename from packages/api/src/schemas/trailConditions.ts rename to packages/schemas/src/trailConditions.ts index 1dc4254775..e36f13a759 100644 --- a/packages/api/src/schemas/trailConditions.ts +++ b/packages/schemas/src/trailConditions.ts @@ -30,3 +30,26 @@ export const TrailConditionReportSchema = z.object({ }); export type TrailConditionReport = z.infer; + +export const CreateTrailConditionReportRequestSchema = z.object({ + id: z.string().describe('Client-generated report ID'), + trailName: z.string().min(1), + trailRegion: z.string().optional().nullable(), + surface: TrailSurfaceSchema, + overallCondition: OverallConditionSchema, + hazards: z.array(z.string()).optional(), + waterCrossings: z.number().int().min(0).max(20).optional(), + waterCrossingDifficulty: WaterCrossingDifficultySchema.optional().nullable(), + notes: z.string().optional().nullable(), + photos: z.array(z.string()).optional(), + tripId: z.string().optional().nullable(), + localCreatedAt: z.string().datetime(), + localUpdatedAt: z.string().datetime(), +}); + +export const UpdateTrailConditionReportRequestSchema = CreateTrailConditionReportRequestSchema.omit( + { + id: true, + localCreatedAt: true, + }, +).partial(); diff --git a/packages/schemas/src/trails.ts b/packages/schemas/src/trails.ts new file mode 100644 index 0000000000..317762edf2 --- /dev/null +++ b/packages/schemas/src/trails.ts @@ -0,0 +1,30 @@ +import { z } from 'zod'; + +export const OsmMemberSchema = z.object({ + type: z.string(), + ref: z.coerce.bigint(), + role: z.string(), +}); + +export const RouteBaseRowSchema = z.object({ + osm_id: z.string(), + name: z.string().nullable(), + sport: z.string().nullable(), + network: z.string().nullable(), + distance: z.string().nullable(), + difficulty: z.string().nullable(), + description: z.string().nullable(), +}); + +export const RouteSearchRowSchema = RouteBaseRowSchema.extend({ + bbox: z.string().nullable(), +}); + +export const RouteDetailRowSchema = RouteBaseRowSchema.extend({ + members: z.array(OsmMemberSchema).nullable(), + geojson: z.string().nullable(), +}); + +export type OsmMember = z.infer; +export type RouteSearchRow = z.infer; +export type RouteDetailRow = z.infer; diff --git a/packages/api/src/schemas/trips.ts b/packages/schemas/src/trips.ts similarity index 94% rename from packages/api/src/schemas/trips.ts rename to packages/schemas/src/trips.ts index 9e4e301dc1..3e63266c05 100644 --- a/packages/api/src/schemas/trips.ts +++ b/packages/schemas/src/trips.ts @@ -1,9 +1,5 @@ import { z } from 'zod'; - -const datetimeString = z.preprocess( - (v) => (v instanceof Date ? v.toISOString() : v), - z.string().datetime(), -); +import { datetimeString } from './utils'; const nullableDateString = z.preprocess( (v) => (v instanceof Date ? v.toISOString() : v), @@ -33,6 +29,8 @@ export const TripSchema = z.object({ updatedAt: datetimeString.optional(), }); +export type Trip = z.infer; + export const CreateTripBodySchema = z.object({ id: z.string(), name: z.string().min(1).max(255), @@ -58,4 +56,3 @@ export const UpdateTripBodySchema = z.object({ }); export type TripLocation = z.infer; -export type Trip = z.infer; diff --git a/packages/api/src/schemas/upload.ts b/packages/schemas/src/upload.ts similarity index 72% rename from packages/api/src/schemas/upload.ts rename to packages/schemas/src/upload.ts index 04a5b5eb1e..66f5a44258 100644 --- a/packages/api/src/schemas/upload.ts +++ b/packages/schemas/src/upload.ts @@ -1,10 +1,5 @@ import { z } from 'zod'; -export const ErrorResponseSchema = z.object({ - error: z.string(), - code: z.string().optional(), -}); - export const PresignedUploadQuerySchema = z.object({ fileName: z.string().optional(), contentType: z.string().optional(), @@ -13,4 +8,6 @@ export const PresignedUploadQuerySchema = z.object({ export const PresignedUploadResponseSchema = z.object({ url: z.string().url(), + objectKey: z.string(), + publicUrl: z.string().url(), }); diff --git a/packages/api/src/schemas/users.ts b/packages/schemas/src/users.ts similarity index 98% rename from packages/api/src/schemas/users.ts rename to packages/schemas/src/users.ts index a1c1f15bba..3c227220fd 100644 --- a/packages/api/src/schemas/users.ts +++ b/packages/schemas/src/users.ts @@ -19,6 +19,8 @@ export const UserProfileSchema = z.object({ user: UserSchema, }); +export type User = z.infer; + // Update user request schema export const UpdateUserRequestSchema = z.object({ firstName: z.string().optional(), diff --git a/packages/schemas/src/utils.ts b/packages/schemas/src/utils.ts new file mode 100644 index 0000000000..147fe47eae --- /dev/null +++ b/packages/schemas/src/utils.ts @@ -0,0 +1,7 @@ +import { z } from 'zod'; + +// Accepts Date objects from Drizzle at runtime and coerces to ISO string for the wire. +export const datetimeString = z.preprocess( + (v) => (v instanceof Date ? v.toISOString() : v), + z.string().datetime(), +); diff --git a/packages/api/src/types/validation.ts b/packages/schemas/src/validation.ts similarity index 67% rename from packages/api/src/types/validation.ts rename to packages/schemas/src/validation.ts index 872d904e60..1d72a902b2 100644 --- a/packages/api/src/types/validation.ts +++ b/packages/schemas/src/validation.ts @@ -1,10 +1,6 @@ import { z } from 'zod'; -export interface ValidationError { - field: string; - reason: string; - value?: string | number | boolean | null | undefined; -} +export type { ValidationError } from '@packrat/db/validation'; export const ValidationErrorSchema = z.object({ field: z.string(), diff --git a/packages/api/src/schemas/weather.ts b/packages/schemas/src/weather.ts similarity index 98% rename from packages/api/src/schemas/weather.ts rename to packages/schemas/src/weather.ts index 64446deef0..cde62929f1 100644 --- a/packages/api/src/schemas/weather.ts +++ b/packages/schemas/src/weather.ts @@ -1,10 +1,5 @@ import { z } from 'zod'; -export const ErrorResponseSchema = z.object({ - error: z.string(), - code: z.string().optional(), -}); - export const LocationSchema = z.object({ id: z.number(), name: z.string(), @@ -31,6 +26,10 @@ export const WeatherSearchQuerySchema = z.object({ q: z.string().optional(), }); +export const WeatherByNameQuerySchema = z.object({ + q: z.string().min(2), +}); + export const WeatherCoordinateQuerySchema = z.object({ lat: z.string(), lon: z.string(), diff --git a/packages/schemas/src/wildlife.ts b/packages/schemas/src/wildlife.ts new file mode 100644 index 0000000000..cc511a907f --- /dev/null +++ b/packages/schemas/src/wildlife.ts @@ -0,0 +1,5 @@ +import { z } from 'zod'; + +export const WildlifeIdentifyRequestSchema = z.object({ + image: z.string().describe('Uploaded image key in R2'), +}); diff --git a/packages/schemas/tsconfig.json b/packages/schemas/tsconfig.json new file mode 100644 index 0000000000..c942c77e31 --- /dev/null +++ b/packages/schemas/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "bundler", + "strict": true, + "skipLibCheck": true, + "noUncheckedIndexedAccess": true, + "paths": { + "@packrat/db": ["../db/src/index.ts"], + "@packrat/db/*": ["../db/src/*"], + "@packrat/guards": ["../guards/src/index.ts"], + "@packrat/guards/*": ["../guards/src/*"] + } + }, + "include": ["src"] +} diff --git a/packages/types/package.json b/packages/types/package.json new file mode 100644 index 0000000000..236c2df0a4 --- /dev/null +++ b/packages/types/package.json @@ -0,0 +1,21 @@ +{ + "name": "@packrat/types", + "version": "0.0.0", + "private": true, + "type": "module", + "exports": { + ".": "./src/index.ts" + }, + "main": "./src/index.ts", + "types": "./src/index.ts", + "scripts": { + "check-types": "tsc --noEmit" + }, + "dependencies": { + "@packrat/constants": "workspace:*", + "@packrat/schemas": "workspace:*" + }, + "devDependencies": { + "typescript": "catalog:" + } +} diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts new file mode 100644 index 0000000000..ef145c9afb --- /dev/null +++ b/packages/types/src/index.ts @@ -0,0 +1,13 @@ +export type { + Availability, + ItemCategory, + ItemLink, + ItemReview, + PackCategory, + WeightUnit, +} from '@packrat/constants'; +export type { CatalogItem } from '@packrat/schemas/catalog'; +export type { Pack, PackItem, PackWithItems, PackWithWeights } from '@packrat/schemas/packs'; +export type { TrailConditionReport } from '@packrat/schemas/trailConditions'; +export type { Trip } from '@packrat/schemas/trips'; +export type { User } from '@packrat/schemas/users'; diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json new file mode 100644 index 0000000000..a086b149de --- /dev/null +++ b/packages/types/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src" + }, + "include": ["src"] +} diff --git a/packages/units/package.json b/packages/units/package.json index db8c411890..82caf137fa 100644 --- a/packages/units/package.json +++ b/packages/units/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/units", - "version": "0.1.0", + "version": "2.0.26", "private": true, "type": "module", "exports": { @@ -13,10 +13,11 @@ "test:coverage": "vitest run --coverage" }, "dependencies": { + "@packrat/constants": "workspace:*", "@packrat/guards": "workspace:*" }, "devDependencies": { "convert-units": "3.0.0-beta.8", - "vitest": "~3.1.4" + "vitest": "catalog:" } } diff --git a/packages/units/src/index.test.ts b/packages/units/src/index.test.ts index 85654b2784..656fb4411c 100644 --- a/packages/units/src/index.test.ts +++ b/packages/units/src/index.test.ts @@ -52,49 +52,49 @@ describe('WEIGHT_UNITS', () => { describe('normalize (→ grams)', () => { it('g is a no-op', () => { - expect(normalize(100, 'g')).toBe(100); - expect(normalize(0, 'g')).toBe(0); - expect(normalize(1, 'g')).toBe(1); - expect(normalize(0.001, 'g')).toBe(0.001); + expect(normalize({ weight: 100, unit: 'g' })).toBe(100); + expect(normalize({ weight: 0, unit: 'g' })).toBe(0); + expect(normalize({ weight: 1, unit: 'g' })).toBe(1); + expect(normalize({ weight: 0.001, unit: 'g' })).toBe(0.001); }); it('kg → g: 1 kg = 1000 g exactly', () => { - expect(normalize(1, 'kg')).toBe(KG_TO_G); - expect(normalize(2.5, 'kg')).toBe(2500); - expect(normalize(0.5, 'kg')).toBe(500); - expect(normalize(0.001, 'kg')).toBeCloseTo(1, 10); - expect(normalize(10, 'kg')).toBe(10_000); - expect(normalize(100, 'kg')).toBe(100_000); + expect(normalize({ weight: 1, unit: 'kg' })).toBe(KG_TO_G); + expect(normalize({ weight: 2.5, unit: 'kg' })).toBe(2500); + expect(normalize({ weight: 0.5, unit: 'kg' })).toBe(500); + expect(normalize({ weight: 0.001, unit: 'kg' })).toBeCloseTo(1, 10); + expect(normalize({ weight: 10, unit: 'kg' })).toBe(10_000); + expect(normalize({ weight: 100, unit: 'kg' })).toBe(100_000); }); it('oz → g: 1 oz = 28.349523125 g (NIST exact)', () => { - expect(normalize(1, 'oz')).toBe(OZ_TO_G); - expect(normalize(2, 'oz')).toBeCloseTo(OZ_TO_G * 2, 8); - expect(normalize(0.5, 'oz')).toBeCloseTo(OZ_TO_G * 0.5, 8); - expect(normalize(16, 'oz')).toBeCloseTo(LB_TO_G, 8); // 1 lb worth of oz - expect(normalize(8, 'oz')).toBeCloseTo(LB_TO_G / 2, 8); - expect(normalize(32, 'oz')).toBeCloseTo(LB_TO_G * 2, 8); + expect(normalize({ weight: 1, unit: 'oz' })).toBe(OZ_TO_G); + expect(normalize({ weight: 2, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 2, 8); + expect(normalize({ weight: 0.5, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.5, 8); + expect(normalize({ weight: 16, unit: 'oz' })).toBeCloseTo(LB_TO_G, 8); // 1 lb worth of oz + expect(normalize({ weight: 8, unit: 'oz' })).toBeCloseTo(LB_TO_G / 2, 8); + expect(normalize({ weight: 32, unit: 'oz' })).toBeCloseTo(LB_TO_G * 2, 8); }); it('lb → g: 1 lb = 453.59237 g (NIST exact)', () => { - expect(normalize(1, 'lb')).toBe(LB_TO_G); - expect(normalize(2, 'lb')).toBe(LB_TO_G * 2); - expect(normalize(0.5, 'lb')).toBeCloseTo(LB_TO_G * 0.5, 8); - expect(normalize(3, 'lb')).toBeCloseTo(LB_TO_G * 3, 8); - expect(normalize(10, 'lb')).toBeCloseTo(LB_TO_G * 10, 5); + expect(normalize({ weight: 1, unit: 'lb' })).toBe(LB_TO_G); + expect(normalize({ weight: 2, unit: 'lb' })).toBe(LB_TO_G * 2); + expect(normalize({ weight: 0.5, unit: 'lb' })).toBeCloseTo(LB_TO_G * 0.5, 8); + expect(normalize({ weight: 3, unit: 'lb' })).toBeCloseTo(LB_TO_G * 3, 8); + expect(normalize({ weight: 10, unit: 'lb' })).toBeCloseTo(LB_TO_G * 10, 5); }); it('handles fractional ultralight gear weights', () => { - expect(normalize(0.1, 'oz')).toBeCloseTo(OZ_TO_G * 0.1, 8); - expect(normalize(0.25, 'oz')).toBeCloseTo(OZ_TO_G * 0.25, 8); - expect(normalize(0.3, 'oz')).toBeCloseTo(OZ_TO_G * 0.3, 8); - expect(normalize(0.5, 'oz')).toBeCloseTo(OZ_TO_G * 0.5, 8); // ultralight stake - expect(normalize(3.2, 'oz')).toBeCloseTo(OZ_TO_G * 3.2, 5); // water filter + expect(normalize({ weight: 0.1, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.1, 8); + expect(normalize({ weight: 0.25, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.25, 8); + expect(normalize({ weight: 0.3, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.3, 8); + expect(normalize({ weight: 0.5, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.5, 8); // ultralight stake + expect(normalize({ weight: 3.2, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 3.2, 5); // water filter }); it('handles typical backpacking item weights', () => { // Common gear weights in ounces - const oz = (w: number) => normalize(w, 'oz'); + const oz = (w: number) => normalize({ weight: w, unit: 'oz' }); expect(oz(1.0)).toBeCloseTo(OZ_TO_G, 5); // headlamp expect(oz(4.1)).toBeCloseTo(OZ_TO_G * 4.1, 4); // rain jacket expect(oz(8.0)).toBeCloseTo(OZ_TO_G * 8.0, 4); // sleeping pad @@ -102,14 +102,14 @@ describe('normalize (→ grams)', () => { expect(oz(48.0)).toBeCloseTo(OZ_TO_G * 48.0, 4); // 3-lb tent = 48 oz // Common gear weights in lbs - const lb = (w: number) => normalize(w, 'lb'); + const lb = (w: number) => normalize({ weight: w, unit: 'lb' }); expect(lb(1.0)).toBeCloseTo(LB_TO_G, 5); expect(lb(1.5)).toBeCloseTo(LB_TO_G * 1.5, 4); expect(lb(2.5)).toBeCloseTo(LB_TO_G * 2.5, 4); expect(lb(4.0)).toBeCloseTo(LB_TO_G * 4.0, 4); // Common gear weights in kg - const kg = (w: number) => normalize(w, 'kg'); + const kg = (w: number) => normalize({ weight: w, unit: 'kg' }); expect(kg(0.8)).toBeCloseTo(800, 5); expect(kg(1.1)).toBeCloseTo(1100, 5); expect(kg(1.5)).toBeCloseTo(1500, 5); @@ -117,28 +117,28 @@ describe('normalize (→ grams)', () => { }); it('handles zero for all units', () => { - expect(normalize(0, 'g')).toBe(0); - expect(normalize(0, 'oz')).toBe(0); - expect(normalize(0, 'lb')).toBe(0); - expect(normalize(0, 'kg')).toBe(0); + expect(normalize({ weight: 0, unit: 'g' })).toBe(0); + expect(normalize({ weight: 0, unit: 'oz' })).toBe(0); + expect(normalize({ weight: 0, unit: 'lb' })).toBe(0); + expect(normalize({ weight: 0, unit: 'kg' })).toBe(0); }); it('handles very small weights', () => { - expect(normalize(0.001, 'oz')).toBeCloseTo(OZ_TO_G * 0.001, 10); - expect(normalize(0.001, 'lb')).toBeCloseTo(LB_TO_G * 0.001, 10); - expect(normalize(0.001, 'kg')).toBeCloseTo(1, 10); + expect(normalize({ weight: 0.001, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 0.001, 10); + expect(normalize({ weight: 0.001, unit: 'lb' })).toBeCloseTo(LB_TO_G * 0.001, 10); + expect(normalize({ weight: 0.001, unit: 'kg' })).toBeCloseTo(1, 10); }); it('handles very large weights', () => { - expect(normalize(1000, 'kg')).toBe(1_000_000); - expect(normalize(1000, 'lb')).toBeCloseTo(LB_TO_G * 1000, 2); - expect(normalize(1000, 'oz')).toBeCloseTo(OZ_TO_G * 1000, 2); + expect(normalize({ weight: 1000, unit: 'kg' })).toBe(1_000_000); + expect(normalize({ weight: 1000, unit: 'lb' })).toBeCloseTo(LB_TO_G * 1000, 2); + expect(normalize({ weight: 1000, unit: 'oz' })).toBeCloseTo(OZ_TO_G * 1000, 2); }); it('handles negative weights (sign preserving)', () => { - expect(normalize(-1, 'kg')).toBe(-1000); - expect(normalize(-1, 'oz')).toBe(-OZ_TO_G); - expect(normalize(-1, 'lb')).toBe(-LB_TO_G); + expect(normalize({ weight: -1, unit: 'kg' })).toBe(-1000); + expect(normalize({ weight: -1, unit: 'oz' })).toBe(-OZ_TO_G); + expect(normalize({ weight: -1, unit: 'lb' })).toBe(-LB_TO_G); }); }); @@ -148,48 +148,48 @@ describe('normalize (→ grams)', () => { describe('fromGrams (grams →)', () => { it('g is a no-op', () => { - expect(fromGrams(100, 'g')).toBe(100); - expect(fromGrams(0, 'g')).toBe(0); - expect(fromGrams(1, 'g')).toBe(1); + expect(fromGrams({ grams: 100, unit: 'g' })).toBe(100); + expect(fromGrams({ grams: 0, unit: 'g' })).toBe(0); + expect(fromGrams({ grams: 1, unit: 'g' })).toBe(1); }); it('g → kg', () => { - expect(fromGrams(KG_TO_G, 'kg')).toBe(1); - expect(fromGrams(500, 'kg')).toBe(0.5); - expect(fromGrams(2500, 'kg')).toBe(2.5); - expect(fromGrams(100, 'kg')).toBe(0.1); - expect(fromGrams(1, 'kg')).toBe(0.001); - expect(fromGrams(1_000_000, 'kg')).toBe(1000); + expect(fromGrams({ grams: KG_TO_G, unit: 'kg' })).toBe(1); + expect(fromGrams({ grams: 500, unit: 'kg' })).toBe(0.5); + expect(fromGrams({ grams: 2500, unit: 'kg' })).toBe(2.5); + expect(fromGrams({ grams: 100, unit: 'kg' })).toBe(0.1); + expect(fromGrams({ grams: 1, unit: 'kg' })).toBe(0.001); + expect(fromGrams({ grams: 1_000_000, unit: 'kg' })).toBe(1000); }); it('g → oz: 28.349523125 g = 1 oz (NIST exact)', () => { - expect(fromGrams(OZ_TO_G, 'oz')).toBe(1); - expect(fromGrams(OZ_TO_G * 2, 'oz')).toBeCloseTo(2, 10); - expect(fromGrams(OZ_TO_G * 0.5, 'oz')).toBeCloseTo(0.5, 10); - expect(fromGrams(OZ_TO_G * 16, 'oz')).toBeCloseTo(16, 8); - expect(fromGrams(0, 'oz')).toBe(0); - expect(fromGrams(1_000_000, 'oz')).toBeCloseTo(35273.96, 1); + expect(fromGrams({ grams: OZ_TO_G, unit: 'oz' })).toBe(1); + expect(fromGrams({ grams: OZ_TO_G * 2, unit: 'oz' })).toBeCloseTo(2, 10); + expect(fromGrams({ grams: OZ_TO_G * 0.5, unit: 'oz' })).toBeCloseTo(0.5, 10); + expect(fromGrams({ grams: OZ_TO_G * 16, unit: 'oz' })).toBeCloseTo(16, 8); + expect(fromGrams({ grams: 0, unit: 'oz' })).toBe(0); + expect(fromGrams({ grams: 1_000_000, unit: 'oz' })).toBeCloseTo(35273.96, 1); }); it('g → lb: 453.59237 g = 1 lb (NIST exact)', () => { - expect(fromGrams(LB_TO_G, 'lb')).toBe(1); - expect(fromGrams(LB_TO_G * 2, 'lb')).toBeCloseTo(2, 10); - expect(fromGrams(LB_TO_G * 0.5, 'lb')).toBeCloseTo(0.5, 10); - expect(fromGrams(1000, 'lb')).toBeCloseTo(1000 / LB_TO_G, 10); - expect(fromGrams(0, 'lb')).toBe(0); - expect(fromGrams(1_000_000, 'lb')).toBeCloseTo(2204.62, 0); + expect(fromGrams({ grams: LB_TO_G, unit: 'lb' })).toBe(1); + expect(fromGrams({ grams: LB_TO_G * 2, unit: 'lb' })).toBeCloseTo(2, 10); + expect(fromGrams({ grams: LB_TO_G * 0.5, unit: 'lb' })).toBeCloseTo(0.5, 10); + expect(fromGrams({ grams: 1000, unit: 'lb' })).toBeCloseTo(1000 / LB_TO_G, 10); + expect(fromGrams({ grams: 0, unit: 'lb' })).toBe(0); + expect(fromGrams({ grams: 1_000_000, unit: 'lb' })).toBeCloseTo(2204.62, 0); }); it('handles very small gram values', () => { - expect(fromGrams(1, 'kg')).toBe(0.001); - expect(fromGrams(1, 'oz')).toBeCloseTo(1 / OZ_TO_G, 8); - expect(fromGrams(1, 'lb')).toBeCloseTo(1 / LB_TO_G, 8); + expect(fromGrams({ grams: 1, unit: 'kg' })).toBe(0.001); + expect(fromGrams({ grams: 1, unit: 'oz' })).toBeCloseTo(1 / OZ_TO_G, 8); + expect(fromGrams({ grams: 1, unit: 'lb' })).toBeCloseTo(1 / LB_TO_G, 8); }); it('handles negative grams', () => { - expect(fromGrams(-1000, 'kg')).toBe(-1); - expect(fromGrams(-OZ_TO_G, 'oz')).toBeCloseTo(-1, 10); - expect(fromGrams(-LB_TO_G, 'lb')).toBeCloseTo(-1, 10); + expect(fromGrams({ grams: -1000, unit: 'kg' })).toBe(-1); + expect(fromGrams({ grams: -OZ_TO_G, unit: 'oz' })).toBeCloseTo(-1, 10); + expect(fromGrams({ grams: -LB_TO_G, unit: 'lb' })).toBeCloseTo(-1, 10); }); }); @@ -208,8 +208,8 @@ describe('normalize / fromGrams round-trips', () => { for (const unit of units) { for (const weight of testWeights) { it(`${weight} ${unit} → g → ${unit} round-trips exactly`, () => { - const grams = normalize(weight, unit); - const back = fromGrams(grams, unit); + const grams = normalize({ weight: weight, unit: unit }); + const back = fromGrams({ grams: grams, unit: unit }); expect(back).toBeCloseTo(weight, 10); }); } @@ -222,62 +222,83 @@ describe('normalize / fromGrams round-trips', () => { describe('convert', () => { it('same unit returns input unchanged (no float ops)', () => { - expect(packratConvert(5, 'g', 'g')).toBe(5); - expect(packratConvert(5, 'oz', 'oz')).toBe(5); - expect(packratConvert(5, 'lb', 'lb')).toBe(5); - expect(packratConvert(5, 'kg', 'kg')).toBe(5); - expect(packratConvert(0, 'oz', 'oz')).toBe(0); + expect(packratConvert({ weight: 5, units: { from: 'g', to: 'g' } })).toBe(5); + expect(packratConvert({ weight: 5, units: { from: 'oz', to: 'oz' } })).toBe(5); + expect(packratConvert({ weight: 5, units: { from: 'lb', to: 'lb' } })).toBe(5); + expect(packratConvert({ weight: 5, units: { from: 'kg', to: 'kg' } })).toBe(5); + expect(packratConvert({ weight: 0, units: { from: 'oz', to: 'oz' } })).toBe(0); }); it('oz → lb: 16 oz = 1 lb', () => { - expect(packratConvert(16, 'oz', 'lb')).toBeCloseTo(1, 10); - expect(packratConvert(8, 'oz', 'lb')).toBeCloseTo(0.5, 10); - expect(packratConvert(32, 'oz', 'lb')).toBeCloseTo(2, 10); + expect(packratConvert({ weight: 16, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(1, 10); + expect(packratConvert({ weight: 8, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(0.5, 10); + expect(packratConvert({ weight: 32, units: { from: 'oz', to: 'lb' } })).toBeCloseTo(2, 10); }); it('lb → oz: 1 lb = 16 oz', () => { - expect(packratConvert(1, 'lb', 'oz')).toBeCloseTo(16, 10); - expect(packratConvert(0.5, 'lb', 'oz')).toBeCloseTo(8, 10); - expect(packratConvert(2, 'lb', 'oz')).toBeCloseTo(32, 10); + expect(packratConvert({ weight: 1, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(16, 10); + expect(packratConvert({ weight: 0.5, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(8, 10); + expect(packratConvert({ weight: 2, units: { from: 'lb', to: 'oz' } })).toBeCloseTo(32, 10); }); it('kg → lb: 1 kg ≈ 2.20462 lb', () => { - expect(packratConvert(1, 'kg', 'lb')).toBeCloseTo(2.20462, 4); - expect(packratConvert(2, 'kg', 'lb')).toBeCloseTo(4.40924, 4); - expect(packratConvert(0.5, 'kg', 'lb')).toBeCloseTo(1.10231, 4); + expect(packratConvert({ weight: 1, units: { from: 'kg', to: 'lb' } })).toBeCloseTo(2.20462, 4); + expect(packratConvert({ weight: 2, units: { from: 'kg', to: 'lb' } })).toBeCloseTo(4.40924, 4); + expect(packratConvert({ weight: 0.5, units: { from: 'kg', to: 'lb' } })).toBeCloseTo( + 1.10231, + 4, + ); }); it('lb → kg: 1 lb ≈ 0.453592 kg', () => { - expect(packratConvert(1, 'lb', 'kg')).toBeCloseTo(0.453592, 5); - expect(packratConvert(2.2046, 'lb', 'kg')).toBeCloseTo(1, 3); - expect(packratConvert(10, 'lb', 'kg')).toBeCloseTo(4.53592, 4); + expect(packratConvert({ weight: 1, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(0.453592, 5); + expect(packratConvert({ weight: 2.2046, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(1, 3); + expect(packratConvert({ weight: 10, units: { from: 'lb', to: 'kg' } })).toBeCloseTo(4.53592, 4); }); it('g → oz and back', () => { - expect(packratConvert(OZ_TO_G, 'g', 'oz')).toBeCloseTo(1, 10); - expect(packratConvert(100, 'g', 'oz')).toBeCloseTo(100 / OZ_TO_G, 8); - expect(packratConvert(1000, 'g', 'oz')).toBeCloseTo(1000 / OZ_TO_G, 6); + expect(packratConvert({ weight: OZ_TO_G, units: { from: 'g', to: 'oz' } })).toBeCloseTo(1, 10); + expect(packratConvert({ weight: 100, units: { from: 'g', to: 'oz' } })).toBeCloseTo( + 100 / OZ_TO_G, + 8, + ); + expect(packratConvert({ weight: 1000, units: { from: 'g', to: 'oz' } })).toBeCloseTo( + 1000 / OZ_TO_G, + 6, + ); }); it('g → kg and back', () => { - expect(packratConvert(1000, 'g', 'kg')).toBe(1); - expect(packratConvert(500, 'g', 'kg')).toBe(0.5); - expect(packratConvert(1, 'kg', 'g')).toBe(1000); + expect(packratConvert({ weight: 1000, units: { from: 'g', to: 'kg' } })).toBe(1); + expect(packratConvert({ weight: 500, units: { from: 'g', to: 'kg' } })).toBe(0.5); + expect(packratConvert({ weight: 1, units: { from: 'kg', to: 'g' } })).toBe(1000); }); it('g → lb and back', () => { - expect(packratConvert(LB_TO_G, 'g', 'lb')).toBeCloseTo(1, 10); - expect(packratConvert(100, 'g', 'lb')).toBeCloseTo(100 / LB_TO_G, 8); + expect(packratConvert({ weight: LB_TO_G, units: { from: 'g', to: 'lb' } })).toBeCloseTo(1, 10); + expect(packratConvert({ weight: 100, units: { from: 'g', to: 'lb' } })).toBeCloseTo( + 100 / LB_TO_G, + 8, + ); }); it('kg → oz', () => { - expect(packratConvert(1, 'kg', 'oz')).toBeCloseTo(1000 / OZ_TO_G, 5); - expect(packratConvert(0.5, 'kg', 'oz')).toBeCloseTo(500 / OZ_TO_G, 5); + expect(packratConvert({ weight: 1, units: { from: 'kg', to: 'oz' } })).toBeCloseTo( + 1000 / OZ_TO_G, + 5, + ); + expect(packratConvert({ weight: 0.5, units: { from: 'kg', to: 'oz' } })).toBeCloseTo( + 500 / OZ_TO_G, + 5, + ); }); it('oz → kg', () => { - expect(packratConvert(1, 'oz', 'kg')).toBeCloseTo(OZ_TO_G / 1000, 8); - expect(packratConvert(35.274, 'oz', 'kg')).toBeCloseTo(1, 2); + expect(packratConvert({ weight: 1, units: { from: 'oz', to: 'kg' } })).toBeCloseTo( + OZ_TO_G / 1000, + 8, + ); + expect(packratConvert({ weight: 35.274, units: { from: 'oz', to: 'kg' } })).toBeCloseTo(1, 2); }); it('all 12 unit pairs are round-trip exact at weight = 42', () => { @@ -296,16 +317,16 @@ describe('convert', () => { ['kg', 'oz'], ]; for (const [a, b] of pairs) { - const converted = packratConvert(42, a, b); - const back = packratConvert(converted, b, a); + const converted = packratConvert({ weight: 42, units: { from: a, to: b } }); + const back = packratConvert({ weight: converted, units: { from: b, to: a } }); expect(back).toBeCloseTo(42, 10); } }); it('round-trips multiple weights for oz↔lb', () => { for (const oz of [0.5, 1, 2, 4, 8, 16, 32, 64]) { - const lb = packratConvert(oz, 'oz', 'lb'); - const back = packratConvert(lb, 'lb', 'oz'); + const lb = packratConvert({ weight: oz, units: { from: 'oz', to: 'lb' } }); + const back = packratConvert({ weight: lb, units: { from: 'lb', to: 'oz' } }); expect(back).toBeCloseTo(oz, 10); } }); @@ -317,55 +338,40 @@ describe('convert', () => { describe('displayWeight', () => { it('rounds to 2 decimal places by default', () => { - expect(displayWeight(normalize(100, 'oz'), 'oz')).toBe(100); - expect(displayWeight(normalize(1.5, 'lb'), 'lb')).toBe(1.5); - expect(displayWeight(normalize(2.5, 'kg'), 'kg')).toBe(2.5); + expect(displayWeight({ grams: normalize({ weight: 100, unit: 'oz' }), unit: 'oz' })).toBe(100); + expect(displayWeight({ grams: normalize({ weight: 1.5, unit: 'lb' }), unit: 'lb' })).toBe(1.5); + expect(displayWeight({ grams: normalize({ weight: 2.5, unit: 'kg' }), unit: 'kg' })).toBe(2.5); }); it('strips trailing zeros', () => { - expect(displayWeight(1000, 'kg')).toBe(1); // not 1.00 - expect(displayWeight(LB_TO_G, 'lb')).toBe(1); // not 1.00 - expect(displayWeight(500, 'kg')).toBe(0.5); // not 0.50 - }); - - it('respects precision = 0', () => { - expect(displayWeight(100, 'g', 0)).toBe(100); - expect(displayWeight(28.7, 'g', 0)).toBe(29); - }); - - it('respects precision = 1', () => { - expect(displayWeight(1234.56, 'g', 1)).toBe(1234.6); - expect(displayWeight(normalize(1.23, 'oz'), 'oz', 1)).toBe(1.2); - }); - - it('respects precision = 4', () => { - expect(displayWeight(OZ_TO_G, 'oz', 4)).toBe(1); - expect(displayWeight(100, 'g', 4)).toBe(100); + expect(displayWeight({ grams: 1000, unit: 'kg' })).toBe(1); // not 1.00 + expect(displayWeight({ grams: LB_TO_G, unit: 'lb' })).toBe(1); // not 1.00 + expect(displayWeight({ grams: 500, unit: 'kg' })).toBe(0.5); // not 0.50 }); it('handles typical backpacking display values', () => { // 3.2 oz water filter - const grams = normalize(3.2, 'oz'); - expect(displayWeight(grams, 'oz')).toBe(3.2); + const grams = normalize({ weight: 3.2, unit: 'oz' }); + expect(displayWeight({ grams: grams, unit: 'oz' })).toBe(3.2); // 1.1 kg tent displayed in kg - const tentG = normalize(1.1, 'kg'); - expect(displayWeight(tentG, 'kg')).toBe(1.1); + const tentG = normalize({ weight: 1.1, unit: 'kg' }); + expect(displayWeight({ grams: tentG, unit: 'kg' })).toBe(1.1); // tent in lb ≈ 2.43 - expect(displayWeight(tentG, 'lb')).toBeCloseTo(2.43, 1); + expect(displayWeight({ grams: tentG, unit: 'lb' })).toBeCloseTo(2.43, 1); }); it('handles ultralight items', () => { // 0.5 oz stake → 14.17 g - const stakeG = normalize(0.5, 'oz'); - expect(displayWeight(stakeG, 'oz')).toBe(0.5); - expect(displayWeight(stakeG, 'g')).toBeCloseTo(14.17, 1); + const stakeG = normalize({ weight: 0.5, unit: 'oz' }); + expect(displayWeight({ grams: stakeG, unit: 'oz' })).toBe(0.5); + expect(displayWeight({ grams: stakeG, unit: 'g' })).toBeCloseTo(14.17, 1); }); it('zero weight displays as 0', () => { - expect(displayWeight(0, 'oz')).toBe(0); - expect(displayWeight(0, 'lb')).toBe(0); - expect(displayWeight(0, 'kg')).toBe(0); - expect(displayWeight(0, 'g')).toBe(0); + expect(displayWeight({ grams: 0, unit: 'oz' })).toBe(0); + expect(displayWeight({ grams: 0, unit: 'lb' })).toBe(0); + expect(displayWeight({ grams: 0, unit: 'kg' })).toBe(0); + expect(displayWeight({ grams: 0, unit: 'g' })).toBe(0); }); it('round-trips through normalize: displayWeight(normalize(w, u), u) = w for clean values', () => { @@ -379,7 +385,7 @@ describe('displayWeight', () => { [250, 'g'], ]; for (const [w, u] of cases) { - expect(displayWeight(normalize(w, u), u)).toBe(w); + expect(displayWeight({ grams: normalize({ weight: w, unit: u }), unit: u })).toBe(w); } }); }); @@ -394,105 +400,129 @@ describe('cross-validation against convert-units library', () => { it('normalize g→g matches convert-units', () => { for (const w of [1, 10, 100, 500, 1000]) { - expect(normalize(w, 'g')).toBe(w); // trivially same + expect(normalize({ weight: w, unit: 'g' })).toBe(w); // trivially same } }); it('normalize kg→g matches convert-units', () => { for (const w of [0.1, 0.5, 1, 1.5, 2, 5, 10]) { const expected = convert(w).from('kg').to('g') as number; - expect(normalize(w, 'kg')).toBeCloseTo(expected, 2); + expect(normalize({ weight: w, unit: 'kg' })).toBeCloseTo(expected, 2); } }); it('normalize oz→g matches convert-units', () => { for (const w of [0.5, 1, 2, 4, 8, 16, 24, 32]) { const expected = convert(w).from('oz').to('g') as number; - expect(normalize(w, 'oz')).toBeCloseTo(expected, 2); + expect(normalize({ weight: w, unit: 'oz' })).toBeCloseTo(expected, 2); } }); it('normalize lb→g matches convert-units', () => { for (const w of [0.5, 1, 1.5, 2, 2.5, 4, 10]) { const expected = convert(w).from('lb').to('g') as number; - expect(normalize(w, 'lb')).toBeCloseTo(expected, 2); + expect(normalize({ weight: w, unit: 'lb' })).toBeCloseTo(expected, 2); } }); it('fromGrams g→kg matches convert-units', () => { for (const g of [100, 500, 1000, 2500, 5000]) { const expected = convert(g).from('g').to('kg') as number; - expect(fromGrams(g, 'kg')).toBeCloseTo(expected, 5); + expect(fromGrams({ grams: g, unit: 'kg' })).toBeCloseTo(expected, 5); } }); it('fromGrams g→oz matches convert-units', () => { for (const g of [28.35, 100, 200, 500, 1000]) { const expected = convert(g).from('g').to('oz') as number; - expect(fromGrams(g, 'oz')).toBeCloseTo(expected, 2); + expect(fromGrams({ grams: g, unit: 'oz' })).toBeCloseTo(expected, 2); } }); it('fromGrams g→lb matches convert-units', () => { for (const g of [100, 227, 453, 907, 1814]) { const expected = convert(g).from('g').to('lb') as number; - expect(fromGrams(g, 'lb')).toBeCloseTo(expected, 2); + expect(fromGrams({ grams: g, unit: 'lb' })).toBeCloseTo(expected, 2); } }); it('packratConvert oz→lb matches convert-units', () => { for (const oz of [1, 4, 8, 12, 16, 32]) { const expected = convert(oz).from('oz').to('lb') as number; - expect(packratConvert(oz, 'oz', 'lb')).toBeCloseTo(expected, 4); + expect(packratConvert({ weight: oz, units: { from: 'oz', to: 'lb' } })).toBeCloseTo( + expected, + 4, + ); } }); it('packratConvert lb→oz matches convert-units', () => { for (const lb of [0.5, 1, 1.5, 2, 3, 5]) { const expected = convert(lb).from('lb').to('oz') as number; - expect(packratConvert(lb, 'lb', 'oz')).toBeCloseTo(expected, 4); + expect(packratConvert({ weight: lb, units: { from: 'lb', to: 'oz' } })).toBeCloseTo( + expected, + 4, + ); } }); it('packratConvert kg→lb matches convert-units', () => { for (const kg of [0.5, 1, 1.5, 2, 5, 10]) { const expected = convert(kg).from('kg').to('lb') as number; - expect(packratConvert(kg, 'kg', 'lb')).toBeCloseTo(expected, 3); + expect(packratConvert({ weight: kg, units: { from: 'kg', to: 'lb' } })).toBeCloseTo( + expected, + 3, + ); } }); it('packratConvert lb→kg matches convert-units', () => { for (const lb of [1, 2.2046, 5, 10, 22.046]) { const expected = convert(lb).from('lb').to('kg') as number; - expect(packratConvert(lb, 'lb', 'kg')).toBeCloseTo(expected, 3); + expect(packratConvert({ weight: lb, units: { from: 'lb', to: 'kg' } })).toBeCloseTo( + expected, + 3, + ); } }); it('packratConvert kg→oz matches convert-units', () => { for (const kg of [0.5, 1, 2, 5]) { const expected = convert(kg).from('kg').to('oz') as number; - expect(packratConvert(kg, 'kg', 'oz')).toBeCloseTo(expected, 2); + expect(packratConvert({ weight: kg, units: { from: 'kg', to: 'oz' } })).toBeCloseTo( + expected, + 2, + ); } }); it('packratConvert oz→kg matches convert-units', () => { for (const oz of [1, 8, 16, 35.274]) { const expected = convert(oz).from('oz').to('kg') as number; - expect(packratConvert(oz, 'oz', 'kg')).toBeCloseTo(expected, 4); + expect(packratConvert({ weight: oz, units: { from: 'oz', to: 'kg' } })).toBeCloseTo( + expected, + 4, + ); } }); it('packratConvert g→oz matches convert-units', () => { for (const g of [28.35, 100, 226.8, 453.6, 1000]) { const expected = convert(g).from('g').to('oz') as number; - expect(packratConvert(g, 'g', 'oz')).toBeCloseTo(expected, 2); + expect(packratConvert({ weight: g, units: { from: 'g', to: 'oz' } })).toBeCloseTo( + expected, + 2, + ); } }); it('packratConvert g→lb matches convert-units', () => { for (const g of [100, 227, 454, 907, 2268]) { const expected = convert(g).from('g').to('lb') as number; - expect(packratConvert(g, 'g', 'lb')).toBeCloseTo(expected, 4); + expect(packratConvert({ weight: g, units: { from: 'g', to: 'lb' } })).toBeCloseTo( + expected, + 4, + ); } }); }); @@ -514,13 +544,13 @@ describe('pack calculation scenarios', () => { { weight: 2, unit: 'oz' as const }, { weight: 3, unit: 'oz' as const }, ]; - const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); - const totalLb = fromGrams(totalG, 'lb'); + const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); + const totalLb = fromGrams({ grams: totalG, unit: 'lb' }); // Should be roughly 4–6 lbs for a solid ultralight kit expect(totalLb).toBeGreaterThan(3.5); expect(totalLb).toBeLessThan(7); // Cross-validate display - expect(displayWeight(totalG, 'lb')).toBeGreaterThan(3.5); + expect(displayWeight({ grams: totalG, unit: 'lb' })).toBeGreaterThan(3.5); }); it('baseweight vs total weight: consumables excluded from base', () => { @@ -532,13 +562,13 @@ describe('pack calculation scenarios', () => { ]; const baseG = items .filter((i) => !i.consumable) - .reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); - const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); - const baseKg = fromGrams(baseG, 'kg'); + .reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); + const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); + const baseKg = fromGrams({ grams: baseG, unit: 'kg' }); // base = 500g + 1.5lb = 500 + 680.38 = 1180.38g ≈ 1.18 kg expect(baseKg).toBeCloseTo(1.18, 1); // total = base + 4lb of consumables = 1180.38 + 1814.37 ≈ 2994.75g - expect(displayWeight(totalG, 'lb')).toBeCloseTo(6.6, 0); + expect(displayWeight({ grams: totalG, unit: 'lb' })).toBeCloseTo(6.6, 0); expect(baseG).toBeLessThan(totalG); }); @@ -550,7 +580,7 @@ describe('pack calculation scenarios', () => { ]; const baseG = items .filter((i) => !i.worn) - .reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); + .reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); expect(baseG).toBe(800); }); @@ -562,19 +592,19 @@ describe('pack calculation scenarios', () => { { weight: 1, unit: 'lb' as const }, // 453.6g { weight: 100, unit: 'g' as const }, // 100g ]; - const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); + const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); // Expected: 1000 + 453.59 + 453.59 + 100 = 2007.18g expect(totalG).toBeCloseTo(2007.18, 0); - expect(displayWeight(totalG, 'kg')).toBeCloseTo(2.01, 1); - expect(displayWeight(totalG, 'lb')).toBeCloseTo(4.42, 1); + expect(displayWeight({ grams: totalG, unit: 'kg' })).toBeCloseTo(2.01, 1); + expect(displayWeight({ grams: totalG, unit: 'lb' })).toBeCloseTo(4.42, 1); }); it('quantity multiplier applies correctly', () => { // 8 stakes × 0.5 oz each = 4 oz = ~113.4g const stakes = { weight: 0.5, unit: 'oz' as const, quantity: 8 }; - const totalG = normalize(stakes.weight, stakes.unit) * stakes.quantity; + const totalG = normalize({ weight: stakes.weight, unit: stakes.unit }) * stakes.quantity; expect(totalG).toBeCloseTo(OZ_TO_G * 4, 5); - expect(displayWeight(totalG, 'oz')).toBe(4); + expect(displayWeight({ grams: totalG, unit: 'oz' })).toBe(4); }); it('category percentage calculation', () => { @@ -583,8 +613,8 @@ describe('pack calculation scenarios', () => { { weight: 300, unit: 'g' as const }, // 300g { weight: 200, unit: 'g' as const }, // 200g ]; - const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); - const pcts = items.map((i) => (normalize(i.weight, i.unit) / totalG) * 100); + const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); + const pcts = items.map((i) => (normalize({ weight: i.weight, unit: i.unit }) / totalG) * 100); expect(pcts[0]).toBeCloseTo(50, 5); expect(pcts[1]).toBeCloseTo(30, 5); expect(pcts[2]).toBeCloseTo(20, 5); @@ -596,10 +626,10 @@ describe('pack calculation scenarios', () => { const item0 = { weight: 1, unit: 'kg' as const }; const item1 = { weight: 500, unit: 'g' as const }; const items = [item0, item1]; - const totalG = items.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); + const totalG = items.reduce((sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), 0); // 1000g / 1500g = 66.7%, 500g / 1500g = 33.3% - const pct0 = (normalize(item0.weight, item0.unit) / totalG) * 100; - const pct1 = (normalize(item1.weight, item1.unit) / totalG) * 100; + const pct0 = (normalize({ weight: item0.weight, unit: item0.unit }) / totalG) * 100; + const pct1 = (normalize({ weight: item1.weight, unit: item1.unit }) / totalG) * 100; expect(pct0).toBeCloseTo(66.67, 1); expect(pct1).toBeCloseTo(33.33, 1); // Same percentages regardless of whether we display in oz, lb, kg @@ -618,8 +648,11 @@ describe('pack calculation scenarios', () => { { name: 'stove', weight: 3, unit: 'oz' as const }, { name: 'headlamp', weight: 1.5, unit: 'oz' as const }, ]; - const totalG = baseItems.reduce((sum, i) => sum + normalize(i.weight, i.unit), 0); - const totalLb = fromGrams(totalG, 'lb'); + const totalG = baseItems.reduce( + (sum, i) => sum + normalize({ weight: i.weight, unit: i.unit }), + 0, + ); + const totalLb = fromGrams({ grams: totalG, unit: 'lb' }); // This kit should be in the 10–18 lb base weight range for a typical AT hiker expect(totalLb).toBeGreaterThan(8); expect(totalLb).toBeLessThan(20); @@ -636,42 +669,42 @@ describe('numeric edge cases', () => { }); it('normalize then fromGrams is identity for exact NIST values', () => { - expect(fromGrams(normalize(1, 'oz'), 'oz')).toBe(1); - expect(fromGrams(normalize(1, 'lb'), 'lb')).toBe(1); - expect(fromGrams(normalize(1, 'kg'), 'kg')).toBe(1); + expect(fromGrams({ grams: normalize({ weight: 1, unit: 'oz' }), unit: 'oz' })).toBe(1); + expect(fromGrams({ grams: normalize({ weight: 1, unit: 'lb' }), unit: 'lb' })).toBe(1); + expect(fromGrams({ grams: normalize({ weight: 1, unit: 'kg' }), unit: 'kg' })).toBe(1); }); it('0.1 kg precision (common UI input)', () => { // User enters "0.1 kg" — must not drift - expect(normalize(0.1, 'kg')).toBe(100); - expect(fromGrams(100, 'kg')).toBe(0.1); + expect(normalize({ weight: 0.1, unit: 'kg' })).toBe(100); + expect(fromGrams({ grams: 100, unit: 'kg' })).toBe(0.1); }); it('very precise sub-gram weights', () => { - const mg = normalize(0.001, 'g'); // 0.001 g = 1 mg + const mg = normalize({ weight: 0.001, unit: 'g' }); // 0.001 g = 1 mg expect(mg).toBe(0.001); - expect(fromGrams(mg, 'g')).toBe(0.001); + expect(fromGrams({ grams: mg, unit: 'g' })).toBe(0.001); }); it('large pack weight 50 lb does not overflow', () => { - const g = normalize(50, 'lb'); + const g = normalize({ weight: 50, unit: 'lb' }); expect(g).toBeCloseTo(LB_TO_G * 50, 2); - expect(fromGrams(g, 'lb')).toBeCloseTo(50, 8); + expect(fromGrams({ grams: g, unit: 'lb' })).toBeCloseTo(50, 8); }); it('convert same-unit short-circuits (no floating point ops)', () => { // IEEE 754 exact: if from===to we return the input directly const w = 1 / 3; // irrational in float - expect(packratConvert(w, 'oz', 'oz')).toBe(w); // toBe = same reference value - expect(packratConvert(w, 'lb', 'lb')).toBe(w); - expect(packratConvert(w, 'kg', 'kg')).toBe(w); - expect(packratConvert(w, 'g', 'g')).toBe(w); + expect(packratConvert({ weight: w, units: { from: 'oz', to: 'oz' } })).toBe(w); // toBe = same reference value + expect(packratConvert({ weight: w, units: { from: 'lb', to: 'lb' } })).toBe(w); + expect(packratConvert({ weight: w, units: { from: 'kg', to: 'kg' } })).toBe(w); + expect(packratConvert({ weight: w, units: { from: 'g', to: 'g' } })).toBe(w); }); it('16 oz equals 1 lb through convert', () => { // 16 oz → lb must equal exactly 1 lb → oz → lb - const via_oz = packratConvert(16, 'oz', 'lb'); - const direct = packratConvert(1, 'lb', 'lb'); + const via_oz = packratConvert({ weight: 16, units: { from: 'oz', to: 'lb' } }); + const direct = packratConvert({ weight: 1, units: { from: 'lb', to: 'lb' } }); expect(via_oz).toBeCloseTo(direct, 10); }); }); @@ -750,39 +783,39 @@ describe('isWeightUnit', () => { describe('parseWeightUnit', () => { it('returns the unit unchanged for all four valid units', () => { - expect(parseWeightUnit('g')).toBe('g'); - expect(parseWeightUnit('kg')).toBe('kg'); - expect(parseWeightUnit('oz')).toBe('oz'); - expect(parseWeightUnit('lb')).toBe('lb'); + expect(parseWeightUnit({ value: 'g' })).toBe('g'); + expect(parseWeightUnit({ value: 'kg' })).toBe('kg'); + expect(parseWeightUnit({ value: 'oz' })).toBe('oz'); + expect(parseWeightUnit({ value: 'lb' })).toBe('lb'); }); it('falls back to g by default for invalid input', () => { - expect(parseWeightUnit('lbs')).toBe('g'); - expect(parseWeightUnit('KG')).toBe('g'); - expect(parseWeightUnit('stone')).toBe('g'); - expect(parseWeightUnit(null)).toBe('g'); - expect(parseWeightUnit(undefined)).toBe('g'); - expect(parseWeightUnit('')).toBe('g'); - expect(parseWeightUnit(42)).toBe('g'); - expect(parseWeightUnit({})).toBe('g'); + expect(parseWeightUnit({ value: 'lbs' })).toBe('g'); + expect(parseWeightUnit({ value: 'KG' })).toBe('g'); + expect(parseWeightUnit({ value: 'stone' })).toBe('g'); + expect(parseWeightUnit({ value: null })).toBe('g'); + expect(parseWeightUnit({ value: undefined })).toBe('g'); + expect(parseWeightUnit({ value: '' })).toBe('g'); + expect(parseWeightUnit({ value: 42 })).toBe('g'); + expect(parseWeightUnit({ value: {} })).toBe('g'); }); it('uses the provided fallback for all four valid fallback units', () => { - expect(parseWeightUnit('invalid', 'oz')).toBe('oz'); - expect(parseWeightUnit('invalid', 'lb')).toBe('lb'); - expect(parseWeightUnit('invalid', 'kg')).toBe('kg'); - expect(parseWeightUnit('invalid', 'g')).toBe('g'); + expect(parseWeightUnit({ value: 'invalid', fallback: 'oz' })).toBe('oz'); + expect(parseWeightUnit({ value: 'invalid', fallback: 'lb' })).toBe('lb'); + expect(parseWeightUnit({ value: 'invalid', fallback: 'kg' })).toBe('kg'); + expect(parseWeightUnit({ value: 'invalid', fallback: 'g' })).toBe('g'); }); it('does not apply fallback when input is valid', () => { - expect(parseWeightUnit('oz', 'lb')).toBe('oz'); // valid → ignore fallback - expect(parseWeightUnit('kg', 'oz')).toBe('kg'); + expect(parseWeightUnit({ value: 'oz', fallback: 'lb' })).toBe('oz'); // valid → ignore fallback + expect(parseWeightUnit({ value: 'kg', fallback: 'oz' })).toBe('kg'); }); it('handles real-world API inputs that may come as null/undefined', () => { // Simulating JSON parse of user preferences not yet set const prefs: Record = {}; - expect(parseWeightUnit(prefs.weightUnit)).toBe('g'); - expect(parseWeightUnit(prefs.weightUnit, 'lb')).toBe('lb'); + expect(parseWeightUnit({ value: prefs.weightUnit })).toBe('g'); + expect(parseWeightUnit({ value: prefs.weightUnit, fallback: 'lb' })).toBe('lb'); }); }); diff --git a/packages/units/src/index.ts b/packages/units/src/index.ts index 1a21806cde..90d22012b5 100644 --- a/packages/units/src/index.ts +++ b/packages/units/src/index.ts @@ -1,5 +1,8 @@ +import { WEIGHT_UNITS, type WeightUnit } from '@packrat/constants'; import { isString } from '@packrat/guards'; +export { WEIGHT_UNITS, type WeightUnit }; + // Exact avoirdupois values per NIST. These constants are the single source of // truth for all weight math in the monorepo — do not inline elsewhere. const TO_GRAMS = { @@ -9,40 +12,41 @@ const TO_GRAMS = { lb: 453.59237, } as const; -export const WEIGHT_UNITS = Object.freeze(['g', 'oz', 'kg', 'lb'] as const); - -export type WeightUnit = keyof typeof TO_GRAMS; - /** * Normalize a weight value to grams. * Use this before summing items with mixed units. */ -export function normalize(weight: number, unit: WeightUnit): number { +export function normalize({ weight, unit }: { weight: number; unit: WeightUnit }): number { return weight * TO_GRAMS[unit]; } /** * Convert grams back to a target unit. */ -export function fromGrams(grams: number, unit: WeightUnit): number { +export function fromGrams({ grams, unit }: { grams: number; unit: WeightUnit }): number { return grams / TO_GRAMS[unit]; } /** * Convert directly between any two weight units. */ -export function convert(weight: number, from: WeightUnit, to: WeightUnit): number { - if (from === to) return weight; - return (weight * TO_GRAMS[from]) / TO_GRAMS[to]; +export function convert({ + weight, + units, +}: { + weight: number; + units: { from: WeightUnit; to: WeightUnit }; +}): number { + if (units.from === units.to) return weight; + return (weight * TO_GRAMS[units.from]) / TO_GRAMS[units.to]; } /** - * Format a gram value for display in the given unit. - * Returns a number rounded to `precision` decimal places (default 2). + * Format a gram value for display in the given unit, rounded to 2 decimal places. * Use this for all weight display — never roll your own toFixed. */ -export function displayWeight(grams: number, unit: WeightUnit, precision = 2): number { - return parseFloat(fromGrams(grams, unit).toFixed(precision)); +export function displayWeight({ grams, unit }: { grams: number; unit: WeightUnit }): number { + return parseFloat(fromGrams({ grams, unit }).toFixed(2)); } /** @@ -55,6 +59,12 @@ export function isWeightUnit(value: unknown): value is WeightUnit { /** * Parse an untrusted string into a WeightUnit, falling back to the default. */ -export function parseWeightUnit(value: unknown, fallback: WeightUnit = 'g'): WeightUnit { +export function parseWeightUnit({ + value, + fallback = 'g', +}: { + value: unknown; + fallback?: WeightUnit; +}): WeightUnit { return isWeightUnit(value) ? value : fallback; } diff --git a/packages/web-ui/package.json b/packages/web-ui/package.json index a161968978..9d89487890 100644 --- a/packages/web-ui/package.json +++ b/packages/web-ui/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/web-ui", - "version": "2.0.25", + "version": "2.0.26", "private": true, "type": "module", "exports": { @@ -45,32 +45,32 @@ "@radix-ui/react-toggle": "catalog:", "@radix-ui/react-toggle-group": "catalog:", "@radix-ui/react-tooltip": "catalog:", - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "cmdk": "1.1.1", - "embla-carousel-react": "8.6.0", - "input-otp": "1.4.1", - "lucide-react": "^1.8.0", - "next-themes": "^0.4.6", - "react-day-picker": "9.14.0", - "react-hook-form": "^7.58.1", - "react-resizable-panels": "^4.10.0", - "recharts": "3.8.1", - "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0", - "tailwindcss-animate": "^1.0.7", - "vaul": "^1.1.2" + "class-variance-authority": "catalog:", + "clsx": "catalog:", + "cmdk": "catalog:", + "embla-carousel-react": "catalog:", + "input-otp": "catalog:", + "lucide-react": "catalog:", + "next-themes": "catalog:", + "react-day-picker": "catalog:", + "react-hook-form": "catalog:", + "react-resizable-panels": "catalog:", + "recharts": "catalog:", + "sonner": "catalog:", + "tailwind-merge": "catalog:", + "tailwindcss-animate": "catalog:", + "vaul": "catalog:" }, "devDependencies": { - "@types/react": "~19.2.10", + "@types/react": "catalog:", "react": "catalog:", - "recharts": "3.8.1", + "recharts": "catalog:", "tailwindcss": "catalog:", "typescript": "catalog:" }, "peerDependencies": { "react": "catalog:", - "recharts": "3.8.1", + "recharts": "catalog:", "tailwindcss": "catalog:" } } diff --git a/packages/web-ui/src/components/chart.tsx b/packages/web-ui/src/components/chart.tsx index 2f70efc25c..b78a6fc1eb 100644 --- a/packages/web-ui/src/components/chart.tsx +++ b/packages/web-ui/src/components/chart.tsx @@ -157,9 +157,12 @@ const ChartTooltipContent = React.forwardRef {payload.map((item, index) => { const key = `${nameKey ?? item.name ?? item.dataKey ?? 'value'}`; - const itemConfig = getPayloadConfigFromPayload(config, { - payload: item, - key, + const itemConfig = getPayloadConfigFromPayload({ + config, + opts: { + payload: item, + key, + }, }); const indicatorColor = color ?? item.payload?.fill ?? item.color; @@ -303,9 +309,12 @@ const ChartLegendContent = React.forwardRef {payload.map((item, index) => { const key = `${nameKey ?? item.dataKey ?? 'value'}`; - const itemConfig = getPayloadConfigFromPayload(config, { - payload: item, - key, + const itemConfig = getPayloadConfigFromPayload({ + config, + opts: { + payload: item, + key, + }, }); return ( @@ -336,7 +345,13 @@ const ChartLegendContent = React.forwardRef { toastTimeouts.set(toastId, timeout); }; -export const reducer = (state: State, action: Action): State => { +export const reducer = ({ state, action }: { state: State; action: Action }): State => { switch (action.type) { case 'ADD_TOAST': return { @@ -128,7 +128,7 @@ const listeners: Array<(state: State) => void> = []; let memoryState: State = { toasts: [] }; function dispatch(action: Action) { - memoryState = reducer(memoryState, action); + memoryState = reducer({ state: memoryState, action }); for (const listener of listeners) { listener(memoryState); } diff --git a/scripts/check-all.ts b/scripts/check-all.ts index 8bba7e6e46..154784955a 100644 --- a/scripts/check-all.ts +++ b/scripts/check-all.ts @@ -4,6 +4,7 @@ // // Runs the following checks in parallel and prints a unified summary table: // - scripts/lint/no-raw-regex.ts +// - scripts/lint/no-owned-max-params.ts // - scripts/lint/no-raw-typeof.ts // - packages/env/scripts/no-raw-process-env.ts // - scripts/lint/no-circular-deps.ts @@ -58,6 +59,10 @@ const ALL_CHECKS: CheckDef[] = [ name: 'no-raw-regex', script: join(ROOT, 'scripts', 'lint', 'no-raw-regex.ts'), }, + { + name: 'no-owned-max-params', + script: join(ROOT, 'scripts', 'lint', 'no-owned-max-params.ts'), + }, { name: 'no-raw-typeof', script: join(ROOT, 'scripts', 'lint', 'no-raw-typeof.ts'), @@ -82,6 +87,10 @@ const ALL_CHECKS: CheckDef[] = [ name: 'no-unauth-routes', script: join(ROOT, 'scripts', 'lint', 'no-unauth-routes.ts'), }, + { + name: 'check-drizzle-migrations', + script: join(ROOT, 'scripts', 'lint', 'check-drizzle-migrations.ts'), + }, { name: 'check-type-casts', script: join(ROOT, 'packages', 'checks', 'src', 'check-type-casts.ts'), diff --git a/scripts/lint/check-drizzle-migrations.ts b/scripts/lint/check-drizzle-migrations.ts new file mode 100644 index 0000000000..d4d5c1caa9 --- /dev/null +++ b/scripts/lint/check-drizzle-migrations.ts @@ -0,0 +1,60 @@ +#!/usr/bin/env bun + +import { existsSync, readdirSync, readFileSync } from 'node:fs'; +import { join } from 'node:path'; + +const ROOT = join(import.meta.dir, '..', '..'); + +const MIGRATION_TARGETS = [ + { name: 'packages/api', allowManual: new Set(['0010_great_colleen_wing.sql']) }, + { name: 'packages/osm-db', allowManual: new Set(['0000_extensions.sql']) }, +]; + +const DRIZZLE_FILE_PATTERN = /^\d{4}_[a-z0-9]+(?:_[a-z0-9]+)+\.sql$/; +const DRIZZLE_TEMPLATE_COMMENT = '-- Custom SQL migration file, put your code below! --'; + +interface Violation { + packageName: string; + message: string; +} + +function checkTarget(target: (typeof MIGRATION_TARGETS)[number], violations: Violation[]): void { + const drizzleDir = join(ROOT, target.name, 'drizzle'); + if (!existsSync(drizzleDir)) return; + + const sqlFiles = readdirSync(drizzleDir) + .filter((file) => file.endsWith('.sql')) + .sort(); + + for (const file of sqlFiles) { + if (target.allowManual.has(file)) continue; + + if (!DRIZZLE_FILE_PATTERN.test(file)) { + violations.push({ + packageName: target.name, + message: `${file}: migration name must match drizzle-kit format (NNNN_word_word.sql)`, + }); + } + + const content = readFileSync(join(drizzleDir, file), 'utf-8'); + if (content.includes(DRIZZLE_TEMPLATE_COMMENT)) { + violations.push({ + packageName: target.name, + message: `${file}: contains drizzle template comment; regenerate via drizzle-kit instead of hand-writing`, + }); + } + } +} + +const violations: Violation[] = []; +for (const target of MIGRATION_TARGETS) checkTarget(target, violations); + +if (violations.length > 0) { + console.log(`Drizzle migration checks failed (${violations.length}):\n`); + for (const violation of violations) { + console.log(`${violation.packageName}: ${violation.message}`); + } + process.exit(1); +} + +console.log('Drizzle migration checks passed.'); diff --git a/scripts/lint/no-owned-max-params.ts b/scripts/lint/no-owned-max-params.ts new file mode 100644 index 0000000000..1ffb9bd726 --- /dev/null +++ b/scripts/lint/no-owned-max-params.ts @@ -0,0 +1,271 @@ +#!/usr/bin/env bun +// +// no-owned-max-params.ts - enforces object params for owned functions. +// +// Biome's useMaxParams rule is intentionally broad, so it also catches JS, +// React, test, and framework callbacks whose positional signatures are not +// ours to redesign. Biome stays at max: 2 as a general backstop. This check +// adds the project-specific rule: owned function definitions should take at +// most one parameter, while inline callbacks passed to other APIs are ignored. + +import { readdirSync, readFileSync, statSync } from 'node:fs'; +import { extname, join } from 'node:path'; +import ts from 'typescript'; + +const ROOT = join(import.meta.dir, '..', '..'); +const SCAN_ROOTS = ['apps', 'packages']; +const MAX_OWNED_PARAMS = 1; + +const EXCLUDED_DIRS = new Set([ + 'node_modules', + 'dist', + 'build', + 'out', + '.next', + '.expo', + '.turbo', + '.wrangler', + 'coverage', +]); + +const EXCLUDED_PATH_PARTS = ['/test/', '/__tests__/', '/mocks/', '/playwright/']; +const EXCLUDED_SUFFIXES = ['.test.ts', '.test.tsx', '.spec.ts', '.spec.tsx']; +const EXCLUDED_FILES = new Set([ + // This service intentionally mirrors Cloudflare R2's positional API. + 'packages/api/src/services/r2-bucket.ts', + // These build scripts override globalThis.fetch with a shim that must + // match the runtime's (input, init) signature. + 'apps/landing/scripts/generate-og-images.ts', + 'apps/guides/scripts/generate-og-images.ts', + 'apps/trails/scripts/generate-og-images.ts', +]); +const FRAMEWORK_METHOD_NAMES = new Set(['fetch', 'queue', 'resolveRequest']); +const EXTERNAL_CALLBACK_NAMES = new Set([ + 'fetcher', + 'keyExtractor', + 'list', + 'onChange', + 'onContentSizeChange', + 'onError', + 'onSettled', + 'onSuccess', + 'orderBy', + 'renderItem', + 'set', + 'setItem', + 'webpack', +]); +const TARGET_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts', '.mjs', '.cjs']); + +interface Violation { + file: string; + line: number; + column: number; + name: string; + count: number; +} + +function isTargetFile(relPath: string): boolean { + if (EXCLUDED_FILES.has(relPath)) return false; + if (EXCLUDED_PATH_PARTS.some((part) => relPath.includes(part))) return false; + if (EXCLUDED_SUFFIXES.some((suffix) => relPath.endsWith(suffix))) return false; + return TARGET_EXTENSIONS.has(extname(relPath)); +} + +function collectFiles(dir: string, relDir: string, files: string[]): void { + let entries: string[]; + try { + entries = readdirSync(dir); + } catch { + return; + } + + for (const entry of entries) { + if (EXCLUDED_DIRS.has(entry)) continue; + + const full = join(dir, entry); + const rel = `${relDir}/${entry}`; + + let isDir = false; + try { + isDir = statSync(full).isDirectory(); + } catch { + continue; + } + + if (isDir) { + collectFiles(full, rel, files); + } else if (isTargetFile(rel)) { + files.push(rel); + } + } +} + +function scriptKindForPath(file: string): ts.ScriptKind { + if (file.endsWith('.tsx')) return ts.ScriptKind.TSX; + if (file.endsWith('.jsx')) return ts.ScriptKind.JSX; + if (file.endsWith('.js') || file.endsWith('.mjs') || file.endsWith('.cjs')) + return ts.ScriptKind.JS; + return ts.ScriptKind.TS; +} + +function unwrapExpressionParent(node: ts.Node): ts.Node { + let current: ts.Node = node; + + while ( + ts.isParenthesizedExpression(current.parent) || + ts.isAsExpression(current.parent) || + ts.isSatisfiesExpression(current.parent) || + ts.isTypeAssertionExpression(current.parent) || + ts.isNonNullExpression(current.parent) + ) { + current = current.parent; + } + + return current.parent; +} + +function isInlineCallback(node: ts.FunctionLikeDeclaration): boolean { + if (!ts.isArrowFunction(node) && !ts.isFunctionExpression(node)) return false; + + const parent = unwrapExpressionParent(node); + if (ts.isCallExpression(parent) || ts.isNewExpression(parent)) { + return ( + parent.arguments?.some((argument) => { + let current: ts.Node = node; + while (current.parent && current.parent !== parent) current = current.parent; + return current === argument; + }) === true + ); + } + + return false; +} + +function hasBody(node: ts.FunctionLikeDeclaration): boolean { + return 'body' in node && node.body !== undefined; +} + +function isAssertionPredicate(node: ts.FunctionLikeDeclaration): boolean { + const type = node.type; + if (!type) return false; + return ts.isTypePredicateNode(type) && type.assertsModifier !== undefined; +} + +function functionName(node: ts.FunctionLikeDeclaration): string { + if ('name' in node && node.name) return node.name.getText(); + + const parent = node.parent; + if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) return parent.name.text; + if (ts.isPropertyAssignment(parent)) return parent.name.getText(); + if (ts.isBinaryExpression(parent) && ts.isPropertyAccessExpression(parent.left)) { + return parent.left.name.text; + } + + return ''; +} + +function isFrameworkObjectMethod(node: ts.FunctionLikeDeclaration): boolean { + if ( + !ts.isMethodDeclaration(node) && + !ts.isFunctionExpression(node) && + !ts.isArrowFunction(node) + ) { + return false; + } + + const name = functionName(node).replace(/^['"]|['"]$/g, ''); + return FRAMEWORK_METHOD_NAMES.has(name); +} + +function isExternalCallback(node: ts.FunctionLikeDeclaration): boolean { + if (EXTERNAL_CALLBACK_NAMES.has(functionName(node).replace(/^['"]|['"]$/g, ''))) return true; + + if (!ts.isArrowFunction(node) && !ts.isFunctionExpression(node)) return false; + const parent = unwrapExpressionParent(node); + + if (ts.isPropertyAssignment(parent)) { + return EXTERNAL_CALLBACK_NAMES.has(parent.name.getText().replace(/^['"]|['"]$/g, '')); + } + + if ( + ts.isJsxExpression(parent) && + parent.parent && + ts.isJsxAttribute(parent.parent) && + ts.isIdentifier(parent.parent.name) + ) { + return EXTERNAL_CALLBACK_NAMES.has(parent.parent.name.text); + } + + return false; +} + +function shouldCheck(node: ts.FunctionLikeDeclaration): boolean { + if (!hasBody(node)) return false; + if (isInlineCallback(node)) return false; + if (isExternalCallback(node)) return false; + if (isAssertionPredicate(node)) return false; + if (isFrameworkObjectMethod(node)) return false; + if (ts.isGetAccessor(node) || ts.isSetAccessor(node)) return false; + return true; +} + +function scanFile(relPath: string, violations: Violation[]): void { + let content: string; + try { + content = readFileSync(join(ROOT, relPath), 'utf8'); + } catch { + return; + } + + const sourceFile = ts.createSourceFile( + relPath, + content, + ts.ScriptTarget.Latest, + true, + scriptKindForPath(relPath), + ); + + function visit(node: ts.Node): void { + if (ts.isFunctionLike(node) && shouldCheck(node) && node.parameters.length > MAX_OWNED_PARAMS) { + const pos = sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile)); + violations.push({ + file: relPath, + line: pos.line + 1, + column: pos.character + 1, + name: functionName(node), + count: node.parameters.length, + }); + } + + ts.forEachChild(node, visit); + } + + visit(sourceFile); +} + +const files: string[] = []; +for (const root of SCAN_ROOTS) { + collectFiles(join(ROOT, root), root, files); +} + +const violations: Violation[] = []; +for (const file of files) { + scanFile(file, violations); +} + +if (violations.length > 0) { + console.log( + `Owned functions with too many params found (${violations.length}). Use one object parameter for owned APIs; inline callbacks passed to external APIs are ignored:\n`, + ); + + for (const violation of violations) { + console.log( + `${violation.file}:${violation.line}:${violation.column}: ${violation.name} has ${violation.count} params`, + ); + } + + process.exit(1); +} + +console.log('No owned functions exceed one parameter.'); diff --git a/tsconfig.json b/tsconfig.json index 643cb3a87d..97dc7bd226 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -44,7 +44,15 @@ "@packrat/cli/*": ["./packages/cli/src/*"], "@packrat/web-ui": ["./packages/web-ui/src"], "@packrat/web-ui/*": ["./packages/web-ui/src/*"], - "nativewindui/*": ["./apps/expo/components/ui/*"] + "nativewindui/*": ["./apps/expo/components/ui/*"], + "@packrat/constants": ["./packages/constants/src/index.ts"], + "@packrat/constants/*": ["./packages/constants/src/*"], + "@packrat/db": ["./packages/db/src/index.ts"], + "@packrat/db/*": ["./packages/db/src/*"], + "@packrat/schemas": ["./packages/schemas/src/index.ts"], + "@packrat/schemas/*": ["./packages/schemas/src/*"], + "@packrat/types": ["./packages/types/src/index.ts"], + "@packrat/types/*": ["./packages/types/src/*"] } }, "include": [ From ab6328ea906271b601fa3f6b0d9ad69c57474a63 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Sun, 31 May 2026 21:25:11 -0600 Subject: [PATCH 69/95] =?UTF-8?q?=F0=9F=90=9B=20fix(web-e2e):=20unblock=20?= =?UTF-8?q?playwright=20suite=20after=20development=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After merging development, several regressions surfaced on the web target that broke the playwright e2e suite. None of these change native behaviour — they're either web-only providers/shims or local-dev guards. - apps/expo/providers/index.web.tsx: restore BottomSheetModalProvider on web. @gorhom/bottom-sheet 5.x runs on web via reanimated + gesture-handler and PackDetailScreen renders BottomSheetView inline, which subscribes to BottomSheetModalInternalContext and threw "...cannot be used outside a provider" before this. - apps/expo/mocks/react-native-community-datetimepicker.tsx: forward the RN `testID` prop to the underlying as `data-testid` so playwright can find trip start/end-date inputs. - apps/expo/lib/api/packrat.ts: on web, expoClient short-circuits and expo-secure-store ships an empty stub — fall through to authClient.getSession() with a 30s in-memory cache so apiClient's per-request token lookup doesn't hammer /api/auth/get-session. - apps/expo/lib/auth-client.ts: set fetchOptions.credentials='include' so the cross-origin better-auth cookie is actually sent on web (API on :18787, page on :18082, prod equivalent for packrat.world/api). - packages/api/src/auth/index.ts: disable the 100/min rate limit when BETTER_AUTH_URL is a localhost URL — local web dev legitimately spams get-session via the useSession hook + apiClient and trips it within seconds. Production behaviour unchanged. - package.json + bun.lock: pin kysely to ^0.28.17 so @better-auth/ kysely-adapter (which imports DEFAULT_MIGRATION_TABLE / DEFAULT_MIGRATION_LOCK_TABLE) keeps resolving — kysely 0.29.x removed those exports. --- apps/expo/lib/api/packrat.ts | 26 ++++++++++++++++++- apps/expo/lib/auth-client.ts | 8 ++++++ .../react-native-community-datetimepicker.tsx | 6 +++++ apps/expo/providers/index.web.tsx | 9 +++++-- bun.lock | 3 ++- package.json | 1 + packages/api/src/auth/index.ts | 7 ++++- 7 files changed, 55 insertions(+), 5 deletions(-) diff --git a/apps/expo/lib/api/packrat.ts b/apps/expo/lib/api/packrat.ts index cf85382b93..50ad34e008 100644 --- a/apps/expo/lib/api/packrat.ts +++ b/apps/expo/lib/api/packrat.ts @@ -5,6 +5,7 @@ import { needsReauthAtom } from 'expo-app/features/auth/atoms/authAtoms'; import { getApiBaseUrl } from 'expo-app/lib/api/getBaseUrl'; import { authClient } from 'expo-app/lib/auth-client'; import * as SecureStore from 'expo-secure-store'; +import { Platform } from 'react-native'; import { z } from 'zod'; // The expoClient plugin serialises all cookies into SecureStore under this key. @@ -15,6 +16,11 @@ const CookieStoreSchema = z.record(z.object({ value: z.string() })); // expoClient stores cookies as JSON: { "better-auth.session_token": { value, expires } } // HTTPS servers (remote dev/prod) prefix the cookie name with __Secure-; HTTP (local) does not. +// In-memory cache of the web session token. Invalidated by onNeedsReauth. +const WEB_TOKEN_CACHE_MS = 30_000; +let cachedToken: string | null = null; +let cachedTokenExpiresAt = 0; + function parseSessionToken(cookieJson: string | null): string | null { if (!cookieJson) return null; const cookies = fromZod(CookieStoreSchema)(JSON.parse(cookieJson)); @@ -29,8 +35,23 @@ function parseSessionToken(cookieJson: string | null): string | null { export const apiClient = createApiClient({ baseUrl: getApiBaseUrl(), auth: { - // Read the token from SecureStore — no network call on every API request. + // Native: read from SecureStore where @better-auth/expo's expoClient + // plugin persists the cookie — no network call per request. + // Web: expoClient short-circuits on web (doesn't write to SecureStore), + // and expo-secure-store ships an empty stub on web. Fall through to + // authClient.getSession() with a small in-memory cache — better-auth's + // /api/auth/get-session is rate-limited and apiClient runs it on every + // call, so an uncached implementation 429s within seconds and 401s the + // user out. The session token is valid for 7 days; 30s is conservative. getAccessToken: async () => { + if (Platform.OS === 'web') { + const now = Date.now(); + if (cachedToken && now < cachedTokenExpiresAt) return cachedToken; + const { data } = await authClient.getSession(); + cachedToken = data?.session?.token ?? null; + cachedTokenExpiresAt = now + WEB_TOKEN_CACHE_MS; + return cachedToken; + } const cookieStr = await SecureStore.getItemAsync(COOKIE_STORE_KEY); return parseSessionToken(cookieStr); }, @@ -39,6 +60,9 @@ export const apiClient = createApiClient({ getRefreshToken: () => null, onAccessTokenRefreshed: () => {}, onNeedsReauth: async () => { + // Invalidate the web token cache so the next request re-fetches. + cachedToken = null; + cachedTokenExpiresAt = 0; // A 401 can be transient (e.g. the server briefly returned an error). // Verify the session is actually gone before alarming the user. const { data } = await authClient.getSession(); diff --git a/apps/expo/lib/auth-client.ts b/apps/expo/lib/auth-client.ts index f2556aee28..1b9be8095c 100644 --- a/apps/expo/lib/auth-client.ts +++ b/apps/expo/lib/auth-client.ts @@ -5,6 +5,14 @@ import * as SecureStore from 'expo-secure-store'; export const authClient = createAuthClient({ baseURL: getApiBaseUrl(), + // Web: the API origin differs from the page origin (Expo web on :18082, + // API on :18787, prod web at packrat.world / api.packrat.world), so the + // browser drops the better-auth session cookie unless we explicitly opt + // into credentials. @better-auth/expo's plugin sets credentials='omit' + // in its `init()` hook on native (cookies are managed via SecureStore + // there), but that init() short-circuits with `if (isWeb) return;` — + // so this top-level option only takes effect on web. + fetchOptions: { credentials: 'include' }, plugins: [ expoClient({ scheme: 'packrat', diff --git a/apps/expo/mocks/react-native-community-datetimepicker.tsx b/apps/expo/mocks/react-native-community-datetimepicker.tsx index a437cced6a..4b541ac0eb 100644 --- a/apps/expo/mocks/react-native-community-datetimepicker.tsx +++ b/apps/expo/mocks/react-native-community-datetimepicker.tsx @@ -10,6 +10,10 @@ type Props = { minimumDate?: Date; maximumDate?: Date; style?: unknown; + // RN's `testID` doesn't auto-flow into a plain the way it does for + // react-native-web's /. Forward it explicitly so Playwright's + // getByTestId can target the rendered date input. + testID?: string; }; function toInputValue(date: Date, mode: Props['mode']): string { @@ -25,6 +29,7 @@ export default function DateTimePicker({ onChange, minimumDate, maximumDate, + testID, }: Props) { const inputType = mode === 'time' ? 'time' : mode === 'datetime' ? 'datetime-local' : 'date'; @@ -39,6 +44,7 @@ export default function DateTimePicker({ return ( - {children} + {children} diff --git a/bun.lock b/bun.lock index 85f1532ae6..33d09abe28 100644 --- a/bun.lock +++ b/bun.lock @@ -790,6 +790,7 @@ "@sinclair/typebox": "^0.34.15", "elysia": "^1.4.0", "expo-sqlite": "~55.0.15", + "kysely": "^0.28.17", "react": "19.2.6", }, "catalog": { @@ -3407,7 +3408,7 @@ "ky": ["ky@1.14.3", "", {}, "sha512-9zy9lkjac+TR1c2tG+mkNSVlyOpInnWdSMiue4F+kq8TwJSgv6o8jhLRg8Ho6SnZ9wOYUq/yozts9qQCfk7bIw=="], - "kysely": ["kysely@0.29.2", "", {}, "sha512-s6WVJyEZrbm6jhBpiKHsGHyePMrVQKJ85wZCFCr9W4QHv6WTjWIrdvTmO9hDEA3bNK0xkrE2DqrHsXMLWuZpQg=="], + "kysely": ["kysely@0.28.17", "", {}, "sha512-nbD8lB9EB3wNdMhOCdx5Li8DxnLbvKByylRLcJ1h+4SkrowVeECAyZlyiKMThF7xFdRz0jSQ2MoJr+wXux2y0Q=="], "lan-network": ["lan-network@0.2.1", "", { "bin": { "lan-network": "dist/lan-network-cli.js" } }, "sha512-ONPnazC96VKDntab9j9JKwIWhZ4ZUceB4A9Epu4Ssg0hYFmtHZSeQ+n15nIwTFmcBUKtExOer8WTJ4GF9MO64A=="], diff --git a/package.json b/package.json index 8e210ca4a6..36e6108fcd 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "@sinclair/typebox": "^0.34.15", "elysia": "^1.4.0", "expo-sqlite": "~55.0.15", + "kysely": "^0.28.17", "react": "19.2.6" }, "devDependencies": { diff --git a/packages/api/src/auth/index.ts b/packages/api/src/auth/index.ts index e7fd940aff..64138dcc09 100644 --- a/packages/api/src/auth/index.ts +++ b/packages/api/src/auth/index.ts @@ -191,7 +191,12 @@ async function buildAuth(env: ValidatedEnv): Promise { ], rateLimit: { - enabled: true, + // Local web dev hits /api/auth/get-session aggressively (better-auth's + // useSession() hook plus apiClient's per-request token lookup), which + // trips the prod 100/min limit within seconds. Disable rate limiting + // when running against a localhost API; prod keeps the original + // throttle. + enabled: !env.BETTER_AUTH_URL.startsWith('http://localhost'), window: 60, max: 100, storage: 'secondary-storage', From 006bcdda22ec88b51a67a3a257fc5e22f9c636a8 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Sun, 31 May 2026 21:34:26 -0600 Subject: [PATCH 70/95] =?UTF-8?q?=F0=9F=90=9B=20fix(web-e2e):=20wire=20Act?= =?UTF-8?q?ionSheet=20on=20web=20+=20restore=20trips:dates-section=20testI?= =?UTF-8?q?D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - providers/index.web.tsx: add ActionSheetProvider (useCustomActionSheet) so feature code calling useActionSheet() actually shows a menu instead of hitting the no-op default context. Item more-actions delete depends on this. CustomActionSheet uses React.Children.only, so the inner fragment is shaped to give it a single child. - TripDetailScreen.tsx: restore testID={testIds.trips.datesSection} on the Dates section View. The id was already defined in lib/testIds.ts; re-attaching it to its View unblocks the trip-list-item-detail test. --- .../features/trips/screens/TripDetailScreen.tsx | 2 +- apps/expo/providers/index.web.tsx | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/apps/expo/features/trips/screens/TripDetailScreen.tsx index 7a8c9d5bff..62ea330f04 100644 --- a/apps/expo/features/trips/screens/TripDetailScreen.tsx +++ b/apps/expo/features/trips/screens/TripDetailScreen.tsx @@ -153,7 +153,7 @@ export function TripDetailScreen() { {/* Dates */} - + {t('trips.dates')} diff --git a/apps/expo/providers/index.web.tsx b/apps/expo/providers/index.web.tsx index be4fa502be..e848e86052 100644 --- a/apps/expo/providers/index.web.tsx +++ b/apps/expo/providers/index.web.tsx @@ -1,3 +1,4 @@ +import { ActionSheetProvider } from '@expo/react-native-action-sheet'; import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'; import { PortalHost } from '@rn-primitives/portal'; import { ErrorBoundary } from 'expo-app/components/initial/ErrorBoundary'; @@ -12,12 +13,16 @@ import { TanstackProvider } from './TanstackProvider'; * Web version of Providers. * Removes native-only providers: * - KeyboardProvider (react-native-keyboard-controller — no web support) - * - ActionSheetProvider (@expo/react-native-action-sheet uses React.Children.only which breaks on web) * Keeps: * - BottomSheetModalProvider — @gorhom/bottom-sheet 5.x runs on web via * Reanimated + gesture-handler. Screens like PackDetailScreen render * BottomSheetView inline, which subscribes to BottomSheetModalInternalContext * and throws on web without this provider. + * - ActionSheetProvider — feature code calls useActionSheet() to show item + * more-actions menus. Without the provider the hook returns a no-op + * showActionSheetWithOptions and the menu never appears. The provider's + * CustomActionSheet renders React.Children.only(children), so the + * direct child here MUST be a single element. * Metro automatically picks this file over providers/index.tsx for web builds. */ export function Providers({ children }: { children: ReactNode }) { @@ -27,8 +32,14 @@ export function Providers({ children }: { children: ReactNode }) { - {children} - + + + <> + {children} + + + + From 522c80592532b223b4c5be0284233e419a476bdd Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Sun, 31 May 2026 22:24:54 -0600 Subject: [PATCH 71/95] =?UTF-8?q?=F0=9F=90=9B=20fix(web-e2e):=20close=20th?= =?UTF-8?q?e=20last=20two=20web=20e2e=20gaps=20=E2=80=94=20AI=20chat=20401?= =?UTF-8?q?=20+=20trip=20delete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After the development merge two scenarios remained red: - AI chat sends message and gets response (401 → 36/36) authClient.useSession() resolves asynchronously, but DefaultChatTransport captured `Bearer ${token}` in headers at construction time. When the user hit send before the hook resolved, the request shipped `Bearer null` and the bearer plugin rejected it. Switch headers to an async function that reads a tokenRef driven by useSession() and falls back to a direct authClient.getSession() when the ref is still empty. Drop `token` from the transport's useMemo deps so we no longer remount on every session refresh. - Trip CRUD › delete trip → disappears from list useDeleteTrip only flipped `tripObs.deleted=true`. syncedCrud flushed that as PUT, but UpdateTripBodySchema doesn't expose `deleted`, so the field was silently dropped and the trip never deleted server-side. Restore the explicit `apiClient.trips({tripId}).delete()` call (the trips route already has DELETE → soft-delete via update). On the screen, swap the NativeWindUI Alert ref (its AlertDialog Overlay wraps an Animated.View entering={FadeIn} that crashes Slot's Children.only on web) for a Platform.OS-gated path: window.confirm on web, RN Alert.alert on native. Test follows pack-delete's explicit `page.goto('/trips')` pattern instead of relying on SPA `router.back()` history that the prior page.goto()s wiped. --- apps/expo/app/(app)/ai-chat.tsx | 23 ++++++-- .../features/trips/hooks/useDeleteTrip.ts | 13 +++-- .../trips/screens/TripDetailScreen.tsx | 53 +++++++++---------- apps/expo/playwright/tests/trips.spec.ts | 17 +++--- 4 files changed, 61 insertions(+), 45 deletions(-) diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx index 5464c9ed46..ad47a4d9e0 100644 --- a/apps/expo/app/(app)/ai-chat.tsx +++ b/apps/expo/app/(app)/ai-chat.tsx @@ -104,6 +104,12 @@ export default function AIChat() { const { data: _authSession } = authClient.useSession(); const token = _authSession?.session?.token ?? null; const userId = _authSession?.user?.id ?? ''; + // Keep the latest token in a ref so the transport's headers function reads + // it at request time — authClient.useSession() resolves asynchronously, + // and useChat captures `transport` at mount, so a token baked into headers + // at construction time would be stale (often null) when the user hits send. + const tokenRef = React.useRef(token); + tokenRef.current = token; const [input, setInput] = React.useState(''); const [lastUserMessage, setLastUserMessage] = React.useState(''); const [previousMessages, setPreviousMessages] = React.useState([]); @@ -199,8 +205,19 @@ export default function AIChat() { transport: new DefaultChatTransport({ fetch: expoFetch as unknown as typeof globalThis.fetch, api: `${clientEnvs.EXPO_PUBLIC_API_URL}/api/chat`, - headers: { - Authorization: `Bearer ${token}`, + // HttpChatTransport awaits resolve(this.headers) on every send, so an + // async function lets us pull the live token at request time. Prefer + // tokenRef (driven by useSession()), and fall back to a direct + // getSession() call when the user submits before the hook resolved — + // otherwise we'd ship Bearer "" → 401. + headers: async () => { + let t = tokenRef.current; + if (!t) { + const { data } = await authClient.getSession(); + t = data?.session?.token ?? null; + tokenRef.current = t; + } + return { Authorization: `Bearer ${t ?? ''}` }; }, body: () => ({ contextType: contextRef.current.contextType, @@ -212,7 +229,7 @@ export default function AIChat() { }), transportKey: 'remote', }; - }, [aiMode, isLocalReady, modelStatus, token, tools, userId]); + }, [aiMode, isLocalReady, modelStatus, tools, userId]); // transportKey forces useChat to remount when the transport type switches, // since useChat captures the transport reference on mount and won't update it. diff --git a/apps/expo/features/trips/hooks/useDeleteTrip.ts b/apps/expo/features/trips/hooks/useDeleteTrip.ts index d67c3db035..5685e95659 100644 --- a/apps/expo/features/trips/hooks/useDeleteTrip.ts +++ b/apps/expo/features/trips/hooks/useDeleteTrip.ts @@ -1,14 +1,21 @@ import { tripsStore } from 'expo-app/features/trips/store/trips'; +import { apiClient } from 'expo-app/lib/api/packrat'; import { obs } from 'expo-app/lib/store'; import { useCallback } from 'react'; export function useDeleteTrip() { - const deleteTrip = useCallback((id: string) => { - // Soft delete by setting deleted flag - const tripObs = obs({ store: tripsStore, id: id }); + const deleteTrip = useCallback(async (id: string) => { + // Optimistically flip `deleted` in the local store so the UI hides the + // trip immediately. + const tripObs = obs({ store: tripsStore, id }); if (tripObs) { tripObs.deleted.set(true); } + // syncedCrud's PUT path strips the `deleted` field (UpdateTripBodySchema + // doesn't expose it), so a store-only flip never reaches the database + // and the next GET /api/trips returns the trip again. Fire DELETE + // explicitly — the trips route already supports soft-delete via DELETE. + await apiClient.trips({ tripId: id }).delete(); }, []); return deleteTrip; diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/apps/expo/features/trips/screens/TripDetailScreen.tsx index 62ea330f04..71f7515f61 100644 --- a/apps/expo/features/trips/screens/TripDetailScreen.tsx +++ b/apps/expo/features/trips/screens/TripDetailScreen.tsx @@ -1,12 +1,5 @@ import { assertDefined } from '@packrat/guards'; -import type { AlertMethods } from '@packrat/ui/nativewindui'; -import { - ActivityIndicator, - Alert as AlertComponent, - Button, - Card, - Text, -} from '@packrat/ui/nativewindui'; +import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui'; import { Icon } from 'expo-app/components/Icon'; import { featureFlags } from 'expo-app/config'; import { SubmitConditionReportForm } from 'expo-app/features/trail-conditions/components/SubmitConditionReportForm'; @@ -14,8 +7,8 @@ import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; import { testIds } from 'expo-app/lib/testIds'; import { useLocalSearchParams, useRouter } from 'expo-router'; -import { useMemo, useRef, useState } from 'react'; -import { Modal, ScrollView, Share, View } from 'react-native'; +import { useMemo, useState } from 'react'; +import { Alert, Modal, Platform, ScrollView, Share, View } from 'react-native'; import MapView, { Marker } from 'react-native-maps'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useDetailedPacks } from '../../packs/hooks/useDetailedPacks'; @@ -30,7 +23,6 @@ export function TripDetailScreen() { const { t } = useTranslation(); const [showConditionReport, setShowConditionReport] = useState(false); - const alertRef = useRef(null); // safe-cast: trip may be undefined before the store is hydrated; the guard at line ~38 handles // the undefined case and returns early, ensuring trip is non-null at render time below. @@ -77,22 +69,26 @@ export function TripDetailScreen() { } }; - const handleDeleteTrip = () => { - alertRef.current?.alert({ - title: t('trips.deleteTrip'), - message: t('trips.deleteTripConfirmation'), - buttons: [ - { text: t('common.cancel'), style: 'cancel' }, - { - text: t('common.delete'), - style: 'destructive', - onPress: async () => { - await deleteTrip(id as string); - router.back(); - }, - }, - ], - }); + const performDelete = async () => { + await deleteTrip(id as string); + router.back(); + }; + + const confirmDeleteTrip = () => { + if (Platform.OS === 'web') { + // react-native-web's Alert.alert ignores the buttons array's onPress + // callbacks, so the destructive handler never fires. Use the browser + // confirm directly — Playwright's page.on('dialog') accepts it the + // same way it would handle Alert.alert on native. + if (window.confirm(t('trips.deleteTripConfirmation'))) { + void performDelete(); + } + return; + } + Alert.alert(t('trips.deleteTrip'), t('trips.deleteTripConfirmation'), [ + { text: t('common.cancel'), style: 'cancel' }, + { text: t('common.delete'), style: 'destructive', onPress: performDelete }, + ]); }; const handleWeatherPress = () => { @@ -141,7 +137,7 @@ export function TripDetailScreen() { variant="plain" size="icon" testID={testIds.trips.deleteBtn} - onPress={handleDeleteTrip} + onPress={confirmDeleteTrip} > - ); } diff --git a/apps/expo/playwright/tests/trips.spec.ts b/apps/expo/playwright/tests/trips.spec.ts index 9a0c33e59a..aa817944f1 100644 --- a/apps/expo/playwright/tests/trips.spec.ts +++ b/apps/expo/playwright/tests/trips.spec.ts @@ -194,8 +194,9 @@ test.describe('Trip CRUD', () => { // Accept window.confirm dialogs before triggering delete page.on('dialog', (dialog) => dialog.accept()); - // Register DELETE listener scoped to this trip's ID before clicking. - // useDeleteTrip calls DELETE /api/trips/:id directly and awaits it before router.back(). + // useDeleteTrip flips `deleted` locally for an optimistic UI update and + // fires DELETE /api/trips/:id so the soft-delete actually lands server-side + // (the PUT path strips `deleted`). const deletePromise = page.waitForResponse( (r) => r.url().includes(`/api/trips/${tripId}`) && r.request().method() === 'DELETE', { timeout: 20_000 }, @@ -206,17 +207,13 @@ test.describe('Trip CRUD', () => { await deleteButton.waitFor({ timeout: 10_000 }); await deleteButton.click(); - // Wait for the server to confirm the hard-delete. - // useDeleteTrip awaits this before calling router.back(), so the URL change - // happens after this resolves — but we still confirm ok() for diagnostics. const deleteResponse = await deletePromise; expect(deleteResponse.ok()).toBeTruthy(); - // router.back() SPA-navigates away from the trip detail to /trips. - // Do NOT use page.goto here — the persist plugin would reload with the old - // deleted:false state and mode:'merge' wouldn't clean it up. - // Instead, stay in the SPA context where the store already has deleted:true. - await page.waitForURL((url) => !url.pathname.startsWith('/trip/'), { timeout: 15_000 }); + // router.back() may not work after page.goto-seeded history; navigate + // explicitly like pack-delete does. With `deleted=true` now persisted + // server-side, GET /api/trips will exclude this trip on the list reload. + await page.goto(`${BASE_URL}/trips`); await page.waitForLoadState('networkidle'); await expect(page.getByText(tripName)).not.toBeVisible({ timeout: 10_000 }); }); From d93a23e6c8268c1877e74e242da335eabe15d477 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 00:00:07 -0600 Subject: [PATCH 72/95] =?UTF-8?q?=F0=9F=94=A5=20chore:=20drop=20orphan=20@?= =?UTF-8?q?packrat-ai/nativewindui=202.0.3=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brought back by the modify/delete conflict in the development merge but no longer referenced from package.json (we're on ^2.0.6 via #2528 where the upstream fix landed). --- .../@packrat-ai%2Fnativewindui@2.0.3.patch | 106 ------------------ 1 file changed, 106 deletions(-) delete mode 100644 patches/@packrat-ai%2Fnativewindui@2.0.3.patch diff --git a/patches/@packrat-ai%2Fnativewindui@2.0.3.patch b/patches/@packrat-ai%2Fnativewindui@2.0.3.patch deleted file mode 100644 index ffcfa0e9a6..0000000000 --- a/patches/@packrat-ai%2Fnativewindui@2.0.3.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/node_modules/@packrat-ai/nativewindui/.bun-tag-85507b58e8a01901 b/.bun-tag-85507b58e8a01901 -new file mode 100644 -index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 -diff --git a/package.json b/package.json -index d8cbd357556aa4e99da8aeb1e80290cb8edad082..a88f91e07aeab9facef841075b4aeb9f49beb879 100644 ---- a/package.json -+++ b/package.json -@@ -1,6 +1,6 @@ - { - "name": "@packrat-ai/nativewindui", -- "version": "2.0.3", -+ "version": "2.0.3-2", - "entry": "src/index.ts", - "main": "src/index.ts", - "types": "src/index.ts", -@@ -43,7 +43,7 @@ - "expo-image": "~3.0.11", - "expo-linear-gradient": "~15.0.8", - "expo-navigation-bar": "~5.0.10", -- "expo-router": "~6.0.23", -+ "expo-router": ">=6.0.23", - "expo-symbols": "~1.0.8", - "nativewind": "^4.2.3", - "react": ">=19.0.0", -diff --git a/src/components/AdaptiveSearchHeader/AdaptiveSearchHeader.tsx b/src/components/AdaptiveSearchHeader/AdaptiveSearchHeader.tsx -index 86091777372a04b76c9e866d2951bcfde9f34e05..deac88175ef8d3b14a4d7ff6a476ab6b7d3a3e71 100644 ---- a/src/components/AdaptiveSearchHeader/AdaptiveSearchHeader.tsx -+++ b/src/components/AdaptiveSearchHeader/AdaptiveSearchHeader.tsx -@@ -186,7 +186,12 @@ export function AdaptiveSearchHeader(props: AdaptiveSearchHeaderProps) { - onFocus={props.searchBar?.onFocus} - value={searchValue} - onChangeText={onChangeText} -- autoCapitalize={props.searchBar?.autoCapitalize} -+ autoCapitalize={ -+ props.searchBar?.autoCapitalize === undefined || -+ props.searchBar?.autoCapitalize === 'systemDefault' -+ ? 'none' -+ : props.searchBar?.autoCapitalize -+ } - keyboardType={searchBarInputTypeToKeyboardType(props.searchBar?.inputType)} - returnKeyType="search" - blurOnSubmit={props.searchBar?.materialBlurOnSubmit} -diff --git a/src/components/Icon/types.ts b/src/components/Icon/types.ts -index 786b62c4a216c360beb193b96092186319a634cb..56b991f34884160c9b5c484415c94c5172b0f25c 100644 ---- a/src/components/Icon/types.ts -+++ b/src/components/Icon/types.ts -@@ -1,16 +1,18 @@ - import type MaterialCommunityIcons from '@expo/vector-icons/MaterialCommunityIcons'; - import type MaterialIcons from '@expo/vector-icons/MaterialIcons'; --import type { SymbolViewProps } from 'expo-symbols'; -+import type { SymbolViewProps as ExpoSymbolViewProps } from 'expo-symbols'; - import type { IconMapper } from 'rn-icon-mapper'; - - type MaterialCommunityIconsProps = React.ComponentProps; - type MaterialIconsProps = React.ComponentProps; - --type Style = SymbolViewProps['style'] & -+type SymbolViewPropsWithStringName = Omit & { name: string }; -+ -+type Style = SymbolViewPropsWithStringName['style'] & - MaterialIconsProps['style'] & - MaterialCommunityIconsProps['style']; - --type IconProps = IconMapper & { -+type IconProps = IconMapper & { - style?: Style; - className?: string; - }; -diff --git a/src/components/LargeTitleHeader/LargeTitleHeader.tsx b/src/components/LargeTitleHeader/LargeTitleHeader.tsx -index 95c66bbdece307542084c2e510c847543134f63e..d6cf24dbaf209ea0086cfb05d9203c81585578a2 100644 ---- a/src/components/LargeTitleHeader/LargeTitleHeader.tsx -+++ b/src/components/LargeTitleHeader/LargeTitleHeader.tsx -@@ -157,6 +157,7 @@ export function LargeTitleHeader(props: LargeTitleHeaderProps) { - - {!!props.searchBar && ( - - diff --git a/apps/expo/playwright/tests/core.spec.ts b/apps/expo/playwright/tests/core.spec.ts index 92ad42b4c4..c366c1142d 100644 --- a/apps/expo/playwright/tests/core.spec.ts +++ b/apps/expo/playwright/tests/core.spec.ts @@ -102,8 +102,11 @@ test('add item from catalog to a pack', async ({ authedPage: page }) => { const { id: packId } = (await packResponse.json()) as { id: number }; - // Navigate to pack detail and open "Add from Catalog" sheet + // Navigate to pack detail and open the "Add" bottom sheet first; its options + // (add-from-catalog-option, etc.) are only mounted inside the BottomSheet + // after present() fires. await page.goto(`${BASE_URL}/pack/${packId}`); + await page.getByTestId('add-item-button').click(); await page.getByTestId('add-from-catalog-option').last().click(); // Dialog with catalog items should appear @@ -218,7 +221,8 @@ test('settings screen loads', async ({ authedPage: page }) => { await page.goto(`${BASE_URL}/settings`); await expect(page.getByText('AI Models')).toBeVisible(); await expect(page.getByText('Danger Zone')).toBeVisible(); - await expect(page.getByText(/PackRat v/i)).toBeVisible(); + // Dev/preview builds prepend an env tag like "PackRat (Dev) v2.0.26". + await expect(page.getByText(/PackRat(?: \([^)]+\))? v\d/i)).toBeVisible(); }); // ─── AI Chat ────────────────────────────────────────────────────────────────── diff --git a/apps/expo/playwright/tests/packs.spec.ts b/apps/expo/playwright/tests/packs.spec.ts index e8d24f9e93..d66644148e 100644 --- a/apps/expo/playwright/tests/packs.spec.ts +++ b/apps/expo/playwright/tests/packs.spec.ts @@ -205,11 +205,16 @@ test.describe('Item CRUD within a pack', () => { const moreActionsButton = page.getByTestId(`items:more-actions-${itemId}`); if (await moreActionsButton.isVisible()) { await moreActionsButton.click(); + // Exact "Delete" so the regex doesn't latch onto the item name + // "E2E-DeleteItem-...". The CustomActionSheet entrance animation is + // ~225ms; wait for it to settle before clicking or _onSelect() drops + // the press silently. const deleteOption = page - .getByText(/delete/i) - .or(page.getByRole('menuitem', { name: /delete/i })) + .getByText('Delete', { exact: true }) + .or(page.getByRole('menuitem', { name: 'Delete' })) .first(); await deleteOption.waitFor({ timeout: 5_000 }); + await page.waitForTimeout(350); await deleteOption.click(); // Item card should be gone diff --git a/apps/expo/playwright/tests/trips.spec.ts b/apps/expo/playwright/tests/trips.spec.ts index aa817944f1..932d534bdb 100644 --- a/apps/expo/playwright/tests/trips.spec.ts +++ b/apps/expo/playwright/tests/trips.spec.ts @@ -213,6 +213,14 @@ test.describe('Trip CRUD', () => { // router.back() may not work after page.goto-seeded history; navigate // explicitly like pack-delete does. With `deleted=true` now persisted // server-side, GET /api/trips will exclude this trip on the list reload. + // Wipe the Legend State persist entries first so an `optimistic + // deleted:true` from this run can't merge against an older `deleted:false` + // cache slice and reappear. + await page.evaluate(() => { + for (const key of Object.keys(window.localStorage)) { + if (/trips|legend|@LegendState/i.test(key)) window.localStorage.removeItem(key); + } + }); await page.goto(`${BASE_URL}/trips`); await page.waitForLoadState('networkidle'); await expect(page.getByText(tripName)).not.toBeVisible({ timeout: 10_000 }); From 206e6bab5a6dabdf9c321929553e3f141529ec32 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 00:22:13 -0600 Subject: [PATCH 74/95] =?UTF-8?q?=F0=9F=9A=A8=20chore:=20clear=20pre-push?= =?UTF-8?q?=20lint=20blockers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - apps/expo/package.json: align @packrat-ai/nativewindui to ^2.0.6 (no-duplicate-deps was flagging the 2.0.3-2 carried in by the development merge against packages/ui's ^2.0.6). - packages/api/src/db/seed-e2e-catalog.ts: convert embedAll(values, openAiKey) to a single-options-object signature so it passes the no-owned-max-params lint. --- apps/expo/package.json | 2 +- packages/api/src/db/seed-e2e-catalog.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/expo/package.json b/apps/expo/package.json index bcf5e879e7..f479581f24 100644 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -53,7 +53,7 @@ "@expo/vector-icons": "^15.0.3", "@gorhom/bottom-sheet": "^5.1.2", "@legendapp/state": "^3.0.0-beta.30", - "@packrat-ai/nativewindui": "2.0.3-2", + "@packrat-ai/nativewindui": "^2.0.6", "@packrat/api": "workspace:*", "@packrat/api-client": "workspace:*", "@packrat/config": "workspace:*", diff --git a/packages/api/src/db/seed-e2e-catalog.ts b/packages/api/src/db/seed-e2e-catalog.ts index 3dc43b1d1e..b99e5f698e 100644 --- a/packages/api/src/db/seed-e2e-catalog.ts +++ b/packages/api/src/db/seed-e2e-catalog.ts @@ -136,7 +136,8 @@ const ITEMS: SeedItem[] = [ }, ]; -async function embedAll(values: string[], openAiKey: string): Promise { +async function embedAll(opts: { values: string[]; openAiKey: string }): Promise { + const { values, openAiKey } = opts; const res = await fetch('https://api.openai.com/v1/embeddings', { method: 'POST', headers: { @@ -181,10 +182,10 @@ async function seedCatalog() { } console.log(`Generating ${newItems.length} embeddings via OpenAI...`); - const embeddings = await embedAll( - newItems.map((i) => `${i.name}. ${i.description}`), + const embeddings = await embedAll({ + values: newItems.map((i) => `${i.name}. ${i.description}`), openAiKey, - ); + }); for (let i = 0; i < newItems.length; i++) { const item = newItems[i]; From f87782222082c44e0a617d58a73ee611844553de Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 08:53:21 -0600 Subject: [PATCH 75/95] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(web-e2e):?= =?UTF-8?q?=20address=20pre-review=20audit=20feedback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adversarial + simplicity passes on the 9 e2e-fix files surfaced real bugs and dead code. Suite still 36/36 after these changes. Real bugs: - packages/api/src/auth/index.ts: collapsing the rate-limit + trustedOrigins decision onto a single BETTER_AUTH_URL prefix meant one misconfigured env could disable two security controls. Gate both on ENVIRONMENT === 'development' AND BETTER_AUTH_URL.startsWith('http://localhost'). - .github/scripts/env.ts: the script hardcoded `ENVIRONMENT=dev`, but apiEnvSchema enforces z.enum(['development','production']) and throws on parse failure. Set canonical 'development'. - apps/expo/features/trips/hooks/useDeleteTrip.ts: inspect the DELETE response and roll back the optimistic `deleted=true` flip on non-2xx (treating 404 as success). Previously a 401 or 5xx left the UI showing success while the trip resurrected on the next list refetch. - apps/expo/features/packs/utils/getPackDetailOptions.tsx: the recently added `testID={testIds.items.addItemBtn}` referenced a non-existent key (it's under testIds.packs, not items), so it rendered `testID={undefined}`. PackDetailScreen body already exposes the same testID — drop the no-op. - apps/expo/playwright/tests/trips.spec.ts: anchor the localStorage wipe regex to startsWith() so a bare `/trips/` substring match can't strip unrelated keys. Simplifications: - apps/expo/app/(app)/ai-chat.tsx: drop tokenRef + transportKey juggling. The transport's async headers() now calls authClient.getSession() each send, which is always live, never stale on token rotation, and removes the cache-coherence concern the ref introduced. - Trim verbose comments in providers/index.web.tsx, lib/auth-client.ts, lib/api/packrat.ts, TripDetailScreen.tsx that restated the code. - auth-client.ts: pass SecureStore.{setItem,getItem} directly instead of wrapping in identity arrows. - TripDetailScreen.tsx: inline performDelete into confirmDeleteTrip; the split added a helper used only twice in the same function. --- .github/scripts/env.ts | 5 +++- apps/expo/app/(app)/ai-chat.tsx | 26 +++++------------- .../packs/utils/getPackDetailOptions.tsx | 7 +---- .../features/trips/hooks/useDeleteTrip.ts | 22 ++++++++------- .../trips/screens/TripDetailScreen.tsx | 22 +++++++-------- apps/expo/lib/api/packrat.ts | 27 +++++++------------ apps/expo/lib/auth-client.ts | 14 ++++------ apps/expo/playwright/tests/trips.spec.ts | 15 ++++++----- apps/expo/providers/index.web.tsx | 18 +++---------- packages/api/src/auth/index.ts | 20 +++++++------- 10 files changed, 70 insertions(+), 106 deletions(-) diff --git a/.github/scripts/env.ts b/.github/scripts/env.ts index 9323386095..02b339a629 100644 --- a/.github/scripts/env.ts +++ b/.github/scripts/env.ts @@ -52,7 +52,10 @@ const apiFileContent = envFileContent .split('\n') .map((line) => { if (line.startsWith('ENVIRONMENT=')) { - return 'ENVIRONMENT=dev'; + // apiEnvSchema enforces z.enum(['development', 'production']) and + // throws on parse failure — keep the canonical 'development' value + // rather than the short 'dev' the script previously hardcoded. + return 'ENVIRONMENT=development'; } return line; }) diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx index ad47a4d9e0..f6238d887e 100644 --- a/apps/expo/app/(app)/ai-chat.tsx +++ b/apps/expo/app/(app)/ai-chat.tsx @@ -102,14 +102,7 @@ export default function AIChat() { locationRef.current = context.location; const { data: _authSession } = authClient.useSession(); - const token = _authSession?.session?.token ?? null; const userId = _authSession?.user?.id ?? ''; - // Keep the latest token in a ref so the transport's headers function reads - // it at request time — authClient.useSession() resolves asynchronously, - // and useChat captures `transport` at mount, so a token baked into headers - // at construction time would be stale (often null) when the user hits send. - const tokenRef = React.useRef(token); - tokenRef.current = token; const [input, setInput] = React.useState(''); const [lastUserMessage, setLastUserMessage] = React.useState(''); const [previousMessages, setPreviousMessages] = React.useState([]); @@ -205,19 +198,14 @@ export default function AIChat() { transport: new DefaultChatTransport({ fetch: expoFetch as unknown as typeof globalThis.fetch, api: `${clientEnvs.EXPO_PUBLIC_API_URL}/api/chat`, - // HttpChatTransport awaits resolve(this.headers) on every send, so an - // async function lets us pull the live token at request time. Prefer - // tokenRef (driven by useSession()), and fall back to a direct - // getSession() call when the user submits before the hook resolved — - // otherwise we'd ship Bearer "" → 401. + // HttpChatTransport awaits resolve(this.headers) per send, so this + // function runs each time. Pull the live token from authClient at + // request time — useSession() resolves asynchronously and useChat + // captures the transport at mount, so any value baked in earlier + // (or stashed in a ref) would go stale on rotation. headers: async () => { - let t = tokenRef.current; - if (!t) { - const { data } = await authClient.getSession(); - t = data?.session?.token ?? null; - tokenRef.current = t; - } - return { Authorization: `Bearer ${t ?? ''}` }; + const { data } = await authClient.getSession(); + return { Authorization: `Bearer ${data?.session?.token ?? ''}` }; }, body: () => ({ contextType: contextRef.current.contextType, diff --git a/apps/expo/features/packs/utils/getPackDetailOptions.tsx b/apps/expo/features/packs/utils/getPackDetailOptions.tsx index 34a5c91e4f..ccf3497987 100644 --- a/apps/expo/features/packs/utils/getPackDetailOptions.tsx +++ b/apps/expo/features/packs/utils/getPackDetailOptions.tsx @@ -54,12 +54,7 @@ export function getPackDetailOptions(id: string) { > - diff --git a/apps/expo/features/trips/hooks/useDeleteTrip.ts b/apps/expo/features/trips/hooks/useDeleteTrip.ts index 5685e95659..022d54ae11 100644 --- a/apps/expo/features/trips/hooks/useDeleteTrip.ts +++ b/apps/expo/features/trips/hooks/useDeleteTrip.ts @@ -5,17 +5,21 @@ import { useCallback } from 'react'; export function useDeleteTrip() { const deleteTrip = useCallback(async (id: string) => { - // Optimistically flip `deleted` in the local store so the UI hides the - // trip immediately. + // Optimistic local flip so the UI hides the trip immediately. const tripObs = obs({ store: tripsStore, id }); - if (tripObs) { - tripObs.deleted.set(true); + if (tripObs) tripObs.deleted.set(true); + + // syncedCrud's PUT strips `deleted` (UpdateTripBodySchema doesn't expose + // it), so the store-only flip never reaches the DB. Fire DELETE. + const response = await apiClient.trips({ tripId: id }).delete(); + + // 404 = already deleted elsewhere, treat as success. Any other non-2xx + // means the server still has the trip; roll back the optimistic flip + // so the next list refetch re-renders the row in its real state. + if (response.error && response.status !== 404) { + if (tripObs) tripObs.deleted.set(false); + throw new Error(`Trip delete failed (${response.status})`); } - // syncedCrud's PUT path strips the `deleted` field (UpdateTripBodySchema - // doesn't expose it), so a store-only flip never reaches the database - // and the next GET /api/trips returns the trip again. Fire DELETE - // explicitly — the trips route already supports soft-delete via DELETE. - await apiClient.trips({ tripId: id }).delete(); }, []); return deleteTrip; diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/apps/expo/features/trips/screens/TripDetailScreen.tsx index 71f7515f61..06fd1657fa 100644 --- a/apps/expo/features/trips/screens/TripDetailScreen.tsx +++ b/apps/expo/features/trips/screens/TripDetailScreen.tsx @@ -69,25 +69,21 @@ export function TripDetailScreen() { } }; - const performDelete = async () => { - await deleteTrip(id as string); - router.back(); - }; - const confirmDeleteTrip = () => { + const onConfirm = async () => { + await deleteTrip(id as string); + router.back(); + }; + // react-native-web's Alert.alert ignores button onPress callbacks, so + // the destructive handler never fires on web — drop straight to + // window.confirm there. if (Platform.OS === 'web') { - // react-native-web's Alert.alert ignores the buttons array's onPress - // callbacks, so the destructive handler never fires. Use the browser - // confirm directly — Playwright's page.on('dialog') accepts it the - // same way it would handle Alert.alert on native. - if (window.confirm(t('trips.deleteTripConfirmation'))) { - void performDelete(); - } + if (window.confirm(t('trips.deleteTripConfirmation'))) void onConfirm(); return; } Alert.alert(t('trips.deleteTrip'), t('trips.deleteTripConfirmation'), [ { text: t('common.cancel'), style: 'cancel' }, - { text: t('common.delete'), style: 'destructive', onPress: performDelete }, + { text: t('common.delete'), style: 'destructive', onPress: onConfirm }, ]); }; diff --git a/apps/expo/lib/api/packrat.ts b/apps/expo/lib/api/packrat.ts index 50ad34e008..eaa5f612ac 100644 --- a/apps/expo/lib/api/packrat.ts +++ b/apps/expo/lib/api/packrat.ts @@ -8,15 +8,15 @@ import * as SecureStore from 'expo-secure-store'; import { Platform } from 'react-native'; import { z } from 'zod'; -// The expoClient plugin serialises all cookies into SecureStore under this key. -// Parsing it locally avoids a network round-trip on every API request. +// expoClient serialises cookies into SecureStore under this key on native. const COOKIE_STORE_KEY = 'packrat_cookie'; const CookieStoreSchema = z.record(z.object({ value: z.string() })); -// expoClient stores cookies as JSON: { "better-auth.session_token": { value, expires } } -// HTTPS servers (remote dev/prod) prefix the cookie name with __Secure-; HTTP (local) does not. -// In-memory cache of the web session token. Invalidated by onNeedsReauth. +// On web expoClient short-circuits and expo-secure-store is an empty stub, so +// we fall back to authClient.getSession(). Cache the token for 30s to keep +// apiClient's per-request token lookup from tripping Better Auth's prod +// rate limit. Invalidated by onNeedsReauth. const WEB_TOKEN_CACHE_MS = 30_000; let cachedToken: string | null = null; let cachedTokenExpiresAt = 0; @@ -25,6 +25,7 @@ function parseSessionToken(cookieJson: string | null): string | null { if (!cookieJson) return null; const cookies = fromZod(CookieStoreSchema)(JSON.parse(cookieJson)); if (!cookies) return null; + // HTTPS prod prefixes the cookie with __Secure-; HTTP local doesn't. return ( cookies['better-auth.session_token']?.value ?? cookies['__Secure-better-auth.session_token']?.value ?? @@ -35,14 +36,6 @@ function parseSessionToken(cookieJson: string | null): string | null { export const apiClient = createApiClient({ baseUrl: getApiBaseUrl(), auth: { - // Native: read from SecureStore where @better-auth/expo's expoClient - // plugin persists the cookie — no network call per request. - // Web: expoClient short-circuits on web (doesn't write to SecureStore), - // and expo-secure-store ships an empty stub on web. Fall through to - // authClient.getSession() with a small in-memory cache — better-auth's - // /api/auth/get-session is rate-limited and apiClient runs it on every - // call, so an uncached implementation 429s within seconds and 401s the - // user out. The session token is valid for 7 days; 30s is conservative. getAccessToken: async () => { if (Platform.OS === 'web') { const now = Date.now(); @@ -55,16 +48,14 @@ export const apiClient = createApiClient({ const cookieStr = await SecureStore.getItemAsync(COOKIE_STORE_KEY); return parseSessionToken(cookieStr); }, - // Better Auth has no separate refresh-token endpoint; the 7-day session - // token is the only credential. Returning null here is intentional. + // Better Auth has no separate refresh-token endpoint. getRefreshToken: () => null, onAccessTokenRefreshed: () => {}, onNeedsReauth: async () => { - // Invalidate the web token cache so the next request re-fetches. cachedToken = null; cachedTokenExpiresAt = 0; - // A 401 can be transient (e.g. the server briefly returned an error). - // Verify the session is actually gone before alarming the user. + // 401 can be transient; verify the session is really gone before + // bouncing the user. const { data } = await authClient.getSession(); if (data?.session) return; store.set(needsReauthAtom, true); diff --git a/apps/expo/lib/auth-client.ts b/apps/expo/lib/auth-client.ts index 1b9be8095c..ba054f1bef 100644 --- a/apps/expo/lib/auth-client.ts +++ b/apps/expo/lib/auth-client.ts @@ -5,21 +5,17 @@ import * as SecureStore from 'expo-secure-store'; export const authClient = createAuthClient({ baseURL: getApiBaseUrl(), - // Web: the API origin differs from the page origin (Expo web on :18082, - // API on :18787, prod web at packrat.world / api.packrat.world), so the - // browser drops the better-auth session cookie unless we explicitly opt - // into credentials. @better-auth/expo's plugin sets credentials='omit' - // in its `init()` hook on native (cookies are managed via SecureStore - // there), but that init() short-circuits with `if (isWeb) return;` — - // so this top-level option only takes effect on web. + // Send the cross-origin session cookie on web (expoClient's init() that + // sets credentials:'omit' short-circuits with `if (isWeb) return`, so + // this top-level option only takes effect there). fetchOptions: { credentials: 'include' }, plugins: [ expoClient({ scheme: 'packrat', storagePrefix: 'packrat', storage: { - setItem: (key: string, value: string) => SecureStore.setItem(key, value), - getItem: (key: string) => SecureStore.getItem(key), + setItem: SecureStore.setItem, + getItem: SecureStore.getItem, }, }), ], diff --git a/apps/expo/playwright/tests/trips.spec.ts b/apps/expo/playwright/tests/trips.spec.ts index 932d534bdb..6faa1bd13e 100644 --- a/apps/expo/playwright/tests/trips.spec.ts +++ b/apps/expo/playwright/tests/trips.spec.ts @@ -210,15 +210,16 @@ test.describe('Trip CRUD', () => { const deleteResponse = await deletePromise; expect(deleteResponse.ok()).toBeTruthy(); - // router.back() may not work after page.goto-seeded history; navigate - // explicitly like pack-delete does. With `deleted=true` now persisted - // server-side, GET /api/trips will exclude this trip on the list reload. - // Wipe the Legend State persist entries first so an `optimistic - // deleted:true` from this run can't merge against an older `deleted:false` - // cache slice and reappear. + // Navigate explicitly (router.back() can't rely on the page.goto-seeded + // history). Wipe the trips persist slice first so an older cached + // `deleted:false` row can't merge over the optimistic flip on reload. + // Anchored prefixes only — a bare `/trips/` substring match would also + // strip unrelated keys whose names happen to contain `trips`. await page.evaluate(() => { for (const key of Object.keys(window.localStorage)) { - if (/trips|legend|@LegendState/i.test(key)) window.localStorage.removeItem(key); + if (key.startsWith('trips') || key.startsWith('@LegendState')) { + window.localStorage.removeItem(key); + } } }); await page.goto(`${BASE_URL}/trips`); diff --git a/apps/expo/providers/index.web.tsx b/apps/expo/providers/index.web.tsx index e848e86052..406317a70e 100644 --- a/apps/expo/providers/index.web.tsx +++ b/apps/expo/providers/index.web.tsx @@ -10,20 +10,10 @@ import { JotaiProvider } from './JotaiProvider'; import { TanstackProvider } from './TanstackProvider'; /** - * Web version of Providers. - * Removes native-only providers: - * - KeyboardProvider (react-native-keyboard-controller — no web support) - * Keeps: - * - BottomSheetModalProvider — @gorhom/bottom-sheet 5.x runs on web via - * Reanimated + gesture-handler. Screens like PackDetailScreen render - * BottomSheetView inline, which subscribes to BottomSheetModalInternalContext - * and throws on web without this provider. - * - ActionSheetProvider — feature code calls useActionSheet() to show item - * more-actions menus. Without the provider the hook returns a no-op - * showActionSheetWithOptions and the menu never appears. The provider's - * CustomActionSheet renders React.Children.only(children), so the - * direct child here MUST be a single element. - * Metro automatically picks this file over providers/index.tsx for web builds. + * Web Providers. Drops KeyboardProvider (no web support); keeps + * BottomSheetModalProvider for inline BottomSheetView and ActionSheetProvider + * for useActionSheet(). CustomActionSheet wraps its child in + * React.Children.only — keep the direct child a single element. */ export function Providers({ children }: { children: ReactNode }) { return ( diff --git a/packages/api/src/auth/index.ts b/packages/api/src/auth/index.ts index 64138dcc09..abdf37e6fa 100644 --- a/packages/api/src/auth/index.ts +++ b/packages/api/src/auth/index.ts @@ -191,12 +191,12 @@ async function buildAuth(env: ValidatedEnv): Promise { ], rateLimit: { - // Local web dev hits /api/auth/get-session aggressively (better-auth's - // useSession() hook plus apiClient's per-request token lookup), which - // trips the prod 100/min limit within seconds. Disable rate limiting - // when running against a localhost API; prod keeps the original - // throttle. - enabled: !env.BETTER_AUTH_URL.startsWith('http://localhost'), + // Drop the throttle only when ENVIRONMENT === 'development' AND + // BETTER_AUTH_URL is a localhost URL. Defense in depth: one misset + // env shouldn't disable rate limiting in production. + enabled: !( + env.ENVIRONMENT === 'development' && env.BETTER_AUTH_URL.startsWith('http://localhost') + ), window: 60, max: 100, storage: 'secondary-storage', @@ -205,10 +205,10 @@ async function buildAuth(env: ValidatedEnv): Promise { trustedOrigins: [ env.BETTER_AUTH_URL, 'packrat://', - // Local web dev — accept any localhost port so parallel agents on - // bumped ports (e.g. 18082) don't need an allowlist update. Gated on - // the API URL pointing at localhost so prod never widens trust. - ...(env.BETTER_AUTH_URL.startsWith('http://localhost') ? ['http://localhost:*'] : []), + // Local web dev — accept any localhost port. Same dual gate as above. + ...(env.ENVIRONMENT === 'development' && env.BETTER_AUTH_URL.startsWith('http://localhost') + ? ['http://localhost:*'] + : []), ], }); From 7b23e155842c55e6b38d39912ac2a6246e8b7664 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 09:48:18 -0600 Subject: [PATCH 76/95] =?UTF-8?q?=F0=9F=9A=A8=20fix(ci):=20commit=20native?= =?UTF-8?q?windui=20lockfile=20bump=20+=20restore=20auth=20storage=20wrapp?= =?UTF-8?q?ers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - bun.lock: regenerate after the apps/expo nativewindui pin moved from 2.0.3-2 → ^2.0.6 in the previous commit; CI failed every job at the install step on `--frozen-lockfile`. - apps/expo/lib/auth-client.ts: revert the SecureStore inlining; the arrow-wrapped storage adapter is the project's lib-wrapper pattern (preserves call-site arity + insulates against any later this-context changes upstream). --- apps/expo/lib/auth-client.ts | 4 ++-- bun.lock | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/expo/lib/auth-client.ts b/apps/expo/lib/auth-client.ts index ba054f1bef..dd9ff7b32a 100644 --- a/apps/expo/lib/auth-client.ts +++ b/apps/expo/lib/auth-client.ts @@ -14,8 +14,8 @@ export const authClient = createAuthClient({ scheme: 'packrat', storagePrefix: 'packrat', storage: { - setItem: SecureStore.setItem, - getItem: SecureStore.getItem, + setItem: (key: string, value: string) => SecureStore.setItem(key, value), + getItem: (key: string) => SecureStore.getItem(key), }, }), ], diff --git a/bun.lock b/bun.lock index b6ec2d3f09..beb81a4737 100644 --- a/bun.lock +++ b/bun.lock @@ -78,7 +78,7 @@ "@expo/vector-icons": "^15.0.3", "@gorhom/bottom-sheet": "^5.1.2", "@legendapp/state": "^3.0.0-beta.30", - "@packrat-ai/nativewindui": "2.0.3-2", + "@packrat-ai/nativewindui": "^2.0.6", "@packrat/api": "workspace:*", "@packrat/api-client": "workspace:*", "@packrat/config": "workspace:*", @@ -5205,8 +5205,6 @@ "p-locate/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="], - "packrat-expo-app/@packrat-ai/nativewindui": ["@packrat-ai/nativewindui@2.0.3-2", "https://npm.pkg.github.com/download/@packrat-ai/nativewindui/2.0.3-2/cae289eeb09d41ea394e5273bc4694596e3facc3", { "peerDependencies": { "@expo/vector-icons": ">=15.0.0", "@gorhom/bottom-sheet": "^5.1.2", "@react-native-community/datetimepicker": "^8.4.0", "@react-native-community/slider": "^5.0.0", "@react-native-picker/picker": "^2.11.0", "@react-native-segmented-control/segmented-control": "^2.5.0", "@react-navigation/drawer": "^7.1.1", "@react-navigation/elements": "^2.3.1", "@react-navigation/native": "^7.0.14", "@rn-primitives/alert-dialog": "^1.1.0", "@rn-primitives/avatar": "^1.0.4", "@rn-primitives/checkbox": "^1.1.0", "@rn-primitives/context-menu": "^1.1.0", "@rn-primitives/dropdown-menu": "^1.1.0", "@rn-primitives/hooks": "^1.1.0", "@rn-primitives/portal": "^1.1.0", "@rn-primitives/slot": "^1.1.0", "@shopify/flash-list": "^2.0.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "expo-blur": "~15.0.8", "expo-device": "~8.0.0", "expo-glass-effect": "*", "expo-haptics": "~15.0.8", "expo-image": "~3.0.11", "expo-linear-gradient": "~15.0.8", "expo-navigation-bar": "~5.0.10", "expo-router": ">=6.0.23", "expo-symbols": "~1.0.8", "nativewind": "^4.2.3", "react": ">=19.0.0", "react-native": ">=0.79.0", "react-native-keyboard-controller": "^1.16.7", "react-native-reanimated": ">=3.17.0", "react-native-safe-area-context": ">=5.4.0", "react-native-screens": ">=4.11.0", "react-native-uitextview": "^1.1.4", "rn-icon-mapper": "^0.0.1", "tailwind-merge": "^2.2.1" } }, "sha512-gimhxLYi3IiAqV4h0s1pzPb4mxy07XOcgRkhN8nOVRi7t6Ucb5dOGv2ArWY3WfQlSrN52dPRxzDtdsnIn33FRg=="], - "parse5/entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="], "playwright/fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="], From c17727cd08dc456a05c8052bfc679d7303599a0a Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 10:01:28 -0600 Subject: [PATCH 77/95] =?UTF-8?q?=F0=9F=90=9B=20fix(web-e2e):=20address=20?= =?UTF-8?q?Copilot=20+=20CodeRabbit=20review=20on=20#2537?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Copilot: - apps/expo/lib/auth-client.ts, lib/api/packrat.ts: stop importing expo-secure-store directly; route through expo-app/lib/secureStore (web-shim included). scripts/lint/no-direct-wrapped-imports.ts enforces this and Copilot would have caught it on review. - apps/expo/app/(app)/ai-chat.tsx: stop shipping `Authorization: Bearer ` when no token is available (better-auth treats an empty Bearer as an invalid bearer session even when the cookie session would have worked). Omit the header entirely in that case. - packages/api/src/db/seed-e2e-catalog.ts: align isStandardPostgresUrl with packages/api/src/db/index.ts — handle the postgresql:// protocol and route db.localtest.me through neon-http like the runtime does. - packages/api/src/index.ts: wire env.NEON_LOCAL_PROXY_PORT through to maybeConfigureLocalNeon (the validated value was previously unread). Signature is an options object for no-owned-max-params. CodeRabbit: - apps/expo/features/trips/hooks/useDeleteTrip.ts: wrap the DELETE call in try/catch so the optimistic `deleted=true` flip is rolled back on transport errors too (not just non-2xx responses), add a Sentry breadcrumb before the call, and capture with structured context. - apps/expo/features/trips/screens/TripDetailScreen.tsx: handle the rethrown error in confirmDeleteTrip — surface an alert (window.alert on web, Alert.alert on native) and capture to Sentry with the surface tag, so a failed delete doesn't silently disappear. - apps/expo/lib/i18n/locales/en.json: add trips.deleteTripFailed copy. - root package.json + bun.lock: tighten the kysely override from ^0.28.17 to 0.28.17 — PR description claims "pin" but the caret permitted drift that would re-break @better-auth/kysely-adapter. --- apps/expo/app/(app)/ai-chat.tsx | 9 ++++-- .../features/trips/hooks/useDeleteTrip.ts | 30 ++++++++++++++----- .../trips/screens/TripDetailScreen.tsx | 20 +++++++++++-- apps/expo/lib/api/packrat.ts | 2 +- apps/expo/lib/auth-client.ts | 2 +- apps/expo/lib/i18n/locales/en.json | 1 + bun.lock | 2 +- package.json | 2 +- packages/api/src/db/seed-e2e-catalog.ts | 12 +++++++- packages/api/src/index.ts | 13 ++++++-- 10 files changed, 72 insertions(+), 21 deletions(-) diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx index f6238d887e..9aaaa9d239 100644 --- a/apps/expo/app/(app)/ai-chat.tsx +++ b/apps/expo/app/(app)/ai-chat.tsx @@ -202,10 +202,13 @@ export default function AIChat() { // function runs each time. Pull the live token from authClient at // request time — useSession() resolves asynchronously and useChat // captures the transport at mount, so any value baked in earlier - // (or stashed in a ref) would go stale on rotation. - headers: async () => { + // (or stashed in a ref) would go stale on rotation. Omit the header + // entirely if we have no token rather than sending `Bearer ` — the + // browser still carries the cookie session via credentials:'include'. + headers: async (): Promise> => { const { data } = await authClient.getSession(); - return { Authorization: `Bearer ${data?.session?.token ?? ''}` }; + const token = data?.session?.token; + return token ? { Authorization: `Bearer ${token}` } : {}; }, body: () => ({ contextType: contextRef.current.contextType, diff --git a/apps/expo/features/trips/hooks/useDeleteTrip.ts b/apps/expo/features/trips/hooks/useDeleteTrip.ts index 022d54ae11..8b3f0d9922 100644 --- a/apps/expo/features/trips/hooks/useDeleteTrip.ts +++ b/apps/expo/features/trips/hooks/useDeleteTrip.ts @@ -1,3 +1,4 @@ +import * as Sentry from '@sentry/react-native'; import { tripsStore } from 'expo-app/features/trips/store/trips'; import { apiClient } from 'expo-app/lib/api/packrat'; import { obs } from 'expo-app/lib/store'; @@ -9,16 +10,29 @@ export function useDeleteTrip() { const tripObs = obs({ store: tripsStore, id }); if (tripObs) tripObs.deleted.set(true); - // syncedCrud's PUT strips `deleted` (UpdateTripBodySchema doesn't expose - // it), so the store-only flip never reaches the DB. Fire DELETE. - const response = await apiClient.trips({ tripId: id }).delete(); + Sentry.addBreadcrumb({ + category: 'trips', + message: 'Deleting trip', + level: 'info', + data: { tripId: id }, + }); - // 404 = already deleted elsewhere, treat as success. Any other non-2xx - // means the server still has the trip; roll back the optimistic flip - // so the next list refetch re-renders the row in its real state. - if (response.error && response.status !== 404) { + // Two failure modes: a transport rejection (network drop, fetch abort) + // and a non-2xx response (server still has the trip). In both we need + // to undo the optimistic flip, capture, and rethrow so the caller can + // surface it. 404 is treated as success since the trip is already gone. + try { + const response = await apiClient.trips({ tripId: id }).delete(); + if (response.error && response.status !== 404) { + throw new Error(`Trip delete failed (${response.status})`); + } + } catch (error) { if (tripObs) tripObs.deleted.set(false); - throw new Error(`Trip delete failed (${response.status})`); + Sentry.captureException(error, { + tags: { feature: 'trips', action: 'delete' }, + extra: { tripId: id }, + }); + throw error; } }, []); diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/apps/expo/features/trips/screens/TripDetailScreen.tsx index 06fd1657fa..696d83ea49 100644 --- a/apps/expo/features/trips/screens/TripDetailScreen.tsx +++ b/apps/expo/features/trips/screens/TripDetailScreen.tsx @@ -1,5 +1,6 @@ import { assertDefined } from '@packrat/guards'; import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui'; +import * as Sentry from '@sentry/react-native'; import { Icon } from 'expo-app/components/Icon'; import { featureFlags } from 'expo-app/config'; import { SubmitConditionReportForm } from 'expo-app/features/trail-conditions/components/SubmitConditionReportForm'; @@ -71,8 +72,23 @@ export function TripDetailScreen() { const confirmDeleteTrip = () => { const onConfirm = async () => { - await deleteTrip(id as string); - router.back(); + try { + await deleteTrip(id as string); + router.back(); + } catch (error) { + // useDeleteTrip already rolls back the optimistic flip and reports + // to Sentry; surface a UX-level error so the user knows the action + // didn't take. Alert.alert is a no-op-with-buttons on web, but its + // single-message form does render via window.alert there. + Sentry.captureException(error, { + tags: { feature: 'trips', action: 'delete', surface: 'TripDetailScreen' }, + }); + if (Platform.OS === 'web') { + window.alert(t('trips.deleteTripFailed')); + } else { + Alert.alert(t('common.error'), t('trips.deleteTripFailed')); + } + } }; // react-native-web's Alert.alert ignores button onPress callbacks, so // the destructive handler never fires on web — drop straight to diff --git a/apps/expo/lib/api/packrat.ts b/apps/expo/lib/api/packrat.ts index eaa5f612ac..b795195b5a 100644 --- a/apps/expo/lib/api/packrat.ts +++ b/apps/expo/lib/api/packrat.ts @@ -4,7 +4,7 @@ import { store } from 'expo-app/atoms/store'; import { needsReauthAtom } from 'expo-app/features/auth/atoms/authAtoms'; import { getApiBaseUrl } from 'expo-app/lib/api/getBaseUrl'; import { authClient } from 'expo-app/lib/auth-client'; -import * as SecureStore from 'expo-secure-store'; +import * as SecureStore from 'expo-app/lib/secureStore'; import { Platform } from 'react-native'; import { z } from 'zod'; diff --git a/apps/expo/lib/auth-client.ts b/apps/expo/lib/auth-client.ts index dd9ff7b32a..8094dcbcf9 100644 --- a/apps/expo/lib/auth-client.ts +++ b/apps/expo/lib/auth-client.ts @@ -1,7 +1,7 @@ import { expoClient } from '@better-auth/expo/client'; import { createAuthClient } from 'better-auth/react'; import { getApiBaseUrl } from 'expo-app/lib/api/getBaseUrl'; -import * as SecureStore from 'expo-secure-store'; +import * as SecureStore from 'expo-app/lib/secureStore'; export const authClient = createAuthClient({ baseURL: getApiBaseUrl(), diff --git a/apps/expo/lib/i18n/locales/en.json b/apps/expo/lib/i18n/locales/en.json index 8f960aee78..8b11bbb841 100644 --- a/apps/expo/lib/i18n/locales/en.json +++ b/apps/expo/lib/i18n/locales/en.json @@ -462,6 +462,7 @@ "viewDetails": "View Details", "deleteTrip": "Delete trip?", "deleteTripConfirmation": "Are you sure you want to delete this trip? This action cannot be undone.", + "deleteTripFailed": "Could not delete this trip. Please try again.", "noTripsYetTitle": "No Trips Yet", "createTripsToSee": "Create trips to start seeing your upcoming adventures!", "gotIt": "Got it", diff --git a/bun.lock b/bun.lock index beb81a4737..d22124ef16 100644 --- a/bun.lock +++ b/bun.lock @@ -799,7 +799,7 @@ "@sinclair/typebox": "^0.34.15", "elysia": "^1.4.0", "expo-sqlite": "~55.0.15", - "kysely": "^0.28.17", + "kysely": "0.28.17", "react": "19.2.6", }, "catalog": { diff --git a/package.json b/package.json index 7461bf2ca9..e3207da958 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@sinclair/typebox": "^0.34.15", "elysia": "^1.4.0", "expo-sqlite": "~55.0.15", - "kysely": "^0.28.17", + "kysely": "0.28.17", "react": "19.2.6" }, "devDependencies": { diff --git a/packages/api/src/db/seed-e2e-catalog.ts b/packages/api/src/db/seed-e2e-catalog.ts index b99e5f698e..558b64c892 100644 --- a/packages/api/src/db/seed-e2e-catalog.ts +++ b/packages/api/src/db/seed-e2e-catalog.ts @@ -23,13 +23,23 @@ import WebSocket from 'ws'; neonConfig.webSocketConstructor = WebSocket; +// Mirrors packages/api/src/db/index.ts so the seed script picks the same +// driver path as the runtime — pg for raw Postgres (postgres:// or +// postgresql://), neon-http for Neon and for the local db.localtest.me proxy +// (which speaks Neon's HTTP wire format despite the URL looking standard). const isStandardPostgresUrl = (url: string) => { try { const u = new URL(url); const host = u.hostname.toLowerCase(); const isNeonTech = host === 'neon.tech' || host.endsWith('.neon.tech'); const isNeonCom = host === 'neon.com' || host.endsWith('.neon.com'); - return u.protocol === 'postgres:' && !isNeonTech && !isNeonCom; + const isLocalNeonProxy = host === 'db.localtest.me'; + return ( + (u.protocol === 'postgres:' || u.protocol === 'postgresql:') && + !isNeonTech && + !isNeonCom && + !isLocalNeonProxy + ); } catch { return false; } diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index bd3776a81d..15d55236e4 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -128,12 +128,16 @@ function enrichEnv(env: Env): Env { // and prod share the exact same driver path — no node-postgres TCP sockets // (which workerd silently drops between requests). let neonLocalConfigured = false; -function maybeConfigureLocalNeon(databaseUrl: string | undefined): void { +function maybeConfigureLocalNeon(opts: { + databaseUrl: string | undefined; + proxyPortOverride: string | undefined; +}): void { + const { databaseUrl, proxyPortOverride } = opts; if (neonLocalConfigured || !databaseUrl) return; try { const host = new URL(databaseUrl).hostname.toLowerCase(); if (host !== 'db.localtest.me') return; - const proxyPort = '4444'; + const proxyPort = proxyPortOverride ?? '4444'; neonConfig.fetchEndpoint = (h) => h === 'db.localtest.me' ? `http://${h}:${proxyPort}/sql` : `https://${h}/sql`; neonConfig.wsProxy = (h) => (h === 'db.localtest.me' ? `${h}:${proxyPort}/v2` : `${h}/v2`); @@ -148,7 +152,10 @@ function maybeConfigureLocalNeon(databaseUrl: string | undefined): void { const workerHandler = { async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise { const e = enrichEnv(env); - maybeConfigureLocalNeon(e.NEON_DATABASE_URL); + maybeConfigureLocalNeon({ + databaseUrl: e.NEON_DATABASE_URL, + proxyPortOverride: e.NEON_LOCAL_PROXY_PORT, + }); setWorkerEnv(e as unknown as Record); // safe-cast: setWorkerEnv accepts Record; ValidatedEnv has no index signature by design return (app.fetch as unknown as CfFetchFn)(request, e, ctx); // safe-cast: Elysia's fetch has Cloudflare-specific env/ctx params not in the standard type From c760b79d6e9778f7a75641db1e01b8223c5185da Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 11:42:12 -0600 Subject: [PATCH 78/95] =?UTF-8?q?=F0=9F=90=9B=20fix(ci/web-e2e):=20bust=20?= =?UTF-8?q?stale=20node=5Fmodules=20cache=20before=20frozen=20install?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bun install --frozen-lockfile installs on top of whatever node_modules the actions/cache restore left behind. With a wide restore-keys prefix, a cache from before a workspace package.json bump can return — and because frozen-lockfile is content with adding only the missing top- level entries, nested dirs like node_modules/@babel/helper-compilation-targets/node_modules/lru-cache@5.1.1 are silently dropped. The web-export step then crashes with `TypeError: _lruCache is not a constructor` when babel falls through to the hoisted lru-cache@11 (which removed the default constructor). - Add apps/expo/package.json and root package.json to the cache key so workspace bumps invalidate the cache, not just lockfile bumps. - Drop the restore-keys partial-prefix fallback. A miss should be a clean install, not a slow drift toward an inconsistent tree. --- .github/workflows/web-e2e-tests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-e2e-tests.yml b/.github/workflows/web-e2e-tests.yml index ee58cc728d..ec69788d6f 100644 --- a/.github/workflows/web-e2e-tests.yml +++ b/.github/workflows/web-e2e-tests.yml @@ -78,10 +78,16 @@ jobs: - name: Cache node_modules uses: actions/cache@v4 with: + # Hash apps/expo/package.json too: bun's --frozen-lockfile happily + # installs on top of a partial cache, so when only the workspace + # package.json changes (e.g. nativewindui pin), the lockfile hash + # alone misses the bust and partial restore-keys hands us a stale + # tree (most recent symptom: @babel/helper-compilation-targets' + # nested lru-cache@5 disappears, breaking expo export). path: node_modules - key: node-modules-${{ runner.os }}-${{ hashFiles('bun.lock') }} - restore-keys: | - node-modules-${{ runner.os }}- + key: node-modules-${{ runner.os }}-${{ hashFiles('bun.lock', 'apps/expo/package.json', 'package.json') }} + # Drop the partial-prefix fallback. A miss should be a clean + # install, not a slow drift toward an inconsistent tree. - name: Install dependencies env: From 51e183ba7d005067b8038d2025d3725def22bf2c Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Mon, 1 Jun 2026 11:54:31 -0600 Subject: [PATCH 79/95] =?UTF-8?q?=F0=9F=90=9B=20fix(ci/web-e2e):=20adopt?= =?UTF-8?q?=20#2541's=20local-stack=20workflow=20(+=20keep=20cache=20key?= =?UTF-8?q?=20fix)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous workflow pointed playwright at the deployed API ($EXPO_PUBLIC_API_URL) but this branch's e2e changes assume a fully local stack — Docker Postgres + Neon HTTP proxy + wrangler dev — with localhost-trusted origins, ENVIRONMENT=development gating, etc. Adopt the workflow from PR #2541 (fix/web-e2e-local-api), which: - boots a local Neon proxy + Postgres via docker compose - writes a CI-only .dev.vars with valid placeholder schema entries - generates a no-AI-binding wrangler.e2e.json so wrangler dev doesn't need a CF login for the binding - runs wrangler dev locally, serves the exported web SPA on :8081 - drives playwright against that fully-local stack Re-apply the cache-key fix from c760b79d6 on top: hash workspace package.json files too and drop the wildcard restore-keys so the @babel/helper-compilation-targets nested lru-cache@5 doesn't disappear between bun.lock-equivalent updates. This file overlaps with PR #2541; the divergence is just the cache key hardening. Whichever lands second can keep that delta in a follow-up. --- .github/workflows/web-e2e-tests.yml | 138 ++++++++++++++++++++++++---- 1 file changed, 122 insertions(+), 16 deletions(-) diff --git a/.github/workflows/web-e2e-tests.yml b/.github/workflows/web-e2e-tests.yml index ec69788d6f..765309c4ea 100644 --- a/.github/workflows/web-e2e-tests.yml +++ b/.github/workflows/web-e2e-tests.yml @@ -9,6 +9,7 @@ on: - "!apps/expo/**/*.test.ts" - "!apps/expo/**/*.test.tsx" - "!apps/expo/vitest.config.ts" + - "packages/api/**" - ".github/workflows/web-e2e-tests.yml" # Note: Using `pull_request` (not `pull_request_target`) so forked PRs get # CI feedback on their own code. Secrets are unavailable for forks, so @@ -21,6 +22,7 @@ on: - "!apps/expo/**/*.test.ts" - "!apps/expo/**/*.test.tsx" - "!apps/expo/vitest.config.ts" + - "packages/api/**" - ".github/workflows/web-e2e-tests.yml" workflow_dispatch: @@ -43,9 +45,10 @@ jobs: name: Verify E2E secrets are available env: E2E_TEST_EMAIL: ${{ secrets.E2E_TEST_EMAIL }} - NEON_DATABASE_URL: ${{ secrets.NEON_DEV_DATABASE_URL }} run: | - if [ -n "$E2E_TEST_EMAIL" ] && [ -n "$NEON_DATABASE_URL" ]; then + # The local stack supplies its own DB; only the seeded test-user + # credentials are required from secrets. + if [ -n "$E2E_TEST_EMAIL" ]; then echo "ready=true" >> "$GITHUB_OUTPUT" else echo "ready=false" >> "$GITHUB_OUTPUT" @@ -60,10 +63,17 @@ jobs: timeout-minutes: 30 env: - # The E2E user is upserted into the dev DB by the seed step below, - # so both email and password are driven entirely by repo secrets. + # The seeded e2e user. The local stack auths against the local DB, so there + # is no dependency on the deployed API being reachable / CORS-open. TEST_EMAIL: ${{ secrets.E2E_TEST_EMAIL }} TEST_PASSWORD: ${{ secrets.E2E_TEST_PASSWORD }} + # The whole stack runs on localhost: a local Neon HTTP proxy in front of a + # Docker Postgres, a `wrangler dev` API worker, and the served web SPA. + # db.localtest.me resolves to 127.0.0.1 via public wildcard DNS; the API's + # maybeConfigureLocalNeon() routes the neon driver to the proxy on :4444. + NEON_DATABASE_URL: postgres://test_user:test_password@db.localtest.me/packrat_test + NEON_DATABASE_URL_READONLY: postgres://test_user:test_password@db.localtest.me/packrat_test + API_PORT: "8787" steps: - name: Checkout repository @@ -97,26 +107,119 @@ jobs: - name: Install Playwright browsers run: bunx playwright install chromium --with-deps - - name: Build Expo web app + # ── Local DB stack: Postgres + Neon HTTP/WS proxy on :4444 ────────────── + - name: Start local Neon proxy + Postgres + working-directory: packages/api + env: + POSTGRES_TEST_HOST_PORT: "5433" + NEON_PROXY_HOST_PORT: "4444" + run: | + docker compose -p packrat-e2e -f docker-compose.test.yml up -d --wait + echo "Stack up. Containers:" + docker compose -p packrat-e2e -f docker-compose.test.yml ps + + # Node-side scripts (migrate/seed) can't use the worker-only + # db.localtest.me neon-proxy routing, so they hit raw Postgres on :5433. + # The worker (.dev.vars below) uses db.localtest.me → proxy :4444. + - name: Run migrations + seed e2e user (local DB) + env: + NEON_DATABASE_URL: postgres://test_user:test_password@localhost:5433/packrat_test + E2E_TEST_EMAIL: ${{ env.TEST_EMAIL }} + E2E_TEST_PASSWORD: ${{ env.TEST_PASSWORD }} + run: | + bun run --filter @packrat/api db:migrate + bun run --filter @packrat/api db:seed:e2e-user + + # ── Write the worker's .dev.vars: real URLs + dummy-but-valid stand-ins ── + # env-validation.ts requires ~25 keys to boot; sign-in only exercises the + # DB + Better Auth, so AI/email/maps/storage keys are placeholder values + # that satisfy the schema's format constraints (sk-/pplx- prefixes, urls, + # emails) without calling those services. + - name: Write API .dev.vars for E2E + working-directory: packages/api + run: | + cat > .dev.vars < /tmp/wrangler.log 2>&1 & + echo "Waiting for API on http://localhost:${API_PORT} ..." + for i in $(seq 1 60); do + if curl -sf "http://localhost:${API_PORT}/api/health" >/dev/null 2>&1 \ + || curl -sf "http://localhost:${API_PORT}/" >/dev/null 2>&1; then + echo "API ready"; exit 0 + fi + sleep 2 + done + echo "::error::API did not become ready — wrangler log:"; cat /tmp/wrangler.log; exit 1 + + - name: Build Expo web app (against local API) working-directory: apps/expo env: - EXPO_PUBLIC_API_URL: ${{ secrets.EXPO_PUBLIC_API_URL }} + EXPO_PUBLIC_API_URL: http://localhost:8787 EXPO_PUBLIC_GOOGLE_WEB_CLIENT_ID: ${{ secrets.EXPO_PUBLIC_GOOGLE_WEB_CLIENT_ID }} EXPO_PUBLIC_R2_PUBLIC_URL: ${{ secrets.EXPO_PUBLIC_R2_PUBLIC_URL }} EXPO_PUBLIC_SENTRY_DSN: ${{ secrets.EXPO_PUBLIC_SENTRY_DSN }} EXPO_PUBLIC_GOOGLE_MAPS_API_KEY: ${{ secrets.EXPO_PUBLIC_GOOGLE_MAPS_API_KEY }} run: bunx expo export -p web --output-dir dist - - name: Seed E2E test user in dev DB - run: bun run --filter @packrat/api db:seed:e2e-user - env: - NEON_DATABASE_URL: ${{ secrets.NEON_DEV_DATABASE_URL }} - E2E_TEST_EMAIL: ${{ env.TEST_EMAIL }} - E2E_TEST_PASSWORD: ${{ secrets.E2E_TEST_PASSWORD }} - - name: Serve web app (SPA mode, port 8081) working-directory: apps/expo - # -s routes all 404s to index.html for client-side routing run: npx serve -s dist -l 8081 & - name: Wait for web server @@ -131,11 +234,14 @@ jobs: working-directory: apps/expo env: BASE_URL: http://localhost:8081 - API_URL: ${{ secrets.EXPO_PUBLIC_API_URL }} - NEON_DATABASE_URL: ${{ secrets.NEON_DEV_DATABASE_URL }} + API_URL: http://localhost:8787 CI: "true" run: bun test:web + - name: Dump API log on failure + if: failure() + run: tail -200 /tmp/wrangler.log || true + - name: Upload Playwright report on failure if: failure() uses: actions/upload-artifact@v7 From 363bac7ef1eae0d8a6508eade55d2974cc3f8378 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Fri, 5 Jun 2026 19:09:57 -0600 Subject: [PATCH 80/95] =?UTF-8?q?=F0=9F=90=9B=20fix(expo):=20restore=20typ?= =?UTF-8?q?ed=20e2e=20branch=20after=20development=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/expo/app/(app)/ai-chat.tsx | 1 + apps/expo/app/(app)/demo/index.tsx | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx index dc6b6a212c..343dfb9f70 100644 --- a/apps/expo/app/(app)/ai-chat.tsx +++ b/apps/expo/app/(app)/ai-chat.tsx @@ -103,6 +103,7 @@ export default function AIChat() { locationRef.current = context.location; const { data: _authSession } = authClient.useSession(); + const token = _authSession?.session?.token ?? null; const userId = _authSession?.user?.id ?? ''; const isAuthenticated = !!token; const [input, setInput] = React.useState(''); diff --git a/apps/expo/app/(app)/demo/index.tsx b/apps/expo/app/(app)/demo/index.tsx index d2cd374c29..d133d998fa 100644 --- a/apps/expo/app/(app)/demo/index.tsx +++ b/apps/expo/app/(app)/demo/index.tsx @@ -121,9 +121,6 @@ const COMPONENTS: ComponentItem[] = [ - From 152d8f6bdccbd1b56313214c7d4cace8a83316cf Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Fri, 5 Jun 2026 19:36:03 -0600 Subject: [PATCH 81/95] =?UTF-8?q?=F0=9F=90=9B=20fix(ci):=20provide=20valid?= =?UTF-8?q?=20R2=20URL=20for=20web=20e2e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/web-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-e2e-tests.yml b/.github/workflows/web-e2e-tests.yml index 765309c4ea..d22a948ceb 100644 --- a/.github/workflows/web-e2e-tests.yml +++ b/.github/workflows/web-e2e-tests.yml @@ -213,7 +213,7 @@ jobs: env: EXPO_PUBLIC_API_URL: http://localhost:8787 EXPO_PUBLIC_GOOGLE_WEB_CLIENT_ID: ${{ secrets.EXPO_PUBLIC_GOOGLE_WEB_CLIENT_ID }} - EXPO_PUBLIC_R2_PUBLIC_URL: ${{ secrets.EXPO_PUBLIC_R2_PUBLIC_URL }} + EXPO_PUBLIC_R2_PUBLIC_URL: ${{ secrets.EXPO_PUBLIC_R2_PUBLIC_URL || 'https://example.r2.dev' }} EXPO_PUBLIC_SENTRY_DSN: ${{ secrets.EXPO_PUBLIC_SENTRY_DSN }} EXPO_PUBLIC_GOOGLE_MAPS_API_KEY: ${{ secrets.EXPO_PUBLIC_GOOGLE_MAPS_API_KEY }} run: bunx expo export -p web --output-dir dist From b909b8805f45a1dcc52623026f19d2a679f66939 Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Fri, 5 Jun 2026 19:42:36 -0600 Subject: [PATCH 82/95] =?UTF-8?q?=F0=9F=90=9B=20fix(ci):=20use=20determini?= =?UTF-8?q?stic=20chat=20stub=20for=20web=20e2e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/web-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-e2e-tests.yml b/.github/workflows/web-e2e-tests.yml index d22a948ceb..11fcc0e8ed 100644 --- a/.github/workflows/web-e2e-tests.yml +++ b/.github/workflows/web-e2e-tests.yml @@ -158,7 +158,7 @@ jobs: RESEND_API_KEY=e2e-resend-key EMAIL_FROM=no-reply@packrattest.local AI_PROVIDER=openai - OPENAI_API_KEY=sk-e2e-placeholder + OPENAI_API_KEY=sk-e2e-stub-placeholder GOOGLE_GENERATIVE_AI_API_KEY=e2e-google-ai PERPLEXITY_API_KEY=pplx-e2e-placeholder OPENWEATHER_KEY=e2e-openweather From eca6d2a38f2660c6a116d31db030418b631db0dd Mon Sep 17 00:00:00 2001 From: Andrew Bierman Date: Fri, 5 Jun 2026 20:02:19 -0600 Subject: [PATCH 83/95] =?UTF-8?q?=F0=9F=90=9B=20fix(web-e2e):=20align=20sp?= =?UTF-8?q?ecs=20with=20current=20app=20surface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/expo/app/(app)/ai-chat.tsx | 11 +- .../features/ai/components/ChatBubble.tsx | 6 +- apps/expo/lib/testIds.ts | 9 ++ apps/expo/playwright/tests/core.spec.ts | 136 ++++++++---------- apps/expo/playwright/tests/packs.spec.ts | 62 ++++---- apps/expo/playwright/tests/trips.spec.ts | 130 ++++++++--------- 6 files changed, 177 insertions(+), 177 deletions(-) diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx index 343dfb9f70..2cad201614 100644 --- a/apps/expo/app/(app)/ai-chat.tsx +++ b/apps/expo/app/(app)/ai-chat.tsx @@ -36,6 +36,7 @@ import type { WeatherLocation } from 'expo-app/features/weather/types'; import { authClient } from 'expo-app/lib/auth-client'; import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme'; import { useTranslation } from 'expo-app/lib/hooks/useTranslation'; +import { testIds } from 'expo-app/lib/testIds'; import { getContextualGreeting, getContextualSuggestions } from 'expo-app/utils/chatContextHelpers'; import { BlurView } from 'expo-blur'; import { Stack, useLocalSearchParams } from 'expo-router'; @@ -593,6 +594,7 @@ function Composer({ > {isLoading ? ( - ) : ( - { - deleteTrip(id); - if (router.canGoBack()) router.back(); - }, - }, - ]} + - + + - + +