@mcp-abap-adt/auth-providers 4.0.0 → 4.1.2

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@mcp-abap-adt/auth-providers",
-  "version": "4.0.0",
+  "version": "4.1.2",
   "description": "Token providers for MCP ABAP ADT auth-broker",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
-    "bin",
     "README.md",
     "CHANGELOG.md",
     "LICENSE",
@@ -38,18 +37,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "bin": {
-    "auth-authorization-code": "./bin/auth-authorization-code.ts",
-    "auth-client-credentials": "./bin/auth-client-credentials.ts"
-  },
   "scripts": {
     "chrono": "./tools/version-stats.sh",
-    "clean": "rm -rf dist tsconfig.tsbuildinfo",
+    "clean": "rm -rf dist tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo",
     "lint": "npx biome check --write src",
     "lint:check": "npx biome check src",
     "format": "npx biome format --write src",
-    "build": "npm run --silent clean && npx biome check src --diagnostic-level=error && npx tsc -p tsconfig.json",
-    "build:fast": "npx tsc -p tsconfig.json",
+    "build": "npm run --silent clean && npx biome check src --diagnostic-level=error && npx tsc -p tsconfig.build.json",
+    "build:fast": "npx tsc -p tsconfig.build.json",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "test:check": "npx tsc --noEmit",
     "prepublishOnly": "npm run build",
@@ -62,7 +57,7 @@
     "node": "^22 || ^24"
   },
   "dependencies": {
-    "@mcp-abap-adt/interfaces-auth": "^2.0.0",
+    "@mcp-abap-adt/interfaces-auth": "^2.0.1",
     "@mcp-abap-adt/interfaces-auth-sap": "^1.0.1",
     "@mcp-abap-adt/interfaces-utils": "^1.1.0",
     "@xmldom/xmldom": "^0.9.12",
@@ -75,7 +70,7 @@
     "@biomejs/biome": "^2.3.14",
     "@jest/globals": "^30.2.0",
     "@mcp-abap-adt/auth-mocks": "^0.3.0",
-    "@mcp-abap-adt/auth-stores": "^1.0.1",
+    "@mcp-abap-adt/auth-stores": "^1.2.1",
     "@mcp-abap-adt/logger": "^0.4.0",
     "@types/express": "^5.0.5",
     "@types/jest": "^30.0.0",
@@ -87,7 +82,6 @@
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "ts-jest": "^29.2.5",
-    "tsx": "^4.19.2",
     "typescript": "^5.9.2"
   }
 }

package/bin/auth-authorization-code.ts

