Skip to content

Commit c0dae87

Browse files
dylanvorsterdylanvorster
committed
cleanup
1 parent fddec93 commit c0dae87

23 files changed

+180
-203
lines changed

‎.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
dist
3+
.out

‎lib-core/src/DiagramEngine.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import * as _ from "lodash";
2-
import { BaseEntity } from "./core-models/BaseEntity";
3-
import { DiagramModel } from "./models/DiagramModel";
4-
import { BaseModel } from "./core-models/BaseModel";
5-
import { NodeModel } from "./models/NodeModel";
6-
import { PointModel } from "./models/PointModel";
7-
import { PortModel } from "./models/PortModel";
8-
import { LinkModel } from "./models/LinkModel";
9-
import { LabelModel } from "./models/LabelModel";
10-
import { FactoryBank } from "./core/FactoryBank";
11-
import { AbstractFactory } from "./core/AbstractFactory";
12-
import { AbstractReactFactory } from "./core/AbstractReactFactory";
13-
import { BaseListener, BaseObserver } from "./core/BaseObserver";
1+
import * as _ from 'lodash';
2+
import { BaseEntity } from './core-models/BaseEntity';
3+
import { DiagramModel } from './models/DiagramModel';
4+
import { BaseModel } from './core-models/BaseModel';
5+
import { NodeModel } from './models/NodeModel';
6+
import { PointModel } from './models/PointModel';
7+
import { PortModel } from './models/PortModel';
8+
import { LinkModel } from './models/LinkModel';
9+
import { LabelModel } from './models/LabelModel';
10+
import { FactoryBank } from './core/FactoryBank';
11+
import { AbstractFactory } from './core/AbstractFactory';
12+
import { AbstractReactFactory } from './core/AbstractReactFactory';
13+
import { BaseListener, BaseObserver } from './core/BaseObserver';
1414

