pmcf 4.5.2 → 4.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "publishConfig": {
     "access": "public"
   },
@@ -53,9 +53,9 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "content-entry-transform": "^1.5.17",
+    "content-entry-transform": "^1.5.18",
     "ip-utilties": "^2.0.2",
-    "npm-pkgbuild": "^19.2.1",
+    "npm-pkgbuild": "^20.0.1",
     "pacc": "^8.0.2",
     "package-directory": "^8.1.0"
   },

package/src/base.mjs

@@ -306,13 +306,20 @@ export class Base {
     return this.owner.addObject(object);
   }
 
-  *allExtends() {
+  *_allExtends(all) {
     for (const e of this.extends) {
-      yield e;
-      yield* e.allExtends();
+      if (!all.has(e)) {
+        all.add(e);
+        yield e;
+        yield* e._allExtends(all);
+      }
     }
   }
 
+  *allExtends() {
+    yield* this._allExtends(new Set());
+  }
+
   *owners() {
     if (this.owner) {
       yield* this.owner.thisAndOwners();

package/src/services/openldap.mjs

@@ -9,7 +9,10 @@ import {
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { addHook } from "../hooks.mjs";
-import { createExpressionTransformer, transform } from "content-entry-transform";
+import {
+  createExpressionTransformer,
+  transform
+} from "content-entry-transform";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -95,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;
@@ -111,26 +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 base = join(e.directory, "content") + "/";
-      templateDirs.push(
-        transform(new FileContentProvider(
-          { transformers, base },
-          entryProperties,
-          directoryProperties
-        ), transformers)
-      );
-    }
 
     const packageData = {
       dir,
       sources: [
-        ...templateDirs,
+        ...this.templateContent(entryProperties, directoryProperties),
         new FileContentProvider(dir + "/", entryProperties, directoryProperties)
       ],
       outputs: this.outputs,

package/types/base.d.mts

@@ -60,6 +60,7 @@ export class Base {
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
+    _allExtends(all: any): Generator<any, void, any>;
     allExtends(): Generator<any, void, any>;
     owners(): any;
     thisAndOwners(): any;

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[];