@oxyhq/services 26.0.1 → 26.0.4

package/lib/commonjs/ui/oauth/browserAuthTransport.js

@@ -67,71 +67,73 @@ async function startWebOAuthSignIn(context, options) {
     });
     return startRedirectSignIn(context, options, 'popup-blocked');
   }
-  const prepared = await (0, _oauthHandshake.prepareAuthorizeRequest)({
-    clientId: context.clientId,
-    redirectUri: options.redirectUri,
-    authorizeBaseUrl: context.authorizeBaseUrl,
-    scope: options.scope,
-    responseMode: 'web_message'
-  });
-  if (!(0, _oauthPopup.navigateOAuthPopup)(popup, prepared.authorizeUrl)) {
-    (0, _oauthPopup.closeOAuthPopup)(popup);
-    return startRedirectSignIn(context, options, 'popup-navigation-failed');
-  }
-  const outcome = await (0, _oauthPopup.awaitOAuthPopupResult)({
-    popup,
-    expectedOrigin: prepared.authorizeOrigin,
-    expectedState: prepared.handshake.state,
-    ...(options.timeoutMs !== undefined ? {
-      timeoutMs: options.timeoutMs
-    } : {})
-  });
-  // The IdP closes itself after delivering; this covers every other outcome
-  // (timeout, mismatch, an error the IdP reported before closing).
-  (0, _oauthPopup.closeOAuthPopup)(popup);
-  switch (outcome.kind) {
-    case 'code':
-      {
-        const completion = await (0, _completeOAuthCode.completeOAuthCode)({
-          oxyServices: context.oxyServices,
-          clientId: context.clientId,
-          code: outcome.code,
-          returnedState: outcome.state,
-          handshake: prepared.handshake,
-          redirectUri: options.redirectUri,
-          commitSession: context.commitSession
-        });
-        return completion.ok ? {
-          status: 'signed-in'
-        } : {
+  try {
+    const prepared = await (0, _oauthHandshake.prepareAuthorizeRequest)({
+      clientId: context.clientId,
+      redirectUri: options.redirectUri,
+      authorizeBaseUrl: context.authorizeBaseUrl,
+      scope: options.scope,
+      responseMode: 'web_message'
+    });
+    if (!(0, _oauthPopup.navigateOAuthPopup)(popup, prepared.authorizeUrl)) {
+      return startRedirectSignIn(context, options, 'popup-navigation-failed');
+    }
+    const outcome = await (0, _oauthPopup.awaitOAuthPopupResult)({
+      popup,
+      expectedOrigin: prepared.authorizeOrigin,
+      expectedState: prepared.handshake.state,
+      redirectUri: options.redirectUri,
+      ...(options.timeoutMs !== undefined ? {
+        timeoutMs: options.timeoutMs
+      } : {})
+    });
+    switch (outcome.kind) {
+      case 'code':
+        {
+          const completion = await (0, _completeOAuthCode.completeOAuthCode)({
+            oxyServices: context.oxyServices,
+            clientId: context.clientId,
+            code: outcome.code,
+            returnedState: outcome.state,
+            handshake: prepared.handshake,
+            redirectUri: options.redirectUri,
+            commitSession: context.commitSession
+          });
+          return completion.ok ? {
+            status: 'signed-in'
+          } : {
+            status: 'failed',
+            reason: completion.reason
+          };
+        }
+      case 'oauth-error':
+        return {
+          status: 'failed',
+          reason: 'idp-error',
+          description: outcome.errorDescription ?? outcome.error
+        };
+      case 'state-mismatch':
+        return {
           status: 'failed',
-          reason: completion.reason
+          reason: 'state-mismatch'
         };
-      }
-    case 'oauth-error':
-      return {
-        status: 'failed',
-        reason: 'idp-error',
-        description: outcome.errorDescription ?? outcome.error
-      };
-    case 'state-mismatch':
-      return {
-        status: 'failed',
-        reason: 'state-mismatch'
-      };
-    case 'closed':
-      return {
-        status: 'cancelled'
-      };
-    case 'timed-out':
-      return {
-        status: 'timed-out'
-      };
-    case 'unsupported':
-      return {
-        status: 'unsupported',
-        reason: 'no-browser'
-      };
+      case 'closed':
+        return {
+          status: 'cancelled'
+        };
+      case 'timed-out':
+        return {
+          status: 'timed-out'
+        };
+      case 'unsupported':
+        return {
+          status: 'unsupported',
+          reason: 'no-browser'
+        };
+    }
+  } finally {
+    // Covers throws after open (prepare/exchange/commit) and every settled outcome.
+    (0, _oauthPopup.closeOAuthPopup)(popup);
   }
 }
 
@@ -153,7 +155,7 @@ async function startRedirectSignIn(context, options, via) {
     authorizeBaseUrl: context.authorizeBaseUrl,
     scope: options.scope
   });
