@eclipse-glsp/server 1.1.0-next.e49c816.56 → 1.1.0-next.f0fc2cf.63
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/lib/common/di/diagram-module.d.ts +3 -0
- package/lib/common/di/diagram-module.d.ts.map +1 -1
- package/lib/common/di/diagram-module.js +14 -5
- package/lib/common/di/diagram-module.js.map +1 -1
- package/lib/common/features/model/model-submission-handler.d.ts +2 -0
- package/lib/common/features/model/model-submission-handler.d.ts.map +1 -1
- package/lib/common/features/model/model-submission-handler.js +10 -0
- package/lib/common/features/model/model-submission-handler.js.map +1 -1
- package/lib/common/features/model/request-model-action-handler.d.ts +5 -6
- package/lib/common/features/model/request-model-action-handler.d.ts.map +1 -1
- package/lib/common/features/model/request-model-action-handler.js +34 -12
- package/lib/common/features/model/request-model-action-handler.js.map +1 -1
- package/lib/common/features/progress/progress-service.d.ts +44 -0
- package/lib/common/features/progress/progress-service.d.ts.map +1 -0
- package/lib/common/features/progress/progress-service.js +50 -0
- package/lib/common/features/progress/progress-service.js.map +1 -0
- package/lib/common/features/validation/model-validator.d.ts +47 -2
- package/lib/common/features/validation/model-validator.d.ts.map +1 -1
- package/lib/common/features/validation/model-validator.js +79 -1
- package/lib/common/features/validation/model-validator.js.map +1 -1
- package/lib/common/features/validation/request-markers-handler.d.ts +15 -0
- package/lib/common/features/validation/request-markers-handler.d.ts.map +1 -1
- package/lib/common/features/validation/request-markers-handler.js +3 -9
- package/lib/common/features/validation/request-markers-handler.js.map +1 -1
- package/lib/common/utils/client-options-util.d.ts +3 -0
- package/lib/common/utils/client-options-util.d.ts.map +1 -1
- package/lib/common/utils/client-options-util.js +5 -15
- package/lib/common/utils/client-options-util.js.map +1 -1
- package/lib/node/abstract-json-model-storage.d.ts.map +1 -1
- package/lib/node/abstract-json-model-storage.js +8 -2
- package/lib/node/abstract-json-model-storage.js.map +1 -1
- package/lib/node/launch/cli-parser.js +1 -1
- package/lib/node/launch/cli-parser.js.map +1 -1
- package/package.json +3 -4
- package/src/common/di/diagram-module.ts +20 -7
- package/src/common/features/model/model-submission-handler.ts +12 -0
- package/src/common/features/model/request-model-action-handler.ts +36 -16
- package/src/common/features/progress/progress-service.ts +74 -0
- package/src/common/features/validation/model-validator.ts +75 -3
- package/src/common/features/validation/request-markers-handler.ts +4 -10
- package/src/common/utils/client-options-util.ts +8 -0
- package/src/node/abstract-json-model-storage.ts +8 -2
- package/src/node/launch/cli-parser.ts +1 -1
|
@@ -23,6 +23,7 @@ import { NavigationTargetProvider } from '../features/navigation/navigation-targ
|
|
|
23
23
|
import { NavigationTargetProviderRegistry } from '../features/navigation/navigation-target-provider-registry';
|
|
24
24
|
import { NavigationTargetResolver } from '../features/navigation/navigation-target-resolver';
|
|
25
25
|
import { PopupModelFactory } from '../features/popup/popup-model-factory';
|
|
26
|
+
import { ProgressService } from '../features/progress/progress-service';
|
|
26
27
|
import { ModelValidator } from '../features/validation/model-validator';
|
|
27
28
|
import { OperationHandlerConstructor, OperationHandlerFactory } from '../operations/operation-handler';
|
|
28
29
|
import { OperationHandlerRegistry } from '../operations/operation-handler-registry';
|
|
@@ -57,6 +58,7 @@ import { InstanceMultiBinding, MultiBinding } from './multi-binding';
|
|
|
57
58
|
* - {@link ContextActionsProviders} as {@link ClassMultiBinding<ContextActionsProvider>} (empty)
|
|
58
59
|
* - {@link ContextActionsProviderRegistry}
|
|
59
60
|
* - {@link ActionDispatcher}
|
|
61
|
+
* - {@link ProgressService}
|
|
60
62
|
* - {@link ClientActionKinds} as {@link InstanceMultiBinding<string>}
|
|
61
63
|
* - {@link ActionHandler} as {@link InstanceMultiBinding<ActionHandlerConstructor>}
|
|
62
64
|
* - {@link ActionHandlerFactory}
|
|
@@ -96,6 +98,7 @@ export declare abstract class DiagramModule extends GLSPModule {
|
|
|
96
98
|
protected bindOperations(): BindingTarget<string[]>;
|
|
97
99
|
protected bindCommandStack(): BindingTarget<CommandStack>;
|
|
98
100
|
protected configureOperationHandlers(binding: InstanceMultiBinding<OperationHandlerConstructor>): void;
|
|
101
|
+
protected bindProgressService(): BindingTarget<ProgressService>;
|
|
99
102
|
protected configureContextActionProviders(binding: MultiBinding<ContextActionsProvider>): void;
|
|
100
103
|
protected configureContextEditValidators(binding: MultiBinding<ContextEditValidator>): void;
|
|
101
104
|
protected configureNavigationTargetProviders(binding: MultiBinding<NavigationTargetProvider>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/diagram-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diagram-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/diagram-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ const request_navigation_targets_action_handler_1 = require("../features/navigat
|
|
|
50
50
|
const resolve_navigation_targets_action_handler_1 = require("../features/navigation/resolve-navigation-targets-action-handler");
|
|
51
51
|
const popup_model_factory_1 = require("../features/popup/popup-model-factory");
|
|
52
52
|
const request_popup_model_action_handler_1 = require("../features/popup/request-popup-model-action-handler");
|
|
53
|
+
const progress_service_1 = require("../features/progress/progress-service");
|
|
53
54
|
const model_validator_1 = require("../features/validation/model-validator");
|
|
54
55
|
const request_markers_handler_1 = require("../features/validation/request-markers-handler");
|
|
55
56
|
const compound_operation_handler_1 = require("../operations/compound-operation-handler");
|
|
@@ -88,6 +89,7 @@ const service_identifiers_1 = require("./service-identifiers");
|
|
|
88
89
|
* - {@link ContextActionsProviders} as {@link ClassMultiBinding<ContextActionsProvider>} (empty)
|
|
89
90
|
* - {@link ContextActionsProviderRegistry}
|
|
90
91
|
* - {@link ActionDispatcher}
|
|
92
|
+
* - {@link ProgressService}
|
|
91
93
|
* - {@link ClientActionKinds} as {@link InstanceMultiBinding<string>}
|
|
92
94
|
* - {@link ActionHandler} as {@link InstanceMultiBinding<ActionHandlerConstructor>}
|
|
93
95
|
* - {@link ActionHandlerFactory}
|
|
@@ -150,6 +152,7 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
150
152
|
this.configureMultiBinding(new multi_binding_1.MultiBinding(service_identifiers_1.ContextEditValidators), binding => this.configureContextEditValidators(binding));
|
|
151
153
|
// Misc
|
|
152
154
|
this.configureMultiBinding(new multi_binding_1.MultiBinding(client_session_initializer_1.ClientSessionInitializer), binding => this.configureClientSessionInitializers(binding));
|
|
155
|
+
(0, binding_target_1.applyBindingTarget)(context, progress_service_1.ProgressService, this.bindProgressService()).inSingletonScope();
|
|
153
156
|
(0, binding_target_1.applyOptionalBindingTarget)(context, popup_model_factory_1.PopupModelFactory, this.bindPopupModelFactory());
|
|
154
157
|
(0, binding_target_1.applyOptionalBindingTarget)(context, layout_engine_1.LayoutEngine, (_a = this.bindLayoutEngine) === null || _a === void 0 ? void 0 : _a.call(this));
|
|
155
158
|
}
|
|
@@ -222,6 +225,9 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
222
225
|
binding.add(compound_operation_handler_1.CompoundOperationHandler);
|
|
223
226
|
binding.add(layout_operation_handler_1.LayoutOperationHandler);
|
|
224
227
|
}
|
|
228
|
+
bindProgressService() {
|
|
229
|
+
return progress_service_1.DefaultProgressService;
|
|
230
|
+
}
|
|
225
231
|
configureContextActionProviders(binding) {
|
|
226
232
|
// empty as default
|
|
227
233
|
}
|
|
@@ -233,16 +239,17 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
233
239
|
}
|
|
234
240
|
configureClientActions(binding) {
|
|
235
241
|
binding.add(protocol_1.CenterAction.KIND);
|
|
236
|
-
binding.add(protocol_1.ExportSvgAction.KIND);
|
|
237
242
|
binding.add(protocol_1.DeleteMarkersAction.KIND);
|
|
243
|
+
binding.add(protocol_1.EndProgressAction.KIND);
|
|
244
|
+
binding.add(protocol_1.ExportSvgAction.KIND);
|
|
238
245
|
binding.add(protocol_1.FitToScreenAction.KIND);
|
|
239
|
-
binding.add(protocol_1.SourceModelChangedAction.KIND);
|
|
240
|
-
binding.add(protocol_1.NavigateToTargetAction.KIND);
|
|
241
246
|
binding.add(protocol_1.NavigateToExternalTargetAction.KIND);
|
|
247
|
+
binding.add(protocol_1.NavigateToTargetAction.KIND);
|
|
242
248
|
binding.add(protocol_1.RequestBoundsAction.KIND);
|
|
243
249
|
binding.add(protocol_1.SelectAction.KIND);
|
|
244
250
|
binding.add(protocol_1.SelectAllAction.KIND);
|
|
245
251
|
binding.add(protocol_1.ServerMessageAction.KIND);
|
|
252
|
+
binding.add(protocol_1.ServerStatusAction.KIND);
|
|
246
253
|
binding.add(protocol_1.SetBoundsAction.KIND);
|
|
247
254
|
binding.add(protocol_1.SetClipboardDataAction.KIND);
|
|
248
255
|
binding.add(protocol_1.SetContextActions.KIND);
|
|
@@ -256,10 +263,12 @@ class DiagramModule extends glsp_module_1.GLSPModule {
|
|
|
256
263
|
binding.add(protocol_1.SetResolvedNavigationTargetAction.KIND);
|
|
257
264
|
binding.add(protocol_1.SetTypeHintsAction.KIND);
|
|
258
265
|
binding.add(protocol_1.SetViewportAction.KIND);
|
|
259
|
-
binding.add(protocol_1.
|
|
260
|
-
binding.add(protocol_1.
|
|
266
|
+
binding.add(protocol_1.SourceModelChangedAction.KIND);
|
|
267
|
+
binding.add(protocol_1.StartProgressAction.KIND);
|
|
261
268
|
binding.add(protocol_1.TriggerEdgeCreationAction.KIND);
|
|
269
|
+
binding.add(protocol_1.TriggerNodeCreationAction.KIND);
|
|
262
270
|
binding.add(protocol_1.UpdateModelAction.KIND);
|
|
271
|
+
binding.add(protocol_1.UpdateProgressAction.KIND);
|
|
263
272
|
}
|
|
264
273
|
bindContextActionsProviderRegistry() {
|
|
265
274
|
return context_actions_provider_registry_1.ContextActionsProviderRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-module.js","sourceRoot":"","sources":["../../../src/common/di/diagram-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"diagram-module.js","sourceRoot":"","sources":["../../../src/common/di/diagram-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ import { Action, DirtyStateChangeReason, MaybePromise } from '@eclipse-glsp/prot
|
|
|
18
18
|
import { CommandStack } from '../../command/command-stack';
|
|
19
19
|
import { DiagramConfiguration } from '../../diagram/diagram-configuration';
|
|
20
20
|
import { LayoutEngine } from '../layout/layout-engine';
|
|
21
|
+
import { ModelValidator } from '../validation/model-validator';
|
|
21
22
|
import { GModelFactory } from './gmodel-factory';
|
|
22
23
|
import { GModelSerializer } from './gmodel-serializer';
|
|
23
24
|
import { ModelState } from './model-state';
|
|
@@ -28,6 +29,7 @@ export declare class ModelSubmissionHandler {
|
|
|
28
29
|
protected modelState: ModelState;
|
|
29
30
|
protected layoutEngine: LayoutEngine;
|
|
30
31
|
protected commandStack: CommandStack;
|
|
32
|
+
protected validator?: ModelValidator;
|
|
31
33
|
/**
|
|
32
34
|
* Returns a list of actions to update the client-side model, based on the specified <code>modelState</code>.
|
|
33
35
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACH,MAAM,EACN,sBAAsB,
|
|
1
|
+
{"version":3,"file":"model-submission-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACH,MAAM,EACN,sBAAsB,EAEtB,YAAY,EAMf,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAoB,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBACa,sBAAsB;IAE/B,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAGvC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IAGtC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAIjC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAIrC,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IAErC;;;;;;;;OAQG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAWpE;;;;;;;;;;;;;OAaG;IACG,mBAAmB,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAsB7E,SAAS,CAAC,eAAe,IAAI,gBAAgB;CAGhD"}
|
|
@@ -15,6 +15,7 @@ const inversify_1 = require("inversify");
|
|
|
15
15
|
const command_stack_1 = require("../../command/command-stack");
|
|
16
16
|
const diagram_configuration_1 = require("../../diagram/diagram-configuration");
|
|
17
17
|
const layout_engine_1 = require("../layout/layout-engine");
|
|
18
|
+
const model_validator_1 = require("../validation/model-validator");
|
|
18
19
|
const gmodel_factory_1 = require("./gmodel-factory");
|
|
19
20
|
const gmodel_serializer_1 = require("./gmodel-serializer");
|
|
20
21
|
const model_state_1 = require("./model-state");
|
|
@@ -64,6 +65,10 @@ let ModelSubmissionHandler = exports.ModelSubmissionHandler = class ModelSubmiss
|
|
|
64
65
|
if (!this.diagramConfiguration.needsClientLayout) {
|
|
65
66
|
result.push(protocol_1.SetDirtyStateAction.create(this.commandStack.isDirty, { reason }));
|
|
66
67
|
}
|
|
68
|
+
if (this.validator) {
|
|
69
|
+
const markers = await this.validator.validate([this.modelState.root], protocol_1.MarkersReason.LIVE);
|
|
70
|
+
result.push(protocol_1.SetMarkersAction.create(markers, { reason: protocol_1.MarkersReason.LIVE }));
|
|
71
|
+
}
|
|
67
72
|
return result;
|
|
68
73
|
}
|
|
69
74
|
serializeGModel() {
|
|
@@ -95,6 +100,11 @@ __decorate([
|
|
|
95
100
|
(0, inversify_1.inject)(command_stack_1.CommandStack),
|
|
96
101
|
__metadata("design:type", Object)
|
|
97
102
|
], ModelSubmissionHandler.prototype, "commandStack", void 0);
|
|
103
|
+
__decorate([
|
|
104
|
+
(0, inversify_1.inject)(model_validator_1.ModelValidator),
|
|
105
|
+
(0, inversify_1.optional)(),
|
|
106
|
+
__metadata("design:type", Object)
|
|
107
|
+
], ModelSubmissionHandler.prototype, "validator", void 0);
|
|
98
108
|
exports.ModelSubmissionHandler = ModelSubmissionHandler = __decorate([
|
|
99
109
|
(0, inversify_1.injectable)()
|
|
100
110
|
], ModelSubmissionHandler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,
|
|
1
|
+
{"version":3,"file":"model-submission-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/model-submission-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
import { Action, RequestModelAction } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { ActionDispatcher } from '../../actions/action-dispatcher';
|
|
18
18
|
import { ActionHandler } from '../../actions/action-handler';
|
|
19
|
+
import { ProgressMonitor, ProgressService } from '../progress/progress-service';
|
|
19
20
|
import { ModelState } from './model-state';
|
|
20
21
|
import { ModelSubmissionHandler } from './model-submission-handler';
|
|
21
22
|
import { SourceModelStorage } from './source-model-storage';
|
|
@@ -26,12 +27,10 @@ export declare class RequestModelActionHandler implements ActionHandler {
|
|
|
26
27
|
protected actionDispatcher: ActionDispatcher;
|
|
27
28
|
protected modelState: ModelState;
|
|
28
29
|
protected submissionHandler: ModelSubmissionHandler;
|
|
30
|
+
protected progressService: ProgressService;
|
|
29
31
|
execute(action: RequestModelAction): Promise<Action[]>;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
* @param message The message that should be sent to the client
|
|
34
|
-
*/
|
|
35
|
-
protected notifyClient(message?: string): void;
|
|
32
|
+
protected handleReconnect(action: RequestModelAction): Promise<void>;
|
|
33
|
+
protected reportModelLoading(message: string): ProgressMonitor;
|
|
34
|
+
protected reportModelLoadingFinished(monitor: ProgressMonitor): void;
|
|
36
35
|
}
|
|
37
36
|
//# sourceMappingURL=request-model-action-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-model-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"request-model-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAsB,MAAM,wBAAwB,CAAC;AAExF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG7D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,yBAA0B,YAAW,aAAa;IAC3D,WAAW,WAA6B;IAGxC,OAAO,CAAC,MAAM,CAAS;IAGvB,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAGpD,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAErC,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAkB5C,eAAe,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1E,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe;IAK9D,SAAS,CAAC,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CAIvE"}
|
|
@@ -28,7 +28,9 @@ exports.RequestModelActionHandler = void 0;
|
|
|
28
28
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
const action_dispatcher_1 = require("../../actions/action-dispatcher");
|
|
31
|
+
const client_options_util_1 = require("../../utils/client-options-util");
|
|
31
32
|
const logger_1 = require("../../utils/logger");
|
|
33
|
+
const progress_service_1 = require("../progress/progress-service");
|
|
32
34
|
const model_state_1 = require("./model-state");
|
|
33
35
|
const model_submission_handler_1 = require("./model-submission-handler");
|
|
34
36
|
const source_model_storage_1 = require("./source-model-storage");
|
|
@@ -40,20 +42,36 @@ let RequestModelActionHandler = exports.RequestModelActionHandler = class Reques
|
|
|
40
42
|
var _a;
|
|
41
43
|
this.logger.debug('Execute RequestModelAction:', action);
|
|
42
44
|
this.modelState.setAll((_a = action.options) !== null && _a !== void 0 ? _a : {});
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
const isReconnecting = client_options_util_1.ClientOptionsUtil.isReconnecting(action.options);
|
|
46
|
+
const progress = this.reportModelLoading('Model loading in progress');
|
|
47
|
+
if (isReconnecting) {
|
|
48
|
+
await this.handleReconnect(action);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
await this.sourceModelStorage.loadSourceModel(action);
|
|
52
|
+
}
|
|
53
|
+
this.reportModelLoadingFinished(progress);
|
|
47
54
|
return this.submissionHandler.submitModel();
|
|
48
55
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
56
|
+
async handleReconnect(action) {
|
|
57
|
+
var _a;
|
|
58
|
+
const oldModelRoot = this.modelState.root;
|
|
59
|
+
if (oldModelRoot) {
|
|
60
|
+
// decrease revision by one, as each submit will increase it by one;
|
|
61
|
+
// the next save would produce warning that source model was changed otherwise
|
|
62
|
+
this.modelState.root.revision = ((_a = this.modelState.root.revision) !== null && _a !== void 0 ? _a : 0) - 1;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
await this.sourceModelStorage.loadSourceModel(action);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
reportModelLoading(message) {
|
|
69
|
+
this.actionDispatcher.dispatch(protocol_1.ServerStatusAction.create(message, { severity: 'INFO' }));
|
|
70
|
+
return this.progressService.start(message);
|
|
71
|
+
}
|
|
72
|
+
reportModelLoadingFinished(monitor) {
|
|
73
|
+
this.actionDispatcher.dispatch(protocol_1.ServerStatusAction.create('', { severity: 'NONE' }));
|
|
74
|
+
monitor.end();
|
|
57
75
|
}
|
|
58
76
|
};
|
|
59
77
|
__decorate([
|
|
@@ -76,6 +94,10 @@ __decorate([
|
|
|
76
94
|
(0, inversify_1.inject)(model_submission_handler_1.ModelSubmissionHandler),
|
|
77
95
|
__metadata("design:type", model_submission_handler_1.ModelSubmissionHandler)
|
|
78
96
|
], RequestModelActionHandler.prototype, "submissionHandler", void 0);
|
|
97
|
+
__decorate([
|
|
98
|
+
(0, inversify_1.inject)(progress_service_1.ProgressService),
|
|
99
|
+
__metadata("design:type", Object)
|
|
100
|
+
], RequestModelActionHandler.prototype, "progressService", void 0);
|
|
79
101
|
exports.RequestModelActionHandler = RequestModelActionHandler = __decorate([
|
|
80
102
|
(0, inversify_1.injectable)()
|
|
81
103
|
], RequestModelActionHandler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"request-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAwF;AACxF,yCAA+C;AAC/C,uEAAmE;AAEnE,yEAAoE;AACpE,+CAA4C;AAC5C,mEAAgF;AAChF,+CAA2C;AAC3C,yEAAoE;AACpE,iEAA4D;AAGrD,IAAM,yBAAyB,uCAA/B,MAAM,yBAAyB;IAA/B;QACH,gBAAW,GAAG,CAAC,6BAAkB,CAAC,IAAI,CAAC,CAAC;IA0D5C,CAAC;IAtCG,KAAK,CAAC,OAAO,CAAC,MAA0B;;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;QAE7C,MAAM,cAAc,GAAG,uCAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,CAAC;QAEtE,IAAI,cAAc,EAAE;YAChB,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;SACtC;aAAM;YACH,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QAE1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;IAChD,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,MAA0B;;QACtD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAC1C,IAAI,YAAY,EAAE;YACd,oEAAoE;YACpE,8EAA8E;YAC9E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC5E;aAAM;YACH,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;SACzD;IACL,CAAC;IAES,kBAAkB,CAAC,OAAe;QACxC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,6BAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,0BAA0B,CAAC,OAAwB;QACzD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,6BAAkB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;CACJ,CAAA;AAvDW;IADP,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACC,eAAM;yDAAC;AAGb;IADT,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;qEACsB;AAGvC;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;mEACoB;AAGnC;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;6DACc;AAGvB;IADT,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;oEAAC;AAG1C;IADT,IAAA,kBAAM,EAAC,kCAAe,CAAC;;kEACmB;oCAnBlC,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CA2DrC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { ActionDispatcher } from '../../actions/action-dispatcher';
|
|
2
|
+
export declare const ProgressService: unique symbol;
|
|
3
|
+
/**
|
|
4
|
+
* Service for starting and monitoring progress reporting to the client.
|
|
5
|
+
*/
|
|
6
|
+
export interface ProgressService {
|
|
7
|
+
/**
|
|
8
|
+
* Start a progress reporting.
|
|
9
|
+
* @param title The title shown in the UI for the progress reporting.
|
|
10
|
+
* @param options Additional optional options for the progress reporting.
|
|
11
|
+
* @returns a monitor to update and end the progress reporting later.
|
|
12
|
+
*/
|
|
13
|
+
start(title: string, options?: ProgressOptions): ProgressMonitor;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Optional progress reporting options.
|
|
17
|
+
*/
|
|
18
|
+
export interface ProgressOptions {
|
|
19
|
+
/** A message shown in the UI. */
|
|
20
|
+
message?: string;
|
|
21
|
+
percentage?: number;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* The monitor of a progress reporting, which can be used to update and end the reporting.
|
|
25
|
+
*/
|
|
26
|
+
export interface ProgressMonitor {
|
|
27
|
+
/**
|
|
28
|
+
* Updates an ongoing progress reporting.
|
|
29
|
+
* @param options Updated message and/or percentage (value range: 0 to 100).
|
|
30
|
+
*/
|
|
31
|
+
update(options: {
|
|
32
|
+
message?: string;
|
|
33
|
+
percentage?: number;
|
|
34
|
+
}): void;
|
|
35
|
+
/**
|
|
36
|
+
* Ends an ongoing progress reporting.
|
|
37
|
+
*/
|
|
38
|
+
end(): void;
|
|
39
|
+
}
|
|
40
|
+
export declare class DefaultProgressService implements ProgressService {
|
|
41
|
+
protected actionDispatcher: ActionDispatcher;
|
|
42
|
+
start(title: string, options?: ProgressOptions): ProgressMonitor;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=progress-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progress-service.d.ts","sourceRoot":"","sources":["../../../../src/common/features/progress/progress-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,eAAe,CAAC;CACpE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE;;OAEG;IACH,GAAG,IAAI,IAAI,CAAC;CACf;AAED,qBACa,sBAAuB,YAAW,eAAe;IAE1D,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,eAAe;CAQnE"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.DefaultProgressService = exports.ProgressService = void 0;
|
|
13
|
+
/********************************************************************************
|
|
14
|
+
* Copyright (c) 2023 EclipseSource and others.
|
|
15
|
+
*
|
|
16
|
+
* This program and the accompanying materials are made available under the
|
|
17
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
18
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
19
|
+
*
|
|
20
|
+
* This Source Code may also be made available under the following Secondary
|
|
21
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
22
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
23
|
+
* with the GNU Classpath Exception which is available at
|
|
24
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
25
|
+
*
|
|
26
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
27
|
+
********************************************************************************/
|
|
28
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
29
|
+
const inversify_1 = require("inversify");
|
|
30
|
+
const uuid = require("uuid");
|
|
31
|
+
const action_dispatcher_1 = require("../../actions/action-dispatcher");
|
|
32
|
+
exports.ProgressService = Symbol('ProgressService');
|
|
33
|
+
let DefaultProgressService = exports.DefaultProgressService = class DefaultProgressService {
|
|
34
|
+
start(title, options) {
|
|
35
|
+
const progressId = uuid.v4();
|
|
36
|
+
this.actionDispatcher.dispatch(protocol_1.StartProgressAction.create(Object.assign({ progressId, title }, options)));
|
|
37
|
+
return {
|
|
38
|
+
update: updateOptions => this.actionDispatcher.dispatch(protocol_1.UpdateProgressAction.create(progressId, updateOptions)),
|
|
39
|
+
end: () => this.actionDispatcher.dispatch(protocol_1.EndProgressAction.create(progressId))
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
__decorate([
|
|
44
|
+
(0, inversify_1.inject)(action_dispatcher_1.ActionDispatcher),
|
|
45
|
+
__metadata("design:type", Object)
|
|
46
|
+
], DefaultProgressService.prototype, "actionDispatcher", void 0);
|
|
47
|
+
exports.DefaultProgressService = DefaultProgressService = __decorate([
|
|
48
|
+
(0, inversify_1.injectable)()
|
|
49
|
+
], DefaultProgressService);
|
|
50
|
+
//# sourceMappingURL=progress-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progress-service.js","sourceRoot":"","sources":["../../../../src/common/features/progress/progress-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsG;AACtG,yCAA+C;AAC/C,6BAA6B;AAC7B,uEAAmE;AAEtD,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAyClD,IAAM,sBAAsB,oCAA5B,MAAM,sBAAsB;IAI/B,KAAK,CAAC,KAAa,EAAE,OAAyB;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,8BAAmB,CAAC,MAAM,iBAAG,UAAU,EAAE,KAAK,IAAK,OAAO,EAAG,CAAC,CAAC;QAC9F,OAAO;YACH,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YAC/G,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,4BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAClF,CAAC;IACN,CAAC;CACJ,CAAA;AAVa;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;gEACoB;iCAFpC,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAYlC"}
|
|
@@ -26,8 +26,53 @@ export interface ModelValidator {
|
|
|
26
26
|
* Validates the given list of {@link GModelElement}s and returns a list of {@link Marker}s.
|
|
27
27
|
*
|
|
28
28
|
* @param elements The list of {@link GModelElement} to validate.
|
|
29
|
-
* @
|
|
29
|
+
* @param reason The reason for a validation request, such as "batch" or "live" validation.
|
|
30
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}s.
|
|
30
31
|
*/
|
|
31
|
-
validate(elements: GModelElement[]): MaybePromise<Marker[]>;
|
|
32
|
+
validate(elements: GModelElement[], reason?: string): MaybePromise<Marker[]>;
|
|
33
|
+
}
|
|
34
|
+
export declare abstract class AbstractModelValidator implements ModelValidator {
|
|
35
|
+
validate(elements: GModelElement[], reason: string): Marker[];
|
|
36
|
+
/**
|
|
37
|
+
* Perform the live validation rules for the given <code>element</code>.
|
|
38
|
+
*
|
|
39
|
+
* This will be invoked on start and after each operation for all elements.
|
|
40
|
+
* Thus, the validation should be rather inexpensive.
|
|
41
|
+
* There is no need to traverse through the children in this method as {@link #validate(List, String)} will invoke
|
|
42
|
+
* this method for all children anyway.
|
|
43
|
+
*
|
|
44
|
+
* @param element The element to validate.
|
|
45
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}.
|
|
46
|
+
*/
|
|
47
|
+
doLiveValidation(element: GModelElement): Marker[];
|
|
48
|
+
/**
|
|
49
|
+
* Perform the batch validation rules for the given <code>element</code>.
|
|
50
|
+
*
|
|
51
|
+
* <p>
|
|
52
|
+
* This will be invoked on demand by the client.
|
|
53
|
+
* Thus, the validation can include more expensive validation rules.
|
|
54
|
+
* There is no need to traverse through the children in this method as {@link #validate(List, String)} will invoke
|
|
55
|
+
* this method for all children anyway.
|
|
56
|
+
* </p>
|
|
57
|
+
*
|
|
58
|
+
* @param element The element to validate.
|
|
59
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}.
|
|
60
|
+
*/
|
|
61
|
+
doBatchValidation(element: GModelElement): Marker[];
|
|
62
|
+
/**
|
|
63
|
+
* Perform a validation for a custom <code>reason</code> with the given <code>element</code>.
|
|
64
|
+
*
|
|
65
|
+
* <p>
|
|
66
|
+
* GLSP editors may add custom reasons for triggering a validation, other than <code>live</code> and
|
|
67
|
+
* <code>batch</code>.
|
|
68
|
+
* Validation requests that are not live or batch validations will be handled by this method.
|
|
69
|
+
* There is no need to traverse through the children in this method as {@link #validate(List, String)} will invoke
|
|
70
|
+
* this method for all children anyway.
|
|
71
|
+
* </p>
|
|
72
|
+
*
|
|
73
|
+
* @param element The element to validate.
|
|
74
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}.
|
|
75
|
+
*/
|
|
76
|
+
doValidationForCustomReason(element: GModelElement): Marker[];
|
|
32
77
|
}
|
|
33
78
|
//# sourceMappingURL=model-validator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-validator.d.ts","sourceRoot":"","sources":["../../../../src/common/features/validation/model-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"model-validator.d.ts","sourceRoot":"","sources":["../../../../src/common/features/validation/model-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAiB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG7E,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;CAChF;AAED,8BACsB,sBAAuB,YAAW,cAAc;IAClE,QAAQ,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAiB7D;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,EAAE;IAIlD;;;;;;;;;;;;OAYG;IACH,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,EAAE;IAInD;;;;;;;;;;;;;OAaG;IACH,2BAA2B,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,EAAE;CAGhE"}
|
|
@@ -1,5 +1,83 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
2
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ModelValidator = void 0;
|
|
9
|
+
exports.AbstractModelValidator = exports.ModelValidator = void 0;
|
|
10
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
11
|
+
const inversify_1 = require("inversify");
|
|
4
12
|
exports.ModelValidator = Symbol('ModelValidator');
|
|
13
|
+
let AbstractModelValidator = exports.AbstractModelValidator = class AbstractModelValidator {
|
|
14
|
+
validate(elements, reason) {
|
|
15
|
+
const markers = [];
|
|
16
|
+
for (const element of elements) {
|
|
17
|
+
if (protocol_1.MarkersReason.LIVE === reason) {
|
|
18
|
+
markers.push(...this.doLiveValidation(element));
|
|
19
|
+
}
|
|
20
|
+
else if (protocol_1.MarkersReason.BATCH === reason) {
|
|
21
|
+
markers.push(...this.doBatchValidation(element));
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
markers.push(...this.doValidationForCustomReason(element));
|
|
25
|
+
}
|
|
26
|
+
if (element.children) {
|
|
27
|
+
markers.push(...this.validate(element.children, reason));
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return markers;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Perform the live validation rules for the given <code>element</code>.
|
|
34
|
+
*
|
|
35
|
+
* This will be invoked on start and after each operation for all elements.
|
|
36
|
+
* Thus, the validation should be rather inexpensive.
|
|
37
|
+
* There is no need to traverse through the children in this method as {@link #validate(List, String)} will invoke
|
|
38
|
+
* this method for all children anyway.
|
|
39
|
+
*
|
|
40
|
+
* @param element The element to validate.
|
|
41
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}.
|
|
42
|
+
*/
|
|
43
|
+
doLiveValidation(element) {
|
|
44
|
+
return [];
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Perform the batch validation rules for the given <code>element</code>.
|
|
48
|
+
*
|
|
49
|
+
* <p>
|
|
50
|
+
* This will be invoked on demand by the client.
|
|
51
|
+
* Thus, the validation can include more expensive validation rules.
|
|
52
|
+
* There is no need to traverse through the children in this method as {@link #validate(List, String)} will invoke
|
|
53
|
+
* this method for all children anyway.
|
|
54
|
+
* </p>
|
|
55
|
+
*
|
|
56
|
+
* @param element The element to validate.
|
|
57
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}.
|
|
58
|
+
*/
|
|
59
|
+
doBatchValidation(element) {
|
|
60
|
+
return [];
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Perform a validation for a custom <code>reason</code> with the given <code>element</code>.
|
|
64
|
+
*
|
|
65
|
+
* <p>
|
|
66
|
+
* GLSP editors may add custom reasons for triggering a validation, other than <code>live</code> and
|
|
67
|
+
* <code>batch</code>.
|
|
68
|
+
* Validation requests that are not live or batch validations will be handled by this method.
|
|
69
|
+
* There is no need to traverse through the children in this method as {@link #validate(List, String)} will invoke
|
|
70
|
+
* this method for all children anyway.
|
|
71
|
+
* </p>
|
|
72
|
+
*
|
|
73
|
+
* @param element The element to validate.
|
|
74
|
+
* @return A list of {@link Marker}s for the validated {@link GModelElement}.
|
|
75
|
+
*/
|
|
76
|
+
doValidationForCustomReason(element) {
|
|
77
|
+
return [];
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
exports.AbstractModelValidator = AbstractModelValidator = __decorate([
|
|
81
|
+
(0, inversify_1.injectable)()
|
|
82
|
+
], AbstractModelValidator);
|
|
5
83
|
//# sourceMappingURL=model-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-validator.js","sourceRoot":"","sources":["../../../../src/common/features/validation/model-validator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model-validator.js","sourceRoot":"","sources":["../../../../src/common/features/validation/model-validator.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,qDAA6E;AAC7E,yCAAuC;AAE1B,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAmBhD,IAAe,sBAAsB,oCAArC,MAAe,sBAAsB;IACxC,QAAQ,CAAC,QAAyB,EAAE,MAAc;QAC9C,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,wBAAa,CAAC,IAAI,KAAK,MAAM,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;aACnD;iBAAM,IAAI,wBAAa,CAAC,KAAK,KAAK,MAAM,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;aACpD;iBAAM;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC;aAC9D;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE;gBAClB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;aAC5D;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,OAAsB;QACnC,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,iBAAiB,CAAC,OAAsB;QACpC,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,2BAA2B,CAAC,OAAsB;QAC9C,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;iCAnEqB,sBAAsB;IAD3C,IAAA,sBAAU,GAAE;GACS,sBAAsB,CAmE3C"}
|