@eclipse-glsp/vscode-integration-webview 1.1.0-next.e3c23fc.57 → 1.1.0-next.e5a109d.70

package/lib/features/export/export-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"export-module.js","sourceRoot":"","sources":["../../../src/features/export/export-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,iDAAsE;AACtE,kFAA0E;AAE7D,QAAA,kBAAkB,GAAG,IAAI,sBAAa,CAAC,IAAI,CAAC,EAAE;IACvD,IAAI,CAAC,8CAAmB,CAAC,CAAC,eAAe,CAAC,wBAAe,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC"}

package/lib/features/navigation/navigation-module.d.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { FeatureModule } from '@eclipse-glsp/client';
+export declare const vscodeNavigationModule: FeatureModule;
+//# sourceMappingURL=navigation-module.d.ts.map

package/lib/features/navigation/navigation-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigation-module.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,aAAa,EAAoD,MAAM,sBAAsB,CAAC;AAGvG,eAAO,MAAM,sBAAsB,eAEf,CAAC"}

package/lib/features/navigation/navigation-module.js

@@ -0,0 +1,24 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.vscodeNavigationModule = void 0;
+const client_1 = require("@eclipse-glsp/client");
+const extension_action_handler_1 = require("../default/extension-action-handler");
+exports.vscodeNavigationModule = new client_1.FeatureModule(bind => {
+    bind(extension_action_handler_1.ExtensionActionKind).toConstantValue(client_1.NavigateToExternalTargetAction.KIND);
+}, client_1.navigationModule);
+//# sourceMappingURL=navigation-module.js.map

package/lib/features/navigation/navigation-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigation-module.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,iDAAuG;AACvG,kFAA0E;AAE7D,QAAA,sBAAsB,GAAG,IAAI,sBAAa,CAAC,IAAI,CAAC,EAAE;IAC3D,IAAI,CAAC,8CAAmB,CAAC,CAAC,eAAe,CAAC,uCAA8B,CAAC,IAAI,CAAC,CAAC;AACnF,CAAC,EAAE,yBAAgB,CAAC,CAAC"}

package/lib/glsp-diagram-widget.d.ts

@@ -14,22 +14,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { IActionDispatcher, ModelSource, ServerStatusAction, ViewerOptions } from '@eclipse-glsp/client';
-import { GLSPDiagramIdentifier } from './diagram-identifier';
+import { DiagramLoader, DiagramLoadingOptions, IActionDispatcher, IDiagramOptions, ModelSource, ViewerOptions } from '@eclipse-glsp/client';
 export declare const GLSPDiagramWidgetFactory: unique symbol;
 export type GLSPDiagramWidgetFactory = () => GLSPDiagramWidget;
 export declare abstract class GLSPDiagramWidget {
-    protected diagramIdentifier: GLSPDiagramIdentifier;
-    readonly actionDispatcher: IActionDispatcher;
-    readonly modelSource: ModelSource;
+    protected actionDispatcher: IActionDispatcher;
+    protected modelSource: ModelSource;
+    protected diagramOptions: IDiagramOptions;
     protected viewerOptions: ViewerOptions;
-    protected statusIconDiv: HTMLDivElement;
-    protected statusMessageDiv: HTMLDivElement;
+    protected diagramLoader: DiagramLoader;
+    get clientId(): string;
     initialize(): void;
     protected initializeHtml(): void;
-    dispatchInitialActions(): void;
-    setStatus(status: ServerStatusAction): void;
-    protected removeClasses(element: Element, keep: number): void;
+    protected createDiagramLoadingOptions(): DiagramLoadingOptions | undefined;
+    loadDiagram(): Promise<void>;
 }
-export declare function decodeURI(uri: string): string;
 //# sourceMappingURL=glsp-diagram-widget.d.ts.map

