@packtrack/layout 1.2.0 → 1.3.1

package/.built/{positioner → source/positioner}/point.js

@@ -1,4 +1,4 @@
-import { Positioner } from ".";
+import { Positioner } from "./index";
 export class PointPositioner extends Positioner {
     track;
     offset;
@@ -14,10 +14,4 @@ export class PointPositioner extends Positioner {
     get position() {
         return this.track.head.advance(this.offset);
     }
-    dump() {
-        console.group('Point positioner');
-        console.log('offset:', this.offset);
-        this.channel.dump();
-        console.groupEnd();
-    }
 }

package/.built/{positioner → source/positioner}/responder-type.d.ts

@@ -1,5 +1,4 @@
 export declare class ResponderType {
     name: string;
     constructor(name: string);
-    dump(): void;
 }

package/.built/{positioner → source/positioner}/responder-type.js

@@ -3,7 +3,4 @@ export class ResponderType {
     constructor(name) {
         this.name = name;
     }
-    dump() {
-        console.log(`Responder Type '${this.name}'`);
-    }
 }

package/.built/{power-district → source/power-district}/index.d.ts

@@ -10,5 +10,4 @@ export declare class PowerDistrict {
     monitor?: PowerDistrictMonitor;
     constructor(name: string, district: District);
     get domainName(): string;
-    dump(): void;
 }

package/.built/{power-district → source/power-district}/index.js

@@ -11,7 +11,4 @@ export class PowerDistrict {
     get domainName() {
         return `${this.name}.${this.district.domainName}`;
     }
-    dump() {
-        console.log(this.name);
-    }
 }

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

@@ -6,5 +6,4 @@ export declare class Route {
     in: Section;
     out: Section;
     constructor(name: string, router: Router);
-    dump(): void;
 }

package/.built/source/route.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Route = void 0;
-class Route {
+export class Route {
     name;
     router;
     in;
@@ -10,8 +7,4 @@ class Route {
         this.name = name;
         this.router = router;
     }
-    dump() {
-        console.log(`Route ${this.name}: ${this.in.domainName} → ${this.out.domainName}`);
-    }
 }
-exports.Route = Route;

package/.built/source/router.d.ts

@@ -7,8 +7,4 @@ export declare class Router {
     routes: Route[];
     constructor(name: string, district: District);
     get domainName(): string;
-    dump(): void;
-    toDotReference(): string;
-    toDotDefinition(): string;
-    toDotConnection(): string;
 }

package/.built/source/router.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = void 0;
-class Router {
+export class Router {
     name;
     district;
     activeRoute;
@@ -13,28 +10,4 @@ class Router {
     get domainName() {
         return `${this.name}.${this.district.domainName}`;
     }
-    dump() {
-        console.group(`Router ${this.domainName}`);
-        for (let route of this.routes) {
-            route.dump();
-        }
-        console.groupEnd();
-    }
-    toDotReference() {
-        return `router_${this.name.replace(/-/g, '_')}_${this.district.toDotReference()}`;
-    }
-    toDotDefinition() {
-        return `
-			${this.toDotReference()} [ label = ${JSON.stringify(this.name)}, shape = diamond ]
-		`;
-    }
-    toDotConnection() {
-        return `
-			${this.routes.map(route => `
-				${route.in.toDotReference()} -> ${this.toDotReference()} [ headlabel = ${JSON.stringify(route.name)} ]
-				${this.toDotReference()} -> ${route.out.toDotReference()} [ taillabel = ${JSON.stringify(route.name)} ]
-			`).join('')}
-		`;
-    }
 }
-exports.Router = Router;

package/.built/source/section.d.ts

@@ -1,6 +1,6 @@
 import { District } from "./district";
 import { SectionPosition } from "./position";
-import { PowerDistrict } from "./power-district";
+import { PowerDistrict } from "./power-district/index";
 import { Router } from "./router";
 import { Tile } from "./tile";
 import { Track } from "./track";
@@ -22,19 +22,10 @@ export declare class Section {
         };
         tiles: Tile[];
     };
-    dump(): void;
     get length(): number;
     get tileLength(): number;
     trail(offset: number, reversed: boolean, length: number): {
         sections: Section[];
         tip: SectionPosition;
     };
-    toDotReference(): string;
-    toDotDefinition(): string;
-    toDotConnection(): string;
-    toSVG(): string;
-    findSVGPositions(): {
-        x: number;
-        y: number;
-    }[];
 }

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/{throttle.d.ts → source/throttle.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 Throttle {
     device: Device;
     scope: District | Layout;
     constructor(device: Device, scope: District | Layout);
-    dump(): void;
 }

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/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.2.0",
+	"version": "1.3.1",
 	"main": ".built/index.js",
 	"typings": ".built/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,6 +1,6 @@
 import { Layout } from "./layout";
 import { Monitor } from "./monitor";
-import { PowerDistrict } from "./power-district";
+import { PowerDistrict } from "./power-district/index";
 import { Router } from "./router";
 import { Section } from "./section";
 
@@ -25,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())
-		];
-	}
 }

package/source/layout.ts

@@ -1,5 +1,5 @@
 import { District } from "./district";
-import { PowerDistrict } from "./power-district";
+import { PowerDistrict } from "./power-district/index";
 import { Route } from "./route";
 import { Router } from "./router";
 import { Section } from "./section";
@@ -400,66 +400,4 @@ export class Layout {
 
 		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();
-		}
-
-		console.groupEnd();
-	}
 }

package/source/monitor.ts

@@ -1,4 +1,4 @@
-import { Device } from "./device";
+import { Device } from "./device/index";
 import { District } from "./district";
 import { Layout } from "./layout";
 
@@ -7,13 +7,4 @@ export class Monitor {
 		public device: Device,
 		public scope: District | Layout
 	) { }
-
-	dump() {
-		console.group('Monitor');
-		console.log('scope:', this.scope instanceof Layout ? '*' : this.scope.domainName);
-
-		this.device.dump();
-
-		console.groupEnd();
-	}
 }

package/source/positioner/point.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";
@@ -16,13 +16,4 @@ export class PointPositioner extends Positioner {
 	get position() {
 		return this.track.head.advance(this.offset);
 	}
-	
-	dump() {
-		console.group('Point positioner');
-		console.log('offset:', this.offset);
-
-		this.channel.dump();
-
-		console.groupEnd();
-	}
-}
+}

package/source/positioner/responder-type.ts

@@ -2,8 +2,4 @@ export class ResponderType {
 	constructor(
 		public name: string
 	) {}
-
-	dump() {
-		console.log(`Responder Type '${this.name}'`);
-	}
-}
+}

package/source/power-district/index.ts

@@ -1,5 +1,4 @@
 import { PowerDistrictActivator } from "./activator";
-import { Device } from "../device/index";
 import { District } from "../district";
 import { PowerDistrictMonitor } from "./monitor";
 import { PowerDistrictReverser } from "./reverser";
@@ -17,8 +16,4 @@ export class PowerDistrict {
 	get domainName() {
 		return `${this.name}.${this.district.domainName}`;
 	}
-
-	dump() {
-		console.log(this.name);
-	}
 }

package/source/route.ts

@@ -4,13 +4,9 @@ import { Section } from "./section";
 export class Route {
 	in: Section;
 	out: Section;
-	
+
 	constructor(
 		public name: string,
 		public router: Router,
 	) {}
-	
-	dump() {
-		console.log(`Route ${this.name}: ${this.in.domainName} → ${this.out.domainName}`);
-	}
-}
+}