pmcf 6.71.0 → 6.71.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.71.0",
+  "version": "6.71.2",
   "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.20",
+    "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/host.mjs

@@ -142,6 +142,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/owner.mjs

@@ -1,5 +1,4 @@
 import { normalizeCIDR, familyIP, FAMILY_IPV4 } from "ip-utilties";
-import { FileContentProvider } from "npm-pkgbuild";
 import { AggregatedMap } from "aggregated-map";
 import { FilteredMap } from "filtered-map";
 import {
@@ -20,7 +19,6 @@ import {
   networkInterfaces_attribute
 } from "./common-attributes.mjs";
 import { addType, assign } from "./type.mjs";
-import { loadHooks } from "./hooks.mjs";
 
 export class owner extends ServiceOwner {
   static priority = 2;
@@ -92,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;
   }
@@ -251,31 +255,4 @@ export class owner extends ServiceOwner {
 
     return architectures;
   }
-
-  async *preparePackages(dir) {
-    const packageData = {
-      sources: [
-        new FileContentProvider(dir + "/"),
-        new FileContentProvider(
-          { dir: this.directory, pattern: "location.json" },
-          { destination: "/etc/location/location.json" }
-        )
-      ],
-      outputs: this.outputs,
-      properties: {
-        name: `${this.typeName}-${this.name}`,
-        description: `${this.typeName} definitions for ${this.fullName}`,
-        access: "private",
-        dependencies: { jq: ">=1.6" },
-        provides: ["location"]
-      }
-    };
-
-    await loadHooks(
-      packageData,
-      new URL("location.install", import.meta.url).pathname
-    );
-
-    yield packageData;
-  }
 }

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]);
+  }
 }