pmcf 6.27.2 → 6.28.0

package/README.md

@@ -75,34 +75,33 @@ generates config packages for:
 *   [HTTPEndpoint](#httpendpoint)
     *   [Parameters](#parameters-13)
     *   [port](#port-1)
-*   [id](#id)
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [type](#type)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -285,10 +284,6 @@ Endpoint based on http
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 
 
-## id
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
 ## domainNames
 
 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;
@@ -301,18 +296,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;
-
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -409,6 +392,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.27.2",
+  "version": "6.28.0",
   "publishConfig": {
     "access": "public"
   },
@@ -53,8 +53,8 @@
     "aggregated-map": "^1.0.10",
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.12.0",
-    "npm-pkgbuild": "^20.8.13",
-    "pacc": "^11.2.0",
+    "npm-pkgbuild": "^20.8.14",
+    "pacc": "^11.2.2",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/base.mjs

@@ -44,7 +44,6 @@ export class Base {
     type: type_attribute_writable,
     directory: { ...string_attribute_writable, name: "directory" },
     packaging: { ...string_set_attribute_writable, name: "packaging" },
-    disabled: { ...boolean_attribute_writable, name: "disabled" },
     enabled: { ...boolean_attribute_writable, name: "enabled" },
     tags: { ...string_set_attribute_writable, name: "tags" },
     template: { ...boolean_attribute_writable, name: "template", private: true }
@@ -404,6 +403,34 @@ export class Base {
     return this.owner?.timezone;
   }
 
+  /**
+   * @return {boolean}
+   */
+  get enabled() {
+    return this.attribute("_enabled") ?? true;
+  }
+
+  set enabled(value) {
+    this._enabled = value;
+  }
+
+  get tags() {
+    return this.unionFromDirections(["this", "extends"], "_tags");
+  }
+
+  set tags(value) {
+    this._tags = union(value, this._tags);
+  }
+
+  set aliases(value) {
+    this._aliases = union(value, this._aliases);
+  }
+
+  get aliases() {
+    return this.expand(
+      this.unionFromDirections(["this", "extends"], "_aliases")
+    );
+  }
   set priority(value) {
     this._priority = value;
   }
@@ -565,37 +592,6 @@ export class Base {
     }
   }
 
-  /**
-   * @return {boolean}
-   */
-  get enabled()
-  {
-    return !this.disabled;
-  }
-
-  set enabled(value)
-  {
-    this.disabled = !value;
-  }
-
-  get tags() {
-    return this.unionFromDirections(["this", "extends"], "_tags");
-  }
-
-  set tags(value) {
-    this._tags = union(value, this._tags);
-  }
-
-  set aliases(value) {
-    this._aliases = union(value, this._aliases);
-  }
-
-  get aliases() {
-    return this.expand(
-      this.unionFromDirections(["this", "extends"], "_aliases")
-    );
-  }
-
   /**
    * @return {boolean}
    */

package/src/network-interfaces/network-interface.mjs

@@ -196,7 +196,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     if (this.name !== "eth0" && this.hwaddr) {
       const disabled = {};
-      if (this.disabled) {
+      if (!this.enabled) {
         disabled.Unmanaged = "yes";
       }
       await writeLines(networkDir, `${this.name}.link`, [
@@ -263,7 +263,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     await writeLines(
       networkDir,
-      `${this.name}.network${this.disabled ? ".disabled" : ""}`,
+      `${this.name}.network${this.enabled ? "" : ".disabled"}`,
       networkSections
     );
   }

package/src/network-interfaces/skeleton.mjs

@@ -42,7 +42,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
 
   get services() {
     return this.owner
-      ? new AggregatedMap([super.services, this.owner.services])
+      ? new AggregatedMap([super.services, this.owner._services])
       : super.services;
   }
 

package/src/services/bind.mjs

@@ -198,7 +198,8 @@ class bind_group extends Base {
       type: bindNetworkAddressTypes,
       name: "access",
       collection: true,
-      writable: true
+      writable: true,
+      deferredExpression: true
     },
     entries: {
       ...default_collection_attribute_writable,
@@ -273,7 +274,6 @@ class bind_group extends Base {
   }
 
   foreignDomains = new Set();
-  access = [];
   allowedUpdates = [];
   notify = true;
   hasCatalog = true;
@@ -369,6 +369,10 @@ class bind_group extends Base {
         const address = na.address;
         const host = na.host;
 
+        if (host === undefined) {
+          console.log("NO HOST", na);
+        }
+
         if (!addresses.has(address)) {
           addresses.add(address);