@azure/msal-common 14.6.0-alpha.0 → 14.6.1

package/src/cache/entities/AuthorityMetadataEntity.ts

@@ -3,13 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { CloudDiscoveryMetadata } from "../../authority/CloudDiscoveryMetadata";
-import { OpenIdConfigResponse } from "../../authority/OpenIdConfigResponse";
-import { AUTHORITY_METADATA_CONSTANTS } from "../../utils/Constants";
-import { TimeUtils } from "../../utils/TimeUtils";
-
 /** @internal */
-export class AuthorityMetadataEntity {
+export type AuthorityMetadataEntity = {
     aliases: Array<string>;
     preferred_cache: string;
     preferred_network: string;
@@ -22,91 +17,4 @@ export class AuthorityMetadataEntity {
     endpointsFromNetwork: boolean;
     expiresAt: number;
     jwks_uri: string;
-
-    constructor() {
-        this.expiresAt =
-            TimeUtils.nowSeconds() +
-            AUTHORITY_METADATA_CONSTANTS.REFRESH_TIME_SECONDS;
-    }
-
-    /**
-     * Update the entity with new aliases, preferred_cache and preferred_network values
-     * @param metadata
-     * @param fromNetwork
-     */
-    updateCloudDiscoveryMetadata(
-        metadata: CloudDiscoveryMetadata,
-        fromNetwork: boolean
-    ): void {
-        this.aliases = metadata.aliases;
-        this.preferred_cache = metadata.preferred_cache;
-        this.preferred_network = metadata.preferred_network;
-        this.aliasesFromNetwork = fromNetwork;
-    }
-
-    /**
-     * Update the entity with new endpoints
-     * @param metadata
-     * @param fromNetwork
-     */
-    updateEndpointMetadata(
-        metadata: OpenIdConfigResponse,
-        fromNetwork: boolean
-    ): void {
-        this.authorization_endpoint = metadata.authorization_endpoint;
-        this.token_endpoint = metadata.token_endpoint;
-        this.end_session_endpoint = metadata.end_session_endpoint;
-        this.issuer = metadata.issuer;
-        this.endpointsFromNetwork = fromNetwork;
-        this.jwks_uri = metadata.jwks_uri;
-    }
-
-    /**
-     * Save the authority that was used to create this cache entry
-     * @param authority
-     */
-    updateCanonicalAuthority(authority: string): void {
-        this.canonical_authority = authority;
-    }
-
-    /**
-     * Reset the exiresAt value
-     */
-    resetExpiresAt(): void {
-        this.expiresAt =
-            TimeUtils.nowSeconds() +
-            AUTHORITY_METADATA_CONSTANTS.REFRESH_TIME_SECONDS;
-    }
-
-    /**
-     * Returns whether or not the data needs to be refreshed
-     */
-    isExpired(): boolean {
-        return this.expiresAt <= TimeUtils.nowSeconds();
-    }
-
-    /**
-     * Validates an entity: checks for all expected params
-     * @param entity
-     */
-    static isAuthorityMetadataEntity(key: string, entity: object): boolean {
-        if (!entity) {
-            return false;
-        }
-
-        return (
-            key.indexOf(AUTHORITY_METADATA_CONSTANTS.CACHE_KEY) === 0 &&
-            entity.hasOwnProperty("aliases") &&
-            entity.hasOwnProperty("preferred_cache") &&
-            entity.hasOwnProperty("preferred_network") &&
-            entity.hasOwnProperty("canonical_authority") &&
-            entity.hasOwnProperty("authorization_endpoint") &&
-            entity.hasOwnProperty("token_endpoint") &&
-            entity.hasOwnProperty("issuer") &&
-            entity.hasOwnProperty("aliasesFromNetwork") &&
-            entity.hasOwnProperty("endpointsFromNetwork") &&
-            entity.hasOwnProperty("expiresAt") &&
-            entity.hasOwnProperty("jwks_uri")
-        );
-    }
-}
+};

package/src/cache/utils/CacheHelpers.ts

@@ -5,11 +5,15 @@
 
 import { extractTokenClaims } from "../../account/AuthToken";
 import { TokenClaims } from "../../account/TokenClaims";
+import { CloudDiscoveryMetadata } from "../../authority/CloudDiscoveryMetadata";
+import { OpenIdConfigResponse } from "../../authority/OpenIdConfigResponse";
 import {
     ClientAuthErrorCodes,
     createClientAuthError,
 } from "../../error/ClientAuthError";
 import {
+    APP_METADATA,
+    AUTHORITY_METADATA_CONSTANTS,
     AuthenticationScheme,
     CredentialType,
     SERVER_TELEM_CONSTANTS,
@@ -18,6 +22,8 @@ import {
 } from "../../utils/Constants";
 import { TimeUtils } from "../../utils/TimeUtils";
 import { AccessTokenEntity } from "../entities/AccessTokenEntity";
+import { AppMetadataEntity } from "../entities/AppMetadataEntity";
+import { AuthorityMetadataEntity } from "../entities/AuthorityMetadataEntity";
 import { CredentialEntity } from "../entities/CredentialEntity";
 import { IdTokenEntity } from "../entities/IdTokenEntity";
 import { RefreshTokenEntity } from "../entities/RefreshTokenEntity";
@@ -350,3 +356,108 @@ export function isThrottlingEntity(key: string, entity?: object): boolean {
 
     return validateKey && validateEntity;
 }
+
+/**
+ * Generate AppMetadata Cache Key as per the schema: appmetadata-<environment>-<client_id>
+ */
+export function generateAppMetadataKey({
+    environment,
+    clientId,
+}: AppMetadataEntity): string {
+    const appMetaDataKeyArray: Array<string> = [
+        APP_METADATA,
+        environment,
+        clientId,
+    ];
+    return appMetaDataKeyArray
+        .join(Separators.CACHE_KEY_SEPARATOR)
+        .toLowerCase();
+}
+
+/*
+ * Validates an entity: checks for all expected params
+ * @param entity
+ */
+export function isAppMetadataEntity(key: string, entity: object): boolean {
+    if (!entity) {
+        return false;
+    }
+
+    return (
+        key.indexOf(APP_METADATA) === 0 &&
+        entity.hasOwnProperty("clientId") &&
+        entity.hasOwnProperty("environment")
+    );
+}
+
+/**
+ * Validates an entity: checks for all expected params
+ * @param entity
+ */
+export function isAuthorityMetadataEntity(
+    key: string,
+    entity: object
+): boolean {
+    if (!entity) {
+        return false;
+    }
+
+    return (
+        key.indexOf(AUTHORITY_METADATA_CONSTANTS.CACHE_KEY) === 0 &&
+        entity.hasOwnProperty("aliases") &&
+        entity.hasOwnProperty("preferred_cache") &&
+        entity.hasOwnProperty("preferred_network") &&
+        entity.hasOwnProperty("canonical_authority") &&
+        entity.hasOwnProperty("authorization_endpoint") &&
+        entity.hasOwnProperty("token_endpoint") &&
+        entity.hasOwnProperty("issuer") &&
+        entity.hasOwnProperty("aliasesFromNetwork") &&
+        entity.hasOwnProperty("endpointsFromNetwork") &&
+        entity.hasOwnProperty("expiresAt") &&
+        entity.hasOwnProperty("jwks_uri")
+    );
+}
+
+/**
+ * Reset the exiresAt value
+ */
+export function generateAuthorityMetadataExpiresAt(): number {
+    return (
+        TimeUtils.nowSeconds() +
+        AUTHORITY_METADATA_CONSTANTS.REFRESH_TIME_SECONDS
+    );
+}
+
+export function updateAuthorityEndpointMetadata(
+    authorityMetadata: AuthorityMetadataEntity,
+    updatedValues: OpenIdConfigResponse,
+    fromNetwork: boolean
+): void {
+    authorityMetadata.authorization_endpoint =
+        updatedValues.authorization_endpoint;
+    authorityMetadata.token_endpoint = updatedValues.token_endpoint;
+    authorityMetadata.end_session_endpoint = updatedValues.end_session_endpoint;
+    authorityMetadata.issuer = updatedValues.issuer;
+    authorityMetadata.endpointsFromNetwork = fromNetwork;
+    authorityMetadata.jwks_uri = updatedValues.jwks_uri;
+}
+
+export function updateCloudDiscoveryMetadata(
+    authorityMetadata: AuthorityMetadataEntity,
+    updatedValues: CloudDiscoveryMetadata,
+    fromNetwork: boolean
+): void {
+    authorityMetadata.aliases = updatedValues.aliases;
+    authorityMetadata.preferred_cache = updatedValues.preferred_cache;
+    authorityMetadata.preferred_network = updatedValues.preferred_network;
+    authorityMetadata.aliasesFromNetwork = fromNetwork;
+}
+
+/**
+ * Returns whether or not the data needs to be refreshed
+ */
+export function isAuthorityMetadataExpired(
+    metadata: AuthorityMetadataEntity
+): boolean {
+    return metadata.expiresAt <= TimeUtils.nowSeconds();
+}

package/src/client/BaseClient.ts

@@ -24,7 +24,7 @@ import { buildClientInfoFromHomeAccountId } from "../account/ClientInfo";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient";
 import { RequestParameterBuilder } from "../request/RequestParameterBuilder";
 import { BaseAuthRequest } from "../request/BaseAuthRequest";
-import { AuthorityFactory } from "../authority/AuthorityFactory";
+import { createDiscoveredInstance } from "../authority/AuthorityFactory";
 import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent";
 
 /**
@@ -191,16 +191,15 @@ export abstract class BaseClient {
             correlationId
         );
         const cloudInstanceAuthorityUri = `https://${cloudInstanceHostname}/${this.authority.tenant}/`;
-        const cloudInstanceAuthority =
-            await AuthorityFactory.createDiscoveredInstance(
-                cloudInstanceAuthorityUri,
-                this.networkClient,
-                this.cacheManager,
-                this.authority.options,
-                this.logger,
-                this.performanceClient,
-                correlationId
-            );
+        const cloudInstanceAuthority = await createDiscoveredInstance(
+            cloudInstanceAuthorityUri,
+            this.networkClient,
+            this.cacheManager,
+            this.authority.options,
+            this.logger,
+            correlationId,
+            this.performanceClient
+        );
         this.authority = cloudInstanceAuthority;
     }
 

package/src/config/ClientConfiguration.ts

@@ -6,10 +6,7 @@
 import { INetworkModule } from "../network/INetworkModule";
 import { DEFAULT_CRYPTO_IMPLEMENTATION, ICrypto } from "../crypto/ICrypto";
 import { ILoggerCallback, Logger, LogLevel } from "../logger/Logger";
-import {
-    Constants,
-    DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
-} from "../utils/Constants";
+import { Constants } from "../utils/Constants";
 import { version } from "../packageMetadata";
 import { Authority } from "../authority/Authority";
 import { AzureCloudInstance } from "../authority/AuthorityOptions";
@@ -24,6 +21,9 @@ import {
     createClientAuthError,
 } from "../error/ClientAuthError";
 
+// Token renewal offset default in seconds
+const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
+
 /**
  * Use the configuration object to configure MSAL Modules and initialize the base interfaces for MSAL.
  *

package/src/index.ts

@@ -59,7 +59,7 @@ export {
     AzureCloudInstance,
     StaticAuthorityOptions,
 } from "./authority/AuthorityOptions";
-export { AuthorityFactory } from "./authority/AuthorityFactory";
+export * as AuthorityFactory from "./authority/AuthorityFactory";
 export { AuthorityType } from "./authority/AuthorityType";
 export { ProtocolMode } from "./authority/ProtocolMode";
 export { OIDCOptions } from "./authority/OIDCOptions";
@@ -204,7 +204,6 @@ export {
     GrantType,
     AADAuthorityConstants,
     HttpStatus,
-    DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
     JsonWebTokenTypes,
 } from "./utils/Constants";
 export * as AADServerParamKeys from "./constants/AADServerParamKeys";

package/src/packageMetadata.ts

@@ -1,3 +1,3 @@
 /* eslint-disable header/header */
 export const name = "@azure/msal-common";
-export const version = "14.6.0-alpha.0";
+export const version = "14.6.1";

package/src/response/ResponseHandler.ts

@@ -524,11 +524,11 @@ export class ResponseHandler {
         // appMetadata
         let cachedAppMetadata: AppMetadataEntity | null = null;
         if (serverTokenResponse.foci) {
-            cachedAppMetadata = AppMetadataEntity.createAppMetadataEntity(
-                this.clientId,
-                env,
-                serverTokenResponse.foci
-            );
+            cachedAppMetadata = {
+                clientId: this.clientId,
+                environment: env,
+                familyId: serverTokenResponse.foci,
+            };
         }
 
         return new CacheRecord(

package/src/utils/Constants.ts

@@ -68,7 +68,6 @@ export const HttpStatus = {
     SUCCESS_RANGE_END: 299,
     REDIRECT: 302,
     CLIENT_ERROR_RANGE_START: 400,
-    UNAUTHORIZED: 401,
     CLIENT_ERROR_RANGE_END: 499,
     SERVER_ERROR_RANGE_START: 500,
     SERVER_ERROR_RANGE_END: 599,
@@ -371,6 +370,3 @@ export type JsonWebTokenTypes =
     (typeof JsonWebTokenTypes)[keyof typeof JsonWebTokenTypes];
 
 export const ONE_DAY_IN_MS = 86400000;
-
-// Token renewal offset default in seconds
-export const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;

package/dist/cache/entities/AppMetadataEntity.mjs

@@ -1,73 +0,0 @@
-/*! @azure/msal-common v14.6.0-alpha.0 2023-12-15 */
-'use strict';
-import { Separators, APP_METADATA } from '../../utils/Constants.mjs';
-
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * APP_METADATA Cache
- *
- * Key:Value Schema:
- *
- * Key: appmetadata-<environment>-<client_id>
- *
- * Value:
- * {
- *      clientId: client ID of the application
- *      environment: entity that issued the token, represented as a full host
- *      familyId: Family ID identifier, '1' represents Microsoft Family
- * }
- */
-class AppMetadataEntity {
-    /**
-     * Generate AppMetadata Cache Key as per the schema: appmetadata-<environment>-<client_id>
-     */
-    generateAppMetadataKey() {
-        return AppMetadataEntity.generateAppMetadataCacheKey(this.environment, this.clientId);
-    }
-    /**
-     * Generate AppMetadata Cache Key
-     */
-    static generateAppMetadataCacheKey(environment, clientId) {
-        const appMetaDataKeyArray = [
-            APP_METADATA,
-            environment,
-            clientId,
-        ];
-        return appMetaDataKeyArray
-            .join(Separators.CACHE_KEY_SEPARATOR)
-            .toLowerCase();
-    }
-    /**
-     * Creates AppMetadataEntity
-     * @param clientId
-     * @param environment
-     * @param familyId
-     */
-    static createAppMetadataEntity(clientId, environment, familyId) {
-        const appMetadata = new AppMetadataEntity();
-        appMetadata.clientId = clientId;
-        appMetadata.environment = environment;
-        if (familyId) {
-            appMetadata.familyId = familyId;
-        }
-        return appMetadata;
-    }
-    /**
-     * Validates an entity: checks for all expected params
-     * @param entity
-     */
-    static isAppMetadataEntity(key, entity) {
-        if (!entity) {
-            return false;
-        }
-        return (key.indexOf(APP_METADATA) === 0 &&
-            entity.hasOwnProperty("clientId") &&
-            entity.hasOwnProperty("environment"));
-    }
-}
-
-export { AppMetadataEntity };
-//# sourceMappingURL=AppMetadataEntity.mjs.map

package/dist/cache/entities/AppMetadataEntity.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"AppMetadataEntity.mjs","sources":["../../../src/cache/entities/AppMetadataEntity.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAAA;;;AAGG;AAIH;;;;;;;;;;;;;AAaG;MACU,iBAAiB,CAAA;AAK1B;;AAEG;IACH,sBAAsB,GAAA;AAClB,QAAA,OAAO,iBAAiB,CAAC,2BAA2B,CAChD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,CAChB,CAAC;KACL;AAED;;AAEG;AACH,IAAA,OAAO,2BAA2B,CAC9B,WAAmB,EACnB,QAAgB,EAAA;AAEhB,QAAA,MAAM,mBAAmB,GAAkB;YACvC,YAAY;YACZ,WAAW;YACX,QAAQ;SACX,CAAC;AACF,QAAA,OAAO,mBAAmB;AACrB,aAAA,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC;AACpC,aAAA,WAAW,EAAE,CAAC;KACtB;AAED;;;;;AAKG;AACH,IAAA,OAAO,uBAAuB,CAC1B,QAAgB,EAChB,WAAmB,EACnB,QAAiB,EAAA;AAEjB,QAAA,MAAM,WAAW,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAE5C,QAAA,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC;AAChC,QAAA,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC;AACtC,QAAA,IAAI,QAAQ,EAAE;AACV,YAAA,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC;AACnC,SAAA;AAED,QAAA,OAAO,WAAW,CAAC;KACtB;AAED;;;AAGG;AACH,IAAA,OAAO,mBAAmB,CAAC,GAAW,EAAE,MAAc,EAAA;QAClD,IAAI,CAAC,MAAM,EAAE;AACT,YAAA,OAAO,KAAK,CAAC;AAChB,SAAA;QAED,QACI,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;AAC/B,YAAA,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC;AACjC,YAAA,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,EACtC;KACL;AACJ;;;;"}

package/dist/cache/entities/AuthorityMetadataEntity.mjs

@@ -1,86 +0,0 @@
-/*! @azure/msal-common v14.6.0-alpha.0 2023-12-15 */
-'use strict';
-import { AUTHORITY_METADATA_CONSTANTS } from '../../utils/Constants.mjs';
-import { TimeUtils } from '../../utils/TimeUtils.mjs';
-
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/** @internal */
-class AuthorityMetadataEntity {
-    constructor() {
-        this.expiresAt =
-            TimeUtils.nowSeconds() +
-                AUTHORITY_METADATA_CONSTANTS.REFRESH_TIME_SECONDS;
-    }
-    /**
-     * Update the entity with new aliases, preferred_cache and preferred_network values
-     * @param metadata
-     * @param fromNetwork
-     */
-    updateCloudDiscoveryMetadata(metadata, fromNetwork) {
-        this.aliases = metadata.aliases;
-        this.preferred_cache = metadata.preferred_cache;
-        this.preferred_network = metadata.preferred_network;
-        this.aliasesFromNetwork = fromNetwork;
-    }
-    /**
-     * Update the entity with new endpoints
-     * @param metadata
-     * @param fromNetwork
-     */
-    updateEndpointMetadata(metadata, fromNetwork) {
-        this.authorization_endpoint = metadata.authorization_endpoint;
-        this.token_endpoint = metadata.token_endpoint;
-        this.end_session_endpoint = metadata.end_session_endpoint;
-        this.issuer = metadata.issuer;
-        this.endpointsFromNetwork = fromNetwork;
-        this.jwks_uri = metadata.jwks_uri;
-    }
-    /**
-     * Save the authority that was used to create this cache entry
-     * @param authority
-     */
-    updateCanonicalAuthority(authority) {
-        this.canonical_authority = authority;
-    }
-    /**
-     * Reset the exiresAt value
-     */
-    resetExpiresAt() {
-        this.expiresAt =
-            TimeUtils.nowSeconds() +
-                AUTHORITY_METADATA_CONSTANTS.REFRESH_TIME_SECONDS;
-    }
-    /**
-     * Returns whether or not the data needs to be refreshed
-     */
-    isExpired() {
-        return this.expiresAt <= TimeUtils.nowSeconds();
-    }
-    /**
-     * Validates an entity: checks for all expected params
-     * @param entity
-     */
-    static isAuthorityMetadataEntity(key, entity) {
-        if (!entity) {
-            return false;
-        }
-        return (key.indexOf(AUTHORITY_METADATA_CONSTANTS.CACHE_KEY) === 0 &&
-            entity.hasOwnProperty("aliases") &&
-            entity.hasOwnProperty("preferred_cache") &&
-            entity.hasOwnProperty("preferred_network") &&
-            entity.hasOwnProperty("canonical_authority") &&
-            entity.hasOwnProperty("authorization_endpoint") &&
-            entity.hasOwnProperty("token_endpoint") &&
-            entity.hasOwnProperty("issuer") &&
-            entity.hasOwnProperty("aliasesFromNetwork") &&
-            entity.hasOwnProperty("endpointsFromNetwork") &&
-            entity.hasOwnProperty("expiresAt") &&
-            entity.hasOwnProperty("jwks_uri"));
-    }
-}
-
-export { AuthorityMetadataEntity };
-//# sourceMappingURL=AuthorityMetadataEntity.mjs.map

package/dist/cache/entities/AuthorityMetadataEntity.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthorityMetadataEntity.mjs","sources":["../../../src/cache/entities/AuthorityMetadataEntity.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAAA;;;AAGG;AAOH;MACa,uBAAuB,CAAA;AAchC,IAAA,WAAA,GAAA;AACI,QAAA,IAAI,CAAC,SAAS;YACV,SAAS,CAAC,UAAU,EAAE;gBACtB,4BAA4B,CAAC,oBAAoB,CAAC;KACzD;AAED;;;;AAIG;IACH,4BAA4B,CACxB,QAAgC,EAChC,WAAoB,EAAA;AAEpB,QAAA,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;AAChC,QAAA,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;AAChD,QAAA,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;AACpD,QAAA,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;KACzC;AAED;;;;AAIG;IACH,sBAAsB,CAClB,QAA8B,EAC9B,WAAoB,EAAA;AAEpB,QAAA,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC,sBAAsB,CAAC;AAC9D,QAAA,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;AAC9C,QAAA,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,oBAAoB,CAAC;AAC1D,QAAA,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;AAC9B,QAAA,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC;AACxC,QAAA,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;KACrC;AAED;;;AAGG;AACH,IAAA,wBAAwB,CAAC,SAAiB,EAAA;AACtC,QAAA,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;KACxC;AAED;;AAEG;IACH,cAAc,GAAA;AACV,QAAA,IAAI,CAAC,SAAS;YACV,SAAS,CAAC,UAAU,EAAE;gBACtB,4BAA4B,CAAC,oBAAoB,CAAC;KACzD;AAED;;AAEG;IACH,SAAS,GAAA;QACL,OAAO,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;KACnD;AAED;;;AAGG;AACH,IAAA,OAAO,yBAAyB,CAAC,GAAW,EAAE,MAAc,EAAA;QACxD,IAAI,CAAC,MAAM,EAAE;AACT,YAAA,OAAO,KAAK,CAAC;AAChB,SAAA;QAED,QACI,GAAG,CAAC,OAAO,CAAC,4BAA4B,CAAC,SAAS,CAAC,KAAK,CAAC;AACzD,YAAA,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC;AAChC,YAAA,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC;AACxC,YAAA,MAAM,CAAC,cAAc,CAAC,mBAAmB,CAAC;AAC1C,YAAA,MAAM,CAAC,cAAc,CAAC,qBAAqB,CAAC;AAC5C,YAAA,MAAM,CAAC,cAAc,CAAC,wBAAwB,CAAC;AAC/C,YAAA,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC;AACvC,YAAA,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC;AAC/B,YAAA,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC;AAC3C,YAAA,MAAM,CAAC,cAAc,CAAC,sBAAsB,CAAC;AAC7C,YAAA,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC;AAClC,YAAA,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,EACnC;KACL;AACJ;;;;"}