pmcf 6.71.1 → 6.72.0

package/README.md

@@ -78,31 +78,31 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [priority](#priority-1)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-20)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [subnetForAddress](#subnetforaddress)
@@ -291,18 +291,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends Interface**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## Interface
 
 **Extends ServiceOwner**
@@ -400,6 +388,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends Interface**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.71.1",
+  "version": "6.72.0",
   "publishConfig": {
     "access": "public"
   },
@@ -54,14 +54,14 @@
     "content-entry-transform": "^1.7.11",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
-    "npm-pkgbuild": "^22.2.21",
+    "npm-pkgbuild": "^22.2.22",
     "pacc": "^14.4.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },
   "devDependencies": {
     "@types/node": "^26.6.5",
-    "ava": "^8.0.1",
+    "ava": "^8.0.2",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",
     "semantic-release": "^25.0.9"

package/src/base.mjs

@@ -110,6 +110,18 @@ export class base extends core {
     }
   }
 
+  get isHost() {
+    return false;
+  }
+  
+  get isCluster() {
+    return false;
+  }
+  
+  get isNetwork() {
+    return false;
+  }
+
   get host() {
     return this.owner?.host;
   }

package/src/host.mjs

@@ -100,6 +100,11 @@ export class host extends ServiceOwner {
 
   _networkInterfaces = new Map();
 
+  get isHost()
+  {
+    return true;
+  }
+
   get isTemplate() {
     return this.isModel || super.isTemplate;
   }
@@ -125,10 +130,6 @@ export class host extends ServiceOwner {
     return parts[parts.length - 1].toLowerCase();
   }
 
-  get isCluster() {
-    return false;
-  }
-
   isMember(host) {
     return this === host;
   }
@@ -142,6 +143,14 @@ export class host extends ServiceOwner {
     ]);
   }
 
+  get descendantServices() {
+    return new AggregatedMap([
+      ...[...this.networkInterfaces.values()]
+        .filter(ni => ni._services.size > 0)
+        .map(ni => ni._services)
+    ]);
+  }
+
   get foreignDomainNames() {
     return [...this.aliases].filter(n => n.split(".").length > 1);
   }

package/src/network.mjs

@@ -20,6 +20,11 @@ export class network extends owner {
   metric;
   bridges = new Set();
 
+  get isNetwork()
+  {
+    return true;
+  }
+  
   get gateway() {
     for (const b of [this, ...this.bridges]) {
       if (b._gateway) {

package/src/owner.mjs

@@ -90,6 +90,12 @@ export class owner extends ServiceOwner {
     );
   }
 
+  get descendantServices() {
+    return new AggregatedMap(
+      [this, ...this.hosts.values()].map(host => host.descendantOrDirectServices)
+    );
+  }
+
   get network() {
     return [...this.networks.values()][0] || super.network;
   }

package/src/service-owner.mjs

@@ -1,3 +1,4 @@
+import { AggregatedMap } from "aggregated-map";
 import { base } from "./base.mjs";
 import { addType } from "./type.mjs";
 import { services_attribute } from "./common-attributes.mjs";
@@ -19,4 +20,16 @@ export class ServiceOwner extends base {
   get services() {
     return this._services;
   }
+
+  get descendantServices() {
+    return new Map();
+  }
+
+  get directServices() {
+    return this._services;
+  }
+
+  get descendantOrDirectServices() {
+    return new AggregatedMap([this.directServices, this.descendantServices]);
+  }
 }