pmcf 4.4.2 → 4.5.1

package/bin/pmcf-package

@@ -47,7 +47,6 @@ for (const object of root.find(args)) {
   }
   const stagingDir = join(options.output, object.fullName);
 
-  //console.log(`packages for ${object.fullName}`);
   for await (const { sources, outputs, properties } of object.preparePackages(
     stagingDir
   )) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.4.2",
+  "version": "4.5.1",
   "publishConfig": {
     "access": "public"
   },
@@ -53,8 +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",
     "ip-utilties": "^2.0.2",
-    "npm-pkgbuild": "^19.2.0",
+    "npm-pkgbuild": "^19.2.1",
     "pacc": "^8.0.2",
     "package-directory": "^8.1.0"
   },

package/src/base.mjs

@@ -306,6 +306,13 @@ export class Base {
     return this.owner.addObject(object);
   }
 
+  *allExtends() {
+    for (const e of this.extends) {
+      yield e;
+      yield* e.allExtends();
+    }
+  }
+
   *owners() {
     if (this.owner) {
       yield* this.owner.thisAndOwners();
@@ -352,7 +359,7 @@ export class Base {
         yield value;
       }
 
-      for (const e of this.extends) {
+      for (const e of this.allExtends()) {
         yield* e._extendedPropertyIterator(propertyName, seen);
       }
     }
@@ -361,7 +368,7 @@ export class Base {
   _extendedProperty(propertyName, seen) {
     if (!seen.has(this)) {
       seen.add(this);
-      for (const e of this.extends) {
+      for (const e of this.allExtends()) {
         const value =
           getAttribute(e, propertyName) ??
           e._extendedProperty(propertyName, seen);

package/src/services/openldap.mjs

@@ -10,6 +10,7 @@ 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";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -102,22 +103,37 @@ export class OpenLDAPService extends Service {
     const owner = "ldap";
     const group = "ldap";
 
+    const entryProperties = {
+      mode: 0o644,
+      owner,
+      group
+    };
+    const directoryProperties = {
+      mode: 0o755,
+      owner,
+      group
+    };
+    const transformers = [
+      createExpressionTransformer(e => true, { base: this.baseDN })
+    ];
+
+    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: [
-        new FileContentProvider(
-          dir + "/",
-          {
-            mode: 0o644,
-            owner,
-            group
-          },
-          {
-            mode: 0o755,
-            owner,
-            group
-          }
-        )
+        ...templateDirs,
+        new FileContentProvider(dir + "/", entryProperties, directoryProperties)
       ],
       outputs: this.outputs,
       properties: {

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(): Generator<any, void, any>;
     owners(): any;
     thisAndOwners(): any;
     forOwner(owner: any): any;

package/types/services/openldap.d.mts

@@ -877,7 +877,7 @@ export class OpenLDAPService extends Service {
     _uri: any;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
-        sources: FileContentProvider[];
+        sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
@@ -889,4 +889,3 @@ export class OpenLDAPService extends Service {
     }, void, unknown>;
 }
 import { Service } from "../service.mjs";
-import { FileContentProvider } from "npm-pkgbuild";