@packtrack/layout 1.1.0 → 1.3.0

package/.built/source/section.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Section = void 0;
-const position_1 = require("./position");
-const router_1 = require("./router");
-class Section {
+import { SectionPosition } from "./position";
+import { Router } from "./router";
+export class Section {
     name;
     district;
     powerDistrict;
@@ -27,7 +24,7 @@ class Section {
             if (this.in instanceof Section) {
                 return this.in;
             }
-            if (this.in instanceof router_1.Router) {
+            if (this.in instanceof Router) {
                 const activeRoute = this.in.activeRoute;
                 if (!activeRoute) {
                     throw new Error(`Router '${this.in.domainName}' has no active route`);
@@ -48,7 +45,7 @@ class Section {
             if (this.out instanceof Section) {
                 return this.out;
             }
-            if (this.out instanceof router_1.Router) {
+            if (this.out instanceof Router) {
                 const activeRoute = this.out.activeRoute;
                 if (!activeRoute) {
                     throw new Error(`Router '${this.out.domainName}' has no active route`);
@@ -113,17 +110,6 @@ class Section {
             tiles
         };
     }
-    dump() {
-        console.group(`Section ${this.domainName}`);
-        console.log('in', this.in?.name ?? 'buffer');
-        console.log('out', this.out?.name ?? 'buffer');
-        console.group(`tracks`);
-        for (let track of this.tracks) {
-            track.dump();
-        }
-        console.groupEnd();
-        console.groupEnd();
-    }
     get length() {
         return this.tracks.reduce((accumulator, track) => accumulator + track.length, 0);
     }
@@ -153,13 +139,13 @@ class Section {
             if (!next) {
                 return {
                     sections,
-                    tip: new position_1.SectionPosition(tip, tip.length, false)
+                    tip: new SectionPosition(tip, tip.length, false)
                 };
             }
             if (next instanceof Section) {
                 tip = next;
             }
-            if (next instanceof router_1.Router) {
+            if (next instanceof Router) {
                 if (!next.activeRoute) {
                     throw new Error(`Router '${next.domainName}' has no active route (routes: ${next.routes.map(route => `'${route.name}'`).join(', ')})`);
                 }
@@ -176,42 +162,7 @@ class Section {
         }
         return {
             sections,
-            tip: new position_1.SectionPosition(tip, reversed ? -length : tip.length + length, false)
+            tip: new SectionPosition(tip, reversed ? -length : tip.length + length, false)
         };
     }
-    toDotReference() {
-        return `section_${this.name.replace(/-/g, '_')}_${this.district.toDotReference()}`;
-    }
-    toDotDefinition() {
-        return `
-			${this.toDotReference()} [ label = ${JSON.stringify(`${this.name}\n${this.length}`)}, shape = box ]
-		`;
-    }
-    toDotConnection() {
-        return `
-			${this.out instanceof Section ? `${this.toDotReference()} -> ${this.out.toDotReference()}` : ''}
-		`;
-    }
-    toSVG() {
-        return `
-			<g id=${JSON.stringify(this.domainName).split('.').join('_')}>
-				<style>
-
-					g#${this.domainName.split('.').join('_')} path {
-						stroke: hsl(${(this.length / this.tileLength)}deg, 100%, 50%);
-					}
-
-				</style>
-
-				${this.tiles.map(tile => tile.toSVG()).join('')}
-			</g>
-		`;
-    }
-    findSVGPositions() {
-        return this.tiles.map(tile => ({
-            x: tile.x,
-            y: tile.y
-        }));
-    }
 }
-exports.Section = Section;

package/.built/source/span.d.ts

@@ -0,0 +1,12 @@
+import { SectionPosition } from "./position";
+import { Section } from "./section";
+export declare class Span {
+    head: SectionPosition;
+    inside: Section[];
+    tail: SectionPosition;
+    constructor(head: SectionPosition, inside: Section[], tail: SectionPosition);
+    contains(position: SectionPosition): boolean;
+    overlap(peer: Span): boolean;
+    get length(): number;
+    static trail(start: SectionPosition, end: SectionPosition): Span;
+}

package/.built/source/span.js

@@ -0,0 +1,77 @@
+export class Span {
+    head;
+    inside;
+    tail;
+    constructor(head, inside, tail) {
+        this.head = head;
+        this.inside = inside;
+        this.tail = tail;
+    }
+    // TODO verify reverse
+    contains(position) {
+        if (this.inside.includes(position.section)) {
+            return true;
+        }
+        if (position.section == this.head.section) {
+            if (this.head.reversed) {
+                if (this.head.absolutePosition > position.absolutePosition) {
+                    return true;
+                }
+            }
+            else {
+                if (this.head.offset < position.absolutePosition) {
+                    return true;
+                }
+            }
+        }
+        if (position.section == this.tail.section) {
+            if (this.tail.reversed) {
+                if (this.tail.absolutePosition < position.absolutePosition) {
+                    return true;
+                }
+            }
+            else {
+                if (this.tail.offset > position.absolutePosition) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    overlap(peer) {
+        return this.contains(peer.head) || this.contains(peer.tail);
+    }
+    get length() {
+        let length = 0;
+        if (this.head.reversed) {
+            length += this.head.section.length - this.head.offset;
+        }
+        else {
+            length += this.head.offset;
+        }
+        for (let section of this.inside) {
+            length += section.length;
+        }
+        if (this.tail.reversed) {
+            length += this.tail.section.length - this.tail.offset;
+        }
+        else {
+            length += this.tail.offset;
+        }
+        return length;
+    }
+    // TODO verify reverse
+    // TODO add efficient algo
+    static trail(start, end) {
+        let head = start;
+        const sections = [];
+        const increment = 1;
+        while (head.section != end.section) {
+            head = head.advance(increment);
+            if (head.section != start.section && head.section != end.section && !sections.includes(head.section)) {
+                sections.push(head.section);
+            }
+        }
+        return new Span(start, sections, end);
+    }
+}

package/.built/source/throttle.d.ts

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

package/.built/source/throttle.js

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

package/.built/source/tile.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tile = exports.TilePattern = void 0;
-class TilePattern {
+export class TilePattern {
     length;
     path;
     // TODO: replace simple paths with rounded versions
@@ -53,8 +50,7 @@ class TilePattern {
         this.path = path;
     }
 }
-exports.TilePattern = TilePattern;
-class Tile {
+export class Tile {
     section;
     x;
     y;
@@ -75,4 +71,3 @@ class Tile {
         `;
     }
 }
-exports.Tile = Tile;

package/.built/source/track.d.ts

@@ -1,4 +1,4 @@
-import { Positioner } from "../positioner";
+import { Positioner } from "./positioner/index";
 import { Section } from "./section";
 import { SectionPosition } from "./position";
 export declare class Track {
@@ -8,5 +8,4 @@ export declare class Track {
     positioners: Positioner[];
     constructor(section: Section, length: number, path: string);
     get head(): SectionPosition;
-    dump(): void;
 }

package/.built/source/track.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Track = void 0;
-const position_1 = require("./position");
-class Track {
+import { SectionPosition } from "./position";
+export class Track {
     section;
     length;
     path;
@@ -17,13 +14,9 @@ class Track {
         let offset = 0;
         for (let track of this.section.tracks) {
             if (track == this) {
-                return new position_1.SectionPosition(this.section, offset, false);
+                return new SectionPosition(this.section, offset, false);
             }
             offset += track.length;
         }
     }
-    dump() {
-        console.log(this.length);
-    }
 }
-exports.Track = Track;

package/.built/span.d.ts

@@ -0,0 +1,12 @@
+import { SectionPosition } from "./position";
+import { Section } from "./section";
+export declare class Span {
+    head: SectionPosition;
+    inside: Section[];
+    tail: SectionPosition;
+    constructor(head: SectionPosition, inside: Section[], tail: SectionPosition);
+    contains(position: SectionPosition): boolean;
+    overlap(peer: Span): boolean;
+    get length(): number;
+    static trail(start: SectionPosition, end: SectionPosition): Span;
+}

package/.built/span.js

@@ -0,0 +1,77 @@
+export class Span {
+    head;
+    inside;
+    tail;
+    constructor(head, inside, tail) {
+        this.head = head;
+        this.inside = inside;
+        this.tail = tail;
+    }
+    // TODO verify reverse
+    contains(position) {
+        if (this.inside.includes(position.section)) {
+            return true;
+        }
+        if (position.section == this.head.section) {
+            if (this.head.reversed) {
+                if (this.head.absolutePosition > position.absolutePosition) {
+                    return true;
+                }
+            }
+            else {
+                if (this.head.offset < position.absolutePosition) {
+                    return true;
+                }
+            }
+        }
+        if (position.section == this.tail.section) {
+            if (this.tail.reversed) {
+                if (this.tail.absolutePosition < position.absolutePosition) {
+                    return true;
+                }
+            }
+            else {
+                if (this.tail.offset > position.absolutePosition) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    overlap(peer) {
+        return this.contains(peer.head) || this.contains(peer.tail);
+    }
+    get length() {
+        let length = 0;
+        if (this.head.reversed) {
+            length += this.head.section.length - this.head.offset;
+        }
+        else {
+            length += this.head.offset;
+        }
+        for (let section of this.inside) {
+            length += section.length;
+        }
+        if (this.tail.reversed) {
+            length += this.tail.section.length - this.tail.offset;
+        }
+        else {
+            length += this.tail.offset;
+        }
+        return length;
+    }
+    // TODO verify reverse
+    // TODO add efficient algo
+    static trail(start, end) {
+        let head = start;
+        const sections = [];
+        const increment = 1;
+        while (head.section != end.section) {
+            head = head.advance(increment);
+            if (head.section != start.section && head.section != end.section && !sections.includes(head.section)) {
+                sections.push(head.section);
+            }
+        }
+        return new Span(start, sections, end);
+    }
+}

package/.built/throttle.d.ts

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

package/.built/throttle.js

@@ -0,0 +1,15 @@
+import { Layout } from "./layout";
+export class Throttle {
+    device;
+    scope;
+    constructor(device, scope) {
+        this.device = device;
+        this.scope = scope;
+    }
+    dump() {
+        console.group('Throttle');
+        console.log('scope:', this.scope instanceof Layout ? '*' : this.scope.domainName);
+        this.device.dump();
+        console.groupEnd();
+    }
+}

package/index.ts

@@ -0,0 +1,23 @@
+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/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "@packtrack/layout",
-	"version": "1.1.0",
-	"main": ".built/index.js",
-	"typings": ".built/index.d.ts",
+	"version": "1.3.0",
+	"main": ".built/source/index.js",
+	"typings": ".built/source/index.d.ts",
 	"sideEffects": false,
 	"scripts": {
 		"build": "tsc",
-		"preversion": "tsc"
+		"preversion": "npm run build"
 	},
 	"devDependencies": {
 		"typescript": "^5.3.3"

package/source/device/channel.ts

@@ -6,9 +6,9 @@ export class Channel {
 		public name: string
 	) {}
 
-	dump() {
-		console.log(`Channel '${this.name}' on ${this.device.identifier}`);
-	}
-
 	publish(data: any) {}
+
+	toString() {
+		return `${this.device.identifier}/${this.name}`;
+	}
 }

package/source/device/index.ts

@@ -4,25 +4,8 @@ export class Device {
 	channels: Channel[] = [];
 
 	lastDiscovery: { date: Date, address: string };
-	
+
 	constructor(
 		public identifier: string
 	) {}
-
-	dump() {
-		console.group(`Device ${this.identifier}`);
-
-		if (this.lastDiscovery) {
-			console.log(`last discovery: ${this.lastDiscovery.date.toISOString()} ${this.lastDiscovery.address}`);
-		}
-
-		console.group('channels');
-
-		for (let channel of this.channels) {
-			channel.dump();
-		}
-
-		console.groupEnd();
-		console.groupEnd();
-	}
-}
+}

package/source/district.ts

@@ -1,15 +1,18 @@
 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 class District {
 	children: District[] = [];
-	
+
 	powerDistricts: PowerDistrict[] = [];
 	sections: Section[] = [];
 	routers: Router[] = [];
-	
+
+	monitors: Monitor[] = [];
+
 	constructor(
 		public name: string,
 		public parent: District | Layout
@@ -22,83 +25,4 @@ export class District {
 
 		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())
-		];
-	}
-}
+}