pmcf 2.3.0 → 2.3.2

package/package.json

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

package/src/base.mjs

@@ -289,11 +289,11 @@ export class Base {
   }
 
   get domains() {
-    return this.owner?.domains || new Set();
+    return this.owner?.domains ?? new Set();
   }
 
   get localDomains() {
-    return this.owner?.localDomains || new Set();
+    return this.owner?.localDomains ?? new Set();
   }
 
   get administratorEmail() {
@@ -317,12 +317,7 @@ export class Base {
   }
 
   get priority() {
-    if (this._priority !== undefined) {
-      return this._priority;
-    }
-    if (this.owner?.priority !== undefined) {
-      return this.owner.priority;
-    }
+    return this._priority ?? this.owner?.priority;
   }
 
   get smtp() {
@@ -351,7 +346,7 @@ export class Base {
   }
 
   get directory() {
-    return this._directory || join(this.owner.directory, this.name);
+    return this._directory ?? join(this.owner.directory, this.name);
   }
 
   get fullName() {
@@ -417,7 +412,7 @@ export class Base {
     switch (typeof object) {
       case "string":
         return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
-          return getAttribute(this, m1) || "${" + m1 + "}";
+          return getAttribute(this, m1) ?? "${" + m1 + "}";
         });
 
       case "object":

package/src/host.mjs

@@ -138,7 +138,7 @@ export class Host extends Base {
   }
 
   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) {
@@ -146,7 +146,7 @@ export class Host extends Base {
   }
 
   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) {
@@ -154,7 +154,7 @@ export class Host extends Base {
   }
 
   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) {
@@ -162,7 +162,7 @@ export class Host extends Base {
   }
 
   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) {
@@ -171,7 +171,7 @@ export class Host extends Base {
 
   get architecture() {
     return (
-      this._architecture || this.extends.find(e => e.architecture)?.architecture
+      this._architecture ?? this.extends.find(e => e.architecture)?.architecture
     );
   }
 
@@ -258,7 +258,7 @@ export class Host extends Base {
   }
 
   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) {
@@ -267,7 +267,7 @@ export class Host extends Base {
 
   get distribution() {
     return (
-      this._distribution || this.extends.find(e => e.distribution)?.distribution
+      this._distribution ?? this.extends.find(e => e.distribution)?.distribution
     );
   }
 
@@ -580,7 +580,7 @@ export class NetworkInterface extends Base {
   }
 
   get hostName() {
-    return this._hostName || this.host.hostName;
+    return this._hostName ?? this.host.hostName;
   }
 
   set hostName(value) {
@@ -602,7 +602,7 @@ export class NetworkInterface extends Base {
   }
 
   get network() {
-    return this._network || this.host.network;
+    return this._network ?? this.host.network;
   }
 
   set network(network) {
@@ -614,7 +614,7 @@ export class NetworkInterface extends Base {
   }
 
   get scope() {
-    return this._scope || this.network?.scope || "global";
+    return this._scope ?? this.network?.scope ?? "global";
   }
 
   set metric(value) {
@@ -622,7 +622,7 @@ export class NetworkInterface extends Base {
   }
 
   get metric() {
-    return this._metric || this.network?.metric || 1004;
+    return this._metric ?? this.network?.metric ?? 1004;
   }
 
   set ssid(value) {
@@ -630,7 +630,7 @@ export class NetworkInterface extends Base {
   }
 
   get ssid() {
-    return this._ssid || this.network?.ssid;
+    return this._ssid ?? this.network?.ssid;
   }
 
   set psk(value) {
@@ -638,7 +638,7 @@ export class NetworkInterface extends Base {
   }
 
   get psk() {
-    return this._psk || this.network?.psk;
+    return this._psk ?? this.network?.psk;
   }
 
   set kind(value) {
@@ -646,6 +646,6 @@ export class NetworkInterface extends Base {
   }
 
   get kind() {
-    return this._kind || this.network?.kind;
+    return this._kind ?? this.network?.kind;
   }
 }

package/src/owner.mjs

@@ -314,7 +314,7 @@ export class Owner extends Base {
   }
 
   get country() {
-    return this._country || this.owner?.country;
+    return this._country ?? this.owner?.country;
   }
 
   _locales = new Set();
@@ -341,7 +341,7 @@ export class Owner extends Base {
   }
 
   get timezone() {
-    return this._timezone || this.owner?.timezone;
+    return this._timezone ?? this.owner?.timezone;
   }
 
   _administratorEmail;
@@ -369,7 +369,7 @@ export class Owner extends Base {
   }
 
   get domain() {
-    return this._domain || this.owner?.domain;
+    return this._domain ?? this.owner?.domain;
   }
 
   get domains() {

package/src/service.mjs

@@ -66,7 +66,7 @@ export const ServiceTypeDefinition = {
   priority: 0.4,
   extends: Base.typeDefinition,
   factoryFor(value) {
-    const type = value.type || value.name;
+    const type = value.type ?? value.name;
 
     if (type === "dns") {
       delete value.type;
@@ -130,15 +130,15 @@ export class Service extends Base {
   }
 
   get ipAddressOrDomainName() {
-    return this.rawAddress || this.domainName;
+    return this.rawAddress ?? this.domainName;
   }
 
   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) {
@@ -164,7 +164,7 @@ export class Service extends Base {
   }
 
   get port() {
-    return this._port || ServiceTypes[this.type]?.endpoints[0].port;
+    return this._port ?? ServiceTypes[this.type]?.endpoints[0].port;
   }
 
   set weight(value) {
@@ -172,15 +172,7 @@ export class Service extends Base {
   }
 
   get weight() {
-    if (this._weight !== undefined) {
-      return this._weight;
-    }
-
-    if (this.owner.weight !== undefined) {
-      return this.owner.weight;
-    }
-
-    return 1;
+    return this._weight ?? this.owner.weight ?? 1;
   }
 
   set type(value) {
@@ -188,7 +180,7 @@ export class Service extends Base {
   }
 
   get type() {
-    return this._type || this.name;
+    return this._type ?? this.name;
   }
 
   get protocol() {
@@ -196,7 +188,7 @@ export class Service extends Base {
   }
 
   get tls() {
-    return ServiceTypes[this.type]?.tls || false;
+    return ServiceTypes[this.type]?.tls ?? false;
   }
 
   get systemdServices() {
@@ -214,12 +206,12 @@ export class Service extends Base {
         records.push(
           DNSRecord(
             dnsFullName(
-              `_${ServiceTypes[this.type]?.type || this.type}._${
+              `_${ServiceTypes[this.type]?.type ?? this.type}._${
                 ep.protocol
               }.${domainName}`
             ),
             "SRV",
-            this.priority === undefined ? 10 : this.priority,
+            this.priority ?? 10,
             this.weight,
             ep.port,
             dnsFullName(this.domainName)
@@ -247,7 +239,7 @@ export class Service extends Base {
           DNSRecord(
             dnsFullName(domainName),
             dnsRecord.type,
-            this.priority === undefined ? 10 : this.priority,
+            this.priority ?? 10,
             ".",
             dnsFormatParameters(parameters)
           )