@oxyhq/services 5.16.44 → 5.17.1

package/src/ui/styles/spacing.ts

@@ -8,20 +8,7 @@ import { StyleSheet } from 'react-native';
 export const STEP_GAP = 12; // Vertical gap between ALL elements (illustration, title, description, textfield, buttons, etc.) - must be consistent everywhere
 export const STEP_INNER_GAP = 12; // Gap within sections (headers, cards, etc.) - must match STEP_GAP for uniformity
 
-/**
- * Re-export screen spacing constants from constants/spacing.ts
- * This allows importing all spacing constants from a single location
- */
-export {
-    SCREEN_PADDING_HORIZONTAL,
-    SCREEN_PADDING_VERTICAL,
-    SECTION_GAP,
-    SECTION_GAP_LARGE,
-    COMPONENT_GAP,
-    COMPONENT_GAP_SMALL,
-    HEADER_PADDING_TOP_OVERVIEW,
-    HEADER_PADDING_TOP_SETTINGS,
-} from '../constants/spacing';
+// Import spacing constants directly from '../constants/spacing' where needed.
 
 /**
  * Reusable stylesheet for step components
@@ -37,7 +24,7 @@ export const stepStyles = StyleSheet.create({
     },
     sectionSpacing: {
         // Layout removed - do NOT use for spacing, use explicit marginBottom: 0
-        // This is kept for backward compatibility but should not add margins
+        // This should not add margins
         marginBottom: 0,
     },
     header: {

package/src/ui/utils/avatarUtils.ts

@@ -1,7 +1,6 @@
 import type { OxyServices } from '../../core';
 import type { User } from '../../models/interfaces';
 import { useAccountStore } from '../stores/accountStore';
-import { useAuthStore } from '../stores/authStore';
 import { QueryClient } from '@tanstack/react-query';
 import { queryKeys, invalidateUserQueries, invalidateAccountQueries } from '../hooks/queries/queryKeys';
 
@@ -70,19 +69,20 @@ export async function updateProfileWithAvatar(
   oxyServices: OxyServices,
   activeSessionId: string | null,
   queryClient: QueryClient,
-  syncIdentity?: () => Promise<User>
+  options?: { syncIdentity?: () => Promise<User>; deviceId?: string }
 ): Promise<User> {
+  const { syncIdentity, deviceId } = options || {};
   // Ensure we have a valid token before making the request
   if (!oxyServices.hasValidToken() && activeSessionId) {
     try {
-      await oxyServices.getTokenBySession(activeSessionId);
+      await oxyServices.getTokenBySession(activeSessionId, deviceId);
     } catch (tokenError) {
       const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
       if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
         if (syncIdentity) {
           try {
             await syncIdentity();
-            await oxyServices.getTokenBySession(activeSessionId);
+            await oxyServices.getTokenBySession(activeSessionId, deviceId);
           } catch (syncError) {
             throw new Error('Session needs to be synced. Please try again.');
           }
@@ -104,9 +104,6 @@ export async function updateProfileWithAvatar(
       queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
     }
     
-    // Update authStore so frontend components see the changes immediately
-    useAuthStore.getState().setUser(data);
-    
     // If avatar was updated, refresh accountStore with cache-busted URL
     if (updates.avatar && activeSessionId) {
       refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
@@ -122,17 +119,23 @@ export async function updateProfileWithAvatar(
     const status = error?.status || error?.response?.status;
     
     // Handle authentication errors
-    if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-      if (activeSessionId && syncIdentity) {
-        try {
-          await syncIdentity();
-          await oxyServices.getTokenBySession(activeSessionId);
-          // Retry the update after getting token
-          return await updateProfileWithAvatar(updates, oxyServices, activeSessionId, queryClient, syncIdentity);
-        } catch (retryError) {
-          throw new Error('Authentication failed. Please sign in again.');
-        }
-      } else {
+      if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
+        if (activeSessionId && syncIdentity) {
+          try {
+            await syncIdentity();
+            await oxyServices.getTokenBySession(activeSessionId, deviceId);
+            // Retry the update after getting token
+            return await updateProfileWithAvatar(
+              updates,
+              oxyServices,
+              activeSessionId,
+              queryClient,
+              { syncIdentity, deviceId }
+            );
+          } catch (retryError) {
+            throw new Error('Authentication failed. Please sign in again.');
+          }
+        } else {
         throw new Error('No active session. Please sign in.');
       }
     }
@@ -140,4 +143,3 @@ export async function updateProfileWithAvatar(
     throw error;
   }
 }
-

package/src/ui/utils/sessionHelpers.ts

@@ -10,7 +10,6 @@ interface DeviceSession {
   user?: { id?: string; _id?: { toString(): string } };
   userId?: string;
   isCurrent?: boolean;
-  deviceInfo?: import('../../core/identity-session/types').DeviceInfo;
 }
 
 export interface FetchSessionsWithFallbackOptions {
@@ -58,12 +57,6 @@ export const mapSessionsToClient = (
       fallbackUserId ||
       '',
     isCurrent: Boolean(session.isCurrent),
-    deviceInfo: session.deviceInfo || {
-      deviceName: '',
-      deviceType: 'unknown',
-      platform: 'unknown',
-      lastActive: session.lastActive || now.toISOString(),
-    },
   }));
 };
 

package/src/utils/__tests__/validationUtils.test.ts

@@ -6,7 +6,6 @@ import {
   isValidObject,
   isValidEmail,
   isValidUsername,
-  isValidPassword,
   isValidUUID,
   isValidDate,
   isValidFileSize,
@@ -125,20 +124,6 @@ describe('Validation Utils', () => {
     });
   });
 
-  describe('isValidPassword', () => {
-    it('should return true for valid passwords', () => {
-      expect(isValidPassword('password123')).toBe(true);
-      expect(isValidPassword('mySecurePass')).toBe(true);
-      expect(isValidPassword('12345678')).toBe(true);
-    });
-
-    it('should return false for invalid passwords', () => {
-      expect(isValidPassword('')).toBe(false);
-      expect(isValidPassword('short')).toBe(false); // too short
-      expect(isValidPassword('1234567')).toBe(false); // too short
-    });
-  });
-
   describe('isValidUUID', () => {
     it('should return true for valid UUIDs', () => {
       expect(isValidUUID('123e4567-e89b-12d3-a456-426614174000')).toBe(true);
@@ -233,4 +218,4 @@ describe('Validation Utils', () => {
       expect(validateAndSanitizeUserInput(123, 'string')).toBeNull();
     });
   });
-});
+});

package/src/utils/deviceManager.ts

@@ -0,0 +1,198 @@
+export interface DeviceFingerprint {
+  userAgent: string;
+  platform: string;
+  language?: string;
+  timezone?: string;
+  screen?: {
+    width: number;
+    height: number;
+    colorDepth: number;
+  };
+}
+
+export interface StoredDeviceInfo {
+  deviceId: string;
+  deviceName?: string;
+  fingerprint?: string;
+  createdAt: string;
+  lastUsed: string;
+}
+
+/**
+ * Client-side device management utility
+ * Handles persistent device identification across app sessions
+ */
+export class DeviceManager {
+  private static DEVICE_KEY = 'oxy_device_info';
+  
+  /**
+   * Check if we're in React Native environment
+   */
+  private static isReactNative(): boolean {
+    return typeof navigator !== 'undefined' && navigator.product === 'ReactNative';
+  }
+  
+  /**
+   * Get appropriate storage for the platform
+   */
+  private static async getStorage(): Promise<{
+    getItem: (key: string) => Promise<string | null>;
+    setItem: (key: string, value: string) => Promise<void>;
+    removeItem: (key: string) => Promise<void>;
+  }> {
+    if (this.isReactNative()) {
+      try {
+        const asyncStorageModule = await import('@react-native-async-storage/async-storage');
+        const storage = (asyncStorageModule.default as unknown) as import('@react-native-async-storage/async-storage').AsyncStorageStatic;
+        return {
+          getItem: storage.getItem.bind(storage),
+          setItem: storage.setItem.bind(storage),
+          removeItem: storage.removeItem.bind(storage),
+        };
+      } catch (error) {
+        console.error('AsyncStorage not available in React Native:', error);
+        throw new Error('AsyncStorage is required in React Native environment');
+      }
+    } else {
+      // Use localStorage for web
+      return {
+        getItem: async (key: string) => localStorage.getItem(key),
+        setItem: async (key: string, value: string) => localStorage.setItem(key, value),
+        removeItem: async (key: string) => localStorage.removeItem(key)
+      };
+    }
+  }
+  
+  /**
+   * Get or create device fingerprint for current device
+   */
+  static getDeviceFingerprint(): DeviceFingerprint {
+    const fingerprint: DeviceFingerprint = {
+      userAgent: typeof navigator !== 'undefined' ? navigator.userAgent : 'unknown',
+      platform: typeof navigator !== 'undefined' ? navigator.platform : 'unknown',
+      language: typeof navigator !== 'undefined' ? navigator.language : undefined,
+      timezone: typeof Intl !== 'undefined' ? Intl.DateTimeFormat().resolvedOptions().timeZone : undefined,
+    };
+
+    // Add screen info if available
+    if (typeof screen !== 'undefined') {
+      fingerprint.screen = {
+        width: screen.width,
+        height: screen.height,
+        colorDepth: screen.colorDepth
+      };
+    }
+
+    return fingerprint;
+  }
+
+  /**
+   * Get stored device info or create new one
+   */
+  static async getDeviceInfo(): Promise<StoredDeviceInfo> {
+    try {
+      const storage = await this.getStorage();
+      const stored = await storage.getItem(this.DEVICE_KEY);
+      
+      if (stored) {
+        const deviceInfo: StoredDeviceInfo = JSON.parse(stored);
+        
+        // Update last used timestamp
+        deviceInfo.lastUsed = new Date().toISOString();
+        await this.saveDeviceInfo(deviceInfo);
+        
+        return deviceInfo;
+      }
+      
+      // Create new device info
+      return await this.createNewDeviceInfo();
+    } catch (error) {
+      console.error('Error getting device info:', error);
+      return await this.createNewDeviceInfo();
+    }
+  }
+
+  /**
+   * Create new device info and store it
+   */
+  static async createNewDeviceInfo(): Promise<StoredDeviceInfo> {
+    const deviceInfo: StoredDeviceInfo = {
+      deviceId: this.generateDeviceId(),
+      fingerprint: JSON.stringify(this.getDeviceFingerprint()),
+      createdAt: new Date().toISOString(),
+      lastUsed: new Date().toISOString()
+    };
+
+    await this.saveDeviceInfo(deviceInfo);
+    return deviceInfo;
+  }
+
+  /**
+   * Save device info to storage
+   */
+  static async saveDeviceInfo(deviceInfo: StoredDeviceInfo): Promise<void> {
+    try {
+      const storage = await this.getStorage();
+      await storage.setItem(this.DEVICE_KEY, JSON.stringify(deviceInfo));
+    } catch (error) {
+      console.error('Error saving device info:', error);
+    }
+  }
+
+  /**
+   * Update device name
+   */
+  static async updateDeviceName(deviceName: string): Promise<void> {
+    try {
+      const deviceInfo = await this.getDeviceInfo();
+      deviceInfo.deviceName = deviceName;
+      await this.saveDeviceInfo(deviceInfo);
+    } catch (error) {
+      console.error('Error updating device name:', error);
+    }
+  }
+
+  /**
+   * Clear stored device info (useful for testing or reset)
+   */
+  static async clearDeviceInfo(): Promise<void> {
+    try {
+      const storage = await this.getStorage();
+      await storage.removeItem(this.DEVICE_KEY);
+    } catch (error) {
+      console.error('Error clearing device info:', error);
+    }
+  }
+
+  /**
+   * Generate a unique device ID
+   */
+  private static generateDeviceId(): string {
+    // Use crypto.getRandomValues if available, otherwise fallback to Math.random
+    if (typeof crypto !== 'undefined' && crypto.getRandomValues) {
+      const array = new Uint8Array(32);
+      crypto.getRandomValues(array);
+      return Array.from(array, byte => byte.toString(16).padStart(2, '0')).join('');
+    } else {
+      // Fallback for environments without crypto.getRandomValues
+      return 'device_' + Date.now().toString(36) + Math.random().toString(36).substr(2);
+    }
+  }
+
+  /**
+   * Get a user-friendly device name based on platform
+   */
+  static getDefaultDeviceName(): string {
+    const fingerprint = this.getDeviceFingerprint();
+    const platform = (fingerprint.platform || '').toLowerCase();
+    
+    if (platform.includes('win')) return 'Windows Computer';
+    if (platform.includes('mac')) return 'Mac Computer';
+    if (platform.includes('linux')) return 'Linux Computer';
+    if (platform.includes('iphone')) return 'iPhone';
+    if (platform.includes('ipad')) return 'iPad';
+    if (platform.includes('android')) return 'Android Device';
+    
+    return 'Unknown Device';
+  }
+}

