pmcf 4.29.1 → 4.29.3

package/README.md

@@ -97,20 +97,18 @@ generates config packages for:
     *   [Parameters](#parameters-19)
 *   [secretName](#secretname)
 *   [isTemplate](#istemplate-1)
-*   [named](#named)
-    *   [Parameters](#parameters-20)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-21)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-23)
+    *   [Parameters](#parameters-22)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-24)
+    *   [Parameters](#parameters-23)
 *   [asArray](#asarray)
-    *   [Parameters](#parameters-25)
+    *   [Parameters](#parameters-24)
 *   [asIterator](#asiterator)
-    *   [Parameters](#parameters-26)
+    *   [Parameters](#parameters-25)
 
 ## Base
 
@@ -366,14 +364,6 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
 
-## named
-
-### Parameters
-
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
-Returns **(Service | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))** 
-
 ## serviceEndpoints
 
 ### Parameters

package/package.json

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

package/src/base.mjs

@@ -105,7 +105,7 @@ export class Base {
   named(name) {
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
-      (name, attribute) => /*attribute.owner &&*/ !attribute.type.primitive
+      (name, attribute) => !attribute.type.primitive
     )) {
       const value = this[path];
       if (typeof value?.get === "function") {
@@ -244,12 +244,6 @@ export class Base {
     return name[0] === "/" ? this.fullName === name : this.name === name;
   }
 
-  relativeName(name) {
-    return name?.[0] === "/"
-      ? name.substring(this.owner.fullName.length + 1)
-      : name;
-  }
-
   *find(pattern) {
     for (const node of this.walkDirections(["children"])) {
       for (const p of pattern) {

package/src/cluster.mjs

@@ -5,12 +5,11 @@ import {
   default_attribute_writable,
   default_attribute,
   number_attribute_writable,
-  duration_attribute_writable,
-  addType
+  duration_attribute_writable
 } from "pacc";
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
-import { serviceEndpoints } from "pmcf";
+import { addType, serviceEndpoints } from "pmcf";
 import { writeLines } from "./utils.mjs";
 
 export class Cluster extends Host {

package/src/endpoint.mjs

@@ -1,5 +1,5 @@
 import { FAMILY_IPV6 } from "ip-utilties";
-import { addType } from "pacc";
+import { addType } from "pmcf";
 import { endpointAttributes, Service } from "./service.mjs";
 
 class BaseEndpoint {

package/src/host.mjs

@@ -7,10 +7,9 @@ import {
   string_attribute_writable,
   string_set_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_false,
-  addType
+  boolean_attribute_false
 } from "pacc";
-import {  NetworkInterface, addresses } from "pmcf";
+import { NetworkInterface, addresses, addType } from "pmcf";
 import { ServiceOwner } from "./service-owner.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
@@ -74,7 +73,12 @@ export class Host extends ServiceOwner {
     replaces: string_set_attribute_writable,
     depends: string_set_attribute_writable,
     provides: string_set_attribute_writable,
-    extends: { ...default_attribute_writable, type: Host, collection: true, owner: false },
+    extends: {
+      ...default_attribute_writable,
+      type: Host,
+      collection: true,
+      owner: false
+    },
     model: string_attribute,
     isModel: boolean_attribute_false
   };

package/src/location.mjs

@@ -1,6 +1,5 @@
 import { FileContentProvider } from "npm-pkgbuild";
-import { addType } from "pacc";
-import { Owner } from "pmcf";
+import { Owner, addType } from "pmcf";
 import { loadHooks } from "./hooks.mjs";
 
 export class Location extends Owner {

package/src/network.mjs

@@ -1,4 +1,5 @@
-import { default_attribute_writable, addType } from "pacc";
+import { default_attribute_writable } from "pacc";
+import { addType } from "pmcf";
 import { Owner } from "./owner.mjs";
 import { Subnet } from "./subnet.mjs";
 import { networkAttributes } from "./network-support.mjs";

package/src/owner.mjs

@@ -4,10 +4,9 @@ import {
   string_set_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable,
-  email_attribute,
-  addType,
-  types
+  email_attribute
 } from "pacc";
+import { addType } from "pacc";
 import { asIterator, union } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
@@ -160,7 +159,7 @@ export class Owner extends Base {
   get hosts() {
     let hosts = this.directHosts();
 
-    for (const type of types.host.owners) {
+    for (const type of Host.owners) {
       for (const object of this.typeList(type)) {
         hosts = hosts.union(object.hosts);
       }

package/src/root.mjs

@@ -1,4 +1,4 @@
-import { addType } from "pacc";
+import { addType } from "pmcf";
 import { Location } from "./location.mjs";
 
 export class root extends Location {

package/src/service-owner.mjs

@@ -1,5 +1,5 @@
-import { default_attribute_writable, addType } from "pacc";
-import { Base, Service } from "pmcf";
+import { default_attribute_writable } from "pacc";
+import { Base, Service, addType } from "pmcf";
 
 export class ServiceOwner extends Base {
   static name = "service-owner";
@@ -64,5 +64,5 @@ export class ServiceOwner extends Base {
       throw new Error("invalidType", { cause: typeName });
     }
     return super.typeNamed(typeName, name);
-  }  
+  }
 }

package/src/service.mjs

@@ -4,8 +4,7 @@ import {
   number_attribute_writable,
   string_set_attribute,
   default_attribute_writable,
-  boolean_attribute_false,
-  addType
+  boolean_attribute_false
 } from "pacc";
 import {
   Base,
@@ -13,7 +12,8 @@ import {
   Endpoint,
   DomainNameEndpoint,
   HTTPEndpoint,
-  UnixEndpoint
+  UnixEndpoint,
+  addType
 } from "pmcf";
 import { asArray } from "./utils.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";

package/src/services/alpm.mjs

@@ -37,12 +37,4 @@ export class alpm extends Service {
   }
 
   repositories = new Map();
-
-  typeNamed(type, name) {
-    if (type === alpm.name) {
-      return this.repositories.get(name);
-    }
-
-    return super.typeNamed(type, name);
-  }
 }

package/src/subnet.mjs

@@ -6,14 +6,10 @@ import {
   familyIP,
   matchPrefixIP
 } from "ip-utilties";
-import {
-  string_attribute,
-  name_attribute,
-  number_attribute,
-  addType
-} from "pacc";
+import { string_attribute, name_attribute, number_attribute } from "pacc";
 import { networks_attribute } from "./network-support.mjs";
 import { Base } from "./base.mjs";
+import { addType } from "pmcf";
 
 export class Subnet extends Base {
   static name = "subnet";