-  if (!(0, _core.persistOAuthHandshake)(prepared.handshake.state, prepared.handshake.codeVerifier)) {
+  if (!(0, _core.persistOAuthHandshake)(prepared.handshake.state, prepared.handshake.codeVerifier, options.redirectUri)) {
     return {
       status: 'failed',
       reason: 'handshake-storage'

package/lib/commonjs/ui/oauth/browserAuthTransport.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_oauthNavigation","_isWebBrowser","_completeOAuthCode","_oauthHandshake","_oauthPopup","startWebOAuthSignIn","context","options","isWebBrowser","closeOAuthPopup","popup","status","reason","identityBound","clientId","mode","undefined","openOAuthPopup","startRedirectSignIn","logger","warn","component","prepared","prepareAuthorizeRequest","redirectUri","authorizeBaseUrl","scope","responseMode","navigateOAuthPopup","authorizeUrl","outcome","awaitOAuthPopupResult","expectedOrigin","authorizeOrigin","expectedState","handshake","state","timeoutMs","kind","completion","completeOAuthCode","oxyServices","code","returnedState","commitSession","ok","description","errorDescription","error","via","persistOAuthHandshake","codeVerifier","redirectToAuthorize"],"sourceRoot":"../../../../src","sources":["ui/oauth/browserAuthTransport.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_oauthNavigation","_isWebBrowser","_completeOAuthCode","_oauthHandshake","_oauthPopup","startWebOAuthSignIn","context","options","isWebBrowser","closeOAuthPopup","popup","status","reason","identityBound","clientId","mode","undefined","openOAuthPopup","startRedirectSignIn","logger","warn","component","prepared","prepareAuthorizeRequest","redirectUri","authorizeBaseUrl","scope","responseMode","navigateOAuthPopup","authorizeUrl","outcome","awaitOAuthPopupResult","expectedOrigin","authorizeOrigin","expectedState","handshake","state","timeoutMs","kind","completion","completeOAuthCode","oxyServices","code","returnedState","commitSession","ok","description","errorDescription","error","via","persistOAuthHandshake","codeVerifier","redirectToAuthorize"],"sourceRoot":"../../../../src","sources":["ui/oauth/browserAuthTransport.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/oauth/oauthPopup.js

@@ -126,6 +126,47 @@ function closeOAuthPopup(popup) {
   }
 }
 
+/**
+ * When the IdP falls back to a top-level redirect inside the popup (no usable
+ * `window.opener`), a same-origin `redirect_uri` is readable from the opener.
+ * Cross-origin redirects remain opaque and are not handled here.
+ */
+function readSameOriginRedirectOutcome(popup, redirectUri, expectedState) {
+  try {
+    const href = popup.location.href;
+    if (!href) return null;
+    const popupUrl = new URL(href);
+    const expected = new URL((0, _core.canonicalizeOAuthRedirectUri)(redirectUri));
+    if (popupUrl.origin !== expected.origin) return null;
+    if (popupUrl.pathname !== expected.pathname) return null;
+    const oauthError = popupUrl.searchParams.get('error');
+    if (oauthError) {
+      const errorDescription = popupUrl.searchParams.get('error_description') ?? undefined;
+      return {
+        kind: 'oauth-error',
+        error: oauthError,
+        ...(errorDescription ? {
+          errorDescription
+        } : {})
+      };
+    }
+    const code = popupUrl.searchParams.get('code');
+    if (!code) return null;
+    const state = popupUrl.searchParams.get('state');
+    if (!state || state !== expectedState) return {
+      kind: 'state-mismatch'
+    };
+    return {
+      kind: 'code',
+      code,
+      state
+    };
+  } catch {
+    // Cross-origin navigation — the popup URL is opaque to the opener.
+    return null;
+  }
+}
+
 /** Inputs for {@link awaitOAuthPopupResult}. */
 
 /**
@@ -144,6 +185,7 @@ function awaitOAuthPopupResult(options) {
     popup,
     expectedOrigin,
     expectedState,
+    redirectUri,
     timeoutMs = DEFAULT_OAUTH_POPUP_TIMEOUT_MS
   } = options;
   const host = messageEventHost();
@@ -213,6 +255,11 @@ function awaitOAuthPopupResult(options) {
       kind: 'timed-out'
     }), timeoutMs);
     closePoll = setInterval(() => {
+      const redirectOutcome = readSameOriginRedirectOutcome(popup, redirectUri, expectedState);
+      if (redirectOutcome) {
+        settle(redirectOutcome);
+        return;
+      }
       if (!popup.closed) return;
       // Stop sampling immediately: the window is gone and only the in-flight
       // message (if any) can still change the outcome.

package/lib/commonjs/ui/oauth/oauthPopup.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_oauthPopupMessages","OXY_OAUTH_POPUP_WINDOW_NAME","exports","POPUP_FEATURES","DEFAULT_OAUTH_POPUP_TIMEOUT_MS","CLOSE_POLL_INTERVAL_MS","CLOSE_GRACE_MS","messageEventHost","win","globalThis","window","addEventListener","removeEventListener","openOAuthPopup","open","error","logger","warn","component","navigateOAuthPopup","popup","url","location","href","closeOAuthPopup","closed","close","debug","awaitOAuthPopupResult","options","expectedOrigin","expectedState","timeoutMs","host","Promise","resolve","kind","settled","timeoutTimer","closeGraceTimer","closePoll","onMessage","event","verdict","readOAuthPopupMessage","settle","code","state","errorDescription","cleanup","clearTimeout","clearInterval","outcome","setTimeout","setInterval"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopup.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_oauthPopupMessages","OXY_OAUTH_POPUP_WINDOW_NAME","exports","POPUP_FEATURES","DEFAULT_OAUTH_POPUP_TIMEOUT_MS","CLOSE_POLL_INTERVAL_MS","CLOSE_GRACE_MS","messageEventHost","win","globalThis","window","addEventListener","removeEventListener","openOAuthPopup","open","error","logger","warn","component","navigateOAuthPopup","popup","url","location","href","closeOAuthPopup","closed","close","debug","readSameOriginRedirectOutcome","redirectUri","expectedState","popupUrl","URL","expected","canonicalizeOAuthRedirectUri","origin","pathname","oauthError","searchParams","get","errorDescription","undefined","kind","code","state","awaitOAuthPopupResult","options","expectedOrigin","timeoutMs","host","Promise","resolve","settled","timeoutTimer","closeGraceTimer","closePoll","onMessage","event","verdict","readOAuthPopupMessage","settle","cleanup","clearTimeout","clearInterval","outcome","setTimeout","setInterval","redirectOutcome"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopup.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/screens/AccountMembersScreen.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _reactNative = require("react-native");
 var _Ionicons = _interopRequireDefault(require("@expo/vector-icons/Ionicons"));
 var _reactQuery = require("@tanstack/react-query");
-var _bloom = require("@oxyhq/bloom");
+var _toast = require("@oxyhq/bloom/toast");
 var _surfaces = require("@oxyhq/bloom/surfaces");
 var _theme = require("@oxyhq/bloom/theme");
 var _typography = require("@oxyhq/bloom/typography");
@@ -101,16 +101,16 @@ const AccountMembersScreen = ({
       setInviteRole('editor');
       setInviteError(null);
       invalidateMembers();
-      _bloom.toast.success(t('accounts.members.toasts.added') || 'Member added');
+      _toast.toast.success(t('accounts.members.toasts.added') || 'Member added');
     },
     onError: error => {
       if (isUserNotFound(error)) {
         const message = t('accounts.members.errors.userNotFound') || 'User not found';
         setInviteError(message);
-        _bloom.toast.error(message);
+        _toast.toast.error(message);
         return;
       }
-      _bloom.toast.error(errorMessage(error, t('accounts.members.toasts.addFailed') || 'Failed to add member'));
+      _toast.toast.error(errorMessage(error, t('accounts.members.toasts.addFailed') || 'Failed to add member'));
     }
   });
   const updateMutation = (0, _reactQuery.useMutation)({
@@ -120,10 +120,10 @@ const AccountMembersScreen = ({
     }),
     onSuccess: () => {
       invalidateMembers();
-      _bloom.toast.success(t('accounts.members.toasts.roleUpdated') || 'Role updated');
+      _toast.toast.success(t('accounts.members.toasts.roleUpdated') || 'Role updated');
     },
     onError: error => {
-      _bloom.toast.error(errorMessage(error, t('accounts.members.toasts.roleFailed') || 'Failed to update role'));
+      _toast.toast.error(errorMessage(error, t('accounts.members.toasts.roleFailed') || 'Failed to update role'));
     }
   });
   const removeMutation = (0, _reactQuery.useMutation)({
@@ -131,10 +131,10 @@ const AccountMembersScreen = ({
     mutationFn: memberId => oxyServices.removeAccountMember(id, memberId),
     onSuccess: () => {
       invalidateMembers();
-      _bloom.toast.success(t('accounts.members.toasts.removed') || 'Member removed');
+      _toast.toast.success(t('accounts.members.toasts.removed') || 'Member removed');
     },
     onError: error => {
-      _bloom.toast.error(errorMessage(error, t('accounts.members.toasts.removeFailed') || 'Failed to remove member'));
+      _toast.toast.error(errorMessage(error, t('accounts.members.toasts.removeFailed') || 'Failed to remove member'));
     }
   });
   const transferMutation = (0, _reactQuery.useMutation)({
@@ -144,10 +144,10 @@ const AccountMembersScreen = ({
     }),
     onSuccess: () => {
       invalidateMembers();
-      _bloom.toast.success(t('accounts.members.toasts.transferred') || 'Ownership transferred');
+      _toast.toast.success(t('accounts.members.toasts.transferred') || 'Ownership transferred');
     },
     onError: error => {
-      _bloom.toast.error(errorMessage(error, t('accounts.members.toasts.transferFailed') || 'Failed to transfer ownership'));
+      _toast.toast.error(errorMessage(error, t('accounts.members.toasts.transferFailed') || 'Failed to transfer ownership'));
     }
   });
   const handleInvite = (0, _react.useCallback)(() => {

package/lib/commonjs/ui/screens/AccountMembersScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_Ionicons","_interopRequireDefault","_reactQuery","_bloom","_surfaces","_theme","_typography","_button","_textField","_divider","_OxyContext","_useI18n","_useSurfaceHeader","_jsxRuntime","e","__esModule","default","ASSIGNABLE_ROLES","errorMessage","error","fallback","Error","message","isUserNotFound","toLowerCase","includes","AccountMembersScreen","onClose","goBack","accountId","bloomTheme","useTheme","colors","t","useI18n","useSurfaceHeader","title","subtitle","oxyServices","canUsePrivateApi","useOxy","queryClient","useQueryClient","id","roleLabel","useCallback","role","charAt","toUpperCase","slice","accountQuery","useQuery","queryKey","queryFn","getAccount","enabled","length","callerMembership","data","permissions","isImplicitOwner","relationship","can","permission","canRead","canInvite","canUpdate","canRemove","canTransfer","membersQuery","listAccountMembers","members","useMemo","ownerCount","filter","m","invalidateMembers","invalidateQueries","inviteIdentifier","setInviteIdentifier","useState","inviteRole","setInviteRole","inviteError","setInviteError","inviteMutation","useMutation","mutationKey","mutationFn","input","inviteAccountMember","onSuccess","toast","success","onError","updateMutation","updateAccountMember","memberId","removeMutation","removeAccountMember","transferMutation","userId","transferAccountOwnership","handleInvite","usernameOrEmail","trim","mutate","handleChangeRole","member","_id","confirmRemove","confirmed","surfaces","confirm","confirmLabel","cancelLabel","destructive","confirmTransfer","memberUserId","jsx","Fragment","children","View","className","Text","jsxs","isLoading","TextField","isInvalid","TextFieldInput","floatingLabel","label","value","onChangeText","autoCapitalize","autoCorrect","autoComplete","style","color","negative","map","selected","TouchableOpacity","accessibilityRole","accessibilityState","accessibilityLabel","onPress","activeOpacity","backgroundColor","primary","card","borderWidth","borderColor","border","background","text","Button","variant","disabled","isPending","loading","ActivityIndicator","index","isOwner","isLastOwner","canEditThisRole","canRemoveThisMember","canTransferToThis","status","Divider","spacing","numberOfLines","primarySubtle","name","size","icon","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/screens/AccountMembersScreen.tsx"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAKA,IAAAE,SAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AACA,IAAAQ,WAAA,GAAAR,OAAA;AACA,IAAAS,OAAA,GAAAT,OAAA;AACA,IAAAU,UAAA,GAAAV,OAAA;AACA,IAAAW,QAAA,GAAAX,OAAA;AAGA,IAAAY,WAAA,GAAAZ,OAAA;AACA,IAAAa,QAAA,GAAAb,OAAA;AACA,IAAAc,iBAAA,GAAAd,OAAA;AAA6D,IAAAe,WAAA,GAAAf,OAAA;AAAA,SAAAG,uBAAAa,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE7D;;AAGA,MAAMG,gBAAkC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC;AAEhG,MAAMC,YAAY,GAAGA,CAACC,KAAc,EAAEC,QAAgB,KACpDD,KAAK,YAAYE,KAAK,IAAIF,KAAK,CAACG,OAAO,GAAGH,KAAK,CAACG,OAAO,GAAGF,QAAQ;AAEpE,MAAMG,cAAc,GAAIJ,KAAc,IAAc;EAClD,MAAMG,OAAO,GAAGH,KAAK,YAAYE,KAAK,GAAGF,KAAK,CAACG,OAAO,CAACE,WAAW,CAAC,CAAC,GAAG,EAAE;EACzE,OAAOF,OAAO,CAACG,QAAQ,CAAC,gBAAgB,CAAC,IAAIH,OAAO,CAACG,QAAQ,CAAC,WAAW,CAAC;AAC5E,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,MAAMC,oBAA+C,GAAGA,CAAC;EAAEC,OAAO;EAAEC,MAAM;EAAEC;AAAU,CAAC,KAAK;EAC1F,MAAMC,UAAU,GAAG,IAAAC,eAAQ,EAAC,CAAC;EAC7B,MAAMC,MAAM,GAAGF,UAAU,CAACE,MAAM;EAChC,MAAM;IAAEC;EAAE,CAAC,GAAG,IAAAC,gBAAO,EAAC,CAAC;EAEvB,IAAAC,kCAAgB,EAAC;IACfC,KAAK,EAAEH,CAAC,CAAC,wBAAwB,CAAC,IAAI,SAAS;IAC/CI,QAAQ,EAAEJ,CAAC,CAAC,2BAA2B,CAAC,IAAI;EAC9C,CAAC,CAAC;EACF,MAAM;IAAEK,WAAW;IAAEC;EAAiB,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EAClD,MAAMC,WAAW,GAAG,IAAAC,0BAAc,EAAC,CAAC;EAEpC,MAAMC,EAAE,GAAG,OAAOd,SAAS,KAAK,QAAQ,GAAGA,SAAS,GAAG,EAAE;EAEzD,MAAMe,SAAS,GAAG,IAAAC,kBAAW,EAAEC,IAAiB,IAAa;IAC3D,OAAOb,CAAC,CAAC,kBAAkBa,IAAI,QAAQ,CAAC,IAAIA,IAAI,CAACC,MAAM,CAAC,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC,GAAGF,IAAI,CAACG,KAAK,CAAC,CAAC,CAAC;EAC1F,CAAC,EAAE,CAAChB,CAAC,CAAC,CAAC;EAEP,MAAMiB,YAAY,GAAG,IAAAC,oBAAQ,EAAC;IAC5BC,QAAQ,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAET,EAAE,CAAC;IACpCU,OAAO,EAAEA,CAAA,KAAMf,WAAW,CAACgB,UAAU,CAACX,EAAE,CAAC;IACzCY,OAAO,EAAEhB,gBAAgB,IAAII,EAAE,CAACa,MAAM,GAAG;EAC3C,CAAC,CAAC;EAEF,MAAMC,gBAAgB,GAAGP,YAAY,CAACQ,IAAI,EAAED,gBAAgB,IAAI,IAAI;EACpE,MAAME,WAAW,GAAGF,gBAAgB,EAAEE,WAAW,IAAI,EAAE;EACvD;EACA;EACA,MAAMC,eAAe,GAAGV,YAAY,CAACQ,IAAI,GACrCR,YAAY,CAACQ,IAAI,CAACG,YAAY,KAAK,QAAQ,GAC3C,KAAK;EACT,MAAMC,GAAG,GAAG,IAAAjB,kBAAW,EACpBkB,UAAkB,IAAcH,eAAe,IAAID,WAAW,CAAClC,QAAQ,CAACsC,UAAU,CAAC,EACpF,CAACH,eAAe,EAAED,WAAW,CAC/B,CAAC;EAED,MAAMK,OAAO,GAAGF,GAAG,CAAC,cAAc,CAAC;EACnC,MAAMG,SAAS,GAAGH,GAAG,CAAC,gBAAgB,CAAC;EACvC,MAAMI,SAAS,GAAGJ,GAAG,CAAC,gBAAgB,CAAC;EACvC,MAAMK,SAAS,GAAGL,GAAG,CAAC,gBAAgB,CAAC;EACvC,MAAMM,WAAW,GAAGN,GAAG,CAAC,oBAAoB,CAAC;EAE7C,MAAMO,YAAY,GAAG,IAAAlB,oBAAQ,EAAC;IAC5BC,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,EAAET,EAAE,CAAC;IACrCU,OAAO,EAAEA,CAAA,KAAMf,WAAW,CAACgC,kBAAkB,CAAC3B,EAAE,CAAC;IACjDY,OAAO,EAAEhB,gBAAgB,IAAII,EAAE,CAACa,MAAM,GAAG,CAAC,IAAIQ;EAChD,CAAC,CAAC;EACF,MAAMO,OAAO,GAAG,IAAAC,cAAO,EAAkB,MAAMH,YAAY,CAACX,IAAI,IAAI,EAAE,EAAE,CAACW,YAAY,CAACX,IAAI,CAAC,CAAC;EAC5F,MAAMe,UAAU,GAAG,IAAAD,cAAO,EAAC,MAAMD,OAAO,CAACG,MAAM,CAAEC,CAAC,IAAKA,CAAC,CAAC7B,IAAI,KAAK,OAAO,CAAC,CAACU,MAAM,EAAE,CAACe,OAAO,CAAC,CAAC;EAE7F,MAAMK,iBAAiB,GAAG,IAAA/B,kBAAW,EAAC,MAAM;IAC1CJ,WAAW,CAACoC,iBAAiB,CAAC;MAAEzB,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,EAAET,EAAE;IAAE,CAAC,CAAC;IACxEF,WAAW,CAACoC,iBAAiB,CAAC;MAAEzB,QAAQ,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAET,EAAE;IAAE,CAAC,CAAC;EACzE,CAAC,EAAE,CAACF,WAAW,EAAEE,EAAE,CAAC,CAAC;;EAErB;EACA,MAAM,CAACmC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAG,IAAAC,eAAQ,EAAC,EAAE,CAAC;EAC5D,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAF,eAAQ,EAAiB,QAAQ,CAAC;EACtE,MAAM,CAACG,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAJ,eAAQ,EAAgB,IAAI,CAAC;EAEnE,MAAMK,cAAc,GAAG,IAAAC,uBAAW,EAAC;IACjCC,WAAW,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE5C,EAAE,CAAC;IAClD6C,UAAU,EAAGC,KAAwD,IACnEnD,WAAW,CAACoD,mBAAmB,CAAC/C,EAAE,EAAE8C,KAAK,CAAC;IAC5CE,SAAS,EAAEA,CAAA,KAAM;MACfZ,mBAAmB,CAAC,EAAE,CAAC;MACvBG,aAAa,CAAC,QAAQ,CAAC;MACvBE,cAAc,CAAC,IAAI,CAAC;MACpBR,iBAAiB,CAAC,CAAC;MACnBgB,YAAK,CAACC,OAAO,CAAC5D,CAAC,CAAC,+BAA+B,CAAC,IAAI,cAAc,CAAC;IACrE,CAAC;IACD6D,OAAO,EAAG3E,KAAK,IAAK;MAClB,IAAII,cAAc,CAACJ,KAAK,CAAC,EAAE;QACzB,MAAMG,OAAO,GAAGW,CAAC,CAAC,sCAAsC,CAAC,IAAI,gBAAgB;QAC7EmD,cAAc,CAAC9D,OAAO,CAAC;QACvBsE,YAAK,CAACzE,KAAK,CAACG,OAAO,CAAC;QACpB;MACF;MACAsE,YAAK,CAACzE,KAAK,CAACD,YAAY,CAACC,KAAK,EAAEc,CAAC,CAAC,mCAAmC,CAAC,IAAI,sBAAsB,CAAC,CAAC;IACpG;EACF,CAAC,CAAC;EAEF,MAAM8D,cAAc,GAAG,IAAAT,uBAAW,EAAC;IACjCC,WAAW,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE5C,EAAE,CAAC;IAClD6C,UAAU,EAAGC,KAAiD,IAC5DnD,WAAW,CAAC0D,mBAAmB,CAACrD,EAAE,EAAE8C,KAAK,CAACQ,QAAQ,EAAE;MAAEnD,IAAI,EAAE2C,KAAK,CAAC3C;IAAK,CAAC,CAAC;IAC3E6C,SAAS,EAAEA,CAAA,KAAM;MACff,iBAAiB,CAAC,CAAC;MACnBgB,YAAK,CAACC,OAAO,CAAC5D,CAAC,CAAC,qCAAqC,CAAC,IAAI,cAAc,CAAC;IAC3E,CAAC;IACD6D,OAAO,EAAG3E,KAAK,IAAK;MAClByE,YAAK,CAACzE,KAAK,CAACD,YAAY,CAACC,KAAK,EAAEc,CAAC,CAAC,oCAAoC,CAAC,IAAI,uBAAuB,CAAC,CAAC;IACtG;EACF,CAAC,CAAC;EAEF,MAAMiE,cAAc,GAAG,IAAAZ,uBAAW,EAAC;IACjCC,WAAW,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE5C,EAAE,CAAC;IAClD6C,UAAU,EAAGS,QAAgB,IAAK3D,WAAW,CAAC6D,mBAAmB,CAACxD,EAAE,EAAEsD,QAAQ,CAAC;IAC/EN,SAAS,EAAEA,CAAA,KAAM;MACff,iBAAiB,CAAC,CAAC;MACnBgB,YAAK,CAACC,OAAO,CAAC5D,CAAC,CAAC,iCAAiC,CAAC,IAAI,gBAAgB,CAAC;IACzE,CAAC;IACD6D,OAAO,EAAG3E,KAAK,IAAK;MAClByE,YAAK,CAACzE,KAAK,CAACD,YAAY,CAACC,KAAK,EAAEc,CAAC,CAAC,sCAAsC,CAAC,IAAI,yBAAyB,CAAC,CAAC;IAC1G;EACF,CAAC,CAAC;EAEF,MAAMmE,gBAAgB,GAAG,IAAAd,uBAAW,EAAC;IACnCC,WAAW,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE5C,EAAE,CAAC;IACpD6C,UAAU,EAAGa,MAAc,IAAK/D,WAAW,CAACgE,wBAAwB,CAAC3D,EAAE,EAAE;MAAE0D;IAAO,CAAC,CAAC;IACpFV,SAAS,EAAEA,CAAA,KAAM;MACff,iBAAiB,CAAC,CAAC;MACnBgB,YAAK,CAACC,OAAO,CAAC5D,CAAC,CAAC,qCAAqC,CAAC,IAAI,uBAAuB,CAAC;IACpF,CAAC;IACD6D,OAAO,EAAG3E,KAAK,IAAK;MAClByE,YAAK,CAACzE,KAAK,CAACD,YAAY,CAACC,KAAK,EAAEc,CAAC,CAAC,wCAAwC,CAAC,IAAI,8BAA8B,CAAC,CAAC;IACjH;EACF,CAAC,CAAC;EAEF,MAAMsE,YAAY,GAAG,IAAA1D,kBAAW,EAAC,MAAM;IACrC,MAAM2D,eAAe,GAAG1B,gBAAgB,CAAC2B,IAAI,CAAC,CAAC;IAC/C,IAAI,CAACD,eAAe,EAAE;MACpBpB,cAAc,CAACnD,CAAC,CAAC,4CAA4C,CAAC,IAAI,qCAAqC,CAAC;MACxG;IACF;IACAmD,cAAc,CAAC,IAAI,CAAC;IACpBC,cAAc,CAACqB,MAAM,CAAC;MAAEF,eAAe;MAAE1D,IAAI,EAAEmC;IAAW,CAAC,CAAC;EAC9D,CAAC,EAAE,CAACH,gBAAgB,EAAEG,UAAU,EAAEI,cAAc,EAAEpD,CAAC,CAAC,CAAC;EAErD,MAAM0E,gBAAgB,GAAG,IAAA9D,kBAAW,EAAC,CAAC+D,MAAqB,EAAE9D,IAAiB,KAAK;IACjF,IAAIA,IAAI,KAAK8D,MAAM,CAAC9D,IAAI,IAAIA,IAAI,KAAK,OAAO,EAAE;MAC5C;IACF;IACAiD,cAAc,CAACW,MAAM,CAAC;MAAET,QAAQ,EAAEW,MAAM,CAACC,GAAG;MAAE/D;IAAK,CAAC,CAAC;EACvD,CAAC,EAAE,CAACiD,cAAc,CAAC,CAAC;EAEpB,MAAMe,aAAa,GAAG,IAAAjE,kBAAW,EAAC,MAAO+D,MAAqB,IAAK;IACjE,MAAMG,SAAS,GAAG,MAAMC,kBAAQ,CAACC,OAAO,CAAC;MACvC7E,KAAK,EAAEH,CAAC,CAAC,sCAAsC,CAAC,IAAI,eAAe;MACnEX,OAAO,EACLW,CAAC,CAAC,4CAA4C,CAAC,IAC5C,iEAAiE;MACtEiF,YAAY,EAAEjF,CAAC,CAAC,iCAAiC,CAAC,IAAI,QAAQ;MAC9DkF,WAAW,EAAElF,CAAC,CAAC,eAAe,CAAC,IAAI,QAAQ;MAC3CmF,WAAW,EAAE;IACf,CAAC,CAAC;IACF,IAAIL,SAAS,EAAEb,cAAc,CAACQ,MAAM,CAACE,MAAM,CAACC,GAAG,CAAC;EAClD,CAAC,EAAE,CAACX,cAAc,EAAEjE,CAAC,CAAC,CAAC;EAEvB,MAAMoF,eAAe,GAAG,IAAAxE,kBAAW,EAAC,MAAO+D,MAAqB,IAAK;IACnE,MAAMG,SAAS,GAAG,MAAMC,kBAAQ,CAACC,OAAO,CAAC;MACvC7E,KAAK,EAAEH,CAAC,CAAC,wCAAwC,CAAC,IAAI,oBAAoB;MAC1EX,OAAO,EACLW,CAAC,CAAC,8CAA8C,CAAC,IAC9C,yGAAyG;MAC9GiF,YAAY,EAAEjF,CAAC,CAAC,mCAAmC,CAAC,IAAI,oBAAoB;MAC5EkF,WAAW,EAAElF,CAAC,CAAC,eAAe,CAAC,IAAI,QAAQ;MAC3CmF,WAAW,EAAE;IACf,CAAC,CAAC;IACF,IAAIL,SAAS,EAAEX,gBAAgB,CAACM,MAAM,CAACE,MAAM,CAACU,YAAY,CAAC;EAC7D,CAAC,EAAE,CAAClB,gBAAgB,EAAEnE,CAAC,CAAC,CAAC;EAEzB,IAAI,CAACU,EAAE,EAAE;IACP,oBACE,IAAA9B,WAAA,CAAA0G,GAAA,EAAA1G,WAAA,CAAA2G,QAAA;MAAAC,QAAA,eACE,IAAA5G,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;QAACC,SAAS,EAAC,0DAA0D;QAAAF,QAAA,eACxE,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;UAACD,SAAS,EAAC,qDAAqD;UAAAF,QAAA,EAClExF,CAAC,CAAC,wCAAwC,CAAC,IAAI;QAAsB,CAClE;MAAC,CACH;IAAC,CACP,CAAC;EAEP;EAEA,oBACI,IAAApB,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA2H,IAAI;IAACC,SAAS,EAAC,uDAAuD;IAAAF,QAAA,GAClE,CAACvE,YAAY,CAAC4E,SAAS,IAAI,CAAC9D,OAAO,gBAClC,IAAAnD,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;MAACD,SAAS,EAAC,iEAAiE;MAAAF,QAAA,EAC9ExF,CAAC,CAAC,sCAAsC,CAAC,IAAI;IAA6C,CACvF,CAAC,GACL,IAAI,EAGPgC,SAAS,gBACR,IAAApD,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA2H,IAAI;MAACC,SAAS,EAAC,mDAAmD;MAAAF,QAAA,gBACjE,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;QAACD,SAAS,EAAC,mCAAmC;QAAAF,QAAA,EAChDxF,CAAC,CAAC,+BAA+B,CAAC,IAAI;MAAc,CACjD,CAAC,eACP,IAAApB,WAAA,CAAA0G,GAAA,EAAC/G,UAAA,CAAAuH,SAAS;QAACC,SAAS,EAAE,CAAC,CAAC7C,WAAY;QAAAsC,QAAA,eAClC,IAAA5G,WAAA,CAAA0G,GAAA,EAAC/G,UAAA,CAAAyH,cAAc;UACbC,aAAa;UACbC,KAAK,EAAElG,CAAC,CAAC,yCAAyC,CAAC,IAAI,mBAAoB;UAC3EmG,KAAK,EAAEtD,gBAAiB;UACxBuD,YAAY,EAAGD,KAAK,IAAK;YACvBrD,mBAAmB,CAACqD,KAAK,CAAC;YAC1B,IAAIjD,WAAW,EAAEC,cAAc,CAAC,IAAI,CAAC;UACvC,CAAE;UACF4C,SAAS,EAAE,CAAC,CAAC7C,WAAY;UACzBmD,cAAc,EAAC,MAAM;UACrBC,WAAW,EAAE,KAAM;UACnBC,YAAY,EAAC;QAAK,CACnB;MAAC,CACO,CAAC,EACXrD,WAAW,gBACV,IAAAtE,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;QAACD,SAAS,EAAC,sCAAsC;QAACc,KAAK,EAAE;UAAEC,KAAK,EAAE1G,MAAM,CAAC2G;QAAS,CAAE;QAAAlB,QAAA,EACtFtC;MAAW,CACR,CAAC,GACL,IAAI,eAER,IAAAtE,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;QAACD,SAAS,EAAC,0DAA0D;QAAAF,QAAA,EACvExF,CAAC,CAAC,mCAAmC,CAAC,IAAI;MAAM,CAC7C,CAAC,eACP,IAAApB,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;QAACC,SAAS,EAAC,gCAAgC;QAAAF,QAAA,EAC7CxG,gBAAgB,CAAC2H,GAAG,CAAE9F,IAAI,IAAK;UAC9B,MAAM+F,QAAQ,GAAG/F,IAAI,KAAKmC,UAAU;UACpC,oBACE,IAAApE,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA+I,gBAAgB;YAEfC,iBAAiB,EAAC,OAAO;YACzBC,kBAAkB,EAAE;cAAEH;YAAS,CAAE;YACjCI,kBAAkB,EAAErG,SAAS,CAACE,IAAI,CAAE;YACpCoG,OAAO,EAAEA,CAAA,KAAMhE,aAAa,CAACpC,IAAI,CAAE;YACnCqG,aAAa,EAAE,GAAI;YACnBxB,SAAS,EAAC,4CAA4C;YACtDc,KAAK,EAAE;cACLW,eAAe,EAAEP,QAAQ,GAAG7G,MAAM,CAACqH,OAAO,GAAGrH,MAAM,CAACsH,IAAI;cACxDC,WAAW,EAAE,CAAC;cACdC,WAAW,EAAEX,QAAQ,GAAG7G,MAAM,CAACqH,OAAO,GAAGrH,MAAM,CAACyH;YAClD,CAAE;YAAAhC,QAAA,eAEF,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;cACHD,SAAS,EAAC,4BAA4B;cACtCc,KAAK,EAAE;gBAAEC,KAAK,EAAEG,QAAQ,GAAG7G,MAAM,CAAC0H,UAAU,GAAG1H,MAAM,CAAC2H;cAAK,CAAE;cAAAlC,QAAA,EAE5D7E,SAAS,CAACE,IAAI;YAAC,CACZ;UAAC,GAlBFA,IAmBW,CAAC;QAEvB,CAAC;MAAC,CACE,CAAC,eAEP,IAAAjC,WAAA,CAAA0G,GAAA,EAAChH,OAAA,CAAAqJ,MAAM;QACLC,OAAO,EAAC,SAAS;QACjBX,OAAO,EAAE3C,YAAa;QACtBuD,QAAQ,EAAEzE,cAAc,CAAC0E,SAAS,IAAI,CAACjF,gBAAgB,CAAC2B,IAAI,CAAC,CAAE;QAC/DuD,OAAO,EAAE3E,cAAc,CAAC0E,SAAU;QAClCd,kBAAkB,EAAEhH,CAAC,CAAC,gCAAgC,CAAC,IAAI,YAAa;QACxE0F,SAAS,EAAC,QAAQ;QAAAF,QAAA,EAEjBxF,CAAC,CAAC,gCAAgC,CAAC,IAAI;MAAY,CAC9C,CAAC;IAAA,CACL,CAAC,GACL,IAAI,EAGP+B,OAAO,gBACN,IAAAnD,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;MAACC,SAAS,EAAC,aAAa;MAAAF,QAAA,EAC1BpD,YAAY,CAACyD,SAAS,gBACrB,IAAAjH,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;QAACC,SAAS,EAAC,0BAA0B;QAAAF,QAAA,eACxC,IAAA5G,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAAkK,iBAAiB;UAACvB,KAAK,EAAE1G,MAAM,CAACqH;QAAQ,CAAE;MAAC,CACxC,CAAC,GACL9E,OAAO,CAACf,MAAM,KAAK,CAAC,gBACtB,IAAA3C,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;QAACD,SAAS,EAAC,iEAAiE;QAAAF,QAAA,EAC9ExF,CAAC,CAAC,wBAAwB,CAAC,IAAI;MAAiB,CAC7C,CAAC,gBAEP,IAAApB,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;QAACC,SAAS,EAAC,2CAA2C;QAAAF,QAAA,EACxDlD,OAAO,CAACqE,GAAG,CAAC,CAAChC,MAAM,EAAEsD,KAAK,KAAK;UAC9B,MAAMC,OAAO,GAAGvD,MAAM,CAAC9D,IAAI,KAAK,OAAO;UACvC,MAAMsH,WAAW,GAAGD,OAAO,IAAI1F,UAAU,IAAI,CAAC;UAC9C,MAAM4F,eAAe,GAAGnG,SAAS,IAAI,CAACiG,OAAO;UAC7C,MAAMG,mBAAmB,GAAGnG,SAAS,IAAI,CAACiG,WAAW,KAAK,CAACD,OAAO,IAAI/F,WAAW,CAAC;UAClF,MAAMmG,iBAAiB,GAAGnG,WAAW,IAAI,CAAC+F,OAAO,IAAIvD,MAAM,CAAC4D,MAAM,KAAK,QAAQ;UAC/E,oBACE,IAAA3J,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA2H,IAAI;YAAAD,QAAA,GACFyC,KAAK,GAAG,CAAC,gBAAG,IAAArJ,WAAA,CAAA0G,GAAA,EAAC9G,QAAA,CAAAgK,OAAO;cAAC/B,KAAK,EAAE1G,MAAM,CAACyH,MAAO;cAACiB,OAAO,EAAE;YAAE,CAAE,CAAC,GAAG,IAAI,eACjE,IAAA7J,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA2H,IAAI;cAACC,SAAS,EAAC,wBAAwB;cAAAF,QAAA,gBACtC,IAAA5G,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA2H,IAAI;gBAACC,SAAS,EAAC,mCAAmC;gBAAAF,QAAA,gBACjD,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;kBAACD,SAAS,EAAC,0CAA0C;kBAACgD,aAAa,EAAE,CAAE;kBAAAlD,QAAA,EACzEb,MAAM,CAACU;gBAAY,CAChB,CAAC,EACN6C,OAAO,gBACN,IAAAtJ,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;kBAACC,SAAS,EAAC,2CAA2C;kBAACc,KAAK,EAAE;oBAAEW,eAAe,EAAEpH,MAAM,CAAC4I;kBAAc,CAAE;kBAAAnD,QAAA,eAC3G,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;oBAACD,SAAS,EAAC,4BAA4B;oBAACc,KAAK,EAAE;sBAAEC,KAAK,EAAE1G,MAAM,CAACqH;oBAAQ,CAAE;oBAAA5B,QAAA,EAC3E7E,SAAS,CAAC,OAAO;kBAAC,CACf;gBAAC,CACH,CAAC,GACL,IAAI,EACPgE,MAAM,CAAC4D,MAAM,KAAK,QAAQ,gBACzB,IAAA3J,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;kBAACC,SAAS,EAAC,2CAA2C;kBAACc,KAAK,EAAE;oBAAEW,eAAe,EAAEpH,MAAM,CAACsH;kBAAK,CAAE;kBAAA7B,QAAA,eAClG,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;oBAACD,SAAS,EAAC,0DAA0D;oBAAAF,QAAA,EACvEb,MAAM,CAAC4D;kBAAM,CACV;gBAAC,CACH,CAAC,GACL,IAAI;cAAA,CACJ,CAAC,EAGNH,eAAe,gBACd,IAAAxJ,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA2H,IAAI;gBAACC,SAAS,EAAC,gCAAgC;gBAAAF,QAAA,EAC7CxG,gBAAgB,CAAC2H,GAAG,CAAE9F,IAAI,IAAK;kBAC9B,MAAM+F,QAAQ,GAAG/F,IAAI,KAAK8D,MAAM,CAAC9D,IAAI;kBACrC,oBACE,IAAAjC,WAAA,CAAA0G,GAAA,EAACxH,YAAA,CAAA+I,gBAAgB;oBAEfC,iBAAiB,EAAC,OAAO;oBACzBC,kBAAkB,EAAE;sBAAEH;oBAAS,CAAE;oBACjCI,kBAAkB,EAAErG,SAAS,CAACE,IAAI,CAAE;oBACpCoG,OAAO,EAAEA,CAAA,KAAMvC,gBAAgB,CAACC,MAAM,EAAE9D,IAAI,CAAE;oBAC9CgH,QAAQ,EAAE/D,cAAc,CAACgE,SAAU;oBACnCZ,aAAa,EAAE,GAAI;oBACnBxB,SAAS,EAAC,4CAA4C;oBACtDc,KAAK,EAAE;sBACLW,eAAe,EAAEP,QAAQ,GAAG7G,MAAM,CAACqH,OAAO,GAAGrH,MAAM,CAACsH,IAAI;sBACxDC,WAAW,EAAE,CAAC;sBACdC,WAAW,EAAEX,QAAQ,GAAG7G,MAAM,CAACqH,OAAO,GAAGrH,MAAM,CAACyH;oBAClD,CAAE;oBAAAhC,QAAA,eAEF,IAAA5G,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;sBACHD,SAAS,EAAC,4BAA4B;sBACtCc,KAAK,EAAE;wBAAEC,KAAK,EAAEG,QAAQ,GAAG7G,MAAM,CAAC0H,UAAU,GAAG1H,MAAM,CAAC2H;sBAAK,CAAE;sBAAAlC,QAAA,EAE5D7E,SAAS,CAACE,IAAI;oBAAC,CACZ;kBAAC,GAnBFA,IAoBW,CAAC;gBAEvB,CAAC;cAAC,CACE,CAAC,GACL,CAACqH,OAAO,gBACV,IAAAtJ,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;gBAACD,SAAS,EAAC,+CAA+C;gBAAAF,QAAA,EAC5D7E,SAAS,CAACgE,MAAM,CAAC9D,IAAI;cAAC,CACnB,CAAC,GACL,IAAI,EAGNyH,iBAAiB,IAAID,mBAAmB,gBACxC,IAAAzJ,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA2H,IAAI;gBAACC,SAAS,EAAC,kCAAkC;gBAAAF,QAAA,GAC/C8C,iBAAiB,gBAChB,IAAA1J,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA+I,gBAAgB;kBACfC,iBAAiB,EAAC,QAAQ;kBAC1BE,kBAAkB,EAAEhH,CAAC,CAAC,mCAAmC,CAAC,IAAI,oBAAqB;kBACnFiH,OAAO,EAAEA,CAAA,KAAM7B,eAAe,CAACT,MAAM,CAAE;kBACvCuC,aAAa,EAAE,GAAI;kBACnBxB,SAAS,EAAC,mCAAmC;kBAAAF,QAAA,gBAE7C,IAAA5G,WAAA,CAAA0G,GAAA,EAACvH,SAAA,CAAAgB,OAAQ;oBAAC6J,IAAI,EAAC,yBAAyB;oBAACC,IAAI,EAAE,EAAG;oBAACpC,KAAK,EAAE1G,MAAM,CAAC+I;kBAAK,CAAE,CAAC,eACzE,IAAAlK,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;oBAACD,SAAS,EAAC,gDAAgD;oBAAAF,QAAA,EAC7DxF,CAAC,CAAC,mCAAmC,CAAC,IAAI;kBAAoB,CAC3D,CAAC;gBAAA,CACS,CAAC,GACjB,IAAI,EACPqI,mBAAmB,gBAClB,IAAAzJ,WAAA,CAAAgH,IAAA,EAAC9H,YAAA,CAAA+I,gBAAgB;kBACfC,iBAAiB,EAAC,QAAQ;kBAC1BE,kBAAkB,EAAEhH,CAAC,CAAC,iCAAiC,CAAC,IAAI,eAAgB;kBAC5EiH,OAAO,EAAEA,CAAA,KAAMpC,aAAa,CAACF,MAAM,CAAE;kBACrCuC,aAAa,EAAE,GAAI;kBACnBxB,SAAS,EAAC,mCAAmC;kBAAAF,QAAA,gBAE7C,IAAA5G,WAAA,CAAA0G,GAAA,EAACvH,SAAA,CAAAgB,OAAQ;oBAAC6J,IAAI,EAAC,eAAe;oBAACC,IAAI,EAAE,EAAG;oBAACpC,KAAK,EAAE1G,MAAM,CAACb;kBAAM,CAAE,CAAC,eAChE,IAAAN,WAAA,CAAA0G,GAAA,EAACjH,WAAA,CAAAsH,IAAI;oBAACD,SAAS,EAAC,4BAA4B;oBAACc,KAAK,EAAE;sBAAEC,KAAK,EAAE1G,MAAM,CAACb;oBAAM,CAAE;oBAAAsG,QAAA,EACzExF,CAAC,CAAC,iCAAiC,CAAC,IAAI;kBAAQ,CAC7C,CAAC;gBAAA,CACS,CAAC,GACjB,IAAI;cAAA,CACJ,CAAC,GACL,IAAI;YAAA,CACJ,CAAC;UAAA,GA7FE2E,MAAM,CAACC,GA8FZ,CAAC;QAEX,CAAC;MAAC,CACE;IACP,CACG,CAAC,GACL,IAAI;EAAA,CACN,CAAC;AAEb,CAAC;AAAC,IAAAmE,QAAA,GAAAC,OAAA,CAAAjK,OAAA,GAEaU,oBAAoB","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_Ionicons","_interopRequireDefault","_reactQuery","_toast","_surfaces","_theme","_typography","_button","_textField","_divider","_OxyContext","_useI18n","_useSurfaceHeader","_jsxRuntime","e","__esModule","default","ASSIGNABLE_ROLES","errorMessage","error","fallback","Error","message","isUserNotFound","toLowerCase","includes","AccountMembersScreen","onClose","goBack","accountId","bloomTheme","useTheme","colors","t","useI18n","useSurfaceHeader","title","subtitle","oxyServices","canUsePrivateApi","useOxy","queryClient","useQueryClient","id","roleLabel","useCallback","role","charAt","toUpperCase","slice","accountQuery","useQuery","queryKey","queryFn","getAccount","enabled","length","callerMembership","data","permissions","isImplicitOwner","relationship","can","permission","canRead","canInvite","canUpdate","canRemove","canTransfer","membersQuery","listAccountMembers","members","useMemo","ownerCount","filter","m","invalidateMembers","invalidateQueries","inviteIdentifier","setInviteIdentifier","useState","inviteRole","setInviteRole","inviteError","setInviteError","inviteMutation","useMutation","mutationKey","mutationFn","input","inviteAccountMember","onSuccess","toast","success","onError","updateMutation","updateAccountMember","memberId","removeMutation","removeAccountMember","transferMutation","userId","transferAccountOwnership","handleInvite","usernameOrEmail","trim","mutate","handleChangeRole","member","_id","confirmRemove","confirmed","surfaces","confirm","confirmLabel","cancelLabel","destructive","confirmTransfer","memberUserId","jsx","Fragment","children","View","className","Text","jsxs","isLoading","TextField","isInvalid","TextFieldInput","floatingLabel","label","value","onChangeText","autoCapitalize","autoCorrect","autoComplete","style","color","negative","map","selected","TouchableOpacity","accessibilityRole","accessibilityState","accessibilityLabel","onPress","activeOpacity","backgroundColor","primary","card","borderWidth","borderColor","border","background","text","Button","variant","disabled","isPending","loading","ActivityIndicator","index","isOwner","isLastOwner","canEditThisRole","canRemoveThisMember","canTransferToThis","status","Divider","spacing","numberOfLines","primarySubtle","name","size","icon","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/screens/AccountMembersScreen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/screens/AccountSettingsScreen.js

@@ -7,19 +7,20 @@ exports.default = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
 var _reactQuery = require("@tanstack/react-query");
-var _bloom = require("@oxyhq/bloom");
+var _toast = require("@oxyhq/bloom/toast");
 var _surfaces = require("@oxyhq/bloom/surfaces");
 var _theme = require("@oxyhq/bloom/theme");
 var _typography = require("@oxyhq/bloom/typography");
 var _button = require("@oxyhq/bloom/button");
 var _textField = require("@oxyhq/bloom/text-field");
 var _settingsList = require("@oxyhq/bloom/settings-list");
+var _core = require("@oxyhq/core");
 var _SettingsIcon = require("../components/SettingsIcon.js");
 var _OxyContext = require("../context/OxyContext.js");
 var _useI18n = require("../hooks/useI18n.js");
 var _useSurfaceHeader = require("../hooks/useSurfaceHeader.js");
 var _jsxRuntime = require("react/jsx-runtime");
-const DISPLAY_NAME_MAX = 50;
+const DISPLAY_NAME_MAX = _core.MAX_DISPLAY_NAME_LENGTH;
 const BIO_MAX = 160;
 const errorMessage = (error, fallback) => error instanceof Error && error.message ? error.message : fallback;
 
@@ -66,14 +67,13 @@ const AccountSettingsScreen = ({
   // Editable fields, seeded lazily from the loaded account once.
   const [seeded, setSeeded] = (0, _react.useState)(false);
   const [displayName, setDisplayName] = (0, _react.useState)('');
+  const [displayNameError, setDisplayNameError] = (0, _react.useState)('');
   const [bio, setBio] = (0, _react.useState)('');
 
   // Seed the form from the account during render (no useEffect): the first time
   // the query resolves we capture its values into local edit state.
   if (node && !seeded) {
-    const first = node.account?.name?.first ?? '';
-    const last = node.account?.name?.last ?? '';
-    setDisplayName([first, last].filter(Boolean).join(' '));
+    setDisplayName(node.account?.name?.displayName ?? (0, _core.getNormalizedUserHandle)(node.account) ?? '');
     setBio(node.account?.bio ?? '');
     setSeeded(true);
   }
@@ -87,10 +87,10 @@ const AccountSettingsScreen = ({
       queryClient.invalidateQueries({
         queryKey: ['accounts']
       });
-      _bloom.toast.success(t('accounts.settings.toasts.saved') || 'Account updated');
+      _toast.toast.success(t('accounts.settings.toasts.saved') || 'Account updated');
     },
     onError: error => {
-      _bloom.toast.error(errorMessage(error, t('accounts.settings.toasts.saveFailed') || 'Failed to update account'));
+      _toast.toast.error(errorMessage(error, t('accounts.settings.toasts.saveFailed') || 'Failed to update account'));
     }
   });
   const archiveMutation = (0, _reactQuery.useMutation)({
@@ -108,11 +108,11 @@ const AccountSettingsScreen = ({
       queryClient.invalidateQueries({
         queryKey: ['accounts']
       });
-      _bloom.toast.success(t('accounts.settings.toasts.archived') || 'Account archived');
+      _toast.toast.success(t('accounts.settings.toasts.archived') || 'Account archived');
       (onClose ?? goBack)?.();
     },
     onError: error => {
-      _bloom.toast.error(errorMessage(error, t('accounts.settings.toasts.archiveFailed') || 'Failed to archive account'));
+      _toast.toast.error(errorMessage(error, t('accounts.settings.toasts.archiveFailed') || 'Failed to archive account'));
     }
   });
   const handleArchive = (0, _react.useCallback)(async () => {
@@ -125,8 +125,22 @@ const AccountSettingsScreen = ({
     });
     if (confirmed) archiveMutation.mutate();
   }, [archiveMutation, t]);
+  const handleDisplayNameChange = (0, _react.useCallback)(value => {
+    setDisplayName(value);
+    const trimmed = value.trim();
+    if (!trimmed) {
+      setDisplayNameError('');
+      return;
+    }
+    const nameParts = trimmed.split(/\s+/).filter(Boolean);
+    const first = nameParts[0] || '';
+    const last = nameParts.length > 1 ? nameParts.slice(1).join(' ') : '';
+    const invalidPart = [first, last].find(part => part && !(0, _core.isValidDisplayName)(part));
+    setDisplayNameError(invalidPart ? t('accounts.settings.displayName.invalidChars') || _core.DISPLAY_NAME_INVALID_MESSAGE : '');
+  }, [t]);
   const handleSave = (0, _react.useCallback)(() => {
     const trimmed = displayName.trim();
+    if (!trimmed || displayNameError) return;
     const nameParts = trimmed.split(/\s+/).filter(Boolean);
     const first = nameParts[0] || '';
     const last = nameParts.length > 1 ? nameParts.slice(1).join(' ') : undefined;
@@ -137,7 +151,7 @@ const AccountSettingsScreen = ({
       },
       bio: bio.trim() ? bio.trim() : null
     });
-  }, [displayName, bio, updateMutation]);
+  }, [displayName, displayNameError, bio, updateMutation]);
   const title = t('accounts.settings.title') || 'Account settings';
   const accountHandle = (0, _react.useMemo)(() => {
     const username = node?.account?.username;
@@ -172,14 +186,22 @@ const AccountSettingsScreen = ({
       }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [canUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
           className: "gap-space-16 p-space-16 rounded-radius-20 bg-fill",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_textField.TextField, {
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_textField.TextFieldInput, {
-              floatingLabel: true,
-              label: t('accounts.settings.displayName.label') || 'Display name',
-              value: displayName,
-              onChangeText: setDisplayName,
-              maxLength: DISPLAY_NAME_MAX
-            })
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+            className: "gap-space-4",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_textField.TextField, {
+              isInvalid: Boolean(displayNameError),
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_textField.TextFieldInput, {
+                floatingLabel: true,
+                label: t('accounts.settings.displayName.label') || 'Display name',
+                value: displayName,
+                onChangeText: handleDisplayNameChange,
+                isInvalid: Boolean(displayNameError),
+                maxLength: DISPLAY_NAME_MAX
+              })
+            }), displayNameError ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
+              className: "text-caption font-caption text-negative px-space-4",
+              children: displayNameError
+            }) : null]
           }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
             className: "gap-space-4",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_textField.TextField, {
@@ -200,7 +222,7 @@ const AccountSettingsScreen = ({
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.Button, {
             variant: "primary",
             onPress: handleSave,
-            disabled: updateMutation.isPending || !displayName.trim(),
+            disabled: updateMutation.isPending || !displayName.trim() || Boolean(displayNameError),
             loading: updateMutation.isPending,
             accessibilityLabel: t('accounts.settings.save') || 'Save changes',
             className: "w-full",