@theia/core 1.74.0-next.9 → 1.74.0

package/lib/browser/shell/shell-layout-restorer.spec.js

@@ -0,0 +1,539 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsdom_1 = require("../test/jsdom");
+const disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const chai_1 = require("chai");
+const sinon = require("sinon");
+const shell_layout_restorer_1 = require("./shell-layout-restorer");
+disableJSDOM();
+describe('ShellLayoutRestorer - Perspective Support', () => {
+    let restorer;
+    let mockStorageService;
+    let mockLogger;
+    let mockWidgetManager;
+    let mockShell;
+    let mockApp;
+    let mockProvider;
+    let mockTransformations;
+    let mockMigrations;
+    let mockWindowService;
+    let mockThemeService;
+    let toTearDown;
+    beforeEach(() => {
+        toTearDown = (0, jsdom_1.enableJSDOM)();
+        mockStorageService = {
+            setData: sinon.stub().resolves(),
+            getData: sinon.stub().resolves(undefined)
+        };
+        mockLogger = {
+            info: sinon.stub(),
+            error: sinon.stub(),
+            warn: sinon.stub()
+        };
+        mockWidgetManager = {
+            getDescription: sinon.stub().returns(undefined)
+        };
+        mockShell = {
+            getLayoutData: sinon.stub().returns({ version: 999, mainPanel: {}, bottomPanel: {} }),
+            setLayoutData: sinon.stub().resolves()
+        };
+        mockApp = { shell: mockShell };
+        mockProvider = {
+            getActivePerspectiveId: sinon.stub().returns('default'),
+            getSavedPerspectiveIds: sinon.stub().returns([]),
+            getSavedLayout: sinon.stub().returns(undefined),
+            setSavedLayout: sinon.stub(),
+            setActivePerspectiveId: sinon.stub().returns(true),
+            clearSavedLayouts: sinon.stub(),
+            onLayoutRestored: sinon.stub(),
+            defaultPerspectiveId: 'default'
+        };
+        mockTransformations = {
+            getContributions: sinon.stub().returns([])
+        };
+        mockMigrations = {
+            getContributions: sinon.stub().returns([])
+        };
+        mockWindowService = {
+            isSafeToShutDown: sinon.stub().resolves(true),
+            reload: sinon.stub()
+        };
+        mockThemeService = {
+            reset: sinon.stub()
+        };
+        restorer = new shell_layout_restorer_1.ShellLayoutRestorer(mockWidgetManager, mockLogger, mockStorageService);
+        restorer['perspectiveService'] = mockProvider;
+        restorer['transformations'] = mockTransformations;
+        restorer['migrations'] = mockMigrations;
+        restorer['windowService'] = mockWindowService;
+        restorer['themeService'] = mockThemeService;
+    });
+    afterEach(() => {
+        sinon.restore();
+        toTearDown();
+    });
+    describe('storePerspectiveLayouts', () => {
+        it('should read current shell layout as the active perspective layout', () => {
+            mockProvider.getActivePerspectiveId.returns('persp-a');
+            mockProvider.getSavedPerspectiveIds.returns([]);
+            const currentLayout = { version: 999, mainPanel: { items: ['editor1'] }, bottomPanel: {} };
+            mockShell.getLayoutData.returns(currentLayout);
+            restorer.storeLayout(mockApp);
+            const perspCall = mockStorageService.setData.getCalls().find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] !== undefined);
+            (0, chai_1.expect)(perspCall).to.not.be.undefined;
+            const data = perspCall.args[1];
+            (0, chai_1.expect)(data.activePerspectiveId).to.equal('persp-a');
+            (0, chai_1.expect)(data.layouts['persp-a']).to.be.a('string');
+            // Verify it contains the current shell layout content
+            const parsed = JSON.parse(data.layouts['persp-a']);
+            (0, chai_1.expect)(parsed.mainPanel.items).to.deep.equal(['editor1']);
+        });
+        it('should deflate all inactive perspective layouts from provider', () => {
+            mockProvider.getActivePerspectiveId.returns('active');
+            mockProvider.getSavedPerspectiveIds.returns(['active', 'inactive1', 'inactive2']);
+            const inactiveLayout1 = { version: 999, mainPanel: { items: ['w1'] }, bottomPanel: {} };
+            const inactiveLayout2 = { version: 999, mainPanel: { items: ['w2'] }, bottomPanel: {} };
+            mockProvider.getSavedLayout.withArgs('inactive1').returns(inactiveLayout1);
+            mockProvider.getSavedLayout.withArgs('inactive2').returns(inactiveLayout2);
+            mockProvider.getSavedLayout.withArgs('active').returns(undefined);
+            restorer.storeLayout(mockApp);
+            const [, data] = mockStorageService.setData.firstCall.args;
+            (0, chai_1.expect)(Object.keys(data.layouts)).to.have.lengthOf(3);
+            (0, chai_1.expect)(data.layouts).to.have.property('active');
+            (0, chai_1.expect)(data.layouts).to.have.property('inactive1');
+            (0, chai_1.expect)(data.layouts).to.have.property('inactive2');
+        });
+        it('should use shell layout for active perspective, not provider', () => {
+            mockProvider.getActivePerspectiveId.returns('active');
+            mockProvider.getSavedPerspectiveIds.returns(['active']);
+            // Provider has stale data for the active perspective
+            const staleLayout = { version: 999, mainPanel: { items: ['stale'] }, bottomPanel: {} };
+            mockProvider.getSavedLayout.withArgs('active').returns(staleLayout);
+            // Shell has the current data
+            const currentLayout = { version: 999, mainPanel: { items: ['current'] }, bottomPanel: {} };
+            mockShell.getLayoutData.returns(currentLayout);
+            restorer.storeLayout(mockApp);
+            const [, data] = mockStorageService.setData.firstCall.args;
+            const parsed = JSON.parse(data.layouts['active']);
+            // Should use shell data, not provider data
+            (0, chai_1.expect)(parsed.mainPanel.items).to.deep.equal(['current']);
+        });
+        it('should write to legacy key when only default perspective is used', () => {
+            mockProvider.getActivePerspectiveId.returns('default');
+            mockProvider.getSavedPerspectiveIds.returns([]);
+            restorer.storeLayout(mockApp);
+            // Should write to legacy key for backward compatibility
+            const legacyCall = mockStorageService.setData.getCalls().find((c) => c.args[0] === 'layout');
+            (0, chai_1.expect)(legacyCall).to.not.be.undefined;
+            // Should clear the perspective key
+            const perspClear = mockStorageService.setData.getCalls().find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] === undefined);
+            (0, chai_1.expect)(perspClear).to.not.be.undefined;
+        });
+        it('should write to perspective key when multiple perspectives are used', () => {
+            mockProvider.getActivePerspectiveId.returns('persp-a');
+            mockProvider.getSavedPerspectiveIds.returns(['persp-a', 'persp-b']);
+            const inactiveLayout = { version: 999, mainPanel: { items: ['b'] }, bottomPanel: {} };
+            mockProvider.getSavedLayout.withArgs('persp-b').returns(inactiveLayout);
+            mockProvider.getSavedLayout.withArgs('persp-a').returns(undefined);
+            restorer.storeLayout(mockApp);
+            const perspCall = mockStorageService.setData.getCalls().find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] !== undefined);
+            (0, chai_1.expect)(perspCall).to.not.be.undefined;
+            // Should clear the legacy key
+            const legacyClear = mockStorageService.setData.getCalls().find((c) => c.args[0] === 'layout' && c.args[1] === undefined);
+            (0, chai_1.expect)(legacyClear).to.not.be.undefined;
+        });
+    });
+    describe('restorePerspectiveLayouts', () => {
+        it('should inflate all layouts and push to provider', async () => {
+            const persisted = {
+                activePerspectiveId: 'persp-a',
+                layouts: {
+                    'persp-a': JSON.stringify({ version: 999, mainPanel: { items: ['a'] }, bottomPanel: {} }),
+                    'persp-b': JSON.stringify({ version: 999, mainPanel: { items: ['b'] }, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            // Return the inflated layout for the active persp when asked
+            mockProvider.getSavedLayout.callsFake((id) => {
+                if (id === 'persp-a') {
+                    // After setSavedLayout is called, return the layout
+                    const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === 'persp-a');
+                    return call?.args[1];
+                }
+                return undefined;
+            });
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.true;
+            (0, chai_1.expect)(mockProvider.setSavedLayout.callCount).to.equal(2);
+            // Verify persp-a was set
+            const setACall = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === 'persp-a');
+            (0, chai_1.expect)(setACall).to.not.be.undefined;
+            // Verify persp-b was set
+            const setBCall = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === 'persp-b');
+            (0, chai_1.expect)(setBCall).to.not.be.undefined;
+        });
+        it('should set active perspective ID on provider', async () => {
+            const persisted = {
+                activePerspectiveId: 'my-persp',
+                layouts: {
+                    'my-persp': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(mockProvider.setActivePerspectiveId.calledWith('my-persp')).to.be.true;
+        });
+        it('should apply the active layout to the shell', async () => {
+            const layoutData = { version: 999, mainPanel: { items: ['active-item'] }, bottomPanel: {} };
+            const persisted = {
+                activePerspectiveId: 'active',
+                layouts: {
+                    'active': JSON.stringify(layoutData)
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(mockShell.setLayoutData.calledOnce).to.be.true;
+            const applied = mockShell.setLayoutData.firstCall.args[0];
+            (0, chai_1.expect)(applied.mainPanel.items).to.deep.equal(['active-item']);
+        });
+        it('should apply transformations to all inflated layouts, not just the active one', async () => {
+            const transformer = {
+                transformLayoutOnRestore: sinon.stub()
+            };
+            mockTransformations.getContributions.returns([transformer]);
+            const persisted = {
+                activePerspectiveId: 'persp-a',
+                layouts: {
+                    'persp-a': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} }),
+                    'persp-b': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            // Transformer should be called for both layouts
+            (0, chai_1.expect)(transformer.transformLayoutOnRestore.callCount).to.equal(2);
+        });
+        it('should fall back to provider active ID when persisted ID is not registered', async () => {
+            const persisted = {
+                activePerspectiveId: 'removed-persp',
+                layouts: {
+                    'removed-persp': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} }),
+                    'default': JSON.stringify({ version: 999, mainPanel: { items: ['default-w'] }, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            mockProvider.setActivePerspectiveId.returns(false);
+            mockProvider.getActivePerspectiveId.returns('default');
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.true;
+            // Should apply 'default' layout to shell, not 'removed-persp'
+            const applied = mockShell.setLayoutData.firstCall.args[0];
+            (0, chai_1.expect)(applied.mainPanel.items).to.deep.equal(['default-w']);
+            // onLayoutRestored should be called with 'default'
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledWith('default')).to.be.true;
+        });
+        it('should return false when no perspective data and no legacy data exists', async () => {
+            mockStorageService.getData.resolves(undefined);
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.false;
+        });
+        it('should warn when a perspective layout fails to inflate', async () => {
+            const persisted = {
+                activePerspectiveId: 'good',
+                layouts: {
+                    'good': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} }),
+                    'bad': 'invalid-json{'
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            // 'good' should be inflated successfully
+            const goodCall = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === 'good');
+            (0, chai_1.expect)(goodCall).to.not.be.undefined;
+            // Should warn about 'bad'
+            (0, chai_1.expect)(mockLogger.warn.called).to.be.true;
+            const warnCall = mockLogger.warn.getCalls().find((c) => c.args[0].includes('bad'));
+            (0, chai_1.expect)(warnCall).to.not.be.undefined;
+        });
+    });
+    describe('legacy migration', () => {
+        it('should fall back to legacy key when perspective-layouts is absent', async () => {
+            const legacyLayout = JSON.stringify({ version: 999, mainPanel: { items: ['legacy'] }, bottomPanel: {} });
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(undefined);
+            mockStorageService.getData.withArgs('layout').resolves(legacyLayout);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.true;
+            // Should push layout as 'default' perspective
+            (0, chai_1.expect)(mockProvider.setSavedLayout.calledOnce).to.be.true;
+            (0, chai_1.expect)(mockProvider.setSavedLayout.firstCall.args[0]).to.equal('default');
+            // Should set active to 'default'
+            (0, chai_1.expect)(mockProvider.setActivePerspectiveId.calledWith('default')).to.be.true;
+        });
+        it('should keep the legacy key after a successful migration', async () => {
+            const legacyLayout = JSON.stringify({ version: 999, mainPanel: { items: ['legacy'] }, bottomPanel: {} });
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(undefined);
+            mockStorageService.getData.withArgs('layout').resolves(legacyLayout);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            // Restoring must not touch the key: it is rewritten or cleared by the next `storeLayout`,
+            // so a crash before then still finds the layout where it was.
+            const legacyWrite = mockStorageService.setData.getCalls().find((c) => c.args[0] === 'layout');
+            (0, chai_1.expect)(legacyWrite).to.be.undefined;
+        });
+        it('should preserve legacy key when inflate fails', async () => {
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(undefined);
+            mockStorageService.getData.withArgs('layout').resolves('not-valid-json{');
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.false;
+            // Legacy key should NOT be cleared
+            const legacyClear = mockStorageService.setData.getCalls().find((c) => c.args[0] === 'layout' && c.args[1] === undefined);
+            (0, chai_1.expect)(legacyClear).to.be.undefined;
+            // No layout should have been saved
+            (0, chai_1.expect)(mockProvider.setSavedLayout.called).to.be.false;
+            // Should warn about the failure
+            (0, chai_1.expect)(mockLogger.warn.called).to.be.true;
+        });
+        it('should apply migrated legacy layout to shell', async () => {
+            const legacyLayout = JSON.stringify({ version: 999, mainPanel: { items: ['legacy-w'] }, bottomPanel: {} });
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(undefined);
+            mockStorageService.getData.withArgs('layout').resolves(legacyLayout);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(mockShell.setLayoutData.calledOnce).to.be.true;
+        });
+    });
+    describe('storePerspectiveLayouts - error isolation', () => {
+        it('should persist other perspectives when one inactive perspective deflate fails', () => {
+            mockProvider.getActivePerspectiveId.returns('active');
+            mockProvider.getSavedPerspectiveIds.returns(['active', 'good', 'bad']);
+            const goodLayout = { version: 999, mainPanel: { items: ['good'] }, bottomPanel: {} };
+            // Create a layout with a circular reference that will cause JSON.stringify to throw
+            const badLayout = { version: 999, mainPanel: {}, bottomPanel: {} };
+            badLayout['self'] = badLayout;
+            mockProvider.getSavedLayout.withArgs('good').returns(goodLayout);
+            mockProvider.getSavedLayout.withArgs('bad').returns(badLayout);
+            mockProvider.getSavedLayout.withArgs('active').returns(undefined);
+            restorer.storeLayout(mockApp);
+            // Multiple perspectives => writes to PERSPECTIVE_LAYOUTS_STORAGE_KEY and clears legacy
+            const perspCall = mockStorageService.setData.getCalls().find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] !== undefined);
+            (0, chai_1.expect)(perspCall).to.not.be.undefined;
+            const data = perspCall.args[1];
+            (0, chai_1.expect)(data.layouts).to.have.property('active');
+            (0, chai_1.expect)(data.layouts).to.have.property('good');
+            (0, chai_1.expect)(data.layouts).to.not.have.property('bad');
+            // Should warn about 'bad'
+            (0, chai_1.expect)(mockLogger.warn.called).to.be.true;
+            const warnCall = mockLogger.warn.getCalls().find((c) => c.args[0].includes('bad'));
+            (0, chai_1.expect)(warnCall).to.not.be.undefined;
+        });
+        it('should persist inactive perspectives when active perspective deflate fails', () => {
+            mockProvider.getActivePerspectiveId.returns('active');
+            mockProvider.getSavedPerspectiveIds.returns(['active', 'inactive']);
+            // Make the shell return a circular structure for the active perspective
+            const circularLayout = { version: 999, mainPanel: {}, bottomPanel: {} };
+            circularLayout['self'] = circularLayout;
+            mockShell.getLayoutData.returns(circularLayout);
+            const inactiveLayout = { version: 999, mainPanel: { items: ['inactive'] }, bottomPanel: {} };
+            mockProvider.getSavedLayout.withArgs('inactive').returns(inactiveLayout);
+            restorer.storeLayout(mockApp);
+            // Multiple perspectives (active + inactive) => writes to PERSPECTIVE_LAYOUTS_STORAGE_KEY
+            const perspCall = mockStorageService.setData.getCalls().find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] !== undefined);
+            (0, chai_1.expect)(perspCall).to.not.be.undefined;
+            const data = perspCall.args[1];
+            (0, chai_1.expect)(data.layouts).to.not.have.property('active');
+            (0, chai_1.expect)(data.layouts).to.have.property('inactive');
+            (0, chai_1.expect)(mockLogger.warn.called).to.be.true;
+        });
+        it('should clear storage key when setData rejects (multi-perspective)', async () => {
+            mockProvider.getActivePerspectiveId.returns('persp-a');
+            mockProvider.getSavedPerspectiveIds.returns(['persp-a', 'persp-b']);
+            const layout = { version: 999, mainPanel: {}, bottomPanel: {} };
+            mockProvider.getSavedLayout.withArgs('persp-b').returns(layout);
+            // The perspective-layouts setData call rejects only the first time (when data is present)
+            let perspCallCount = 0;
+            mockStorageService.setData.callsFake((key, data) => {
+                if (key === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && data !== undefined) {
+                    perspCallCount++;
+                    return Promise.reject(new Error('storage error'));
+                }
+                return Promise.resolve();
+            });
+            restorer.storeLayout(mockApp);
+            // Allow the .catch() handler to execute
+            await new Promise(resolve => setTimeout(resolve, 0));
+            (0, chai_1.expect)(perspCallCount).to.equal(1);
+            // Should have attempted to clear the perspective key
+            const clearCall = mockStorageService.setData.getCalls().find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] === undefined);
+            (0, chai_1.expect)(clearCall).to.not.be.undefined;
+            (0, chai_1.expect)(mockLogger.error.called).to.be.true;
+        });
+    });
+    describe('restorePerspectiveLayouts - desync fallback', () => {
+        it('should fall back to default perspective when active perspective has no saved layout', async () => {
+            const persisted = {
+                activePerspectiveId: 'custom',
+                layouts: {
+                    'default': JSON.stringify({ version: 999, mainPanel: { items: ['default-w'] }, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            // 'custom' is a registered perspective, but has no layout entry
+            mockProvider.setActivePerspectiveId.returns(true);
+            // Track calls to setActivePerspectiveId to simulate state changes
+            let currentActiveId = 'default';
+            mockProvider.setActivePerspectiveId.callsFake((id) => {
+                currentActiveId = id;
+                return true;
+            });
+            mockProvider.getActivePerspectiveId.callsFake(() => currentActiveId);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.true;
+            // Should have fallen back to default
+            (0, chai_1.expect)(mockLogger.warn.called).to.be.true;
+            const warnCall = mockLogger.warn.getCalls().find((c) => c.args[0].includes('custom'));
+            (0, chai_1.expect)(warnCall).to.not.be.undefined;
+            // Should have called onLayoutRestored with default
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledWith('default')).to.be.true;
+        });
+        it('should call onLayoutRestored even when falling through to no layout', async () => {
+            const persisted = {
+                activePerspectiveId: 'custom',
+                layouts: {}
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            let currentActiveId = 'default';
+            mockProvider.setActivePerspectiveId.callsFake((id) => {
+                currentActiveId = id;
+                return true;
+            });
+            mockProvider.getActivePerspectiveId.callsFake(() => currentActiveId);
+            mockProvider.getSavedLayout.returns(undefined);
+            const result = await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(result).to.be.false;
+            // onLayoutRestored should still be called
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledOnce).to.be.true;
+        });
+    });
+    describe('resetLayout', () => {
+        it('should clear layouts and legacy layout keys', async () => {
+            // Access private method
+            await restorer['resetLayout']();
+            const setDataCalls = mockStorageService.setData.getCalls();
+            const layoutClear = setDataCalls.find((c) => c.args[0] === 'layout' && c.args[1] === undefined);
+            const perspClear = setDataCalls.find((c) => c.args[0] === shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY && c.args[1] === undefined);
+            (0, chai_1.expect)(layoutClear).to.not.be.undefined;
+            (0, chai_1.expect)(perspClear).to.not.be.undefined;
+        });
+        it('should call provider.clearSavedLayouts', async () => {
+            await restorer['resetLayout']();
+            (0, chai_1.expect)(mockProvider.clearSavedLayouts.calledOnce).to.be.true;
+        });
+        it('should reload the window after reset', async () => {
+            await restorer['resetLayout']();
+            (0, chai_1.expect)(mockWindowService.reload.calledOnce).to.be.true;
+        });
+    });
+    describe('onLayoutRestored callback', () => {
+        it('should call onLayoutRestored on provider after successful restore', async () => {
+            const persisted = {
+                activePerspectiveId: 'my-persp',
+                layouts: {
+                    'my-persp': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            let currentActiveId = 'default';
+            mockProvider.setActivePerspectiveId.callsFake((id) => {
+                currentActiveId = id;
+                return true;
+            });
+            mockProvider.getActivePerspectiveId.callsFake(() => currentActiveId);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledOnce).to.be.true;
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledWith('my-persp')).to.be.true;
+        });
+        it('should call onLayoutRestored even when no layout is restored', async () => {
+            mockStorageService.getData.resolves(undefined);
+            await restorer.restoreLayout(mockApp);
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledOnce).to.be.true;
+            (0, chai_1.expect)(mockProvider.onLayoutRestored.calledWith('default')).to.be.true;
+        });
+        it('should call onLayoutRestored after layout is applied to shell', async () => {
+            const persisted = {
+                activePerspectiveId: 'active',
+                layouts: {
+                    'active': JSON.stringify({ version: 999, mainPanel: {}, bottomPanel: {} })
+                }
+            };
+            mockStorageService.getData.withArgs(shell_layout_restorer_1.PERSPECTIVE_LAYOUTS_STORAGE_KEY).resolves(persisted);
+            let currentActiveId = 'default';
+            mockProvider.setActivePerspectiveId.callsFake((id) => {
+                currentActiveId = id;
+                return true;
+            });
+            mockProvider.getActivePerspectiveId.callsFake(() => currentActiveId);
+            mockProvider.getSavedLayout.callsFake((id) => {
+                const call = mockProvider.setSavedLayout.getCalls().find((c) => c.args[0] === id);
+                return call?.args[1];
+            });
+            await restorer.restoreLayout(mockApp);
+            // onLayoutRestored should be called after setLayoutData
+            (0, chai_1.expect)(mockShell.setLayoutData.calledBefore(mockProvider.onLayoutRestored)).to.be.true;
+        });
+    });
+});
+//# sourceMappingURL=shell-layout-restorer.spec.js.map

