pmcf 4.26.0 → 4.27.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.26.0",
+  "version": "4.27.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.6.9",
     "ip-utilties": "^3.0.4",
     "npm-pkgbuild": "^20.7.3",
-    "pacc": "^9.3.0",
+    "pacc": "^9.3.1",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -44,7 +44,7 @@ export class Base {
     packaging: string_attribute_writable,
     disabled: boolean_attribute_writable,
     tags: string_set_attribute_writable,
-    owner: { ...default_attribute, type: "base" },
+    owner: { ...default_attribute, type: "base", owner: false },
     type: string_attribute
   };
 
@@ -149,6 +149,23 @@ export class Base {
     return collected;
   }
 
+  get children() {
+    const all = [];
+
+    for (const [path, attribute] of extendingAttributeIterator(
+      this.constructor,
+      (name, attribute) => attribute.owner && !attribute.type.primitive
+    )) {
+      if (attribute.collection) {
+        all.push(...this[path].values());
+      } else {
+        all.push(this[path]);
+      }
+    }
+
+    return all;
+  }
+
   /**
    * Walk the object graph in some directions and deliver seen nodes.
    * @param {string[]} directions
@@ -229,7 +246,10 @@ export class Base {
    * @return {Iterable<[string,any]>} values
    */
   *attributeIterator(filter) {
-    for (const [path, def] of extendingAttributeIterator(this.constructor, filter)) {
+    for (const [path, def] of extendingAttributeIterator(
+      this.constructor,
+      filter
+    )) {
       const name = path.join(".");
       const value = this.attribute(name);
 

package/src/host.mjs

@@ -10,7 +10,7 @@ import {
   boolean_attribute_false,
   addType
 } from "pacc";
-import {  Base, NetworkInterface, addresses } from "pmcf";
+import {  NetworkInterface, addresses } from "pmcf";
 import { ServiceOwner } from "./service-owner.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
@@ -28,7 +28,7 @@ export class Host extends ServiceOwner {
   static name = "host";
   static priority = 1.9;
   static owners = ["owner", "network", "root"];
-  static extends = Base;
+  static extends = ServiceOwner;
   static key = "name";
   static attributes = {
     ...networkAddressAttributes,
@@ -37,11 +37,6 @@ export class Host extends ServiceOwner {
       type: "network_interface",
       collection: true
     },
-    services: {
-      ...default_attribute_writable,
-      type: "service",
-      collection: true
-    },
     aliases: string_set_attribute_writable,
     os: {
       ...string_attribute_writable,
@@ -82,12 +77,11 @@ export class Host extends ServiceOwner {
     replaces: string_set_attribute_writable,
     depends: string_set_attribute_writable,
     provides: string_set_attribute_writable,
-    extends: { ...default_attribute_writable, type: "host", collection: true },
+    extends: { ...default_attribute_writable, type: "host", collection: true, owner: false },
     model: string_attribute,
     isModel: boolean_attribute_false
   };
 
-
   static {
     addType(this);
   }
@@ -111,16 +105,14 @@ export class Host extends ServiceOwner {
     super.materializeExtends();
 
     for (const host of this.walkDirections(["extends"])) {
-
-
       for (const [name, ni] of host.networkInterfaces) {
-        const present = this._networkInterfaces.get(name);
+        const present = this._networkInterfaces.get(ni.name);
 
         if (present) {
           //console.log("LINK", present.fullName, ni.fullName,present.extends);
           present.extends.add(ni);
         } else {
-          this._networkInterfaces.set(name, ni.forOwner(this));
+          this._networkInterfaces.set(ni.name, ni.forOwner(this));
         }
       }
     }

package/src/location.mjs

@@ -6,12 +6,11 @@ import { loadHooks } from "./hooks.mjs";
 export class Location extends Owner {
   static name = "location";
   static priority = 2;
-  static owners = [Owner, "location", "root"];
+  static owners = [Owner, Location, "root"];
   static extends = Owner;
   static key = "name";
   static attributes = {};
 
-
   static {
     addType(this);
   }

package/src/network.mjs

@@ -14,9 +14,10 @@ export class Network extends Owner {
     bridge: {
       ...default_attribute_writable,
       type: "network",
-      collection: true
+      collection: true,
+      owner: false
     },
-    gateway: { ...default_attribute_writable, type: "host" }
+    gateway: { ...default_attribute_writable, type: "host", owner: false }
   };
 
 

package/src/owner.mjs

@@ -23,11 +23,12 @@ export class Owner extends Base {
   static key = "name";
   static attributes = {
     networks: networks_attribute,
-    hosts: { ...default_attribute_writable, type: "host", collection: true },
+    hosts: { ...default_attribute_writable, type: "host", collection: true, owner: true },
     clusters: {
       ...default_attribute_writable,
       type: "cluster",
-      collection: true
+      collection: true,
+      owner: true
     },
     subnets: {
       ...default_attribute_writable,

package/src/service-owner.mjs

@@ -1,6 +1,27 @@
+import {
+  default_attribute_writable,
+  addType
+} from "pacc";
 import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
+  static name = "service-owner";
+  static priority = 1.9;
+  static owners = ["owner", "network", "root"];
+  static extends = Base;
+  static key = "name";
+  static attributes = {
+    services: {
+      ...default_attribute_writable,
+      type: "service",
+      collection: true
+    }
+  };
+
+  static {
+    addType(this);
+  }
+
   _services = new Map();
 
   set services(service) {

package/src/service.mjs

@@ -33,7 +33,7 @@ export const endpointAttributes = {
   port: number_attribute_writable,
   protocol: {
     ...string_attribute_writable,
-    values: ["tcp", "udp"]
+    values: ["tcp", "udp", "quic"]
   },
   type: string_attribute_writable,
   types: string_set_attribute,
@@ -61,7 +61,12 @@ export class Service extends Base {
   static attributes = {
     ...networkAddressAttributes,
     ...endpointAttributes,
-    extends: { ...default_attribute_writable, type: Service, collection: true },
+    extends: {
+      ...default_attribute_writable,
+      type: Service,
+      collection: true,
+      owner: false
+    },
     alias: string_attribute_writable,
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemdService: string_attribute_writable