@@ -1,147 +0,0 @@
-#!/usr/bin/env tsx
-/**
- * Authorization Code Provider Test Command
- *
- * Gets tokens using authorization_code grant type
- */
-
-import {
-  ABAP_AUTHORIZATION_VARS,
-  ABAP_CONNECTION_VARS,
-} from '@mcp-abap-adt/auth-stores';
-import { AuthorizationCodeProvider } from '../src/providers/AuthorizationCodeProvider';
-import { browserCallbackStrategy } from '../src/strategies';
-import {
-  getUaaCredentials,
-  parseEnvFile,
-  parseServiceKey,
-  writeEnvFile,
-} from './utils/parseConfig';
-
-async function main() {
-  const args = process.argv.slice(2);
-  let serviceKeyPath: string | undefined;
-  let inputEnvPath: string | undefined;
-  let outputEnvPath: string | undefined;
-  let browser: string = 'none';
-  let port: number = 3001;
-  let authorizationUrl: string | undefined;
-
-  // Parse arguments
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
-    if (arg === '--service-key' && args[i + 1]) {
-      serviceKeyPath = args[++i];
-    } else if (arg === '--input-env' && args[i + 1]) {
-      inputEnvPath = args[++i];
-    } else if (arg === '--output-env' && args[i + 1]) {
-      outputEnvPath = args[++i];
-    } else if (arg === '--browser' && args[i + 1]) {
-      browser = args[++i];
-    } else if (arg === '--port' && args[i + 1]) {
-      port = parseInt(args[++i], 10);
-    } else if (arg === '--auth-url' && args[i + 1]) {
-      authorizationUrl = args[++i];
-    } else if (arg === '--help' || arg === '-h') {
-      console.log(`
-Usage: auth-authorization-code [options]
-
-Options:
-  --service-key <path>    Path to service key JSON file
-  --input-env <path>      Path to .env file for reading existing tokens (for refresh)
-  --output-env <path>     Path to .env file for saving tokens (required)
-  --browser <type>        Browser type (auto, system, chrome, none) [default: none]
-  --port <number>         Callback server port [default: 3001]
-  --auth-url <url>        Pre-built authorization URL
-  --help, -h              Show this help message
-
-Example:
-  auth-authorization-code --service-key ./service-key.json --output-env ./tokens.env --browser auto
-  auth-authorization-code --input-env ./tokens.env --output-env ./tokens.env --browser none
-      `);
-      process.exit(0);
-    }
-  }
-
-  if (!serviceKeyPath && !inputEnvPath) {
-    console.error('❌ Error: Either --service-key or --input-env must be provided');
-    process.exit(1);
-  }
-
-  if (!outputEnvPath) {
-    console.error('❌ Error: --output-env is required to save tokens');
-    process.exit(1);
-  }
-
-  try {
-    // Parse config
-    const serviceKey = serviceKeyPath ? parseServiceKey(serviceKeyPath) : undefined;
-    const inputEnv = inputEnvPath ? parseEnvFile(inputEnvPath) : undefined;
-    const { uaaUrl, clientId, clientSecret } = getUaaCredentials(serviceKey, inputEnv);
-
-    // Read existing tokens from input env if provided (use constants, fallback to legacy)
-    const existingRefreshToken =
-      inputEnv?.[ABAP_AUTHORIZATION_VARS.REFRESH_TOKEN] ||
-      inputEnv?.REFRESH_TOKEN;
-
-    // Build authorization URL if not provided
-    if (!authorizationUrl) {
-      const redirectUri = `http://localhost:${port}/callback`;
-      authorizationUrl = `${uaaUrl}/oauth/authorize?client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(redirectUri)}&response_type=code`;
-    }
-
-    // Create provider. `--port` now reaches the strategy that binds the socket;
-    // it must stay the port baked into the authorization URL above, or the
-    // provider rejects the mismatch before opening anything.
-    const provider = new AuthorizationCodeProvider({
-      authorizationUrl,
-      uaaUrl,
-      clientId,
-      clientSecret,
-      authorization: browserCallbackStrategy({ browser, port }),
-      refreshToken: existingRefreshToken,
-    });
-
-    console.log('🔐 Getting tokens using Authorization Code flow...');
-    if (serviceKeyPath) {
-      console.log(`📁 Service Key: ${serviceKeyPath}`);
-    }
-    if (inputEnvPath) {
-      console.log(`📁 Input Env: ${inputEnvPath}`);
-    }
-    console.log(`💾 Output Env: ${outputEnvPath}`);
-    console.log(`🌐 Browser: ${browser}`);
-    console.log(`🔗 Authorization URL: ${authorizationUrl}\n`);
-
-    // Get tokens
-    const result = await provider.getTokens();
-
-    // Save tokens to output env file
-    writeEnvFile(outputEnvPath, {
-      authorizationToken: result.authorizationToken,
-      refreshToken: result.refreshToken,
-      uaaUrl,
-      clientId,
-      clientSecret,
-    });
-
-    console.log('✅ Tokens obtained and saved successfully!');
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-    console.log(`🔑 Authorization Token: ${result.authorizationToken.substring(0, 50)}...`);
-    if (result.refreshToken) {
-      console.log(`🔄 Refresh Token: ${result.refreshToken.substring(0, 50)}...`);
-    }
-    console.log(`📋 Auth Type: ${result.authType}`);
-    if (result.expiresIn) {
-      console.log(`⏰ Expires In: ${result.expiresIn} seconds`);
-    }
-    console.log(`💾 Saved to: ${outputEnvPath}`);
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-  } catch (error) {
-    console.error('❌ Error:', error instanceof Error ? error.message : String(error));
-    process.exit(1);
-  }
-}
-
-main();
-

