pmcf 2.61.0 → 2.62.0

package/package.json

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

package/src/base.mjs

@@ -41,6 +41,7 @@ export class Base {
   _packaging = new Set();
   _directory;
   _finalize;
+  _properties;
 
   static {
     addType(this);
@@ -221,6 +222,10 @@ export class Base {
       }
     };
 
+    if(data?.properties) {
+      this._properties = data.properties;
+    }
+
     for (const property of Object.values(type.properties)) {
       if (property.writeable) {
         const value = data[property.name];
@@ -452,6 +457,15 @@ export class Base {
     return false;
   }
 
+  property(name) {
+    const value = this._properties?.[name];
+    if(value === undefined && this.owner) {
+      return this.owner.property(name);
+    }
+
+    return value;
+  }
+
   expand(object) {
     if (this.isTemplate) {
       return object;
@@ -460,7 +474,7 @@ export class Base {
     switch (typeof object) {
       case "string":
         return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
-          return getAttribute(this, m1) ?? "${" + m1 + "}";
+          return this.property(m1) ?? getAttribute(this, m1) ?? "${" + m1 + "}";
         });
 
       case "object":

package/types/base.d.mts

@@ -61,6 +61,7 @@ export class Base {
     _packaging: Set<any>;
     _directory: any;
     _finalize: any;
+    _properties: any;
     ownerFor(property: any, data: any): any;
     read(data: any, type: any): void;
     named(name: any): void;
@@ -106,6 +107,7 @@ export class Base {
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): boolean;
+    property(name: any): any;
     expand(object: any): any;
     finalize(action: any): void;
     execFinalize(): void;