pmcf 1.99.2 → 1.100.1

package/package.json

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

package/src/base.mjs

@@ -32,7 +32,10 @@ export class Base {
   owner;
   description;
   name;
-  #tags = new Set();
+  _tags = new Set();
+  _packaging = new Set();
+  _directory;
+  _finalize;
 
   static {
     addType(this);
@@ -179,7 +182,8 @@ export class Base {
           if (value instanceof property.type.clazz) {
             assign(property, value);
           } else {
-            const factory = property.type.factoryFor?.(value) || property.type.clazz;
+            const factory =
+              property.type.factoryFor?.(value) || property.type.clazz;
 
             assign(
               property,
@@ -328,13 +332,12 @@ export class Base {
     }
   }
 
-  #directory;
   set directory(directory) {
-    this.#directory = directory;
+    this._directory = directory;
   }
 
   get directory() {
-    return this.#directory || join(this.owner.directory, this.name);
+    return this._directory || join(this.owner.directory, this.name);
   }
 
   get fullName() {
@@ -343,10 +346,9 @@ export class Base {
       : this.owner.fullName;
   }
 
-  #packaging = new Set();
 
   set packaging(value) {
-    this.#packaging.add(value);
+    this._packaging.add(value);
   }
 
   get derivedPackaging() {
@@ -357,10 +359,10 @@ export class Base {
     const dp = this.derivedPackaging;
 
     if (dp) {
-      return this.#packaging.union(dp);
+      return this._packaging.union(dp);
     }
 
-    return this.#packaging;
+    return this._packaging;
   }
 
   get outputs() {
@@ -379,14 +381,14 @@ export class Base {
   }
 
   get tags() {
-    return this.#tags;
+    return this._tags;
   }
 
   set tags(value) {
     if (value instanceof Set) {
-      this.#tags = this.#tags.union(value);
+      this._tags = this._tags.union(value);
     } else {
-      this.#tags.add(value);
+      this._tags.add(value);
     }
   }
 
@@ -422,25 +424,24 @@ export class Base {
     return object;
   }
 
-  #finalize;
 
   finalize(action) {
-    if (!this.#finalize) {
-      this.#finalize = [];
+    if (!this._finalize) {
+      this._finalize = [];
     }
-    this.#finalize.push(action);
+    this._finalize.push(action);
   }
 
   execFinalize() {
-    this.traverse(object => object._finalize());
+    this.traverse(object => object._execFinalize());
   }
 
-  _finalize() {
-    if (this.#finalize) {
+  _execFinalize() {
+    if (this._finalize) {
       let i = 0;
-      for (const action of this.#finalize) {
+      for (const action of this._finalize) {
         if (action) {
-          this.#finalize[i] = undefined;
+          this._finalize[i] = undefined;
           action();
         }
         i++;

package/src/cluster.mjs

@@ -20,8 +20,8 @@ const ClusterTypeDefinition = {
 };
 
 export class Cluster extends Host {
-  #masters = new Set();
-  #backups = new Set();
+  _masters = new Set();
+  _backups = new Set();
   routerId = 100;
   checkInterval = 60;
 
@@ -39,19 +39,19 @@ export class Cluster extends Host {
   }
 
   set masters(value) {
-    this.#masters.add(value);
+    this._masters.add(value);
   }
 
   get masters() {
-    return this.#masters;
+    return this._masters;
   }
 
   set backups(value) {
-    this.#backups.add(value);
+    this._backups.add(value);
   }
 
   get backups() {
-    return this.#backups;
+    return this._backups;
   }
 
   get members() {

package/src/host.mjs

@@ -45,11 +45,12 @@ const HostTypeDefinition = {
     distribution: { type: "string", collection: false, writeable: true },
     deployment: { type: "string", collection: false, writeable: true },
     master: { type: "boolean", collection: false, writeable: true },
+    priority: { type: "number", collection: false, writeable: true },
+    weight: { type: "number", collection: false, writeable: true },
     serial: { type: "string", collection: false, writeable: true },
     vendor: { type: "string", collection: false, writeable: true },
     chassis: { type: "string", collection: false, writeable: true },
     architecture: { type: "string", collection: false, writeable: true },
-    priority: { type: "number", collection: false, writeable: true },
     replaces: { type: "string", collection: true, writeable: true },
     depends: { type: "string", collection: true, writeable: true },
     provides: { type: "string", collection: true, writeable: true },
@@ -61,21 +62,21 @@ const HostTypeDefinition = {
 
 export class Host extends Base {
   priority = 1;
-  #services = [];
-  #extends = [];
-  #aliases = new Set();
-  #networkInterfaces = new Map();
-  #provides = new Set();
-  #replaces = new Set();
-  #depends = new Set();
-  #master = false;
-  #os;
-  #distribution;
-  #deployment;
-  #chassis;
-  #vendor;
-  #architecture;
-  #serial;
+  _services = [];
+  _extends = [];
+  _aliases = new Set();
+  _networkInterfaces = new Map();
+  _provides = new Set();
+  _replaces = new Set();
+  _depends = new Set();
+  _master = false;
+  _os;
+  _distribution;
+  _deployment;
+  _chassis;
+  _vendor;
+  _architecture;
+  _serial;
 
   static {
     addType(this);
@@ -108,10 +109,10 @@ export class Host extends Base {
     }
 
     for (const [name, ni] of host.networkInterfaces) {
-      let present = this.#networkInterfaces.get(name);
+      let present = this._networkInterfaces.get(name);
       if (!present) {
         present = ni.forOwner(this);
-        this.#networkInterfaces.set(name, present);
+        this._networkInterfaces.set(name, present);
       }
 
       present.extends.push(ni);
@@ -123,7 +124,7 @@ export class Host extends Base {
       for (const ni of this.networkInterfaces.values()) {
         ni._traverse(...args);
       }
-      for (const service of this.#services) {
+      for (const service of this._services) {
         service._traverse(...args);
       }
 
@@ -133,44 +134,44 @@ export class Host extends Base {
   }
 
   set serial(value) {
-    this.#serial = value;
+    this._serial = value;
   }
 
   get serial() {
-    return this.#serial || this.extends.find(e => e.serial)?.serial;
+    return this._serial || this.extends.find(e => e.serial)?.serial;
   }
 
   set deployment(value) {
-    this.#deployment = value;
+    this._deployment = value;
   }
 
   get deployment() {
-    return this.#deployment || this.extends.find(e => e.deployment)?.deployment;
+    return this._deployment || this.extends.find(e => e.deployment)?.deployment;
   }
 
   set chassis(value) {
-    this.#chassis = value;
+    this._chassis = value;
   }
 
   get chassis() {
-    return this.#chassis || this.extends.find(e => e.chassis)?.chassis;
+    return this._chassis || this.extends.find(e => e.chassis)?.chassis;
   }
 
   set vendor(value) {
-    this.#vendor = value;
+    this._vendor = value;
   }
 
   get vendor() {
-    return this.#vendor || this.extends.find(e => e.vendor)?.vendor;
+    return this._vendor || this.extends.find(e => e.vendor)?.vendor;
   }
 
   set architecture(value) {
-    this.#architecture = value;
+    this._architecture = value;
   }
 
   get architecture() {
     return (
-      this.#architecture || this.extends.find(e => e.architecture)?.architecture
+      this._architecture || this.extends.find(e => e.architecture)?.architecture
     );
   }
 
@@ -183,7 +184,7 @@ export class Host extends Base {
   }
 
   get isModel() {
-    return this.#vendor || this.#chassis ? true : false;
+    return this._vendor || this._chassis ? true : false;
   }
 
   get model() {
@@ -192,89 +193,89 @@ export class Host extends Base {
 
   set aliases(value) {
     if (value instanceof Set) {
-      this.#aliases = this.#aliases.union(value);
+      this._aliases = this._aliases.union(value);
     } else {
-      this.#aliases.add(value);
+      this._aliases.add(value);
     }
   }
 
   get aliases() {
-    return this.extends.reduce((a, c) => a.union(c.aliases), this.#aliases);
+    return this.extends.reduce((a, c) => a.union(c.aliases), this._aliases);
   }
 
   set extends(value) {
-    this.#extends.push(value);
+    this._extends.push(value);
   }
 
   get extends() {
-    return this.#extends;
+    return this._extends;
   }
 
   set provides(value) {
     if (value instanceof Set) {
-      this.#provides = this.#provides.union(value);
+      this._provides = this._provides.union(value);
     } else {
-      this.#provides.add(value);
+      this._provides.add(value);
     }
   }
 
   get provides() {
     return this.expand(
-      this.extends.reduce((a, c) => a.union(c.provides), this.#provides)
+      this.extends.reduce((a, c) => a.union(c.provides), this._provides)
     );
   }
 
   set replaces(value) {
     if (value instanceof Set) {
-      this.#replaces = this.#replaces.union(value);
+      this._replaces = this._replaces.union(value);
     } else {
-      this.#replaces.add(value);
+      this._replaces.add(value);
     }
   }
 
   get replaces() {
     return this.expand(
-      this.extends.reduce((a, c) => a.union(c.replaces), this.#replaces)
+      this.extends.reduce((a, c) => a.union(c.replaces), this._replaces)
     );
   }
 
   set depends(value) {
     if (value instanceof Set) {
-      this.#depends = this.#depends.union(value);
+      this._depends = this._depends.union(value);
     } else {
-      this.#depends.add(value);
+      this._depends.add(value);
     }
   }
 
   get depends() {
     return this.expand(
-      this.extends.reduce((a, c) => a.union(c.depends), this.#depends)
+      this.extends.reduce((a, c) => a.union(c.depends), this._depends)
     );
   }
 
   set master(value) {
-    this.#master = value;
+    this._master = value;
   }
 
   get master() {
-    return this.#master || this.extends.find(e => e.master) ? true : false;
+    return this._master || this.extends.find(e => e.master) ? true : false;
   }
 
   set os(value) {
-    this.#os = value;
+    this._os = value;
   }
 
   get os() {
-    return this.#os || this.extends.find(e => e.os)?.os;
+    return this._os || this.extends.find(e => e.os)?.os;
   }
 
   set distribution(value) {
-    this.#distribution = value;
+    this._distribution = value;
   }
 
   get distribution() {
     return (
-      this.#distribution || this.extends.find(e => e.distribution)?.distribution
+      this._distribution || this.extends.find(e => e.distribution)?.distribution
     );
   }
 
@@ -335,24 +336,24 @@ export class Host extends Base {
   }
 
   get services() {
-    return this.#services;
+    return this._services;
   }
 
   set services(service) {
-    const present = this.#services.find(s => s.name === service.name);
+    const present = this._services.find(s => s.name === service.name);
 
     if (!present) {
-      this.#services.push(service);
+      this._services.push(service);
     }
   }
 
   *findServices(filter) {
-    yield* objectFilter(types.service, this.#services, filter);
+    yield* objectFilter(types.service, this._services, filter);
   }
 
   typeNamed(typeName, name) {
     if (typeName === NetworkInterfaceTypeDefinition.name) {
-      const ni = this.#networkInterfaces.get(name);
+      const ni = this._networkInterfaces.get(name);
       if (ni) {
         return ni;
       }
@@ -368,7 +369,7 @@ export class Host extends Base {
   }
 
   named(name) {
-    const ni = this.#networkInterfaces.get(name);
+    const ni = this._networkInterfaces.get(name);
     if (ni) {
       return ni;
     }
@@ -379,11 +380,11 @@ export class Host extends Base {
   }
 
   get networkInterfaces() {
-    return this.#networkInterfaces;
+    return this._networkInterfaces;
   }
 
   set networkInterfaces(networkInterface) {
-    this.#networkInterfaces.set(networkInterface.name, networkInterface);
+    this._networkInterfaces.set(networkInterface.name, networkInterface);
 
     if (!this.isTemplate) {
       networkInterface.network?.addObject(this);
@@ -484,14 +485,14 @@ export class NetworkInterface extends Base {
     return NetworkInterfaceTypeDefinition;
   }
 
-  #ipAddresses = new Map();
-  #scope;
-  #metric;
-  #ssid;
-  #psk;
-  #network;
-  #kind;
-  #hostName;
+  _ipAddresses = new Map();
+  _scope;
+  _metric;
+  _ssid;
+  _psk;
+  _network;
+  _kind;
+  _hostName;
   extends = [];
   arpbridge;
   hwaddr;
@@ -512,12 +513,12 @@ export class NetworkInterface extends Base {
   }
 
   get ipAddresses() {
-    return this.#ipAddresses;
+    return this._ipAddresses;
   }
 
   set ipAddresses(value) {
     for (const address of asArray(value)) {
-      this.#ipAddresses.set(
+      this._ipAddresses.set(
         normalizeIPAddress(address),
         this.addSubnet(address)
       );
@@ -529,7 +530,7 @@ export class NetworkInterface extends Base {
   }
 
   get rawAddresses() {
-    return [...this.#ipAddresses].map(([address]) => address);
+    return [...this._ipAddresses].map(([address]) => address);
   }
 
   get cidrAddress() {
@@ -537,7 +538,7 @@ export class NetworkInterface extends Base {
   }
 
   get cidrAddresses() {
-    return [...this.#ipAddresses].map(([address, subnet]) =>
+    return [...this._ipAddresses].map(([address, subnet]) =>
       formatCIDR(address, subnet)
     );
   }
@@ -574,11 +575,11 @@ export class NetworkInterface extends Base {
   }
 
   get hostName() {
-    return this.#hostName || this.host.hostName;
+    return this._hostName || this.host.hostName;
   }
 
   set hostName(value) {
-    this.#hostName = value;
+    this._hostName = value;
   }
 
   get domainNames() {
@@ -596,50 +597,50 @@ export class NetworkInterface extends Base {
   }
 
   get network() {
-    return this.#network || this.host.network;
+    return this._network || this.host.network;
   }
 
   set network(network) {
-    this.#network = network;
+    this._network = network;
   }
 
   set scope(value) {
-    this.#scope = value;
+    this._scope = value;
   }
 
   get scope() {
-    return this.#scope || this.network?.scope || "global";
+    return this._scope || this.network?.scope || "global";
   }
 
   set metric(value) {
-    this.#metric = value;
+    this._metric = value;
   }
 
   get metric() {
-    return this.#metric || this.network?.metric || 1004;
+    return this._metric || this.network?.metric || 1004;
   }
 
   set ssid(value) {
-    this.#ssid = value;
+    this._ssid = value;
   }
 
   get ssid() {
-    return this.#ssid || this.network?.ssid;
+    return this._ssid || this.network?.ssid;
   }
 
   set psk(value) {
-    this.#psk = value;
+    this._psk = value;
   }
 
   get psk() {
-    return this.#psk || this.network?.psk;
+    return this._psk || this.network?.psk;
   }
 
   set kind(value) {
-    this.#kind = value;
+    this._kind = value;
   }
 
   get kind() {
-    return this.#kind || this.network?.kind;
+    return this._kind || this.network?.kind;
   }
 }

package/src/network.mjs

@@ -20,7 +20,7 @@ export class Network extends Owner {
   scope;
   metric;
   gateway;
-  #bridge;
+  _bridge;
 
   static {
     addType(this);
@@ -54,11 +54,11 @@ export class Network extends Owner {
   }
 
   get bridge() {
-    return this.#bridge;
+    return this._bridge;
   }
 
   set bridge(network) {
-    this.#bridge = this.owner.addBridge(this, network);
+    this._bridge = this.owner.addBridge(this, network);
     network.bridge = this.bridge; // TODO should happen in addBridge
   }
 }

package/src/owner.mjs

@@ -27,8 +27,8 @@ const OwnerTypeDefinition = {
 const EMPTY = new Map();
 
 export class Owner extends Base {
-  #membersByType = new Map();
-  #bridges = new Set();
+  _membersByType = new Map();
+  _bridges = new Set();
 
   static {
     addType(this);
@@ -45,7 +45,7 @@ export class Owner extends Base {
 
   _traverse(...args) {
     if (super._traverse(...args)) {
-      for (const typeSlot of this.#membersByType.values()) {
+      for (const typeSlot of this._membersByType.values()) {
         for (const object of typeSlot.values()) {
           object._traverse(...args);
         }
@@ -62,7 +62,7 @@ export class Owner extends Base {
       name = name.substring(this.fullName.length + 1);
     }
 
-    for (const slot of this.#membersByType.values()) {
+    for (const slot of this._membersByType.values()) {
       const object = slot.get(name);
       if (object) {
         return object;
@@ -83,7 +83,7 @@ export class Owner extends Base {
   }
 
   typeNamed(typeName, name) {
-    const typeSlot = this.#membersByType.get(typeName);
+    const typeSlot = this._membersByType.get(typeName);
     if (typeSlot) {
       const object = typeSlot.get(
         name[0] === "/" ? name.substring(this.fullName.length + 1) : name
@@ -97,19 +97,19 @@ export class Owner extends Base {
   }
 
   typeObject(typeName) {
-    return this.#membersByType.get(typeName);
+    return this._membersByType.get(typeName);
   }
 
   typeList(typeName) {
-    const typeSlot = this.#membersByType.get(typeName);
+    const typeSlot = this._membersByType.get(typeName);
     return (typeSlot || EMPTY).values();
   }
 
   addTypeObject(typeName, name, object) {
-    let typeSlot = this.#membersByType.get(typeName);
+    let typeSlot = this._membersByType.get(typeName);
     if (!typeSlot) {
       typeSlot = new Map();
-      this.#membersByType.set(typeName, typeSlot);
+      this._membersByType.set(typeName, typeSlot);
     }
 
     typeSlot.set(name, object);
@@ -221,7 +221,7 @@ export class Owner extends Base {
     if (destinationNetworks) {
       let bridge;
 
-      for (bridge of this.#bridges) {
+      for (bridge of this._bridges) {
         if (bridge.has(network.name)) {
           bridge.delete(network.name);
           bridge.add(network);
@@ -235,7 +235,7 @@ export class Owner extends Base {
 
       if (!bridge) {
         bridge = new Set([network]);
-        this.#bridges.add(bridge);
+        this._bridges.add(bridge);
       }
 
       for (const nameOrNetwork of asIterator(destinationNetworks)) {
@@ -259,7 +259,7 @@ export class Owner extends Base {
   }
 
   _resolveBridges() {
-    for (const bridge of this.#bridges) {
+    for (const bridge of this._bridges) {
       const subnets = new Map();
 
       for (let network of bridge) {
@@ -307,69 +307,69 @@ export class Owner extends Base {
     }
   }
 
-  #country;
+  _country;
 
   set country(value) {
-    this.#country = value;
+    this._country = value;
   }
 
   get country() {
-    return this.#country || this.owner?.country;
+    return this._country || this.owner?.country;
   }
 
-  #locales = new Set();
+  _locales = new Set();
 
   set locales(value) {
     if (value instanceof Set) {
-      this.#locales = this.#locales.union(value);
+      this._locales = this._locales.union(value);
     } else {
-      this.#locales.add(value);
+      this._locales.add(value);
     }
   }
 
   get locales() {
     if (this.owner) {
-      return this.owner.locales.union(this.#locales);
+      return this.owner.locales.union(this._locales);
     }
-    return this.#locales;
+    return this._locales;
   }
 
-  #timezone;
+  _timezone;
 
   set timezone(value) {
-    this.#timezone = value;
+    this._timezone = value;
   }
 
   get timezone() {
-    return this.#timezone || this.owner?.timezone;
+    return this._timezone || this.owner?.timezone;
   }
 
-  #administratorEmail;
+  _administratorEmail;
 
   set administratorEmail(value) {
-    this.#administratorEmail = value;
+    this._administratorEmail = value;
   }
 
   get administratorEmail() {
-    if (this.#administratorEmail) {
-      return this.#administratorEmail;
+    if (this._administratorEmail) {
+      return this._administratorEmail;
     }
 
-    if (this.owner && !this.#domain) {
+    if (this.owner && !this._domain) {
       return this.owner.administratorEmail;
     }
 
     return "admin@" + this.domain;
   }
 
-  #domain;
+  _domain;
 
   set domain(value) {
-    this.#domain = value;
+    this._domain = value;
   }
 
   get domain() {
-    return this.#domain || this.owner?.domain;
+    return this._domain || this.owner?.domain;
   }
 
   get domains() {
@@ -396,21 +396,21 @@ export class Owner extends Base {
     return names;
   }
 
-  #architectures;
+  _architectures;
 
   set architectures(value) {
     if (value instanceof Set) {
-      this.#architectures = this.#architectures
-        ? this.#architectures.union(value)
+      this._architectures = this._architectures
+        ? this._architectures.union(value)
         : value;
     } else {
-      this.#architectures = new Set(value);
+      this._architectures = new Set(value);
     }
   }
 
   get architectures() {
-    if (this.#architectures) {
-      return this.#architectures;
+    if (this._architectures) {
+      return this._architectures;
     }
 
     const architectures = new Set();

package/src/service.mjs

@@ -96,12 +96,12 @@ export const ServiceTypeDefinition = {
 
 export class Service extends Base {
   alias;
-  #weight;
-  #priority;
-  #type;
-  #port;
-  #ipAddresses;
-  #systemd;
+  _weight;
+  _priority;
+  _type;
+  _port;
+  _ipAddresses;
+  _systemd;
 
   static {
     addType(this);
@@ -116,41 +116,10 @@ export class Service extends Base {
     this.read(data, ServiceTypeDefinition);
   }
 
-  forOwner(owner) {
-    if (this.owner !== owner) {
-      const data = { name: this.name };
-      if (this.alias) {
-        data.alias = this.alias;
-      }
-      if (this.#type) {
-        data.type = this.#type;
-      }
-      if (this.#weight) {
-        data.weight = this.#weight;
-      }
-      if (this.#port) {
-        data.port = this.#port;
-      }
-      if (this.#ipAddresses) {
-        data.ipAddresses = this.#ipAddresses;
-      }
-
-      if (this.#systemd) {
-        data.systemd = this.#systemd;
-      }
-
-      // @ts-ignore
-      return new this.constructor(owner, data);
-    }
-
-    return this;
-  }
-
-  get network()
-  {
+  get network() {
     return this.server.network;
   }
-  
+
   get server() {
     return this.owner;
   }
@@ -164,15 +133,15 @@ export class Service extends Base {
   }
 
   get rawAddresses() {
-    return this.#ipAddresses || this.owner.rawAddresses;
+    return this._ipAddresses || this.owner.rawAddresses;
   }
 
   get rawAddress() {
-    return this.#ipAddresses?.[0] || this.server.rawAddress;
+    return this._ipAddresses?.[0] || this.server.rawAddress;
   }
 
   set ipAddresses(value) {
-    this.#ipAddresses = value;
+    this._ipAddresses = value;
   }
 
   get addresses() {
@@ -180,20 +149,20 @@ export class Service extends Base {
   }
 
   set port(value) {
-    this.#port = value;
+    this._port = value;
   }
 
   get port() {
-    return this.#port || ServiceTypes[this.type]?.port;
+    return this._port || ServiceTypes[this.type]?.port;
   }
 
   set priority(value) {
-    this.#priority = value;
+    this._priority = value;
   }
 
   get priority() {
-    if (this.#priority !== undefined) {
-      return this.#priority;
+    if (this._priority !== undefined) {
+      return this._priority;
     }
     if (this.owner.priority !== undefined) {
       return this.owner.priority;
@@ -203,13 +172,14 @@ export class Service extends Base {
   }
 
   set weight(value) {
-    this.#weight = value;
+    this._weight = value;
   }
 
   get weight() {
-    if (this.#weight !== undefined) {
-      return this.#weight;
+    if (this._weight !== undefined) {
+      return this._weight;
     }
+
     if (this.owner.weight !== undefined) {
       return this.owner.weight;
     }
@@ -218,11 +188,11 @@ export class Service extends Base {
   }
 
   set type(value) {
-    this.#type = value;
+    this._type = value;
   }
 
   get type() {
-    return this.#type || this.name;
+    return this._type || this.name;
   }
 
   get master() {
@@ -238,7 +208,7 @@ export class Service extends Base {
   }
 
   get systemdServices() {
-    return this.#systemd;
+    return this._systemd;
   }
 
   get srvPrefix() {

package/src/services/dns.mjs

@@ -68,10 +68,10 @@ export class DNSService extends Service {
   hasCatalog = true;
   hasLinkLocalAdresses = true;
   notify = true;
-  #source = [];
-  #trusted = [];
-  #protected = [];
-  #open = [];
+  _source = [];
+  _trusted = [];
+  _protected = [];
+  _open = [];
 
   serial = Math.ceil(Date.now() / 1000);
   refresh = 36000;
@@ -101,35 +101,35 @@ export class DNSService extends Service {
   }
 
   set protected(value) {
-    this.#protected.push(value);
+    this._protected.push(value);
   }
 
   get protected() {
-    return this.#protected;
+    return this._protected;
   }
 
   set trusted(value) {
-    this.#trusted.push(value);
+    this._trusted.push(value);
   }
 
   get trusted() {
-    return this.#trusted;
+    return this._trusted;
   }
 
   set open(value) {
-    this.#open.push(value);
+    this._open.push(value);
   }
 
   get open() {
-    return this.#open;
+    return this._open;
   }
 
   set source(value) {
-    this.#source.push(value);
+    this._source.push(value);
   }
 
   get source() {
-    return this.#source;
+    return this._source;
   }
 
   *findServices(filter) {
@@ -161,7 +161,8 @@ export class DNSService extends Service {
   }
 
   async *preparePackages(dir) {
-    const name = this.owner.name;
+    const location = this.location;
+    const name = location.name;
     const p1 = join(dir, "p1");
     const packageData = {
       dir: p1,
@@ -169,7 +170,7 @@ export class DNSService extends Service {
       outputs: this.outputs,
       properties: {
         name: `named-${name}`,
-        description: `named definitions for ${this.fullName}`,
+        description: `named definitions for ${location.fullName}`,
         access: "private"
       }
     };
@@ -203,7 +204,7 @@ export class DNSService extends Service {
 
     packageData.properties = {
       name: `named-zones-${name}`,
-      description: `zone definitions for ${this.fullName}`,
+      description: `zone definitions for ${location.fullName}`,
       dependencies: ["mf-named"],
       replaces: ["mf-named-zones"],
       access: "private"
@@ -283,7 +284,7 @@ async function generateZoneDefs(dns, packageData) {
   }
 
   for (const domain of dns.localDomains) {
-    const ownerName = dns.owner.name;
+    const locationName = location.name;
     const reverseZones = new Map();
 
     const config = {
@@ -296,7 +297,7 @@ async function generateZoneDefs(dns, packageData) {
 
     const zone = {
       id: domain,
-      file: `${ownerName}/${domain}.zone`,
+      file: `${locationName}/${domain}.zone`,
       records: new Set([SOARecord, NSRecord, locationRecord])
     };
     config.zones.push(zone);
@@ -310,7 +311,7 @@ async function generateZoneDefs(dns, packageData) {
 
       zone.catalogZone = {
         id: `catalog.${domain}`,
-        file: `${ownerName}/catalog.${domain}.zone`,
+        file: `${locationName}/catalog.${domain}.zone`,
         records: new Set([
           SOARecord,
           NSRecord,
@@ -353,7 +354,7 @@ async function generateZoneDefs(dns, packageData) {
             reverseZone = {
               id: reverseArpa,
               type: "plain",
-              file: `${ownerName}/${reverseArpa}.zone`,
+              file: `${locationName}/${reverseArpa}.zone`,
               records: new Set([SOARecord, NSRecord])
             };
             config.zones.push(reverseZone);

package/src/services/ntp.mjs

@@ -17,7 +17,7 @@ const NTPServiceTypeDefinition = {
 const NTP_SERVICE_FILTER = { type: NTPServiceTypeDefinition.name };
 
 export class NTPService extends Service {
-  #source = [];
+  _source = [];
 
   static {
     addType(this);
@@ -37,11 +37,11 @@ export class NTPService extends Service {
   }
 
   set source(value) {
-    this.#source.push(value);
+    this._source.push(value);
   }
 
   get source() {
-    return this.#source;
+    return this._source;
   }
 
   *findServices(filter) {

package/types/base.d.mts

@@ -49,6 +49,10 @@ export class Base {
     owner: any;
     description: any;
     name: string;
+    _tags: Set<any>;
+    _packaging: Set<any>;
+    _directory: any;
+    _finalize: any;
     ownerFor(property: any, data: any): any;
     read(data: any, type: any): void;
     named(name: any): void;
@@ -93,12 +97,11 @@ export class Base {
     expand(object: any): any;
     finalize(action: any): void;
     execFinalize(): void;
-    _finalize(): void;
+    _execFinalize(): void;
     traverse(visitor: any, ...args: any[]): void;
     _traverse(visited: any, visitor: any, ...args: any[]): boolean;
     error(...args: any[]): void;
     info(...args: any[]): void;
     toString(): string;
     toJSON(): any;
-    #private;
 }

package/types/cluster.d.mts

@@ -216,27 +216,32 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
-                serial: {
+                priority: {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
                 };
-                vendor: {
+                weight: {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
                 };
-                chassis: {
+                serial: {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
                 };
-                architecture: {
+                vendor: {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
                 };
-                priority: {
+                chassis: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
+                architecture: {
                     type: string;
                     collection: boolean;
                     writeable: boolean;
@@ -326,6 +331,8 @@ export class Cluster extends Host {
             };
         };
     };
+    _masters: Set<any>;
+    _backups: Set<any>;
     routerId: number;
     checkInterval: number;
     set masters(value: Set<any>);
@@ -343,6 +350,5 @@ export class Cluster extends Host {
             dependencies: string[];
         };
     }, void, unknown>;
-    #private;
 }
 import { Host } from "./host.mjs";

package/types/host.d.mts

@@ -86,27 +86,32 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
-            serial: {
+            priority: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            vendor: {
+            weight: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            chassis: {
+            serial: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            architecture: {
+            vendor: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            priority: {
+            chassis: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            architecture: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
@@ -169,6 +174,21 @@ export class Host extends Base {
         };
     };
     priority: number;
+    _services: any[];
+    _extends: any[];
+    _aliases: Set<any>;
+    _networkInterfaces: Map<any, any>;
+    _provides: Set<any>;
+    _replaces: Set<any>;
+    _depends: Set<any>;
+    _master: boolean;
+    _os: any;
+    _distribution: any;
+    _deployment: any;
+    _chassis: any;
+    _vendor: any;
+    _architecture: any;
+    _serial: any;
     _applyExtends(host: any): void;
     set services(service: any[]);
     get services(): any[];
@@ -241,7 +261,6 @@ export class Host extends Base {
             hooks: any;
         };
     }, void, unknown>;
-    #private;
 }
 export class NetworkInterface extends Base {
     static get typeDefinition(): {
@@ -378,6 +397,14 @@ export class NetworkInterface extends Base {
             };
         };
     };
+    _ipAddresses: Map<any, any>;
+    _scope: any;
+    _metric: any;
+    _ssid: any;
+    _psk: any;
+    _network: any;
+    _kind: any;
+    _hostName: any;
     extends: any[];
     arpbridge: any;
     hwaddr: any;
@@ -409,6 +436,5 @@ export class NetworkInterface extends Base {
     get psk(): any;
     set kind(value: any);
     get kind(): any;
-    #private;
 }
 import { Base } from "./base.mjs";

package/types/network.d.mts

@@ -177,9 +177,9 @@ export class Network extends Owner {
     scope: any;
     metric: any;
     gateway: any;
+    _bridge: any;
     get network(): this;
     set bridge(network: any);
     get bridge(): any;
-    #private;
 }
 import { Owner } from "./owner.mjs";

package/types/owner.d.mts

@@ -126,6 +126,8 @@ export class Owner extends Base {
             };
         };
     };
+    _membersByType: Map<any, any>;
+    _bridges: Set<any>;
     _traverse(...args: any[]): boolean;
     named(name: any): any;
     typeObject(typeName: any): any;
@@ -148,21 +150,26 @@ export class Owner extends Base {
     _resolveBridges(): void;
     get derivedPackaging(): Set<any>;
     networkAddresses(): Generator<any, void, any>;
+    _country: any;
     set country(value: any);
     get country(): any;
+    _locales: Set<any>;
     set locales(value: any);
     get locales(): any;
+    _timezone: any;
     set timezone(value: any);
     get timezone(): any;
+    _administratorEmail: any;
     set administratorEmail(value: any);
     get administratorEmail(): any;
+    _domain: any;
     set domain(value: any);
     get domain(): any;
     get domains(): Set<any>;
     get localDomains(): Set<any>;
     get domainNames(): Set<any>;
+    _architectures: any;
     set architectures(value: any);
     get architectures(): any;
-    #private;
 }
 import { Base } from "./base.mjs";

package/types/service.d.mts

@@ -262,6 +262,12 @@ export class Service extends Base {
         };
     };
     alias: any;
+    _weight: any;
+    _priority: any;
+    _type: any;
+    _port: any;
+    _ipAddresses: any;
+    _systemd: any;
     get server(): any;
     get domainName(): any;
     get ipAddressOrDomainName(): any;
@@ -286,7 +292,6 @@ export class Service extends Base {
         key: any;
         toString: (maxKeyLength: any, ttl: any) => string;
     }[];
-    #private;
 }
 export function sortByPriority(a: any, b: any): number;
 import { DNSService } from "./module.mjs";

package/types/services/dns.d.mts

@@ -89,6 +89,10 @@ export class DNSService extends Service {
     hasCatalog: boolean;
     hasLinkLocalAdresses: boolean;
     notify: boolean;
+    _source: any[];
+    _trusted: any[];
+    _protected: any[];
+    _open: any[];
     serial: number;
     refresh: number;
     retry: number;
@@ -122,6 +126,5 @@ export class DNSService extends Service {
             access: string;
         };
     }, void, unknown>;
-    #private;
 }
 import { Service } from "../service.mjs";

package/types/services/ntp.d.mts

@@ -11,12 +11,12 @@ export class NTPService extends Service {
             };
         };
     };
+    _source: any[];
     get type(): string;
     set source(value: any[]);
     get source(): any[];
     get systemdConfig(): (string | {
         NTP: string;
     })[];
-    #private;
 }
 import { Service } from "../service.mjs";