pmcf 4.5.4 → 4.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.5.4",
+  "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/hooks.mjs

@@ -1,21 +1,21 @@
 import { createReadStream } from "node:fs";
 import { extractFunctions } from "npm-pkgbuild";
 
-export async function loadHooks(hooks, file) {
+export async function loadHooks(packageData, file) {
   for await (const f of extractFunctions(createReadStream(file, "utf8"))) {
-    addHook(hooks, f.name, f.body);
+    addHook(packageData, f.name, f.body);
   }
-
-  return hooks;
 }
 
-export function addHook(hooks, name, content) {
-  const hook = hooks[name];
+export function addHook(packageData, name, content) {
+  packageData.properties.hooks ||= {};
+
+  const hook = packageData.properties.hooks[name];
   if (hook) {
     content = hook + "\n" + content;
   }
 
-  hooks[name] = content;
+  packageData.properties.hooks[name] = content;
 
-  return hooks;
+  return packageData.properties.hooks;
 }

package/src/host.mjs

@@ -17,7 +17,6 @@ import {
   domainFromDominName,
   domainName,
   writeLines,
-  sectionLines,
   asArray
 } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
@@ -451,14 +450,15 @@ export class Host extends ServiceOwner {
         provides: [...this.provides],
         replaces: [...this.replaces],
         requires: [],
-        backup: "root/.ssh/known_hosts",
-        hooks: await loadHooks(
-          {},
-          new URL("host.install", import.meta.url).pathname
-        )
+        backup: "root/.ssh/known_hosts"
       }
     };
 
+    await loadHooks(
+      packageData,
+      new URL("host.install", import.meta.url).pathname
+    );
+
     for (const ni of this.networkInterfaces.values()) {
       await ni.systemdDefinitions(packageData);
     }
@@ -478,7 +478,7 @@ export class Host extends ServiceOwner {
           await writeLines(dir, configFileName, content);
 
           addHook(
-            packageData.properties.hooks,
+            packageData,
             "post_install",
             `systemctl enable ${serviceName}`
           );

package/src/location.mjs

@@ -55,14 +55,15 @@ export class Location extends Owner {
         access: "private",
         dependencies: { jq: ">=1.8" },
         provides: ["location", "mf-location"],
-        replaces: [`mf-location-${this.name}`],
-        hooks: await loadHooks(
-          {},
-          new URL("location.install", import.meta.url).pathname
-        )
+        replaces: [`mf-location-${this.name}`]
       }
     };
 
+    await loadHooks(
+      packageData,
+      new URL("location.install", import.meta.url).pathname
+    );
+
     yield packageData;
   }
 }

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;
@@ -145,19 +111,18 @@ export class OpenLDAPService extends Service {
         name: `${this.typeName}-${this.location.name}-${name}`,
         description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
-        dependencies: ["openldap>=2.6.10"],
-        hooks: {}
+        dependencies: ["openldap>=2.6.10"]
       }
     };
 
     addHook(
-      packageData.properties.hooks,
+      packageData,
       "post_upgrade",
       `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );
 
     addHook(
-      packageData.properties.hooks,
+      packageData,
       "post_install",
       `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );

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/hooks.d.mts

@@ -1,2 +1,2 @@
-export function loadHooks(hooks: any, file: any): Promise<any>;
-export function addHook(hooks: any, name: any, content: any): any;
+export function loadHooks(packageData: any, file: any): Promise<void>;
+export function addHook(packageData: any, name: any, content: any): any;

package/types/host.d.mts

@@ -265,7 +265,6 @@ export class Host extends ServiceOwner {
             replaces: any[];
             requires: any[];
             backup: string;
-            hooks: any;
         };
     }, void, unknown>;
 }

package/types/location.d.mts

@@ -362,7 +362,6 @@ export class Location extends Owner {
             };
             provides: string[];
             replaces: string[];
-            hooks: any;
         };
     }, void, unknown>;
 }

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[];
@@ -884,7 +879,6 @@ export class OpenLDAPService extends Service {
             description: string;
             access: string;
             dependencies: string[];
-            hooks: {};
         };
     }, void, unknown>;
 }