pmcf 6.39.7 → 6.39.9

package/README.md

@@ -47,75 +47,75 @@ generates config packages for:
     *   [templateContentAttributes](#templatecontentattributes)
         *   [Parameters](#parameters)
     *   [templateContent](#templatecontent)
-        *   [Parameters](#parameters-1)
     *   [isTemplate](#istemplate)
 *   [access](#access)
 *   [loadHooks](#loadhooks)
-    *   [Parameters](#parameters-2)
+    *   [Parameters](#parameters-1)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-3)
+    *   [Parameters](#parameters-2)
 *   [attributeIterator](#attributeiterator)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
 *   [getAttributes](#getattributes)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-4)
 *   [property](#property)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-5)
 *   [attribute](#attribute)
-    *   [Parameters](#parameters-7)
+    *   [Parameters](#parameters-6)
 *   [walkDirections](#walkdirections)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-7)
 *   [mapFromDirections](#mapfromdirections)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-8)
 *   [unionFromDirections](#unionfromdirections)
-    *   [Parameters](#parameters-10)
+    *   [Parameters](#parameters-9)
 *   [expand](#expand)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-10)
 *   [expression](#expression)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-11)
+*   [isTemplate](#istemplate-1)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-12)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-13)
     *   [port](#port-1)
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-14)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-19)
+        *   [Parameters](#parameters-18)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
 *   [subnetForAddress](#subnetforaddress)
-    *   [Parameters](#parameters-23)
+    *   [Parameters](#parameters-22)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-24)
+    *   [Parameters](#parameters-23)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-25)
+    *   [Parameters](#parameters-24)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-26)
+    *   [Parameters](#parameters-25)
 
 ## base
 
@@ -142,11 +142,6 @@ Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 ### templateContent
 
-#### Parameters
-
-*   `entryProperties` **any** 
-*   `directoryProperties` **any** 
-
 Returns **AsyncIterable\<ContentProvider>**&#x20;
 
 ### isTemplate
@@ -263,6 +258,10 @@ Returns **any**&#x20;
 
 Returns **any**&#x20;
 
+## isTemplate
+
+Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+
 ## PortEndpoint
 
 **Extends BaseEndpoint**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.39.7",
+  "version": "6.39.9",
   "publishConfig": {
     "access": "public"
   },
@@ -66,7 +66,7 @@
     "semantic-release": "^25.0.9"
   },
   "engines": {
-    "node": ">=26.7.0"
+    "node": ">=26.8.1"
   },
   "repository": {
     "type": "git",

package/src/base.mjs

@@ -217,7 +217,7 @@ export class base extends core {
         }
       }
     }
-    return this.content?.packageData(this);
+    return this.content?.packageData();
   }
 
   async *preparePackages(stagingDir) {}
@@ -248,22 +248,16 @@ export class base extends core {
 
   /**
    *
-   * @param {*} entryProperties
-   * @param {*} directoryProperties
    * @returns {AsyncIterable<ContentProvider>}
    */
-  async *templateContent(entryProperties, directoryProperties) {
+  async *templateContent() {
     for (const node of this.walkDirections(["this", "extends"])) {
       const dir = join(node.directory, "content");
 
       try {
         if ((await stat(dir)).isDirectory) {
           yield transform(
-            new FileContentProvider(
-              this.templateContentAttributes(dir),
-              entryProperties,
-              directoryProperties
-            ),
+            new FileContentProvider(this.templateContentAttributes(dir)),
             this.templateTransformers
           );
         }
@@ -279,10 +273,7 @@ export class base extends core {
    * @return {boolean}
    */
   get isTemplate() {
-    return (
-      this.template ??
-      (this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false)
-    );
+    return this.template ?? (super.isTemplate || this.name?.indexOf("*") >= 0);
   }
 
   error(...args) {

package/src/content.mjs

@@ -97,8 +97,7 @@ export class content extends core {
   _hooks = new Set();
 
   value(name) {
-    //  console.log("CONTENT VALUE", this.name, this.owner.fullName, name, this.owner.name);
-    return this.owner.value(name) ?? super.value(name);
+    return super.value(name) ?? this.owner.value(name);
   }
 
   get name() {
@@ -226,26 +225,7 @@ export class content extends core {
   }
 
   get permissions() {
-    const p = this.mapFromDirections(["this", "extends"], "_permissions");
-
-    return p;
-
-    /*
-    const owner = this.systemUserName;
-    const group = this.systemGroupName;
-    return [
-      {
-        mode: 0o644,
-        owner,
-        group
-      },
-      {
-        mode: 0o755,
-        owner,
-        group
-      }
-    ];
-*/
+    return this.mapFromDirections(["this", "extends"], "_permissions");
   }
 
   /**

package/src/core-service.mjs

@@ -274,7 +274,7 @@ export class CoreService extends base {
     const pd = await this.packageData;
 
     pd.sources = await Array.fromAsync(
-      this.templateContent(this.content.permissions)
+      this.templateContent()
     );
 
     if (pd.sources.length) {

package/src/services/bind.mjs

@@ -281,7 +281,6 @@ class bind_object extends base {
 }
 
 export class bind_acl extends bind_object {
-
   static {
     addType(this);
   }
@@ -630,9 +629,7 @@ class bind_view extends bind_object {
 
   async packageContent(outputControl) {
     outputControl.packageData.sources.push(
-      ...(await Array.fromAsync(
-        this.templateContent(...outputControl.permissions)
-      ))
+      ...(await Array.fromAsync(this.templateContent()))
     );
 
     for (const config of this.zoneConfigs.values()) {
@@ -803,36 +800,14 @@ 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: 0o777 },
-      "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 packageData = await this.packageData;
 
-    const permissions = this.content.permissions;
-
-    packageData.sources = await Array.fromAsync(
-      this.templateContent(permissions)
-    );
+    packageData.sources = await Array.fromAsync(this.templateContent());
 
     let hasContent = packageData.sources.length > 0;
 
-    packageData.sources.push(
-      new FileContentProvider(dir + "/", permissions)
-    );
+    packageData.sources.push(new FileContentProvider({ dir: dir + "/" }));
 
     const outputControl = { packageData, dir, permissions };
 

package/src/services/mosquitto.mjs

@@ -59,15 +59,10 @@ export class mosquitto extends CoreService {
     );*/
 
     const packageData = await this.packageData;
-    const permissions = this.content.permissions;
 
-    packageData.sources = await Array.fromAsync(
-      this.templateContent(...permissions)
-    );
+    packageData.sources = await Array.fromAsync(this.templateContent());
 
-    packageData.sources.push(
-      new FileContentProvider(dir + "/", permissions)
-    );
+    packageData.sources.push(new FileContentProvider({ dir: dir + "/" }));
 
     await writeLines(
       join(dir, "etc", "mosquitto"),