pmcf 4.0.8 → 4.1.0

package/package.json

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

package/src/base.mjs

@@ -381,11 +381,10 @@ export class Base {
 
   /**
    * Retrive attribute values from an object.
-   * @return {Object} values
+   * @param {Function} [filter]
+   * @return {Iterable<[string,any]>} values
    */
-  getProperties(filter = filterPublic) {
-    const result = {};
-
+  *propertyIterator(filter) {
     for (
       let typeDefinition = this.constructor.typeDefinition;
       typeDefinition;
@@ -396,16 +395,22 @@ export class Base {
         filter
       )) {
         const name = path.join(".");
-
-        let value = this.extendedProperty(name);
+        const value = this.extendedProperty(name);
 
         if (value !== undefined) {
-          result[def.externalName ?? name] = toExternal(value, def);
+          yield [def.externalName ?? name, toExternal(value, def), path, def];
         }
       }
     }
+  }
 
-    return result;
+  /**
+   * Retrive attribute values from an object.
+   * @param {Function} [filter]
+   * @return {Object} values
+   */
+  getProperties(filter = filterPublic) {
+    return Object.fromEntries(this.propertyIterator(filter));
   }
 
   get root() {

package/src/host.mjs

@@ -425,6 +425,7 @@ export class Host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
+    const pkgName = `${this.typeName}-${this.owner.name}-${this.name}`;
     let packageData = {
       dir,
       sources: [
@@ -440,7 +441,7 @@ export class Host extends ServiceOwner {
       ],
       outputs: this.outputs,
       properties: {
-        name: `${this.typeName}-${this.owner.name}-${this.name}`,
+        name: pkgName,
         description: `${this.typeName} definitions for ${this.fullName}`,
         access: "private",
         dependencies: [
@@ -448,7 +449,7 @@ export class Host extends ServiceOwner {
           ...this.depends
         ],
         provides: [...this.provides],
-        replaces: [`mf-${this.hostName}`, ...this.replaces],
+        replaces: [...this.replaces],
         requires: [],
         backup: "root/.ssh/known_hosts",
         hooks: await loadHooks(
@@ -496,7 +497,7 @@ export class Host extends ServiceOwner {
           name: `${this.typeName}-extra-${this.owner.name}-${this.name}`,
           description: `additional files for ${this.fullName}`,
           access: "private",
-          dependencies: [`${this.typeName}-${this.owner.name}-${this.name}`]
+          dependencies: [pkgName]
         }
       };
 

package/types/base.d.mts

@@ -71,9 +71,16 @@ export class Base {
     extendedProperty(propertyName: any): any;
     /**
      * Retrive attribute values from an object.
+     * @param {Function} [filter]
+     * @return {Iterable<[string,any]>} values
+     */
+    propertyIterator(filter?: Function): Iterable<[string, any]>;
+    /**
+     * Retrive attribute values from an object.
+     * @param {Function} [filter]
      * @return {Object} values
      */
-    getProperties(filter?: typeof filterPublic): any;
+    getProperties(filter?: Function): any;
     get root(): any;
     get location(): any;
     get host(): any;
@@ -136,4 +143,3 @@ export class Base {
     toString(): string;
     toJSON(): any;
 }
-import { filterPublic } from "pacc";