pmcf 6.2.0 → 6.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "publishConfig": {
     "access": "public"
   },
@@ -52,9 +52,9 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.5.1",
+    "ip-utilties": "^3.4.0",
     "npm-pkgbuild": "^20.7.12",
-    "pacc": "^10.4.0",
+    "pacc": "^10.4.1",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -287,12 +287,8 @@ export class Base {
     return Object.fromEntries(this.attributeIterator(filter));
   }
 
-  valueFor(name, at) {
-    if (at !== undefined) {
-      return this.attribute(name) ?? this.property(name);
-    }
-
-    return globals[name];
+  value(name) {
+    return this.attribute(name) ?? this.property(name);
   }
 
   /**
@@ -374,7 +370,8 @@ export class Base {
   expression(expression, options) {
     return parse(expression, {
       root: this,
-      valueFor: (name, at) => this.valueFor(name, at),
+      valueFor: (name, at) =>
+        at === undefined ? globals[name] : at.value(name),
       ...options
     });
   }
@@ -445,7 +442,8 @@ export class Base {
         expression =>
           parse(expression, {
             root: this,
-            valueFor: (name, at) => this.valueFor(name, at)
+            valueFor: (name, at) =>
+              at === undefined ? globals[name] : at.value(name)
           })
       )
     ];
@@ -512,7 +510,8 @@ export class Base {
     return expand(object, {
       stopClass: Base,
       root: this,
-      valueFor: (name, at) => this.valueFor(name, at)
+      valueFor: (name, at) =>
+        at === undefined ? globals[name] : this.value(name)
     });
   }
 

package/src/core-service.mjs

@@ -17,7 +17,8 @@ import {
   HTTPEndpoint,
   UnixEndpoint,
   addType,
-  FAMILY_UNIX
+  FAMILY_UNIX,
+  FAMILY_DNS
 } from "pmcf";
 import { asArray } from "./utils.mjs";
 import { networkAddressAttributes } from "./common-attributes.mjs";
@@ -141,7 +142,7 @@ export class CoreService extends Base {
           break;
 
         case undefined:
-        case "dns":
+        case FAMILY_DNS:
         case FAMILY_IPV4:
         case FAMILY_IPV6:
           const options =

package/src/endpoint.mjs

@@ -3,6 +3,7 @@ import { addType } from "pmcf";
 import { endpointAttributes, CoreService } from "./core-service.mjs";
 
 export const FAMILY_UNIX = "unix";
+export const FAMILY_DNS = "dns";
 
 class BaseEndpoint {
   static name = "endpoint";
@@ -114,7 +115,7 @@ export class DomainNameEndpoint extends PortEndpoint {
   }
 
   get family() {
-    return "dns"; // TODO
+    return FAMILY_DNS;
   }
 
   get address() {

package/src/services/bind.mjs

@@ -23,7 +23,8 @@ import {
   serviceEndpoints,
   addresses,
   networkAddressType,
-  addType
+  addType,
+  FAMILY_DNS
 } from "pmcf";
 import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
@@ -501,8 +502,8 @@ export class bind extends ExtraSourceService {
 
   async writeForwarders(outputControl) {
     const forwarders = serviceEndpoints(this.source, {
-      services: 'services[types[dns] && priority>=100 && priority<200]',
-      endpoints: endpoint => endpoint.family !== "dns",
+      services: "services[types[dns] && priority>=100 && priority<200]",
+      endpoints: endpoint => endpoint.family !== FAMILY_DNS,
       select: e => e.address,
       limit: 5
     });

package/src/services/openldap.mjs

@@ -8,8 +8,7 @@ export class openldap extends CoreService {
   };
   static service = {
     systemdService: "slapd.service",
-    extends: ["ldap", "ldapi"],
-    services: {}
+    extends: ["ldap", "ldapi"]
   };
 
   static {

package/src/services/postfix.mjs

@@ -3,8 +3,7 @@ import { CoreService, addType } from "pmcf";
 export class postfix extends CoreService {
   static service = {
     systemdService: "postfix.service",
-    extends: ["smtp", "lmtp", "submission"],
-    services: {}
+    extends: ["smtp", "lmtp", "submission"]
   };
 
   static {

package/src/subnet.mjs

@@ -7,7 +7,12 @@ import {
   matchPrefixIP,
   FAMILY_IPV6
 } from "ip-utilties";
-import { string_attribute, name_attribute, integer_attribute } from "pacc";
+import {
+  string_attribute,
+  name_attribute,
+  integer_attribute,
+  getAttribute
+} from "pacc";
 import { networks_attribute } from "./common-attributes.mjs";
 import { addType, Network } from "pmcf";
 
@@ -46,14 +51,21 @@ export class Subnet {
 
   set owner(value) {
     this._owner = value;
-    if(value instanceof Network) {
+    if (value instanceof Network) {
       this.networks.add(value);
     }
   }
 
-  *_walkDirections(directions, seen) {
+  value(name) {
+    const value = getAttribute(this, name);
+
+    console.log("SUBNET VALUE", name, value);
+
+    return value;
   }
 
+  *_walkDirections(directions, seen) {}
+
   get cidr() {
     return this.address;
   }