package/lib/glsp-diagram-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-diagram-widget.d.ts","sourceRoot":"","sources":["../src/glsp-diagram-widget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;kFAekF;AAElF,OAAO,EAGH,iBAAiB,EACjB,WAAW,EAGX,kBAAkB,EAElB,aAAa,EAChB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,MAAM,wBAAwB,GAAG,MAAM,iBAAiB,CAAC;AAE/D,8BACsB,iBAAiB;IAEnC,SAAS,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAEnD,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAE7C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAElC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;IACxC,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC;IAG3C,UAAU,IAAI,IAAI;IAKlB,SAAS,CAAC,cAAc,IAAI,IAAI;IAwBhC,sBAAsB,IAAI,IAAI;IAiB9B,SAAS,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IA2B3C,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;CAShE;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}
+{"version":3,"file":"glsp-diagram-widget.d.ts","sourceRoot":"","sources":["../src/glsp-diagram-widget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;kFAekF;AAElF,OAAO,EACH,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,WAAW,EAEX,aAAa,EAChB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,MAAM,wBAAwB,GAAG,MAAM,iBAAiB,CAAC;AAE/D,8BACsB,iBAAiB;IAEnC,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAG9C,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IAGnC,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAG1C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,IAAI,QAAQ,IAAI,MAAM,CAErB;IAGD,UAAU,IAAI,IAAI;IAKlB,SAAS,CAAC,cAAc,IAAI,IAAI;IAahC,SAAS,CAAC,2BAA2B,IAAI,qBAAqB,GAAG,SAAS;IAI1E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/lib/glsp-diagram-widget.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeURI = exports.GLSPDiagramWidget = exports.GLSPDiagramWidgetFactory = void 0;
+exports.GLSPDiagramWidget = exports.GLSPDiagramWidgetFactory = void 0;
 /********************************************************************************
  * Copyright (c) 2018 TypeFox and others.
  * Modifications: (c) 2020-2023 EclipseSource and others.
@@ -29,15 +29,17 @@ exports.decodeURI = exports.GLSPDiagramWidget = exports.GLSPDiagramWidgetFactory
 // based on https://github.com/eclipse-sprotty/sprotty-vscode/blob/v0.3.0/sprotty-vscode-webview/src/vscode-diagram-widget.ts
 const client_1 = require("@eclipse-glsp/client");
 const inversify_1 = require("inversify");
-const diagram_identifier_1 = require("./diagram-identifier");
 exports.GLSPDiagramWidgetFactory = Symbol('GLSPDiagramWidgetFactory');
 let GLSPDiagramWidget = class GLSPDiagramWidget {
+    get clientId() {
+        return this.diagramOptions.clientId;
+    }
     initialize() {
         this.initializeHtml();
-        this.dispatchInitialActions();
+        this.loadDiagram();
     }
     initializeHtml() {
-        const containerDiv = document.getElementById(this.diagramIdentifier.clientId + '_container');
+        const containerDiv = document.getElementById(this.clientId + '_container');
         if (containerDiv) {
             const svgContainer = document.createElement('div');
             svgContainer.id = this.viewerOptions.baseDiv;
@@ -45,69 +47,16 @@ let GLSPDiagramWidget = class GLSPDiagramWidget {
             const hiddenContainer = document.createElement('div');
             hiddenContainer.id = this.viewerOptions.hiddenDiv;
             document.body.appendChild(hiddenContainer);
-            const statusDiv = document.createElement('div');
-            statusDiv.setAttribute('class', 'sprotty-status');
-            containerDiv.appendChild(statusDiv);
-            this.statusIconDiv = document.createElement('div');
-            statusDiv.appendChild(this.statusIconDiv);
-            this.statusMessageDiv = document.createElement('div');
-            this.statusMessageDiv.setAttribute('class', 'sprotty-status-message');
-            statusDiv.appendChild(this.statusMessageDiv);
-        }
-    }
-    dispatchInitialActions() {
-        if (this.modelSource instanceof client_1.DiagramServerProxy) {
-            this.modelSource.clientId = this.diagramIdentifier.clientId;
         }
-        this.actionDispatcher.dispatch(client_1.RequestModelAction.create({
-            options: {
-                sourceUri: decodeURI(this.diagramIdentifier.uri),
-                diagramType: this.diagramIdentifier.diagramType
-            }
-        }));
-        this.actionDispatcher.dispatch(client_1.RequestTypeHintsAction.create());
-        this.actionDispatcher.dispatch(client_1.EnableToolPaletteAction.create());
     }
-    setStatus(status) {
-        this.statusMessageDiv.textContent = status.message;
-        this.removeClasses(this.statusMessageDiv, 1);
-        this.statusMessageDiv.classList.add(status.severity.toLowerCase());
-        this.removeClasses(this.statusIconDiv, 0);
-        const classes = this.statusIconDiv.classList;
-        classes.add(status.severity.toLowerCase());
-        switch (status.severity) {
-            case 'FATAL':
-                classes.add('fa');
-                classes.add('fa-times-circle');
-                break;
-            case 'ERROR':
-                classes.add('fa');
-                classes.add('fa-exclamation-circle');
-                break;
-            case 'WARNING':
-                classes.add('fa');
-                classes.add('fa-exclamation-circle');
-                break;
-            case 'INFO':
-                classes.add('fa');
-                classes.add('fa-info-circle');
-                break;
-        }
+    createDiagramLoadingOptions() {
+        return undefined;
     }
-    removeClasses(element, keep) {
-        const classes = element.classList;
-        while (classes.length > keep) {
-            const item = classes.item(classes.length - 1);
-            if (item) {
-                classes.remove(item);
-            }
-        }
+    loadDiagram() {
+        return this.diagramLoader.load(this.createDiagramLoadingOptions());
     }
 };
-__decorate([
-    (0, inversify_1.inject)(diagram_identifier_1.GLSPDiagramIdentifier),
-    __metadata("design:type", Object)
-], GLSPDiagramWidget.prototype, "diagramIdentifier", void 0);
+exports.GLSPDiagramWidget = GLSPDiagramWidget;
 __decorate([
     (0, inversify_1.inject)(client_1.TYPES.IActionDispatcher),
     __metadata("design:type", Object)
@@ -116,22 +65,25 @@ __decorate([
     (0, inversify_1.inject)(client_1.TYPES.ModelSource),
     __metadata("design:type", client_1.ModelSource)
 ], GLSPDiagramWidget.prototype, "modelSource", void 0);
+__decorate([
+    (0, inversify_1.inject)(client_1.TYPES.IDiagramOptions),
+    __metadata("design:type", Object)
+], GLSPDiagramWidget.prototype, "diagramOptions", void 0);
 __decorate([
     (0, inversify_1.inject)(client_1.TYPES.ViewerOptions),
     __metadata("design:type", Object)
 ], GLSPDiagramWidget.prototype, "viewerOptions", void 0);
+__decorate([
+    (0, inversify_1.inject)(client_1.DiagramLoader),
+    __metadata("design:type", client_1.DiagramLoader)
+], GLSPDiagramWidget.prototype, "diagramLoader", void 0);
 __decorate([
     (0, inversify_1.postConstruct)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], GLSPDiagramWidget.prototype, "initialize", null);
-GLSPDiagramWidget = __decorate([
+exports.GLSPDiagramWidget = GLSPDiagramWidget = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPDiagramWidget);
-exports.GLSPDiagramWidget = GLSPDiagramWidget;
-function decodeURI(uri) {
-    return decodeURIComponent(uri.replace(/\+/g, ' '));
-}
-exports.decodeURI = decodeURI;
 //# sourceMappingURL=glsp-diagram-widget.js.map

package/lib/glsp-diagram-widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-diagram-widget.js","sourceRoot":"","sources":["../src/glsp-diagram-widget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-diagram-widget.js","sourceRoot":"","sources":["../src/glsp-diagram-widget.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;kFAekF;AAClF,6HAA6H;AAC7H,iDAQ8B;AAC9B,yCAA8D;AAEjD,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAIpE,IAAe,iBAAiB,GAAhC,MAAe,iBAAiB;IAgBnC,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;IACxC,CAAC;IAGD,UAAU;QACN,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAES,cAAc;QACpB,MAAM,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,CAAC;QAC3E,IAAI,YAAY,EAAE;YACd,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnD,YAAY,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YAC7C,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAEvC,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACtD,eAAe,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;YAClD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SAC9C;IACL,CAAC;IAES,2BAA2B;QACjC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;IACvE,CAAC;CACJ,CAAA;AA9CqB,8CAAiB;AAEzB;IADT,IAAA,kBAAM,EAAC,cAAK,CAAC,iBAAiB,CAAC;;2DACc;AAGpC;IADT,IAAA,kBAAM,EAAC,cAAK,CAAC,WAAW,CAAC;8BACH,oBAAW;sDAAC;AAGzB;IADT,IAAA,kBAAM,EAAC,cAAK,CAAC,eAAe,CAAC;;yDACY;AAGhC;IADT,IAAA,kBAAM,EAAC,cAAK,CAAC,aAAa,CAAC;;wDACW;AAG7B;IADT,IAAA,kBAAM,EAAC,sBAAa,CAAC;8BACG,sBAAa;wDAAC;AAOvC;IADC,IAAA,yBAAa,GAAE;;;;mDAIf;4BAxBiB,iBAAiB;IADtC,IAAA,sBAAU,GAAE;GACS,iBAAiB,CA8CtC"}

package/lib/glsp-starter.d.ts

@@ -1,18 +1,47 @@
-import { Container } from 'inversify';
+/********************************************************************************
+ * Copyright (c) 2018 TypeFox and others.
+ * Modifications: (c) 2020-2023 EclipseSource and others.
+ *
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { ContainerConfiguration } from '@eclipse-glsp/client';
+import { Container, ContainerModule } from 'inversify';
+import { NotificationType } from 'vscode-messenger-common';
+import { Messenger } from 'vscode-messenger-webview';
 import { GLSPDiagramIdentifier } from './diagram-identifier';
-import { GLSPStarterServices, VsCodeApi } from './services';
+export declare const WebviewReadyNotification: NotificationType<void>;
+export declare const InitializeNotification: NotificationType<GLSPDiagramIdentifier>;
 export declare abstract class GLSPStarter {
     protected container?: Container;
-    protected vscodeApi: VsCodeApi;
-    constructor(services?: GLSPStarterServices);
+    protected messenger: Messenger;
+    constructor();
     protected sendReadyMessage(): void;
-    protected acceptDiagramIdentifier(): void;
-    protected abstract createContainer(diagramIdentifier: GLSPDiagramIdentifier): Container;
-    protected addVscodeBindings(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void;
-    protected configureExtensionActionHandler(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void;
+    protected acceptDiagramIdentifier(identifier: GLSPDiagramIdentifier): void;
+    protected createDiagramOptionsModule(identifier: GLSPDiagramIdentifier): ContainerModule;
     /**
-     *  All kinds of actions that should (also) be delegated to and handled by the vscode extension
+     * Retrieves additional {@link ContainerConfiguration} for the diagram container.
+     * Typically this composes a set of vscode specific customization modules.
+     * @returns the container configuration
      */
-    protected get extensionActionKinds(): string[];
+    protected getContainerConfiguration(): ContainerConfiguration;
+    protected abstract createContainer(...containerConfiguration: ContainerConfiguration): Container;
+    /**
+     * Optional hook that can be implemented to customize diagram container bindings before it's used
+     * to instantiate the diagram services
+     * @param container The diagram container
+     * @param diagramIdentifier The diagram identfier
+     */
+    protected addVscodeBindings?(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void;
 }
+export declare function decodeURI(uri: string): string;
 //# sourceMappingURL=glsp-starter.d.ts.map

package/lib/glsp-starter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-starter.d.ts","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAA4C,MAAM,sBAAsB,CAAC;AAIvG,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5D,8BAAsB,WAAW;IAC7B,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAChC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;gBAEnB,QAAQ,GAAE,mBAAwB;IAM9C,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAIlC,SAAS,CAAC,uBAAuB,IAAI,IAAI;IA2BzC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,SAAS;IAEvF,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,qBAAqB,GAAG,IAAI;IAkBjG,SAAS,CAAC,+BAA+B,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,qBAAqB,GAAG,IAAI;IAM/G;;OAEG;IACH,SAAS,KAAK,oBAAoB,IAAI,MAAM,EAAE,CAQ7C;CACJ"}
+{"version":3,"file":"glsp-starter.d.ts","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;kFAekF;AAElF,OAAO,EAAE,sBAAsB,EAA8B,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAkB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAa,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAG7D,eAAO,MAAM,wBAAwB,EAAE,gBAAgB,CAAC,IAAI,CAAuB,CAAC;AACpF,eAAO,MAAM,sBAAsB,EAAE,gBAAgB,CAAC,qBAAqB,CAA4B,CAAC;AAIxG,8BAAsB,WAAW;IAC7B,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAChC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;;IAW/B,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAIlC,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAe1E,SAAS,CAAC,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,eAAe;IAUxF;;;;OAIG;IACH,SAAS,CAAC,yBAAyB,IAAI,sBAAsB;IAI7D,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS;IAEhG;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,qBAAqB,GAAG,IAAI;CACrG;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}

package/lib/glsp-starter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLSPStarter = void 0;
+exports.decodeURI = exports.GLSPStarter = exports.InitializeNotification = exports.WebviewReadyNotification = void 0;
 /********************************************************************************
  * Copyright (c) 2018 TypeFox and others.
  * Modifications: (c) 2020-2023 EclipseSource and others.
@@ -19,79 +19,61 @@ exports.GLSPStarter = void 0;
  ********************************************************************************/
 // based on https://github.com/eclipse-sprotty/sprotty-vscode/blob/v0.3.0/sprotty-vscode-webview/src/sprotty-starter.ts
 const client_1 = require("@eclipse-glsp/client");
-const copy_paste_handler_provider_1 = require("./copy-paste-handler-provider");
+const vscode_messenger_common_1 = require("vscode-messenger-common");
+const vscode_messenger_webview_1 = require("vscode-messenger-webview");
+const default_modules_1 = require("./default-modules");
 const diagram_identifier_1 = require("./diagram-identifier");
-const extension_action_handler_1 = require("./extension-action-handler");
 const glsp_diagram_widget_1 = require("./glsp-diagram-widget");
-const glsp_vscode_diagramserver_1 = require("./glsp-vscode-diagramserver");
-const services_1 = require("./services");
+const webview_glsp_client_1 = require("./webview-glsp-client");
+exports.WebviewReadyNotification = { method: 'ready' };
+exports.InitializeNotification = { method: 'initialize' };
 class GLSPStarter {
-    constructor(services = {}) {
-        var _a;
-        this.vscodeApi = (_a = services.vscodeApi) !== null && _a !== void 0 ? _a : acquireVsCodeApi();
+    constructor() {
+        this.messenger = new vscode_messenger_webview_1.Messenger(acquireVsCodeApi());
+        this.messenger.onNotification(exports.InitializeNotification, identifier => this.acceptDiagramIdentifier(identifier));
+        this.messenger.start();
         this.sendReadyMessage();
-        this.acceptDiagramIdentifier();
     }
     sendReadyMessage() {
-        this.vscodeApi.postMessage({ readyMessage: 'Sprotty Webview ready' });
-    }
-    acceptDiagramIdentifier() {
-        console.log('Waiting for diagram identifier...');
-        const eventListener = (message) => {
-            if ((0, diagram_identifier_1.isDiagramIdentifier)(message.data)) {
-                console.log(message);
-                if (this.container) {
-                    const oldIdentifier = this.container.get(diagram_identifier_1.GLSPDiagramIdentifier);
-                    const newIdentifier = message.data;
-                    oldIdentifier.diagramType = newIdentifier.diagramType;
-                    oldIdentifier.uri = newIdentifier.uri;
-                    const diagramWidget = this.container.get(glsp_diagram_widget_1.GLSPDiagramWidget);
-                    diagramWidget.dispatchInitialActions();
-                }
-                else {
-                    console.log('...received...', message);
-                    const diagramIdentifier = message.data;
-                    this.container = this.createContainer(diagramIdentifier);
-                    this.addVscodeBindings(this.container, diagramIdentifier);
-                    if (diagramIdentifier.initializeResult) {
-                        (0, client_1.configureServerActions)(diagramIdentifier.initializeResult, diagramIdentifier.diagramType, this.container);
-                    }
-                    this.container.get(glsp_diagram_widget_1.GLSPDiagramWidget);
-                }
-            }
-        };
-        window.addEventListener('message', eventListener);
+        this.messenger.sendNotification(exports.WebviewReadyNotification, vscode_messenger_common_1.HOST_EXTENSION);
     }
-    addVscodeBindings(container, diagramIdentifier) {
-        container.bind(services_1.VsCodeApi).toConstantValue(this.vscodeApi);
-        container.bind(glsp_diagram_widget_1.GLSPDiagramWidget).toSelf().inSingletonScope();
-        container.bind(glsp_diagram_widget_1.GLSPDiagramWidgetFactory).toFactory(context => () => context.container.get(glsp_diagram_widget_1.GLSPDiagramWidget));
-        container.bind(diagram_identifier_1.GLSPDiagramIdentifier).toConstantValue(diagramIdentifier);
-        container
-            .bind(copy_paste_handler_provider_1.CopyPasteHandlerProvider)
-            .toProvider(ctx => () => new Promise(resolve => resolve(ctx.container.get(client_1.TYPES.ICopyPasteHandler))));
-        container.bind(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer).toSelf().inSingletonScope();
-        container.bind(client_1.TYPES.ModelSource).toService(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer);
-        container.bind(client_1.DiagramServerProxy).toService(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer);
-        this.configureExtensionActionHandler(container, diagramIdentifier);
+    acceptDiagramIdentifier(identifier) {
+        var _a;
+        if (this.container) {
+            const oldIdentifier = this.container.get(diagram_identifier_1.GLSPDiagramIdentifier);
+            oldIdentifier.diagramType = identifier.diagramType;
+            oldIdentifier.uri = identifier.uri;
+            const diagramWidget = this.container.get(glsp_diagram_widget_1.GLSPDiagramWidget);
+            diagramWidget.loadDiagram();
+        }
+        else {
+            const diagramModule = this.createDiagramOptionsModule(identifier);
+            this.container = this.createContainer(diagramModule, ...this.getContainerConfiguration());
+            (_a = this.addVscodeBindings) === null || _a === void 0 ? void 0 : _a.call(this, this.container, identifier);
+            this.container.get(glsp_diagram_widget_1.GLSPDiagramWidget);
+        }
     }
-    configureExtensionActionHandler(container, diagramIdentifier) {
-        const extensionActionHandler = new extension_action_handler_1.GLSPVscodeExtensionActionHandler(this.extensionActionKinds, diagramIdentifier, this.vscodeApi);
-        container.bind(extension_action_handler_1.GLSPVscodeExtensionActionHandler).toConstantValue(extensionActionHandler);
-        container.bind(client_1.TYPES.IActionHandlerInitializer).toService(extension_action_handler_1.GLSPVscodeExtensionActionHandler);
+    createDiagramOptionsModule(identifier) {
+        const glspClient = new webview_glsp_client_1.WebviewGlspClient({ id: identifier.diagramType, messenger: this.messenger });
+        return (0, client_1.createDiagramOptionsModule)({
+            clientId: identifier.clientId,
+            diagramType: identifier.diagramType,
+            glspClientProvider: async () => glspClient,
+            sourceUri: decodeURIComponent(identifier.uri)
+        });
     }
     /**
-     *  All kinds of actions that should (also) be delegated to and handled by the vscode extension
+     * Retrieves additional {@link ContainerConfiguration} for the diagram container.
+     * Typically this composes a set of vscode specific customization modules.
+     * @returns the container configuration
      */
-    get extensionActionKinds() {
-        return [
-            client_1.NavigateToExternalTargetAction.KIND,
-            client_1.RequestClipboardDataAction.KIND,
-            client_1.SetClipboardDataAction.KIND,
-            client_1.SelectAction.KIND,
-            client_1.ExportSvgAction.KIND
-        ];
+    getContainerConfiguration() {
+        return [default_modules_1.VSCODE_DEFAULT_MODULE_CONFIG];
     }
 }
 exports.GLSPStarter = GLSPStarter;
+function decodeURI(uri) {
+    return decodeURIComponent(uri.replace(/\+/g, ' '));
+}
+exports.decodeURI = decodeURI;
 //# sourceMappingURL=glsp-starter.js.map

package/lib/glsp-starter.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-starter.js","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-starter.js","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;kFAekF;AAClF,uHAAuH;AACvH,iDAA0F;AAE1F,qEAA2E;AAC3E,uEAAgE;AAChE,uDAAiE;AACjE,6DAA6D;AAC7D,+DAA0D;AAC1D,+DAA0D;AAC7C,QAAA,wBAAwB,GAA2B,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AACvE,QAAA,sBAAsB,GAA4C,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAIxG,MAAsB,WAAW;IAI7B;QACI,IAAI,CAAC,SAAS,GAAG,IAAI,oCAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAwB,8BAAsB,EAAE,UAAU,CAAC,EAAE,CACtF,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAC3C,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAES,gBAAgB;QACtB,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,gCAAwB,EAAE,wCAAc,CAAC,CAAC;IAC9E,CAAC;IAES,uBAAuB,CAAC,UAAiC;;QAC/D,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAwB,0CAAqB,CAAC,CAAC;YACvF,aAAa,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;YACnD,aAAa,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;YACnC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,uCAAiB,CAAC,CAAC;YAC5D,aAAa,CAAC,WAAW,EAAE,CAAC;SAC/B;aAAM;YACH,MAAM,aAAa,GAAG,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;YAClE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;YAC1F,MAAA,IAAI,CAAC,iBAAiB,qDAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACrD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,uCAAiB,CAAC,CAAC;SACzC;IACL,CAAC;IAES,0BAA0B,CAAC,UAAiC;QAClE,MAAM,UAAU,GAAG,IAAI,uCAAiB,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QACpG,OAAO,IAAA,mCAA0B,EAAC;YAC9B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU;YAC1C,SAAS,EAAE,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC;SAChD,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACO,yBAAyB;QAC/B,OAAO,CAAC,8CAA4B,CAAC,CAAC;IAC1C,CAAC;CAWJ;AA5DD,kCA4DC;AAED,SAAgB,SAAS,CAAC,GAAW;IACjC,OAAO,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AACvD,CAAC;AAFD,8BAEC"}

package/lib/index.d.ts

@@ -13,11 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './copy-paste-handler-provider';
+export * from './default-modules';
 export * from './diagram-identifier';
-export * from './extension-action-handler';
+export * from './features/copyPaste/copy-paste-module';
+export * from './features/copyPaste/copy-paste-startup';
+export * from './features/default/default-module';
+export * from './features/default/vscode-glsp-modelsource';
+export * from './features/export/export-module';
+export * from './features/navigation/navigation-module';
 export * from './glsp-diagram-widget';
 export * from './glsp-starter';
-export * from './glsp-vscode-diagramserver';
-export * from './services';
+export * from './webview-glsp-client';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}

package/lib/index.js

@@ -1,19 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
  * Copyright (c) 2020-2023 EclipseSource and others.
  *
@@ -29,11 +14,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-__exportStar(require("./copy-paste-handler-provider"), exports);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./default-modules"), exports);
 __exportStar(require("./diagram-identifier"), exports);
-__exportStar(require("./extension-action-handler"), exports);
+__exportStar(require("./features/copyPaste/copy-paste-module"), exports);
+__exportStar(require("./features/copyPaste/copy-paste-startup"), exports);
+__exportStar(require("./features/default/default-module"), exports);
+__exportStar(require("./features/default/vscode-glsp-modelsource"), exports);
+__exportStar(require("./features/export/export-module"), exports);
+__exportStar(require("./features/navigation/navigation-module"), exports);
 __exportStar(require("./glsp-diagram-widget"), exports);
 __exportStar(require("./glsp-starter"), exports);
-__exportStar(require("./glsp-vscode-diagramserver"), exports);
-__exportStar(require("./services"), exports);
+__exportStar(require("./webview-glsp-client"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gEAA8C;AAC9C,uDAAqC;AACrC,6DAA2C;AAC3C,wDAAsC;AACtC,iDAA+B;AAC/B,8DAA4C;AAC5C,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,oDAAkC;AAClC,uDAAqC;AACrC,yEAAuD;AACvD,0EAAwD;AACxD,oEAAkD;AAClD,6EAA2D;AAC3D,kEAAgD;AAChD,0EAAwD;AACxD,wDAAsC;AACtC,iDAA+B;AAC/B,wDAAsC"}

package/lib/webview-glsp-client.d.ts

@@ -0,0 +1,56 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { Action, ActionMessage, ActionMessageHandler, ClientState, Disposable, DisposableCollection, DisposeClientSessionParameters, Emitter, Event, GLSPClient, InitializeClientSessionParameters, InitializeParameters, InitializeResult } from '@eclipse-glsp/client';
+import { NotificationType, RequestType } from 'vscode-messenger-common';
+import { Messenger } from 'vscode-messenger-webview';
+export interface WebviewGlspClientOptions extends GLSPClient.Options {
+    messenger?: Messenger;
+}
+export declare const ActionMessageNotification: NotificationType<ActionMessage>;
+export declare const StartRequest: RequestType<undefined, void>;
+export declare const InitializeServerRequest: RequestType<InitializeParameters, InitializeResult>;
+export declare const InitializeClientSessionRequest: RequestType<InitializeClientSessionParameters, void>;
+export declare const DisposeClientSessionRequest: RequestType<DisposeClientSessionParameters, void>;
+export declare const ShutdownServerNotification: NotificationType<void>;
+export declare const StopRequest: RequestType<undefined, void>;
+/**
+ * GLSP client implementation for the diagram webview. This is proxy implementation
+ * that  communicates with the actual GLSP client running in the host extension.
+ * via the vscode-messenger protocol
+ */
+export declare class WebviewGlspClient implements GLSPClient, Disposable {
+    readonly id: string;
+    protected messenger: Messenger;
+    protected toDispose: DisposableCollection;
+    protected onActionMessageEmitter: Emitter<ActionMessage<Action>>;
+    protected _currentState: ClientState;
+    get currentState(): ClientState;
+    protected _initializeResult?: InitializeResult;
+    get initializeResult(): InitializeResult | undefined;
+    protected onServerInitializedEmitter: Emitter<InitializeResult>;
+    get onServerInitialized(): Event<InitializeResult>;
+    constructor(options: WebviewGlspClientOptions);
+    start(): Promise<void>;
+    initializeServer(params: InitializeParameters): Promise<InitializeResult>;
+    initializeClientSession(params: InitializeClientSessionParameters): Promise<void>;
+    disposeClientSession(params: DisposeClientSessionParameters): Promise<void>;
+    shutdownServer(): void;
+    stop(): Promise<void>;
+    sendActionMessage(message: ActionMessage<Action>): void;
+    onActionMessage(handler: ActionMessageHandler): Disposable;
+    dispose(): void;
+}
+//# sourceMappingURL=webview-glsp-client.d.ts.map

package/lib/webview-glsp-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webview-glsp-client.d.ts","sourceRoot":"","sources":["../src/webview-glsp-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,aAAa,EACb,oBAAoB,EACpB,WAAW,EACX,UAAU,EACV,oBAAoB,EACpB,8BAA8B,EAC9B,OAAO,EACP,KAAK,EACL,UAAU,EACV,iCAAiC,EACjC,oBAAoB,EACpB,gBAAgB,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAkB,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,MAAM,WAAW,wBAAyB,SAAQ,UAAU,CAAC,OAAO;IAChE,SAAS,CAAC,EAAE,SAAS,CAAC;CACzB;AAED,eAAO,MAAM,yBAAyB,EAAE,gBAAgB,CAAC,aAAa,CAA+B,CAAC;AACtG,eAAO,MAAM,YAAY,EAAE,WAAW,CAAC,SAAS,EAAE,IAAI,CAAuB,CAAC;AAC9E,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,oBAAoB,EAAE,gBAAgB,CAAkC,CAAC;AAC3H,eAAO,MAAM,8BAA8B,EAAE,WAAW,CAAC,iCAAiC,EAAE,IAAI,CAAyC,CAAC;AAC1I,eAAO,MAAM,2BAA2B,EAAE,WAAW,CAAC,8BAA8B,EAAE,IAAI,CAAsC,CAAC;AACjI,eAAO,MAAM,0BAA0B,EAAE,gBAAgB,CAAC,IAAI,CAAgC,CAAC;AAC/F,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,SAAS,EAAE,IAAI,CAAsB,CAAC;AAC5E;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,UAAU,EAAE,UAAU;IAC5D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,SAAS,uBAA8B;IACjD,SAAS,CAAC,sBAAsB,iCAAgC;IAEhE,SAAS,CAAC,aAAa,EAAE,WAAW,CAAwB;IAC5D,IAAI,YAAY,IAAI,WAAW,CAE9B;IAED,SAAS,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IAC/C,IAAI,gBAAgB,IAAI,gBAAgB,GAAG,SAAS,CAEnD;IAED,SAAS,CAAC,0BAA0B,4BAAmC;IACvE,IAAI,mBAAmB,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAEjD;gBAEW,OAAO,EAAE,wBAAwB;IAOvC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtB,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAU/E,uBAAuB,CAAC,MAAM,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjF,oBAAoB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3E,cAAc,IAAI,IAAI;IAIhB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI;IAIvD,eAAe,CAAC,OAAO,EAAE,oBAAoB,GAAG,UAAU;IAI1D,OAAO,IAAI,IAAI;CAGlB"}