pmcf 6.49.0 → 6.49.2

package/package.json

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

package/src/interfaces/interface.mjs

@@ -1,6 +1,7 @@
 import { AggregatedMap } from "aggregated-map";
-import { addType, asArray } from "pacc";
-import { host } from "pmcf";
+import { asArray } from "pacc";
+import { host } from "../host.mjs";
+import { addType } from "../type.mjs";
 import { ServiceOwner } from "../service-owner.mjs";
 
 /**

package/src/interfaces/loopback.mjs

@@ -1,5 +1,5 @@
-import { addType } from "pacc";
 import { SUBNET_LOCALHOST_IPV4, SUBNET_LOCALHOST_IPV6 } from "pmcf";
+import { addType } from "../type.mjs";
 import { SkeletonNetworkInterface } from "./skeleton-network-interface.mjs";
 import { NetworkInterface } from "./network-interface.mjs";
 

package/src/interfaces/modbus.mjs

@@ -1,11 +1,15 @@
-import { addType } from "pacc";
+import { number_attribute_writable } from "pacc";
+import { addType } from "../type.mjs";
 import { Interface } from "./interface.mjs";
 
 export class modbus extends Interface {
+  static attributes = {
+    address: { number_attribute_writable, name: "address" }
+  };
+
   static commonNamePattern = /^modbus\d*$/;
 
   static {
     addType(this);
   }
-
 }

package/src/interfaces/network-interface.mjs

@@ -4,7 +4,8 @@ import {
   default_collection_attribute_writable
 } from "pacc";
 import { network_attribute } from "../common-attributes.mjs";
-import { host, cidrAddresses, addType } from "pmcf";
+import { host, cidrAddresses } from "pmcf";
+import { addType } from "../type.mjs";
 import {
   networkAttributes,
   networkAddressAttributes,

package/src/interfaces/skeleton-network-interface.mjs

@@ -1,6 +1,6 @@
 import { join } from "node:path";
-import { addType } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
+import { addType } from "../type.mjs";
 import { NetworkAddress, cidrAddresses } from "pmcf";
 import { Interface } from "./interface.mjs";
 

package/src/services/bind.mjs

@@ -368,16 +368,16 @@ class bind_view extends bind_object {
       type: bind_view
     },
     notify: { ...boolean_attribute_writable_false, name: "notify" },
-    hasForeignDomains: {
+    hasCatalog: { ...boolean_attribute_writable_false, name: "hasCatalog" },
+    hasForeignDomainRecords: {
       ...boolean_attribute_writable_false,
-      name: "hasForeignDomains"
+      name: "hasForeignDomainRecords"
     },
     hasBaseRecords: {
       ...boolean_attribute_writable_true,
       name: "hasBaseRecords"
     },
-    hasCatalog: { ...boolean_attribute_writable_false, name: "hasCatalog" },
-    hasReverse: { ...boolean_attribute_writable_false, name: "hasReverse" },
+    hasReverseRecords: { ...boolean_attribute_writable_false, name: "hasReverseRecords" },
     hasSVRRecords: {
       ...boolean_attribute_writable_false,
       name: "hasSVRRecords"
@@ -416,12 +416,12 @@ class bind_view extends bind_object {
   hasSVRRecords = true;
   recordTTL = "1W";
 
-  set hasForeignDomains(value) {
-    this._hasForeignDomains = value;
+  set hasForeignDomainRecords(value) {
+    this._hasForeignDomainRecords = value;
   }
 
-  get hasForeignDomains() {
-    return this.attribute("_hasForeignDomains");
+  get hasForeignDomainRecords() {
+    return this.attribute("_hasForeignDomainRecords");
   }
 
   set hasBaseRecords(value) {
@@ -432,12 +432,12 @@ class bind_view extends bind_object {
     return this.attribute("_hasBaseRecords");
   }
 
-  set hasReverse(value) {
-    this._hasReverse = value;
+  set hasReverseRecords(value) {
+    this._hasReverseRecords = value;
   }
 
-  get hasReverse() {
-    return this.attribute("_hasReverse");
+  get hasReverseRecords() {
+    return this.attribute("_hasReverseRecords");
   }
 
   set hasCatalog(value) {
@@ -558,7 +558,7 @@ class bind_view extends bind_object {
             );
 
             if (this.hasBaseRecords) {
-              if (this.hasReverse && na.subnet.prefix) {
+              if (this.hasReverseRecords && na.subnet.prefix) {
                 let subnet;
 
                 for (const s of subnets) {
@@ -586,7 +586,7 @@ class bind_view extends bind_object {
             if (!hosts.has(host)) {
               hosts.add(host);
 
-              if (this.hasForeignDomains) {
+              if (this.hasForeignDomainRecords) {
                 for (let foreignDomain of host.foreignDomainNames) {
                   const wildcard = foreignDomain.startsWith("*.");
                   if (wildcard) {