pmcf 6.34.0 → 6.34.2

package/README.md

@@ -78,29 +78,29 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [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)
@@ -295,18 +295,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>
@@ -397,6 +385,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;
@@ -450,6 +450,8 @@ Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Gl
 
 ## asArray
 
+Convert scalar or iterable into Array.
+
 ### Parameters
 
 *   `value` **any**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.34.0",
+  "version": "6.34.2",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
     "aggregated-map": "^1.0.10",
     "content-entry-transform": "^1.7.1",
     "ip-utilties": "^3.13.0",
-    "npm-pkgbuild": "^20.8.15",
+    "npm-pkgbuild": "^20.9.0",
     "pacc": "^11.2.3",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"

package/src/base.mjs

@@ -21,7 +21,8 @@ import {
   string_attribute_writable,
   string_set_attribute_writable,
   description_attribute_writable,
-  boolean_attribute_writable
+  boolean_attribute_writable,
+  object_attribute
 } from "pacc";
 import { union } from "./utils.mjs";
 import { addType } from "pmcf";
@@ -43,14 +44,18 @@ export class Base {
     description: description_attribute_writable,
     type: type_attribute_writable,
     directory: { ...string_attribute_writable, name: "directory" },
-    packaging: { ...string_set_attribute_writable, name: "packaging" },
     enabled: { ...boolean_attribute_writable, name: "enabled" },
     tags: { ...string_set_attribute_writable, name: "tags" },
-    template: { ...boolean_attribute_writable, name: "template", private: true }
+    template: {
+      ...boolean_attribute_writable,
+      name: "template",
+      private: true
+    },
+
+    packaging: { ...string_set_attribute_writable, name: "packaging" },
+ //   packageContentProperties: { ...object_attribute, writable: true, name: "packageContentProperties"}
   };
-  /*asMapEntry = (attribute, value, object) => {
-    console.log("asMapEntry",attribute?.name,value);
-    return [value.name, value]; };*/
+
   static {
     addType(this);
   }
@@ -553,6 +558,15 @@ export class Base {
     ];
   }
 
+  /**
+   *
+   * @param {string} dir
+   * @returns {Object}
+   */
+  templateContentAttributes(dir) {
+    return { dir, pattern: "**/*" };
+  }
+
   /**
    *
    * @param {*} entryProperties
@@ -567,7 +581,7 @@ export class Base {
         if ((await stat(dir)).isDirectory) {
           yield transform(
             new FileContentProvider(
-              { dir, pattern: "**/*" },
+              this.templateContentAttributes(dir),
               entryProperties,
               directoryProperties
             ),

package/src/host.mjs

@@ -3,7 +3,6 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { AggregatedMap } from "aggregated-map";
 import {
-  default_collection_attribute_writable,
   string_attribute,
   string_attribute_writable,
   string_set_attribute_writable,
@@ -79,6 +78,7 @@ export class Host extends ServiceOwner {
     replaces: { ...string_set_attribute_writable, name: "replaces" },
     depends: { ...string_set_attribute_writable, name: "depends" },
     provides: { ...string_set_attribute_writable, name: "provides" },
+    optional: { ...string_set_attribute_writable, name: "optional" },
     extends: {
       ...extends_attribute,
       type: Host

package/src/initialization-context.mjs

@@ -71,7 +71,7 @@ export class InitializationContext {
     }
     if (value !== undefined) {
       if (typeof value === "object") {
-        if (attribute.type && value instanceof attribute.type) {
+        if (typeof attribute.type === 'function' && value instanceof attribute.type) {
           return assign(attribute, object, value);
         }
       } else {

package/src/services/bind.mjs

@@ -1,13 +1,7 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import {
-  reverseArpa,
-  FAMILY_IPV4,
-  FAMILY_IPV6,
-  ADDRESS_TYPE_LOOPBACK,
-  addressType
-} from "ip-utilties";
+import { reverseArpa, ADDRESS_TYPE_LOOPBACK, addressType } from "ip-utilties";
 import {
   default_collection_attribute,
   default_collection_attribute_writable,
@@ -798,6 +792,22 @@ export class bind extends CoreService {
     return false;
   }
 
+  templateContentAttributes(dir) {
+    const attr = super.templateContentAttributes(dir);
+
+    //  attr.properties = this.packageContentProperties;
+
+    attr.properties = {
+      "usr/share/libalpm/scripts/*": { mode: "0777" },
+      "etc/named/**/*": { user: "named", group: "named" },
+      "var/lib/named": { user: "named", group: "named" }
+    };
+
+    console.log("templateContentAttributes", this.fullName, attr);
+
+    return attr;
+  }
+
   async *preparePackages(dir) {
     const permissions = this.packageContentPermissions;
     const packageData = this.packageData;

package/src/utils.mjs

@@ -92,6 +92,7 @@ export function bridgeToJSON(bridge) {
 }
 
 /**
+ * Convert scalar or iterable into Array.
  * @param {any} value
  * @returns {Array<any>}
  */
@@ -124,7 +125,7 @@ export function asIterator(value) {
       return [value];
   }
 
-  if (typeof value[Symbol.iterator] === "function") {
+  if (value[Symbol.iterator]) {
     return value;
   }