pmcf 6.66.9 → 6.66.11

package/README.md

@@ -75,37 +75,37 @@ generates config packages for:
     *   [Parameters](#parameters-12)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
-*   [HTTPEndpoint](#httpendpoint)
+*   [url\_endpoint](#url_endpoint)
     *   [Parameters](#parameters-13)
     *   [port](#port-1)
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [priority](#priority-1)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [subnetForAddress](#subnetforaddress)
@@ -280,7 +280,7 @@ Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
-## HTTPEndpoint
+## url\_endpoint
 
 **Extends BaseEndpoint**
 
@@ -308,18 +308,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends Interface**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## Interface
 
 **Extends ServiceOwner**
@@ -417,6 +405,18 @@ 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 Interface**
+
+### 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.66.9",
+  "version": "6.66.11",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "aggregated-map": "^1.0.11",
-    "content-entry-transform": "^1.7.10",
+    "content-entry-transform": "^1.7.11",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
     "npm-pkgbuild": "^22.2.9",

package/src/core.mjs

@@ -4,7 +4,6 @@ import {
   filterPublic,
   parse,
   extendingAttributeIterator,
-  getAttribute,
   expand,
   globals
 } from "pacc";
@@ -167,7 +166,7 @@ export class core {
    */
   attribute(name) {
     for (const node of this.walkDirections(["this", "extends"])) {
-      const value = getAttribute(node, name);
+      const value = node[name];
       if (value !== undefined) {
         return this.expand(value);
       }
@@ -285,7 +284,7 @@ export class core {
    * @returns {any}
    */
   expand(object) {
-    if (this.isTemplate) {
+    if (object === undefined || this.isTemplate) {
       return object;
     }
 

package/src/endpoint.mjs

@@ -1,4 +1,4 @@
-import { getAttribute, string_attribute, url_attribute } from "pacc";
+import { string_attribute, url_attribute } from "pacc";
 import { FAMILY_IPV6, FAMILY_IPV4 } from "ip-utilties";
 import { addType } from "./type.mjs";
 import { CoreService } from "./core-service.mjs";
@@ -43,7 +43,7 @@ class BaseEndpoint {
   }
 
   attribute(name) {
-    return getAttribute(this, name);
+    return this[name];
   }
 
   value(name) {

package/src/network-address.mjs

@@ -1,7 +1,6 @@
 import {
   default_attribute,
   type_attribute,
-  getAttribute,
   leafValues
 } from "pacc";
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
@@ -89,7 +88,7 @@ export class NetworkAddress {
   }
 
   attribute(name) {
-    return getAttribute(this, name);
+    return this[name];
   }
 
   value(name) {