pmcf 4.25.1 → 4.25.3

package/README.md

@@ -49,20 +49,20 @@ generates config packages for:
         *   [Parameters](#parameters-2)
     *   [walkDirections](#walkdirections)
         *   [Parameters](#parameters-3)
-    *   [extendedAttribute](#extendedattribute)
+    *   [attribute](#attribute)
         *   [Parameters](#parameters-4)
-    *   [propertyIterator](#propertyiterator)
+    *   [attributeIterator](#attributeiterator)
         *   [Parameters](#parameters-5)
-    *   [getProperties](#getproperties)
+    *   [getAttributes](#getattributes)
         *   [Parameters](#parameters-6)
+    *   [property](#property)
+        *   [Parameters](#parameters-7)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-7)
-    *   [templateContent](#templatecontent)
         *   [Parameters](#parameters-8)
-    *   [isTemplate](#istemplate)
-    *   [property](#property)
+    *   [templateContent](#templatecontent)
         *   [Parameters](#parameters-9)
+    *   [isTemplate](#istemplate)
     *   [expand](#expand)
         *   [Parameters](#parameters-10)
 *   [PortEndpoint](#portendpoint)
@@ -114,7 +114,7 @@ generates config packages for:
 
 ## Base
 
-attributes: essential values
+attributes: as declared in the types
 properties: use defined values to support attribute value definitions
 
 ### Parameters
@@ -154,7 +154,7 @@ Walk the object graph in some directions and deliver seen nodes.
 
 Returns **Iterable<[Base](#base)>**&#x20;
 
-### extendedAttribute
+### attribute
 
 #### Parameters
 
@@ -162,7 +162,7 @@ Returns **Iterable<[Base](#base)>**&#x20;
 
 Returns **any**&#x20;
 
-### propertyIterator
+### attributeIterator
 
 Retrive attribute values from an object.
 
@@ -172,7 +172,7 @@ Retrive attribute values from an object.
 
 Returns **Iterable<\[[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String), any]>** values
 
-### getProperties
+### getAttributes
 
 Retrive attribute values from an object.
 
@@ -182,6 +182,14 @@ Retrive attribute values from an object.
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** values
 
+### property
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+Returns **any**&#x20;
+
 ### priority
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)**&#x20;
@@ -208,14 +216,6 @@ Returns **AsyncIterable\<ContentProvider>**&#x20;
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
 
-### property
-
-#### Parameters
-
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
-
-Returns **any**&#x20;
-
 ### expand
 
 #### Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.25.1",
+  "version": "4.25.3",
   "publishConfig": {
     "access": "public"
   },
@@ -58,7 +58,7 @@
     "package-directory": "^8.2.0"
   },
   "devDependencies": {
-    "@types/node": "^25.9.1",
+    "@types/node": "^25.9.2",
     "ava": "^8.0.1",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -194,7 +194,6 @@ export class Base {
   forOwner(owner) {
     if (this.owner !== owner) {
       const newObject = Object.create(this);
-      newObject.extends = new Set([...this.extends]);
       newObject.owner = owner;
       return newObject;
     }

package/src/host.mjs

@@ -494,7 +494,7 @@ export class Host extends ServiceOwner {
         for (const { serviceName, configFileName, content } of asArray(
           service.expand(service.systemdConfigs(this.name))
         )) {
-          console.log("SERVICE", service.fullName, configFileName);
+          //console.log("SERVICE", service.fullName, configFileName);
 
           await writeLines(dir, configFileName, content);
 

package/src/initialization-context.mjs

@@ -18,25 +18,24 @@ export class InitializationContext {
   }
 
   resolveOutstanding() {
-    for (let { object, attribute, name, value } of this.outstandingResolves) {
+    nextOutstanding: for (let { object, attribute, name, value } of this
+      .outstandingResolves) {
       value = object.expand(value);
 
       for (const type of attribute.type.members || [attribute.type]) {
-        const o =
-          object.typeNamed(type.name, value) ||
-          object.owner.typeNamed(type.name, value) ||
-          object.root.typeNamed(type.name, value); // TODO
-
-        if (o) {
-          this.assign(object, name, attribute, o);
+        for (const node of object.walkDirections(["this", "owner"])) {
+          const resolved = node.typeNamed(type.name, value);
+          if (resolved) {
+            this.assign(object, name, attribute, resolved);
+            continue nextOutstanding;
+          }
         }
       }
 
-      /*
       this.error(
-        `No such object "${value}" (${attribute.type.name}) for attribute ${name}`,
+        `Unable to resolve "${value}" (${attribute.type.name}) for attribute ${name}`,
         object.root.named(value)?.toString()
-      );*/
+      );
     }
   }
 
@@ -82,6 +81,9 @@ export class InitializationContext {
                 if (value instanceof Set) {
                   object[name] = current.union(value);
                 } else {
+                  /*if(name === 'extends') {
+                    console.log("EXT",object.fullName,value.fullName)
+                  }*/
                   object[name].add(value);
                 }
               } else if (current instanceof Map) {
@@ -194,7 +196,6 @@ export class InitializationContext {
     this._read(object, data, type);
 
     if (data.extends) {
-      //console.log("EXTENDS", type.name, object.fullName); // data.extends);
       object.materializeExtends();
     }
   }
@@ -221,7 +222,6 @@ export class InitializationContext {
               } else {
                 for (const [objectName, objectData] of Object.entries(value)) {
                   if (typeof objectData === "object") {
-                    //console.log("KEY", objectName, type.name, type.key);
                     objectData[attribute.type.key] = objectName;
                   }
                   this.instantiateAndAssign(
@@ -237,10 +237,6 @@ export class InitializationContext {
           }
         }
         this.instantiateAndAssign(object, name, attribute, value);
-
-        /*if (name === "alias" && value) {
-          console.log("READ ALIAS", object.fullName, object.alias, value);
-        }*/
       }
     }
   }
@@ -253,7 +249,6 @@ export class InitializationContext {
       )
     );
 
-    //console.log("LOAD", name);
     let owner;
     if (name[0] === "/") {
       const parentName = name.replace(/\/[^\/]+$/, "");

package/src/service-owner.mjs

@@ -8,42 +8,54 @@ export class ServiceOwner extends Base {
   }
 
   get services() {
-    return this.mapFromDirections(["this", "extends"], "_services");
+    return this._services;
+    //return this.mapFromDirections(["this", "extends"], "_services");
   }
 
-  addObject(object)
-  {
-    if(object instanceof Service) {
+  addObject(object) {
+    if (object instanceof Service) {
       this._services.set(object.name, object);
     }
 
     super.addObject(object);
   }
 
-  _materializeExtends() {
+  materializeExtends() {
     super.materializeExtends();
 
-    for (const serviceOwner of this.walkDirections(["extends"])) {
-      /*console.log(
-        "ServiceOwner materializeExtends",
-        this.fullName,
-        serviceOwner.fullName
-      );*/
-
-      for (const service of serviceOwner.services.values()) {
-        const present = this.services.get(service.name);
-
-        if (present) {
-          //console.log("LINK SERVICE", this.fullName, present.fullName, service.fullName);
-          present.extends.add(service);
-        } else {
-          //console.log("ADD  SERVICE", this.fullName, service.fullName);
-
-          const s = service.forOwner(this);
-          this._services.set(s.name, s);
-        }
+    for (const [name, service] of this.mapFromDirections(
+      ["extends"],
+      "_services"
+    )) {
+      const present = this._services.get(service.name);
+
+      if (present) {
+        present.extends.add(service);
+      } else {
+        this.services = service.forOwner(this);
+      }
+    }
+
+    /*
+    if (this.fullName === "/SW/mini1") {
+      const myServiceNames = new Set([...this.services.keys()]);
+      const extendingSericeNames = new Set([
+        ...this.mapFromDirections(["extends"], "_services").keys()
+      ]);
+
+      console.log("XXX",this.fullName, [...this.extends].map(n=>n.fullName), myServiceNames, extendingSericeNames);
+
+      if (!extendingSericeNames.isSubsetOf(myServiceNames)) {
+        // const diff = myServiceNames.difference(extendingSericeNames);
+        console.log(
+          "DIFF",
+          this.fullName,
+          myServiceNames,
+          extendingSericeNames
+        );
       }
     }
+    */
   }
 
   _traverse(...args) {

package/src/services/systemd-journal-upload.mjs

@@ -69,7 +69,10 @@ export class SystemdJournalUploadService extends Service {
    * @returns {Object}
    */
   systemdConfigs(name) {
-    console.log("PROPS",this.expand(this.getAttributes(filterConfigurable)));
+    console.log(this.fullName,this.owner.fullName);
+    console.log(this.property('domainName'),this.name);
+    console.log(this.property('certs_private_dir'));
+    console.log("PROPS", this.expand(this.getAttributes(filterConfigurable)));
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,