pmcf 6.11.3 → 6.13.0

package/bin/pmcf-info

@@ -10,30 +10,67 @@ for (const expression of args) {
   show(result);
 }
 
-function show(value) {
+function show(value, indent = 0) {
   if (value instanceof Iterator) {
     for (const v of value) {
       show(v);
     }
   } else {
-    console.log(`${value.fullName}(${value.constructor.name}):`);
+    const type = value.constructor;
+    console.log(`${" ".repeat(indent)}${value.fullName}(${type.name}):`);
+
+    const ml = maxNameLength(type);
+    const name = attribute => "  " + attribute.name.padEnd(ml) + ": ";
+
+    for (const [path, attribute] of extendingAttributeIterator(
+      type,
+      attribute =>
+        !attribute.key && !attribute.private && attribute.type.primitive
+    )) {
+      const v = value.attribute(attribute.name);
+      if (v !== undefined) {
+        if (attribute.collection) {
+          console.log(`${name(attribute)}${[...v]}`);
+        } else {
+          console.log(`${name(attribute)}${v}`);
+        }
+      }
+    }
 
     for (const [path, attribute] of extendingAttributeIterator(
-      value,
-      attribute => !attribute.private
+      type,
+      attribute => !attribute.private && !attribute.type.primitive
     )) {
-      console.log(path);
+      const v = value[attribute.name];
+      if (v !== undefined) {
+        if (attribute.collection) {
+          console.log(name(attribute));
+
+          if (attribute.backpointer) {
+            for (const o of v.values()) {
+              show(o, indent + 2);
+            }
+          } else {
+            for (const o of v.values()) {
+              console.log(" ".repeat(indent + 2) + o.fullName);
+            }
+          }
+        } else {
+          console.log(`${name(attribute)}${v.fullName}`);
+        }
+      }
     }
-    ex(value);
   }
 }
 
-function ex(node, indent = 1) {
-  if (indent > 5) {
-    return;
-  }
-  for (const e of node.extends) {
-    console.log(" ".repeat(indent * 2) + e.fullName);
-    ex(e, indent + 1);
+function maxNameLength(type) {
+  let maxLength = 0;
+  for (const [path, attribute] of extendingAttributeIterator(
+    type,
+    attribute => !attribute.key && !attribute.private
+  )) {
+    maxLength = Math.max(maxLength, attribute.name.length);
   }
+
+  return maxLength;
 }

package/package.json

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

package/src/services/bind.mjs

@@ -42,7 +42,6 @@ class bind_group extends Base {
   static priority = 1;
   static attributes = {
     name: name_attribute_writable,
-    owner: owner_attribute,
     access: {
       type: bindNetworkAddressTypes,
       name: "access",
@@ -167,6 +166,10 @@ class bind_group extends Base {
   }
 
   async packageContent(outputControl) {
+    outputControl.packageData.sources.push(
+      ...(await Array.fromAsync(this.templateContent(...outputControl.permissions)))
+    );
+
     return (
       await Promise.all([
         this.generateACLs(outputControl),
@@ -553,7 +556,7 @@ export class bind extends ExtraSourceService {
       new FileContentProvider(dir + "/", ...permissions)
     );
 
-    const outputControl = newOutputControl(packageData, dir);
+    const outputControl = newOutputControl(packageData, dir, permissions);
 
     for (const group of this.groups.values()) {
       const present = await group.packageContent(outputControl);
@@ -639,6 +642,6 @@ export class bind extends ExtraSourceService {
   }
 }
 
-function newOutputControl(packageData, dir) {
-  return { configs: [], catalogs: new Map(), packageData, dir };
+function newOutputControl(packageData, dir, permissions) {
+  return { configs: [], catalogs: new Map(), packageData, dir, permissions};
 }