pmcf 1.59.0 → 1.59.1

package/package.json

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

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { asArray, normalizeCIDR } from "./utils.mjs";
+import { asIterator, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
 import { addType } from "./types.mjs";
@@ -90,17 +90,17 @@ export class Owner extends Base {
   }
 
   typeNamed(typeName, name) {
-    const localName = name[0] === "/" ? name.substring(this.fullName.length + 1) : name;
-
     const typeSlot = this.#membersByType.get(typeName);
     if (typeSlot) {
-      const object = typeSlot.get(localName);
+      const object = typeSlot.get(
+        name[0] === "/" ? name.substring(this.fullName.length + 1) : name
+      );
       if (object) {
         return object;
       }
     }
 
-    return super.typeNamed(typeName, localName); // TODO use name
+    return super.typeNamed(typeName, name);
   }
 
   typeObject(typeName) {
@@ -223,11 +223,13 @@ export class Owner extends Base {
         this.#bridges.add(bridge);
       }
 
-      for (const name of asArray(destinationNetworks)) {
+      for (const name of asIterator(destinationNetworks)) {
         const other = this.networkNamed(name);
         if (other) {
-          bridge.add(other);
-          other.bridge = bridge;
+          if (!bridge.has(other)) {
+            bridge.add(other);
+            other.bridge = bridge;
+          }
         } else {
           bridge.add(name);
           this.finalize(() => this._resolveBridges());

package/src/utils.mjs

@@ -33,6 +33,17 @@ export function asArray(value) {
   return Array.isArray(value) ? value : value === undefined ? [] : [value];
 }
 
+export function asIterator(value)
+{
+  if(value === undefined) { return []; }
+
+  if(typeof value[Symbol.iterator] === 'function') {
+    return value;
+  }
+
+  return asArray(value);
+}
+
 export function isIPv4Address(address) {
   return address.indexOf(".") >= 0;
 }

package/types/utils.d.mts

@@ -2,6 +2,7 @@ export function writeLines(dir: any, name: any, lines: any): Promise<void>;
 export function sectionLines(sectionName: any, values: any): string[];
 export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
+export function asIterator(value: any): any;
 export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;