pmcf 4.29.3 → 4.29.5

package/package.json

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

package/src/base.mjs

@@ -9,7 +9,6 @@ import {
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   getAttribute,
-  addType,
   parse,
   globals,
   expand,
@@ -26,6 +25,7 @@ import {
   boolean_attribute_writable
 } from "pacc";
 import { union } from "./utils.mjs";
+import { addType } from "pmcf";
 
 /**
  *
@@ -64,7 +64,6 @@ export class Base {
   _tags = new Set();
   _packaging = new Set();
   _directory;
-  _finalize;
 
   /**
    *
@@ -527,32 +526,6 @@ export class Base {
     });
   }
 
-  finalize(action) {
-    if (!this._finalize) {
-      this._finalize = [];
-    }
-    this._finalize.push(action);
-  }
-
-  execFinalize() {
-    for (const node of this.walkDirections(["children"])) {
-      node._execFinalize();
-    }
-  }
-
-  _execFinalize() {
-    if (this._finalize) {
-      let i = 0;
-      for (const action of this._finalize) {
-        if (action) {
-          this._finalize[i] = undefined;
-          action();
-        }
-        i++;
-      }
-    }
-  }
-
   error(...args) {
     console.error(`${this.toString()}:`, ...args);
   }

package/src/owner.mjs

@@ -7,7 +7,7 @@ import {
   email_attribute
 } from "pacc";
 import { addType } from "pacc";
-import { asIterator, union } from "./utils.mjs";
+import { asIterator, asArray, union } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { networks_attribute } from "./network-support.mjs";
@@ -196,7 +196,9 @@ export class Owner extends Base {
 
     if (!subnet) {
       subnet =
-        familyIP(address) === FAMILY_IPV4 ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
+        familyIP(address) === FAMILY_IPV4
+          ? SUBNET_GLOBAL_IPV4
+          : SUBNET_GLOBAL_IPV6;
 
       this.error(
         `Address without subnet ${address}`,
@@ -253,8 +255,9 @@ export class Owner extends Base {
             other.bridge = bridge;
           }
         } else {
-          bridge.add(nameOrNetwork);
-          this.finalize(() => this._resolveBridges());
+          this.error("Unknown destination", nameOrNetwork);
+          //  bridge.add(nameOrNetwork);
+          //  this.finalize(() => this._resolveBridges());
         }
       }
 
@@ -262,6 +265,7 @@ export class Owner extends Base {
     }
   }
 
+  /*
   _resolveBridges() {
     for (const bridge of this._bridges) {
       const subnets = new Map();
@@ -295,6 +299,7 @@ export class Owner extends Base {
       }
     }
   }
+*/
 
   get derivedPackaging() {
     let all = new Set();
@@ -380,7 +385,7 @@ export class Owner extends Base {
   }
 
   get localDomains() {
-    return this.domain ? new Set([this.domain]) : new Set();
+    return new Set(asArray(this.domain));
   }
 
   get domainNames() {