pmcf 1.94.2 → 1.94.4

package/package.json

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

package/src/base.mjs

@@ -386,7 +386,15 @@ export class Base {
     }
   }
 
+  get isTemplate() {
+    return false;
+  }
+
   expand(object) {
+    if (this.isTemplate) {
+      return object;
+    }
+
     switch (typeof object) {
       case "string":
         return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
@@ -474,7 +482,17 @@ export function extractFrom(
   object,
   typeDefinition = object?.constructor?.typeDefinition
 ) {
-  if (Array.isArray(object)) {
+  switch (typeof object) {
+    case "undefined":
+    case "string":
+    case "number":
+    case "boolean":
+      return object;
+  }
+
+  if (typeof object[Symbol.iterator] === "function") {
+    object = [...object];
+
     if (object.length === 0) {
       return undefined;
     }
@@ -490,11 +508,7 @@ export function extractFrom(
       );
     }
 
-    return object.map(o => extractFrom(o));
-  }
-
-  if (!typeDefinition || object === undefined) {
-    return object;
+    return object.length ? object : undefined;
   }
 
   const json = {};
@@ -525,8 +539,11 @@ export function extractFrom(
               json[name].name = value.name;
             }
           } else {
-            if (Array.isArray(value)) {
-              json[name] = extractFrom(value);
+            if (typeof value[Symbol.iterator] === "function") {
+              value = extractFrom(value);
+              if (value !== undefined) {
+                json[name] = value;
+              }
             } else {
               const resultObject = Object.fromEntries(
                 Object.entries(value).map(([k, v]) => [

package/src/host.mjs

@@ -60,7 +60,6 @@ const HostTypeDefinition = {
 };
 
 export class Host extends Base {
-  serial;
   priority = 1;
   #services = [];
   #extends = [];
@@ -76,6 +75,7 @@ export class Host extends Base {
   #chassis;
   #vendor;
   #architecture;
+  #serial;
 
   static {
     addType(this);
@@ -104,12 +104,6 @@ export class Host extends Base {
             this.services = service.forOwner(this);
           }
         }
-
-        if (!this.isTemplate) {
-          this.#depends = this.expand(this.depends);
-          this.#provides = this.expand(this.provides);
-          this.#replaces = this.expand(this.replaces);
-        }
       });
     }
   }
@@ -128,6 +122,14 @@ export class Host extends Base {
     return false;
   }
 
+  set serial(value) {
+    this.#serial = value;
+  }
+
+  get serial() {
+    return this.#serial || this.extends.find(e => e.serial)?.serial;
+  }
+
   set deployment(value) {
     this.#deployment = value;
   }
@@ -207,7 +209,9 @@ export class Host extends Base {
   }
 
   get provides() {
-    return this.#provides;
+    return this.expand(
+      this.extends.reduce((a, c) => a.union(c.provides), this.#provides)
+    );
   }
 
   set replaces(value) {
@@ -219,7 +223,9 @@ export class Host extends Base {
   }
 
   get replaces() {
-    return this.#replaces;
+    return this.expand(
+      this.extends.reduce((a, c) => a.union(c.replaces), this.#replaces)
+    );
   }
 
   set depends(value) {
@@ -231,7 +237,9 @@ export class Host extends Base {
   }
 
   get depends() {
-    return this.#depends;
+    return this.expand(
+      this.extends.reduce((a, c) => a.union(c.depends), this.#depends)
+    );
   }
 
   set master(value) {
@@ -247,7 +255,7 @@ export class Host extends Base {
   }
 
   get os() {
-    return this.#os || this.extends.find(e => e.os);
+    return this.#os || this.extends.find(e => e.os)?.os
   }
 
   set distribution(value) {

package/src/utils.mjs

@@ -2,11 +2,6 @@ import { writeFile, mkdir } from "node:fs/promises";
 import { join, dirname, basename } from "node:path";
 
 export function domainName(name, defaultDomain) {
-
-  if(typeof name != "string") {
-    console.log(name);
-  }
-
   const dcs = name.split(".");
   return defaultDomain === undefined || dcs.length > 1
     ? name

package/types/base.d.mts

@@ -89,6 +89,7 @@ export class Base {
     }, void, unknown>;
     set tags(value: Set<any>);
     get tags(): Set<any>;
+    get isTemplate(): boolean;
     expand(object: any): any;
     finalize(action: any): void;
     execFinalize(): void;

package/types/host.d.mts

@@ -163,17 +163,18 @@ export class Host extends Base {
             };
         };
     };
-    serial: any;
     priority: number;
-    set depends(value: Set<any>);
-    get depends(): Set<any>;
-    set provides(value: Set<any>);
-    get provides(): Set<any>;
-    set replaces(value: Set<any>);
-    get replaces(): Set<any>;
+    set depends(value: any);
+    get depends(): any;
+    set provides(value: any);
+    get provides(): any;
+    set replaces(value: any);
+    get replaces(): any;
     set services(service: any[]);
     get services(): any[];
     _traverse(...args: any[]): boolean;
+    set serial(value: any);
+    get serial(): any;
     set deployment(value: any);
     get deployment(): any;
     set chassis(value: any);