pmcf 1.6.2 → 1.7.0

package/package.json

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

package/src/model.mjs

@@ -168,7 +168,7 @@ export class Owner extends Base {
         this.#bridges.add(bridge);
       }
 
-      for (const name of destinationNetworks) {
+      for (const name of asArray(destinationNetworks)) {
         bridge.add(this.network(name) || name);
       }
 
@@ -243,7 +243,7 @@ export class World extends Owner {
 
       type = await type.prepareData(this, data);
       object = new type(owner, data);
-      this.#byName.set(object.name, object);
+      this.addObject(object);
     }
 
     return object;
@@ -259,6 +259,10 @@ export class World extends Owner {
     }
   }
 
+  addObject(object) {
+    this.#byName.set(object.name, object);
+  }
+
   async named(name) {
     await this.load();
     return this.#byName.get(name);
@@ -298,12 +302,6 @@ export class World extends Owner {
     return this._loadType(name, Host);
   }
 
-  async *subnets() {
-    for await (const location of this.locations()) {
-      yield* location.subnets();
-    }
-  }
-
   async *networkAddresses() {
     for await (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
@@ -411,10 +409,10 @@ export class Network extends Owner {
   constructor(owner, data) {
     super(owner, data);
 
-    let bridges;
-    if (data.bridges) {
-      bridges = data.bridges;
-      delete data.bridges;
+    let bridge;
+    if (data.bridge) {
+      bridge = data.bridge;
+      delete data.bridge;
     }
 
     Object.assign(this, data);
@@ -433,7 +431,7 @@ export class Network extends Owner {
 
     owner.addNetwork(this);
 
-    this.bridge = owner.addBridge(this, bridges);
+    this.bridge = owner.addBridge(this, bridge);
   }
 
   get ipv4_netmask() {
@@ -844,3 +842,7 @@ function extractFrom(object, propertyNames) {
 function bridgeToJSON(bridge) {
   return [...bridge].map(n => n.name || `(${n})`).sort();
 }
+
+function asArray(value) {
+  return Array.isArray(value) ? value : value === undefined ? [] : [value];
+}

package/types/model.d.mts

@@ -50,13 +50,13 @@ export class World extends Owner {
     get world(): this;
     _loadType(name: any, type: any): Promise<any>;
     load(): Promise<void>;
+    addObject(object: any): void;
     named(name: any): Promise<any>;
     locations(): AsyncGenerator<Location, void, unknown>;
     hosts(): AsyncGenerator<Host, void, unknown>;
     domains(): AsyncGenerator<any, void, unknown>;
     location(name: any): Promise<any>;
     host(name: any): Promise<any>;
-    subnets(): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<{
         address: any;
         networkInterface: any;