pmcf 6.32.1 → 6.32.3

package/package.json

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

package/src/base.mjs

@@ -122,11 +122,23 @@ export class Base {
           attribute.name
         )) {
           const present = collection.get(extending.name);
-          //console.log("ME",this.fullName,attribute.name,extending.name);
+
           if (present) {
+            /*if (attribute.name === "services") {
+              console.log(
+                this.fullName,
+                present.fullName,
+                "<-",
+                extending.fullName
+              );
+            }*/
+
             present.extends.add(extending);
             present.materializeExtends();
           } else {
+            /*if (attribute.name === "services") {
+              console.log(this.fullName, extending.fullName);
+            }*/
             collection.set(extending.name, extending.forOwner(this));
           }
         }
@@ -180,7 +192,9 @@ export class Base {
    */
   mapFromDirections(directions, property) {
     return new AggregatedMap(
-      [...this.walkDirections(directions)].map(node => node[property])
+      [...this.walkDirections(directions)]
+        .map(node => node[property])
+        .filter(node => node !== undefined)
     );
   }
 

package/src/initialization-context.mjs

@@ -29,6 +29,12 @@ export class InitializationContext {
         const resolved = this.named(value, node);
         if (resolved) {
           assign(attribute, object, resolved);
+
+          if (attribute.name === "extends") {
+            // TODO attribute action ?
+            object.materializeExtends();
+          }
+
           continue nextOutstanding;
         }
       }
@@ -36,6 +42,12 @@ export class InitializationContext {
       const resolved = object.expression(value);
       if (resolved) {
         assign(attribute, object, resolved);
+
+        if (attribute.name === "extends") {
+          // TODO attribute action ?
+          object.materializeExtends();
+        }
+
         continue nextOutstanding;
       }
 

package/src/services/bind.mjs

@@ -191,16 +191,7 @@ class bind_zone_config extends Base {
             );
             break;
           case "secondary":
-            const primaries = [...this.service.primaries]
-              .map(e => e.endpoints())
-              .flat()
-              .filter(
-                e =>
-                  e.networkAddress &&
-                  addressType(e.networkAddress.address) !==
-                    ADDRESS_TYPE_LOOPBACK
-              )
-              .map(e => e.networkAddress.address);
+            const primaries = endpointAddresses(this.service.primaries);
 
             content.push(
               ...addressesStatement("  primaries", primaries, false, "    ")
@@ -649,6 +640,29 @@ class bind_group extends bind_object {
   }
 }
 
+function endpointAddresses(entries) {
+  if (entries === undefined) {
+    return [];
+  }
+
+  /*
+      [...this.forwarders]
+      .map(e => e.endpoints())
+      .flat()
+      .filter(e => e.networkAddress)
+      .map(e => e.networkAddress?.address);
+*/
+  return [...entries]
+    .map(e => e.endpoints())
+    .flat()
+    .filter(
+      e =>
+        e.networkAddress &&
+        addressType(e.networkAddress.address) !== ADDRESS_TYPE_LOOPBACK
+    )
+    .map(e => e.networkAddress.address);
+}
+
 /**
  *
  * @param {string} prefix
@@ -783,12 +797,14 @@ export class bind extends CoreService {
 
   async writeForwarders(outputControl) {
     // TODO formulate everything as pacc expression
-    const forwarders = [...this.forwarders]
-      .map(e => e.endpoints())
-      .flat()
-      .filter(e => e.networkAddress)
-      .map(e => e.networkAddress?.address);
 
+    /*
+    console.log("F",this.extends);
+    console.log("F0",this.fullName);
+    console.log("F1",this.forwarders);
+*/
+    const forwarders = endpointAddresses(this.forwarders);
+    
     if (forwarders.length) {
       await writeLines(
         join(outputControl.dir, "etc/named/options"),