pmcf 6.27.0 → 6.27.2

package/bin/pmcf-info

@@ -96,16 +96,20 @@ function show(value, indent = 0, options = { short: false, maxDepth: 5 }) {
               }
             }
           } else {
-            const l = [...v];
+            try {
+              const l = [...v];
 
-            if (l.length > 1) {
-              console.log(name(attribute));
+              if (l.length > 1) {
+                console.log(name(attribute));
 
-              for (const o of l) {
-                console.log(prefix(indent + 2) + o.fullName);
+                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);
             }
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.27.0",
+  "version": "6.27.2",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.12.0",
     "npm-pkgbuild": "^20.8.13",
-    "pacc": "^11.1.3",
+    "pacc": "^11.2.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/host.mjs

@@ -40,7 +40,7 @@ export class Host extends ServiceOwner {
       name: "os",
       values: new Set(["osx", "windows", "linux"])
     },
-    "machine-id": { ...string_attribute_writable, name: "machine-id" },
+    id: { ...string_attribute_writable, name: "id" },
     distribution: { ...string_attribute_writable, name: "distribution" },
     deployment: {
       ...string_attribute_writable,
@@ -136,13 +136,6 @@ export class Host extends ServiceOwner {
     return this.attribute("_vendor");
   }
 
-  /**
-   * @return {string}
-   */
-  get id() {
-    return this["machine-id"];
-  }
-
   set keymap(value) {
     this._keymap = value;
   }

package/src/type.mjs

@@ -39,9 +39,13 @@ export function assign(attribute, object, value) {
     }
 
     if (attribute.deferredExpression) {
-      Object.defineProperty(object, attribute.name, {
-        get: () => object.expression(value)
-      });
+      if (object.hasOwnProperty(attribute.name)) {
+        error(`attribute ${attribute.name} of ${object.fullName} already defined`, attribute );
+      } else {
+        Object.defineProperty(object, attribute.name, {
+          get: () => object.expression(value)
+        });
+      }
       return value;
     }