pmcf 4.0.1 → 4.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "ip-utilties": "^2.0.2",
     "npm-pkgbuild": "^19.1.3",
-    "pacc": "^7.1.0",
+    "pacc": "^7.2.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -208,10 +208,8 @@ export class Base {
                   }
 
                   this.error(
-                    "Not found",
-                    name,
-                    attribute.type?.map && attribute.type.map(t => t.name),
-                    value
+                    `No such object "${value}" (${attribute.type.name}) for attribute ${name}`,
+                    this.root.named(value)?.toString()
                   );
                 });
               }
@@ -315,6 +313,17 @@ export class Base {
     return this.owner.addObject(object);
   }
 
+  *owners() {
+    if (this.owner) {
+      yield* this.owner.thisAndOwners();
+    }
+  }
+
+  *thisAndOwners() {
+    yield this;
+    yield* this.owners();
+  }
+
   forOwner(owner) {
     if (this.owner !== owner) {
       const newObject = Object.create(this);
@@ -550,27 +559,31 @@ export class Base {
     return this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
   }
 
-  get properties() {
-    return this._properties;
-  }
-
   get globals() {
     return Object.assign(
       {},
       this.properties,
-      this.owner?.properties,
-      this.owner?.owner?.properties,
-      this.owner?.owner?.owner?.properties,
+      ...[...this.owners()].map(o => o.properties),
       globals
     );
   }
 
+  get properties() {
+    return this._properties;
+  }
+
   property(name) {
-    return (
-      this._properties?.[name] ??
-      this.owner?.property(name) ??
-      this.owner?.owner?.property(name)
-    );
+    let value = this._properties?.[name];
+    if (value !== undefined) {
+      return value;
+    }
+
+    for (const o of this.owners()) {
+      const value = o.property(name);
+      if (value !== undefined) {
+        return value;
+      }
+    }
   }
 
   /**
@@ -684,7 +697,7 @@ export function extractFrom(
 
   const json = {};
 
-  do {
+  for (; typeDefinition; typeDefinition = typeDefinition.extends) {
     for (const [path, def] of attributeIterator(
       typeDefinition.attributes,
       filterPublic
@@ -739,8 +752,7 @@ export function extractFrom(
           json[name] = value;
       }
     }
-    typeDefinition = typeDefinition?.extends;
-  } while (typeDefinition);
+  }
 
   return json;
 }

package/src/network-interfaces/ethernet.mjs

@@ -31,7 +31,7 @@ export class EthernetNetworkInterface extends NetworkInterface {
   }
 
   static isCommonName(name) {
-    return name.match(/eth\d+$/);
+    return name.match(/^eth\d+$/);
   }
 
   get kind() {

package/src/network-interfaces/loopback.mjs

@@ -28,7 +28,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   }
 
   static isCommonName(name) {
-    return name.match(/lo\d*$/);
+    return name.match(/^lo\d*$/);
   }
 
   get kind() {

package/src/network-interfaces/wlan.mjs

@@ -1,6 +1,10 @@
 import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
-import { string_attribute_writable, secret_attribute, addType } from "pacc";
+import {
+  string_attribute_writable,
+  secret_attribute_writable,
+  addType
+} from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 import {
@@ -16,7 +20,7 @@ const WLANNetworkInterfaceTypeDefinition = {
   key: "name",
   attributes: {
     ssid: string_attribute_writable,
-    psk: { ...secret_attribute, writable: true },
+    psk: secret_attribute_writable,
     secretName: string_attribute_writable
   }
 };
@@ -31,7 +35,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
   }
 
   static isCommonName(name) {
-    return name.match(/wlan\d+$/);
+    return name.match(/^wlan\d+$/);
   }
 
   static get typeDefinition() {

package/src/owner.mjs

@@ -3,10 +3,10 @@ import {
   default_attribute_writable,
   string_collection_attribute_writable,
   string_attribute_writable,
+  boolean_attribute_writable_false,
   email_attribute,
   addType,
-  types,
-  boolean_attribute_writable_false
+  types
 } from "pacc";
 import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
@@ -147,6 +147,15 @@ export class Owner extends Base {
   }
 
   addObject(object) {
+    if (object.owner && object.owner !== this) {
+      this.addTypeObject(
+        object.typeName,
+        object.owner.name + "/" + object.name,
+        object
+      );
+
+      return;
+    }
     this.addTypeObject(object.typeName, object.name, object);
   }
 

package/src/service.mjs

@@ -119,6 +119,10 @@ export class Service extends Base {
     return this.host.subnets;
   }
 
+  get services() {
+    return [this];
+  }
+
   get serviceTypeEndpoints() {
     return serviceTypeEndpoints(ServiceTypes[this.type]);
   }

package/types/base.d.mts

@@ -62,6 +62,8 @@ export class Base {
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
+    owners(): any;
+    thisAndOwners(): any;
     forOwner(owner: any): any;
     isNamed(name: any): boolean;
     relativeName(name: any): any;
@@ -117,8 +119,8 @@ export class Base {
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): any;
-    get properties(): any;
     get globals(): any;
+    get properties(): any;
     property(name: any): any;
     /**
      *

package/types/network-interfaces/wlan.d.mts

@@ -1647,27 +1647,7 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
         key: string;
         attributes: {
             ssid: import("pacc").AttributeDefinition;
-            psk: {
-                writable: boolean;
-                type: object;
-                isKey: boolean;
-                mandatory: boolean;
-                collection: boolean;
-                private?: boolean;
-                credential?: boolean;
-                persistent?: boolean;
-                depends?: string;
-                description?: string;
-                default?: any;
-                set?: Function;
-                get?: Function;
-                toInternal?: Function;
-                toExternal?: Function;
-                values?: Set<any>;
-                externalName?: string;
-                env?: string[] | string;
-                additionalValues?: object;
-            };
+            psk: import("pacc").AttributeDefinition;
             secretName: import("pacc").AttributeDefinition;
         };
     };

package/types/service.d.mts

@@ -614,6 +614,7 @@ export class Service extends Base {
     get domainName(): string;
     get networks(): Set<any>;
     get subnets(): Set<any>;
+    get services(): this[];
     get serviceTypeEndpoints(): any;
     endpoints(filter: any): (UnixEndpoint | HTTPEndpoint | Endpoint | DomainNameEndpoint)[];
     endpoint(filter: any): UnixEndpoint | HTTPEndpoint | Endpoint | DomainNameEndpoint;