fontdue-js 2.22.0 → 2.22.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.22.2
+
+- Fixed country order variables (e.g. *Fair Price Adjustment*) not updating when the licensee country changed at checkout. The unified checkout now clears the option id when syncing the licensee country to a country-type variable, so the server can re-evaluate the multiplier against the new country.
+
+## 2.22.1
+
+- Added `corsErrorModal` config option (default `true`). Set to `false` on `<FontdueProvider>` or the script-tag config to suppress the CORS error modal entirely while keeping console warnings and auto-reload polling.
+- GraphQL requests now retry up to 2 times (with a 1s delay) before falling through to CORS error detection. Transient network failures no longer trigger a false-positive CORS modal.
+
 ## 2.22.0
 
 - **`features="*"` wildcard on `<TypeTester>` and `<TypeTesters>`** to expose every OpenType feature each font supports without curating a list. Custom *stylistic set* names defined by the foundry are picked up automatically. Works on both the standalone `<fontdue-type-tester>` HTML element and the React `<TypeTester>` / `<TypeTesters>` components.

package/dist/components/ConfigContext.d.ts

@@ -29,6 +29,7 @@ export interface Config {
     typeTester?: TypeTesterConfig;
     stripe?: StripeConfig;
     tracking?: TrackingConfig;
+    corsErrorModal?: boolean;
 }
 export declare const makeConfig: (config?: Config) => {
     typeTester: {
@@ -99,6 +100,7 @@ export declare const makeConfig: (config?: Config) => {
         consentMessage: string | undefined;
         segment: SegmentConfig | undefined;
     };
+    corsErrorModal: boolean;
 };
 declare const _default: React.Context<{
     typeTester: {
@@ -169,5 +171,6 @@ declare const _default: React.Context<{
         consentMessage: string | undefined;
         segment: SegmentConfig | undefined;
     };
+    corsErrorModal: boolean;
 }>;
 export default _default;

package/dist/components/ConfigContext.js

@@ -79,7 +79,8 @@ const makeConfig = config => {
       consentRequired: (config === null || config === void 0 ? void 0 : (_config$tracking2 = config.tracking) === null || _config$tracking2 === void 0 ? void 0 : _config$tracking2.consentRequired) ?? false,
       consentMessage: config === null || config === void 0 ? void 0 : (_config$tracking3 = config.tracking) === null || _config$tracking3 === void 0 ? void 0 : _config$tracking3.consentMessage,
       segment: config === null || config === void 0 ? void 0 : (_config$tracking4 = config.tracking) === null || _config$tracking4 === void 0 ? void 0 : _config$tracking4.segment
-    }
+    },
+    corsErrorModal: (config === null || config === void 0 ? void 0 : config.corsErrorModal) ?? true
   };
 };
 exports.makeConfig = makeConfig;

package/dist/components/FontdueProvider/FontdueProviderClientComponent.js

@@ -15,6 +15,7 @@ var _reducer = require("../../reducer");
 var _ComponentsContext = _interopRequireDefault(require("../ComponentsContext"));
 var _UrlContext = _interopRequireDefault(require("../UrlContext"));
 var _retryImport = _interopRequireDefault(require("../../retryImport"));
+var _corsError = require("../../corsError");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -35,6 +36,7 @@ function FontdueProviderClientComponent(_ref) {
     stripeIntegration
   });
   const configValue = (0, _ConfigContext.makeConfig)(config);
