pmcf 6.39.0 → 6.39.2

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.39.0",
+  "version": "6.39.2",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -100,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,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";
@@ -11,6 +13,7 @@ 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" },
@@ -22,7 +25,7 @@ export class permission extends core {
     addType(this);
   }
 
-  get name() {
+  get fullName() {
     return this.pattern;
   }
 }
@@ -31,6 +34,7 @@ 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,
@@ -84,6 +88,24 @@ export class content extends core {
     this._name = value;
   }
 
+  get fullName() {
+    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}
    */
@@ -198,13 +220,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],
@@ -215,12 +249,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.mjs

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

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)) {