@hydranium/glsp-client-theia 1.0.0-next.289 → 1.0.0-next.298
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -5
- package/lib/browser/client-contribution.d.ts.map +1 -1
- package/lib/browser/client-contribution.js +1 -1
- package/lib/browser/client-contribution.js.map +1 -1
- package/lib/browser/diagram-widget.d.ts +1 -1
- package/lib/browser/diagram-widget.d.ts.map +1 -1
- package/lib/browser/diagram-widget.js +2 -2
- package/lib/browser/diagram-widget.js.map +1 -1
- package/lib/browser/glsp-client-theia-module.d.ts +12 -5
- package/lib/browser/glsp-client-theia-module.d.ts.map +1 -1
- package/lib/browser/glsp-client-theia-module.js +27 -14
- package/lib/browser/glsp-client-theia-module.js.map +1 -1
- package/lib/browser/glsp-diagram-manager.js +2 -2
- package/lib/browser/glsp-diagram-manager.js.map +1 -1
- package/lib/browser/index.d.ts +1 -5
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +5 -7
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/theia-diagram-loader.d.ts +25 -0
- package/lib/browser/theia-diagram-loader.d.ts.map +1 -0
- package/lib/browser/theia-diagram-loader.js +42 -0
- package/lib/browser/theia-diagram-loader.js.map +1 -0
- package/package.json +10 -12
- package/src/browser/client-contribution.ts +1 -1
- package/src/browser/diagram-widget.ts +1 -1
- package/src/browser/glsp-client-theia-module.ts +34 -15
- package/src/browser/glsp-diagram-manager.ts +1 -1
- package/src/browser/index.ts +5 -7
- package/src/browser/theia-diagram-loader.ts +31 -0
- package/lib/browser/action-dispatcher.d.ts +0 -90
- package/lib/browser/action-dispatcher.d.ts.map +0 -1
- package/lib/browser/action-dispatcher.js +0 -257
- package/lib/browser/action-dispatcher.js.map +0 -1
- package/lib/browser/diagram-loader.d.ts +0 -132
- package/lib/browser/diagram-loader.d.ts.map +0 -1
- package/lib/browser/diagram-loader.js +0 -161
- package/lib/browser/diagram-loader.js.map +0 -1
- package/lib/browser/glsp-client.d.ts +0 -17
- package/lib/browser/glsp-client.d.ts.map +0 -1
- package/lib/browser/glsp-client.js +0 -23
- package/lib/browser/glsp-client.js.map +0 -1
- package/lib/browser/hidden-bounds-updater.d.ts +0 -120
- package/lib/browser/hidden-bounds-updater.d.ts.map +0 -1
- package/lib/browser/hidden-bounds-updater.js +0 -211
- package/lib/browser/hidden-bounds-updater.js.map +0 -1
- package/lib/browser/status-overlay.d.ts +0 -23
- package/lib/browser/status-overlay.d.ts.map +0 -1
- package/lib/browser/status-overlay.js +0 -52
- package/lib/browser/status-overlay.js.map +0 -1
- package/lib/testing/bind-recorder.d.ts +0 -67
- package/lib/testing/bind-recorder.d.ts.map +0 -1
- package/lib/testing/bind-recorder.js +0 -72
- package/lib/testing/bind-recorder.js.map +0 -1
- package/lib/testing/index.d.ts +0 -10
- package/lib/testing/index.d.ts.map +0 -1
- package/lib/testing/index.js +0 -30
- package/lib/testing/index.js.map +0 -1
- package/src/browser/action-dispatcher.ts +0 -273
- package/src/browser/diagram-loader.ts +0 -180
- package/src/browser/glsp-client.ts +0 -20
- package/src/browser/hidden-bounds-updater.ts +0 -211
- package/src/browser/status-overlay.ts +0 -43
- package/src/testing/bind-recorder.ts +0 -126
- package/src/testing/index.ts +0 -15
package/README.md
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
The Theia integration for the
|
|
4
4
|
[Hydranium](https://github.com/eclipse-emfcloud/hydranium) GLSP head, the
|
|
5
5
|
companion of `@hydranium/glsp-server`. Install it to mount a Hydranium diagram
|
|
6
|
-
in a Theia application. It builds on `@eclipse-glsp/theia-integration
|
|
7
|
-
`@hydranium/client-theia`.
|
|
6
|
+
in a Theia application. It builds on `@eclipse-glsp/theia-integration`,
|
|
7
|
+
`@hydranium/glsp-client` and `@hydranium/client-theia`.
|
|
8
8
|
|
|
9
9
|
## What it gives you
|
|
10
10
|
|
|
@@ -30,6 +30,7 @@ npm install @hydranium/glsp-client-theia
|
|
|
30
30
|
| `@eclipse-glsp/client` | `^2.6.0` |
|
|
31
31
|
| `@eclipse-glsp/theia-integration` | `^2.6.0` |
|
|
32
32
|
| `@hydranium/client-theia` | `^1.0.0-next` |
|
|
33
|
+
| `@hydranium/glsp-client` | `^1.0.0-next` |
|
|
33
34
|
| `@hydranium/protocol` | `^1.0.0-next` |
|
|
34
35
|
| `@theia/core` | `^1.70.0` |
|
|
35
36
|
| `@theia/process` | `^1.70.0` |
|
|
@@ -52,8 +53,11 @@ them, one frontend and backend pair per diagram.
|
|
|
52
53
|
`AbstractHydraniumGlspDiagramConfiguration` and calls
|
|
53
54
|
`createGlspClientTheiaModule` from its `configureContainer`, not from the
|
|
54
55
|
frontend module: called earlier, GLSP's own bindings silently replace its
|
|
55
|
-
rebinds.
|
|
56
|
-
|
|
56
|
+
rebinds. It binds `@hydranium/glsp-client`'s classes over the Output
|
|
57
|
+
channel; your host-neutral diagram module still calls
|
|
58
|
+
`configureHydraniumModelElements` from that package and names
|
|
59
|
+
`HydraniumGEdge` for its edge types. Set `propagateMarkersToProblemsView`
|
|
60
|
+
to `false` when the LSP head already reports the same problems.
|
|
57
61
|
- One frontend module calls `bindEditorDiskSync` from
|
|
58
62
|
`@hydranium/client-theia`, since a diagram save writes a file an editor can
|
|
59
63
|
have open.
|
|
@@ -73,7 +77,6 @@ For the whole setup, see *Host in Theia* in
|
|
|
73
77
|
| `.` | The same as `./browser` | Theia frontend |
|
|
74
78
|
| `./browser` | The frontend module, configuration and manager bases | Theia frontend |
|
|
75
79
|
| `./node` | The connection handler and its backend module | Theia backend |
|
|
76
|
-
| `./testing` | A binding recorder for testing your modules | browser-neutral |
|
|
77
80
|
| `./style/diagram-loading.css` | The loading overlay's stylesheet, imported for you | browser |
|
|
78
81
|
|
|
79
82
|
The subpaths need a TypeScript `moduleResolution` that reads `exports`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAe,KAAK,UAAU,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"client-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ const theia_integration_1 = require("@eclipse-glsp/theia-integration");
|
|
|
26
26
|
const common_1 = require("@eclipse-glsp/theia-integration/lib/common");
|
|
27
27
|
const browser_1 = require("@hydranium/client-theia/browser");
|
|
28
28
|
const common_2 = require("@hydranium/client-theia/common");
|
|
29
|
+
const glsp_client_1 = require("@hydranium/glsp-client");
|
|
29
30
|
const protocol_1 = require("@hydranium/protocol");
|
|
30
31
|
const core_1 = require("@theia/core");
|
|
31
32
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
@@ -34,7 +35,6 @@ const browser_2 = require("@theia/workspace/lib/browser");
|
|
|
34
35
|
// GLSP's channel connection uses the top-level `vscode-jsonrpc`'s root entry, which
|
|
35
36
|
// installs no runtime layer; without the browser entry, no message is received.
|
|
36
37
|
require("vscode-jsonrpc/browser");
|
|
37
|
-
const glsp_client_1 = require("./glsp-client");
|
|
38
38
|
exports.DEFAULT_GLSP_CLIENT_STARTUP_TIMEOUT_MS = 30_000;
|
|
39
39
|
/**
|
|
40
40
|
* Theia GLSP client contribution for adopters whose GLSP server runs in a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-contribution.js","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;AAElF,iDAA2F;AAC3F,uEAA6E;AAC7E,uEAAuG;AACvG,6DAA2G;AAC3G,2DAAuD;AACvD,kDAAmG;AACnG,sCAA4E;AAC5E,sEAA+D;AAC/D,4DAAuF;AACvF,0DAAgE;AAChE,oFAAoF;AACpF,gFAAgF;AAChF,kCAAgC;
|
|
1
|
+
{"version":3,"file":"client-contribution.js","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
********************************************************************************/
|
|
9
9
|
import { type Args } from '@eclipse-glsp/client';
|
|
10
10
|
import { GLSPDiagramWidget, type GLSPDiagramWidgetOptions } from '@eclipse-glsp/theia-integration';
|
|
11
|
+
import { type DiagramLoadOutcome, HydraniumDiagramLoader } from '@hydranium/glsp-client';
|
|
11
12
|
import { type Message } from '@theia/core/lib/browser';
|
|
12
13
|
import { Emitter, type Event } from '@theia/core';
|
|
13
14
|
import { type Container } from '@theia/core/shared/inversify';
|
|
14
|
-
import { type DiagramLoadOutcome, HydraniumDiagramLoader } from './diagram-loader';
|
|
15
15
|
import { WindowSessionService } from './window-session';
|
|
16
16
|
import '../../style/diagram-loading.css';
|
|
17
17
|
/** Class on the overlay root. Adopters style / override via this contract. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-widget.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-widget.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,IAAI,EAAgF,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"diagram-widget.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-widget.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,IAAI,EAAgF,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AACnG,OAAO,EAAE,KAAK,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGzF,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,EAAO,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,KAAK,SAAS,EAAsB,MAAM,8BAA8B,CAAC;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,OAAO,iCAAiC,CAAC;AAEzC,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE;kFACkF;AAClF,eAAO,MAAM,4BAA4B,qCAAoC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBACa,0BAA2B,SAAQ,iBAAiB;IAChC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IACvF,SAAS,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,gBAAuB;IAE9D;;;yBAGqB;IACrB,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAmC;IAE3E;;;;OAIG;IACM,SAAS,CAAC,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,CAMlF;IAED,kFAAkF;IAClF,SAAS,CAAC,cAAc,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAExD;IAED,kGAAkG;IAClG,UAAmB,sBAAsB,IAAI,IAAI,CAEhD;IAED,UAAmB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAKnD;IAEQ,OAAO,IAAI,IAAI,CAGvB;IAED;;;;OAIG;IACH,UAAyB,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzH;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAiBnC;IAED,iEAAiE;IACjE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAMzD;IAED;;;;;;;;;OASG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAY9C;IAED,mDAAmD;IACnD,SAAS,CAAC,SAAS,IAAI,IAAI,CAI1B;IAED,+EAA+E;IAC/E,SAAS,CAAC,iBAAiB,IAAI,WAAW,CAMzC;IAED,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAGnC;IAED;;oFAEgF;IAChF,SAAS,CAAC,oBAAoB,IAAI,WAAW,CAW5C;IAED;sEACkE;IAClE,SAAS,KAAK,YAAY,IAAI,MAAM,CAEnC;IAED;;;;;OAKG;IACH,SAAS,KAAK,sBAAsB,IAAI,sBAAsB,GAAG,SAAS,CAGzE;CACH"}
|
|
@@ -21,9 +21,9 @@ exports.HydraniumGlspDiagramWidget = exports.DIAGRAM_LOADING_FAILED_CLASS = expo
|
|
|
21
21
|
const client_1 = require("@eclipse-glsp/client");
|
|
22
22
|
const protocol_1 = require("@hydranium/protocol");
|
|
23
23
|
const theia_integration_1 = require("@eclipse-glsp/theia-integration");
|
|
24
|
+
const glsp_client_1 = require("@hydranium/glsp-client");
|
|
24
25
|
const core_1 = require("@theia/core");
|
|
25
26
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
-
const diagram_loader_1 = require("./diagram-loader");
|
|
27
27
|
const glsp_saveable_1 = require("./glsp-saveable");
|
|
28
28
|
const window_session_1 = require("./window-session");
|
|
29
29
|
// Shipped by this package rather than left to adopters: an overlay whose
|
|
@@ -208,7 +208,7 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
|
|
|
208
208
|
*/
|
|
209
209
|
get hydraniumDiagramLoader() {
|
|
210
210
|
const loader = this.diContainer.get(client_1.DiagramLoader);
|
|
211
|
-
return loader instanceof
|
|
211
|
+
return loader instanceof glsp_client_1.HydraniumDiagramLoader ? loader : undefined;
|
|
212
212
|
}
|
|
213
213
|
};
|
|
214
214
|
exports.HydraniumGlspDiagramWidget = HydraniumGlspDiagramWidget;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-widget.js","sourceRoot":"","sources":["../../src/browser/diagram-widget.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,iDAA+H;AAC/H,kDAAuD;AACvD,uEAAmG;
|
|
1
|
+
{"version":3,"file":"diagram-widget.js","sourceRoot":"","sources":["../../src/browser/diagram-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
import { type ChannelLoggerOptions } from '@hydranium/client-theia/browser';
|
|
10
9
|
import { type BindingContext } from '@eclipse-glsp/client';
|
|
10
|
+
import { type ChannelLoggerOptions } from '@hydranium/client-theia/browser';
|
|
11
11
|
/** Options for `createGlspClientTheiaModule`. The adopter supplies the channel
|
|
12
12
|
* logger configuration ({@link ChannelLoggerOptions} — a `channelName`, and
|
|
13
13
|
* optionally a `component` label); the framework owns the dispatcher type and
|
|
@@ -18,10 +18,17 @@ export interface GlspClientTheiaModuleOptions {
|
|
|
18
18
|
readonly channelLogger: ChannelLoggerOptions;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
21
|
-
* Composes the standard framework client bindings: the
|
|
22
|
-
*
|
|
23
|
-
*
|
|
24
|
-
*
|
|
21
|
+
* Composes the standard framework client bindings for a Theia frontend: the
|
|
22
|
+
* cross-head Output-channel logger, the host-neutral classes
|
|
23
|
+
* `createGlspClientModule` binds, fed from that channel, the loader that renders
|
|
24
|
+
* its failure through Theia's catalogue, and the message service that drops
|
|
25
|
+
* the duplicate model-loading notification.
|
|
26
|
+
*
|
|
27
|
+
* The neutral tokens are bound BEFORE the neutral binder runs, so it binds no
|
|
28
|
+
* console defaults. The logger binding tags each line with the requesting
|
|
29
|
+
* class, as `bindChannelLogger`'s own does; a plain `toService` alias would
|
|
30
|
+
* start a fresh request and lose the tag. The clock is resolved lazily, so a
|
|
31
|
+
* clock an adopter module binds after this one is still the one used.
|
|
25
32
|
*
|
|
26
33
|
* Takes the whole {@link BindingContext} rather than `(bind, rebind)`: the
|
|
27
34
|
* message-service rebind has to know whether GLSP's `theiaNotificationModule`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-client-theia-module.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,
|
|
1
|
+
{"version":3,"file":"glsp-client-theia-module.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAGJ,KAAK,oBAAoB,EAG3B,MAAM,iCAAiC,CAAC;AAOzC;;;;;qEAKqE;AACrE,MAAM,WAAW,4BAA4B;IAC1C,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;CAC/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAehH"}
|
|
@@ -9,18 +9,25 @@
|
|
|
9
9
|
********************************************************************************/
|
|
10
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
11
|
exports.createGlspClientTheiaModule = createGlspClientTheiaModule;
|
|
12
|
-
const browser_1 = require("@hydranium/client-theia/browser");
|
|
13
12
|
const client_1 = require("@eclipse-glsp/client");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
13
|
+
const browser_1 = require("@hydranium/client-theia/browser");
|
|
14
|
+
const common_1 = require("@hydranium/client-theia/common");
|
|
15
|
+
const glsp_client_1 = require("@hydranium/glsp-client");
|
|
16
|
+
const protocol_1 = require("@hydranium/protocol");
|
|
17
17
|
const glsp_message_service_1 = require("./glsp-message-service");
|
|
18
|
-
const
|
|
18
|
+
const theia_diagram_loader_1 = require("./theia-diagram-loader");
|
|
19
19
|
/**
|
|
20
|
-
* Composes the standard framework client bindings: the
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
*
|
|
20
|
+
* Composes the standard framework client bindings for a Theia frontend: the
|
|
21
|
+
* cross-head Output-channel logger, the host-neutral classes
|
|
22
|
+
* `createGlspClientModule` binds, fed from that channel, the loader that renders
|
|
23
|
+
* its failure through Theia's catalogue, and the message service that drops
|
|
24
|
+
* the duplicate model-loading notification.
|
|
25
|
+
*
|
|
26
|
+
* The neutral tokens are bound BEFORE the neutral binder runs, so it binds no
|
|
27
|
+
* console defaults. The logger binding tags each line with the requesting
|
|
28
|
+
* class, as `bindChannelLogger`'s own does; a plain `toService` alias would
|
|
29
|
+
* start a fresh request and lose the tag. The clock is resolved lazily, so a
|
|
30
|
+
* clock an adopter module binds after this one is still the one used.
|
|
24
31
|
*
|
|
25
32
|
* Takes the whole {@link BindingContext} rather than `(bind, rebind)`: the
|
|
26
33
|
* message-service rebind has to know whether GLSP's `theiaNotificationModule`
|
|
@@ -38,11 +45,17 @@ const hidden_bounds_updater_1 = require("./hidden-bounds-updater");
|
|
|
38
45
|
function createGlspClientTheiaModule(context, options) {
|
|
39
46
|
const { bind, isBound, rebind } = context;
|
|
40
47
|
(0, browser_1.bindChannelLogger)(bind, options.channelLogger);
|
|
41
|
-
bind(
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
bind(glsp_client_1.HydraniumClientTypes.Logger).toDynamicValue(ctx => {
|
|
49
|
+
const base = ctx.container.get(browser_1.ChannelLogger);
|
|
50
|
+
const parentName = (0, browser_1.getRequestParentName)(ctx);
|
|
51
|
+
return parentName ? base.for(parentName) : base;
|
|
52
|
+
});
|
|
53
|
+
bind(glsp_client_1.HydraniumClientTypes.Tracer).toService(browser_1.ChannelTracer);
|
|
54
|
+
bind(glsp_client_1.HydraniumClientTypes.Clock)
|
|
55
|
+
.toDynamicValue(ctx => (ctx.container.isBound(common_1.Clock) ? ctx.container.get(common_1.Clock) : new protocol_1.SystemClock()))
|
|
56
|
+
.inSingletonScope();
|
|
57
|
+
(0, glsp_client_1.createGlspClientModule)(context);
|
|
58
|
+
rebind(client_1.DiagramLoader).to(theia_diagram_loader_1.HydraniumGlspTheiaDiagramLoader).inSingletonScope();
|
|
46
59
|
(0, glsp_message_service_1.bindHydraniumGlspMessageService)(bind, isBound, rebind);
|
|
47
60
|
}
|
|
48
61
|
//# sourceMappingURL=glsp-client-theia-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-client-theia-module.js","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,
|
|
1
|
+
{"version":3,"file":"glsp-client-theia-module.js","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,iDAA0E;AAC1E,6DAMyC;AACzC,2DAAuD;AACvD,wDAAsF;AACtF,kDAAkD;AAClD,iEAAyE;AACzE,iEAAyE;AAYzE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qCAA4C,OAAuB,EAAE,OAAqC;IACvG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAA,2BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,CAAC,kCAAoB,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACpD,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAA,8BAAoB,EAAC,GAAG,CAAC,CAAC;QAC7C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,kCAAoB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uBAAa,CAAC,CAAC;IAC3D,IAAI,CAAC,kCAAoB,CAAC,KAAK,CAAC;SAC5B,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAQ,cAAK,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAW,EAAE,CAAC,CAAC;SAC3G,gBAAgB,EAAE,CAAC;IACvB,IAAA,oCAAsB,EAAC,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,sDAA+B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAA,sDAA+B,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -23,8 +23,8 @@ const theia_integration_1 = require("@eclipse-glsp/theia-integration");
|
|
|
23
23
|
const core_1 = require("@theia/core");
|
|
24
24
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
25
25
|
const protocol_1 = require("@hydranium/protocol");
|
|
26
|
+
const glsp_client_1 = require("@hydranium/glsp-client");
|
|
26
27
|
const client_contribution_1 = require("./client-contribution");
|
|
27
|
-
const diagram_loader_1 = require("./diagram-loader");
|
|
28
28
|
const diagram_widget_1 = require("./diagram-widget");
|
|
29
29
|
const window_session_1 = require("./window-session");
|
|
30
30
|
/**
|
|
@@ -116,7 +116,7 @@ let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramMana
|
|
|
116
116
|
}
|
|
117
117
|
loadFailed(widget) {
|
|
118
118
|
const loader = widget.diContainer.get(client_1.DiagramLoader);
|
|
119
|
-
return loader instanceof
|
|
119
|
+
return loader instanceof glsp_client_1.HydraniumDiagramLoader && loader.loadOutcome?.status === 'failed';
|
|
120
120
|
}
|
|
121
121
|
/**
|
|
122
122
|
* Replace `widget` with a fresh one for the same diagram, in the same tab
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-diagram-manager.js","sourceRoot":"","sources":["../../src/browser/glsp-diagram-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,iDAA6F;AAC7F,uEAAqE;AAQrE,sCAAoE;AACpE,4DAAkE;AAClE,kDAA+C;AAC/C,+DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"glsp-diagram-manager.js","sourceRoot":"","sources":["../../src/browser/glsp-diagram-manager.ts"],"names":[],"mappings":"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"}
|
package/lib/browser/index.d.ts
CHANGED
|
@@ -6,20 +6,16 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
export * from './action-dispatcher';
|
|
10
9
|
export * from './client-contribution';
|
|
11
|
-
export * from './diagram-loader';
|
|
12
10
|
export * from './diagram-only-marker-manager';
|
|
13
11
|
export * from './diagram-widget';
|
|
14
|
-
export * from './glsp-client';
|
|
15
12
|
export * from './glsp-client-theia-module';
|
|
16
13
|
export * from './glsp-diagram-manager';
|
|
17
14
|
export * from './glsp-message-service';
|
|
18
15
|
export * from './glsp-saveable';
|
|
19
16
|
export * from './glsp-theia-frontend-module';
|
|
20
|
-
export * from './hidden-bounds-updater';
|
|
21
17
|
export * from './hydranium-glsp-diagram-configuration';
|
|
22
|
-
export * from './
|
|
18
|
+
export * from './theia-diagram-loader';
|
|
23
19
|
export * from './window-session';
|
|
24
20
|
export type { GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common';
|
|
25
21
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAMlF,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AAKjC,YAAY,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC"}
|
package/lib/browser/index.js
CHANGED
|
@@ -22,21 +22,19 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
22
22
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
// Browser-side framework primitives for GLSP-on-Theia adopters.
|
|
26
|
-
//
|
|
27
|
-
|
|
25
|
+
// Browser-side framework primitives for GLSP-on-Theia adopters. The
|
|
26
|
+
// host-neutral classes (the dispatcher, loader, updater, overlay and client)
|
|
27
|
+
// are `@hydranium/glsp-client`'s; the cross-head Output-channel logger lives
|
|
28
|
+
// in `@hydranium/client-theia/browser`.
|
|
28
29
|
__exportStar(require("./client-contribution"), exports);
|
|
29
|
-
__exportStar(require("./diagram-loader"), exports);
|
|
30
30
|
__exportStar(require("./diagram-only-marker-manager"), exports);
|
|
31
31
|
__exportStar(require("./diagram-widget"), exports);
|
|
32
|
-
__exportStar(require("./glsp-client"), exports);
|
|
33
32
|
__exportStar(require("./glsp-client-theia-module"), exports);
|
|
34
33
|
__exportStar(require("./glsp-diagram-manager"), exports);
|
|
35
34
|
__exportStar(require("./glsp-message-service"), exports);
|
|
36
35
|
__exportStar(require("./glsp-saveable"), exports);
|
|
37
36
|
__exportStar(require("./glsp-theia-frontend-module"), exports);
|
|
38
|
-
__exportStar(require("./hidden-bounds-updater"), exports);
|
|
39
37
|
__exportStar(require("./hydranium-glsp-diagram-configuration"), exports);
|
|
40
|
-
__exportStar(require("./
|
|
38
|
+
__exportStar(require("./theia-diagram-loader"), exports);
|
|
41
39
|
__exportStar(require("./window-session"), exports);
|
|
42
40
|
//# sourceMappingURL=index.js.map
|
package/lib/browser/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,oEAAoE;AACpE,6EAA6E;AAC7E,6EAA6E;AAC7E,wCAAwC;AACxC,wDAAsC;AACtC,gEAA8C;AAC9C,mDAAiC;AACjC,6DAA2C;AAC3C,yDAAuC;AACvC,yDAAuC;AACvC,kDAAgC;AAChC,+DAA6C;AAC7C,yEAAuD;AACvD,yDAAuC;AACvC,mDAAiC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2026 CrossBreeze, EclipseSource and others.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made available under the
|
|
5
|
+
* terms of the MIT License which is available in the project root.
|
|
6
|
+
*
|
|
7
|
+
* SPDX-License-Identifier: MIT
|
|
8
|
+
********************************************************************************/
|
|
9
|
+
import { HydraniumDiagramLoader } from '@hydranium/glsp-client';
|
|
10
|
+
/**
|
|
11
|
+
* The framework loader rendering its failure through Theia's catalogue, which
|
|
12
|
+
* knows the reading user's locale where the neutral loader does not.
|
|
13
|
+
*
|
|
14
|
+
* The key and the English are inline literals, because `theia nls-extract`
|
|
15
|
+
* drops a key it cannot resolve. The English must match
|
|
16
|
+
* `DIAGRAM_LOAD_FAILED`'s text in `@hydranium/glsp-client`; a test holds them
|
|
17
|
+
* equal.
|
|
18
|
+
*
|
|
19
|
+
* Bound by `createGlspClientTheiaModule` via `rebind(DiagramLoader)`, after
|
|
20
|
+
* `createGlspClientModule` bound the neutral loader.
|
|
21
|
+
*/
|
|
22
|
+
export declare class HydraniumGlspTheiaDiagramLoader extends HydraniumDiagramLoader {
|
|
23
|
+
loadFailureLabel(err: unknown): string;
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=theia-diagram-loader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"theia-diagram-loader.d.ts","sourceRoot":"","sources":["../../src/browser/theia-diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAIhE;;;;;;;;;;;GAWG;AACH,qBACa,+BAAgC,SAAQ,sBAAsB;IAC/D,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE9C;CACH"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/********************************************************************************
|
|
3
|
+
* Copyright (c) 2026 CrossBreeze, EclipseSource and others.
|
|
4
|
+
*
|
|
5
|
+
* This program and the accompanying materials are made available under the
|
|
6
|
+
* terms of the MIT License which is available in the project root.
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: MIT
|
|
9
|
+
********************************************************************************/
|
|
10
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
11
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
12
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
13
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
14
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
exports.HydraniumGlspTheiaDiagramLoader = void 0;
|
|
18
|
+
const glsp_client_1 = require("@hydranium/glsp-client");
|
|
19
|
+
const core_1 = require("@theia/core");
|
|
20
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
+
/**
|
|
22
|
+
* The framework loader rendering its failure through Theia's catalogue, which
|
|
23
|
+
* knows the reading user's locale where the neutral loader does not.
|
|
24
|
+
*
|
|
25
|
+
* The key and the English are inline literals, because `theia nls-extract`
|
|
26
|
+
* drops a key it cannot resolve. The English must match
|
|
27
|
+
* `DIAGRAM_LOAD_FAILED`'s text in `@hydranium/glsp-client`; a test holds them
|
|
28
|
+
* equal.
|
|
29
|
+
*
|
|
30
|
+
* Bound by `createGlspClientTheiaModule` via `rebind(DiagramLoader)`, after
|
|
31
|
+
* `createGlspClientModule` bound the neutral loader.
|
|
32
|
+
*/
|
|
33
|
+
let HydraniumGlspTheiaDiagramLoader = class HydraniumGlspTheiaDiagramLoader extends glsp_client_1.HydraniumDiagramLoader {
|
|
34
|
+
loadFailureLabel(err) {
|
|
35
|
+
return core_1.nls.localize('hydranium/glsp-client-theia/diagram-load-failed', 'Diagram failed to load: {0}', this.formatError(err));
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
exports.HydraniumGlspTheiaDiagramLoader = HydraniumGlspTheiaDiagramLoader;
|
|
39
|
+
exports.HydraniumGlspTheiaDiagramLoader = HydraniumGlspTheiaDiagramLoader = __decorate([
|
|
40
|
+
(0, inversify_1.injectable)()
|
|
41
|
+
], HydraniumGlspTheiaDiagramLoader);
|
|
42
|
+
//# sourceMappingURL=theia-diagram-loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"theia-diagram-loader.js","sourceRoot":"","sources":["../../src/browser/theia-diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAElF,wDAAgE;AAChE,sCAAkC;AAClC,4DAA0D;AAE1D;;;;;;;;;;;GAWG;AAEI,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,oCAAsB;IAC/D,gBAAgB,CAAC,GAAY;QACnC,OAAO,UAAG,CAAC,QAAQ,CAAC,iDAAiD,EAAE,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAChI,CAAC;CACH,CAAA;;0CAJY,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAI3C"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hydranium/glsp-client-theia",
|
|
3
|
-
"version": "1.0.0-next.
|
|
4
|
-
"description": "Theia-coupled client primitives for GLSP heads built on @hydranium/glsp-server. Provides the
|
|
3
|
+
"version": "1.0.0-next.298",
|
|
4
|
+
"description": "Theia-coupled client primitives for GLSP heads built on @hydranium/glsp-server. Provides the diagram widget, manager, client contribution and connection-handler bases that Theia-based adopters extend, and binds @hydranium/glsp-client's host-neutral classes through the Output channel; companion of @hydranium/glsp-server.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"diagram",
|
|
7
7
|
"glsp",
|
|
@@ -48,10 +48,6 @@
|
|
|
48
48
|
"types": "./lib/node/index.d.ts",
|
|
49
49
|
"default": "./lib/node/index.js"
|
|
50
50
|
},
|
|
51
|
-
"./testing": {
|
|
52
|
-
"types": "./lib/testing/index.d.ts",
|
|
53
|
-
"default": "./lib/testing/index.js"
|
|
54
|
-
},
|
|
55
51
|
"./style/diagram-loading.css": "./style/diagram-loading.css"
|
|
56
52
|
},
|
|
57
53
|
"publishConfig": {
|
|
@@ -70,10 +66,11 @@
|
|
|
70
66
|
"@eclipse-glsp/client": "2.7.0",
|
|
71
67
|
"@eclipse-glsp/server": "2.7.0",
|
|
72
68
|
"@eclipse-glsp/theia-integration": "2.7.0",
|
|
73
|
-
"@hydranium/client-theia": "1.0.0-next.
|
|
74
|
-
"@hydranium/core": "1.0.0-next.
|
|
75
|
-
"@hydranium/glsp-
|
|
76
|
-
"@hydranium/
|
|
69
|
+
"@hydranium/client-theia": "1.0.0-next.298",
|
|
70
|
+
"@hydranium/core": "1.0.0-next.298",
|
|
71
|
+
"@hydranium/glsp-client": "1.0.0-next.298",
|
|
72
|
+
"@hydranium/glsp-server": "1.0.0-next.298",
|
|
73
|
+
"@hydranium/protocol": "1.0.0-next.298",
|
|
77
74
|
"@theia/core": "^1.70.0",
|
|
78
75
|
"@theia/process": "^1.70.0",
|
|
79
76
|
"@theia/workspace": "^1.70.0",
|
|
@@ -88,8 +85,9 @@
|
|
|
88
85
|
"peerDependencies": {
|
|
89
86
|
"@eclipse-glsp/client": "^2.6.0",
|
|
90
87
|
"@eclipse-glsp/theia-integration": "^2.6.0",
|
|
91
|
-
"@hydranium/client-theia": "1.0.0-next.
|
|
92
|
-
"@hydranium/
|
|
88
|
+
"@hydranium/client-theia": "1.0.0-next.298",
|
|
89
|
+
"@hydranium/glsp-client": "1.0.0-next.298",
|
|
90
|
+
"@hydranium/protocol": "1.0.0-next.298",
|
|
93
91
|
"@theia/core": "^1.70.0",
|
|
94
92
|
"@theia/process": "^1.70.0",
|
|
95
93
|
"@theia/workspace": "^1.70.0",
|
|
@@ -12,6 +12,7 @@ import { BaseGLSPClientContribution } from '@eclipse-glsp/theia-integration';
|
|
|
12
12
|
import { createChannelConnection, GLSPContribution } from '@eclipse-glsp/theia-integration/lib/common';
|
|
13
13
|
import { ChannelLogger, ConnectionReporter, type ConnectionTarget } from '@hydranium/client-theia/browser';
|
|
14
14
|
import { Clock } from '@hydranium/client-theia/common';
|
|
15
|
+
import { HydraniumGlspClient } from '@hydranium/glsp-client';
|
|
15
16
|
import { sendByMethodName, describeError, type Stopwatch, SystemClock } from '@hydranium/protocol';
|
|
16
17
|
import { type Channel, Disposable, Emitter, Event, nls } from '@theia/core';
|
|
17
18
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
@@ -20,7 +21,6 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
|
20
21
|
// GLSP's channel connection uses the top-level `vscode-jsonrpc`'s root entry, which
|
|
21
22
|
// installs no runtime layer; without the browser entry, no message is received.
|
|
22
23
|
import 'vscode-jsonrpc/browser';
|
|
23
|
-
import { HydraniumGlspClient } from './glsp-client';
|
|
24
24
|
|
|
25
25
|
export const DEFAULT_GLSP_CLIENT_STARTUP_TIMEOUT_MS = 30_000;
|
|
26
26
|
|
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
import { type Args, DiagramLoader, EditorContextService, GLSPActionDispatcher, SetViewportAction } from '@eclipse-glsp/client';
|
|
11
11
|
import { RESUME_TOKEN_ARG } from '@hydranium/protocol';
|
|
12
12
|
import { GLSPDiagramWidget, type GLSPDiagramWidgetOptions } from '@eclipse-glsp/theia-integration';
|
|
13
|
+
import { type DiagramLoadOutcome, HydraniumDiagramLoader } from '@hydranium/glsp-client';
|
|
13
14
|
// Type-only: the `@theia/core/lib/browser` barrel touches DOM globals at module
|
|
14
15
|
// load, which the node-environment unit tests cannot provide.
|
|
15
16
|
import { type Message } from '@theia/core/lib/browser';
|
|
16
17
|
import { Emitter, type Event, nls } from '@theia/core';
|
|
17
18
|
import { type Container, inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { type DiagramLoadOutcome, HydraniumDiagramLoader } from './diagram-loader';
|
|
19
19
|
import { HydraniumGlspSaveable } from './glsp-saveable';
|
|
20
20
|
import { WindowSessionService } from './window-session';
|
|
21
21
|
// Shipped by this package rather than left to adopters: an overlay whose
|