weixin-devtools-mcp 0.1.0 → 0.1.1

package/build/connection/manager.js

@@ -3,6 +3,8 @@ import { HealthCheckConnectionError, ValidationConnectionError, normalizeConnect
 import { probeConnectionHealth } from './health-probe.js';
 import { resolveConnectionPlan } from './resolver.js';
 import { createDisconnectedStatus, } from './types.js';
+const DISCONNECT_SETTLE_DELAY_MS = 200;
+const RECONNECT_DELAY_MS = 300;
 function createConnectionId() {
     return `conn_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
 }
@@ -22,19 +24,42 @@ export class ConnectionManager {
     #session = null;
     #status = createDisconnectedStatus();
     #lastRequest = null;
-    getSession() {
-        return this.#session;
+    #lifecycleQueue = Promise.resolve();
+    #enqueueLifecycleOperation(operation) {
+        const task = this.#lifecycleQueue.then(operation, operation);
+        this.#lifecycleQueue = task.then(() => undefined, () => undefined);
+        return task;
     }
-    getStatusSnapshot() {
-        return cloneStatus(this.#status);
+    async #cleanupMiniProgram(miniProgram) {
+        try {
+            await miniProgram.disconnect();
+        }
+        catch {
+            // 忽略断连异常，始终收敛本地状态
+        }
+        await new Promise(resolve => setTimeout(resolve, DISCONNECT_SETTLE_DELAY_MS));
     }
-    getLastRequest() {
-        return this.#lastRequest ? { ...this.#lastRequest, fallback: [...this.#lastRequest.fallback] } : null;
+    async #cleanupCurrentSession(options) {
+        const activeSession = this.#session;
+        this.#session = null;
+        if (activeSession?.miniProgram) {
+            await this.#cleanupMiniProgram(activeSession.miniProgram);
+        }
+        this.#status = {
+            ...createDisconnectedStatus(),
+            lastError: options?.lastError ?? null,
+        };
+        if (options?.clearLastRequest) {
+            this.#lastRequest = null;
+        }
+        return this.getStatusSnapshot();
     }
-    async connect(request) {
+    async #connectInternal(request) {
         const plan = resolveConnectionPlan(request);
+        // 单活语义：新建连接前先清理已有会话
+        await this.#cleanupCurrentSession();
         this.#status = {
-            ...this.#status,
+            ...createDisconnectedStatus(),
             state: 'connecting',
             connected: false,
             strategyUsed: null,
@@ -46,8 +71,13 @@ export class ConnectionManager {
         let latestError = null;
         for (const strategy of plan.attempts) {
             const attemptStartedAt = Date.now();
+            let attemptSession = null;
             try {
                 const adapterResult = await executeConnectionStrategy(strategy, plan.request);
+                attemptSession = {
+                    miniProgram: adapterResult.miniProgram,
+                    currentPage: adapterResult.currentPage,
+                };
                 const connectMs = Date.now() - attemptStartedAt;
                 const healthStart = Date.now();
                 const health = plan.request.healthCheck
@@ -68,10 +98,8 @@ export class ConnectionManager {
                 const healthMs = Date.now() - healthStart;
                 const pagePath = adapterResult.pagePath;
                 const status = health.level === 'healthy' ? 'connected' : 'degraded';
-                this.#session = {
-                    miniProgram: adapterResult.miniProgram,
-                    currentPage: adapterResult.currentPage,
-                };
+                this.#session = attemptSession;
+                attemptSession = null;
                 this.#lastRequest = {
                     ...plan.request,
                     strategy,
@@ -104,6 +132,10 @@ export class ConnectionManager {
                 };
             }
             catch (error) {
+                if (attemptSession?.miniProgram) {
+                    await this.#cleanupMiniProgram(attemptSession.miniProgram);
+                    attemptSession = null;
+                }
                 latestError = normalizeConnectionError(error instanceof Error ? error : new Error(String(error)));
                 warnings.push(`[${strategy}] ${latestError.message}`);
             }
@@ -111,45 +143,24 @@ export class ConnectionManager {
         if (!latestError) {
             latestError = new ValidationConnectionError('未执行任何连接尝试');
         }
-        this.#session = null;
-        this.#status = {
-            ...createDisconnectedStatus(),
+        await this.#cleanupCurrentSession({
             lastError: latestError.toSummary(),
-        };
+        });
         throw latestError;
     }
-    async reconnect(request) {
+    async #reconnectInternal(request) {
         const baseRequest = request ?? this.#lastRequest;
         if (!baseRequest) {
             throw new ValidationConnectionError('没有可用于重连的历史连接参数', ['调用 reconnect_devtools 时显式传入连接参数']);
         }
-        await this.disconnect();
-        await new Promise(resolve => setTimeout(resolve, 300));
-        return this.connect(baseRequest);
+        await this.#disconnectInternal();
+        await new Promise(resolve => setTimeout(resolve, RECONNECT_DELAY_MS));
+        return this.#connectInternal(baseRequest);
     }
-    async disconnect() {
-        if (this.#session?.miniProgram) {
-            const miniProgram = this.#session.miniProgram;
-            try {
-                miniProgram.removeAllListeners('console');
-                miniProgram.removeAllListeners('exception');
-            }
-            catch {
-                // 忽略监听器清理异常
-            }
-            try {
-                await miniProgram.disconnect();
-            }
-            catch {
-                // 忽略断连异常，始终清理本地状态
-            }
-            await new Promise(resolve => setTimeout(resolve, 200));
-        }
-        this.#session = null;
-        this.#status = createDisconnectedStatus();
-        return this.getStatusSnapshot();
+    async #disconnectInternal() {
+        return this.#cleanupCurrentSession();
     }
-    async refreshHealth() {
+    async #refreshHealthInternal() {
         if (!this.#session) {
             this.#status = createDisconnectedStatus();
             return this.getStatusSnapshot();
@@ -161,18 +172,15 @@ export class ConnectionManager {
             unhealthy: 'disconnected',
         };
         if (health.level === 'unhealthy') {
-            this.#session = null;
-            this.#status = {
-                ...createDisconnectedStatus(),
+            return this.#cleanupCurrentSession({
                 lastError: {
                     code: 'HEALTH_CHECK_FAILED',
                     phase: 'health_check',
-                    message: '连接健康检查失败，已自动标记为断开',
+                    message: '连接健康检查失败，已自动断开连接',
                     suggestions: ['调用 connect_devtools 或 reconnect_devtools 重新建立连接'],
                     timestamp: new Date().toISOString(),
                 },
-            };
-            return this.getStatusSnapshot();
+            });
         }
         const pagePath = this.#session.currentPage ? await this.#session.currentPage.path : null;
         this.#status = {
@@ -186,6 +194,27 @@ export class ConnectionManager {
         };
         return this.getStatusSnapshot();
     }
+    getSession() {
+        return this.#session;
+    }
+    getStatusSnapshot() {
+        return cloneStatus(this.#status);
+    }
+    getLastRequest() {
+        return this.#lastRequest ? { ...this.#lastRequest, fallback: [...this.#lastRequest.fallback] } : null;
+    }
+    async connect(request) {
+        return this.#enqueueLifecycleOperation(() => this.#connectInternal(request));
+    }
+    async reconnect(request) {
+        return this.#enqueueLifecycleOperation(() => this.#reconnectInternal(request));
+    }
+    async disconnect() {
+        return this.#enqueueLifecycleOperation(() => this.#disconnectInternal());
+    }
+    async refreshHealth() {
+        return this.#enqueueLifecycleOperation(() => this.#refreshHealthInternal());
+    }
     markDisconnectedWithError(error) {
         this.#session = null;
         this.#status = {

package/build/connection/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/connection/manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,wBAAwB,GAOzB,MAAM,YAAY,CAAC;AAOpB,SAAS,kBAAkB;IACzB,OAAO,QAAQ,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AACzE,CAAC;AAED,SAAS,WAAW,CAAC,MAAgC;IACnD,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,MAAM,CAAC,MAAM;YACnB,CAAC,CAAC;gBACE,GAAG,MAAM,CAAC,MAAM;gBAChB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;aAC1D;YACH,CAAC,CAAC,IAAI;QACR,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI;KAC7D,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,iBAAiB;IAC5B,QAAQ,GAAyB,IAAI,CAAC;IACtC,OAAO,GAA6B,wBAAwB,EAAE,CAAC;IAC/D,YAAY,GAAqC,IAAI,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,iBAAiB;QACf,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAA0B;QACtC,MAAM,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,WAAW,GAA2B,IAAI,CAAC;QAE/C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;gBAChD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAqB,IAAI,CAAC,OAAO,CAAC,WAAW;oBACvD,CAAC,CAAC,MAAM,qBAAqB,CAAC,aAAa,CAAC,WAAW,CAAC;oBACxD,CAAC,CAAC;wBACE,KAAK,EAAE,SAAS;wBAChB,MAAM,EAAE,EAAE;wBACV,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACpC,CAAC;gBAEN,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;oBACjC,MAAM,IAAI,0BAA0B,CAAC,WAAW,EAAE;wBAChD,QAAQ;wBACR,QAAQ,EAAE,aAAa,CAAC,QAAQ;qBACjC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;gBAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC;gBAC1C,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;gBACxC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;gBAErE,IAAI,CAAC,QAAQ,GAAG;oBACd,WAAW,EAAE,aAAa,CAAC,WAAW;oBACtC,WAAW,EAAE,aAAa,CAAC,WAAW;iBACvC,CAAC;gBACF,IAAI,CAAC,YAAY,GAAG;oBAClB,GAAG,IAAI,CAAC,OAAO;oBACf,QAAQ;oBACR,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC;iBAClE,CAAC;gBACF,IAAI,CAAC,OAAO,GAAG;oBACb,YAAY;oBACZ,KAAK,EAAE,MAAM;oBACb,YAAY,EAAE,aAAa,CAAC,YAAY;oBACxC,QAAQ,EAAE,aAAa,CAAC,QAAQ;oBAChC,SAAS,EAAE,IAAI;oBACf,cAAc,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;oBACnC,QAAQ;oBACR,MAAM;oBACN,SAAS,EAAE,IAAI;oBACf,eAAe,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oBACzC,iBAAiB,EAAE,MAAM,CAAC,SAAS;iBACpC,CAAC;gBAEF,OAAO;oBACL,GAAG,aAAa;oBAChB,YAAY;oBACZ,MAAM;oBACN,MAAM;oBACN,MAAM,EAAE;wBACN,OAAO;wBACP,SAAS;wBACT,QAAQ;qBACT;oBACD,QAAQ;iBACT,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,WAAW,GAAG,wBAAwB,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClG,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,WAAW,GAAG,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,wBAAwB,EAAE;YAC7B,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE;SACnC,CAAC;QAEF,MAAM,WAAW,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAA2B;QACzC,MAAM,WAAW,GAAG,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC;QACjD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,yBAAyB,CACjC,gBAAgB,EAChB,CAAC,iCAAiC,CAAC,CACpC,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAC9C,IAAI,CAAC;gBACH,WAAW,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBAC1C,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBACP,kBAAkB;YACpB,CAAC;YAED,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,wBAAwB,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,wBAAwB,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,YAAY,GAAmE;YACnF,OAAO,EAAE,WAAW;YACpB,QAAQ,EAAE,UAAU;YACpB,SAAS,EAAE,cAAc;SAC1B,CAAC;QAEF,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,wBAAwB,EAAE;gBAC7B,SAAS,EAAE;oBACT,IAAI,EAAE,qBAAqB;oBAC3B,KAAK,EAAE,cAAc;oBACrB,OAAO,EAAE,mBAAmB;oBAC5B,WAAW,EAAE,CAAC,iDAAiD,CAAC;oBAChE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACpC;aACF,CAAC;YACF,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACzF,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACjC,SAAS,EAAE,IAAI;YACf,cAAc,EAAE,CAAC,CAAC,QAAQ;YAC1B,QAAQ;YACR,MAAM;YACN,iBAAiB,EAAE,MAAM,CAAC,SAAS;SACpC,CAAC;QAEF,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED,yBAAyB,CAAC,KAA6B;QACrD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,wBAAwB,EAAE;YAC7B,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;CACF"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/connection/manager.ts"],"names":[],"mappings":"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"}

package/build/connection/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/connection/resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EAEjB,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AA0GpB,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,iBAAiB,GAAG,sBAAsB,CA4B3F"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/connection/resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EAEjB,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAkHpB,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,iBAAiB,GAAG,sBAAsB,CA4B3F"}

package/build/connection/resolver.js

@@ -53,6 +53,9 @@ function resolveFallbackStrategies(primary, request) {
     return [];
 }
 function validateRequest(request) {
+    if (request.wsHeaders !== undefined) {
+        throw new ValidationConnectionError('当前连接链路不支持 wsHeaders 参数', ['请移除 wsHeaders 参数后重试'], { strategy: request.strategy });
+    }
     if (request.strategy === 'launch' || request.strategy === 'connect') {
         if (!request.projectPath) {
             throw new ValidationConnectionError(`${request.strategy} 策略要求提供 projectPath`, ['为 connect_devtools 传入 projectPath'], { strategy: request.strategy });

package/build/connection/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/connection/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/connection/resolver.ts"],"names":[],"mappings":"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"}

package/build/core/assertion.d.ts

@@ -0,0 +1,22 @@
+/**
+ * 断言验证核心逻辑
+ * 从 src/tools.ts 提取
+ */
+import type { ElementMapInfo, AssertResult, ExistenceAssertOptions, StateAssertOptions, ContentAssertOptions } from './types.js';
+/**
+ * 断言元素存在性
+ */
+export declare function assertElementExists(page: any, options: ExistenceAssertOptions): Promise<AssertResult>;
+/**
+ * 断言元素可见性
+ */
+export declare function assertElementVisible(page: any, elementMap: Map<string, ElementMapInfo>, options: StateAssertOptions): Promise<AssertResult>;
+/**
+ * 断言元素文本内容
+ */
+export declare function assertElementText(page: any, elementMap: Map<string, ElementMapInfo>, options: ContentAssertOptions): Promise<AssertResult>;
+/**
+ * 断言元素属性
+ */
+export declare function assertElementAttribute(page: any, elementMap: Map<string, ElementMapInfo>, options: ContentAssertOptions): Promise<AssertResult>;
+//# sourceMappingURL=assertion.d.ts.map

package/build/core/assertion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assertion.d.ts","sourceRoot":"","sources":["../../src/core/assertion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAIpB;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,YAAY,CAAC,CA4DvB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EACvC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAmFvB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EACvC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAuGvB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EACvC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAkFvB"}

package/build/core/assertion.js

@@ -0,0 +1,318 @@
+/**
+ * 断言验证核心逻辑
+ * 从 src/tools.ts 提取
+ */
+import { extractErrorMessage } from '../utils/error.js';
+/**
+ * 断言元素存在性
+ */
+export async function assertElementExists(page, options) {
+    const { selector, uid, timeout = 5000, shouldExist } = options;
+    if (!selector && !uid) {
+        throw new Error("必须提供selector或uid参数");
+    }
+    if (!page) {
+        throw new Error("页面对象是必需的");
+    }
+    const startTime = Date.now();
+    let element = null;
+    let actualExists = false;
+    try {
+        while (Date.now() - startTime < timeout) {
+            try {
+                if (selector) {
+                    element = await page.$(selector);
+                }
+                else if (uid) {
+                    element = await page.$(uid);
+                }
+                actualExists = !!element;
+                if (actualExists === shouldExist) {
+                    return {
+                        passed: true,
+                        message: `断言通过: 元素${shouldExist ? '存在' : '不存在'}`,
+                        actual: actualExists,
+                        expected: shouldExist,
+                        timestamp: Date.now()
+                    };
+                }
+                await new Promise(resolve => setTimeout(resolve, 100));
+            }
+            catch (error) {
+                // 继续检查直到超时
+            }
+        }
+        return {
+            passed: false,
+            message: `断言失败: 期望元素${shouldExist ? '存在' : '不存在'}，实际${actualExists ? '存在' : '不存在'}`,
+            actual: actualExists,
+            expected: shouldExist,
+            timestamp: Date.now()
+        };
+    }
+    catch (error) {
+        const errorMessage = extractErrorMessage(error);
+        return {
+            passed: false,
+            message: `断言执行失败: ${errorMessage}`,
+            actual: null,
+            expected: shouldExist,
+            timestamp: Date.now()
+        };
+    }
+}
+/**
+ * 断言元素可见性
+ */
+export async function assertElementVisible(page, elementMap, options) {
+    const { uid, visible } = options;
+    if (visible === undefined) {
+        throw new Error("必须指定visible参数");
+    }
+    if (!uid) {
+        throw new Error("元素uid是必需的");
+    }
+    if (!page) {
+        throw new Error("页面对象是必需的");
+    }
+    try {
+        const mapInfo = elementMap.get(uid);
+        if (!mapInfo) {
+            return {
+                passed: false,
+                message: `断言失败: 找不到uid为 ${uid} 的元素`,
+                actual: null,
+                expected: visible,
+                timestamp: Date.now()
+            };
+        }
+        const elements = await page.$$(mapInfo.selector);
+        if (!elements || elements.length === 0) {
+            return {
+                passed: false,
+                message: `断言失败: 无法找到选择器为 ${mapInfo.selector} 的元素`,
+                actual: false,
+                expected: visible,
+                timestamp: Date.now()
+            };
+        }
+        if (mapInfo.index >= elements.length) {
+            return {
+                passed: false,
+                message: `断言失败: 元素索引 ${mapInfo.index} 超出范围，共找到 ${elements.length} 个元素`,
+                actual: false,
+                expected: visible,
+                timestamp: Date.now()
+            };
+        }
+        const element = elements[mapInfo.index];
+        if (!element) {
+            return {
+                passed: false,
+                message: `断言失败: 无法获取索引为 ${mapInfo.index} 的元素`,
+                actual: false,
+                expected: visible,
+                timestamp: Date.now()
+            };
+        }
+        const size = await element.size();
+        const actualVisible = size.width > 0 && size.height > 0;
+        const passed = actualVisible === visible;
+        return {
+            passed,
+            message: passed
+                ? `断言通过: 元素${visible ? '可见' : '不可见'}`
+                : `断言失败: 期望元素${visible ? '可见' : '不可见'}，实际${actualVisible ? '可见' : '不可见'}`,
+            actual: actualVisible,
+            expected: visible,
+            timestamp: Date.now()
+        };
+    }
+    catch (error) {
+        const errorMessage = extractErrorMessage(error);
+        return {
+            passed: false,
+            message: `断言执行失败: ${errorMessage}`,
+            actual: null,
+            expected: visible,
+            timestamp: Date.now()
+        };
+    }
+}
+/**
+ * 断言元素文本内容
+ */
+export async function assertElementText(page, elementMap, options) {
+    const { uid, text, textContains, textMatches } = options;
+    if (!text && !textContains && !textMatches) {
+        throw new Error("必须指定text、textContains或textMatches参数之一");
+    }
+    if (!uid) {
+        throw new Error("元素uid是必需的");
+    }
+    if (!page) {
+        throw new Error("页面对象是必需的");
+    }
+    try {
+        const mapInfo = elementMap.get(uid);
+        if (!mapInfo) {
+            return {
+                passed: false,
+                message: `断言失败: 找不到uid为 ${uid} 的元素`,
+                actual: null,
+                expected: text || textContains || textMatches,
+                timestamp: Date.now()
+            };
+        }
+        const elements = await page.$$(mapInfo.selector);
+        if (!elements || elements.length === 0) {
+            return {
+                passed: false,
+                message: `断言失败: 无法找到选择器为 ${mapInfo.selector} 的元素`,
+                actual: null,
+                expected: text || textContains || textMatches,
+                timestamp: Date.now()
+            };
+        }
+        if (mapInfo.index >= elements.length) {
+            return {
+                passed: false,
+                message: `断言失败: 元素索引 ${mapInfo.index} 超出范围，共找到 ${elements.length} 个元素`,
+                actual: null,
+                expected: text || textContains || textMatches,
+                timestamp: Date.now()
+            };
+        }
+        const element = elements[mapInfo.index];
+        if (!element) {
+            return {
+                passed: false,
+                message: `断言失败: 无法获取索引为 ${mapInfo.index} 的元素`,
+                actual: null,
+                expected: text || textContains || textMatches,
+                timestamp: Date.now()
+            };
+        }
+        const actualText = await element.text();
+        let passed = false;
+        let expectedValue = '';
+        let message = '';
+        if (text) {
+            passed = actualText === text;
+            expectedValue = text;
+            message = passed
+                ? `断言通过: 文本精确匹配`
+                : `断言失败: 期望文本 "${text}"，实际 "${actualText}"`;
+        }
+        else if (textContains) {
+            passed = actualText.includes(textContains);
+            expectedValue = textContains;
+            message = passed
+                ? `断言通过: 文本包含 "${textContains}"`
+                : `断言失败: 期望包含 "${textContains}"，实际文本 "${actualText}"`;
+        }
+        else if (textMatches) {
+            const regex = new RegExp(textMatches);
+            passed = regex.test(actualText);
+            expectedValue = textMatches;
+            message = passed
+                ? `断言通过: 文本匹配正则 ${textMatches}`
+                : `断言失败: 期望匹配正则 ${textMatches}，实际文本 "${actualText}"`;
+        }
+        return {
+            passed,
+            message,
+            actual: actualText,
+            expected: expectedValue,
+            timestamp: Date.now()
+        };
+    }
+    catch (error) {
+        const errorMessage = extractErrorMessage(error);
+        return {
+            passed: false,
+            message: `断言执行失败: ${errorMessage}`,
+            actual: null,
+            expected: text || textContains || textMatches,
+            timestamp: Date.now()
+        };
+    }
+}
+/**
+ * 断言元素属性
+ */
+export async function assertElementAttribute(page, elementMap, options) {
+    const { uid, attribute } = options;
+    if (!attribute) {
+        throw new Error("必须指定attribute参数");
+    }
+    if (!uid) {
+        throw new Error("元素uid是必需的");
+    }
+    if (!page) {
+        throw new Error("页面对象是必需的");
+    }
+    try {
+        const mapInfo = elementMap.get(uid);
+        if (!mapInfo) {
+            return {
+                passed: false,
+                message: `断言失败: 找不到uid为 ${uid} 的元素`,
+                actual: null,
+                expected: attribute.value,
+                timestamp: Date.now()
+            };
+        }
+        const elements = await page.$$(mapInfo.selector);
+        if (!elements || elements.length === 0) {
+            return {
+                passed: false,
+                message: `断言失败: 无法找到选择器为 ${mapInfo.selector} 的元素`,
+                actual: null,
+                expected: attribute.value,
+                timestamp: Date.now()
+            };
+        }
+        if (mapInfo.index >= elements.length) {
+            return {
+                passed: false,
+                message: `断言失败: 元素索引 ${mapInfo.index} 超出范围，共找到 ${elements.length} 个元素`,
+                actual: null,
+                expected: attribute.value,
+                timestamp: Date.now()
+            };
+        }
+        const element = elements[mapInfo.index];
+        if (!element) {
+            return {
+                passed: false,
+                message: `断言失败: 无法获取索引为 ${mapInfo.index} 的元素`,
+                actual: null,
+                expected: attribute.value,
+                timestamp: Date.now()
+            };
+        }
+        const actualValue = await element.attribute(attribute.key);
+        const passed = actualValue === attribute.value;
+        return {
+            passed,
+            message: passed
+                ? `断言通过: 属性 ${attribute.key} 值为 "${attribute.value}"`
+                : `断言失败: 期望属性 ${attribute.key} 值为 "${attribute.value}"，实际 "${actualValue}"`,
+            actual: actualValue,
+            expected: attribute.value,
+            timestamp: Date.now()
+        };
+    }
+    catch (error) {
+        const errorMessage = extractErrorMessage(error);
+        return {
+            passed: false,
+            message: `断言执行失败: ${errorMessage}`,
+            actual: null,
+            expected: attribute.value,
+            timestamp: Date.now()
+        };
+    }
+}
+//# sourceMappingURL=assertion.js.map

package/build/core/assertion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assertion.js","sourceRoot":"","sources":["../../src/core/assertion.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,IAAS,EACT,OAA+B;IAE/B,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAE/D,IAAI,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,YAAY,GAAG,KAAK,CAAC;IAEzB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACnC,CAAC;qBAAM,IAAI,GAAG,EAAE,CAAC;oBACf,OAAO,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC;gBAED,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC;gBAEzB,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;oBACjC,OAAO;wBACL,MAAM,EAAE,IAAI;wBACZ,OAAO,EAAE,WAAW,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE;wBAChD,MAAM,EAAE,YAAY;wBACpB,QAAQ,EAAE,WAAW;wBACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;qBACtB,CAAC;gBACJ,CAAC;gBAED,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,WAAW;YACb,CAAC;QACH,CAAC;QAED,OAAO;YACL,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,aAAa,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE;YACnF,MAAM,EAAE,YAAY;YACpB,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IAEJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO;YACL,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,WAAW,YAAY,EAAE;YAClC,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAS,EACT,UAAuC,EACvC,OAA2B;IAE3B,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEjC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,iBAAiB,GAAG,MAAM;gBACnC,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,kBAAkB,OAAO,CAAC,QAAQ,MAAM;gBACjD,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,cAAc,OAAO,CAAC,KAAK,aAAa,QAAQ,CAAC,MAAM,MAAM;gBACtE,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,iBAAiB,OAAO,CAAC,KAAK,MAAM;gBAC7C,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAExD,MAAM,MAAM,GAAG,aAAa,KAAK,OAAO,CAAC;QACzC,OAAO;YACL,MAAM;YACN,OAAO,EAAE,MAAM;gBACb,CAAC,CAAC,WAAW,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE;gBACrC,CAAC,CAAC,aAAa,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE;YAC3E,MAAM,EAAE,aAAa;YACrB,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IAEJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO;YACL,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,WAAW,YAAY,EAAE;YAClC,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAS,EACT,UAAuC,EACvC,OAA6B;IAE7B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEzD,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,iBAAiB,GAAG,MAAM;gBACnC,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI,IAAI,YAAY,IAAI,WAAW;gBAC7C,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,kBAAkB,OAAO,CAAC,QAAQ,MAAM;gBACjD,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI,IAAI,YAAY,IAAI,WAAW;gBAC7C,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,cAAc,OAAO,CAAC,KAAK,aAAa,QAAQ,CAAC,MAAM,MAAM;gBACtE,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI,IAAI,YAAY,IAAI,WAAW;gBAC7C,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,iBAAiB,OAAO,CAAC,KAAK,MAAM;gBAC7C,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI,IAAI,YAAY,IAAI,WAAW;gBAC7C,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,GAAG,EAAE,CAAC;QAEjB,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,GAAG,UAAU,KAAK,IAAI,CAAC;YAC7B,aAAa,GAAG,IAAI,CAAC;YACrB,OAAO,GAAG,MAAM;gBACd,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,eAAe,IAAI,SAAS,UAAU,GAAG,CAAC;QAChD,CAAC;aAAM,IAAI,YAAY,EAAE,CAAC;YACxB,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC3C,aAAa,GAAG,YAAY,CAAC;YAC7B,OAAO,GAAG,MAAM;gBACd,CAAC,CAAC,eAAe,YAAY,GAAG;gBAChC,CAAC,CAAC,eAAe,YAAY,WAAW,UAAU,GAAG,CAAC;QAC1D,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC;YACtC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChC,aAAa,GAAG,WAAW,CAAC;YAC5B,OAAO,GAAG,MAAM;gBACd,CAAC,CAAC,gBAAgB,WAAW,EAAE;gBAC/B,CAAC,CAAC,gBAAgB,WAAW,UAAU,UAAU,GAAG,CAAC;QACzD,CAAC;QAED,OAAO;YACL,MAAM;YACN,OAAO;YACP,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,aAAa;YACvB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IAEJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO;YACL,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,WAAW,YAAY,EAAE;YAClC,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI,IAAI,YAAY,IAAI,WAAW;YAC7C,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAS,EACT,UAAuC,EACvC,OAA6B;IAE7B,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAEnC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,iBAAiB,GAAG,MAAM;gBACnC,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,SAAS,CAAC,KAAK;gBACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,kBAAkB,OAAO,CAAC,QAAQ,MAAM;gBACjD,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,SAAS,CAAC,KAAK;gBACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,cAAc,OAAO,CAAC,KAAK,aAAa,QAAQ,CAAC,MAAM,MAAM;gBACtE,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,SAAS,CAAC,KAAK;gBACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,iBAAiB,OAAO,CAAC,KAAK,MAAM;gBAC7C,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,SAAS,CAAC,KAAK;gBACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,WAAW,KAAK,SAAS,CAAC,KAAK,CAAC;QAE/C,OAAO;YACL,MAAM;YACN,OAAO,EAAE,MAAM;gBACb,CAAC,CAAC,YAAY,SAAS,CAAC,GAAG,QAAQ,SAAS,CAAC,KAAK,GAAG;gBACrD,CAAC,CAAC,cAAc,SAAS,CAAC,GAAG,QAAQ,SAAS,CAAC,KAAK,SAAS,WAAW,GAAG;YAC7E,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,SAAS,CAAC,KAAK;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IAEJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO;YACL,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,WAAW,YAAY,EAAE;YAClC,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,SAAS,CAAC,KAAK;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;AACH,CAAC"}