package/src/utils/errorUtils.ts

@@ -211,11 +211,4 @@ export function logError(error: unknown, context?: string): void {
       method: 'logError',
     });
   }
-}
-
-/**
- * Retry function with exponential backoff
- * Re-exports retryAsync for backward compatibility
- * @deprecated Use retryAsync from asyncUtils instead
- */
-export { retryAsync as retryWithBackoff } from './asyncUtils'; 
+}

package/src/utils/index.ts

@@ -1,4 +1,5 @@
-// DeviceManager removed - use IdentitySessionCore.getDeviceManager() instead
+export { DeviceManager } from './deviceManager';
+export type { DeviceFingerprint, StoredDeviceInfo } from './deviceManager';
 
 // Request utilities
 export { RequestDeduplicator, RequestQueue, SimpleLogger } from './requestUtils';

package/src/utils/sessionUtils.ts

@@ -6,26 +6,18 @@
  */
 
 import type { ClientSession } from '../models/session';
-import type { DeviceInfo } from '../core/identity-session/types';
 
 /**
  * Normalize a session to ensure all required fields are present
  */
 export function normalizeSession(session: Partial<ClientSession> & { sessionId: string }): ClientSession {
   const now = new Date().toISOString();
-  const defaultDeviceInfo: DeviceInfo = {
-    deviceName: '',
-    deviceType: 'unknown',
-    platform: 'unknown',
-    lastActive: now,
-  };
   return {
     sessionId: session.sessionId,
     deviceId: session.deviceId || '',
     expiresAt: session.expiresAt || now,
     lastActive: session.lastActive || now,
     userId: session.userId || '',
-    deviceInfo: session.deviceInfo || defaultDeviceInfo,
   };
 }
 

