@j0hanz/fetch-url-mcp 1.3.1 → 1.5.0

package/dist/transform/types.d.ts

@@ -43,14 +43,17 @@ export interface ExtractionResult {
     article: ExtractedArticle | null;
     metadata: ExtractedMetadata;
 }
+interface MarkdownPayload {
+    markdown: string;
+    title?: string | undefined;
+    truncated: boolean;
+    metadata?: ExtractedMetadata;
+}
 /**
  * Result of HTML to markdown transformation.
  */
-export interface MarkdownTransformResult {
-    markdown: string;
+export interface MarkdownTransformResult extends MarkdownPayload {
     title: string | undefined;
-    truncated: boolean;
-    metadata?: ExtractedMetadata;
 }
 /**
  * Options for transform operations.
@@ -109,14 +112,8 @@ export interface TransformWorkerCancelledMessage {
 export interface TransformWorkerResultMessage {
     type: 'result';
     id: string;
-    result: {
-        markdown: string;
-        title?: string;
-        truncated: boolean;
-        metadata?: ExtractedMetadata;
-    };
+    result: MarkdownPayload;
 }
-export type TransformWorkerPayload = TransformWorkerResultMessage['result'];
 export interface TransformWorkerErrorMessage {
     type: 'error';
     id: string;
@@ -129,4 +126,4 @@ export interface TransformWorkerErrorMessage {
     };
 }
 export type TransformWorkerOutgoingMessage = TransformWorkerResultMessage | TransformWorkerErrorMessage | TransformWorkerCancelledMessage;
-//# sourceMappingURL=types.d.ts.map
+export {};

package/dist/transform/types.js

@@ -3,4 +3,3 @@
  * Extracted to avoid circular dependencies between transform modules.
  */
 export {};
-//# sourceMappingURL=types.js.map

package/dist/transform/worker-pool.d.ts

@@ -90,4 +90,3 @@ export declare function getWorkerPoolStats(): {
 } | null;
 export declare function shutdownWorkerPool(): Promise<void>;
 export {};
-//# sourceMappingURL=worker-pool.d.ts.map

package/dist/transform/worker-pool.js

@@ -5,20 +5,12 @@ import { availableParallelism } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { isSharedArrayBuffer } from 'node:util/types';
 import { Worker, } from 'node:worker_threads';
-import { config } from '../config.js';
-import { FetchError, getErrorMessage } from '../errors.js';
-import { logWarn } from '../observability.js';
-import { createUnrefTimeout } from '../timer-utils.js';
-import { isObject } from '../type-guards.js';
-// ---------------------------------------------------------------------------
-// Abort helper (inlined to avoid circular dependency with transform.ts)
-// ---------------------------------------------------------------------------
-function createAbortError(url, stage) {
-    return new FetchError('Request was canceled', url, 499, {
-        reason: 'aborted',
-        stage,
-    });
-}
+import { config } from '../lib/core.js';
+import { logWarn } from '../lib/core.js';
+import { createAbortError } from '../lib/utils.js';
+import { FetchError, getErrorMessage } from '../lib/utils.js';
+import { createUnrefTimeout } from '../lib/utils.js';
+import { isObject } from '../lib/utils.js';
 // ---------------------------------------------------------------------------
 // Worker message validation
 // ---------------------------------------------------------------------------
@@ -282,7 +274,7 @@ class WorkerPool {
                 ? 0
                 : Math.max(this.minCapacity, Math.min(size, this.maxCapacity));
         this.timeoutMs = timeoutMs;
-        this.queueMax = this.maxCapacity * 32;
+        this.queueMax = this.maxCapacity * 4;
         this.spawnWorkerImpl = spawnWorker;
     }
     async transform(htmlOrBuffer, url, options) {
@@ -754,4 +746,3 @@ export async function shutdownWorkerPool() {
     await workerPool.close();
     workerPool = null;
 }
-//# sourceMappingURL=worker-pool.js.map

package/dist/transform/workers/shared.d.ts

@@ -0,0 +1,7 @@
+import type { MarkdownTransformResult, TransformOptions, TransformWorkerOutgoingMessage } from '../types.js';
+interface WorkerMessageHandlerOptions {
+    sendMessage: (message: TransformWorkerOutgoingMessage) => void;
+    runTransform: (html: string, url: string, options: TransformOptions) => MarkdownTransformResult;
+}
+export declare function createTransformMessageHandler(options: WorkerMessageHandlerOptions): (raw: unknown) => void;
+export {};

package/dist/transform/workers/shared.js

@@ -0,0 +1,130 @@
+import { FetchError, getErrorMessage } from '../../lib/utils.js';
+function isTransformMessage(message) {
+    if (!message || typeof message !== 'object')
+        return false;
+    const value = message;
+    const { id, url, html, htmlBuffer, encoding, includeMetadata, skipNoiseRemoval, inputTruncated, } = value;
+    return (typeof id === 'string' &&
+        typeof url === 'string' &&
+        typeof includeMetadata === 'boolean' &&
+        (html === undefined || typeof html === 'string') &&
+        (htmlBuffer === undefined || htmlBuffer instanceof Uint8Array) &&
+        (encoding === undefined || typeof encoding === 'string') &&
+        (skipNoiseRemoval === undefined || typeof skipNoiseRemoval === 'boolean') &&
+        (inputTruncated === undefined || typeof inputTruncated === 'boolean'));
+}
+function decodeHtml(html, htmlBuffer, encoding, decoder) {
+    if (!htmlBuffer)
+        return html ?? '';
+    if (!encoding || encoding === 'utf-8') {
+        return decoder.decode(htmlBuffer);
+    }
+    try {
+        return new TextDecoder(encoding).decode(htmlBuffer);
+    }
+    catch {
+        return decoder.decode(htmlBuffer);
+    }
+}
+function createErrorMessage(id, url, error) {
+    if (error instanceof FetchError) {
+        return {
+            type: 'error',
+            id,
+            error: {
+                name: error.name,
+                message: error.message,
+                url: error.url,
+                statusCode: error.statusCode,
+                details: { ...error.details },
+            },
+        };
+    }
+    return {
+        type: 'error',
+        id,
+        error: {
+            name: error instanceof Error ? error.name : 'Error',
+            message: getErrorMessage(error),
+            url,
+        },
+    };
+}
+function createResultMessage(id, result) {
+    return {
+        type: 'result',
+        id,
+        result: {
+            markdown: result.markdown,
+            ...(result.metadata ? { metadata: result.metadata } : {}),
+            ...(result.title !== undefined ? { title: result.title } : {}),
+            truncated: result.truncated,
+        },
+    };
+}
+export function createTransformMessageHandler(options) {
+    const { sendMessage, runTransform } = options;
+    const controllersById = new Map();
+    const decoder = new TextDecoder('utf-8');
+    return (raw) => {
+        if (!raw || typeof raw !== 'object')
+            return;
+        const message = raw;
+        const messageType = message['type'];
+        const messageId = message['id'];
+        if (messageType === 'cancel') {
+            if (typeof messageId !== 'string')
+                return;
+            const controller = controllersById.get(messageId);
+            if (controller)
+                controller.abort(new Error('Canceled'));
+            sendMessage({ type: 'cancelled', id: messageId });
+            return;
+        }
+        if (messageType !== 'transform' || !isTransformMessage(message))
+            return;
+        const { id, url, html, htmlBuffer, encoding, includeMetadata, skipNoiseRemoval, inputTruncated, } = message;
+        if (!id.trim()) {
+            sendMessage({
+                type: 'error',
+                id,
+                error: {
+                    name: 'ValidationError',
+                    message: 'Missing transform message id',
+                    url: url || '',
+                },
+            });
+            return;
+        }
+        if (!url.trim()) {
+            sendMessage({
+                type: 'error',
+                id,
+                error: {
+                    name: 'ValidationError',
+                    message: 'Missing transform URL',
+                    url,
+                },
+            });
+            return;
+        }
+        const controller = new AbortController();
+        controllersById.set(id, controller);
+        try {
+            const content = decodeHtml(html, htmlBuffer, encoding, decoder);
+            const result = runTransform(content, url, {
+                includeMetadata,
+                signal: controller.signal,
+                ...(skipNoiseRemoval ? { skipNoiseRemoval: true } : {}),
+                ...(inputTruncated ? { inputTruncated: true } : {}),
+            });
+            sendMessage(createResultMessage(id, result));
+        }
+        catch (error) {
+            sendMessage(createErrorMessage(id, url, error));
+        }
+        finally {
+            controllersById.delete(id);
+        }
+    };
+}

package/dist/transform/workers/transform-child.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=transform-child.d.ts.map

package/dist/transform/workers/transform-child.js

@@ -1,6 +1,6 @@
 import process from 'node:process';
-import { FetchError, getErrorMessage } from '../../errors.js';
 import { transformHtmlToMarkdownInProcess } from '../transform.js';
+import { createTransformMessageHandler } from './shared.js';
 const send = process.send?.bind(process);
 if (!send)
     throw new Error('transform-child started without IPC channel');
@@ -8,138 +8,8 @@ const sendMessage = send;
 function postMessage(message) {
     sendMessage(message);
 }
-const controllersById = new Map();
-const decoder = new TextDecoder('utf-8');
-function postError(id, url, error) {
-    if (error instanceof FetchError) {
-        postMessage({
-            type: 'error',
-            id,
-            error: {
-                name: error.name,
-                message: error.message,
-                url: error.url,
-                statusCode: error.statusCode,
-                details: { ...error.details },
-            },
-        });
-        return;
-    }
-    postMessage({
-        type: 'error',
-        id,
-        error: {
-            name: error instanceof Error ? error.name : 'Error',
-            message: getErrorMessage(error),
-            url,
-        },
-    });
-}
-function isValidMessage(msg) {
-    const { id, url, html, htmlBuffer, encoding, includeMetadata, skipNoiseRemoval, inputTruncated, } = msg;
-    if (typeof id !== 'string')
-        return false;
-    if (typeof url !== 'string')
-        return false;
-    if (typeof includeMetadata !== 'boolean')
-        return false;
-    if (html !== undefined && typeof html !== 'string')
-        return false;
-    if (htmlBuffer !== undefined && !(htmlBuffer instanceof Uint8Array))
-        return false;
-    if (encoding !== undefined && typeof encoding !== 'string')
-        return false;
-    if (skipNoiseRemoval !== undefined && typeof skipNoiseRemoval !== 'boolean')
-        return false;
-    if (inputTruncated !== undefined && typeof inputTruncated !== 'boolean')
-        return false;
-    return true;
-}
-function postValidationError(id, url, message) {
-    postMessage({
-        type: 'error',
-        id,
-        error: { name: 'ValidationError', message, url },
-    });
-}
-function decodeHtml(html, htmlBuffer, encoding) {
-    if (!htmlBuffer)
-        return html ?? '';
-    if (!encoding || encoding === 'utf-8')
-        return decoder.decode(htmlBuffer);
-    try {
-        return new TextDecoder(encoding).decode(htmlBuffer);
-    }
-    catch {
-        // Fall back to UTF-8 when server-provided charset labels are invalid.
-        return decoder.decode(htmlBuffer);
-    }
-}
-function buildTransformResultMessage(result) {
-    return {
-        markdown: result.markdown,
-        ...(result.metadata ? { metadata: result.metadata } : {}),
-        ...(result.title !== undefined ? { title: result.title } : {}),
-        truncated: result.truncated,
-    };
-}
-function handleTransform(msg) {
-    if (!isValidMessage(msg))
-        return;
-    const { id, url, html, htmlBuffer, encoding, includeMetadata, skipNoiseRemoval, inputTruncated, } = msg;
-    if (!id.trim()) {
-        postValidationError(id, url || '', 'Missing transform message id');
-        return;
-    }
-    if (!url.trim()) {
-        postValidationError(id, url, 'Missing transform URL');
-        return;
-    }
-    const controller = new AbortController();
-    controllersById.set(id, controller);
-    try {
-        const content = decodeHtml(html, htmlBuffer, encoding);
-        const result = transformHtmlToMarkdownInProcess(content, url, {
-            includeMetadata,
-            signal: controller.signal,
-            ...(skipNoiseRemoval ? { skipNoiseRemoval: true } : {}),
-            ...(inputTruncated ? { inputTruncated: true } : {}),
-        });
-        const { markdown, metadata, title, truncated } = result;
-        postMessage({
-            type: 'result',
-            id,
-            result: buildTransformResultMessage({
-                markdown,
-                ...(metadata ? { metadata } : {}),
-                ...(title === undefined ? {} : { title }),
-                truncated,
-            }),
-        });
-    }
-    catch (error) {
-        postError(id, url, error);
-    }
-    finally {
-        controllersById.delete(id);
-    }
-}
-process.on('message', (raw) => {
-    if (!raw || typeof raw !== 'object')
-        return;
-    const msg = raw;
-    const { type, id } = msg;
-    if (type === 'cancel') {
-        if (typeof id !== 'string')
-            return;
-        const controller = controllersById.get(id);
-        if (controller)
-            controller.abort(new Error('Canceled'));
-        postMessage({ type: 'cancelled', id });
-        return;
-    }
-    if (type === 'transform') {
-        handleTransform(msg);
-    }
+const onMessage = createTransformMessageHandler({
+    sendMessage: postMessage,
+    runTransform: transformHtmlToMarkdownInProcess,
 });
-//# sourceMappingURL=transform-child.js.map
+process.on('message', onMessage);

package/dist/transform/workers/transform-worker.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=transform-worker.d.ts.map

package/dist/transform/workers/transform-worker.js

@@ -1,134 +1,13 @@
 import { parentPort } from 'node:worker_threads';
-import { FetchError, getErrorMessage } from '../../errors.js';
 import { transformHtmlToMarkdownInProcess } from '../transform.js';
+import { createTransformMessageHandler } from './shared.js';
 if (!parentPort)
     throw new Error('transform-worker started without parentPort');
 const port = parentPort;
-const controllersById = new Map();
-const decoder = new TextDecoder('utf-8');
-function postError(id, url, error) {
-    if (error instanceof FetchError) {
-        port.postMessage({
-            type: 'error',
-            id,
-            error: {
-                name: error.name,
-                message: error.message,
-                url: error.url,
-                statusCode: error.statusCode,
-                details: { ...error.details },
-            },
-        });
-        return;
-    }
-    port.postMessage({
-        type: 'error',
-        id,
-        error: {
-            name: error instanceof Error ? error.name : 'Error',
-            message: getErrorMessage(error),
-            url,
-        },
-    });
-}
-function isValidMessage(msg) {
-    const { id, url, html, htmlBuffer, encoding, includeMetadata, skipNoiseRemoval, inputTruncated, } = msg;
-    return (typeof id === 'string' &&
-        typeof url === 'string' &&
-        typeof includeMetadata === 'boolean' &&
-        (html === undefined || typeof html === 'string') &&
-        (htmlBuffer === undefined || htmlBuffer instanceof Uint8Array) &&
-        (encoding === undefined || typeof encoding === 'string') &&
-        (skipNoiseRemoval === undefined || typeof skipNoiseRemoval === 'boolean') &&
-        (inputTruncated === undefined || typeof inputTruncated === 'boolean'));
-}
-function postValidationError(id, message, url) {
-    port.postMessage({
-        type: 'error',
-        id,
-        error: { name: 'ValidationError', message, url },
-    });
-}
-function decodeHtmlBuffer(htmlBuffer, encoding) {
-    if (!encoding || encoding === 'utf-8') {
-        return decoder.decode(htmlBuffer);
-    }
-    try {
-        return new TextDecoder(encoding).decode(htmlBuffer);
-    }
-    catch {
-        // Fall back to UTF-8 when server-provided charset labels are invalid.
-        return decoder.decode(htmlBuffer);
-    }
-}
-function resolveHtmlContent(html, htmlBuffer, encoding) {
-    return htmlBuffer ? decodeHtmlBuffer(htmlBuffer, encoding) : (html ?? '');
-}
-function buildTransformResultMessage(result) {
-    return {
-        markdown: result.markdown,
-        ...(result.metadata ? { metadata: result.metadata } : {}),
-        ...(result.title !== undefined ? { title: result.title } : {}),
-        truncated: result.truncated,
-    };
-}
-function handleTransform(msg) {
-    if (!isValidMessage(msg))
-        return;
-    const { id, url, html, htmlBuffer, encoding, includeMetadata, skipNoiseRemoval, inputTruncated, } = msg;
-    if (!id.trim()) {
-        postValidationError(id, 'Missing transform message id', url || '');
-        return;
-    }
-    if (!url.trim()) {
-        postValidationError(id, 'Missing transform URL', url);
-        return;
-    }
-    const controller = new AbortController();
-    controllersById.set(id, controller);
-    try {
-        const content = resolveHtmlContent(html, htmlBuffer, encoding);
-        const result = transformHtmlToMarkdownInProcess(content, url, {
-            includeMetadata,
-            signal: controller.signal,
-            ...(skipNoiseRemoval ? { skipNoiseRemoval: true } : {}),
-            ...(inputTruncated ? { inputTruncated: true } : {}),
-        });
-        const { markdown, metadata, title, truncated } = result;
-        port.postMessage({
-            type: 'result',
-            id,
-            result: buildTransformResultMessage({
-                markdown,
-                ...(metadata ? { metadata } : {}),
-                ...(title === undefined ? {} : { title }),
-                truncated,
-            }),
-        });
-    }
-    catch (error) {
-        postError(id, url, error);
-    }
-    finally {
-        controllersById.delete(id);
-    }
-}
-port.on('message', (raw) => {
-    if (!raw || typeof raw !== 'object')
-        return;
-    const msg = raw;
-    const { type, id } = msg;
-    if (type === 'cancel') {
-        if (typeof id !== 'string')
-            return;
-        const controller = controllersById.get(id);
-        if (controller)
-            controller.abort(new Error('Canceled'));
-        port.postMessage({ type: 'cancelled', id });
-        return;
-    }
-    if (type === 'transform') {
-        handleTransform(msg);
-    }
+const onMessage = createTransformMessageHandler({
+    sendMessage: (message) => {
+        port.postMessage(message);
+    },
+    runTransform: transformHtmlToMarkdownInProcess,
 });
-//# sourceMappingURL=transform-worker.js.map
+port.on('message', onMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@j0hanz/fetch-url-mcp",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "mcpName": "io.github.j0hanz/fetch-url-mcp",
   "description": "Intelligent web content fetcher MCP server that converts HTML to clean, AI-readable Markdown",
   "type": "module",
@@ -51,12 +51,15 @@
     "start": "node dist/index.js",
     "format": "prettier --write .",
     "type-check": "node scripts/tasks.mjs type-check",
+    "type-check:src": "node node_modules/typescript/bin/tsc -p tsconfig.json --noEmit",
+    "type-check:tests": "node node_modules/typescript/bin/tsc -p tsconfig.test.json --noEmit",
     "type-check:diagnostics": "tsc --noEmit --extendedDiagnostics",
     "type-check:trace": "node -e \"require('fs').rmSync('.ts-trace',{recursive:true,force:true})\" && tsc --noEmit --generateTrace .ts-trace",
     "lint": "eslint .",
+    "lint:tests": "eslint src/__tests__",
     "lint:fix": "eslint . --fix",
     "test": "node scripts/tasks.mjs test",
-    "test:fast": "node --test --import tsx/esm src/__tests__/**/*.test.ts",
+    "test:fast": "node --test --import tsx/esm src/__tests__/**/*.test.ts node-tests/**/*.test.ts",
     "test:coverage": "node scripts/tasks.mjs test --coverage",
     "knip": "knip",
     "knip:fix": "knip --fix",
@@ -64,7 +67,7 @@
     "prepublishOnly": "npm run lint && npm run type-check && npm run build"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@modelcontextprotocol/sdk": "^1.27.1",
     "@mozilla/readability": "^0.6.0",
     "linkedom": "^0.18.12",
     "node-html-markdown": "^2.0.0",
@@ -75,15 +78,16 @@
     "@eslint/js": "^10.0.1",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@types/node": "^24",
-    "eslint": "^10.0.0",
+    "eslint": "^10.0.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-de-morgan": "^2.0.0",
+    "eslint-plugin-de-morgan": "^2.1.1",
     "eslint-plugin-depend": "^1.4.0",
     "eslint-plugin-unused-imports": "^4.4.1",
-    "knip": "^5.83.1",
+    "knip": "^5.85.0",
     "prettier": "^3.8.1",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.0"
+    "typescript-eslint": "^8.56.1"
   },
   "engines": {
     "node": ">=24"

package/dist/cache.d.ts

@@ -1,54 +0,0 @@
-import { z } from 'zod';
-declare const CachedPayloadSchema: z.ZodObject<{
-    content: z.ZodOptional<z.ZodString>;
-    markdown: z.ZodOptional<z.ZodString>;
-    title: z.ZodOptional<z.ZodString>;
-}, z.core.$strict>;
-type CachedPayload = z.infer<typeof CachedPayloadSchema>;
-interface CacheEntry {
-    url: string;
-    title?: string;
-    content: string;
-    fetchedAt: string;
-    expiresAt: string;
-}
-interface CacheKeyParts {
-    namespace: string;
-    urlHash: string;
-}
-interface CacheSetOptions {
-    force?: boolean;
-}
-interface CacheGetOptions {
-    force?: boolean;
-}
-interface CacheEntryMetadata {
-    url: string;
-    title?: string;
-}
-interface CacheUpdateEvent {
-    cacheKey: string;
-    namespace: string;
-    urlHash: string;
-    listChanged: boolean;
-}
-type CacheUpdateListener = (event: CacheUpdateEvent) => unknown;
-export declare function parseCachedPayload(raw: string): CachedPayload | null;
-export declare function resolveCachedPayloadContent(payload: CachedPayload): string | null;
-export declare function createCacheKey(namespace: string, url: string, vary?: Record<string, unknown> | string): string | null;
-export declare function parseCacheKey(cacheKey: string): CacheKeyParts | null;
-export declare function onCacheUpdate(listener: CacheUpdateListener): () => void;
-export declare function get(cacheKey: string | null, options?: CacheGetOptions): CacheEntry | undefined;
-export declare function set(cacheKey: string | null, content: string, metadata: CacheEntryMetadata, options?: CacheSetOptions): void;
-export declare function keys(): readonly string[];
-/**
- * Return lightweight metadata (url and optional page title) for a cache entry.
- * Returns `undefined` if the key is not found or cache is disabled.
- */
-export declare function getEntryMeta(cacheKey: string): {
-    url: string;
-    title?: string;
-} | undefined;
-export declare function isEnabled(): boolean;
-export {};
-//# sourceMappingURL=cache.d.ts.map

package/dist/cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,QAAA,MAAM,mBAAmB;;;;kBAIvB,CAAC;AACH,KAAK,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAGzD,UAAU,UAAU;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,aAAa;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,kBAAkB;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,KAAK,mBAAmB,GAAG,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC;AAWhE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAOpE;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,GACrB,MAAM,GAAG,IAAI,CAEf;AA4BD,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GACtC,MAAM,GAAG,IAAI,CAoBf;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAMpE;AA6LD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,IAAI,CAEvE;AAED,wBAAgB,GAAG,CACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,OAAO,CAAC,EAAE,eAAe,GACxB,UAAU,GAAG,SAAS,CAExB;AAED,wBAAgB,GAAG,CACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,CAAC,EAAE,eAAe,GACxB,IAAI,CAEN;AAED,wBAAgB,IAAI,IAAI,SAAS,MAAM,EAAE,CAExC;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAM7C;AAED,wBAAgB,SAAS,IAAI,OAAO,CAEnC"}