package/lib/browser/shell/shell-layout-restorer.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-layout-restorer.spec.js","sourceRoot":"","sources":["../../../src/browser/shell/shell-layout-restorer.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,yCAA4C;AAC5C,MAAM,YAAY,GAAG,IAAA,mBAAW,GAAE,CAAC;AAEnC,+BAA8B;AAC9B,+BAA+B;AAC/B,mEAIiC;AAEjC,YAAY,EAAE,CAAC;AAEf,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACvD,IAAI,QAA6B,CAAC;IAClC,IAAI,kBAA0E,CAAC;IAC/E,IAAI,UAAoF,CAAC;IACzF,IAAI,iBAAsD,CAAC;IAC3D,IAAI,SAGH,CAAC;IACF,IAAI,OAAoC,CAAC;IACzC,IAAI,YASH,CAAC;IACF,IAAI,mBAA0D,CAAC;IAC/D,IAAI,cAAqD,CAAC;IAC1D,IAAI,iBAAiF,CAAC;IACtF,IAAI,gBAA4C,CAAC;IACjD,IAAI,UAAsB,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACZ,UAAU,GAAG,IAAA,mBAAW,GAAE,CAAC;QAE3B,kBAAkB,GAAG;YACjB,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;YAChC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;SAC5C,CAAC;QACF,UAAU,GAAG;YACT,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;YACnB,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;SACrB,CAAC;QACF,iBAAiB,GAAG;YAChB,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;SAClD,CAAC;QACF,SAAS,GAAG;YACR,aAAa,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YACrF,aAAa,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;SACzC,CAAC;QACF,OAAO,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAC/B,YAAY,GAAG;YACX,sBAAsB,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;YACvD,sBAAsB,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YAChD,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;YAC/C,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE;YAC5B,sBAAsB,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;YAClD,iBAAiB,EAAE,KAAK,CAAC,IAAI,EAAE;YAC/B,gBAAgB,EAAE,KAAK,CAAC,IAAI,EAAE;YAC9B,oBAAoB,EAAE,SAAS;SAClC,CAAC;QACF,mBAAmB,GAAG;YAClB,gBAAgB,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC;QACF,cAAc,GAAG;YACb,gBAAgB,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC;QACF,iBAAiB,GAAG;YAChB,gBAAgB,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC7C,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE;SACvB,CAAC;QACF,gBAAgB,GAAG;YACf,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;SACtB,CAAC;QAEF,QAAQ,GAAG,IAAI,2CAAmB,CAC9B,iBAA0B,EAC1B,UAAmB,EACnB,kBAA2B,CAC9B,CAAC;QAED,QAA+C,CAAC,oBAAoB,CAAC,GAAG,YAAY,CAAC;QACrF,QAA+C,CAAC,iBAAiB,CAAC,GAAG,mBAAmB,CAAC;QACzF,QAA+C,CAAC,YAAY,CAAC,GAAG,cAAc,CAAC;QAC/E,QAA+C,CAAC,eAAe,CAAC,GAAG,iBAAiB,CAAC;QACrF,QAA+C,CAAC,cAAc,CAAC,GAAG,gBAAgB,CAAC;IACxF,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,UAAU,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;YAEzE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChD,MAAM,aAAa,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YAC3F,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAE/C,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACtG,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACtC,MAAM,IAAI,GAAG,SAAU,CAAC,IAAI,CAAC,CAAC,CAA6B,CAAC;YAC5D,IAAA,aAAM,EAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACrD,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAClD,sDAAsD;YACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;YAErE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;YAClF,MAAM,eAAe,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YAClI,MAAM,eAAe,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YAClI,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC3E,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC3E,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAElE,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,IAA0C,CAAC;YACjG,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtD,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnD,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;YAEpE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,qDAAqD;YACrD,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YACjI,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACpE,6BAA6B;YAC7B,MAAM,aAAa,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YAC3F,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAE/C,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,IAA0C,CAAC;YACjG,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClD,2CAA2C;YAC3C,IAAA,aAAM,EAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YACxE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEhD,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,wDAAwD;YACxD,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACzD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CACpD,CAAC;YACF,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACvC,mCAAmC;YACnC,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACzD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACtG,CAAC;YACF,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;YAC3E,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YACpE,MAAM,cAAc,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YAChI,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACxE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEnE,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACtG,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACtC,8BAA8B;YAC9B,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAC1D,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAC/E,CAAC;YACF,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QAC5C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAE7D,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,SAAS;gBAC9B,OAAO,EAAE;oBACL,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;oBACzF,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBAC5F;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,6DAA6D;YAC7D,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;oBACnB,oDAAoD;oBACpD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACrD,CAAC;oBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1B,IAAA,aAAM,EAAC,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1D,yBAAyB;YACzB,MAAM,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACrD,CAAC;YACF,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACrC,yBAAyB;YACzB,MAAM,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACrD,CAAC;YACF,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAE1D,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,UAAU;gBAC/B,OAAO,EAAE;oBACL,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBAC/E;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,IAAA,aAAM,EAAC,YAAY,CAAC,sBAAsB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAClF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAEzD,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YAC5F,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,QAAQ;gBAC7B,OAAO,EAAE;oBACL,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;iBACvC;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,IAAA,aAAM,EAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACtD,MAAM,OAAO,GAAG,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAA,aAAM,EAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;YAE3F,MAAM,WAAW,GAAG;gBAChB,wBAAwB,EAAE,KAAK,CAAC,IAAI,EAAE;aACzC,CAAC;YACF,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;YAE5D,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,SAAS;gBAC9B,OAAO,EAAE;oBACL,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;oBAC3E,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBAC9E;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzF,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,gDAAgD;YAChD,IAAA,aAAM,EAAC,WAAW,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAExF,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,eAAe;gBACpC,OAAO,EAAE;oBACL,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;oBACjF,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBACpG;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzF,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACnD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1B,8DAA8D;YAC9D,MAAM,OAAO,GAAG,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAA,aAAM,EAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;YAC7D,mDAAmD;YACnD,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YAEpF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAE/C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YAEpE,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,MAAM;gBAC3B,OAAO,EAAE;oBACL,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;oBACxE,KAAK,EAAE,eAAe;iBACzB;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,yCAAyC;YACzC,MAAM,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAClD,CAAC;YACF,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YAErC,0BAA0B;YAC1B,IAAA,aAAM,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1C,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAC5C,CAAC,CAAqB,EAAE,EAAE,CAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CACnE,CAAC;YACF,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QACzC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAE/E,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;YACzG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAErE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1B,8CAA8C;YAC9C,IAAA,aAAM,EAAC,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1D,IAAA,aAAM,EAAC,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC1E,iCAAiC;YACjC,IAAA,aAAM,EAAC,YAAY,CAAC,sBAAsB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACjF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YAErE,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;YACzG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAErE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,0FAA0F;YAC1F,8DAA8D;YAC9D,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAC1D,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CACpD,CAAC;YACF,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAE3D,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAE1E,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YAC3B,mCAAmC;YACnC,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAC1D,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAC/E,CAAC;YACF,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;YACpC,mCAAmC;YACnC,IAAA,aAAM,EAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YACvD,gCAAgC;YAChC,IAAA,aAAM,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAE1D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3G,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACzF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAErE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,IAAA,aAAM,EAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACvD,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;YACrF,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YAEvE,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YAC/H,oFAAoF;YACpF,MAAM,SAAS,GAA4B,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YAC5F,SAAS,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;YAE9B,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACjE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC/D,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAElE,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,uFAAuF;YACvF,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACtG,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACtC,MAAM,IAAI,GAAG,SAAU,CAAC,IAAI,CAAC,CAAC,CAA6B,CAAC;YAC5D,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAEjD,0BAA0B;YAC1B,IAAA,aAAM,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1C,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAC5C,CAAC,CAAqB,EAAE,EAAE,CAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CACnE,CAAC;YACF,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;YAClF,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;YAEpE,wEAAwE;YACxE,MAAM,cAAc,GAA4B,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YACjG,cAAc,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;YACxC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAEhD,MAAM,cAAc,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YACvI,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAEzE,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,yFAAyF;YACzF,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACtG,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACtC,MAAM,IAAI,GAAG,SAAU,CAAC,IAAI,CAAC,CAAC,CAA6B,CAAC;YAC5D,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAElD,IAAA,aAAM,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAC/E,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YACpE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAA4C,CAAC;YAC1G,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEhE,0FAA0F;YAC1F,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAW,EAAE,IAAa,EAAE,EAAE;gBAChE,IAAI,GAAG,KAAK,uDAA+B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBAChE,cAAc,EAAE,CAAC;oBACjB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBACtD,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7B,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,WAAW,CAAC,OAAgB,CAAC,CAAC;YAEvC,wCAAwC;YACxC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YAErD,IAAA,aAAM,EAAC,cAAc,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACnC,qDAAqD;YACrD,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CACxD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CACtG,CAAC;YACF,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YAEtC,IAAA,aAAM,EAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC/C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACzD,EAAE,CAAC,qFAAqF,EAAE,KAAK,IAAI,EAAE;YACjG,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,QAAQ;gBAC7B,OAAO,EAAE;oBACL,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBACpG;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,gEAAgE;YAChE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAElD,kEAAkE;YAClE,IAAI,eAAe,GAAG,SAAS,CAAC;YAChC,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACzD,eAAe,GAAG,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC;YAErE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1B,qCAAqC;YACrC,IAAA,aAAM,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC1C,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAC5C,CAAC,CAAqB,EAAE,EAAE,CAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACtE,CAAC;YACF,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACrC,mDAAmD;YACnD,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACjF,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,QAAQ;gBAC7B,OAAO,EAAE,EAAE;aACd,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,IAAI,eAAe,GAAG,SAAS,CAAC;YAChC,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACzD,eAAe,GAAG,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC;YACrE,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE/C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE9D,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YAC3B,0CAA0C;YAC1C,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAEzD,wBAAwB;YACxB,MAAO,QAA2D,CAAC,aAAa,CAAC,EAAE,CAAC;YAEpF,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC3D,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;YACpH,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,uDAA+B,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;YAE1I,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;YACxC,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YAEpD,MAAO,QAA2D,CAAC,aAAa,CAAC,EAAE,CAAC;YAEpF,IAAA,aAAM,EAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YAElD,MAAO,QAA2D,CAAC,aAAa,CAAC,EAAE,CAAC;YAEpF,IAAA,aAAM,EAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAE/E,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,UAAU;gBAC/B,OAAO,EAAE;oBACL,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBAC/E;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,IAAI,eAAe,GAAG,SAAS,CAAC;YAChC,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACzD,eAAe,GAAG,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC;YAErE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC5D,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAE1E,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAE/C,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC5D,IAAA,aAAM,EAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;YAE3E,MAAM,SAAS,GAA6B;gBACxC,mBAAmB,EAAE,QAAQ;gBAC7B,OAAO,EAAE;oBACL,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBAC7E;aACJ,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,uDAA+B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEzF,IAAI,eAAe,GAAG,SAAS,CAAC;YAChC,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACzD,eAAe,GAAG,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC;YAErE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAU,EAAE,EAAE;gBACjD,MAAM,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CACpD,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9C,CAAC;gBACF,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAgB,CAAC,CAAC;YAE/C,wDAAwD;YACxD,IAAA,aAAM,EAAC,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3F,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/lib/browser/shell/view-contribution.d.ts