package/bin/auth-client-credentials.ts

@@ -1,109 +0,0 @@
-#!/usr/bin/env tsx
-/**
- * Client Credentials Provider Test Command
- *
- * Gets tokens using client_credentials grant type
- */
-
-import { ClientCredentialsProvider } from '../src/providers/ClientCredentialsProvider';
-import {
-  getUaaCredentials,
-  parseEnvFile,
-  parseServiceKey,
-  writeEnvFile,
-} from './utils/parseConfig';
-
-async function main() {
-  const args = process.argv.slice(2);
-  let serviceKeyPath: string | undefined;
-  let inputEnvPath: string | undefined;
-  let outputEnvPath: string | undefined;
-
-  // Parse arguments
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
-    if (arg === '--service-key' && args[i + 1]) {
-      serviceKeyPath = args[++i];
-    } else if (arg === '--input-env' && args[i + 1]) {
-      inputEnvPath = args[++i];
-    } else if (arg === '--output-env' && args[i + 1]) {
-      outputEnvPath = args[++i];
-    } else if (arg === '--help' || arg === '-h') {
-      console.log(`
-Usage: auth-client-credentials [options]
-
-Options:
-  --service-key <path>    Path to service key JSON file
-  --input-env <path>      Path to .env file for reading credentials
-  --output-env <path>     Path to .env file for saving tokens (required)
-  --help, -h              Show this help message
-
-Example:
-  auth-client-credentials --service-key ./service-key.json --output-env ./tokens.env
-  auth-client-credentials --input-env ./tokens.env --output-env ./tokens.env
-      `);
-      process.exit(0);
-    }
-  }
-
-  if (!serviceKeyPath && !inputEnvPath) {
-    console.error('❌ Error: Either --service-key or --input-env must be provided');
-    process.exit(1);
-  }
-
-  if (!outputEnvPath) {
-    console.error('❌ Error: --output-env is required to save tokens');
-    process.exit(1);
-  }
-
-  try {
-    // Parse config
-    const serviceKey = serviceKeyPath ? parseServiceKey(serviceKeyPath) : undefined;
-    const inputEnv = inputEnvPath ? parseEnvFile(inputEnvPath) : undefined;
-    const { uaaUrl, clientId, clientSecret } = getUaaCredentials(serviceKey, inputEnv);
-
-    // Create provider
-    const provider = new ClientCredentialsProvider({
-      uaaUrl,
-      clientId,
-      clientSecret,
-    });
-
-    console.log('🔐 Getting tokens using Client Credentials flow...');
-    if (serviceKeyPath) {
-      console.log(`📁 Service Key: ${serviceKeyPath}`);
-    }
-    if (inputEnvPath) {
-      console.log(`📁 Input Env: ${inputEnvPath}`);
-    }
-    console.log(`💾 Output Env: ${outputEnvPath}\n`);
-
-    // Get tokens
-    const result = await provider.getTokens();
-
-    // Save tokens to output env file
-    writeEnvFile(outputEnvPath, {
-      authorizationToken: result.authorizationToken,
-      refreshToken: result.refreshToken,
-      uaaUrl,
-      clientId,
-      clientSecret,
-    });
-
-    console.log('✅ Tokens obtained and saved successfully!');
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-    console.log(`🔑 Authorization Token: ${result.authorizationToken.substring(0, 50)}...`);
-    console.log(`📋 Auth Type: ${result.authType}`);
-    if (result.expiresIn) {
-      console.log(`⏰ Expires In: ${result.expiresIn} seconds`);
-    }
-    console.log(`💾 Saved to: ${outputEnvPath}`);
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-  } catch (error) {
-    console.error('❌ Error:', error instanceof Error ? error.message : String(error));
-    process.exit(1);
-  }
-}
-
-main();
-

package/bin/utils/parseConfig.ts

