[PF-34] - Simulation

- refactor arc types

Author: mazarijuraj

local_build.sh

@@ -0,0 +1,3 @@
+# Build and publish to local Verdaccio npm registry
+npm run build
+npm publish --registry http://localhost:4873

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/petriflow",
-    "version": "1.3.6",
+    "version": "1.4.0-rc4",
     "description": "Javascript / Typescript library of Petriflow objects",
     "main": "dist/petriflow.js",
     "module": "dist/petriflow.esm.js",

src/lib/export/export-utils.ts

@@ -1,12 +1,14 @@
 import {
     Action,
+    ArcType,
     CaseLogic,
     Event,
     Expression,
     I18nString,
     I18nWithDynamic,
     Logic,
-    PetriflowFunction
+    PetriflowFunction,
+    XmlArcType
 } from '../model';
 
 export class ExportUtils {
@@ -145,4 +147,20 @@ export class ExportUtils {
         }
         element.appendChild(exportLogic);
     }
+
+    public arcTypeMapping: Map<ArcType, XmlArcType> = new Map([
+        [ArcType.REGULAR_TP, XmlArcType.REGULAR],
+        [ArcType.REGULAR_PT, XmlArcType.REGULAR],
+        [ArcType.READ, XmlArcType.READ],
+        [ArcType.RESET, XmlArcType.RESET],
+        [ArcType.INHIBITOR, XmlArcType.INHIBITOR],
+    ]);
+
+    public exportArcType(type: ArcType): XmlArcType {
+        const xmlType = this.arcTypeMapping.get(type);
+        if (!xmlType) {
+            throw new Error(`Unknown export mapping for arc type ${type}`);
+        }
+        return xmlType;
+    }
 }

src/lib/export/export.service.ts

