pmcf 4.18.13 → 4.19.0

package/README.md

@@ -89,22 +89,20 @@ generates config packages for:
 *   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-17)
 *   [isTemplate](#istemplate)
-*   [services](#services)
-    *   [Parameters](#parameters-18)
 *   [named](#named)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-21)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-23)
+    *   [Parameters](#parameters-22)
 *   [asArray](#asarray)
-    *   [Parameters](#parameters-24)
+    *   [Parameters](#parameters-23)
 *   [asIterator](#asiterator)
-    *   [Parameters](#parameters-25)
+    *   [Parameters](#parameters-24)
 
 ## Base
 
@@ -326,12 +324,6 @@ Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Gl
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
 
-## services
-
-### Parameters
-
-*   `service` **Service** 
-
 ## named
 
 ### Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.18.13",
+  "version": "4.19.0",
   "publishConfig": {
     "access": "public"
   },
@@ -56,7 +56,7 @@
     "content-entry-transform": "^1.6.4",
     "ip-utilties": "^3.0.0",
     "npm-pkgbuild": "^20.6.2",
-    "pacc": "^8.11.2",
+    "pacc": "^9.0.0",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -510,7 +510,7 @@ export class Base {
   expression(expression, options) {
     return parse(expression, {
       root: this,
-      getGlobal: x => this.getGlobal(x),
+      valueFor: (name, at) => this.valueFor(name, at),
       ...options
     });
   }
@@ -594,7 +594,7 @@ export class Base {
         expression =>
           parse(expression, {
             root: this,
-            getGlobal: id => this.getGlobal(id)
+            valueFor: (name, at) => this.valueFor(name, at)
           })
       )
     ];
@@ -641,8 +641,12 @@ export class Base {
     return this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
   }
 
-  getGlobal(a) {
-    return globals[a] ?? this.extendedAttribute(a) ?? this.property(a);
+  valueFor(name, at) {
+    if (at !== undefined) {
+      return this.extendedAttribute(name) ?? this.property(name);
+    }
+
+    return globals[name];
   }
 
   get properties() {
@@ -676,7 +680,7 @@ export class Base {
     return expand(object, {
       stopClass: Base,
       root: this,
-      getGlobal: name => this.getGlobal(name)
+      valueFor: (name, at) => this.valueFor(name, at)
     });
   }
 

package/src/extra-source-service.mjs

@@ -17,7 +17,7 @@ export const ExtraSourceServiceTypeDefinition = {
 };
 
 export class ExtraSourceService extends Service {
-  _source = [];
+  source = [];
 
   static {
     addType(this);
@@ -31,14 +31,6 @@ export class ExtraSourceService extends Service {
     return ExtraSourceServiceTypeDefinition.name;
   }
 
-  set source(value) {
-    this._source.push(value);
-  }
-
-  get source() {
-    return this._source;
-  }
-
   *findServices(filter) {
     yield* this.owner.owner.findServices(filter);
 

package/src/owner.mjs

@@ -159,6 +159,11 @@ export class Owner extends Base {
     this.addTypeObject(object.typeName, object.name, object);
   }
 
+  get services()
+  {
+    return [...this.hosts].map(host=>host.services).flat();
+  }
+
   *findServices(filter) {
     for (const host of this.hosts) {
       yield* host.findServices(filter);

package/src/service-owner.mjs

@@ -1,38 +1,27 @@
 import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
-  _services = [];
-
-  get services() {
-    return this._services;
-  }
-
-  /**
-   * @param {Service} service
-   */
-  set services(service) {
-    this._services.push(service);
-  }
+  services = [];
 
   _applyExtends(owner) {
     super._applyExtends(owner);
 
     for (const service of owner.services) {
-      const present = this._services.find(s => s.name === service.name);
+      const present = this.services.find(s => s.name === service.name);
 
       if (present && service.isTemplate) {
         if (present.extends.indexOf(service) < 0) {
           present.extends.push(service);
         }
       } else {
-        this.services = service.forOwner(this);
+        this.services.push(service.forOwner(this));
       }
     }
   }
 
   _traverse(...args) {
     if (super._traverse(...args)) {
-      for (const service of this._services) {
+      for (const service of this.services) {
         service._traverse(...args);
       }
 
@@ -71,6 +60,6 @@ export class ServiceOwner extends Base {
    * @returns {Service|undefined}
    */
   named(name) {
-    return this._services.find(s => s.name === name);
+    return this.services.find(s => s.name === name);
   }
 }

package/types/base.d.mts

@@ -153,7 +153,7 @@ export class Base {
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): any;
-    getGlobal(a: any): any;
+    valueFor(name: any, at: any): any;
     get properties(): any;
     /**
      *

package/types/extra-source-service.d.mts

@@ -1025,10 +1025,8 @@ export class ExtraSourceService extends Service {
             };
         };
     };
-    _source: any[];
+    source: any[];
     get type(): string;
-    set source(value: any[]);
-    get source(): any[];
     findServices(filter: any): Generator<any, void, any>;
 }
 import { ServiceTypeDefinition } from "./service.mjs";

package/types/owner.d.mts

@@ -190,6 +190,7 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     addTypeObject(typeName: any, name: any, object: any): void;
     addObject(object: any): void;
+    get services(): any[];
     findServices(filter: any): Generator<any, void, any>;
     locationNamed(name: any): any;
     get locations(): any;

package/types/service-owner.d.mts

@@ -1,10 +1,5 @@
 export class ServiceOwner extends Base {
-    _services: any[];
-    /**
-     * @param {Service} service
-     */
-    set services(service: Service);
-    get services(): Service;
+    services: any[];
     _applyExtends(owner: any): void;
     _traverse(...args: any[]): boolean;
     findServices(filter: any): Generator<any, void, unknown>;