pmcf 1.38.2 → 1.38.3

package/package.json

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

package/src/model.mjs

@@ -112,8 +112,6 @@ export class Root extends Location {
 
     this._addObject(type.typeName, fullName, object);
 
-    //console.log("FINISH LOAD", object.fullName);
-
     return object;
   }
 

package/src/owner.mjs

@@ -86,13 +86,13 @@ export class Owner extends Base {
     return typeSlot?.get(name) || this.owner?.typeNamed(typeName, name);
   }
 
-  *typeList(typeName) {
+  typeList(typeName) {
     const typeSlot = this.#membersByType.get(typeName);
     if (typeSlot) {
-      for (const object of typeSlot.values()) {
-        yield object;
-      }
+      return typeSlot.values();
     }
+
+    return [];
   }
 
   _addObject(typeName, fullName, object) {
@@ -153,11 +153,15 @@ export class Owner extends Base {
   }
 
   subnetNamed(name) {
-    if (this !== this.location) {
-      return this.location.subnetNamed(name);
-    }
+    return this.typeNamed("subnet", name) || this.owner?.subnetNamed(name);
+  }
 
-    return this.typeNamed("subnet", name);
+  *_subnets() {
+    if (this.owner) {
+      yield* this.owner.subnets();
+    } else {
+      yield* this.typeList("subnet");
+    }
   }
 
   subnets() {
@@ -168,42 +172,36 @@ export class Owner extends Base {
     return this.typeList("subnet");
   }
 
-  subnetForAddress(address) {
-    for (const subnet of this.subnets()) {
-      if (subnet.matchesAddress(address)) {
-        return subnet;
-      }
+  addSubnet(address) {
+    if (address instanceof Subnet) {
+      return address;
     }
-  }
 
-  addSubnet(address) {
     if (this !== this.location) {
       return this.location.addSubnet(address);
     }
 
-    if (address instanceof Subnet) {
-      return address;
-    }
-
     const { cidr } = normalizeCIDR(address);
 
-    //console.log("ADD SUBNET", this.toString(), address, cidr);
-
     if (cidr) {
       let subnet = this.subnetNamed(cidr);
 
       if (!subnet) {
         subnet = new Subnet(this, { name: cidr });
-
-        /*if(this.owner) {
-          this.owner.addSubnet(subnet);
-        }*/
       }
 
       return subnet;
     }
   }
 
+  subnetForAddress(address) {
+    for (const subnet of this.subnets()) {
+      if (subnet.matchesAddress(address)) {
+        return subnet;
+      }
+    }
+  }
+
   clusterNamed(name) {
     return this.typeNamed("cluster", name);
   }

package/types/owner.d.mts

@@ -8,23 +8,24 @@ export class Owner extends Base {
     get dns(): DNSService;
     named(name: any): any;
     typeNamed(typeName: any, name: any): any;
-    typeList(typeName: any): Generator<any, void, unknown>;
+    typeList(typeName: any): any;
     _addObject(typeName: any, fullName: any, object: any): void;
     addObject(object: any): void;
     service(filter: any): Promise<any>;
     services(filter: any): AsyncGenerator<any, void, unknown>;
     locationNamed(name: any): any;
-    locations(): Generator<any, void, unknown>;
+    locations(): any;
     hostNamed(name: any): any;
-    hosts(): Generator<any, void, unknown>;
+    hosts(): any;
     networkNamed(name: any): any;
-    networks(): Generator<any, void, unknown>;
+    networks(): any;
     subnetNamed(name: any): any;
+    _subnets(): Generator<any, void, any>;
     subnets(): any;
-    subnetForAddress(address: any): any;
     addSubnet(address: any): any;
+    subnetForAddress(address: any): any;
     clusterNamed(name: any): any;
-    clusters(): Generator<any, void, unknown>;
+    clusters(): any;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
     networkAddresses(): AsyncGenerator<any, void, unknown>;