pmcf 6.38.5 → 6.39.1

package/README.md

@@ -117,7 +117,7 @@ generates config packages for:
 
 ## Base
 
-**Extends Core**
+**Extends core**
 
 attributes: as declared in the types
 properties: use defined values to support attribute value definitions
@@ -214,7 +214,7 @@ Walk the object graph in some directions and deliver seen nodes.
 
 *   `directions` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**  (optional, default `["this","extends","owner"]`)
 
-Returns **Iterable\<Core>**&#x20;
+Returns **Iterable\<core>**&#x20;
 
 ## mapFromDirections
 

package/bin/pmcf-info

@@ -112,25 +112,32 @@ function show(value, indent, options) {
               }
             }
           } else {
-            try {
-              const l = [...v];
-
-              if (l.length > 1) {
-                console.log(name(attribute));
-
-                if (l.length >= options.maxEntries) {
-                  l[options.maxEntries] = { fullName: "..." };
-                  l.length = options.maxEntries + 1;
-                }
-
-                for (const o of l) {
-                  console.log(prefix(indent + 2) + o.fullName);
+            if (typeof v.get === "function") {
+              console.log(name(attribute));
+              for(const [k,o] of v) {
+                show(o,indent + 2, options);
+              }
+            } else {
+              try {
+                const l = [...v];
+
+                if (l.length > 1) {
+                  console.log(name(attribute));
+
+                  if (l.length >= options.maxEntries) {
+                    l[options.maxEntries] = { fullName: "..." };
+                    l.length = options.maxEntries + 1;
+                  }
+
+                  for (const o of l) {
+                    console.log(prefix(indent + 2) + o.fullName);
+                  }
+                } else if (l.length === 1) {
+                  console.log(name(attribute) + l[0].fullName);
                 }
-              } else if (l.length === 1) {
-                console.log(name(attribute) + l[0].fullName);
+              } catch (e) {
+                console.log(name(attribute), v);
               }
-            } catch (e) {
-              console.log(name(attribute), v);
             }
           }
         } else {

package/package.json

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

package/src/base.mjs

@@ -45,7 +45,6 @@ export class Base extends core {
       name: "template",
       private: true
     },
-
     content: { ...default_attribute_writable, type: "content", name: "content" }
   };
 
@@ -101,10 +100,6 @@ export class Base extends core {
     }
   }
 
-  get root() {
-    return this.owner?.root;
-  }
-
   get host() {
     return this.owner?.host;
   }

package/src/content.mjs

@@ -1,4 +1,5 @@
 import {
+  name_attribute_writable,
   string_attribute_writable,
   string_set_attribute_writable,
   default_collection_attribute_writable
@@ -6,9 +7,11 @@ import {
 import { allOutputs } from "npm-pkgbuild";
 import { core, addType } from "pmcf";
 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" },
     user: { ...string_attribute_writable, name: "user" },
@@ -20,7 +23,7 @@ export class permission extends core {
     addType(this);
   }
 
-  get name() {
+  get fullName() {
     return this.pattern;
   }
 }
@@ -28,6 +31,7 @@ export class permission extends core {
 export class content extends core {
   static priority = 1.9;
   static attributes = {
+    name: name_attribute_writable,
     permissions: {
       ...default_collection_attribute_writable,
       type: permission,
@@ -38,12 +42,13 @@ export class content extends core {
       name: "access",
       default: "private"
     },
-    replaces: { ...string_set_attribute_writable, name: "replaces" },
     depends: { ...string_set_attribute_writable, name: "depends" },
     provides: { ...string_set_attribute_writable, name: "provides" },
+    replaces: { ...string_set_attribute_writable, name: "replaces" },
     optional: { ...string_set_attribute_writable, name: "optional" },
     groups: { ...string_set_attribute_writable, name: "groups" },
     backup: { ...string_set_attribute_writable, name: "backup" },
+    hooks: { ...string_set_attribute_writable, name: "hooks" },
     packaging: { ...string_set_attribute_writable, name: "packaging" }
   };
 
@@ -58,14 +63,30 @@ export class content extends core {
   _depends = new Set();
   _optional = new Set();
   _groups = new Set();
+  _hooks = new Set();
+
+  value(name) {
+    //  console.log("CONTENT VALUE", this.name, this.owner.fullName, name, this.owner.name);
+    return this.owner.value(name) ?? super.value(name);
+  }
 
   get name() {
-    return "content";
+    let name = this.attribute("_name");
+    if (name !== undefined) {
+      return name;
+    }
+
+    const node = this.owner;
+    const nameParts = [node.typeName, node.owner?.name, node.name];
+    return nameParts.filter(n => n !== undefined && n.length > 0).join("-");
   }
 
-  value(name) {
-  //  console.log("CONTENT VALUE", this.name, this.owner.fullName, name, this.owner.name);
-    return this.owner.value(name) ?? super.value(name);
+  set name(value) {
+    this._name = value;
+  }
+
+  get fullName() {
+    return this.name;
   }
 
   /**
@@ -84,7 +105,7 @@ export class content extends core {
   }
 
   get packaging() {
-    return this.unionFromDirections(["this", "extends"], "_packaging")
+    return this.unionFromDirections(["this", "extends"], "_packaging");
   }
 
   get outputs() {
@@ -151,6 +172,14 @@ export class content extends core {
     );
   }
 
+  set hooks(value) {
+    this._hooks = union(value, this._hooks);
+  }
+
+  get hooks() {
+    return this.expand(this.unionFromDirections(["this", "extends"], "_hooks"));
+  }
+
   get permissions() {
     const p = this.mapFromDirections(["this", "extends"], "_permissions");
 
@@ -174,14 +203,12 @@ export class content extends core {
 */
   }
 
-  packageData(node) {
-    const nameParts = [node.typeName, node.owner?.name, node.name];
-
-    return {
+  async packageData(node) {
+    const packageData = {
       sources: [],
       outputs: this.outputs,
       properties: {
-        name: nameParts.filter(n => n !== undefined && n.length > 0).join("-"),
+        name: this.name,
         description: `${node.typeName} definitions for ${node.fullName}`,
         access: this.access,
         groups: [...this.groups],
@@ -192,5 +219,14 @@ export class content extends core {
         backup: [...this.backup]
       }
     };
+
+    for (const hook of this.hooks) {
+      await loadHooks(
+        packageData,
+        new URL("host.install", import.meta.url).pathname
+      );
+    }
+
+    return packageData;
   }
 }

package/src/core-service.mjs

@@ -270,16 +270,8 @@ export class CoreService extends Base {
     );
   }
 
-  get packageData() {
-    const packageData = super.packageData;
-    const name = `${this.owner.owner.name}-${this.owner.name}`;
-    packageData.properties.name = `${this.name}-${name}`;
-    packageData.properties.groups.push("config", name);
-    return packageData;
-  }
-
   async *preparePackages(dir) {
-    const pd = this.packageData;
+    const pd = await this.packageData;
 
     pd.sources = await Array.fromAsync(
       this.templateContent(this.content.permissions)

package/src/core.mjs

@@ -321,4 +321,8 @@ export class core {
   get isTemplate() {
     return false;
   }
+
+  get root() {
+    return this.owner?.root;
+  }
 }

package/src/host.mjs

@@ -19,7 +19,6 @@ import {
 import { ServiceOwner } from "./service-owner.mjs";
 import { addHook } from "./hooks.mjs";
 import { domainFromDominName, domainName, writeLines } from "./utils.mjs";
-import { loadHooks } from "./hooks.mjs";
 import { generateKnownHosts } from "./host-utils.mjs";
 
 export class Host extends ServiceOwner {
@@ -312,7 +311,7 @@ export class Host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
-    const packageData = this.packageData;
+    const packageData = await this.packageData;
 
     packageData.sources.push(
       await Array.fromAsync(this.templateContent()),
@@ -323,11 +322,6 @@ export class Host extends ServiceOwner {
       })
     );
 
-    await loadHooks(
-      packageData,
-      new URL("host.install", import.meta.url).pathname
-    );
-
     for (const ni of this.networkInterfaces.values()) {
       await ni.systemdDefinitions(dir, packageData);
     }

package/src/initialization-context.mjs

@@ -6,7 +6,7 @@ import {
   resolveTypeLinks,
   create
 } from "pacc";
-import { Base, root, assign } from "pmcf";
+import { core, root, assign } from "pmcf";
 
 /**
  * Keeps track of all in flight object creations and loose ends during config initialization.
@@ -122,7 +122,7 @@ export class InitializationContext {
               this.instantiateAndAssign(object, attribute, v);
             }
           } else {
-            if (value instanceof Base) {
+            if (value instanceof core) {
               assign(attribute, object, value);
             } else {
               for (const [objectName, objectData] of Object.entries(value)) {

package/src/host.install

@@ -1,17 +0,0 @@
-post_install()
-{
-    ls -l /etc/resolv.conf | grep -q /run/systemd/resolve/resolv.conf
-    if [ $? = 1 ]
-    then
-        ln -f -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-    fi
-}
-
-post_upgrade()
-{
-    ls -l /etc/resolv.conf | grep -q /run/systemd/resolve/resolv.conf
-    if [ $? = 1 ]
-    then
-        ln -f -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-    fi
-}