@packtrack/layout 1.2.0 → 1.3.1

package/.built/index.d.ts

@@ -1,20 +1,20 @@
-export * from './district';
-export * from './layout';
-export * from './position';
-export * from './route';
-export * from './router';
-export * from './section';
-export * from './span';
-export * from './tile';
-export * from './track';
-export * from './monitor';
-export * from './throttle';
-export * from './power-district/index';
-export * from './power-district/activator';
-export * from './power-district/monitor';
-export * from './power-district/reverser';
-export * from './positioner/index';
-export * from './positioner/point';
-export * from './positioner/responder-type';
-export * from './device/index';
-export * from './device/channel';
+export * from './source/district';
+export * from './source/layout';
+export * from './source/position';
+export * from './source/route';
+export * from './source/router';
+export * from './source/section';
+export * from './source/span';
+export * from './source/tile';
+export * from './source/track';
+export * from './source/monitor';
+export * from './source/throttle';
+export * from './source/power-district/index';
+export * from './source/power-district/activator';
+export * from './source/power-district/monitor';
+export * from './source/power-district/reverser';
+export * from './source/positioner/index';
+export * from './source/positioner/point';
+export * from './source/positioner/responder-type';
+export * from './source/device/index';
+export * from './source/device/channel';

package/.built/index.js

@@ -1,20 +1,20 @@
-export * from './district';
-export * from './layout';
-export * from './position';
-export * from './route';
-export * from './router';
-export * from './section';
-export * from './span';
-export * from './tile';
-export * from './track';
-export * from './monitor';
-export * from './throttle';
-export * from './power-district/index';
-export * from './power-district/activator';
-export * from './power-district/monitor';
-export * from './power-district/reverser';
-export * from './positioner/index';
-export * from './positioner/point';
-export * from './positioner/responder-type';
-export * from './device/index';
-export * from './device/channel';
+export * from './source/district';
+export * from './source/layout';
+export * from './source/position';
+export * from './source/route';
+export * from './source/router';
+export * from './source/section';
+export * from './source/span';
+export * from './source/tile';
+export * from './source/track';
+export * from './source/monitor';
+export * from './source/throttle';
+export * from './source/power-district/index';
+export * from './source/power-district/activator';
+export * from './source/power-district/monitor';
+export * from './source/power-district/reverser';
+export * from './source/positioner/index';
+export * from './source/positioner/point';
+export * from './source/positioner/responder-type';
+export * from './source/device/index';
+export * from './source/device/channel';

package/.built/source/device/channel.d.ts

@@ -1,8 +1,8 @@
-import { Device } from "./device";
+import { Device } from "./index";
 export declare class Channel {
     device: Device;
     name: string;
     constructor(device: Device, name: string);
-    dump(): void;
     publish(data: any): void;
+    toString(): string;
 }

package/.built/source/device/channel.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Channel = void 0;
-class Channel {
+export class Channel {
     device;
     name;
     constructor(device, name) {
         this.device = device;
         this.name = name;
     }
-    dump() {
-        console.log(`Channel '${this.name}' on ${this.device.identifier}`);
-    }
     publish(data) { }
+    toString() {
+        return `${this.device.identifier}/${this.name}`;
+    }
 }
-exports.Channel = Channel;

package/.built/{device → source/device}/index.d.ts

@@ -7,5 +7,4 @@ export declare class Device {
         address: string;
     };
     constructor(identifier: string);
-    dump(): void;
 }

package/.built/source/device/index.js

@@ -0,0 +1,8 @@
+export class Device {
+    identifier;
+    channels = [];
+    lastDiscovery;
+    constructor(identifier) {
+        this.identifier = identifier;
+    }
+}

package/.built/source/district.d.ts

@@ -1,5 +1,6 @@
 import { Layout } from "./layout";
