pmcf 4.25.2 → 4.25.4

package/README.md

@@ -73,11 +73,11 @@ generates config packages for:
     *   [Parameters](#parameters-12)
     *   [port](#port-1)
 *   [id](#id)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-13)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-13)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -263,6 +263,14 @@ Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
+## InitializationContext
+
+Keeps track of all in flight object creations and loose ends during config initialization.
+
+### Parameters
+
+*   `directory`   (optional, default `"/"`)
+
 ## SkeletonNetworkInterface
 
 **Extends ServiceOwner**
@@ -275,14 +283,6 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
-## InitializationContext
-
-Keeps track of all in flight object creations and loose ends during config initialization.
-
-### Parameters
-
-*   `directory`   (optional, default `"/"`)
-
 ## SystemdJournalRemoteService
 
 **Extends Service**

package/bin/pmcf-info

@@ -4,11 +4,28 @@ import { prepare } from "../src/cli.mjs";
 const { root, args, options } = await prepare({});
 
 for (const expression of args) {
-  let result = root.expression(expression);
+  const result = root.named(expression);
 
-  if (result instanceof Iterator) {
-    result = Array.from(result);
+  show(result);
+}
+
+function show(value) {
+  if (value instanceof Iterator) {
+    for (const v of value) {
+      show(v);
+    }
+  } else {
+    console.log(`${value.fullName}:`);
+    ex(value);
   }
+}
 
-  console.log(result);
+function ex(node, indent = 1) {
+  if (indent > 5) {
+    return;
+  }
+  for (const e of node.extends) {
+    console.log(" ".repeat(indent * 2) + e.fullName);
+    ex(e, indent + 1);
+  }
 }

package/package.json

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

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/initialization-context.mjs

@@ -18,28 +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);
-
-        //  console.log("RESOLVE", object.fullName,name,o.fullName);
-        //  continue;
+        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()
-      );*/
+      );
     }
   }
 
@@ -85,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) {

package/src/service-owner.mjs

@@ -30,10 +30,8 @@ export class ServiceOwner extends Base {
       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);
         this.services = service.forOwner(this);
       }
     }