pmcf 6.39.1 → 6.39.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.39.1",
+  "version": "6.39.3",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -27,8 +27,7 @@ import { owner_attribute, aliases_attribute } from "./common-attributes.mjs";
  * attributes: as declared in the types
  * properties: use defined values to support attribute value definitions
  */
-export class Base extends core {
-  static name = "base";
+export class base extends core {
   static key = "name";
   static priority = 0;
   static attributes = {

package/src/cluster.mjs

@@ -58,7 +58,7 @@ export class Cluster extends Host {
       const packageStagingDir = join(stagingDir, host.name);
       const name = `${this.owner.name}-${host.name}`;
 
-      const packageData = host.packageData;
+      const packageData = await host.packageData;
       packageData.sources.push(
         new FileContentProvider(packageStagingDir + "/")
       );

package/src/content.mjs

@@ -1,8 +1,10 @@
+import { join } from "node:path";
 import {
   name_attribute_writable,
   string_attribute_writable,
   string_set_attribute_writable,
-  default_collection_attribute_writable
+  default_collection_attribute_writable,
+  description_attribute_writable
 } from "pacc";
 import { allOutputs } from "npm-pkgbuild";
 import { core, addType } from "pmcf";
@@ -10,7 +12,6 @@ import { union } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
 
 export class permission extends core {
-  static priority = 1.9;
   static key = "pattern";
   static attributes = {
     pattern: { ...string_attribute_writable, key: true, name: "pattern" },
@@ -29,9 +30,9 @@ export class permission extends core {
 }
 
 export class content extends core {
-  static priority = 1.9;
   static attributes = {
     name: name_attribute_writable,
+    description: description_attribute_writable,
     permissions: {
       ...default_collection_attribute_writable,
       type: permission,
@@ -89,6 +90,20 @@ export class content extends core {
     return this.name;
   }
 
+  get description() {
+    let description = this.attribute("_description");
+    if (description !== undefined) {
+      return description;
+    }
+
+    const node = this.owner;
+    return `${node.typeName} definitions for ${node.fullName}`;
+  }
+
+  set description(value) {
+    this._description = value;
+  }
+
   /**
    * @return {string}
    */
@@ -203,13 +218,25 @@ export class content extends core {
 */
   }
 
+  /**
+   * 
+   * @param {object} packageData 
+   */
+  async loadHooks(packageData) {
+    for (const node of this.walkDirections(["this", "extends"])) {
+      for (const hook of node._hooks) {
+        await loadHooks(packageData, join(node.owner.directory, hook));
+      }
+    }
+  }
+
   async packageData(node) {
     const packageData = {
       sources: [],
       outputs: this.outputs,
       properties: {
         name: this.name,
-        description: `${node.typeName} definitions for ${node.fullName}`,
+        description: this.description,
         access: this.access,
         groups: [...this.groups],
         depends: [...this.depends],
@@ -220,12 +247,7 @@ export class content extends core {
       }
     };
 
-    for (const hook of this.hooks) {
-      await loadHooks(
-        packageData,
-        new URL("host.install", import.meta.url).pathname
-      );
-    }
+    await this.loadHooks(packageData);
 
     return packageData;
   }

package/src/core-service.mjs

@@ -6,7 +6,7 @@ import {
   asArray
 } from "pacc";
 import {
-  Base,
+  base,
   Host,
   Endpoint,
   DomainNameEndpoint,
@@ -34,7 +34,7 @@ import {
   dnsPriority
 } from "./dns-utils.mjs";
 
-export class CoreService extends Base {
+export class CoreService extends base {
   static name = "core-service";
   static priority = 1.1;
   static owners = [Host, "cluster", "network_interface"];

package/src/initialization-context.mjs

@@ -125,9 +125,9 @@ export class InitializationContext {
             if (value instanceof core) {
               assign(attribute, object, value);
             } else {
-              for (const [objectName, objectData] of Object.entries(value)) {
+              for (const [objectIdentifier, objectData] of Object.entries(value)) {
                 if (typeof objectData === "object") {
-                  objectData[attribute.type.key] = objectName;
+                  objectData[attribute.type.key] = objectIdentifier;
                 }
                 this.instantiateAndAssign(object, attribute, objectData);
               }

package/src/service-owner.mjs

@@ -1,8 +1,8 @@
 import { default_collection_attribute_writable } from "pacc";
-import { Base, addType } from "pmcf";
+import { base, addType } from "pmcf";
 import { owner_attribute } from "./common-attributes.mjs";
 
-export class ServiceOwner extends Base {
+export class ServiceOwner extends base {
   static name = "service-owner";
   static priority = 1.9;
   static owners = ["owner", "network", "root"];

package/src/services/alpm.mjs

@@ -4,10 +4,10 @@ import {
   string_attribute_writable,
   string_set_attribute_writable
 } from "pacc";
-import { addType, CoreService, Base } from "pmcf";
+import { addType, CoreService, base } from "pmcf";
 import { owner_attribute } from "../common-attributes.mjs";
 
-class alpm_repository extends Base {
+class alpm_repository extends base {
   static attributes = {
     name: name_attribute_writable,
     base: { ...string_attribute_writable, name: "base" },

package/src/services/bind.mjs

@@ -7,7 +7,7 @@ import {
   default_collection_attribute_writable,
   default_attribute_writable,
   duration_attribute_writable,
-  name_attribute,
+  id_attribute,
   string_attribute,
   string_set_attribute,
   string_attribute_writable,
@@ -20,7 +20,7 @@ import {
   asArray
 } from "pacc";
 import {
-  Base,
+  base,
   CoreService,
   Endpoint,
   addresses,
@@ -42,11 +42,10 @@ import { NetworkAddress } from "../network-address.mjs";
 const PRIMARY = "primary";
 const SECONDARY = "secondary";
 
-class bind_zone extends Base {
-  static priority = 1;
+class bind_zone extends base {
   static key = "id";
   static attributes = {
-    id: { ...name_attribute, name: "id" },
+    id: id_attribute,
     file: { ...string_attribute, name: "file" },
     records: {
       ...string_attribute_writable,
@@ -135,8 +134,7 @@ class catalog_zone extends bind_zone {
   }
 }
 
-class bind_zone_config extends Base {
-  static priority = 1;
+class bind_zone_config extends base {
   static attributes = {
     zones: { ...default_collection_attribute, type: bind_zone, name: "zones" },
     type: { ...string_attribute, name: "type" }
@@ -228,8 +226,7 @@ class bind_zone_config extends Base {
   }
 }
 
-export class bind_key extends Base {
-  static priority = 1;
+export class bind_key extends base {
   static attributes = {
     algorithm: {
       ...string_attribute_writable,
@@ -259,8 +256,7 @@ export class bind_key extends Base {
   }
 }
 
-class bind_object extends Base {
-  static priority = 1;
+class bind_object extends base {
   static attributes = {
     order: { ...integer_attribute, name: "order" },
     entries: {
@@ -285,7 +281,6 @@ class bind_object extends Base {
 }
 
 export class bind_acl extends bind_object {
-  static priority = 1;
 
   static {
     addType(this);
@@ -825,8 +820,9 @@ export class bind extends CoreService {
   }
 
   async *preparePackages(dir) {
+    const packageData = await this.packageData;
+
     const permissions = this.content.permissions;
-    const packageData = this.packageData;
 
     packageData.sources = await Array.fromAsync(
       this.templateContent(permissions)

package/src/services/chrony.mjs

@@ -37,7 +37,7 @@ export class chrony extends ExtraSourceService {
   }
 
   async *preparePackages(dir) {
-    const packageData = this.packageData;
+    const packageData = await this.packageData;
     packageData.sources.push(new FileContentProvider(dir + "/"));
 
     const subnets = [...new Map(this.subnets).values()]; // TODO should be normal

package/src/services/influxdb.mjs

@@ -31,7 +31,7 @@ export class influxdb extends CoreService {
   }
 
   async *preparePackages(dir) {
-    const packageData = this.packageData;
+    const packageData = await this.packageData;
 
     packageData.sources.push(new FileContentProvider(dir + "/"));
 

package/src/services/kea.mjs

@@ -151,7 +151,7 @@ export class kea extends CoreService {
       endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
     });
 
-    const packageData = this.packageData;
+    const packageData = await this.packageData;
 
     packageData.sources.push(new FileContentProvider(dir + "/"));
 

package/src/services/mosquitto.mjs

@@ -58,8 +58,8 @@ export class mosquitto extends CoreService {
       wd.map(n => [n.fullName, n.directory])
     );*/
 
+    const packageData = await this.packageData;
     const permissions = this.content.permissions;
-    const packageData = this.packageData;
 
     packageData.sources = await Array.fromAsync(
       this.templateContent(...permissions)