pmcf 3.10.9 → 3.10.11

package/package.json

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

package/src/base.mjs

@@ -1,7 +1,9 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
 import {
-  getAttribute,
+  parse,
+  expand,
+  tokens,
   baseTypes,
   attributeIterator,
   name_attribute_writable,
@@ -482,45 +484,26 @@ export class Base {
     return false;
   }
 
+  get properties() {
+    return this._properties;
+  }
+
   property(name) {
     return this._properties?.[name] ?? this.owner?.property(name);
   }
 
   expand(object) {
-    if (this.isTemplate) {
+    if (this.isTemplate || object instanceof Base) {
       return object;
     }
 
-    switch (typeof object) {
-      case "string":
-        return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
-          return this.property(m1) ?? getAttribute(this, m1) ?? "${" + m1 + "}";
-        });
-
-      case "object":
-        if (object instanceof Base) {
-          return object;
-        }
-        if (object instanceof Map) {
-          return new Map(
-            [...object].map(([k, v]) => [this.expand(k), this.expand(v)])
-          );
-        }
-
-        if (object instanceof Set) {
-          return new Set([...object].map(e => this.expand(e)));
-        }
-
-        if (Array.isArray(object)) {
-          return object.map(e => this.expand(e));
-        }
-
-        return Object.fromEntries(
-          Object.entries(object).map(([k, v]) => [k, this.expand(v)])
-        );
-    }
+    const context = {
+      stopClass: Base,
+      root: this,
+      globals: Object.assign({}, this.properties, this.owner.properties)
+    };
 
-    return object;
+    return expand(object, context);
   }
 
   finalize(action) {

package/src/types.mjs

@@ -2,6 +2,7 @@ import { baseTypes, attributeIterator, types } from "pacc";
 import { asArray } from "./utils.mjs";
 import { addServiceTypes } from "./service-types.mjs";
 export { types };
+
 export function addType(clazz) {
   const type = clazz.typeDefinition;
 
@@ -24,8 +25,7 @@ export function resolveTypeLinks() {
       type.owners = type.owners.map(owner =>
         typeof owner === "string" ? types[owner] : owner
       );
-    }
-    else {
+    } else {
       type.owners = [];
     }
     for (const [path, attribute] of attributeIterator(type.attributes)) {

package/types/base.d.mts

@@ -109,6 +109,7 @@ export class Base {
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): boolean;
+    get properties(): any;
     property(name: any): any;
     expand(object: any): any;
     finalize(action: any): void;