pmcf 6.32.2 → 6.32.4

package/package.json

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

package/src/base.mjs

@@ -100,22 +100,28 @@ export class Base {
   }
 
   materializeExtends() {
-    /*
-    console.log(
-      "materializeExtends",
-      this.fullName,
-      this.owner?.fullName,
-      [...this.extends].map(n => n.fullName)
-    );*/
-
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
-      attribute =>
-        attribute.collection &&
-        !attribute.type.primitive &&
-        !attribute.deferredExpression
+      attribute => attribute.collection && !attribute.type.primitive
     )) {
+      if (attribute.deferredExpression) {
+        const name = attribute.name;
+        if (!this.hasOwnProperty(name)) {
+          for (const e of this.walkDirections(["extends"])) {
+            if (e.hasOwnProperty(name)) {
+              Object.defineProperty(this, name, {
+                get: () => e[name]
+              });
+              break;
+            }
+          }
+        }
+
+        continue;
+      }
+
       const collection = this[attribute.name];
+
       if (typeof collection?.get === "function") {
         for (const [name, extending] of this.mapFromDirections(
           ["extends"],

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
@@ -784,17 +798,13 @@ export class bind extends CoreService {
   async writeForwarders(outputControl) {
     // TODO formulate everything as pacc expression
 
-/*
+    /*
     console.log("F",this.extends);
     console.log("F0",this.fullName);
     console.log("F1",this.forwarders);
 */
-    const forwarders = [...this.forwarders]
-      .map(e => e.endpoints())
-      .flat()
-      .filter(e => e.networkAddress)
-      .map(e => e.networkAddress?.address);
-
+    const forwarders = endpointAddresses(this.forwarders);
+    
     if (forwarders.length) {
       await writeLines(
         join(outputControl.dir, "etc/named/options"),