pmcf 1.14.0 → 1.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.14.0",
+  "version": "1.16.0",
   "publishConfig": {
     "access": "public"
   },
@@ -64,5 +64,8 @@
       "arlac77/template-node-app",
       "arlac77/template-typescript"
     ]
+  },
+  "dependencies": {
+    "pacc": "^3.1.9"
   }
 }

package/src/model.mjs

@@ -1,5 +1,6 @@
 import { readFile, writeFile, mkdir, glob } from "node:fs/promises";
 import { join } from "node:path";
+import { getAttribute } from "pacc";
 
 export class Base {
   owner;
@@ -89,18 +90,24 @@ export class Base {
   }
 
   expand(object) {
-    if (typeof object === "string") {
-      return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
-        return this[m1] || "${" + m1 + "}";
-      });
-    }
+    switch (typeof object) {
+      case "string":
+        return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
+          return getAttribute(this, m1) || "${" + m1 + "}";
+        });
+
+      case "object":
+        if (Array.isArray(object)) {
+          return object.map(e => this.expand(e));
+        }
 
-    if (Array.isArray(object)) {
-      return object.map(e => this.expand(e));
-    }
+        if (object instanceof Set) {
+          return new Set([...object].map(e => this.expand(e)));
+        }
 
-    if (object instanceof Set) {
-      return new Set([...object].map(e => this.expand(e)));
+      /*return Object.fromEntries(
+          Object.entries(object).map(([k, v]) => [k, this.expand(v)])
+        );*/
     }
 
     return object;
@@ -638,15 +645,15 @@ export class Host extends Base {
       delete data.master;
     }
     if (data.depends !== undefined) {
-      this.#depends = new Set(data.depends);
+      this.#depends = new Set(asArray(data.depends));
       delete data.depends;
     }
     if (data.replaces !== undefined) {
-      this.#replaces = new Set(data.replaces);
+      this.#replaces = new Set(asArray(data.replaces));
       delete data.replaces;
     }
     if (data.provides !== undefined) {
-      this.#provides = new Set(data.provides);
+      this.#provides = new Set(asArray(data.provides));
       delete data.provides;
     }