pmcf 6.22.0 → 6.22.1

package/README.md

@@ -327,7 +327,7 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 *   `empty` **([boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))**  (optional, default `false`)
 *   `indent` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**  (optional, default `""`)
 
-Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
+Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)>**&#x20;
 
 ## SystemdJournalRemoteService
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.22.0",
+  "version": "6.22.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.10.1",
     "npm-pkgbuild": "^20.8.13",
-    "pacc": "^11.1.0",
+    "pacc": "^11.1.2",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/common-attributes.mjs

@@ -12,7 +12,15 @@ import {
 
 export const networkAddressType = "network|host|network_interface";
 
-export const aliases_attribute = { ...string_set_attribute_writable, name: "aliases" };
+export const extends_attribute = {  
+  ...default_collection_attribute_writable,
+  name: "extends"
+};
+
+export const aliases_attribute = {
+  ...string_set_attribute_writable,
+  name: "aliases"
+};
 
 export const owner_attribute = {
   ...default_attribute,
@@ -103,7 +111,14 @@ export const networkAttributes = {
   kind: {
     ...string_attribute_writable,
     name: "kind",
-    values: new Set(["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"])
+    values: new Set([
+      "loopback",
+      "ethernet",
+      "wlan",
+      "wireguard",
+      "fiber",
+      "dsl"
+    ])
   },
   ssid: ssid_attribute,
   psk: psk_attribute,

package/src/core-service.mjs

@@ -21,7 +21,10 @@ import {
   FAMILY_DNS
 } from "pmcf";
 import { asArray } from "./utils.mjs";
-import { networkAddressAttributes } from "./common-attributes.mjs";
+import {
+  networkAddressAttributes,
+  extends_attribute
+} from "./common-attributes.mjs";
 import {
   serviceTypeEndpoints,
   serviceTypes,
@@ -68,8 +71,7 @@ export class CoreService extends Base {
     ...networkAddressAttributes,
     ...endpointAttributes,
     extends: {
-      ...default_collection_attribute_writable,
-      name: "extends",
+      ...extends_attribute,
       type: CoreService
     },
     priority: priority_attribute,

package/src/host.mjs

@@ -14,7 +14,8 @@ import { addresses, addType, assign } from "pmcf";
 import {
   networkAddressAttributes,
   networkInterfaces_attribute,
-  hosts_attribute
+  hosts_attribute,
+  extends_attribute
 } from "./common-attributes.mjs";
 import { ServiceOwner } from "./service-owner.mjs";
 import { addHook } from "./hooks.mjs";
@@ -79,8 +80,7 @@ export class Host extends ServiceOwner {
     depends: { ...string_set_attribute_writable, name: "depends" },
     provides: { ...string_set_attribute_writable, name: "provides" },
     extends: {
-      ...default_collection_attribute_writable,
-      name: "extends",
+      ...extends_attribute,
       type: Host
     },
     model: { ...string_attribute, name: "model" }

package/src/service.mjs

@@ -1,11 +1,7 @@
-import { string_attribute_writable } from "pacc";
 import { setBaseService, CoreService, addType } from "pmcf";
 
 export class Service extends CoreService {
   static name = "service";
-  static attributes = {
-    type: { ...string_attribute_writable, name: "type" }
-  };
   static {
     addType(this);
     setBaseService(this);
@@ -17,10 +13,6 @@ export class Service extends CoreService {
     this._type = value;
   }
 
-  set type(value) {
-    this._type = value;
-  }
-
   get type() {
     return this.attribute("_type") ?? this.name;
   }