pmcf 2.62.0 → 2.62.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.62.0",
+  "version": "2.62.2",
   "publishConfig": {
     "access": "public"
   },
@@ -19,8 +19,8 @@
     "iwd",
     "kea",
     "keepalived",
-    "systemd",
-    "openldap"
+    "openldap",
+    "systemd"
   ],
   "contributors": [
     {

package/src/base.mjs

@@ -31,7 +31,7 @@ const BaseTypeDefinition = {
 };
 
 /**
- * 
+ *
  */
 export class Base {
   owner;
@@ -158,8 +158,6 @@ export class Base {
         case "number":
         case "string":
           {
-            value = this.expand(value);
-
             let object;
 
             for (const type of property.type) {
@@ -222,13 +220,14 @@ export class Base {
       }
     };
 
-    if(data?.properties) {
+    if (data?.properties) {
       this._properties = data.properties;
     }
 
     for (const property of Object.values(type.properties)) {
       if (property.writeable) {
-        const value = data[property.name];
+        const value = this.expand(data[property.name]);
+
         if (property.collection) {
           if (typeof value === "object") {
             if (Array.isArray(value)) {
@@ -240,7 +239,9 @@ export class Base {
                 assign(property, value);
               } else {
                 for (const [objectName, objectData] of Object.entries(value)) {
-                  objectData[type.identifier.name] = objectName;
+                  if (typeof objectData === "object") {
+                    objectData[type.identifier.name] = objectName;
+                  }
                   instantiateAndAssign(property, objectData);
                 }
               }
@@ -382,8 +383,8 @@ export class Base {
   }
 
   /**
-   * 
-   * @param {any} filter 
+   *
+   * @param {any} filter
    * @returns service with the highest priority
    */
   findService(filter) {
@@ -459,7 +460,7 @@ export class Base {
 
   property(name) {
     const value = this._properties?.[name];
-    if(value === undefined && this.owner) {
+    if (value === undefined && this.owner) {
       return this.owner.property(name);
     }
 
@@ -478,17 +479,24 @@ export class Base {
         });
 
       case "object":
-        if (Array.isArray(object)) {
-          return object.map(e => this.expand(e));
+        if (object instanceof Base) {
+          return object;
+        }
+        if (object instanceof Map) {
+          return object; // TODO
         }
 
         if (object instanceof Set) {
           return new Set([...object].map(e => this.expand(e)));
         }
 
-      /*return Object.fromEntries(
+        if (Array.isArray(object)) {
+          return object.map(e => this.expand(e));
+        }
+
+        return Object.fromEntries(
           Object.entries(object).map(([k, v]) => [k, this.expand(v)])
-        );*/
+        );
     }
 
     return object;

package/src/host.mjs

@@ -211,7 +211,7 @@ export class Host extends ServiceOwner {
   }
 
   get isTemplate() {
-    return this.isModel || this.name.match(/services\//); // TODO
+    return this.isModel || this.name?.match(/services\//); // TODO
   }
 
   get isModel() {

package/src/network-interfaces/skeleton.mjs

@@ -27,7 +27,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
   }
 
   get isTemplate() {
-    return this.name.indexOf("*") >= 0;
+    return this.name?.indexOf("*") >= 0;
   }
 
   get host() {