pmcf 4.6.2 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.6.2",
+  "version": "4.8.0",
   "publishConfig": {
     "access": "public"
   },
@@ -60,7 +60,7 @@
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^25.0.8",
+    "@types/node": "^25.0.9",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -310,29 +310,35 @@ export class Base {
     return this.owner.addObject(object);
   }
 
-  *_allExtends(all) {
-    for (const e of this.extends) {
-      if (!all.has(e)) {
-        all.add(e);
-        yield e;
-        yield* e._allExtends(all);
-      }
-    }
+  *walkDirections(directions = ["this", "extends", "owner"]) {
+    yield* this._walkDirections(
+      directions,
+      directions.indexOf("this") >= 0,
+      new Set()
+    );
   }
 
-  *allExtends() {
-    yield* this._allExtends(new Set());
-  }
+  *_walkDirections(directions, withThis, seen) {
+    if (!seen.has(this)) {
+      seen.add(this);
 
-  *owners() {
-    if (this.owner) {
-      yield* this.owner.thisAndOwners();
-    }
-  }
+      if (withThis) {
+        yield this;
+      }
+      for (const direction of directions) {
+        const value = this[direction];
 
-  *thisAndOwners() {
-    yield this;
-    yield* this.owners();
+        if (value) {
+          if (value[Symbol.iterator]) {
+            for (const node of value) {
+              yield* node._walkDirections(directions, true, seen);
+            }
+          } else {
+            yield* value._walkDirections(directions, true, seen);
+          }
+        }
+      }
+    }
   }
 
   forOwner(owner) {
@@ -361,49 +367,20 @@ export class Base {
     return this.constructor.typeDefinition.name;
   }
 
-  *_extendedPropertyIterator(propertyName, seen) {
-    if (!seen.has(this)) {
-      seen.add(this);
-
-      const value = getAttribute(this, propertyName);
+  /**
+   * 
+   * @param {string} name 
+   * @returns {any}
+   */
+  extendedAttribute(name) {
+    for (const node of this.walkDirections(["this", "extends"])) {
+      const value = getAttribute(node, name);
       if (value !== undefined) {
-        yield value;
-      } else {
-        const value = this._properties?.[propertyName];
-        if (value !== undefined) {
-          yield value;
-        }
-      }
-
-      for (const e of this.allExtends()) {
-        yield* e._extendedPropertyIterator(propertyName, seen);
-      }
-    }
-  }
-
-  _extendedProperty(propertyName, seen) {
-    if (!seen.has(this)) {
-      seen.add(this);
-      for (const e of this.allExtends()) {
-        const value =
-          getAttribute(e, propertyName) ??
-          e._extendedProperty(propertyName, seen);
-        if (value !== undefined) {
-          return value;
-        }
+        return value;
       }
     }
   }
 
-  extendedProperty(propertyName) {
-    const value = getAttribute(this, propertyName);
-    if (value !== undefined) {
-      return value;
-    }
-
-    return this._extendedProperty(propertyName, new Set());
-  }
-
   /**
    * Retrive attribute values from an object.
    * @param {Function} [filter]
@@ -420,7 +397,7 @@ export class Base {
         filter
       )) {
         const name = path.join(".");
-        const value = this.extendedProperty(name);
+        const value = this.extendedAttribute(name);
 
         if (value !== undefined) {
           yield [def.externalName ?? name, toExternal(value, def), path, def];
@@ -581,15 +558,16 @@ export class Base {
       )
     ];
 
-    return [...this.allExtends(), this].map(e => {
-      const dir = join(e.directory, "content") + "/";
-      console.log("DIR", dir);
-
-      return transform(
-        new FileContentProvider(dir, entryProperties, directoryProperties),
+    return [...this.walkDirections(["this", "extends"])].map(e =>
+      transform(
+        new FileContentProvider(
+          { dir: join(e.directory, "content"), pattern: "**/*" },
+          entryProperties,
+          directoryProperties
+        ),
         transformers
-      );
-    });
+      )
+    );
   }
 
   get tags() {
@@ -609,21 +587,21 @@ export class Base {
   }
 
   getGlobal(a) {
-    return globals[a] ?? this.property(a);
+    return globals[a] ?? this.extendedAttribute(a) ?? this.property(a);
   }
 
   get properties() {
     return this._properties;
   }
 
+  /**
+   *
+   * @param {string} name
+   * @returns {any}
+   */
   property(name) {
-    let value = this._properties?.[name];
-    if (value !== undefined) {
-      return value;
-    }
-
-    for (const o of this.owners()) {
-      const value = o.property(name);
+    for (const node of this.walkDirections(["this", "extends", "owner"])) {
+      const value = node._properties?.[name];
       if (value !== undefined) {
         return value;
       }

package/src/host.mjs

@@ -143,7 +143,7 @@ export class Host extends ServiceOwner {
   }
 
   get serial() {
-    return this.extendedProperty("_serial");
+    return this.extendedAttribute("_serial");
   }
 
   set deployment(value) {
@@ -151,7 +151,7 @@ export class Host extends ServiceOwner {
   }
 
   get deployment() {
-    return this.extendedProperty("_deployment");
+    return this.extendedAttribute("_deployment");
   }
 
   set chassis(value) {
@@ -159,7 +159,7 @@ export class Host extends ServiceOwner {
   }
 
   get chassis() {
-    return this.extendedProperty("_chassis");
+    return this.extendedAttribute("_chassis");
   }
 
   set vendor(value) {
@@ -167,7 +167,7 @@ export class Host extends ServiceOwner {
   }
 
   get vendor() {
-    return this.extendedProperty("_vendor");
+    return this.extendedAttribute("_vendor");
   }
 
   set keymap(value) {
@@ -175,7 +175,7 @@ export class Host extends ServiceOwner {
   }
 
   get keymap() {
-    return this.extendedProperty("_keymap");
+    return this.extendedAttribute("_keymap");
   }
 
   set architecture(value) {
@@ -183,7 +183,7 @@ export class Host extends ServiceOwner {
   }
 
   get architecture() {
-    return this.extendedProperty("_architecture");
+    return this.extendedAttribute("_architecture");
   }
 
   get derivedPackaging() {
@@ -261,7 +261,7 @@ export class Host extends ServiceOwner {
   }
 
   get os() {
-    return this.extendedProperty("_os");
+    return this.extendedAttribute("_os");
   }
 
   set distribution(value) {
@@ -269,7 +269,7 @@ export class Host extends ServiceOwner {
   }
 
   get distribution() {
-    return this.extendedProperty("_distribution");
+    return this.extendedAttribute("_distribution");
   }
 
   get modelName() {

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

@@ -126,7 +126,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get hostName() {
-    return this.extendedProperty("_hostName") ?? this.host.hostName;
+    return this.extendedAttribute("_hostName") ?? this.host.hostName;
   }
 
   set hostName(value) {
@@ -147,7 +147,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
   get scope() {
     return (
-      this.extendedProperty("_scope") ??
+      this.extendedAttribute("_scope") ??
       this.network?.scope ??
       networkAttributes.scope.default
     );
@@ -158,7 +158,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get hwaddr() {
-    return this.extendedProperty("_hwaddr");
+    return this.extendedAttribute("_hwaddr");
   }
 
   set metric(value) {
@@ -167,7 +167,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
   get metric() {
     return (
-      this.extendedProperty("_metric") ??
+      this.extendedAttribute("_metric") ??
       this.network?.metric ??
       networkAttributes.metric.default
     );
@@ -178,7 +178,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get mtu() {
-    return this.extendedProperty("_mtu"); // ?? networkAttributes.mtu.default;
+    return this.extendedAttribute("_mtu"); // ?? networkAttributes.mtu.default;
   }
 
   set class(value) {
@@ -186,7 +186,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get class() {
-    return this.extendedProperty("_class") ?? this.network?.class;
+    return this.extendedAttribute("_class") ?? this.network?.class;
   }
 
   set kind(value) {
@@ -194,7 +194,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get kind() {
-    return this.extendedProperty("_kind") ?? this.network?.kind;
+    return this.extendedAttribute("_kind") ?? this.network?.kind;
   }
 
   async systemdDefinitions(packageData) {

package/src/network-interfaces/skeleton.mjs

@@ -52,7 +52,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
   }
 
   get network() {
-    return this.extendedProperty("_network") ?? this.host?.network;
+    return this.extendedAttribute("_network") ?? this.host?.network;
   }
 
   set network(network) {

package/src/network-interfaces/wlan.mjs

@@ -52,7 +52,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
 
   get secretName() {
     return (
-      this.extendedProperty("_secretName") ??
+      this.extendedAttribute("_secretName") ??
       this.network?.secretName ??
       `${this.network.name}.password`
     );
@@ -63,7 +63,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   }
 
   get ssid() {
-    return this.extendedProperty("_ssid") ?? this.network?.ssid;
+    return this.extendedAttribute("_ssid") ?? this.network?.ssid;
   }
 
   set psk(value) {
@@ -71,7 +71,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   }
 
   get psk() {
-    return this.extendedProperty("_psk") ?? this.network?.psk;
+    return this.extendedAttribute("_psk") ?? this.network?.psk;
   }
 
   async systemdDefinitions(packageData) {

package/src/service.mjs

@@ -218,7 +218,7 @@ export class Service extends Base {
   }
 
   get alias() {
-    return this.extendedProperty("_alias");
+    return this.extendedAttribute("_alias");
   }
 
   set port(value) {
@@ -234,7 +234,7 @@ export class Service extends Base {
   }
 
   get weight() {
-    return this.extendedProperty("_weight") ?? this.owner.weight ?? 1;
+    return this.extendedAttribute("_weight") ?? this.owner.weight ?? 1;
   }
 
   set type(value) {
@@ -251,7 +251,7 @@ export class Service extends Base {
 
   get systemdService() {
     return (
-      this.extendedProperty("_systemdService") ??
+      this.extendedAttribute("_systemdService") ??
       ServiceTypes[this.type]?.systemdService
     );
   }

package/types/base.d.mts

@@ -60,17 +60,18 @@ export class Base {
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
-    _allExtends(all: any): Generator<any, void, any>;
-    allExtends(): Generator<any, void, any>;
-    owners(): any;
-    thisAndOwners(): any;
+    walkDirections(directions?: string[]): Generator<any, void, any>;
+    _walkDirections(directions: any, withThis: any, seen: any): Generator<any, void, any>;
     forOwner(owner: any): any;
     isNamed(name: any): boolean;
     relativeName(name: any): any;
     get typeName(): any;
-    _extendedPropertyIterator(propertyName: any, seen: any): Generator<any, void, any>;
-    _extendedProperty(propertyName: any, seen: any): any;
-    extendedProperty(propertyName: any): any;
+    /**
+     *
+     * @param {string} name
+     * @returns {any}
+     */
+    extendedAttribute(name: string): any;
     /**
      * Retrive attribute values from an object.
      * @param {Function} [filter]
@@ -129,7 +130,12 @@ export class Base {
     get isTemplate(): any;
     getGlobal(a: any): any;
     get properties(): any;
-    property(name: any): any;
+    /**
+     *
+     * @param {string} name
+     * @returns {any}
+     */
+    property(name: string): any;
     /**
      *
      * @param {any} object