pmcf 6.17.3 → 6.17.5

package/README.md

@@ -77,27 +77,27 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [type](#type)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-14)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-19)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -287,18 +287,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## type
 
 Type of the group.
@@ -380,6 +368,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/bin/pmcf-info

@@ -5,13 +5,21 @@ import { prepare } from "../src/cli.mjs";
 const { root, args, options } = await prepare({});
 
 for (const expression of args) {
-  const result = root.named(expression);
+  const result = root.expression(expression);
 
   show(result);
 }
 
 function show(value, indent = 0, short = false) {
-  if (value instanceof Iterator) {
+  switch (typeof value) {
+    case "string":
+    case "number":
+    case "bigint":
+      console.log(value);
+      return;
+  }
+
+  if (value instanceof Iterator || Array.isArray(value)) {
     for (const v of value) {
       show(v, indent);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.17.3",
+  "version": "6.17.5",
   "publishConfig": {
     "access": "public"
   },
@@ -52,14 +52,14 @@
   "dependencies": {
     "aggregated-map": "^1.0.8",
     "content-entry-transform": "^1.7.0",
-    "ip-utilties": "^3.9.0",
-    "npm-pkgbuild": "^20.8.6",
-    "pacc": "^10.6.0",
+    "ip-utilties": "^3.10.0",
+    "npm-pkgbuild": "^20.8.8",
+    "pacc": "^11.0.1",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@types/node": "^26.1.1",
+    "@types/node": "^26.1.2",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -399,7 +399,8 @@ export class Base {
    */
   expression(expression, options) {
     return parse(expression, {
-      root: this,
+      root: this.root,
+      current: this,
       valueFor: (name, at) =>
         at === undefined ? globals[name] : at.value(name),
       ...options
@@ -496,7 +497,8 @@ export class Base {
         e => e.isBlob,
         expression =>
           parse(expression, {
-            root: this,
+            root: this.root,
+            current: this,
             valueFor: (name, at) =>
               at === undefined ? globals[name] : at.value(name)
           })
@@ -565,7 +567,8 @@ export class Base {
 
     return expand(object, {
       stopClass: Base,
-      root: this,
+      root: this.root,
+      current: this,
       valueFor: (name, at) =>
         at === undefined ? globals[name] : at.value(name)
     });

package/src/network-address.mjs

@@ -1,13 +1,37 @@
-import { getAttribute } from "pacc";
+import {
+  default_attribute,
+  string_attribute,
+  name_attribute,
+  getAttribute
+} from "pacc";
+
 import { familyIP, formatCIDR, decodeIP } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
-import { Owner } from "pmcf";
+import { Owner, addType } from "pmcf";
 import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
 
 /**
  *
  */
 export class NetworkAddress {
+    static name = "network-address";
+    static priority = 1;
+    static key = "address";
+    static attributes = {
+      address: { ...name_attribute, name: "address" },
+      cidrAddress: { ...string_attribute, name: "cidrAddress" },
+       networkInterface: {
+        ...default_attribute,
+        name: "networkInterface",
+        type: "network_interface"
+      },
+      family: { ...string_attribute, name: "family" }
+    };
+  
+  static {
+    addType(this);
+  }
+
   /** @type {Subnet} */ subnet;
   /** @type {NetworkInterface} */ networkInterface;
   /** @type {string|Uint8Array|Uint16Array} */ address;