@@ -32,6 +32,8 @@ export declare abstract class AbstractViewContribution<T extends Widget> impleme
     get viewId(): string;
     get viewLabel(): string;
     get defaultViewOptions(): ApplicationShell.WidgetOptions;
+    /** The widget ID used for shell operations — `viewContainerId` if set, otherwise `widgetId`. */
+    get effectiveWidgetId(): string;
     get widget(): Promise<T>;
     tryGetWidget(): T | undefined;
     openView(args?: Partial<OpenViewArguments>): Promise<T>;

package/lib/browser/shell/view-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/view-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAuB,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACH,iBAAiB,EAAE,OAAO,EAAE,mBAAmB,EAC/C,gBAAgB,EAAE,eAAe,EACpC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB,CAAC,aAAa;IACrE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,gBAAgB,CAAC,aAAa,CAAC;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,wBAAwB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAM5K;AAED;;GAEG;AACH,8BACsB,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;IAWpH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,uBAAuB;IAT7C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAE/C,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;gBAGG,OAAO,EAAE,uBAAuB;IAWpE,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,kBAAkB,IAAI,gBAAgB,CAAC,aAAa,CAEvD;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAEvB;IAED,YAAY,IAAI,CAAC,GAAG,SAAS;IAIvB,QAAQ,CAAC,IAAI,GAAE,OAAO,CAAC,iBAAiB,CAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAuCjE,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAY3C,SAAS,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKzC,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC;IAOxB,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAS7C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;CAQ7D"}
+{"version":3,"file":"view-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/view-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAuB,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACH,iBAAiB,EAAE,OAAO,EAAE,mBAAmB,EAC/C,gBAAgB,EAAE,eAAe,EACpC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB,CAAC,aAAa;IACrE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,uBAAuB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,gBAAgB,CAAC,aAAa,CAAC;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,wBAAwB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAM5K;AAED;;GAEG;AACH,8BACsB,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;IAWpH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,uBAAuB;IAT7C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAE/C,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;gBAGG,OAAO,EAAE,uBAAuB;IAWpE,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,kBAAkB,IAAI,gBAAgB,CAAC,aAAa,CAEvD;IAED,gGAAgG;IAChG,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAEvB;IAED,YAAY,IAAI,CAAC,GAAG,SAAS;IAIvB,QAAQ,CAAC,IAAI,GAAE,OAAO,CAAC,iBAAiB,CAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAuCjE,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAY3C,SAAS,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKzC,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC;IAOxB,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAS7C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;CAQ7D"}

package/lib/browser/shell/view-contribution.js

@@ -55,6 +55,10 @@ let AbstractViewContribution = class AbstractViewContribution {
     get defaultViewOptions() {
         return this.options.defaultWidgetOptions;
     }
+    /** The widget ID used for shell operations — `viewContainerId` if set, otherwise `widgetId`. */
+    get effectiveWidgetId() {
+        return this.options.viewContainerId || this.options.widgetId;
+    }
     get widget() {
         return this.widgetManager.getOrCreateWidget(this.viewId);
     }
@@ -63,7 +67,7 @@ let AbstractViewContribution = class AbstractViewContribution {
     }
     async openView(args = {}) {
         const shell = this.shell;
-        const widget = await this.widgetManager.getOrCreateWidget(this.options.viewContainerId || this.viewId);
+        const widget = await this.widgetManager.getOrCreateWidget(this.effectiveWidgetId);
         const tabBar = shell.getTabBarFor(widget);
         const area = shell.getAreaFor(widget);
         if (!tabBar) {