package/src/utils/validationUtils.ts

@@ -12,11 +12,6 @@ export const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
  */
 export const USERNAME_REGEX = /^[a-zA-Z0-9_-]{3,30}$/;
 
-/**
- * Password validation regex (at least 8 chars, 1 uppercase, 1 lowercase, 1 number)
- */
-// At least 8 characters (tests expect len>=8 without complexity requirements)
-export const PASSWORD_REGEX = /^.{8,}$/;
 
 /**
  * Validate email format
@@ -32,13 +27,6 @@ export function isValidUsername(username: string): boolean {
   return USERNAME_REGEX.test(username);
 }
 
-/**
- * Validate password strength
- */
-export function isValidPassword(password: string): boolean {
-  return PASSWORD_REGEX.test(password);
-}
-
 /**
  * Validate required string
  */

package/lib/commonjs/adapters/expo/crypto.js

@@ -1,56 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createExpoCryptoAdapter = createExpoCryptoAdapter;
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/**
- * Expo 54 Crypto Adapter
- * 
- * Uses expo-crypto which works in both React Native and Web
- */
-
-// Lazy import
-let ExpoCrypto = null;
-
-/**
- * Initialize expo-crypto
- */
-async function initExpoCrypto() {
-  if (!ExpoCrypto) {
-    try {
-      ExpoCrypto = await Promise.resolve().then(() => _interopRequireWildcard(require('expo-crypto')));
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to load expo-crypto: ${errorMessage}`);
-    }
-  }
-  return ExpoCrypto;
-}
-
-/**
- * Crypto Adapter Interface
- */
-
-/**
- * Create Expo Crypto Adapter
- */
-async function createExpoCryptoAdapter() {
-  const crypto = await initExpoCrypto();
-  return {
-    /**
-     * Generate cryptographically secure random bytes
-     */
-    async getRandomBytes(length) {
-      return crypto.getRandomBytes(length);
-    },
-    /**
-     * Hash a string using the specified algorithm
-     */
-    async digestStringAsync(algorithm, data) {
-      return crypto.digestStringAsync(algorithm, data);
-    }
-  };
-}
-//# sourceMappingURL=crypto.js.map

package/lib/commonjs/adapters/expo/crypto.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["ExpoCrypto","initExpoCrypto","Promise","resolve","then","_interopRequireWildcard","require","error","errorMessage","Error","message","String","createExpoCryptoAdapter","crypto","getRandomBytes","length","digestStringAsync","algorithm","data"],"sourceRoot":"../../../../src","sources":["adapters/expo/crypto.ts"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA,IAAIA,UAA+C,GAAG,IAAI;;AAE1D;AACA;AACA;AACA,eAAeC,cAAcA,CAAA,EAA0C;EACrE,IAAI,CAACD,UAAU,EAAE;IACf,IAAI;MACFA,UAAU,GAAG,MAAAE,OAAA,CAAAC,OAAA,GAAAC,IAAA,OAAAC,uBAAA,CAAAC,OAAA,CAAa,aAAa,GAAC;IAC1C,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAMC,YAAY,GAAGD,KAAK,YAAYE,KAAK,GAAGF,KAAK,CAACG,OAAO,GAAGC,MAAM,CAACJ,KAAK,CAAC;MAC3E,MAAM,IAAIE,KAAK,CAAC,+BAA+BD,YAAY,EAAE,CAAC;IAChE;EACF;EACA,OAAOR,UAAU;AACnB;;AAEA;AACA;AACA;;AAMA;AACA;AACA;AACO,eAAeY,uBAAuBA,CAAA,EAA2B;EACtE,MAAMC,MAAM,GAAG,MAAMZ,cAAc,CAAC,CAAC;EAErC,OAAO;IACL;AACJ;AACA;IACI,MAAMa,cAAcA,CAACC,MAAc,EAAuB;MACxD,OAAOF,MAAM,CAACC,cAAc,CAACC,MAAM,CAAC;IACtC,CAAC;IAED;AACJ;AACA;IACI,MAAMC,iBAAiBA,CAACC,SAA8B,EAAEC,IAAY,EAAmB;MACrF,OAAOL,MAAM,CAACG,iBAAiB,CAACC,SAAS,EAAEC,IAAI,CAAC;IAClD;EACF,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/adapters/expo/fetch.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createExpoFetchAdapter = createExpoFetchAdapter;
-/**
- * Expo 54 Fetch Adapter
- * 
- * Uses native fetch which works in both React Native and Web
- */
-
-/**
- * Fetch Adapter Interface
- */
-
-/**
- * Create Expo Fetch Adapter
- */
-async function createExpoFetchAdapter() {
-  if (typeof fetch === 'undefined') {
-    throw new Error('fetch is not available in this environment');
-  }
-  return {
-    fetch(url, options) {
-      return fetch(url, options);
-    }
-  };
-}
-//# sourceMappingURL=fetch.js.map

package/lib/commonjs/adapters/expo/fetch.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["createExpoFetchAdapter","fetch","Error","url","options"],"sourceRoot":"../../../../src","sources":["adapters/expo/fetch.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAKA;AACA;AACA;AACO,eAAeA,sBAAsBA,CAAA,EAA0B;EACpE,IAAI,OAAOC,KAAK,KAAK,WAAW,EAAE;IAChC,MAAM,IAAIC,KAAK,CAAC,4CAA4C,CAAC;EAC/D;EAEA,OAAO;IACLD,KAAKA,CAACE,GAAW,EAAEC,OAAqB,EAAqB;MAC3D,OAAOH,KAAK,CAACE,GAAG,EAAEC,OAAO,CAAC;IAC5B;EACF,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/adapters/expo/index.js

@@ -1,48 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createExpoAdapter = createExpoAdapter;
-var _reactNative = require("react-native");
-var _storage = require("./storage");
-var _crypto = require("./crypto");
-var _fetch = require("./fetch");
-/**
- * Expo 54 Platform Adapter
- * 
- * Provides storage, crypto, and fetch adapters for Expo 54 (React Native + Web)
- */
-
-/**
- * Platform Adapter Interface
- */
-
-/**
- * Create Expo Platform Adapter
- */
-async function createExpoAdapter() {
-  const storage = await (0, _storage.createExpoStorageAdapter)();
-  const crypto = await (0, _crypto.createExpoCryptoAdapter)();
-  const fetchAdapter = await (0, _fetch.createExpoFetchAdapter)();
-
-  // Determine platform
-  let platform = 'web';
-  try {
-    if (_reactNative.Platform.OS !== 'web') {
-      platform = 'native';
-    }
-  } catch {
-    // Fallback detection
-    if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') {
-      platform = 'native';
-    }
-  }
-  return {
-    storage,
-    crypto,
-    fetch: fetchAdapter,
-    platform
-  };
-}
-//# sourceMappingURL=index.js.map

package/lib/commonjs/adapters/expo/index.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNative","require","_storage","_crypto","_fetch","createExpoAdapter","storage","createExpoStorageAdapter","crypto","createExpoCryptoAdapter","fetchAdapter","createExpoFetchAdapter","platform","Platform","OS","navigator","product","fetch"],"sourceRoot":"../../../../src","sources":["adapters/expo/index.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AATA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;;AAQA;AACA;AACA;AACO,eAAeI,iBAAiBA,CAAA,EAA6B;EAClE,MAAMC,OAAO,GAAG,MAAM,IAAAC,iCAAwB,EAAC,CAAC;EAChD,MAAMC,MAAM,GAAG,MAAM,IAAAC,+BAAuB,EAAC,CAAC;EAC9C,MAAMC,YAAY,GAAG,MAAM,IAAAC,6BAAsB,EAAC,CAAC;;EAEnD;EACA,IAAIC,QAAsB,GAAG,KAAK;EAClC,IAAI;IACF,IAAIC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzBF,QAAQ,GAAG,QAAQ;IACrB;EACF,CAAC,CAAC,MAAM;IACN;IACA,IAAI,OAAOG,SAAS,KAAK,WAAW,IAAIA,SAAS,CAACC,OAAO,KAAK,aAAa,EAAE;MAC3EJ,QAAQ,GAAG,QAAQ;IACrB;EACF;EAEA,OAAO;IACLN,OAAO;IACPE,MAAM;IACNS,KAAK,EAAEP,YAAY;IACnBE;EACF,CAAC;AACH","ignoreList":[]}