pmcf 4.5.5 → 4.6.0

package/package.json

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

package/src/base.mjs

@@ -1,5 +1,10 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
+import {
+  createExpressionTransformer,
+  transform
+} from "content-entry-transform";
+import { FileContentProvider } from "npm-pkgbuild";
 import {
   getAttribute,
   typeFactory,
@@ -19,7 +24,6 @@ import {
   description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
-
 import { asArray } from "./utils.mjs";
 
 /**
@@ -560,6 +564,29 @@ export class Base {
 
   async *preparePackages(stagingDir) {}
 
+  templateContent(entryProperties, directoryProperties) {
+    const transformers = [
+      createExpressionTransformer(
+        e => e.isBlob,
+        expression =>
+          parse(expression, {
+            root: this,
+            getGlobal: id => this.getGlobal(id)
+          })
+      )
+    ];
+
+    return [...this.allExtends(), this].map(e => {
+      const dir = join(e.directory, "content") + "/";
+      console.log("DIR", dir);
+
+      return transform(
+        new FileContentProvider(dir, entryProperties, directoryProperties),
+        transformers
+      );
+    });
+  }
+
   get tags() {
     return this._tags;
   }

package/src/services/openldap.mjs

@@ -1,4 +1,3 @@
-import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   string_attribute_writable,
@@ -9,10 +8,6 @@ import {
 import { addServiceType } from "pmcf";
 import { ServiceTypeDefinition, Service } from "../service.mjs";
 import { addHook } from "../hooks.mjs";
-import {
-  createExpressionTransformer,
-  transform
-} from "content-entry-transform";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
@@ -21,8 +16,7 @@ const OpenLDAPServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    baseDN: string_attribute_writable,
-    rootDN: string_attribute_writable,
+    base: string_attribute_writable,
     uri: string_attribute_writable,
 
     DB_CONFIG: {
@@ -67,27 +61,18 @@ export class OpenLDAPService extends Service {
     return OpenLDAPServiceTypeDefinition;
   }
 
-  _baseDN;
-  _rootDN;
+  _base;
 
   get type() {
     return OpenLDAPServiceTypeDefinition.name;
   }
 
-  get baseDN() {
-    return this.expand(this._baseDN);
-  }
-
-  set baseDN(value) {
-    this._baseDN = value;
+  get base() {
+    return this.expand(this._base);
   }
 
-  get rootDN() {
-    return this.expand(this._rootDN);
-  }
-
-  set rootDN(value) {
-    this._rootDN = value;
+  set base(value) {
+    this._base = value;
   }
 
   get uri() {
@@ -98,25 +83,6 @@ 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;

package/types/base.d.mts

@@ -123,6 +123,7 @@ export class Base {
     get derivedPackaging(): any;
     get outputs(): Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
     preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
+    templateContent(entryProperties: any, directoryProperties: any): any[];
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): any;

package/types/services/openldap.d.mts

@@ -743,8 +743,7 @@ export class OpenLDAPService extends Service {
         })[];
         key: string;
         attributes: {
-            baseDN: import("pacc").AttributeDefinition;
-            rootDN: import("pacc").AttributeDefinition;
+            base: import("pacc").AttributeDefinition;
             uri: import("pacc").AttributeDefinition;
             DB_CONFIG: {
                 attributes: {
@@ -864,17 +863,13 @@ export class OpenLDAPService extends Service {
             services: {};
         };
     };
-    _baseDN: any;
-    _rootDN: any;
+    _base: any;
     get type(): string;
-    set baseDN(value: any);
-    get baseDN(): any;
-    set rootDN(value: any);
-    get rootDN(): any;
+    set base(value: any);
+    get base(): any;
     set uri(value: any);
     get uri(): any;
     _uri: any;
-    templateContent(entryProperties: any, directoryProperties: any): any[];
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
         sources: any[];