pmcf 6.39.7 → 6.39.8

package/README.md

@@ -72,6 +72,7 @@ generates config packages for:
     *   [Parameters](#parameters-11)
 *   [expression](#expression)
     *   [Parameters](#parameters-12)
+*   [isTemplate](#istemplate-1)
 *   [PortEndpoint](#portendpoint)
     *   [Parameters](#parameters-13)
     *   [port](#port)
@@ -263,6 +264,10 @@ Returns **any** 
 
 Returns **any** 
 
+## isTemplate
+
+Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
+
 ## PortEndpoint
 
 **Extends BaseEndpoint**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.39.7",
+  "version": "6.39.8",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -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/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"),