pmcf 6.68.10 → 6.68.12

package/package.json

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

package/src/core-service.mjs

@@ -201,23 +201,14 @@ export class CoreService extends base {
     return this.endpoints(filter)[0];
   }
 
-  address(
-    options = {
-      endpoints: e =>
-        e.networkInterface && e.networkInterface.kind !== "loopbak",
-      select: e => e.domainName || e.address,
-      limit: 1,
-      join: ""
-    }
-  ) {
-    const all = this.endpoints(options.endpoints);
-    const res = [...new Set(options.select ? all.map(options.select) : all)];
-
-    if (options.limit < res.length) {
-      res.length = options.limit;
-    }
-
-    return options.join !== undefined ? res.join(options.join) : res;
+  get address() {
+    return [
+      ...new Set(
+        this.endpoints(
+          e => e.networkInterface && e.networkInterface.kind !== "loopbak"
+        ).map(e => e.domainName || e.address)
+      )
+    ][0];
   }
 
   set port(value) {

package/src/initialization-context.mjs

@@ -28,30 +28,30 @@ export class InitializationContext {
       .outstandingResolves) {
       value = object.expand(value);
 
-      for (const node of object.walkDirections(["this", "owner"])) {
-        const resolved = this.named(value, node);
-        if (resolved) {
+      function resolve(resolved)
+       {
           assign(attribute, object, resolved);
 
           if (attribute.name === "extends") {
             // TODO attribute action ?
             object.materializeExtends();
           }
+       }
 
+      for (const node of object.walkDirections(["this", "owner"])) {
+        const resolved = this.named(value, node);
+        if (resolved) {
+          resolve(resolved);
           continue nextOutstanding;
         }
       }
 
       const resolved = object.expression(value);
       if (resolved) {
-        assign(attribute, object, resolved);
-
-        if (attribute.name === "extends") {
-          // TODO attribute action ?
-          object.materializeExtends();
+        if (resolved) {
+          resolve(resolved);
+          continue nextOutstanding;
         }
-
-        continue nextOutstanding;
       }
 
       this.error(

package/src/services/bind.mjs

@@ -491,7 +491,7 @@ class bind_view extends bind_object {
         `(${this.soaUpdates.join(" ")})`
       ),
       ...asArray(service.authorative).map(dns =>
-        DNSRecord("@", "NS", dnsFullName(dns.address()))
+        DNSRecord("@", "NS", dnsFullName(dns.address))
       )
     ];
   }