+  (0, _corsError.setCorsModalEnabled)(configValue.corsErrorModal);
   const storeRef = (0, _react.useRef)(store ?? (0, _reducer.createDefaultStore)(config));
   return /*#__PURE__*/_react.default.createElement(_reactRelay.RelayEnvironmentProvider, {
     environment: environment

package/dist/components/elements/StoreModalUnifiedCheckout.js

@@ -354,13 +354,17 @@ function StoreModalUnifiedCheckout(_ref2) {
     // Only update if the country has actually changed
     if (countryVariableSelection.countryCode === licenseeIdentity.country) return;
 
-    // Build updated selections array
+    // Build updated selections array. For country-type variables, send
+    // countryCode and clear orderVariableOptionId — the server derives the
+    // option from the country. Carrying forward the previous country's option
+    // id conflicts with the new country's option.
     const updatedSelections = order.orderVariableSelections.map(selection => {
       var _selection$orderVaria;
+      const isCountryVariable = selection.orderVariable.variableType === 'country';
       return {
         orderVariableId: selection.orderVariable.id,
-        orderVariableOptionId: ((_selection$orderVaria = selection.orderVariableOption) === null || _selection$orderVaria === void 0 ? void 0 : _selection$orderVaria.id) ?? null,
-        countryCode: selection.orderVariable.variableType === 'country' ? licenseeIdentity.country : selection.countryCode ?? null
+        orderVariableOptionId: isCountryVariable ? null : ((_selection$orderVaria = selection.orderVariableOption) === null || _selection$orderVaria === void 0 ? void 0 : _selection$orderVaria.id) ?? null,
+        countryCode: isCountryVariable ? licenseeIdentity.country : selection.countryCode ?? null
       };
     });
 

package/dist/corsError.d.ts

@@ -1,3 +1,4 @@
+export declare function setCorsModalEnabled(enabled: boolean): void;
 export interface CorsError {
     origin: string;
     fontdueUrl: string;

package/dist/corsError.js

@@ -4,12 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handlePossibleCorsError = handlePossibleCorsError;
+exports.setCorsModalEnabled = setCorsModalEnabled;
 var _retryImport = _interopRequireDefault(require("./retryImport"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 let detected = false;
 let navigating = false;
+let modalEnabled = true;
+function setCorsModalEnabled(enabled) {
+  modalEnabled = enabled;
+}
 if (typeof window !== 'undefined') {
   window.addEventListener('beforeunload', () => {
     navigating = true;
@@ -52,15 +57,17 @@ async function isCorsBlocked(fetchUrl) {
 }
 function showCorsError(origin, fetchUrl) {
   console.error(`[Fontdue] Cross-origin request to ${fetchUrl} was blocked.\n\n` + `Your website (${origin}) is not listed as an allowed origin ` + `in your Fontdue CORS settings.\n\n` + `To fix this:\n` + `1. Log in to your Fontdue dashboard\n` + `2. Go to Settings \u2192 Security\n` + `3. Add "${origin}" to the "Cross-origin API access" field\n` + `4. Save \u2014 this page will reload automatically`);
-  (0, _retryImport.default)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./components/CorsErrorModal')))).then(_ref => {
-    let {
-      renderCorsErrorModal
-    } = _ref;
-    renderCorsErrorModal(origin, fetchUrl);
-  }).catch(() => {
-    // Chunk failed to load — the console.error above already
-    // told the developer what's wrong.
-  });
+  if (modalEnabled) {
+    (0, _retryImport.default)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./components/CorsErrorModal')))).then(_ref => {
+      let {
+        renderCorsErrorModal
+      } = _ref;
+      renderCorsErrorModal(origin, fetchUrl);
+    }).catch(() => {
+      // Chunk failed to load — the console.error above already
+      // told the developer what's wrong.
+    });
+  }
   startPolling(fetchUrl);
 }
 function handlePossibleCorsError(error, fetchUrl) {

package/dist/global-shim.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/global-shim.js

@@ -0,0 +1,8 @@
+// fbjs (transitive via draft-js) references Node's `global` at module init.
+// Browsers don't define `global`, so hydration blows up with a ReferenceError.
+// ESM evaluates imports in source order, so importing this first ensures the
+// alias is in place before fbjs/setImmediate evaluates.
+if (typeof globalThis.global === 'undefined') {
+  globalThis.global = globalThis;
+}
+export {};

package/dist/relay/environment.js

@@ -23,52 +23,61 @@ const CACHE_TTL = 10 * 1000; // 10 seconds, to resolve preloaded results
 function createNetworkFetch(options) {
   return async function networkFetch(request, variables) {
     const url = (FONTDUE_URL && `${FONTDUE_URL}/graphql`) ?? ((options === null || options === void 0 ? void 0 : options.url) ?? '') + '/graphql';
-    let resp;
-    try {
-      resp = await fetch(url + `?queryName=${request.name}`, {
-        method: 'POST',
-        credentials: 'include',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          'fontdue-stripe-integration': STRIPE_INTEGRATION ?? ((options === null || options === void 0 ? void 0 : options.stripeIntegration) || 'dynamic'),
-          'fontdue-client-version': _package.version
-        },
-        body: JSON.stringify({
-          query: request.text,
-          variables
-        }),
-        // @ts-ignore
-        next: {
-          tags: ['graphql', `operation:${request.name}`]
+    for (let attempt = 0; attempt <= 2; attempt++) {
+      try {
+        const resp = await fetch(url + `?queryName=${request.name}`, {
+          method: 'POST',
+          credentials: 'include',
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            'fontdue-stripe-integration': STRIPE_INTEGRATION ?? ((options === null || options === void 0 ? void 0 : options.stripeIntegration) || 'dynamic'),
+            'fontdue-client-version': _package.version
+          },
+          body: JSON.stringify({
+            query: request.text,
+            variables
+          }),
+          // @ts-ignore
+          next: {
+            tags: ['graphql', `operation:${request.name}`]
+          }
+        });
+        const json = await resp.json();
+
+        // GraphQL returns exceptions (for example, a missing required variable) in the "errors"
+        // property of the response. If any exceptions occurred when processing the request,
+        // throw an error to indicate to the developer what went wrong.
+        if (Array.isArray(json.errors)) {
+          var _json$errors, _error$extensions;
+          const error = (_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors[0];
+          console.error('GraphQL Error:', {
+            message: error.message,
+            code: (_error$extensions = error.extensions) === null || _error$extensions === void 0 ? void 0 : _error$extensions.code,
+            path: error.path
+          });
+        }
+        return json;
+      } catch (error) {
+        // Retry on network errors (TypeError) before falling through to CORS detection
+        if (attempt < 2 && error instanceof TypeError) {
+          await new Promise(resolve => setTimeout(resolve, 1000));
+          continue;
         }
-      });
-    } catch (error) {
-      if ((0, _corsError.handlePossibleCorsError)(error, url)) {
-        return {
-          data: undefined,
-          errors: [{
-            message: 'Cross-origin request blocked'
-          }]
-        };
+        if ((0, _corsError.handlePossibleCorsError)(error, url)) {
+          return {
+            data: undefined,
+            errors: [{
+              message: 'Cross-origin request blocked'
+            }]
+          };
+        }
+        throw error;
       }
-      throw error;
     }
-    const json = await resp.json();
 
-    // GraphQL returns exceptions (for example, a missing required variable) in the "errors"
-    // property of the response. If any exceptions occurred when processing the request,
-    // throw an error to indicate to the developer what went wrong.
-    if (Array.isArray(json.errors)) {
-      var _json$errors, _error$extensions;
-      const error = (_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors[0];
-      console.error('GraphQL Error:', {
-        message: error.message,
-        code: (_error$extensions = error.extensions) === null || _error$extensions === void 0 ? void 0 : _error$extensions.code,
-        path: error.path
-      });
-    }
-    return json;
+    // Unreachable — final iteration either returns or throws
+    throw new Error('Unexpected: exhausted retries');
   };
 }
 const networkFetch = createNetworkFetch();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontdue-js",
-  "version": "2.22.0",
+  "version": "2.22.2",
   "scripts": {
     "build": "npm run relay && run-p build-js build-css build-ts",
     "build-js": "babel src --out-dir dist --extensions .ts,.tsx,.js,.jsx",

package/dist-bundle/FontdueProvider.js

@@ -1,6 +0,0 @@
-'use client';
-import './chunks/ComponentsContext-CmkN9J4X.js';
-import 'react';
-export { F as default } from './chunks/index-C4ak9qTL.js';
-import './index.js';
-//# sourceMappingURL=FontdueProvider.js.map

package/dist-bundle/FontdueProvider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FontdueProvider.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist-bundle/TypeTester.js

@@ -1,7 +0,0 @@
-'use client';
-import './chunks/ComponentsContext-CmkN9J4X.js';
-export { T as TypeTesterStandalonePreloadedQueryRenderer, a as default } from './chunks/TypeTesterStandalone-BMWuv8Ca.js';
-import 'react';
-import './index.js';
-import 'react-dom';
-//# sourceMappingURL=TypeTester.js.map

package/dist-bundle/TypeTester.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TypeTester.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}

package/dist-bundle/TypeTester.preload.js

@@ -1,75 +0,0 @@
-import React__default from 'react';
-import { c as createNetworkFetch } from './chunks/ComponentsContext-CmkN9J4X.js';
-import { T as TypeTesterStandalonePreloadedQueryRenderer, n as node } from './chunks/TypeTesterStandalone-BMWuv8Ca.js';
-import { F as FontdueProvider } from './chunks/index-C4ak9qTL.js';
-import './index.js';
-import 'react-dom';
-
-/**
- * RELAY CACHE KEY NORMALIZATION
- *
- * This type transformation is required to fix a cache key inconsistency issue in Relay.
- *
- * THE PROBLEM:
- * Relay's `getOperationVariables()` function always includes ALL argumentDefinitions
- * from the GraphQL operation, even optional ones, setting them to their defaultValue
- * (typically null). This means when Relay generates cache keys, it creates entries like:
- *
- * Cache Key A: { collectionId: "123", tags: null, excludeTags: null, selectable: true }
- * Cache Key B: { collectionId: "123", selectable: true }  // when optional vars omitted
- *
- * Even though these represent the same logical query, they produce different cache keys
- * because `JSON.stringify(stableCopy(variables))` serializes them differently.
- *
- *  (This is possibly caused by NextJS RSC data serialization and hydration)
- *
- * THE ROOT CAUSE:
- * - GraphQL schema defines: `$tags: [String!], $excludeTags: [String!]` (optional)
- * - TypeScript generates: `tags?: ReadonlyArray<string> | null`
- * - Relay's argumentDefinitions include: `{ name: "tags", defaultValue: null }`
- * - getOperationVariables() always sets: `operationVariables[def.name] = def.defaultValue`
- *
- * THE SOLUTION:
- * RequireAllWithNull<T> transforms optional properties to required properties with
- * explicit null values, forcing callers to be consistent. This ensures server-side
- * preloaded queries and client-side cache lookups use identical variable structures.
- *
- * USAGE:
- * Instead of: { tags, excludeTags } // undefined values
- * Use:        { tags: tags ?? null, excludeTags: excludeTags ?? null } // explicit nulls
- *
- * This eliminates cache misses caused by variable structure inconsistencies between
- * server-side rendering and client-side Relay operations.
- */
-
-// Call into raw network fetch to get serializable GraphQL query response
-// This response will be sent to the client to "warm" the QueryResponseCache
-// to avoid the client fetches.
-async function loadSerializableQuery(query, variables, options) {
-  if (!('params' in query)) throw new Error('Params not found in query, is it a fragment instead of a query?');
-  const fetcher = createNetworkFetch(options);
-  const response = await fetcher(query.params, variables);
-  return {
-    params: query.params,
-    variables,
-    response
-  };
-}
-
-async function loadTypeTesterQuery(variables, options) {
-  return loadSerializableQuery(node, {
-    familyName: variables.familyName,
-    styleName: variables.styleName,
-    selectable: variables.selectable ?? true
-  }, options);
-}
-// Self-wraps with FontdueProvider so consumers don't need to. The provider
-// state is a module-level singleton under the hood, so multiple
-// TypeTesterPreloaded (or other *Preloaded) components on a page all share
-// one Relay env + Redux store + auxiliary UI.
-function TypeTesterPreloaded(props) {
-  return /*#__PURE__*/React__default.createElement(FontdueProvider, null, /*#__PURE__*/React__default.createElement(TypeTesterStandalonePreloadedQueryRenderer, props));
-}
-
-export { TypeTesterPreloaded, loadTypeTesterQuery };
-//# sourceMappingURL=TypeTester.preload.js.map

package/dist-bundle/TypeTester.preload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TypeTester.preload.js","sources":["../src/relay/loadSerializableQuery.ts","../src/components/TypeTester/TypeTesterStandalone.preload.tsx"],"sourcesContent":["import {\n  GraphQLResponse,\n  GraphQLTaggedNode,\n  OperationType,\n  RequestParameters,\n  VariablesOf,\n} from 'relay-runtime';\nimport { createNetworkFetch } from './environment';\n\nexport interface SerializablePreloadedQuery<TQuery extends OperationType> {\n  params: RequestParameters;\n  variables: VariablesOf<TQuery>;\n  response: GraphQLResponse;\n}\n\n/**\n * RELAY CACHE KEY NORMALIZATION\n *\n * This type transformation is required to fix a cache key inconsistency issue in Relay.\n *\n * THE PROBLEM:\n * Relay's `getOperationVariables()` function always includes ALL argumentDefinitions\n * from the GraphQL operation, even optional ones, setting them to their defaultValue\n * (typically null). This means when Relay generates cache keys, it creates entries like:\n *\n * Cache Key A: { collectionId: \"123\", tags: null, excludeTags: null, selectable: true }\n * Cache Key B: { collectionId: \"123\", selectable: true }  // when optional vars omitted\n *\n * Even though these represent the same logical query, they produce different cache keys\n * because `JSON.stringify(stableCopy(variables))` serializes them differently.\n *\n *  (This is possibly caused by NextJS RSC data serialization and hydration)\n *\n * THE ROOT CAUSE:\n * - GraphQL schema defines: `$tags: [String!], $excludeTags: [String!]` (optional)\n * - TypeScript generates: `tags?: ReadonlyArray<string> | null`\n * - Relay's argumentDefinitions include: `{ name: \"tags\", defaultValue: null }`\n * - getOperationVariables() always sets: `operationVariables[def.name] = def.defaultValue`\n *\n * THE SOLUTION:\n * RequireAllWithNull<T> transforms optional properties to required properties with\n * explicit null values, forcing callers to be consistent. This ensures server-side\n * preloaded queries and client-side cache lookups use identical variable structures.\n *\n * USAGE:\n * Instead of: { tags, excludeTags } // undefined values\n * Use:        { tags: tags ?? null, excludeTags: excludeTags ?? null } // explicit nulls\n *\n * This eliminates cache misses caused by variable structure inconsistencies between\n * server-side rendering and client-side Relay operations.\n */\ntype RequireAllWithNull<T> = {\n  [K in keyof T]-?: T[K] | null;\n};\n\nexport interface LoadSerializableQueryOptions {\n  url?: string;\n  stripeIntegration?: 'card-element' | 'dynamic';\n}\n\n// Call into raw network fetch to get serializable GraphQL query response\n// This response will be sent to the client to \"warm\" the QueryResponseCache\n// to avoid the client fetches.\nexport default async function loadSerializableQuery<TQuery extends OperationType>(\n  query: GraphQLTaggedNode,\n  variables: RequireAllWithNull<VariablesOf<TQuery>>,\n  options?: LoadSerializableQueryOptions,\n): Promise<SerializablePreloadedQuery<TQuery>> {\n  if (!('params' in query))\n    throw new Error('Params not found in query, is it a fragment instead of a query?');\n  const fetcher = createNetworkFetch(options);\n  const response = await fetcher(query.params, variables);\n\n  return {\n    params: query.params,\n    variables,\n    response,\n  };\n}\n","import React from 'react';\nimport loadSerializableQuery, {\n  LoadSerializableQueryOptions,\n  SerializablePreloadedQuery,\n} from '../../relay/loadSerializableQuery';\nimport TypeTesterStandaloneQueryNode, {\n  TypeTesterStandaloneQuery,\n} from '../../__generated__/TypeTesterStandaloneQuery.graphql';\nimport FontdueProvider from '../FontdueProvider';\nimport { TypeTesterStandalonePreloadedQueryRenderer } from './TypeTesterStandalone';\n\nexport type TypeTesterPreloadedQuery =\n  SerializablePreloadedQuery<TypeTesterStandaloneQuery>;\n\nexport interface LoadTypeTesterQueryVariables {\n  familyName: string;\n  styleName: string;\n  selectable?: boolean;\n}\n\nexport async function loadTypeTesterQuery(\n  variables: LoadTypeTesterQueryVariables,\n  options?: LoadSerializableQueryOptions,\n): Promise<TypeTesterPreloadedQuery> {\n  return loadSerializableQuery<TypeTesterStandaloneQuery>(\n    TypeTesterStandaloneQueryNode,\n    {\n      familyName: variables.familyName,\n      styleName: variables.styleName,\n      selectable: variables.selectable ?? true,\n    },\n    options,\n  );\n}\n\ntype RendererProps = React.ComponentProps<typeof TypeTesterStandalonePreloadedQueryRenderer>;\n\n// Self-wraps with FontdueProvider so consumers don't need to. The provider\n// state is a module-level singleton under the hood, so multiple\n// TypeTesterPreloaded (or other *Preloaded) components on a page all share\n// one Relay env + Redux store + auxiliary UI.\nexport function TypeTesterPreloaded(props: RendererProps) {\n  return (\n    <FontdueProvider>\n      <TypeTesterStandalonePreloadedQueryRenderer {...props} />\n    </FontdueProvider>\n  );\n}\n"],"names":["loadSerializableQuery","query","variables","options","Error","fetcher","createNetworkFetch","response","params","loadTypeTesterQuery","TypeTesterStandaloneQueryNode","familyName","styleName","selectable","TypeTesterPreloaded","props","React","createElement","FontdueProvider","TypeTesterStandalonePreloadedQueryRenderer"],"mappings":";;;;;;;AAeA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACe,eAAeA,qBAAqBA,CACjDC,KAAwB,EACxBC,SAAkD,EAClDC,OAAsC,EACO;EAC7C,IAAI,EAAE,QAAQ,IAAIF,KAAK,CAAC,EACtB,MAAM,IAAIG,KAAK,CAAC,iEAAiE,CAAC;AACpF,EAAA,MAAMC,OAAO,GAAGC,kBAAkB,CAACH,OAAO,CAAC;EAC3C,MAAMI,QAAQ,GAAG,MAAMF,OAAO,CAACJ,KAAK,CAACO,MAAM,EAAEN,SAAS,CAAC;EAEvD,OAAO;IACLM,MAAM,EAAEP,KAAK,CAACO,MAAM;IACpBN,SAAS;AACTK,IAAAA;GACD;AACH;;AC1DO,eAAeE,mBAAmBA,CACvCP,SAAuC,EACvCC,OAAsC,EACH;EACnC,OAAOH,qBAAqB,CAC1BU,IAA6B,EAC7B;IACEC,UAAU,EAAET,SAAS,CAACS,UAAU;IAChCC,SAAS,EAAEV,SAAS,CAACU,SAAS;AAC9BC,IAAAA,UAAU,EAAEX,SAAS,CAACW,UAAU,IAAI;GACrC,EACDV,OACF,CAAC;AACH;AAIA;AACA;AACA;AACA;AACO,SAASW,mBAAmBA,CAACC,KAAoB,EAAE;AACxD,EAAA,oBACEC,cAAA,CAAAC,aAAA,CAACC,eAAe,EAAA,IAAA,eACdF,cAAA,CAAAC,aAAA,CAACE,0CAA0C,EAAKJ,KAAQ,CACzC,CAAC;AAEtB;;;;"}