@novorb/mcp-core 2.1.2 → 3.0.1

package/package.json

@@ -1,23 +1,48 @@
 {
   "name": "@novorb/mcp-core",
-  "version": "2.1.2",
-  "description": "Shared utilities for MCP servers — logger, HTTP client, retry, pagination, transport",
+  "version": "3.0.1",
+  "description": "Shared utilities for MCP servers: the SDK v2 surface, logger, HTTP client, retry, pagination, transport",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "bin": {
+    "mcp-core-jest": "bin/mcp-core-jest.mjs"
+  },
   "exports": {
     ".": "./dist/index.js",
-    "./logger": "./dist/logger.js",
+    "./logger": "./dist/utils/logger.js",
     "./retry": "./dist/retry.js",
     "./pagination": "./dist/pagination.js",
     "./http-client": "./dist/http-client.js",
     "./transport": "./dist/transport.js",
-    "./server": "./dist/server.js"
+    "./server": "./dist/server.js",
+    "./tools": "./dist/tools.js",
+    "./credentials": "./dist/credential-health.js",
+    "./bootstrap": "./dist/bootstrap.js",
+    "./env": "./dist/utils/envLoader.js",
+    "./data-store": "./dist/utils/dataStore.js",
+    "./net": "./dist/net.js",
+    "./url-path": "./dist/url-path.js",
+    "./auth": "./dist/auth.js",
+    "./express": "./dist/express.js",
+    "./notifications": "./dist/notifications.js",
+    "./prompts": "./dist/prompts.js",
+    "./resources": "./dist/resources.js",
+    "./request-state": "./dist/request-state.js",
+    "./task-store": "./dist/task-store.js",
+    "./task-tools": "./dist/task-tools.js",
+    "./testing": "./dist/testing/index.js",
+    "./sdk/server": "./dist/sdk/server.js",
+    "./sdk/server/stdio": "./dist/sdk/server-stdio.js",
+    "./sdk/node": "./dist/sdk/node.js",
+    "./sdk/client": "./dist/sdk/client.js",
+    "./sdk/client/stdio": "./dist/sdk/client-stdio.js",
+    "./sdk/express": "./dist/sdk/express.js"
   },
   "typesVersions": {
     "*": {
       "logger": [
-        "dist/logger.d.ts"
+        "dist/utils/logger.d.ts"
       ],
       "retry": [
         "dist/retry.d.ts"
@@ -33,6 +58,72 @@
       ],
       "server": [
         "dist/server.d.ts"
+      ],
+      "tools": [
+        "dist/tools.d.ts"
+      ],
+      "credentials": [
+        "dist/credential-health.d.ts"
+      ],
+      "bootstrap": [
+        "dist/bootstrap.d.ts"
+      ],
+      "env": [
+        "dist/utils/envLoader.d.ts"
+      ],
+      "data-store": [
+        "dist/utils/dataStore.d.ts"
+      ],
+      "net": [
+        "dist/net.d.ts"
+      ],
+      "url-path": [
+        "dist/url-path.d.ts"
+      ],
+      "auth": [
+        "dist/auth.d.ts"
+      ],
+      "express": [
+        "dist/express.d.ts"
+      ],
+      "notifications": [
+        "dist/notifications.d.ts"
+      ],
+      "prompts": [
+        "dist/prompts.d.ts"
+      ],
+      "resources": [
+        "dist/resources.d.ts"
+      ],
+      "request-state": [
+        "dist/request-state.d.ts"
+      ],
+      "task-store": [
+        "dist/task-store.d.ts"
+      ],
+      "task-tools": [
+        "dist/task-tools.d.ts"
+      ],
+      "testing": [
+        "dist/testing/index.d.ts"
+      ],
+      "sdk/server": [
+        "dist/sdk/server.d.ts"
+      ],
+      "sdk/server/stdio": [
+        "dist/sdk/server-stdio.d.ts"
+      ],
+      "sdk/node": [
+        "dist/sdk/node.d.ts"
+      ],
+      "sdk/client": [
+        "dist/sdk/client.d.ts"
+      ],
+      "sdk/client/stdio": [
+        "dist/sdk/client-stdio.d.ts"
+      ],
+      "sdk/express": [
+        "dist/sdk/express.d.ts"
       ]
     }
   },
@@ -57,36 +148,58 @@
     "url": "https://github.com/Novorb/mcp-core/issues"
   },
   "author": "novorb",
