pmcf 2.8.0 → 2.9.0

package/package.json

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

package/src/base.mjs

@@ -274,6 +274,32 @@ export class Base {
     return this.constructor.typeDefinition.name;
   }
 
+  get extends() {
+    return [];
+  }
+
+  _extendedProperty(propertyName, seen) {
+    if (!seen.has(this)) {
+      seen.add(this);
+      for (const e of this.extends) {
+        const value =
+          e[propertyName] ?? e._extendedProperty(propertyName, seen);
+        if (value !== undefined) {
+          return value;
+        }
+      }
+    }
+  }
+
+  extendedProperty(propertyName) {
+    const value = this[propertyName];
+    if (value !== undefined) {
+      return value;
+    }
+
+    return this._extendedProperty(propertyName, new Set());
+  }
+
   get root() {
     return this.owner.root;
   }

package/src/host.mjs

@@ -107,9 +107,6 @@ export class Host extends Base {
     if (data.extends) {
       this.finalize(() => {
         for (const host of this.extends) {
-          if (host === this) {
-            this.error("Cant extend myself");
-          }
           host.execFinalize();
           this._applyExtends(host);
         }
@@ -156,7 +153,7 @@ export class Host extends Base {
   }
 
   get serial() {
-    return this._serial ?? this.extends.find(e => e.serial)?.serial;
+    return this.extendedProperty("_serial");
   }
 
   set deployment(value) {
@@ -164,7 +161,7 @@ export class Host extends Base {
   }
 
   get deployment() {
-    return this._deployment ?? this.extends.find(e => e.deployment)?.deployment;
+    return this.extendedProperty("_deployment");
   }
 
   set chassis(value) {
@@ -172,7 +169,7 @@ export class Host extends Base {
   }
 
   get chassis() {
-    return this._chassis ?? this.extends.find(e => e.chassis)?.chassis;
+    return this.extendedProperty("_chassis");
   }
 
   set vendor(value) {
@@ -180,7 +177,7 @@ export class Host extends Base {
   }
 
   get vendor() {
-    return this._vendor ?? this.extends.find(e => e.vendor)?.vendor;
+    return this.extendedProperty("_vendor");
   }
 
   set architecture(value) {
@@ -188,9 +185,7 @@ export class Host extends Base {
   }
 
   get architecture() {
-    return (
-      this._architecture ?? this.extends.find(e => e.architecture)?.architecture
-    );
+    return this.extendedProperty("_architecture");
   }
 
   get derivedPackaging() {
@@ -276,7 +271,7 @@ export class Host extends Base {
   }
 
   get os() {
-    return this._os ?? this.extends.find(e => e.os)?.os;
+    return this.extendedProperty("_os");
   }
 
   set distribution(value) {
@@ -284,9 +279,7 @@ export class Host extends Base {
   }
 
   get distribution() {
-    return (
-      this._distribution ?? this.extends.find(e => e.distribution)?.distribution
-    );
+    return this.extendedProperty("_distribution");
   }
 
   get modelName() {
@@ -522,7 +515,8 @@ export class NetworkInterface extends Base {
   _kind;
   _hostName;
   _hwaddr;
-  extends = [];
+  _class;
+  _extends = [];
   arpbridge;
 
   constructor(owner, data) {
@@ -616,7 +610,7 @@ export class NetworkInterface extends Base {
   }
 
   get hostName() {
-    return this._hostName ?? this.host.hostName;
+    return this.extendedProperty("_hostName") ?? this.host.hostName;
   }
 
   set hostName(value) {
@@ -637,14 +631,16 @@ export class NetworkInterface extends Base {
     return this;
   }
 
-  extendedProperty(name) {
-    return this.extends.find(i => i[name])?.[name];
+  set extends(value) {
+    this._extends.push(value);
+  }
+
+  get extends() {
+    return this._extends;
   }
 
   get network() {
-    return (
-      this._network ?? this.extendedProperty("_network") ?? this.host.network
-    );
+    return this.extendedProperty("_network") ?? this.host.network;
   }
 
   set network(network) {
@@ -656,12 +652,7 @@ export class NetworkInterface extends Base {
   }
 
   get scope() {
-    return (
-      this._scope ??
-      this.extendedProperty("_scope") ??
-      this.network?.scope ??
-      "global"
-    );
+    return this.extendedProperty("_scope") ?? this.network?.scope ?? "global";
   }
 
   set hwaddr(value) {
@@ -669,7 +660,7 @@ export class NetworkInterface extends Base {
   }
 
   get hwaddr() {
-    return this._hwaddr ?? this.extendedProperty("_hwaddr");
+    return this.extendedProperty("_hwaddr");
   }
 
   set metric(value) {
@@ -677,12 +668,15 @@ export class NetworkInterface extends Base {
   }
 
   get metric() {
-    return (
-      this._metric ??
-      this.extendedProperty("_metric") ??
-      this.network?.metric ??
-      1004
-    );
+    return this.extendedProperty("_metric") ?? this.network?.metric ?? 1004;
+  }
+
+  set class(value) {
+    this._class = value;
+  }
+
+  get class() {
+    return this.extendedProperty("_class") ?? this.network?.class;
   }
 
   set ssid(value) {
@@ -690,7 +684,7 @@ export class NetworkInterface extends Base {
   }
 
   get ssid() {
-    return this._ssid ?? this.extendedProperty("_ssid") ?? this.network?.ssid;
+    return this.extendedProperty("_ssid") ?? this.network?.ssid;
   }
 
   set psk(value) {
@@ -698,7 +692,7 @@ export class NetworkInterface extends Base {
   }
 
   get psk() {
-    return this._psk ?? this.extendedProperty("_psk") ?? this.network?.psk;
+    return this.extendedProperty("_psk") ?? this.network?.psk;
   }
 
   set kind(value) {
@@ -706,8 +700,6 @@ export class NetworkInterface extends Base {
   }
 
   get kind() {
-    return (
-      this._kind ?? this.extendedProperty("_kind") ?? this.network?.kind
-    );
+    return this.extendedProperty("_kind") ?? this.network?.kind;
   }
 }

package/src/network-support.mjs

@@ -5,6 +5,12 @@ export const networkProperties = {
     writeable: true,
     values: ["global", "site", "link", "host"]
   },
+  class: {
+    type: "string",
+    collection: false,
+    writeable: true,
+    values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
+  },
   kind: {
     type: "string",
     collection: false,

package/types/base.d.mts

@@ -67,6 +67,9 @@ export class Base {
     isNamed(name: any): boolean;
     relativeName(name: any): any;
     get typeName(): any;
+    get extends(): any[];
+    _extendedProperty(propertyName: any, seen: any): any;
+    extendedProperty(propertyName: any): any;
     get root(): any;
     get location(): any;
     get host(): any;

package/types/host.d.mts

@@ -366,6 +366,12 @@ export class NetworkInterface extends Base {
                 writeable: boolean;
                 values: string[];
             };
+            class: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+                values: string[];
+            };
             kind: {
                 type: string;
                 collection: boolean;
@@ -413,7 +419,8 @@ export class NetworkInterface extends Base {
     _kind: any;
     _hostName: any;
     _hwaddr: any;
-    extends: any[];
+    _class: any;
+    _extends: any[];
     arpbridge: any;
     matches(other: any): boolean;
     addSubnet(address: any): any;
@@ -432,7 +439,8 @@ export class NetworkInterface extends Base {
     get hostName(): any;
     get domainNames(): any;
     get network_interface(): this;
-    extendedProperty(name: any): any;
+    set extends(value: any[]);
+    get extends(): any[];
     set network(network: any);
     get network(): any;
     set scope(value: any);
@@ -441,6 +449,8 @@ export class NetworkInterface extends Base {
     get hwaddr(): any;
     set metric(value: any);
     get metric(): any;
+    set class(value: any);
+    get class(): any;
     set ssid(value: any);
     get ssid(): any;
     set psk(value: any);

package/types/network-support.d.mts

@@ -1,11 +1,11 @@
 export namespace networkProperties {
-    namespace scope {
+    export namespace scope {
         let type: string;
         let collection: boolean;
         let writeable: boolean;
         let values: string[];
     }
-    namespace kind {
+    export namespace _class {
         let type_1: string;
         export { type_1 as type };
         let collection_1: boolean;
@@ -15,15 +15,18 @@ export namespace networkProperties {
         let values_1: string[];
         export { values_1 as values };
     }
-    namespace ssid {
+    export { _class as class };
+    export namespace kind {
         let type_2: string;
         export { type_2 as type };
         let collection_2: boolean;
         export { collection_2 as collection };
         let writeable_2: boolean;
         export { writeable_2 as writeable };
+        let values_2: string[];
+        export { values_2 as values };
     }
-    namespace psk {
+    export namespace ssid {
         let type_3: string;
         export { type_3 as type };
         let collection_3: boolean;
@@ -31,7 +34,7 @@ export namespace networkProperties {
         let writeable_3: boolean;
         export { writeable_3 as writeable };
     }
-    namespace metric {
+    export namespace psk {
         let type_4: string;
         export { type_4 as type };
         let collection_4: boolean;
@@ -39,7 +42,7 @@ export namespace networkProperties {
         let writeable_4: boolean;
         export { writeable_4 as writeable };
     }
-    namespace MTU {
+    export namespace metric {
         let type_5: string;
         export { type_5 as type };
         let collection_5: boolean;
@@ -47,7 +50,7 @@ export namespace networkProperties {
         let writeable_5: boolean;
         export { writeable_5 as writeable };
     }
-    namespace gateway {
+    export namespace MTU {
         let type_6: string;
         export { type_6 as type };
         let collection_6: boolean;
@@ -55,7 +58,7 @@ export namespace networkProperties {
         let writeable_6: boolean;
         export { writeable_6 as writeable };
     }
-    namespace multicastDNS {
+    export namespace gateway {
         let type_7: string;
         export { type_7 as type };
         let collection_7: boolean;
@@ -63,9 +66,7 @@ export namespace networkProperties {
         let writeable_7: boolean;
         export { writeable_7 as writeable };
     }
-}
-export namespace networkAddressProperties {
-    namespace hostName {
+    export namespace multicastDNS {
         let type_8: string;
         export { type_8 as type };
         let collection_8: boolean;
@@ -73,7 +74,9 @@ export namespace networkAddressProperties {
         let writeable_8: boolean;
         export { writeable_8 as writeable };
     }
-    namespace cidrAddresses {
+}
+export namespace networkAddressProperties {
+    namespace hostName {
         let type_9: string;
         export { type_9 as type };
         let collection_9: boolean;
@@ -81,7 +84,7 @@ export namespace networkAddressProperties {
         let writeable_9: boolean;
         export { writeable_9 as writeable };
     }
-    namespace cidrAddress {
+    namespace cidrAddresses {
         let type_10: string;
         export { type_10 as type };
         let collection_10: boolean;
@@ -89,7 +92,7 @@ export namespace networkAddressProperties {
         let writeable_10: boolean;
         export { writeable_10 as writeable };
     }
-    namespace rawAddresses {
+    namespace cidrAddress {
         let type_11: string;
         export { type_11 as type };
         let collection_11: boolean;
@@ -97,7 +100,7 @@ export namespace networkAddressProperties {
         let writeable_11: boolean;
         export { writeable_11 as writeable };
     }
-    namespace rawAddress {
+    namespace rawAddresses {
         let type_12: string;
         export { type_12 as type };
         let collection_12: boolean;
@@ -105,4 +108,12 @@ export namespace networkAddressProperties {
         let writeable_12: boolean;
         export { writeable_12 as writeable };
     }
+    namespace rawAddress {
+        let type_13: string;
+        export { type_13 as type };
+        let collection_13: boolean;
+        export { collection_13 as collection };
+        let writeable_13: boolean;
+        export { writeable_13 as writeable };
+    }
 }

package/types/network.d.mts

@@ -152,6 +152,12 @@ export class Network extends Owner {
                 writeable: boolean;
                 values: string[];
             };
+            class: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+                values: string[];
+            };
             kind: {
                 type: string;
                 collection: boolean;