Cleanup deprecated types (#332)

Ensure that deprecated types are isolated and don't leak into non-deprecated  definitions.
=> Consistently use definitions from sprotty protocol in non-deprecated  classes,functions or type definitions.

Author: tortmayr

packages/sprotty/src/base/actions/action-handler.ts

@@ -19,7 +19,7 @@ import { TYPES } from "../types";
 import { MultiInstanceRegistry } from "../../utils/registry";
 import { isInjectable } from "../../utils/inversify";
 import { ICommand } from "../commands/command";
-import { Action } from "./action";
+import { Action } from "sprotty-protocol";
 
 /**
  * An action handler accepts an action and reacts to it by returning either a command to be

packages/sprotty/src/base/actions/action.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { generateRequestId as generateRequestId2 } from 'sprotty-protocol/lib/actions';
+import { generateRequestId as generateRequestId2, Action as ProtocolAction} from 'sprotty-protocol/lib/actions';
 import { JsonAny } from 'sprotty-protocol/lib/utils/json';
 import { hasOwnProperty } from 'sprotty-protocol/lib/utils/object';
 
@@ -99,7 +99,7 @@ export class RejectAction implements ResponseAction {
  * to define an entry in the command palette or in the context menu.
  */
 export class LabeledAction {
-    constructor(readonly label: string, readonly actions: Action[], readonly icon?: string) { }
+    constructor(readonly label: string, readonly actions: ProtocolAction[], readonly icon?: string) { }
 }
 
 export function isLabeledAction(element: unknown): element is LabeledAction {

packages/sprotty/src/base/features/set-model.ts

@@ -33,7 +33,7 @@ import { InitializeCanvasBoundsCommand } from './initialize-canvas';
  *
  * @deprecated Use the declaration from `sprotty-protocol` instead.
  */
-export class RequestModelAction implements RequestAction<SetModelAction>, ProtocolRequestModelAction {
+export class RequestModelAction implements ProtocolRequestModelAction {
     static readonly KIND = 'requestModel';
     readonly kind = RequestModelAction.KIND;
 

packages/sprotty/src/base/model/smodel.ts

@@ -15,6 +15,7 @@
  ********************************************************************************/
 
 import { Bounds, isBounds, Point } from "sprotty-protocol/lib/utils/geometry";
+import { SModelElement as ProtocolSModelElement } from "sprotty-protocol";
 import { mapIterable, FluentIterable } from "../../utils/iterable";
 
 /**
@@ -81,8 +82,8 @@ export interface FeatureSet {
     has(feature: symbol): boolean
 }
 
-export function isParent(element: SModelElementSchema | SModelElement):
-        element is SModelElementSchema & { children: SModelElementSchema[] } {
+export function isParent(element: ProtocolSModelElement | SModelElement):
+        element is ProtocolSModelElement & { children: ProtocolSModelElement[] } {
     const children = (element as any).children;
     return children !== undefined && children.constructor === Array;
 }
@@ -213,10 +214,10 @@ export function createRandomId(length: number = 8): string {
  * Used to speed up model element lookup by id.
  */
  export interface IModelIndex {
-    add(element: SModelElementSchema): void
-    remove(element: SModelElementSchema): void
-    contains(element: SModelElementSchema): boolean
-    getById(id: string): SModelElementSchema | undefined
+    add(element: ProtocolSModelElement): void
+    remove(element: ProtocolSModelElement): void
+    contains(element: ProtocolSModelElement): boolean
+    getById(id: string): ProtocolSModelElement | undefined
 }
 
 /**

packages/sprotty/src/base/ui-extensions/ui-extension.ts

@@ -14,6 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { inject, injectable } from "inversify";
+import { hasOwnProperty } from "sprotty-protocol";
 import { ILogger } from "../../utils/logging";
 import { SModelRoot } from "../model/smodel";
 import { TYPES } from "../types";
@@ -26,6 +27,13 @@ export interface IUIExtension {
     id(): string;
     show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void;
     hide(): void;
+    enableOnStartup?: boolean
+}
+
+export function isUIExtension(object: unknown): object is IUIExtension {
+    return hasOwnProperty<string, Function>(object, 'id', 'function')
+    && hasOwnProperty<string, Function>(object, 'show', 'function')
+    && hasOwnProperty<string, Function>(object, 'hide', 'function');
 }
 
 /**

packages/sprotty/src/features/bounds/bounds-manipulation.ts

@@ -16,7 +16,7 @@
 
 import { inject, injectable } from "inversify";
 import {
-    Action, generateRequestId, RequestAction, ResponseAction} from 'sprotty-protocol/lib/actions';
+    Action, generateRequestId, RequestAction, ResponseAction, ComputedBoundsAction as ProtocolComputedBoundsAction} from 'sprotty-protocol/lib/actions';
 import * as protocol from "sprotty-protocol/lib/actions";
 import { SModelRoot as SModelRootSchema } from 'sprotty-protocol/lib/model';
 import { Bounds, Dimension, Point } from "sprotty-protocol/lib/utils/geometry";
@@ -198,6 +198,6 @@ export class RequestBoundsCommand extends HiddenCommand {
     }
 
     get blockUntil(): (action: Action) => boolean {
-        return action => action.kind === ComputedBoundsAction.KIND;
+        return action => action.kind === ProtocolComputedBoundsAction.KIND;
     }
 }

packages/sprotty/src/features/button/model.ts

@@ -14,8 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { boundsFeature, layoutableChildFeature, SShapeElement, SShapeElementSchema } from '../bounds/model';
+import { boundsFeature, layoutableChildFeature, SShapeElement } from '../bounds/model';
 import { fadeFeature } from '../fade/model';
+import { SShapeElement as SShapeElementSchema } from 'sprotty-protocol';
 
 export interface SButtonSchema extends SShapeElementSchema {
     pressed: boolean

packages/sprotty/src/features/edit/create.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject, injectable } from 'inversify';
-import { Action } from 'sprotty-protocol/lib/actions';
+import { Action, CreateElementAction as ProtocolCreateElementAction } from 'sprotty-protocol/lib/actions';
 import { SModelElement as SModelElementSchema } from 'sprotty-protocol/lib/model';
 import { Command, CommandExecutionContext, CommandReturn } from '../../base/commands/command';
 import { SParentElement, SChildElement } from '../../base/model/smodel';
@@ -45,12 +45,12 @@ export namespace CreateElementAction {
 
 @injectable()
 export class CreateElementCommand extends Command {
-    static readonly KIND = CreateElementAction.KIND;
+    static readonly KIND = ProtocolCreateElementAction.KIND;
 
     container: SParentElement;
     newElement: SChildElement;
 
-    constructor(@inject(TYPES.Action) protected readonly action: CreateElementAction) {
+    constructor(@inject(TYPES.Action) protected readonly action: ProtocolCreateElementAction) {
         super();
     }
 

packages/sprotty/src/features/edit/delete.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject, injectable } from 'inversify';
-import { Action } from 'sprotty-protocol/lib/actions';
+import { Action, DeleteElementAction as ProtocolDeleteElementAction} from 'sprotty-protocol/lib/actions';
 import { Command, CommandExecutionContext, CommandReturn } from '../../base/commands/command';
 import { SModelElement, SParentElement, SChildElement } from '../../base/model/smodel';
 import { SModelExtension } from '../../base/model/smodel-extension';
@@ -57,11 +57,11 @@ export class ResolvedDelete {
 
 @injectable()
 export class DeleteElementCommand extends Command {
-    static readonly KIND = DeleteElementAction.KIND;
+    static readonly KIND = ProtocolDeleteElementAction.KIND;
 
     resolvedDeletes: ResolvedDelete[] = [];
 
-    constructor(@inject(TYPES.Action) protected readonly action: DeleteElementAction) {
+    constructor(@inject(TYPES.Action) protected readonly action: ProtocolDeleteElementAction) {
         super();
     }
 

packages/sprotty/src/features/edit/edit-label.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject } from 'inversify';
-import { Action, isAction } from 'sprotty-protocol/lib/actions';
+import { Action, isAction, ApplyLabelEditAction as ProtocolApplyLabelEditAction } from 'sprotty-protocol/lib/actions';
 import { CommandExecutionContext, CommandReturn, Command } from '../../base/commands/command';
 import { SModelElement } from '../../base/model/smodel';
 import { TYPES } from '../../base/types';
@@ -66,8 +66,8 @@ export namespace ApplyLabelEditAction {
     }
 }
 
-export function isApplyLabelEditAction(element?: any): element is ApplyLabelEditAction {
-    return isAction(element) && element.kind === ApplyLabelEditAction.KIND && 'labelId' in element && 'text' in element;
+export function isApplyLabelEditAction(element?: any): element is ProtocolApplyLabelEditAction {
+    return isAction(element) && element.kind === ProtocolApplyLabelEditAction.KIND && 'labelId' in element && 'text' in element;
 }
 
 
@@ -78,11 +78,11 @@ export class ResolvedLabelEdit {
 }
 
 export class ApplyLabelEditCommand extends Command {
-    static readonly KIND = ApplyLabelEditAction.KIND;
+    static readonly KIND = ProtocolApplyLabelEditAction.KIND;
 
     protected resolvedLabelEdit: ResolvedLabelEdit;
 
-    constructor(@inject(TYPES.Action) protected readonly action: ApplyLabelEditAction) {
+    constructor(@inject(TYPES.Action) protected readonly action: ProtocolApplyLabelEditAction) {
         super();
     }