pmcf 1.51.0 → 1.52.1

package/package.json

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

package/src/base.mjs

@@ -131,13 +131,17 @@ export class Base {
         case "string":
           {
             value = this.expand(value);
-            const object = this.typeNamed(property.type.name, value);
+            let object = this.typeNamed(property.type.name, value);
 
             if (object) {
               assign(property, object);
             } else {
               if (property.type.constructWithIdentifierOnly) {
-                new property.type.clazz(this.ownerFor(property, value), value);
+                object = new property.type.clazz(
+                  this.ownerFor(property, value),
+                  value
+                );
+                this.addObject(object);
               } else {
                 this.finalize(() => {
                   value = this.expand(value);

package/src/host.mjs

@@ -79,14 +79,19 @@ export class Host extends Base {
     if (data.extends) {
       this.finalize(() => {
         for (const host of this.extends) {
+          host.execFinalize();
           this.depends = host.depends;
           this.provides = host.provides;
           this.replaces = host.replaces;
 
-          for (const service of host.findServices()) {
+          for (const service of host.services) {
             this.services = service.forOwner(this);
           }
         }
+
+        this.#depends = this.expand(this.depends);
+        this.#provides = this.expand(this.provides);
+        this.#replaces = this.expand(this.replaces);
       });
     }
   }
@@ -129,6 +134,10 @@ export class Host extends Base {
     return this.#vendor || this.extends.find(e => e.vendor)?.vendor;
   }
 
+  get isTemplate() {
+    return this.isModel || this.name.match(/services\//); // TODO
+  }
+
   get isModel() {
     return this.#vendor || this.#chassis ? true : false;
   }
@@ -256,6 +265,12 @@ export class Host extends Base {
         return ni;
       }
     }
+    if (typeName === "service") {
+      const service = this.services.find(s => s.name === name);
+      if (service) {
+        return service;
+      }
+    }
 
     return super.typeNamed(typeName, name);
   }
@@ -266,7 +281,10 @@ export class Host extends Base {
 
   set networkInterfaces(networkInterface) {
     this.#networkInterfaces.set(networkInterface.name, networkInterface);
-    networkInterface.network?.addObject(this);
+
+    if (!this.isTemplate) {
+      networkInterface.network?.addObject(this);
+    }
   }
 
   *networkAddresses() {

package/src/owner.mjs

@@ -46,7 +46,6 @@ export class Owner extends Base {
   constructor(owner, data) {
     super(owner, data);
     this.read(data, OwnerTypeDefinition);
-    owner?.addObject(this);
   }
 
   _traverse(...args) {

package/src/service.mjs

@@ -51,7 +51,6 @@ export class Service extends Base {
   constructor(owner, data) {
     super(owner, data);
     this.read(data, ServiceTypeDefinition);
-  // owner.addService(this);
   }
 
   forOwner(owner) {

package/types/host.d.mts

@@ -155,6 +155,7 @@ export class Host extends Base {
     get chassis(): any;
     set vendor(value: any);
     get vendor(): any;
+    get isTemplate(): true | RegExpMatchArray;
     get isModel(): boolean;
     get model(): any;
     set extends(value: any[]);