pmcf 4.5.1 → 4.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.5.1",
+  "version": "4.5.3",
   "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

@@ -8,9 +8,11 @@ import {
 } from "pacc";
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
-import { writeLines, filterConfigurable } from "../utils.mjs";
 import { addHook } from "../hooks.mjs";
-import { createExpressionTransformer, transform } from "content-entry-transform";
+import {
+  createExpressionTransformer,
+  transform
+} from "content-entry-transform";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -65,7 +67,6 @@ export class OpenLDAPService extends Service {
     return OpenLDAPServiceTypeDefinition;
   }
 
-  DB_CONFIG = {};
   _baseDN;
   _rootDN;
 
@@ -114,18 +115,25 @@ export class OpenLDAPService extends Service {
       group
     };
     const transformers = [
-      createExpressionTransformer(e => true, { base: this.baseDN })
+      createExpressionTransformer(e => true, {
+        base: this.baseDN,
+        uri: this.uri
+      })
     ];
 
     const templateDirs = [];
     for (const e of [...this.allExtends(), this]) {
-      const base = join(e.directory, "content") + "/";
+      const dir = join(e.directory, "content") + "/";
+      console.log("DIR", dir);
       templateDirs.push(
-        transform(new FileContentProvider(
-          { transformers, base },
-          entryProperties,
-          directoryProperties
-        ), transformers)
+        transform(
+          new FileContentProvider(
+            { transformers, dir },
+            entryProperties,
+            directoryProperties
+          ),
+          transformers
+        )
       );
     }
 
@@ -157,38 +165,6 @@ export class OpenLDAPService extends Service {
       `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );
 
-    await writeLines(
-      join(packageData.dir, "etc/conf.d"),
-      "slapd",
-      this.expand([
-        "SLAPD_OPTIONS=",
-        "SLAPD_URLS=ldap:/// ldaps:/// ldapi://%2Frun%2Fldapi"
-      ])
-    );
-
-    await writeLines(
-      join(packageData.dir, "/var/lib/openldap/openldap-data"),
-      "DB_CONFIG",
-
-      /*
-      ...[...this.propertyIterator(filterConfigurable)].map(
-        ([name, value]) => `${name} ${value}`
-      )
-    */
-
-      this.expand([
-        "set_cachesize 0 16777216 1",
-        "set_lg_regionmax 65536",
-        "set_lg_bsize 524288"
-      ])
-    );
-
-    await writeLines(
-      join(packageData.dir, "etc/openldap"),
-      "ldap.conf",
-      this.expand([`BASE  ${this.baseDN}`, `URI   ${this.uri}`])
-    );
-
     yield packageData;
   }
 }

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

@@ -864,7 +864,6 @@ export class OpenLDAPService extends Service {
             services: {};
         };
     };
-    DB_CONFIG: {};
     _baseDN: any;
     _rootDN: any;
     get type(): string;