pmcf 4.20.0 → 4.21.0

package/package.json

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

package/src/base.mjs

@@ -64,7 +64,7 @@ export class Base {
   owner;
   description;
   name;
-  extends = [];
+  extends = new Set();
   _tags = new Set();
   _packaging = new Set();
   _directory;
@@ -127,6 +127,15 @@ export class Base {
     return this.owner.addObject(object);
   }
 
+  collectFromDirections(directions = ["this", "extends", "owner"], property) {
+    let collected = new Set();
+    for (const node of this.walkDirections(directions)) {
+      collected = collected.union(node[property]);
+    }
+
+    return collected;
+  }
+
   /**
    * Walk the object graph in some directions and deliver seen nodes.
    * @param {string[]} directions
@@ -166,7 +175,7 @@ export class Base {
   forOwner(owner) {
     if (this.owner !== owner) {
       const newObject = Object.create(this);
-      newObject.extends = [...this.extends];
+      newObject.extends = new Set([...this.extends]);
       newObject.owner = owner;
       return newObject;
     }
@@ -414,7 +423,7 @@ export class Base {
   }
 
   get tags() {
-    return this.extends.reduce((a, c) => a.union(c.tags), this._tags);
+    return this.collectFromDirections(["this", "extends"], "_tags");
   }
 
   set tags(value) {

package/src/host.mjs

@@ -117,8 +117,8 @@ export class Host extends ServiceOwner {
         const present = this._networkInterfaces.get(name);
 
         if (present) {
-          //console.log("LINK", present.fullName, ni.fullName);
-          present.extends.push(ni);
+          //console.log("LINK", present.fullName, ni.fullName,present.extends);
+          present.extends.add(ni);
         } else {
           this._networkInterfaces.set(name, ni.forOwner(this));
         }
@@ -192,7 +192,9 @@ export class Host extends ServiceOwner {
   }
 
   get derivedPackaging() {
-    return this.extends.reduce((a, c) => a.union(c.packaging), new Set());
+    return this.expand(
+      this.collectFromDirections(["this", "extends"], "_packaging")
+    );
   }
 
   get isTemplate() {
@@ -204,7 +206,11 @@ export class Host extends ServiceOwner {
   }
 
   get model() {
-    return this.extends.find(h => h.isModel);
+    for (const node of this.walkDirections(["this", "extends"])) {
+      if (node.isModel) {
+        return node;
+      }
+    }
   }
 
   set aliases(value) {
@@ -212,7 +218,9 @@ export class Host extends ServiceOwner {
   }
 
   get aliases() {
-    return this.extends.reduce((a, c) => a.union(c.aliases), this._aliases);
+    return this.expand(
+      this.collectFromDirections(["this", "extends"], "_aliases")
+    );
   }
 
   set provides(value) {
@@ -221,7 +229,7 @@ export class Host extends ServiceOwner {
 
   get provides() {
     return this.expand(
-      this.extends.reduce((a, c) => a.union(c.provides), this._provides)
+      this.collectFromDirections(["this", "extends"], "_provides")
     );
   }
 
@@ -231,7 +239,7 @@ export class Host extends ServiceOwner {
 
   get replaces() {
     return this.expand(
-      this.extends.reduce((a, c) => a.union(c.replaces), this._replaces)
+      this.collectFromDirections(["this", "extends"], "_replaces")
     );
   }
 
@@ -241,7 +249,7 @@ export class Host extends ServiceOwner {
 
   get depends() {
     return this.expand(
-      this.extends.reduce((a, c) => a.union(c.depends), this._depends)
+      this.collectFromDirections(["this", "extends"], "_depends")
     );
   }
 

package/src/service-owner.mjs

@@ -18,7 +18,7 @@ export class ServiceOwner extends Base {
 
         if (present) {
           //console.log("LINK", present.fullName, service.fullName);
-          present.extends.push(service);
+          present.extends.add(service);
         } else {
           this.services.push(service.forOwner(this));
         }