pmcf 4.27.1 → 4.27.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.27.1",
+  "version": "4.27.3",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -156,10 +156,24 @@ export class Base {
       this.constructor,
       (name, attribute) => attribute.owner && !attribute.type.primitive
     )) {
-      if (attribute.collection) {
-        all.push(...this[path].values());
-      } else {
-        all.push(this[path]);
+      const value = this[path];
+      if (value) {
+        if (attribute.collection) {
+          if (typeof value.values !== "function") {
+            if (value instanceof Iterator) {
+              all.push(...value);
+            } else {
+              if (typeof value === "object") {
+                //console.log("NO F", this.fullName, path, value);
+                all.push(...Object.values(value));
+              }
+            }
+          } else {
+            all.push(...value.values());
+          }
+        } else {
+          all.push(value);
+        }
       }
     }
 
@@ -533,6 +547,10 @@ export class Base {
 
     visitor(this, ...args);
 
+    for (const child of this.children) {
+      child._traverse(visited, visitor, ...args);
+    }
+
     return true;
   }
 

package/src/host.mjs

@@ -109,25 +109,14 @@ export class Host extends ServiceOwner {
         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(ni.name, ni.forOwner(this));
+          this.networkInterfaces = ni.forOwner(this);
         }
       }
     }
   }
 
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const ni of this.networkInterfaces.values()) {
-        ni._traverse(...args);
-      }
-      return true;
-    }
-    return false;
-  }
-
   set serial(value) {
     this._serial = value;
   }

package/src/owner.mjs

@@ -23,7 +23,12 @@ export class Owner extends Base {
   static key = "name";
   static attributes = {
     networks: networks_attribute,
-    hosts: { ...default_attribute_writable, type: "host", collection: true, owner: true },
+    hosts: {
+      ...default_attribute_writable,
+      type: "host",
+      collection: true,
+      owner: true
+    },
     clusters: {
       ...default_attribute_writable,
       type: "cluster",
@@ -45,7 +50,6 @@ export class Owner extends Base {
     template: { ...boolean_attribute_writable, private: true }
   };
 
-
   static {
     addType(this);
   }
@@ -61,20 +65,6 @@ export class Owner extends Base {
     return this.template ?? super.isTemplate;
   }
 
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const typeSlot of this._membersByType.values()) {
-        for (const object of typeSlot.values()) {
-          object._traverse(...args);
-        }
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
   *find(pattern) {
     for (const node of this.traverse(() => {})) {
       for (const p of pattern) {
@@ -195,6 +185,7 @@ export class Owner extends Base {
   }
 
   get networks() {
+    //return this._membersByType.get("network") || new Map();
     return this.typeList("network");
   }
 
@@ -234,6 +225,7 @@ export class Owner extends Base {
   }
 
   get clusters() {
+    //return this._membersByType.get("cluster") || new Map();
     return this.typeList("cluster");
   }
 

package/src/service-owner.mjs

@@ -1,7 +1,4 @@
-import {
-  default_attribute_writable,
-  addType
-} from "pacc";
+import { default_attribute_writable, addType } from "pacc";
 import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
@@ -35,9 +32,9 @@ export class ServiceOwner extends Base {
   addObject(object) {
     if (object instanceof Service) {
       this._services.set(object.name, object);
+    } else {
+      super.addObject(object);
     }
-
-    super.addObject(object);
   }
 
   materializeExtends() {
@@ -55,38 +52,6 @@ export class ServiceOwner extends Base {
         this.services = service.forOwner(this);
       }
     }
-
-    /*
-    if (this.fullName === "/SW/mini1") {
-      const myServiceNames = new Set([...this.services.keys()]);
-      const extendingSericeNames = new Set([
-        ...this.mapFromDirections(["extends"], "_services").keys()
-      ]);
-
-      console.log("XXX",this.fullName, [...this.extends].map(n=>n.fullName), myServiceNames, extendingSericeNames);
-
-      if (!extendingSericeNames.isSubsetOf(myServiceNames)) {
-        // const diff = myServiceNames.difference(extendingSericeNames);
-        console.log(
-          "DIFF",
-          this.fullName,
-          myServiceNames,
-          extendingSericeNames
-        );
-      }
-    }
-    */
-  }
-
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const service of this._services.values()) {
-        service._traverse(...args);
-      }
-
-      return true;
-    }
-    return false;
   }
 
   typeNamed(typeName, name) {

package/src/services/bind.mjs

@@ -407,6 +407,7 @@ export class BindService extends ExtraSourceService {
       ...default_attribute_writable,
       type: bind_group,
       collection: true,
+      owner: true,
       writable: true
     },
     primaries: {
@@ -501,17 +502,6 @@ export class BindService extends ExtraSourceService {
     }
   }
 
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const group of Object.values(this.groups)) {
-        group._traverse(...args);
-      }
-      return true;
-    }
-
-    return false;
-  }
-
   typeNamed(type, name) {
     if (type === bind_group.name) {
       return this.groups[name];

package/src/subnet.mjs

@@ -28,7 +28,6 @@ export class Subnet extends Base {
     family: string_attribute
   };
 
-
   static {
     addType(this);
   }
@@ -84,17 +83,6 @@ export class Subnet extends Base {
   get longAddress() {
     return `${this.longPrefix}/${this.prefixLength}`;
   }
-
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const network of this.networks) {
-        network._traverse(...args);
-      }
-      return true;
-    }
-
-    return false;
-  }
 }
 
 const _owner = { addObject() {} };