@@ -1,270 +0,0 @@
-/**
- * Utility functions for parsing service keys and env files
- */
-
-import {
-  ABAP_AUTHORIZATION_VARS,
-  ABAP_CONNECTION_VARS,
-} from '@mcp-abap-adt/auth-stores';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-
-export interface ServiceKey {
-  // Format 1: ABAP Environment service key (nested uaa object)
-  uaa?: {
-    url?: string;
-    clientid?: string;
-    clientsecret?: string;
-  };
-  // Format 2: XSUAA/BTP service key (flat structure)
-  url?: string;
-  clientid?: string;
-  clientsecret?: string;
-  // ABAP service URL
-  sap_url?: string;
-}
-
-export interface EnvConfig {
-  // ABAP Connection vars
-  [ABAP_CONNECTION_VARS.SERVICE_URL]?: string;
-  [ABAP_CONNECTION_VARS.AUTHORIZATION_TOKEN]?: string;
-  [ABAP_CONNECTION_VARS.USERNAME]?: string;
-  [ABAP_CONNECTION_VARS.PASSWORD]?: string;
-  [ABAP_CONNECTION_VARS.SAP_CLIENT]?: string;
-  [ABAP_CONNECTION_VARS.SAP_LANGUAGE]?: string;
-  // ABAP Authorization vars
-  [ABAP_AUTHORIZATION_VARS.UAA_URL]?: string;
-  [ABAP_AUTHORIZATION_VARS.UAA_CLIENT_ID]?: string;
-  [ABAP_AUTHORIZATION_VARS.UAA_CLIENT_SECRET]?: string;
-  [ABAP_AUTHORIZATION_VARS.REFRESH_TOKEN]?: string;
-  // Legacy support (for backward compatibility)
-  UAA_URL?: string;
-  UAA_CLIENT_ID?: string;
-  UAA_CLIENT_SECRET?: string;
-  SAP_URL?: string;
-  SERVICE_URL?: string;
-  AUTHORIZATION_TOKEN?: string;
-  REFRESH_TOKEN?: string;
-}
-
-/**
- * Parse service key from JSON file
- */
-export function parseServiceKey(filePath: string): ServiceKey {
-  const fullPath = path.resolve(filePath);
-  if (!fs.existsSync(fullPath)) {
-    throw new Error(`Service key file not found: ${fullPath}`);
-  }
-
-  const content = fs.readFileSync(fullPath, 'utf8');
-  try {
-    return JSON.parse(content) as ServiceKey;
-  } catch (error) {
-    throw new Error(
-      `Failed to parse service key file: ${error instanceof Error ? error.message : String(error)}`,
-    );
-  }
-}
-
-/**
- * Parse .env file
- */
-export function parseEnvFile(filePath: string): EnvConfig {
-  const fullPath = path.resolve(filePath);
-  if (!fs.existsSync(fullPath)) {
-    throw new Error(`Env file not found: ${fullPath}`);
-  }
-
-  const content = fs.readFileSync(fullPath, 'utf8');
-  const config: EnvConfig = {};
-
-  for (const line of content.split('\n')) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith('#')) {
-      continue;
-    }
-
-    const match = trimmed.match(/^([^=]+)=(.*)$/);
-    if (match) {
-      const key = match[1].trim();
-      const value = match[2].trim().replace(/^["']|["']$/g, '');
-      (config as Record<string, string>)[key] = value;
-    }
-  }
-
-  return config;
-}
-
-/**
- * Get UAA credentials from service key or env file
- * Supports two service key formats:
- * 1. ABAP Environment: nested uaa object (uaa.url, uaa.clientid, uaa.clientsecret)
- * 2. XSUAA/BTP flat: top-level fields (url, clientid, clientsecret)
- */
-export function getUaaCredentials(
-  serviceKey?: ServiceKey,
-  envConfig?: EnvConfig,
-): {
-  uaaUrl: string;
-  clientId: string;
-  clientSecret: string;
-} {
-  if (serviceKey) {
-    // Format 1: ABAP Environment service key with nested uaa object
-    if (serviceKey.uaa?.url && serviceKey.uaa?.clientid && serviceKey.uaa?.clientsecret) {
-      return {
-        uaaUrl: serviceKey.uaa.url,
-        clientId: serviceKey.uaa.clientid,
-        clientSecret: serviceKey.uaa.clientsecret,
-      };
-    }
-
-    // Format 2: XSUAA/BTP flat service key (url is UAA URL, no nested uaa object)
-    if (serviceKey.url && serviceKey.clientid && serviceKey.clientsecret) {
-      return {
-        uaaUrl: serviceKey.url,
-        clientId: serviceKey.clientid,
-        clientSecret: serviceKey.clientsecret,
-      };
-    }
-
-    // Try to provide helpful error message
-    const hasUaa = !!serviceKey.uaa;
-    const hasFlat = !!(serviceKey.clientid || serviceKey.clientsecret);
-    if (hasUaa) {
-      throw new Error(
-        'Service key (ABAP format) missing required UAA fields: uaa.url, uaa.clientid, uaa.clientsecret',
-      );
-    } else if (hasFlat) {
-      throw new Error(
-        'Service key (XSUAA format) missing required fields: url, clientid, clientsecret',
-      );
-    } else {
-      throw new Error(
-        'Service key format not recognized. Expected either ABAP format (uaa.url, uaa.clientid, uaa.clientsecret) or XSUAA format (url, clientid, clientsecret)',
-      );
-    }
-  }
-
-  if (envConfig) {
-    // Use constants from auth-stores, fallback to legacy names
-    const uaaUrl =
-      envConfig[ABAP_AUTHORIZATION_VARS.UAA_URL] || envConfig.UAA_URL;
-    const clientId =
-      envConfig[ABAP_AUTHORIZATION_VARS.UAA_CLIENT_ID] ||
-      envConfig.UAA_CLIENT_ID;
-    const clientSecret =
-      envConfig[ABAP_AUTHORIZATION_VARS.UAA_CLIENT_SECRET] ||
-      envConfig.UAA_CLIENT_SECRET;
-
-    if (!uaaUrl || !clientId || !clientSecret) {
-      throw new Error(
-        `Env file missing required UAA fields: ${ABAP_AUTHORIZATION_VARS.UAA_URL}, ${ABAP_AUTHORIZATION_VARS.UAA_CLIENT_ID}, ${ABAP_AUTHORIZATION_VARS.UAA_CLIENT_SECRET}`,
-      );
-    }
-
-    return { uaaUrl, clientId, clientSecret };
-  }
-
-  throw new Error('No service key or env config provided');
-}
-
-/**
- * Convert ABAP URL to ABAP-Web URL for ADT reentrancy ticket
- * @param url Original URL (may contain .abap. or .abap-web.)
- * @returns URL with .abap-web. domain
- */
-function convertToAbapWebUrl(url: string): string {
-  // Replace .abap. with .abap-web. for ADT reentrancy ticket
-  return url.replace(/\.abap\./g, '.abap-web.');
-}
-
-/**
- * Get service URL from service key or env file
- * For ADT, converts .abap. to .abap-web. if needed
- */
-export function getServiceUrl(
-  serviceKey?: ServiceKey,
-  envConfig?: EnvConfig,
-  forAdt: boolean = false,
-): string | undefined {
-  let url: string | undefined;
-
-  if (serviceKey) {
-    url = serviceKey.url || serviceKey.sap_url;
-  } else if (envConfig) {
-    // Use constants from auth-stores, fallback to legacy names
-    url =
-      envConfig[ABAP_CONNECTION_VARS.SERVICE_URL] ||
-      envConfig.SAP_URL ||
-      envConfig.SERVICE_URL;
-  }
-
-  if (url && forAdt) {
-    url = convertToAbapWebUrl(url);
-  }
-
-  return url;
-}
-
-/**
- * Write tokens to .env file
- */
-export function writeEnvFile(
-  filePath: string,
-  tokens: {
-    authorizationToken?: string;
-    refreshToken?: string;
-    uaaUrl?: string;
-    clientId?: string;
-    clientSecret?: string;
-    serviceUrl?: string;
-  },
-): void {
-  const fullPath = path.resolve(filePath);
-  const lines: string[] = [];
-
-  // Read existing file if it exists
-  const existing: EnvConfig = fs.existsSync(fullPath)
-    ? parseEnvFile(fullPath)
-    : {};
-
-  // Update with new tokens using constants from auth-stores
-  if (tokens.authorizationToken) {
-    existing[ABAP_CONNECTION_VARS.AUTHORIZATION_TOKEN] =
-      tokens.authorizationToken;
-  }
-  // Update refresh token only if provided (don't remove existing if not provided)
-  if (tokens.refreshToken) {
-    existing[ABAP_AUTHORIZATION_VARS.REFRESH_TOKEN] = tokens.refreshToken;
-  }
-  if (tokens.uaaUrl) {
-    existing[ABAP_AUTHORIZATION_VARS.UAA_URL] = tokens.uaaUrl;
-  }
-  if (tokens.clientId) {
-    existing[ABAP_AUTHORIZATION_VARS.UAA_CLIENT_ID] = tokens.clientId;
-  }
-  if (tokens.clientSecret) {
-    existing[ABAP_AUTHORIZATION_VARS.UAA_CLIENT_SECRET] = tokens.clientSecret;
-  }
-  if (tokens.serviceUrl) {
-    // Use SAP_URL as the standard name for ABAP systems
-    existing[ABAP_CONNECTION_VARS.SERVICE_URL] = tokens.serviceUrl;
-  }
-
-  // Write all values
-  for (const [key, value] of Object.entries(existing)) {
-    if (value) {
-      lines.push(`${key}=${value}`);
-    }
-  }
-
-  // Ensure directory exists
-  const dir = path.dirname(fullPath);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-
-  fs.writeFileSync(fullPath, lines.join('\n') + '\n', 'utf8');
-}
-

