pmcf 6.13.1 → 6.15.0

package/bin/pmcf-info

@@ -10,17 +10,23 @@ for (const expression of args) {
   show(result);
 }
 
-function show(value, indent = 0) {
+function show(value, indent = 0, short = false) {
   if (value instanceof Iterator) {
     for (const v of value) {
-      show(v);
+      show(v, indent);
     }
   } else {
     const type = value.constructor;
-    console.log(`${" ".repeat(indent)}${value.fullName}(${type.name}):`);
-
+    const prefix = (l = indent) => " ".repeat(l * 2);
     const ml = maxNameLength(type);
-    const name = attribute => "  " + attribute.name.padEnd(ml) + ": ";
+    const name = (attribute, l = indent + 1) =>
+      prefix(l) + attribute.name.padEnd(ml) + ": ";
+
+    if (short) {
+      console.log(`${prefix()}${value.name}:`);
+    } else {
+      console.log(`${prefix()}${value.fullName}(${type.name}):`);
+    }
 
     for (const [path, attribute] of extendingAttributeIterator(
       type,
@@ -30,7 +36,10 @@ function show(value, indent = 0) {
       const v = value.attribute(attribute.name);
       if (v !== undefined) {
         if (attribute.collection) {
-          console.log(`${name(attribute)}${[...v]}`);
+          const l = [...v];
+          if (l.length) {
+            console.log(`${name(attribute)}${l}`);
+          }
         } else {
           console.log(`${name(attribute)}${v}`);
         }
@@ -44,15 +53,22 @@ function show(value, indent = 0) {
       const v = value[attribute.name];
       if (v !== undefined) {
         if (attribute.collection) {
-          console.log(name(attribute));
-
           if (attribute.backpointer) {
+            console.log(name(attribute));
             for (const o of v.values()) {
-              show(o, indent + 2);
+              show(o, indent + 2, true);
             }
           } else {
-            for (const o of v.values()) {
-              console.log(" ".repeat(indent + 2) + o.fullName);
+            const l = [...v];
+
+            if (l.length > 1) {
+              console.log(name(attribute));
+
+              for (const o of l) {
+                console.log(prefix(indent + 2) + o.fullName);
+              }
+            } else if (l.length === 1) {
+              console.log(name(attribute) + l[0].fullName);
             }
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.13.1",
+  "version": "6.15.0",
   "publishConfig": {
     "access": "public"
   },
@@ -50,10 +50,10 @@
     "lint:docs": "documentation lint ./src**/*.mjs"
   },
   "dependencies": {
-    "aggregated-map": "^1.0.7",
+    "aggregated-map": "^1.0.8",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.8.0",
-    "npm-pkgbuild": "^20.8.4",
+    "ip-utilties": "^3.8.1",
+    "npm-pkgbuild": "^20.8.6",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"

package/src/services/bind.mjs

@@ -15,6 +15,7 @@ import {
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
   integer_attribute_writable,
+  integer_attribute,
   name_attribute_writable
 } from "pacc";
 import {
@@ -42,6 +43,7 @@ class bind_group extends Base {
   static priority = 1;
   static attributes = {
     name: name_attribute_writable,
+    order: { ...integer_attribute, name: "order" },
     access: {
       type: bindNetworkAddressTypes,
       name: "access",
@@ -135,6 +137,10 @@ class bind_group extends Base {
     return "unknown";
   }
 
+  get order() {
+    return this.sharedWith ? this.sharedWith.order + 1 : 0;
+  }
+
   get service() {
     return this.owner;
   }
@@ -144,24 +150,24 @@ class bind_group extends Base {
   }
 
   get defaultRecords() {
-    const nameService = this.owner;
+    const service = this.service;
 
-    console.log(
+    /*console.log(
       "nameService",
-      nameService.fullName,
-      nameService.domainName,
-      nameService.address()
-    );
+      service.fullName,
+      service.domainName,
+      service.address()
+    );*/
 
     return [
       DNSRecord(
         "@",
         "SOA",
-        dnsFullName(nameService.domainName),
+        dnsFullName(service.domainName),
         dnsFullName(this.administratorEmail.replace(/@/, ".")),
         `(${this.soaUpdates.join(" ")})`
       ),
-      DNSRecord("@", "NS", dnsFullName(nameService.address()))
+      DNSRecord("@", "NS", dnsFullName(service.address()))
     ];
   }
 
@@ -553,7 +559,7 @@ export class bind extends ExtraSourceService {
     const present = await this.writeForwarders(outputControl);
 
     if (hasContent || present) {
-      console.log(packageData);
+      //console.log(packageData);
       yield packageData;
     }
   }