+  "peerDependencies": {
+    "@modelcontextprotocol/express": "~2.0.2",
+    "express": "^4.18.0 || ^5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@modelcontextprotocol/express": {
+      "optional": true
+    },
+    "express": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.30.0",
-    "axios": "^1.20.0",
-    "axios-retry": "^4.5.0"
+    "@modelcontextprotocol/client": "~2.3.1",
+    "@modelcontextprotocol/node": "~2.1.1",
+    "@modelcontextprotocol/server": "~2.3.1",
+    "axios": "^1.20.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.13",
     "@jest/globals": "^30.3.0",
+    "@modelcontextprotocol/express": "~2.0.2",
+    "@modelcontextprotocol/ext-tasks": "0.2.2",
     "@secretlint/secretlint-rule-preset-recommend": "^13.0.5",
+    "@types/express": "^5.0.6",
     "@types/jest": "^30.0.0",
     "@types/node": "^20.19.33",
+    "express": "^5.2.1",
     "jest": "^30.3.0",
     "secretlint": "^13.0.5",
     "ts-jest": "^29.4.9",
-    "typescript": "^5.9.3"
+    "tsx": "^4.20.0",
+    "typescript": "^5.9.3",
+    "zod": "^4.2.0"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.12.0"
   },
   "files": [
-    "dist"
+    "dist",
+    "bin",
+    "docs",
+    "examples"
   ],
   "scripts": {
     "build": "tsc",
-    "typecheck": "tsc --noEmit",
-    "test": "node scripts/run-jest.mjs --runInBand",
-    "test:watch": "node scripts/run-jest.mjs --watch",
-    "test:coverage": "node scripts/run-jest.mjs --runInBand --coverage",
-    "lint": "biome check src tests scripts",
-    "format": "biome check --write src tests scripts",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.examples.json",
+    "test": "node bin/mcp-core-jest.mjs --runInBand",
+    "test:watch": "node bin/mcp-core-jest.mjs --watch",
+    "test:coverage": "node bin/mcp-core-jest.mjs --runInBand --coverage",
+    "lint": "biome check src tests scripts bin examples",
+    "format": "biome check --write src tests scripts bin examples",
     "secretlint": "secretlint \"**/*\" --secretlintignore .gitignore",
     "docs:check": "node scripts/check-docs-freshness.mjs",
     "qa:all": "node scripts/qa-all.mjs",

package/dist/logger.d.ts

@@ -1,80 +0,0 @@
-/**
- * @novorb/mcp-core — Logger
- *
- * Unified logger for MCP servers. Supports two output modes:
- * - file: writes to rotating log files (for stdio-based MCP servers)
- * - stderr: writes to stderr (for Docker / HTTP transport)
- *
- * Log format (text): 2026-03-22T13:27:58.513Z | INFO  | Server | Starting...
- * Log format (json): {"level":"INFO","timestamp":"...","component":"Server","message":"Starting..."}
- *
- * Environment variables (read once at first logger creation):
- * - LOG_LEVEL: DEBUG, INFO, WARN, ERROR (default: INFO)
- * - LOG_PATH: log directory (default: ./logs)
- * - LOG_FILE: log file name (default: mcp.log)
- *
- * Security: `meta` is passed through `redactSecrets()` before serialisation — sensitive-keyed fields
- * (authorization/token/api_key/secret/password/cookie/...) are replaced with `[REDACTED]` so a
- * consumer that logs an error object or request params never writes a credential in cleartext. In
- * text mode the message + component are also stripped of CR/LF so a logged value can't forge log lines.
- */
-export declare enum LogLevel {
-    DEBUG = 0,
-    INFO = 1,
-    WARN = 2,
-    ERROR = 3
-}
-export interface LoggerConfig {
-    /** Minimum log level (default: INFO) */
-    level: LogLevel;
-    /** Output mode: 'file' writes to disk, 'stderr' writes to process.stderr */
-    output: 'file' | 'stderr';
-    /** Format: 'text' for human-readable, 'json' for structured (default: text) */
-    format: 'text' | 'json';
-    /** Directory for log files (file mode only) */
-    logDir: string;
-    /** Log file name (file mode only, default: mcp.log) */
-    logFile: string;
-    /** Max log file size in bytes before rotation (default: 10MB) */
-    maxLogSize: number;
-    /** Max number of rotated log files to keep (default: 5) */
-    maxLogFiles: number;
-}
-/** Recursively copy a value, replacing any sensitive-keyed field with `[REDACTED]`. */
-export declare function redactSecrets(value: unknown, depth?: number): unknown;
-export declare class Logger {
-    private config;
-    private logPath;
-    constructor(config?: Partial<LoggerConfig>);
-    private ensureLogDirectory;
-    private shouldLog;
-    private formatText;
-    private formatJson;
-    private format;
-    private write;
-    private writeToFile;
-    private rotateLog;
-    debug(message: string, context?: string, meta?: unknown): void;
-    info(message: string, context?: string, meta?: unknown): void;
-    warn(message: string, context?: string, meta?: unknown): void;
-    error(message: string, context?: string, meta?: unknown): void;
-    setLevel(level: LogLevel): void;
-}
-/**
- * Initialize logger with custom config.
- * Should be called once at application startup.
- * Reads LOG_LEVEL, LOG_PATH, LOG_FILE from env (overrides take precedence).
- */
-export declare function initLogger(config?: Partial<LoggerConfig>): Logger;
-/**
- * Get the logger instance.
- * Creates a default stderr/text instance if initLogger was not called.
- * Reads LOG_LEVEL, LOG_PATH, LOG_FILE from env on first creation.
- */
-export declare function getLogger(config?: Partial<LoggerConfig>): Logger;
-/**
- * Reset the singleton (for testing).
- */
-export declare function resetLogger(): void;
-export default getLogger;
-//# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,oBAAY,QAAQ;IAClB,KAAK,IAAI;IACT,IAAI,IAAI;IACR,IAAI,IAAI;IACR,KAAK,IAAI;CACV;AAaD,MAAM,WAAW,YAAY;IAC3B,wCAAwC;IACxC,KAAK,EAAE,QAAQ,CAAC;IAChB,4EAA4E;IAC5E,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,+EAA+E;IAC/E,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,UAAU,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,EAAE,MAAM,CAAC;CACrB;AAkCD,uFAAuF;AACvF,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,OAAO,CAQhE;AAoBD,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC;IAS1C,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,UAAU;IAkBlB,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,KAAK;IAYb,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,SAAS;IAqBjB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAI9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAI7D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAI7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAI9D,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGhC;AAKD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,CAGjE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,CAKhE;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,eAAe,SAAS,CAAC"}

package/dist/logger.js

@@ -1,237 +0,0 @@
-/**
- * @novorb/mcp-core — Logger
- *
- * Unified logger for MCP servers. Supports two output modes:
- * - file: writes to rotating log files (for stdio-based MCP servers)
- * - stderr: writes to stderr (for Docker / HTTP transport)
- *
- * Log format (text): 2026-03-22T13:27:58.513Z | INFO  | Server | Starting...
- * Log format (json): {"level":"INFO","timestamp":"...","component":"Server","message":"Starting..."}
- *
- * Environment variables (read once at first logger creation):
- * - LOG_LEVEL: DEBUG, INFO, WARN, ERROR (default: INFO)
- * - LOG_PATH: log directory (default: ./logs)
- * - LOG_FILE: log file name (default: mcp.log)
- *
- * Security: `meta` is passed through `redactSecrets()` before serialisation — sensitive-keyed fields
- * (authorization/token/api_key/secret/password/cookie/...) are replaced with `[REDACTED]` so a
- * consumer that logs an error object or request params never writes a credential in cleartext. In
- * text mode the message + component are also stripped of CR/LF so a logged value can't forge log lines.
- */
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-export var LogLevel;
-(function (LogLevel) {
-    LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
-    LogLevel[LogLevel["INFO"] = 1] = "INFO";
-    LogLevel[LogLevel["WARN"] = 2] = "WARN";
-    LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
-})(LogLevel || (LogLevel = {}));
-/** Map string → LogLevel, case-insensitive */
-function parseLogLevel(value) {
-    if (!value)
-        return undefined;
-    const upper = value.toUpperCase();
-    const byName = LogLevel;
-    if (upper in LogLevel && typeof byName[upper] === 'number') {
-        return byName[upper];
-    }
-    return undefined;
-}
-const DEFAULT_CONFIG = {
-    level: LogLevel.INFO,
-    output: 'stderr',
-    format: 'text',
-    logDir: 'logs',
-    logFile: 'mcp.log',
-    maxLogSize: 10 * 1024 * 1024,
-    maxLogFiles: 5,
-};
-/** Build config from defaults + env vars + explicit overrides */
-function buildConfig(overrides) {
-    const envLevel = parseLogLevel(process.env.LOG_LEVEL);
-    const envDir = process.env.LOG_PATH;
-    const envFile = process.env.LOG_FILE;
-    return {
-        ...DEFAULT_CONFIG,
-        ...(envLevel !== undefined ? { level: envLevel } : {}),
-        ...(envDir ? { logDir: envDir } : {}),
-        ...(envFile ? { logFile: envFile } : {}),
-        ...overrides,
-    };
-}
-// Keys whose values are redacted before a `meta` object is serialised. Defense-in-depth: consumers
-// commonly pass error objects / request params carrying credentials, and a log sink must never write
-// them in cleartext. Matched case-insensitively against each object key.
-const SENSITIVE_KEY = /(authorization|cookie|password|secret|client[_-]?secret|access[_-]?token|refresh[_-]?token|token|api[_-]?key|apikey|bearer|private[_-]?key|signature|x-api-key)/i;
-const REDACTED = '[REDACTED]';
-/** Recursively copy a value, replacing any sensitive-keyed field with `[REDACTED]`. */
-export function redactSecrets(value, depth = 0) {
-    if (depth > 6 || value === null || typeof value !== 'object')
-        return value;
-    if (Array.isArray(value))
-        return value.map((v) => redactSecrets(v, depth + 1));
-    const out = {};
-    for (const [k, v] of Object.entries(value)) {
-        out[k] = SENSITIVE_KEY.test(k) ? REDACTED : redactSecrets(v, depth + 1);
-    }
-    return out;
-}
-/** Collapse C0 control chars (incl. CR/LF) + DEL to spaces so a logged value can't forge log lines. */
-function stripControlChars(s) {
-    let out = '';
-    for (let i = 0; i < s.length; i++) {
-        const code = s.charCodeAt(i);
-        out += code < 0x20 || code === 0x7f ? ' ' : s[i];
-    }
-    return out;
-}
-// Padded level names — fixed 5 chars for alignment
-const LEVEL_NAMES = {
-    [LogLevel.DEBUG]: 'DEBUG',
-    [LogLevel.INFO]: 'INFO ',
-    [LogLevel.WARN]: 'WARN ',
-    [LogLevel.ERROR]: 'ERROR',
-};
-export class Logger {
-    config;
-    logPath;
-    constructor(config) {
-        this.config = buildConfig(config);
-        this.logPath = path.join(this.config.logDir, this.config.logFile);
-        if (this.config.output === 'file') {
-            this.ensureLogDirectory();
-        }
-    }
-    ensureLogDirectory() {
-        if (!fs.existsSync(this.config.logDir)) {
-            fs.mkdirSync(this.config.logDir, { recursive: true });
-        }
-    }
-    shouldLog(level) {
-        return level >= this.config.level;
-    }
-    formatText(level, message, context, meta) {
-        const timestamp = new Date().toISOString();
-        const levelStr = LEVEL_NAMES[level] ?? LogLevel[level].padEnd(5);
-        const contextStr = stripControlChars(context ?? 'General');
-        const safeMessage = stripControlChars(message);
-        const metaStr = meta !== undefined ? ` | ${JSON.stringify(redactSecrets(meta))}` : '';
-        return `${timestamp} | ${levelStr} | ${contextStr} | ${safeMessage}${metaStr}\n`;
-    }
-    formatJson(level, message, context, meta) {
-        const entry = {
-            level: LogLevel[level],
-            timestamp: new Date().toISOString(),
-            component: context ?? 'General',
-            message,
-        };
-        if (meta !== undefined) {
-            const safeMeta = redactSecrets(meta);
-            if (typeof safeMeta === 'object' && safeMeta !== null) {
-                Object.assign(entry, safeMeta);
-            }
-            else {
-                entry.meta = safeMeta;
-            }
-        }
-        return `${JSON.stringify(entry)}\n`;
-    }
-    format(level, message, context, meta) {
-        return this.config.format === 'json'
-            ? this.formatJson(level, message, context, meta)
-            : this.formatText(level, message, context, meta);
-    }
-    write(level, message, context, meta) {
-        if (!this.shouldLog(level))
-            return;
-        const formatted = this.format(level, message, context, meta);
-        if (this.config.output === 'file') {
-            this.writeToFile(formatted);
-        }
-        else {
-            process.stderr.write(formatted);
-        }
-    }
-    writeToFile(message) {
-        try {
-            if (fs.existsSync(this.logPath)) {
-                const stats = fs.statSync(this.logPath);
-                if (stats.size > this.config.maxLogSize) {
-                    this.rotateLog();
-                }
-            }
-            fs.appendFileSync(this.logPath, message, 'utf8');
-        }
-        catch {
-            // Silently fail — can't log to console in MCP stdio context
-        }
-    }
-    rotateLog() {
-        try {
-            for (let i = this.config.maxLogFiles - 1; i > 0; i--) {
-                const oldPath = `${this.logPath}.${i}`;
-                const newPath = `${this.logPath}.${i + 1}`;
-                if (fs.existsSync(oldPath)) {
-                    if (i === this.config.maxLogFiles - 1) {
-                        fs.unlinkSync(oldPath);
-                    }
-                    else {
-                        fs.renameSync(oldPath, newPath);
-                    }
-                }
-            }
-            if (fs.existsSync(this.logPath)) {
-                fs.renameSync(this.logPath, `${this.logPath}.1`);
-            }
-        }
-        catch {
-            // Silently fail
-        }
-    }
-    debug(message, context, meta) {
-        this.write(LogLevel.DEBUG, message, context, meta);
-    }
-    info(message, context, meta) {
-        this.write(LogLevel.INFO, message, context, meta);
-    }
-    warn(message, context, meta) {
-        this.write(LogLevel.WARN, message, context, meta);
-    }
-    error(message, context, meta) {
-        this.write(LogLevel.ERROR, message, context, meta);
-    }
-    setLevel(level) {
-        this.config.level = level;
-    }
-}
-// Singleton management
-let loggerInstance = null;
-/**
- * Initialize logger with custom config.
- * Should be called once at application startup.
- * Reads LOG_LEVEL, LOG_PATH, LOG_FILE from env (overrides take precedence).
- */
-export function initLogger(config) {
-    loggerInstance = new Logger(config);
-    return loggerInstance;
-}
-/**
- * Get the logger instance.
- * Creates a default stderr/text instance if initLogger was not called.
- * Reads LOG_LEVEL, LOG_PATH, LOG_FILE from env on first creation.
- */
-export function getLogger(config) {
-    if (!loggerInstance) {
-        loggerInstance = new Logger(config);
-    }
-    return loggerInstance;
-}
-/**
- * Reset the singleton (for testing).
- */
-export function resetLogger() {
-    loggerInstance = null;
-}
-export default getLogger;
-//# sourceMappingURL=logger.js.map

package/dist/logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,CAAN,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,uCAAQ,CAAA;IACR,yCAAS,CAAA;AACX,CAAC,EALW,QAAQ,KAAR,QAAQ,QAKnB;AAED,8CAA8C;AAC9C,SAAS,aAAa,CAAC,KAAyB;IAC9C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,QAAyD,CAAC;IACzE,IAAI,KAAK,IAAI,QAAQ,IAAI,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC3D,OAAO,MAAM,CAAC,KAAK,CAAa,CAAC;IACnC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAmBD,MAAM,cAAc,GAAiB;IACnC,KAAK,EAAE,QAAQ,CAAC,IAAI;IACpB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;IAC5B,WAAW,EAAE,CAAC;CACf,CAAC;AAEF,iEAAiE;AACjE,SAAS,WAAW,CAAC,SAAiC;IACpD,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IAErC,OAAO;QACL,GAAG,cAAc;QACjB,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,mGAAmG;AACnG,qGAAqG;AACrG,yEAAyE;AACzE,MAAM,aAAa,GACjB,kKAAkK,CAAC;AACrK,MAAM,QAAQ,GAAG,YAAY,CAAC;AAE9B,uFAAuF;AACvF,MAAM,UAAU,aAAa,CAAC,KAAc,EAAE,KAAK,GAAG,CAAC;IACrD,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3E,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,GAAG,GAA4B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;QACtE,GAAG,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,uGAAuG;AACvG,SAAS,iBAAiB,CAAC,CAAS;IAClC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC7B,GAAG,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,mDAAmD;AACnD,MAAM,WAAW,GAA2B;IAC1C,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO;IACxB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO;IACxB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;CAC1B,CAAC;AAEF,MAAM,OAAO,MAAM;IACT,MAAM,CAAe;IACrB,OAAO,CAAS;IAExB,YAAY,MAA8B;QACxC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAElE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,KAAe;QAC/B,OAAO,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IACpC,CAAC;IAEO,UAAU,CAAC,KAAe,EAAE,OAAe,EAAE,OAAgB,EAAE,IAAc;QACnF,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,OAAO,GAAG,SAAS,MAAM,QAAQ,MAAM,UAAU,MAAM,WAAW,GAAG,OAAO,IAAI,CAAC;IACnF,CAAC;IAEO,UAAU,CAAC,KAAe,EAAE,OAAe,EAAE,OAAgB,EAAE,IAAc;QACnF,MAAM,KAAK,GAA4B;YACrC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;YACtB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS,EAAE,OAAO,IAAI,SAAS;YAC/B,OAAO;SACR,CAAC;QACF,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtD,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;YACxB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;IACtC,CAAC;IAEO,MAAM,CAAC,KAAe,EAAE,OAAe,EAAE,OAAgB,EAAE,IAAc;QAC/E,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM;YAClC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,KAAe,EAAE,OAAe,EAAE,OAAgB,EAAE,IAAc;QAC9E,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAAE,OAAO;QAEnC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE7D,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,OAAe;QACjC,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACxC,IAAI,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBACxC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;QAC9D,CAAC;IACH,CAAC;IAEO,SAAS;QACf,IAAI,CAAC;YACH,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC;gBACvC,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3C,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;wBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBACzB,CAAC;yBAAM,CAAC;wBACN,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,gBAAgB;QAClB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,OAAgB,EAAE,IAAc;QACrD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,OAAgB,EAAE,IAAc;QACpD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,OAAgB,EAAE,IAAc;QACpD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,OAAgB,EAAE,IAAc;QACrD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,QAAQ,CAAC,KAAe;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IAC5B,CAAC;CACF;AAED,uBAAuB;AACvB,IAAI,cAAc,GAAkB,IAAI,CAAC;AAEzC;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,MAA8B;IACvD,cAAc,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,MAA8B;IACtD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,cAAc,GAAG,IAAI,CAAC;AACxB,CAAC;AAED,eAAe,SAAS,CAAC"}