pmcf 6.49.11 → 6.49.12

package/README.md

@@ -81,30 +81,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -308,18 +308,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**
@@ -414,6 +402,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.49.11",
+  "version": "6.49.12",
   "publishConfig": {
     "access": "public"
   },

package/src/network-address.mjs

@@ -1,7 +1,7 @@
 import { default_attribute, type_attribute, getAttribute, asArray } from "pacc";
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
-import { Owner, addType } from "pmcf";
+import { owner, addType } from "pmcf";
 import { NetworkInterface } from "./interfaces/network-interface.mjs";
 import {
   family_attribute,
@@ -92,7 +92,7 @@ export class NetworkAddress {
 
 /**
  *
- * @param {Iterable<Owner|string>} sources
+ * @param {Iterable<owner|string>} sources
  * @param {Object} options
  * @param {boolean} options.aggregate
  * @param {Object} options.filter
@@ -106,7 +106,7 @@ export function addresses(sources, options) {
           if (typeof s === "string") {
             return s;
           }
-          if (options?.aggregate && s instanceof Owner && s.subnets.size > 0) {
+          if (options?.aggregate && s instanceof owner && s.subnets.size > 0) {
             return [...s.subnets.keys()];
           }
 

package/src/network.mjs

@@ -1,11 +1,11 @@
 import { AggregatedMap } from "aggregated-map";
 import { addType } from "pmcf";
-import { Owner } from "./owner.mjs";
+import { owner } from "./owner.mjs";
 import { networkAttributes, bridges_attribute } from "./common-attributes.mjs";
 import { Subnet } from "./subnet.mjs";
 
-export class network extends Owner {
-  static owners = [Owner, "root"];
+export class network extends owner {
+  static owners = [owner, "root"];
   static attributes = {
     ...networkAttributes,
     bridges: bridges_attribute

package/src/owner.mjs

@@ -21,10 +21,9 @@ import {
 import { addType, assign } from "pmcf";
 import { loadHooks } from "./hooks.mjs";
 
-export class Owner extends ServiceOwner {
-  static name = "owner";
+export class owner extends ServiceOwner {
   static priority = 2;
-  static owners = [Owner, "root"];
+  static owners = [owner, "root"];
   static attributes = {
     networks: networks_attribute,
     hosts: hosts_attribute,

package/src/root.mjs

@@ -1,6 +1,6 @@
-import { Owner, addType } from "pmcf";
+import { owner, addType } from "pmcf";
 
-export class root extends Owner {
+export class root extends owner {
   static priority = 3;
   static {
     addType(this);