pmcf 6.24.1 → 6.26.0

package/bin/pmcf-info

@@ -2,15 +2,25 @@
 import { extendingAttributeIterator } from "pacc";
 import { prepare } from "../src/cli.mjs";
 
-const { root, args, options } = await prepare({});
+const { root, args, options } = await prepare({
+  maxDepth: {
+    type: "string",
+    short: "m"
+  }
+});
 
 for (const expression of args) {
   const result = root.expression(expression);
 
-  show(result);
+  show(result, 0, { short: false, maxDepth: options.maxDepth });
 }
 
-function show(value, indent = 0, short = false) {
+function show(value, indent = 0, options = { short: false, maxDepth: 5 }) {
+  if (indent >= options.maxDepth) {
+    console.log("...");
+    return;
+  }
+
   switch (typeof value) {
     case "string":
     case "number":
@@ -23,7 +33,7 @@ function show(value, indent = 0, short = false) {
 
   if (value instanceof Iterator || Array.isArray(value)) {
     for (const v of value) {
-      show(v, indent);
+      show(v, indent, options);
     }
   } else {
     const type = value.constructor;
@@ -32,7 +42,12 @@ function show(value, indent = 0, short = false) {
     const name = (attribute, l = indent + 1) =>
       prefix(l) + attribute.name.padEnd(ml) + ": ";
 
-    if (short) {
+    if (value instanceof Set || Array.isArray(value)) {
+      console.log([...value].join(" "));
+      return;
+    }
+
+    if (options.short) {
       console.log(`${prefix()}${value[type.key]}:`);
     } else {
       console.log(`${prefix()}${value.fullName}(${type.name}):`);
@@ -71,9 +86,14 @@ function show(value, indent = 0, short = false) {
       if (v !== undefined) {
         if (attribute.collection) {
           if (attribute.backpointer) {
-            console.log(name(attribute));
-            for (const o of v.values()) {
-              show(o, indent + 2, true);
+            if (indent + 2 >= options.maxDepth) {
+              console.log(name(attribute), "...");
+            } else {
+              console.log(name(attribute));
+
+              for (const o of v.values()) {
+                show(o, indent + 2, { ...options, short: true });
+              }
             }
           } else {
             const l = [...v];

package/package.json

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

package/src/initialization-context.mjs

@@ -48,7 +48,7 @@ export class InitializationContext {
   }
 
   instantiateAndAssign(object, attribute, value) {
-    if (attribute.type.primitive || attribute.expression) {
+    if (attribute.type.primitive || attribute.deferredExpression) {
       return assign(attribute, object, value);
     }
     if (value !== undefined) {

package/src/service-types.mjs

@@ -77,14 +77,38 @@ export const ServiceTypes = {
   },
   ldap: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "ldap", protocol: "tcp", port: 389, tls: false },
-      { family: FAMILY_IPV6, scheme: "ldap", protocol: "tcp", port: 389, tls: false }
+      {
+        family: FAMILY_IPV4,
+        scheme: "ldap",
+        protocol: "tcp",
+        port: 389,
+        tls: false
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "ldap",
+        protocol: "tcp",
+        port: 389,
+        tls: false
+      }
     ]
   },
   ldaps: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "ldaps", protocol: "tcp", port: 636, tls: true },
-      { family: FAMILY_IPV6, scheme: "ldaps", protocol: "tcp", port: 636, tls: true }
+      {
+        family: FAMILY_IPV4,
+        scheme: "ldaps",
+        protocol: "tcp",
+        port: 636,
+        tls: true
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "ldaps",
+        protocol: "tcp",
+        port: 636,
+        tls: true
+      }
     ]
   },
   ldapi: {
@@ -92,21 +116,57 @@ export const ServiceTypes = {
   },
   http: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "http", protocol: "tcp", port: 80, tls: false },
-      { family: FAMILY_IPV6, scheme: "http", protocol: "tcp", port: 80, tls: false }
+      {
+        family: FAMILY_IPV4,
+        scheme: "http",
+        protocol: "tcp",
+        port: 80,
+        tls: false
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "http",
+        protocol: "tcp",
+        port: 80,
+        tls: false
+      }
     ]
   },
   https: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "https", protocol: "tcp", port: 443, tls: true },
-      { family: FAMILY_IPV6, scheme: "https", protocol: "tcp", port: 443, tls: true }
+      {
+        family: FAMILY_IPV4,
+        scheme: "https",
+        protocol: "tcp",
+        port: 443,
+        tls: true
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "https",
+        protocol: "tcp",
+        port: 443,
+        tls: true
+      }
     ],
     dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
   },
   http3: {
     endpoints: [
-      { family: FAMILY_IPV4, scheme: "https", protocol: "udp", port: 443, tls: true },
-      { family: FAMILY_IPV6, scheme: "https", protocol: "udp", port: 443, tls: true }
+      {
+        family: FAMILY_IPV4,
+        scheme: "https",
+        protocol: "udp",
+        port: 443,
+        tls: true
+      },
+      {
+        family: FAMILY_IPV6,
+        scheme: "https",
+        protocol: "udp",
+        port: 443,
+        tls: true
+      }
     ],
     dnsRecord: {
       type: "HTTPS",
@@ -168,13 +228,18 @@ export const ServiceTypes = {
       { family: FAMILY_IPV6, protocol: "udp", port: 546, tls: false }
     ]
   },
-  "dhcpv6-server": { endpoints: [{ family: FAMILY_IPV6, port: 547, tls: false }] },
+  "dhcpv6-server": {
+    endpoints: [{ family: FAMILY_IPV6, port: 547, tls: false }]
+  },
   smb: {
     endpoints: [
       { family: FAMILY_IPV4, protocol: "tcp", port: 445, tls: false },
       { family: FAMILY_IPV6, protocol: "tcp", port: 445, tls: false }
     ]
   },
+  nginx: {
+    extends: ["http", "https", "http3"]
+  },
   timemachine: {
     extends: ["smb"],
     dnsRecord: {

package/src/services/bind.mjs

@@ -205,7 +205,7 @@ class bind_group extends Base {
       ...default_collection_attribute_writable,
       type: NetworkAddress,
       name: "entries",
-      expression: true
+      deferredExpression: true
     },
     domains: {
       ...string_set_attribute,
@@ -245,10 +245,6 @@ class bind_group extends Base {
       ...boolean_attribute_writable_false,
       name: "hasSVRRecords"
     },
-    hasLinkLocalAdresses: {
-      ...boolean_attribute_writable_false,
-      name: "hasLinkLocalAdresses"
-    },
     hasLocationRecord: {
       ...boolean_attribute_writable_true,
       name: "hasLocationRecord"
@@ -283,23 +279,14 @@ class bind_group extends Base {
   notify = true;
   hasCatalog = true;
   hasSVRRecords = true;
-  hasLinkLocalAdresses = bind_group.attributes.hasLinkLocalAdresses.default;
   recordTTL = "1W";
 
-  set entries(value) {
-    this._entries = value;
-  }
-
-  get entries() {
-    return this._entries ? this.expression(this._entries) : [];
-  }
-
   /**
    * Type of the group.
    * @return {string} view | unknown
    */
   get type() {
-    if (this.sharedWith || this._entries) {
+    if (this.sharedWith || this.entries) {
       return "view";
     }
 
@@ -367,7 +354,8 @@ class bind_group extends Base {
   }
 
   get zones() {
-    const entries = [...this.entries];
+    const e = this.entries;
+    const entries = e === undefined ? [] : [...e];
 
     if (!this._zones && entries.length > 0) {
       this._zoneConfigs = new Map();

package/src/type.mjs

@@ -33,13 +33,15 @@ export function assign(attribute, object, value) {
   value ??= attribute.default;
 
   if (value !== undefined) {
-    // set backointer early so that parent properties can be found during load
+    // set backpointer early so that parent properties can be found during load
     if (attribute.backpointer) {
       assign(attribute.backpointer, value, object);
     }
 
-    if (attribute.expression) { // TODO
-      object[attribute.name] = value;
+    if (attribute.deferredExpression) {
+      Object.defineProperty(object, attribute.name, {
+        get: () => object.expression(value)
+      });
       return value;
     }