pmcf 4.5.3 → 4.5.4

package/package.json

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

package/src/services/openldap.mjs

@@ -98,6 +98,25 @@ export class OpenLDAPService extends Service {
     this._uri = value;
   }
 
+  templateContent(entryProperties, directoryProperties) {
+    const transformers = [
+      createExpressionTransformer(e => true, {
+        base: this.baseDN,
+        uri: this.uri
+      })
+    ];
+
+    return [...this.allExtends(), this].map(e => {
+      const dir = join(e.directory, "content") + "/";
+      console.log("DIR", dir);
+
+      return transform(
+        new FileContentProvider(dir, entryProperties, directoryProperties),
+        transformers
+      );
+    });
+  }
+
   async *preparePackages(dir) {
     const host = this.host;
     const name = host.name;
@@ -114,33 +133,11 @@ export class OpenLDAPService extends Service {
       owner,
       group
     };
-    const transformers = [
-      createExpressionTransformer(e => true, {
-        base: this.baseDN,
-        uri: this.uri
-      })
-    ];
-
-    const templateDirs = [];
-    for (const e of [...this.allExtends(), this]) {
-      const dir = join(e.directory, "content") + "/";
-      console.log("DIR", dir);
-      templateDirs.push(
-        transform(
-          new FileContentProvider(
-            { transformers, dir },
-            entryProperties,
-            directoryProperties
-          ),
-          transformers
-        )
-      );
-    }
 
     const packageData = {
       dir,
       sources: [
-        ...templateDirs,
+        ...this.templateContent(entryProperties, directoryProperties),
         new FileContentProvider(dir + "/", entryProperties, directoryProperties)
       ],
       outputs: this.outputs,

package/types/services/openldap.d.mts

@@ -874,6 +874,7 @@ export class OpenLDAPService extends Service {
     set uri(value: any);
     get uri(): any;
     _uri: any;
+    templateContent(entryProperties: any, directoryProperties: any): any[];
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
         sources: any[];