package/dist/__tests__/helpers/configHelpers.d.ts

@@ -1,46 +0,0 @@
-/**
- * Configuration helpers for auth-providers tests
- * Loads test configuration from test-config.yaml
- */
-export interface TestConfig {
-    destination?: string;
-    destination_dir?: string;
-    service_key_path?: string;
-    session_path?: string;
-}
-/**
- * Load test configuration from YAML
- * Uses test-config.yaml from tests/ directory
- */
-export declare function loadTestConfig(): TestConfig;
-/**
- * Check if test config has real values (not placeholders)
- */
-export declare function hasRealConfigValue(config?: TestConfig): boolean;
-/**
- * Get destination from config
- */
-export declare function getDestination(config?: TestConfig): string | null;
-/**
- * Get service keys directory from config
- * Uses base_dir/service-keys or default platform path
- */
-export declare function getServiceKeysDir(config?: TestConfig): string;
-/**
- * Get sessions directory from config
- * Uses base_dir/sessions or default platform path
- */
-export declare function getSessionsDir(config?: TestConfig): string;
-/**
- * Get service key file path
- * Returns full path to service key file
- */
-export declare function getServiceKeyPath(config?: TestConfig): string | null;
-/**
- * Get session file path
- * Returns full path to session file
- */
-export declare function getSessionPath(config?: TestConfig): string | null;
-export declare function getAbapDestination(config?: TestConfig): string | null;
-export declare function hasRealConfig(config?: TestConfig, _section?: 'abap' | 'xsuaa'): boolean;
-//# sourceMappingURL=configHelpers.d.ts.map

package/dist/__tests__/helpers/configHelpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"configHelpers.d.ts","sourceRoot":"","sources":["../../../src/__tests__/helpers/configHelpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,MAAM,WAAW,UAAU;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAkBD;;;GAGG;AACH,wBAAgB,cAAc,IAAI,UAAU,CAyD3C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAO/D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAGjE;AA+BD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,CAa7D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,CAa1D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAcpE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAcjE;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAErE;AAED,wBAAgB,aAAa,CAC3B,MAAM,CAAC,EAAE,UAAU,EACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,GAC1B,OAAO,CAET"}