1515
export interface DiagramEngineListener extends BaseListener {
1616
repaintCanvas?(): void;
@@ -195,7 +195,7 @@ export class DiagramEngine extends BaseObserver<DiagramEngineListener> {
195195
getNodeElement(node: NodeModel): Element {
196196
const selector = this.canvas.querySelector(`.node[data-nodeid="${node.getID()}"]`);
197197
if (selector === null) {
198-
throw new Error("Cannot find Node element with nodeID: [" + node.getID() + "]");
198+
throw new Error('Cannot find Node element with nodeID: [' + node.getID() + ']');
199199
}
200200
return selector;
201201
}
@@ -206,11 +206,11 @@ export class DiagramEngine extends BaseObserver<DiagramEngineListener> {
206206
);
207207
if (selector === null) {
208208
throw new Error(
209-
"Cannot find Node Port element with nodeID: [" +
210-
port.getParent().getID() +
211-
"] and name: [" +
212-
port.getName() +
213-
"]"
209+
'Cannot find Node Port element with nodeID: [' +
210+
port.getParent().getID() +
211+
'] and name: [' +
212+
port.getName() +
213+
']'
214214
);
215215
}
216216
return selector;

‎lib-core/src/core-models/BaseEntity.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Toolkit } from '../Toolkit';
22
import * as _ from 'lodash';
33
import { DiagramEngine } from '../DiagramEngine';
4-
import { BaseEvent, BaseListener, BaseObserver } from "../core/BaseObserver";
4+
import { BaseEvent, BaseListener, BaseObserver } from '../core/BaseObserver';
55

66
export interface BaseEntityEvent<T extends BaseEntity = BaseEntity> extends BaseEvent {
77
entity: T;
@@ -22,21 +22,20 @@ export interface BaseEntityOptions {
2222
export type BaseEntityGenerics = {
2323
LISTENER: BaseEntityListener;
2424
OPTIONS: BaseEntityOptions;
25-
}
25+
};
2626

2727
export class BaseEntity<T extends BaseEntityGenerics = BaseEntityGenerics> extends BaseObserver<T['LISTENER']> {
28-
2928
protected options: T['OPTIONS'];
3029

3130
constructor(options: T['OPTIONS'] = {}) {
3231
super();
3332
this.options = {
3433
id: Toolkit.UID(),
35-
...options,
34+
...options
3635
};
3736
}
3837

39-
getOptions(){
38+
getOptions() {
4039
return this.options;
4140
}
4241

‎lib-core/src/core-models/BaseModel.ts

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
import {
2-
BaseEntity,
3-
BaseEntityEvent,
4-
BaseEntityGenerics,
5-
BaseEntityListener,
6-
BaseEntityOptions
7-
} from "./BaseEntity";
8-
import { DiagramEngine } from "../DiagramEngine";
1+
import { BaseEntity, BaseEntityEvent, BaseEntityGenerics, BaseEntityListener, BaseEntityOptions } from './BaseEntity';
2+
import { DiagramEngine } from '../DiagramEngine';
93

104
export interface BaseModelListener extends BaseEntityListener {
115
selectionChanged?(event: BaseEntityEvent<BaseModel> & { isSelected: boolean }): void;
@@ -19,14 +13,13 @@ export interface BaseModelOptions extends BaseEntityOptions {
1913
extras?: any;
2014
}
2115

22-
export interface BaseModelGenerics extends BaseEntityGenerics{
23-
LISTENER: BaseModelListener
16+
export interface BaseModelGenerics extends BaseEntityGenerics {
17+
LISTENER: BaseModelListener;
2418
PARENT: BaseEntity;
2519
OPTIONS: BaseModelOptions;
2620
}
2721

2822
export class BaseModel<G extends BaseModelGenerics = BaseModelGenerics> extends BaseEntity<G> {
29-
3023
protected parent: G['PARENT'];
3124

3225
constructor(options: G['OPTIONS']) {
@@ -75,11 +68,11 @@ export class BaseModel<G extends BaseModelGenerics = BaseModelGenerics> extends
7568
{
7669
isSelected: selected
7770
},
78-
"selectionChanged"
71+
'selectionChanged'
7972
);
8073
}
8174

8275
remove() {
83-
this.fireEvent({}, "entityRemoved");
76+
this.fireEvent({}, 'entityRemoved');
8477
}
8578
}

‎lib-core/src/core-models/BasePositionModel.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
import { BaseModel, BaseModelGenerics, BaseModelListener } from "./BaseModel";
2-
import { DiagramEngine } from "../DiagramEngine";
3-
import { BaseEntityEvent } from "./BaseEntity";
1+
import { BaseModel, BaseModelGenerics, BaseModelListener } from './BaseModel';
2+
import { DiagramEngine } from '../DiagramEngine';
3+
import { BaseEntityEvent } from './BaseEntity';
44

5-
export interface BasePositionModelListener extends BaseModelListener{
5+
export interface BasePositionModelListener extends BaseModelListener {
66
positionChanged?(event: BaseEntityEvent<BasePositionModel>): void;
77
}
88

9-
export interface BasePositionModelGenerics extends BaseModelGenerics{
9+
export interface BasePositionModelGenerics extends BaseModelGenerics {
1010
LISTENER: BasePositionModelListener;
1111
}
1212

13-
export class BasePositionModel<G extends BasePositionModelGenerics = BasePositionModelGenerics> extends BaseModel<G>{
14-
13+
export class BasePositionModel<G extends BasePositionModelGenerics = BasePositionModelGenerics> extends BaseModel<G> {
1514
protected x: number;
1615
protected y: number;
1716

@@ -32,15 +31,14 @@ export class BasePositionModel<G extends BasePositionModelGenerics = BasePositio
3231
...super.serialize(),
3332
x: this.x,
3433
y: this.y
35-
}
34+
};
3635
}
3736

3837
getX() {
3938
return this.x;
4039
}
4140

42-
getY(){
41+
getY() {
4342
return this.y;
4443
}
45-
4644
}

‎lib-core/src/core/BaseObserver.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Toolkit } from "../Toolkit";
1+
import { Toolkit } from '../Toolkit';
22

33
export interface BaseEvent {
44
firing: boolean;
@@ -25,7 +25,7 @@ export type BaseListener = {
2525
/**
2626
* Type for other events that will fire
2727
*/
28-
[key: string]: (event: BaseEvent) => any
28+
[key: string]: (event: BaseEvent) => any;
2929
};
3030

3131
/**
@@ -38,7 +38,7 @@ export class BaseObserver<L extends BaseListener = BaseListener> {
3838
this.listeners = {};
3939
}
4040

41-
private fireEventInternal(fire: boolean, k: keyof L, event: BaseEvent, ) {
41+
private fireEventInternal(fire: boolean, k: keyof L, event: BaseEvent) {
4242
this.iterateListeners(listener => {
4343
// returning false here will instruct itteration to stop
4444
if (!fire && !event.firing) {
@@ -61,16 +61,16 @@ export class BaseObserver<L extends BaseListener = BaseListener> {
6161
};
6262

6363
// fire pre
64-
this.fireEventInternal( true, "eventWillFire", {
64+
this.fireEventInternal(true, 'eventWillFire', {
6565
...event,
6666
function: k
6767
} as BaseEventProxy);
6868

6969
// fire main event
70-
this.fireEventInternal( false, k, event as BaseEvent);
70+
this.fireEventInternal(false, k, event as BaseEvent);
7171

7272
// fire post
73-
this.fireEventInternal( true, "eventDidFire", {
73+
this.fireEventInternal(true, 'eventDidFire', {
7474
...event,
7575
function: k
7676
} as BaseEventProxy);

‎lib-core/src/models/DiagramModel.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import {
22
BaseEntity,
33
BaseEntityEvent,
44
BaseEntityGenerics,
5-
BaseEntityListener, BaseEntityOptions,
5+
BaseEntityListener,
6+
BaseEntityOptions,
67
BaseEntityType
7-
} from "../core-models/BaseEntity";
8+
} from '../core-models/BaseEntity';
89
import * as _ from 'lodash';
910
import { DiagramEngine } from '../DiagramEngine';
1011
import { LinkModel } from './LinkModel';
@@ -25,14 +26,14 @@ export interface DiagramListener extends BaseEntityListener {
2526
gridUpdated?(event: BaseEntityEvent<DiagramModel> & { size: number }): void;
2627
}
2728

28-
export interface DiagramModelOptions extends BaseEntityOptions{
29+
export interface DiagramModelOptions extends BaseEntityOptions {
2930
offsetX?: number;
3031
offsetY?: number;
3132
zoom?: number;
3233
gridSize?: number;
3334
}
3435

35-
export interface DiagramModelGenerics extends BaseEntityGenerics{
36+
export interface DiagramModelGenerics extends BaseEntityGenerics {
3637
LISTENER: DiagramListener;
3738
OPTIONS: DiagramModelOptions;
3839
}
@@ -50,7 +51,7 @@ export class DiagramModel<G extends DiagramModelGenerics = DiagramModelGenerics>
5051
gridSize: 0,
5152
offsetX: 0,
5253
offsetY: 0,
53-
...options,
54+
...options
5455
});
5556

5657
this.links = {};

‎lib-core/src/models/LabelModel.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { BaseModel, BaseModelGenerics } from "../core-models/BaseModel";
1+
import { BaseModel, BaseModelGenerics } from '../core-models/BaseModel';
22
import * as _ from 'lodash';
33
import { DiagramEngine } from '../DiagramEngine';
44

55
export class LabelModel<G extends BaseModelGenerics = BaseModelGenerics> extends BaseModel<G> {
6-
76
offsetX: number;
87
offsetY: number;
98

‎lib-core/src/models/LinkModel.ts

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { BaseModel, BaseModelGenerics, BaseModelListener } from "../core-models/BaseModel";
2-
import { PortModel } from "./PortModel";
3-
import { PointModel } from "./PointModel";
4-
import * as _ from "lodash";
5-
import { LabelModel } from "./LabelModel";
6-
import { DiagramEngine } from "../DiagramEngine";
7-
import { BaseEntityEvent } from "../core-models/BaseEntity";
8-
import { DiagramModel } from "./DiagramModel";
1+
import { BaseModel, BaseModelGenerics, BaseModelListener } from '../core-models/BaseModel';
2+
import { PortModel } from './PortModel';
3+
import { PointModel } from './PointModel';
4+
import * as _ from 'lodash';
5+
import { LabelModel } from './LabelModel';
6+
import { DiagramEngine } from '../DiagramEngine';
7+
import { BaseEntityEvent } from '../core-models/BaseEntity';
8+
import { DiagramModel } from './DiagramModel';
99

1010
export interface LinkModelListener extends BaseModelListener {
1111
sourcePortChanged?(event: BaseEntityEvent<LinkModel> & { port: null | PortModel }): void;
@@ -19,14 +19,13 @@ export interface LinkModelGenerics extends BaseModelGenerics {
1919
}
2020

2121
export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics> extends BaseModel<G> {
22-
2322
protected sourcePort: PortModel | null;
2423
protected targetPort: PortModel | null;
2524

2625
protected labels: LabelModel[];
2726
protected points: PointModel[];
2827

29-
constructor(options: G["OPTIONS"]) {
28+
constructor(options: G['OPTIONS']) {
3029
super(options);
3130
this.points = [
3231
new PointModel({
@@ -171,7 +170,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics> extends
171170
this.sourcePort.removeLink(this);
172171
}
173172
this.sourcePort = port;
174-
this.fireEvent({ port }, "sourcePortChanged");
173+
this.fireEvent({ port }, 'sourcePortChanged');
175174
}
176175

177176
getSourcePort(): PortModel {
@@ -190,7 +189,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics> extends
190189
this.targetPort.removeLink(this);
191190
}
192191
this.targetPort = port;
193-
this.fireEvent({ port }, "targetPortChanged");
192+
this.fireEvent({ port }, 'targetPortChanged');
194193
}
195194

196195
point(x: number, y: number): PointModel {
@@ -206,7 +205,7 @@ export class LinkModel<G extends LinkModelGenerics = LinkModelGenerics> extends
206205
return this.points;
207206
}
208207

209-
getLabels(){
208+
getLabels() {
210209
return this.labels;
211210
}
212211

‎lib-core/src/models/NodeModel.ts

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
import { BaseModelListener } from "../core-models/BaseModel";
1+
import { BaseModelListener } from '../core-models/BaseModel';
22
import * as _ from 'lodash';
33
import { DiagramEngine } from '../DiagramEngine';
44
import { BaseEntityEvent } from '../core-models/BaseEntity';
5-
import { BasePositionModel, BasePositionModelGenerics } from "../core-models/BasePositionModel";
6-
import { DiagramModel } from "./DiagramModel";
7-
import { PortModel } from "./PortModel";
5+
import { BasePositionModel, BasePositionModelGenerics } from '../core-models/BasePositionModel';
6+
import { DiagramModel } from './DiagramModel';
7+
import { PortModel } from './PortModel';
88

99
export interface NodeModelListener extends BaseModelListener {
1010
positionChanged?(event: BaseEntityEvent<NodeModel>): void;
1111
}
1212

13-
export interface NodeModelGenerics extends BasePositionModelGenerics{
13+
export interface NodeModelGenerics extends BasePositionModelGenerics {
1414
LISTENER: NodeModelListener;
1515
PARENT: DiagramModel;
1616
PORT: PortModel;
1717
}
1818

1919
export class NodeModel<G extends NodeModelGenerics = NodeModelGenerics> extends BasePositionModel<G> {
20-
2120
ports: { [s: string]: G['PORT'] };
2221

2322
// calculated post rendering so routing can be done correctly
@@ -81,7 +80,7 @@ export class NodeModel<G extends NodeModelGenerics = NodeModelGenerics> extends
8180
ports: _.map(this.ports, port => {
8281
return port.serialize();
8382
})
84-
}
83+
};
8584
}
8685

8786
doClone(lookupTable = {}, clone) {

0 commit comments

Comments
 (0)