@@ -433,7 +433,7 @@ export class ExportService {
         model.getArcs().forEach(arc => {
             const exportArc = this.xmlConstructor.createElement('arc');
             this._exportUtils.exportTag(exportArc, 'id', arc.id, true);
-            this._exportUtils.exportTag(exportArc, 'type', arc.type);
+            this._exportUtils.exportTag(exportArc, 'type', this._exportUtils.exportArcType(arc.type));
             this._exportUtils.exportTag(exportArc, 'sourceId', arc.source.id);
             this._exportUtils.exportTag(exportArc, 'destinationId', arc.destination.id);
             this._exportUtils.exportTag(exportArc, 'multiplicity', arc.multiplicity?.toString());

src/lib/import/import-utils.ts

@@ -3,7 +3,6 @@ import {
     Alignment,
     Appearance,
     Arc,
-    ArcType,
     CompactDirection,
     Component,
     DataEvent,
@@ -34,7 +33,7 @@ import {
     Template,
     Trigger,
     TriggerType,
-    UserRef
+    UserRef, XmlArcType
 } from '../model';
 
 export class ImportUtils {
@@ -356,10 +355,10 @@ export class ImportUtils {
         return isStatic;
     }
 
-    public parseArcType(xmlArc: Element): ArcType {
-        let parsedArcType = ArcType.REGULAR;
+    public parseArcType(xmlArc: Element): XmlArcType {
+        let parsedArcType = XmlArcType.REGULAR;
         if (this.checkLengthAndNodes(xmlArc, 'type')) {
-            parsedArcType = xmlArc.getElementsByTagName('type')[0].childNodes[0].nodeValue as ArcType;
+            parsedArcType = xmlArc.getElementsByTagName('type')[0].childNodes[0].nodeValue as XmlArcType;
         }
         return parsedArcType;
     }

src/lib/import/import.service.ts

@@ -1,7 +1,6 @@
 import {
     Alignment,
     Arc,
-    ArcType,
     AssignedUser,
     AssignPolicy,
     Breakpoint,
@@ -45,7 +44,8 @@ import {
     TransitionEventType,
     TransitionLayout,
     UserRef,
-    Validation
+    Validation,
+    XmlArcType
 } from '../model';
 import {ImportUtils} from './import-utils';
 import {PetriNetResult} from './petri-net-result';
@@ -592,7 +592,7 @@ export class ImportService {
         const parsedArcType = this.importUtils.parseArcType(xmlArc);
         const arc = this.resolveArc(source, target, parsedArcType, arcId, result);
         arc.multiplicity = this.importUtils.parseNumberValue(xmlArc, 'multiplicity') ?? 0;
-        if (parsedArcType === ArcType.VARIABLE) {
+        if (parsedArcType as string === 'variable') {
             arc.reference = xmlArc.getElementsByTagName('multiplicity')[0]?.childNodes[0]?.nodeValue ?? undefined;
             this.importUtils.checkVariability(result.model, arc, arc.reference);
             result.addInfo(`Variable arc '${arc.id}' converted to regular with data field reference`);
@@ -605,21 +605,21 @@ export class ImportService {
         return arc;
     }
 
-    resolveArc(source: string, target: string, parsedArcType: ArcType, arcId: string, result: PetriNetResult): Arc<NodeElement, NodeElement> {
+    resolveArc(source: string, target: string, parsedArcType: XmlArcType, arcId: string, result: PetriNetResult): Arc<NodeElement, NodeElement> {
         // TODO: refactor
         let place, transition;
         switch (parsedArcType) {
-            case ArcType.INHIBITOR:
+            case XmlArcType.INHIBITOR:
                 [place, transition] = this.getPlaceTransition(result, source, target, arcId);
                 return new InhibitorArc(place, transition, arcId);
-            case ArcType.RESET:
+            case XmlArcType.RESET:
                 [place, transition] = this.getPlaceTransition(result, source, target, arcId);
                 return new ResetArc(place, transition, arcId);
-            case ArcType.READ:
+            case XmlArcType.READ:
                 [place, transition] = this.getPlaceTransition(result, source, target, arcId);
                 return new ReadArc(place, transition, arcId);
-            case ArcType.REGULAR:
-            case ArcType.VARIABLE:
+            case XmlArcType.REGULAR:
+            case 'variable' as XmlArcType:
                 if (result.model.getPlace(source)) {
                     [place, transition] = this.getPlaceTransition(result, source, target, arcId);
                     return new RegularPlaceTransitionArc(place, transition, arcId);

src/lib/model/arc/arc-type.enum.ts

@@ -1,7 +1,14 @@
 export enum ArcType {
+    REGULAR_PT = 'regular_pt',
+    REGULAR_TP = 'regular_tp',
+    READ = 'read',
+    RESET = 'reset',
+    INHIBITOR = 'inhibitor',
+}
+
+export enum XmlArcType {
     REGULAR = 'regular',
     READ = 'read',
     RESET = 'reset',
     INHIBITOR = 'inhibitor',
-    VARIABLE = 'variable'
 }

src/lib/model/arc/arc.ts

@@ -1,17 +1,17 @@
+import {Element} from '../petrinet/element';
 import {NodeElement} from '../petrinet/node-element';
 import {ArcType} from './arc-type.enum';
 import {Breakpoint} from './breakpoint';
 
-export abstract class Arc<S extends NodeElement, D extends NodeElement> {
-    private _id: string;
+export abstract class Arc<S extends NodeElement, D extends NodeElement> extends Element {
     private _source: S;
     private _destination: D;
     private _multiplicity: number;
     private _reference?: string;
     private _breakpoints: Array<Breakpoint>;
 
     constructor(source: S, target: D, id: string) {
-        this._id = id;
+        super(id);
         this._source = source;
         this._destination = target;
         this._multiplicity = 1;
@@ -20,14 +20,6 @@ export abstract class Arc<S extends NodeElement, D extends NodeElement> {
 
     abstract get type(): ArcType;
 
-    get id(): string {
-        return this._id;
-    }
-
-    set id(value: string) {
-        this._id = value;
-    }
-
     get source(): S {
         return this._source;
     }

src/lib/model/arc/regular-place-transition-arc.ts

@@ -24,7 +24,7 @@ export class RegularPlaceTransitionArc extends PlaceTransitionArc {
     }
 
     get type(): ArcType {
-        return ArcType.REGULAR;
+        return ArcType.REGULAR_PT;
     }
 
     clone(): RegularPlaceTransitionArc {

src/lib/model/arc/regular-transition-place-arc.ts

@@ -11,7 +11,7 @@ export class RegularTransitionPlaceArc extends TransitionPlaceArc {
     }
 
     get type(): ArcType {
-        return ArcType.REGULAR;
+        return ArcType.REGULAR_TP;
     }
 
     clone(): RegularTransitionPlaceArc {