pmcf 6.7.0 → 6.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.7.0",
+  "version": "6.7.2",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.5.3",
+    "ip-utilties": "^3.6.0",
     "npm-pkgbuild": "^20.8.1",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",

package/src/base.mjs

@@ -92,6 +92,14 @@ export class Base {
   }
 
   materializeExtends() {
+    /*
+    console.log(
+      "materializeExtends",
+      this.fullName,
+      this.owner?.fullName,
+      [...this.extends].map(n => n.fullName)
+    );*/
+
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
       attribute => attribute.collection && !attribute.type.primitive
@@ -441,13 +449,11 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
-  get systemUserName()
-  {
+  get systemUserName() {
     return this.constructor.name;
   }
 
-  get systemGroupName()
-  {
+  get systemGroupName() {
     return this.constructor.name;
   }
 
@@ -510,6 +516,7 @@ export class Base {
 
       try {
         if ((await stat(dir)).isDirectory) {
+          console.log("TD", dir);
           yield transform(
             new FileContentProvider(
               { dir, pattern: "**/*" },

package/src/services/bind.mjs

@@ -480,23 +480,6 @@ export class bind extends ExtraSourceService {
 
   groups = new Map();
 
-  materializeExtends() {
-    console.log("materializeExtends", this.fullName, this.owner, this.extends);
-    super.materializeExtends();
-
-    for (const service of this.walkDirections(["extends"])) {
-      for (const group of service.groups.values()) {
-        const present = this.groups.get(group.name);
-
-        if (present) {
-          present.extends.add(group);
-        } else {
-          this.groups.set(group.name, group.forOwner(this));
-        }
-      }
-    }
-  }
-
   get serverType() {
     return this.primaries ? "secondary" : "primary";
   }

package/src/services/mosquitto.mjs

@@ -46,13 +46,15 @@ export class mosquitto extends CoreService {
 
   async *preparePackages(dir) {
     const pm = this.root.named("/services/primary-SW/mosquitto");
+    const wd = [...this.walkDirections(["this", "extends"])];
 
     console.log(
       "MOSQUITTO",
-      pm.fullName,
       this.fullName,
       [...this.extends].map(n => n.fullName),
-      [...this.walkDirections(["this", "extends"])].map(n => this.fullName)
+      pm.fullName,
+      [...pm.extends].map(n => n.fullName),
+      wd.map(n => [n.fullName, n.directory])
     );
 
     const permissions = this.packageContentPermissions;