@packtrack/layout 1.3.2 → 1.4.0

package/.built/source/layout.js

@@ -206,12 +206,12 @@ export class Layout {
     findSection(path, base, source = base) {
         const parts = path.split('.');
         if (parts.length == 0) {
-            throw `section '${path}' not found from '${source.name}': invalid name`;
+            throw new Error(`Section '${path}' not found from '${source.domainName}': invalid name`);
         }
         if (parts.length == 1) {
             const localSection = base.sections.find(section => section.name == parts[0]);
             if (!localSection) {
-                throw new Error(`Section '${path}' not found from '${source.name}': section does not exist in '${base.name}'`);
+                throw new Error(`Section '${path}' not found from '${source.domainName}': section does not exist in '${base.name}'`);
             }
             return localSection;
         }
@@ -219,19 +219,19 @@ export class Layout {
         let pool = base;
         for (let index = 0; index < parts.length; index++) {
             if (pool instanceof Layout || !pool.parent) {
-                throw new Error(`Section '${path}' could not be found from '${source.name}': district '${pool.name}' does not have a parent`);
+                throw new Error(`Section '${path}' could not be found from '${source.domainName}': district '${pool.name}' does not have a parent`);
             }
             pool = pool.parent;
         }
         for (let part of parts) {
             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}'`);
+                throw new Error(`Section '${path}' could not be found from '${source.domainName}': district '${pool.name}' does not have a child named '${part}'`);
             }
             pool = child;
         }
         if (pool instanceof Layout) {
-            throw new Error(`Section '${path}' could not be found from '${source.name}': a layout cannot directly include a section`);
+            throw new Error(`Section '${path}' could not be found from '${source.domainName}': a layout cannot directly include a section`);
         }
         return this.findSection(sectionName, pool, source);
     }
@@ -241,7 +241,6 @@ export class Layout {
     }
     linkRouter(source, router) {
         let child = source.firstChild;
-        let active;
         while (child) {
             if (child.tagName == 'route') {
                 const route = new Route(child.getAttribute('name'), router);
@@ -249,17 +248,18 @@ export class Layout {
                 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;
+        const active = source.getAttribute('active');
+        if (active) {
+            const route = router.routes.find(route => route.name == active);
+            if (!route) {
+                throw new Error(`Router '${router.domainName}' cannot have active route '${active}': Router has no such route (available: ${router.routes.map(route => route.name).join(', ')})`);
+            }
+            router.activeRoute = route;
+        }
     }
     loadPowerDistrict(source, district) {
         const powerDistrict = new PowerDistrict(source.getAttribute('name'), district);

package/package.json

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

package/source/layout.ts

@@ -293,14 +293,14 @@ export class Layout {
 		const parts = path.split('.');
 
 		if (parts.length == 0) {
-			throw `section '${path}' not found from '${source.name}': invalid name`;
+			throw new Error(`Section '${path}' not found from '${source.domainName}': invalid name`);
 		}
 
 		if (parts.length == 1) {
 			const localSection = base.sections.find(section => section.name == parts[0]);
 
 			if (!localSection) {
-				throw new Error(`Section '${path}' not found from '${source.name}': section does not exist in '${base.name}'`);
+				throw new Error(`Section '${path}' not found from '${source.domainName}': section does not exist in '${base.name}'`);
 			}
 
 			return localSection;
@@ -312,7 +312,7 @@ export class Layout {
 
 		for (let index = 0; index < parts.length; index++) {
 			if (pool instanceof Layout || !pool.parent) {
-				throw new Error(`Section '${path}' could not be found from '${source.name}': district '${pool.name}' does not have a parent`);
+				throw new Error(`Section '${path}' could not be found from '${source.domainName}': district '${pool.name}' does not have a parent`);
 			}
 
 			pool = pool.parent!;
@@ -322,14 +322,14 @@ export class Layout {
 			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}'`);
+				throw new Error(`Section '${path}' could not be found from '${source.domainName}': district '${pool.name}' does not have a child named '${part}'`);
 			}
 
 			pool = child;
 		}
 
 		if (pool instanceof Layout) {
-			throw new Error(`Section '${path}' could not be found from '${source.name}': a layout cannot directly include a section`);
+			throw new Error(`Section '${path}' could not be found from '${source.domainName}': a layout cannot directly include a section`);
 		}
 
 		return this.findSection(sectionName, pool, source);
@@ -343,7 +343,6 @@ export class Layout {
 
 	linkRouter(source, router: Router) {
 		let child = source.firstChild;
-		let active: Route;
 
 		while (child) {
 			if (child.tagName == 'route') {
@@ -355,21 +354,23 @@ export class Layout {
 				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;
+		const active = source.getAttribute('active');
+
+		if (active) {
+			const route = router.routes.find(route => route.name == active);
+
+			if (!route) {
+				throw new Error(`Router '${router.domainName}' cannot have active route '${active}': Router has no such route (available: ${router.routes.map(route => route.name).join(', ')})`);
+			}
+
+			router.activeRoute = route;
+		}
 	}
 
 	loadPowerDistrict(source, district: District) {