pmcf 6.6.0 → 6.7.1

package/package.json

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

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,9 +449,17 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
+  get systemUserName() {
+    return this.constructor.name;
+  }
+
+  get systemGroupName() {
+    return this.constructor.name;
+  }
+
   get packageContentPermissions() {
-    const owner = this.constructor.name;
-    const group = owner;
+    const owner = this.systemUserName;
+    const group = this.systemGroupName;
     return [
       {
         mode: 0o644,

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/openldap.mjs

@@ -33,6 +33,14 @@ export class openldap extends CoreService {
     this._uri = value;
   }
 
+  get systemUserName() {
+    return "ldap";
+  }
+
+  get systemGroupName() {
+    return "ldap";
+  }
+
   async *preparePackages(dir) {
     const permissions = this.packageContentPermissions;
     const packageData = this.packageData;