pmcf 6.18.1 → 6.19.0

package/README.md

@@ -42,83 +42,89 @@ generates config packages for:
 ### Table of Contents
 
 *   [Base](#base)
+    *   [Parameters](#parameters)
     *   [mapFromDirections](#mapfromdirections)
-        *   [Parameters](#parameters)
-    *   [unionFromDirections](#unionfromdirections)
         *   [Parameters](#parameters-1)
-    *   [walkDirections](#walkdirections)
+    *   [unionFromDirections](#unionfromdirections)
         *   [Parameters](#parameters-2)
-    *   [attribute](#attribute)
+    *   [walkDirections](#walkdirections)
         *   [Parameters](#parameters-3)
-    *   [attributeIterator](#attributeiterator)
+    *   [attribute](#attribute)
         *   [Parameters](#parameters-4)
-    *   [getAttributes](#getattributes)
+    *   [attributeIterator](#attributeiterator)
         *   [Parameters](#parameters-5)
-    *   [property](#property)
+    *   [getAttributes](#getattributes)
         *   [Parameters](#parameters-6)
+    *   [property](#property)
+        *   [Parameters](#parameters-7)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-7)
-    *   [templateContent](#templatecontent)
         *   [Parameters](#parameters-8)
+    *   [templateContent](#templatecontent)
+        *   [Parameters](#parameters-9)
     *   [isTemplate](#istemplate)
     *   [expand](#expand)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-10)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-10)
-*   [PortEndpoint](#portendpoint)
     *   [Parameters](#parameters-11)
+*   [PortEndpoint](#portendpoint)
+    *   [Parameters](#parameters-12)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-13)
     *   [port](#port-1)
 *   [id](#id)
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-14)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-15)
 *   [type](#type)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-19)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-20)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
 *   [subnetForAddress](#subnetforaddress)
-    *   [Parameters](#parameters-20)
-*   [domainName](#domainname)
     *   [Parameters](#parameters-21)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-22)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-23)
-*   [asArray](#asarray)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-24)
-*   [asIterator](#asiterator)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-25)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-26)
 
 ## Base
 
 attributes: as declared in the types
 properties: use defined values to support attribute value definitions
 
+### Parameters
+
+*   `owner`  
+*   `data`  
+
 ### mapFromDirections
 
 Deliver AggregatedMap of all property Maps.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.18.1",
+  "version": "6.19.0",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.10.0",
     "npm-pkgbuild": "^20.8.9",
-    "pacc": "^11.0.1",
+    "pacc": "^11.0.2",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/base.mjs

@@ -37,9 +37,9 @@ export class Base {
   static key = "name";
   static priority = 0;
   static attributes = {
+    owner: owner_attribute,
     name: name_attribute_writable,
     description: description_attribute_writable,
-    owner: owner_attribute,
     type: type_attribute,
     directory: { ...string_attribute_writable, name: "directory" },
     packaging: { ...string_set_attribute_writable, name: "packaging" },
@@ -66,6 +66,12 @@ export class Base {
   _packaging = new Set();
   _directory;
 
+  constructor(owner, data) {
+    if (owner) {
+      this.owner = owner;
+    }
+  }
+
   set owner(value) {
     if (this === value || this === value?.owner) {
       this.error("Unable to own myself", value.fullName);

package/src/initialization-context.mjs

@@ -48,7 +48,7 @@ export class InitializationContext {
   }
 
   instantiateAndAssign(object, attribute, value) {
-    if (attribute.type.primitive) {
+    if (attribute.type.primitive || attribute.expression) {
       return assign(attribute, object, value);
     }
     if (value !== undefined) {
@@ -178,15 +178,9 @@ export class InitializationContext {
       attribute => attribute.type === type && attribute.collection
     )) {
       try {
-        const object = create(type, owner, data);
-
-        // set backointer early so that parent properties can be found during load
-        if (attribute.backpointer) {
-          assign(attribute.backpointer, object, owner);
-        }
-        return assign(attribute, owner, this.read(object, data));
+        return assign(attribute, owner, this.read(create(type, owner, data), data));
       } catch (e) {
-        this.error(`Unable to assign ${type.name}.${attribute.name}`, data);
+        this.error(`Unable to assign ${type.name}.${attribute.name}`, e, data);
       }
     }
 

package/src/network-address.mjs

@@ -14,20 +14,20 @@ import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
  *
  */
 export class NetworkAddress {
-    static name = "network-address";
-    static priority = 1;
-    static key = "address";
-    static attributes = {
-      address: { ...name_attribute, name: "address" },
-      cidrAddress: { ...string_attribute, name: "cidrAddress" },
-       networkInterface: {
-        ...default_attribute,
-        name: "networkInterface",
-        type: "network_interface"
-      },
-      family: { ...string_attribute, name: "family" }
-    };
-  
+  static name = "network-address";
+  static priority = 1;
+  static key = "address";
+  static attributes = {
+    address: { ...name_attribute, name: "address" },
+    cidrAddress: { ...string_attribute, name: "cidrAddress" },
+    networkInterface: {
+      ...default_attribute,
+      name: "networkInterface",
+      type: "network_interface"
+    },
+    family: { ...string_attribute, name: "family" }
+  };
+
   static {
     addType(this);
   }
@@ -48,10 +48,18 @@ export class NetworkAddress {
     this.subnet = subnet;
   }
 
+  get host() {
+    return this.networkInterface.host;
+  }
+
   get domainNames() {
     return this.networkInterface.domainNames;
   }
 
+  get domains() {
+    return this.networkInterface.domains;
+  }
+
   get family() {
     return familyIP(this.address);
   }
@@ -60,6 +68,10 @@ export class NetworkAddress {
     return formatCIDR(this.address, this.subnet.prefixLength);
   }
 
+  get fullName() {
+    return `${this.networkInterface.fullName}/${decodeIP(this.address)}`;
+  }
+
   toString() {
     return `${this.networkInterface.fullName} ${decodeIP(this.address)}`;
   }

package/src/network-interfaces/network-interface.mjs

@@ -107,10 +107,17 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   set hostName(value) {
     this._hostName = value;
   }
+  
+  get domains() {
+    if (!this.host) {
+      return new Set();
+    }
+
+    return this.host.localDomains;
+  }
 
   get domainNames() {
-    if(!this.host) {
-      //console.log("NO HOST",this.fullName);
+    if (!this.host) {
       return new Set();
     }
     return this.hostName

package/src/network.mjs

@@ -53,7 +53,7 @@ export class Network extends Owner {
 
   get subnets() {
     if (!this._subnets.get("fe80::/64")) {
-      const linkLocal = new Subnet("fe80::/64");
+      const linkLocal = new Subnet(this, "fe80::/64");
       this._subnets.set(linkLocal.address, linkLocal);
       //assign(subnets_attribute, this, linkLocal);
     }

package/src/owner.mjs

@@ -135,7 +135,7 @@ export class Owner extends ServiceOwner {
       if (cidr && prefixLength !== 0) {
         return (
           this._subnets.get(cidr) ||
-          assign(subnets_attribute, this, new Subnet(cidr))
+          assign(subnets_attribute, this, new Subnet(this, cidr))
         );
       }
 

package/src/subnet.mjs

@@ -33,8 +33,9 @@ export class Subnet {
 
   networks = new Set();
 
-  constructor(address) {
-    const { longPrefix, prefix, prefixLength, cidr, family } = normalizeCIDR(address);
+  constructor(owner, address) {
+    const { longPrefix, prefix, prefixLength, cidr, family } =
+      normalizeCIDR(address);
 
     this.address = cidr;
     this.prefix = prefix;
@@ -99,7 +100,7 @@ export class Subnet {
   }
 }
 
-export const SUBNET_GLOBAL_IPV4 = new Subnet("0.0.0.0/0");
-export const SUBNET_GLOBAL_IPV6 = new Subnet("::0/0");
-export const SUBNET_LOCALHOST_IPV4 = new Subnet("127.0.0.1/8");
-export const SUBNET_LOCALHOST_IPV6 = new Subnet("::1/128");
+export const SUBNET_GLOBAL_IPV4 = new Subnet(undefined, "0.0.0.0/0");
+export const SUBNET_GLOBAL_IPV6 = new Subnet(undefined, "::0/0");
+export const SUBNET_LOCALHOST_IPV4 = new Subnet(undefined, "127.0.0.1/8");
+export const SUBNET_LOCALHOST_IPV6 = new Subnet(undefined, "::1/128");

package/src/type.mjs

@@ -3,8 +3,7 @@ import { normalizeIP } from "ip-utilties";
 import { addServiceType } from "pmcf";
 import { asArray } from "./utils.mjs";
 
-
-const SLASH = {...DOT, str: "/" };
+const SLASH = { ...DOT, str: "/" };
 
 registerToken(SLASH);
 
@@ -34,16 +33,22 @@ export function assign(attribute, object, value) {
   value ??= attribute.default;
 
   if (value !== undefined) {
+    // set backointer early so that parent properties can be found during load
+    if (attribute.backpointer) {
+      assign(attribute.backpointer, value, object);
+    }
+
+    if (attribute.expression) { // TODO
+      object[attribute.name] = value;
+      return value;
+    }
+
     if (attribute.values) {
       if (!attribute.values.has(value)) {
         error("unkown value", attribute);
       }
     }
 
-    if (attribute.backpointer) {
-      assign(attribute.backpointer, value, object);
-    }
-
     if (attribute.collection) {
       const current = object[attribute.name];