@packtrack/layout 1.5.0 → 1.6.1

package/.built/index.d.ts

@@ -2,6 +2,7 @@ export * from './source/district';
 export * from './source/layout';
 export * from './source/position';
 export * from './source/route';
+export * from './source/route-controller';
 export * from './source/router';
 export * from './source/section';
 export * from './source/span';

package/.built/index.js

@@ -2,6 +2,7 @@ export * from './source/district';
 export * from './source/layout';
 export * from './source/position';
 export * from './source/route';
+export * from './source/route-controller';
 export * from './source/router';
 export * from './source/section';
 export * from './source/span';

package/.built/source/layout.js

@@ -14,6 +14,7 @@ import { PowerDistrictReverser } from "./power-district/reverser";
 import { PowerDistrictMonitor } from "./power-district/monitor";
 import { Monitor } from "./monitor";
 import { Throttle } from "./throttle";
+import { RouteController } from "./route-controller";
 export class Layout {
     name;
     districts = [];
@@ -241,13 +242,34 @@ export class Layout {
     }
     linkRouter(source, router) {
         let child = source.firstChild;
+        // controller can be set on router level if common for all routes
+        let commonController;
         while (child) {
+            if (child.tagName == 'controller') {
+                commonController = this.findChannel(this.findDevice(child.getAttribute('device')), child.getAttribute('channel'));
+            }
             if (child.tagName == 'route') {
                 const route = new Route(child.getAttribute('name'), router);
                 route.in = this.findSection(child.getAttribute('in'), router.district);
                 route.in.out = router;
                 route.out = this.findSection(child.getAttribute('out'), router.district);
                 route.out.in = router;
+                if (child.hasAttribute('command')) {
+                    const controller = new RouteController();
+                    controller.channel = commonController;
+                    controller.command = child.getAttribute('command');
+                    route.controllers.push(controller);
+                }
+                let routeChild = child.firstChild;
+                while (routeChild) {
+                    if (routeChild.tagName == 'controller') {
+                        const controller = new RouteController();
+                        controller.channel = this.findChannel(this.findDevice(routeChild.getAttribute('device')), routeChild.getAttribute('channel'));
+                        controller.command = routeChild.getAttribute('command');
+                        route.controllers.push(controller);
+                    }
+                    routeChild = routeChild.nextSibling;
+                }
                 router.routes.push(route);
             }
             child = child.nextSibling;

package/.built/source/route-controller.d.ts

@@ -0,0 +1,5 @@
+import { Channel } from "./device/channel";
+export declare class RouteController {
+    channel: Channel;
+    command: string;
+}

package/.built/source/route-controller.js

@@ -0,0 +1,4 @@
+export class RouteController {
+    channel;
+    command;
+}

package/.built/source/route.d.ts

@@ -1,3 +1,4 @@
+import { RouteController } from "./route-controller";
 import { Router } from "./router";
 import { Section } from "./section";
 export declare class Route {
@@ -5,5 +6,6 @@ export declare class Route {
     router: Router;
     in: Section;
     out: Section;
+    controllers: RouteController[];
     constructor(name: string, router: Router);
 }

package/.built/source/route.js

@@ -3,6 +3,7 @@ export class Route {
     router;
     in;
     out;
+    controllers = [];
     constructor(name, router) {
         this.name = name;
         this.router = router;

package/.built/source/span.js

@@ -42,6 +42,10 @@ export class Span {
         return this.contains(peer.head) || this.contains(peer.tail);
     }
     get length() {
+        // TODO verify reverse
+        if (this.head.section == this.tail.section) {
+            return Math.abs(this.head.offset - this.tail.offset);
+        }
         let length = 0;
         if (this.head.reversed) {
             length += this.head.section.length - this.head.offset;
@@ -52,11 +56,12 @@ export class Span {
         for (let section of this.inside) {
             length += section.length;
         }
+        // TODO verify
         if (this.tail.reversed) {
-            length += this.tail.section.length - this.tail.offset;
+            length += this.tail.offset;
         }
         else {
-            length += this.tail.offset;
+            length += this.tail.section.length - this.tail.offset;
         }
         return length;
     }

package/index.ts

@@ -2,6 +2,7 @@ export * from './source/district';
 export * from './source/layout';
 export * from './source/position';
 export * from './source/route';
+export * from './source/route-controller';
 export * from './source/router';
 export * from './source/section';
 export * from './source/span';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@packtrack/layout",
-	"version": "1.5.0",
+	"version": "1.6.1",
 	"type": "module",
 	"main": ".built/index.js",
 	"typings": ".built/index.d.ts",

package/source/layout.ts

@@ -14,6 +14,7 @@ import { PowerDistrictReverser } from "./power-district/reverser";
 import { PowerDistrictMonitor } from "./power-district/monitor";
 import { Monitor } from "./monitor";
 import { Throttle } from "./throttle";
+import { RouteController } from "./route-controller";
 
 export class Layout {
 	name: string;
@@ -344,7 +345,14 @@ export class Layout {
 	linkRouter(source, router: Router) {
 		let child = source.firstChild;
 
+		// controller can be set on router level if common for all routes
+		let commonController: Channel;
+
 		while (child) {
+			if (child.tagName == 'controller') {
+				commonController = this.findChannel(this.findDevice(child.getAttribute('device')), child.getAttribute('channel'));
+			}
+
 			if (child.tagName == 'route') {
 				const route = new Route(child.getAttribute('name'), router);
 
@@ -354,6 +362,28 @@ export class Layout {
 				route.out = this.findSection(child.getAttribute('out'), router.district);
 				route.out.in = router;
 
+				if (child.hasAttribute('command')) {
+					const controller = new RouteController();
+					controller.channel = commonController;
+					controller.command = child.getAttribute('command');
+
+					route.controllers.push(controller);
+				}
+
+				let routeChild = child.firstChild;
+
+				while (routeChild) {
+					if (routeChild.tagName == 'controller') {
+						const controller = new RouteController();
+						controller.channel = this.findChannel(this.findDevice(routeChild.getAttribute('device')), routeChild.getAttribute('channel'));
+						controller.command = routeChild.getAttribute('command');
+
+						route.controllers.push(controller);
+					}
+
+					routeChild = routeChild.nextSibling;
+				}
+
 				router.routes.push(route);
 			}
 

package/source/route-controller.ts

@@ -0,0 +1,6 @@
+import { Channel } from "./device/channel";
+
+export class RouteController {
+	channel: Channel;
+	command: string;
+}

package/source/route.ts

@@ -1,3 +1,4 @@
+import { RouteController } from "./route-controller";
 import { Router } from "./router";
 import { Section } from "./section";
 
@@ -5,6 +6,8 @@ export class Route {
 	in: Section;
 	out: Section;
 
+	controllers: RouteController[] = [];
+
 	constructor(
 		public name: string,
 		public router: Router,

package/source/span.ts

@@ -46,6 +46,11 @@ export class Span {
 	}
 
 	get length() {
+		// TODO verify reverse
+		if (this.head.section == this.tail.section) {
+			return Math.abs(this.head.offset - this.tail.offset);
+		}
+
 		let length = 0;
 
 		if (this.head.reversed) {
@@ -58,10 +63,11 @@ export class Span {
 			length += section.length;
 		}
 
+		// TODO verify
 		if (this.tail.reversed) {
-			length += this.tail.section.length - this.tail.offset;
-		} else {
 			length += this.tail.offset;
+		} else {
+			length += this.tail.section.length - this.tail.offset;
 		}
 
 		return length;