-import { PowerDistrict } from "./power-district";
+import { Monitor } from "./monitor";
+import { PowerDistrict } from "./power-district/index";
 import { Router } from "./router";
 import { Section } from "./section";
 export declare class District {
@@ -9,12 +10,7 @@ export declare class District {
     powerDistricts: PowerDistrict[];
     sections: Section[];
     routers: Router[];
+    monitors: Monitor[];
     constructor(name: string, parent: District | Layout);
     get domainName(): string;
-    dump(): void;
-    toDotReference(): any;
-    toDotDefinition(): any;
-    toDotConnection(): any;
-    toSVG(): any;
-    findSVGPositions(): any;
 }

package/.built/source/district.js

@@ -1,86 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.District = void 0;
-const layout_1 = require("./layout");
-class District {
+import { Layout } from "./layout";
+export class District {
     name;
     parent;
     children = [];
     powerDistricts = [];
     sections = [];
     routers = [];
+    monitors = [];
     constructor(name, parent) {
         this.name = name;
         this.parent = parent;
     }
     get domainName() {
-        if (this.parent instanceof layout_1.Layout) {
+        if (this.parent instanceof Layout) {
             return `${this.name}.${this.parent.name}`;
         }
         return `${this.name}.${this.parent.domainName}`;
     }
-    dump() {
-        console.group(`District ${this.domainName}`);
-        if (this.powerDistricts.length) {
-            console.group('power districts');
-            for (let district of this.powerDistricts) {
-                district.dump();
-            }
-            console.groupEnd();
-        }
-        if (this.sections.length) {
-            console.group('sections');
-            for (let section of this.sections) {
-                section.dump();
-            }
-            console.groupEnd();
-        }
-        if (this.children.length) {
-            console.group('children');
-            for (let district of this.children) {
-                district.dump();
-            }
-            console.groupEnd();
-        }
-        console.groupEnd();
-    }
-    toDotReference() {
-        return `cluster_${this.name.replace(/-/g, '_')}${this.parent instanceof District ? this.parent.toDotReference() : ''}`;
-    }
-    toDotDefinition() {
-        return `
-			subgraph ${this.toDotReference()} {
-				label = ${JSON.stringify(this.name)}
-				
-				${this.sections.map(section => section.toDotDefinition()).join('')}
-				${this.routers.map(router => router.toDotDefinition()).join('')}
-				
-				${this.children.map(child => child.toDotDefinition()).join('')}
-			}
-		`;
-    }
-    toDotConnection() {
-        return `
-			${this.sections.map(section => section.toDotConnection()).join('')}
-			${this.routers.map(router => router.toDotConnection()).join('')}
-				
-			${this.children.map(child => child.toDotConnection()).join('')}
-		`;
-    }
-    toSVG() {
-        return `
-			<g id=${JSON.stringify(this.domainName)}>
-				${this.sections.map(section => section.toSVG()).join('')}
-
-				${this.children.map(child => child.toSVG()).join('')}
-			</g>
-		`;
-    }
-    findSVGPositions() {
-        return [
-            ...this.sections.map(section => section.findSVGPositions()),
-            ...this.children.map(child => child.findSVGPositions())
-        ];
-    }
 }
-exports.District = District;

package/.built/source/layout.d.ts

@@ -1,17 +1,23 @@
 import { District } from "./district";
-import { PowerDistrict } from "./power-district";
+import { PowerDistrict } from "./power-district/index";
 import { Router } from "./router";
 import { Section } from "./section";
-import { Device } from "./device/device";
-import { ResponderType } from "../positioner/responder-type";
+import { Device } from "./device/index";
+import { ResponderType } from "./positioner/responder-type";
 import { Channel } from "./device/channel";
+import { Monitor } from "./monitor";
+import { Throttle } from "./throttle";
 export declare class Layout {
     name: string;
     districts: District[];
     devices: Device[];
     responderType: ResponderType[];
+    monitors: Monitor[];
+    throttles: Throttle[];
     get allDistricts(): District[];
     static from(document: any): Layout;
+    loadMonitor(source: any, parent: District | Layout): Monitor;
+    loadThrottle(source: any, parent: District | Layout): Throttle;
     loadDistrict(source: any, parent: District | Layout): District;
     linkDistrict(source: any, district: District): void;
     loadSection(source: any, district: District): void;
@@ -23,7 +29,4 @@ export declare class Layout {
     loadRouter(source: any, district: District): Router;
     linkRouter(source: any, router: Router): void;
     loadPowerDistrict(source: any, district: District): PowerDistrict;
-    toDot(): string;
-    toSVG(inject?: string): string;
-    dump(): void;
 }

package/.built/source/layout.js

@@ -1,22 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Layout = void 0;
-const district_1 = require("./district");
-const power_district_1 = require("./power-district");
-const route_1 = require("./route");
-const router_1 = require("./router");
-const section_1 = require("./section");
-const tile_1 = require("./tile");
-const track_1 = require("./track");
-const point_1 = require("../positioner/point");
-const device_1 = require("./device/device");
-const responder_type_1 = require("../positioner/responder-type");
-const channel_1 = require("./device/channel");
-class Layout {
+import { District } from "./district";
+import { PowerDistrict } from "./power-district/index";
+import { Route } from "./route";
+import { Router } from "./router";
+import { Section } from "./section";
+import { TilePattern, Tile } from "./tile";
+import { Track } from "./track";
+import { Device } from "./device/index";
+import { ResponderType } from "./positioner/responder-type";
+import { Channel } from "./device/channel";
+import { PointPositioner } from "./positioner/point";
+import { PowerDistrictActivator } from "./power-district/activator";
+import { PowerDistrictReverser } from "./power-district/reverser";
+import { PowerDistrictMonitor } from "./power-district/monitor";
+import { Monitor } from "./monitor";
+import { Throttle } from "./throttle";
+export class Layout {
     name;
     districts = [];
     devices = [];
     responderType = [];
+    monitors = [];
+    throttles = [];
     get allDistricts() {
         const districts = [];
         function walkDistrict(district) {
@@ -36,30 +40,44 @@ class Layout {
         layout.name = railway.getAttribute('name');
         const version = railway.getAttribute('version');
         if (version == '1') {
-            let district = railway.firstChild;
-            while (district) {
-                if (district.tagName == 'district') {
-                    layout.districts.push(layout.loadDistrict(district, layout));
+            let child = railway.firstChild;
+            while (child) {
+                if (child.tagName == 'district') {
+                    layout.districts.push(layout.loadDistrict(child, layout));
                 }
-                district = district.nextSibling;
+                if (child.tagName == 'monitor') {
+                    layout.monitors.push(layout.loadMonitor(child, layout));
+                }
+                if (child.tagName == 'throttle') {
+                    layout.throttles.push(layout.loadThrottle(child, layout));
+                }
+                child = child.nextSibling;
             }
-            district = railway.firstChild;
+            child = railway.firstChild;
             let index = 0;
-            while (district) {
-                if (district.tagName == 'district') {
-                    layout.linkDistrict(district, layout.districts[index]);
+            while (child) {
+                if (child.tagName == 'district') {
+                    layout.linkDistrict(child, layout.districts[index]);
                     index++;
                 }
-                district = district.nextSibling;
+                child = child.nextSibling;
             }
         }
         else {
-            throw new Error(`unsupported railway definition file version '${version}'`);
+            throw new Error(`Unsupported railway definition file version '${version}'`);
         }
         return layout;
     }
+    loadMonitor(source, parent) {
+        const montior = new Monitor(this.findDevice(source.getAttribute('device')), parent);
+        return montior;
+    }
+    loadThrottle(source, parent) {
+        const throttle = new Throttle(this.findDevice(source.getAttribute('device')), parent);
+        return throttle;
+    }
     loadDistrict(source, parent) {
-        const district = new district_1.District(source.getAttribute('name'), parent);
+        const district = new District(source.getAttribute('name'), parent);
         let child = source.firstChild;
         while (child) {
             if (child.tagName == 'power-districts') {
@@ -80,6 +98,9 @@ class Layout {
             if (child.tagName == 'district') {
                 district.children.push(this.loadDistrict(child, district));
             }
+            if (child.tagName == 'monitor') {
+                district.monitors.push(this.loadMonitor(child, district));
+            }
             child = child.nextSibling;
         }
         return district;
@@ -104,7 +125,7 @@ class Layout {
         }
     }
     loadSection(source, district) {
-        const section = new section_1.Section(source.getAttribute('name'), district);
+        const section = new Section(source.getAttribute('name'), district);
         district.sections.push(section);
         let child = source.firstChild;
         while (child) {
@@ -112,7 +133,7 @@ class Layout {
                 let trackNode = child.firstChild;
                 while (trackNode) {
                     if (trackNode.tagName == 'track') {
-                        const track = new track_1.Track(section, +trackNode.getAttribute('length'), trackNode.getAttribute('path'));
+                        const track = new Track(section, +trackNode.getAttribute('length'), trackNode.getAttribute('path'));
                         section.tracks.push(track);
                         let trackChild = trackNode.firstChild;
                         while (trackChild) {
@@ -123,7 +144,7 @@ class Layout {
                                         const device = this.findDevice(positioner.getAttribute('device'));
                                         const channel = this.findChannel(device, positioner.getAttribute('channel'));
                                         const responderType = this.findResponderType(positioner.getAttribute('responder'));
-                                        track.positioners.push(new point_1.PointPositioner(track, +positioner.getAttribute('offset'), channel, responderType));
+                                        track.positioners.push(new PointPositioner(track, +positioner.getAttribute('offset'), channel, responderType));
                                     }
                                     positioner = positioner.nextSibling;
                                 }
@@ -136,10 +157,10 @@ class Layout {
             }
             if (child.tagName == 'tile') {
                 const pattern = child.getAttribute('pattern');
-                if (!(pattern in tile_1.TilePattern.patterns)) {
+                if (!(pattern in TilePattern.patterns)) {
                     throw new Error(`Unknown tile pattern '${pattern}' in tile ${section.tiles.length + 1} in ${section.domainName}`);
                 }
-                section.tiles.push(new tile_1.Tile(section, +child.getAttribute('x'), +child.getAttribute('y'), tile_1.TilePattern.patterns[pattern]));
+                section.tiles.push(new Tile(section, +child.getAttribute('x'), +child.getAttribute('y'), TilePattern.patterns[pattern]));
             }
             child = child.nextSibling;
         }
@@ -149,7 +170,7 @@ class Layout {
         if (device) {
             return device;
         }
-        device = new device_1.Device(identifier);
+        device = new Device(identifier);
         this.devices.push(device);
         return device;
     }
@@ -158,7 +179,7 @@ class Layout {
         if (channel) {
             return channel;
         }
-        channel = new channel_1.Channel(device, name);
+        channel = new Channel(device, name);
         device.channels.push(channel);
         return channel;
     }
@@ -167,7 +188,7 @@ class Layout {
         if (type) {
             return type;
         }
-        type = new responder_type_1.ResponderType(name);
+        type = new ResponderType(name);
         this.responderType.push(type);
         return type;
     }
@@ -203,7 +224,7 @@ class Layout {
             pool = pool.parent;
         }
         for (let part of parts) {
-            const child = (pool instanceof district_1.District ? pool.children : pool.districts).find(child => child.name == part);
+            const child = (pool instanceof District ? pool.children : pool.districts).find(child => child.name == part);
             if (!child) {
                 throw new Error(`Section '${path}' could not be found from '${source.name}': district '${pool.name}' does not have a child named '${part}'`);
             }
@@ -215,72 +236,50 @@ class Layout {
         return this.findSection(sectionName, pool, source);
     }
     loadRouter(source, district) {
-        const router = new router_1.Router(source.getAttribute('name'), district);
+        const router = new Router(source.getAttribute('name'), district);
         return router;
     }
     linkRouter(source, router) {
         let child = source.firstChild;
+        let active;
         while (child) {
             if (child.tagName == 'route') {
-                const route = new route_1.Route(child.getAttribute('name'), router);
+                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('active')) {
+                    if (active) {
+                        throw new Error(`Router '${router.domainName}' has multiple active routes (${active.name}, ${route.name}).`);
+                    }
+                    active = route;
+                }
                 router.routes.push(route);
             }
             child = child.nextSibling;
         }
+        router.activeRoute = active;
     }
     loadPowerDistrict(source, district) {
-        const powerDistrict = new power_district_1.PowerDistrict(source.getAttribute('name'), district);
-        return powerDistrict;
-    }
-    toDot() {
-        let dot = 'digraph G {';
-        for (let district of this.districts) {
-            dot += district.toDotDefinition();
-        }
-        for (let district of this.districts) {
-            dot += district.toDotConnection();
-        }
-        return `${dot}}`;
-    }
-    toSVG(inject = '') {
-        const positons = this.districts.map(district => district.findSVGPositions()).flat(Infinity);
-        const width = Math.max(...positons.map(position => position.x));
-        const height = Math.max(...positons.map(position => position.y));
-        let svg = `<svg width="100vw" height="100vh" viewBox="0 0 ${width + 1} ${height + 1}" xmlns="http://www.w3.org/2000/svg">
-			<style>
-
-				path {
-					fill: none;
-					stroke: #000;
-					stroke-width: 0.2;
-				}
-
-			</style>
-		`;
-        for (let district of this.districts) {
-            svg += district.toSVG();
-        }
-        return `${svg}${inject}</svg>`;
-    }
-    dump() {
-        console.group(`Layout ${this.name}`);
-        console.log('devices');
-        for (let device of this.devices) {
-            device.dump();
-        }
-        console.log('responder types');
-        for (let type of this.responderType) {
-            type.dump();
-        }
-        console.log('districts');
-        for (let district of this.districts) {
-            district.dump();
+        const powerDistrict = new PowerDistrict(source.getAttribute('name'), district);
+        let actor = source.firstChild;
+        while (actor) {
+            if (actor.tagName == 'activator' || actor.tagName == 'reverser' || actor.tagName == 'monitor') {
+                const device = this.findDevice(actor.getAttribute('device'));
+                const channel = this.findChannel(device, actor.getAttribute('channel'));
+                if (actor.tagName == 'activator') {
+                    powerDistrict.activator = new PowerDistrictActivator(device, channel);
+                }
+                if (actor.tagName == 'reverser') {
+                    powerDistrict.reverser = new PowerDistrictReverser(device, channel);
+                }
+                if (actor.tagName == 'monitor') {
+                    powerDistrict.monitor = new PowerDistrictMonitor(device, channel);
+                }
+            }
+            actor = actor.nextSibling;
         }
-        console.groupEnd();
+        return powerDistrict;
     }
 }
-exports.Layout = Layout;

package/.built/{monitor.d.ts → source/monitor.d.ts}

@@ -1,9 +1,8 @@
-import { Device } from "./device";
+import { Device } from "./device/index";
 import { District } from "./district";
 import { Layout } from "./layout";
 export declare class Monitor {
     device: Device;
     scope: District | Layout;
     constructor(device: Device, scope: District | Layout);
-    dump(): void;
 }

package/.built/source/monitor.js

@@ -0,0 +1,8 @@
+export class Monitor {
+    device;
+    scope;
+    constructor(device, scope) {
+        this.device = device;
+        this.scope = scope;
+    }
+}

package/.built/source/position.d.ts

@@ -5,6 +5,8 @@ export declare class SectionPosition {
     reversed: boolean;
     constructor(section: Section, offset: number, reversed: boolean);
     get absolutePosition(): number;
-    advance(distance: number): any;
+    advance(distance: number): SectionPosition;
+    private invert;
     toString(): string;
+    toPackTrackValue(): string;
 }

package/.built/source/position.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SectionPosition = void 0;
-class SectionPosition {
+export class SectionPosition {
     section;
     offset;
     reversed;
@@ -9,14 +6,23 @@ class SectionPosition {
         this.section = section;
         this.offset = offset;
         this.reversed = reversed;
+        if (offset > section.length || offset < 0) {
+            throw new Error(`Offset ${offset} out of range for section '${section.domainName}' (0 - ${section.length})`);
+        }
     }
+    // returns the absolute position of the point inside the section
+    // regardless of direction
     get absolutePosition() {
         if (this.reversed) {
             return this.section.length - this.offset;
         }
         return this.offset;
     }
+    // TODO verify reverse
     advance(distance) {
+        if (distance < 0) {
+            return this.invert().advance(-distance).invert();
+        }
         if (this.offset + distance > this.section.length) {
             const next = this.section.next(this.reversed);
             if (!next) {
@@ -26,8 +32,14 @@ class SectionPosition {
         }
         return new SectionPosition(this.section, this.offset + distance, this.reversed);
     }
+    // reverse direction
+    invert() {
+        return new SectionPosition(this.section, this.section.length - this.offset, !this.reversed);
+    }
     toString() {
         return `${this.section.name} @ ${this.offset.toFixed(1)} ${this.reversed ? 'backward' : 'forward'}`;
     }
+    toPackTrackValue() {
+        return `${this.section.domainName}@${this.offset}${this.reversed ? 'R' : 'F'}`;
+    }
 }
-exports.SectionPosition = SectionPosition;

package/.built/{positioner → source/positioner}/point.d.ts

@@ -1,4 +1,4 @@
-import { Positioner } from ".";
+import { Positioner } from "./index";
 import { Channel } from "../device/channel";
 import { Track } from "../track";
 import { ResponderType } from "./responder-type";
@@ -8,6 +8,5 @@ export declare class PointPositioner extends Positioner {
     channel: Channel;
     responder: ResponderType;
     constructor(track: Track, offset: number, channel: Channel, responder: ResponderType);
-    get position(): import("..").SectionPosition;
-    dump(): void;
+    get position(): import("../position").SectionPosition;
 }