pmcf 6.10.2 → 6.10.4

package/README.md

@@ -77,26 +77,26 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-15)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-17)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-17)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-18)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-19)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -286,6 +286,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## SystemdJournalRemoteService
 
 **Extends CoreService**
@@ -361,18 +373,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.10.2",
+  "version": "6.10.4",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.7.4",
+    "ip-utilties": "^3.7.5",
     "npm-pkgbuild": "^20.8.2",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",

package/src/network-address.mjs

@@ -69,7 +69,7 @@ export function addresses(sources, options) {
           typeof object === "string" ? object : decodeIP(object.address)
         )
     )
-  ];
+  ].filter(e=>e!=='');
 }
 
 /**

package/src/services/bind.mjs

@@ -134,7 +134,7 @@ class bind_group extends Base {
   }
 
   get defaultRecords() {
-    const nameService = this.owner; //ss[0];
+    const nameService = this.owner;
 
     console.log(
       "nameService",
@@ -372,11 +372,12 @@ class bind_group extends Base {
           content.push(`  type ${config.type};`);
           content.push(`  file \"${zone.file}\";`);
           content.push(
-            `  allow-update { ${
-              this.allowedUpdates.length
-                ? this.allowedUpdates.join(";")
-                : "none"
-            }; };`
+            addressesStatement(
+              "allow-update",
+              this.allowedUpdates,
+              "none;",
+              "  "
+            )
           );
           content.push(`  notify ${yesno(this.notify)};`);
         }
@@ -407,11 +408,17 @@ class bind_group extends Base {
   }
 }
 
-function addressesStatement(prefix, objects, generateEmpty = false) {
-  const body = asArray(objects).map(name => `  ${name};`);
+function addressesStatement(prefix, objects, empty = false, indent = "") {
+  const body = asArray(objects).map(
+    value => `${indent}  ${typeof value === "string" ? value : value.name};`
+  );
 
-  if (body.length || generateEmpty) {
-    return [`${prefix} {`, body, "};"];
+  if (body.length) {
+    return [`${indent}${prefix} {`, body, `${indent}};`];
+  }
+
+  if (empty) {
+    return [`${indent}${prefix} {`, indent + "  " + empty, `${indent}};`];
   }
 
   return [];