pmcf 4.8.0 → 4.8.2

package/README.md

@@ -42,69 +42,84 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
-    *   [propertyIterator](#propertyiterator)
+    *   [extendedAttribute](#extendedattribute)
         *   [Parameters](#parameters-1)
-    *   [getProperties](#getproperties)
+    *   [propertyIterator](#propertyiterator)
         *   [Parameters](#parameters-2)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-3)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-3)
-    *   [findService](#findservice)
         *   [Parameters](#parameters-4)
-    *   [expand](#expand)
+    *   [findService](#findservice)
         *   [Parameters](#parameters-5)
+    *   [property](#property)
+        *   [Parameters](#parameters-6)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-7)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-8)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-7)
+    *   [Parameters](#parameters-9)
     *   [port](#port-1)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-8)
+        *   [Parameters](#parameters-10)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-11)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-12)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-13)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-14)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-15)
 *   [isTemplate](#istemplate)
 *   [services](#services)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-16)
 *   [named](#named)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-17)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-18)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-19)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-20)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-21)
 *   [asArray](#asarray)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-22)
 *   [asIterator](#asiterator)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-23)
 
 ## Base
 
+attributes: essential values
+properties: use defined values to support attribute value definitions
+
 ### Parameters
 
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### extendedAttribute
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **any** 
+
 ### propertyIterator
 
 Retrive attribute values from an object.
@@ -146,6 +161,14 @@ Returns **any** 
 
 Returns **any** service with the highest priority
 
+### property
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **any** 
+
 ### expand
 
 #### Parameters

package/package.json

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

package/src/base.mjs

@@ -28,6 +28,8 @@ import { asArray } from "./utils.mjs";
 
 /**
  *
+ * attributes: essential values
+ * properties: use defined values to support attribute value definitions
  */
 export class Base {
   static name = "base";
@@ -376,7 +378,7 @@ export class Base {
     for (const node of this.walkDirections(["this", "extends"])) {
       const value = getAttribute(node, name);
       if (value !== undefined) {
-        return value;
+        return this.expand(value);
       }
     }
   }
@@ -603,7 +605,7 @@ export class Base {
     for (const node of this.walkDirections(["this", "extends", "owner"])) {
       const value = node._properties?.[name];
       if (value !== undefined) {
-        return value;
+        return this.expand(value);
       }
     }
   }

package/src/services/openldap.mjs

@@ -68,7 +68,7 @@ export class OpenLDAPService extends Service {
   }
 
   get base() {
-    return this.expand(this._base);
+    return this.extendedAttribute("_base");
   }
 
   set base(value) {
@@ -76,7 +76,7 @@ export class OpenLDAPService extends Service {
   }
 
   get uri() {
-    return this._uri;
+    return this.extendedAttribute("_uri");
   }
 
   set uri(value) {

package/types/base.d.mts

@@ -1,6 +1,8 @@
 export function extractFrom(object: any, typeDefinition?: any): any;
 /**
  *
+ * attributes: essential values
+ * properties: use defined values to support attribute value definitions
  */
 export class Base {
     static name: string;