pmcf 3.19.7 → 3.19.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.19.7",
+  "version": "3.19.9",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "ip-utilties": "^2.0.2",
     "npm-pkgbuild": "^19.1.2",
-    "pacc": "^6.8.0",
+    "pacc": "^6.8.1",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -65,6 +65,11 @@ export class Base {
     return "**/" + this.typeFileName;
   }
 
+  /**
+   *
+   * @param {Base} owner
+   * @param {object} data
+   */
   constructor(owner, data) {
     this.owner = owner;
 
@@ -413,8 +418,14 @@ export class Base {
     return this.findService('type="smtp"');
   }
 
+  /**
+   *
+   * @param {string} expression
+   * @param {object} options
+   * @returns {any}
+   */
   expression(expression, options) {
-    return parse(expression, { root: this, globals, ...options });
+    return parse(expression, { root: this, globals: this.globals, ...options });
   }
 
   /**
@@ -495,22 +506,36 @@ export class Base {
     return this._properties;
   }
 
+  get globals() {
+    return Object.assign(
+      {},
+      this.properties,
+      this.owner?.properties,
+      this.owner?.owner?.properties,
+      this.owner?.owner?.owner?.properties,
+      globals
+    );
+  }
+
   property(name) {
-    return this._properties?.[name] ?? this.owner?.property(name);
+    return this._properties?.[name] ?? this.owner?.property(name) ?? this.owner?.owner?.property(name);
   }
 
+  /**
+   *
+   * @param {any} object
+   * @returns {any}
+   */
   expand(object) {
     if (this.isTemplate || object instanceof Base) {
       return object;
     }
 
-    const context = {
+    return expand(object, {
       stopClass: Base,
       root: this,
-      globals: Object.assign({}, this.properties, this.owner?.properties)
-    };
-
-    return expand(object, context);
+      globals: this.globals
+    });
   }
 
   finalize(action) {

package/types/base.d.mts

@@ -39,8 +39,13 @@ export class Base {
     static get typeDefinition(): typeof Base;
     static get typeFileName(): string;
     static get fileNameGlob(): string;
-    constructor(owner: any, data: any);
-    owner: any;
+    /**
+     *
+     * @param {Base} owner
+     * @param {object} data
+     */
+    constructor(owner: Base, data: object);
+    owner: Base;
     description: any;
     name: string;
     _tags: Set<any>;
@@ -79,19 +84,25 @@ export class Base {
     get priority(): any;
     _priority: any;
     get smtp(): any;
-    expression(expression: any, options: any): any;
+    /**
+     *
+     * @param {string} expression
+     * @param {object} options
+     * @returns {any}
+     */
+    expression(expression: string, options: object): any;
     /**
      *
      * @param {any} filter
      * @returns service with the highest priority
      */
     findService(filter: any): any;
-    findServices(filter: any): Generator<any, void, any>;
+    findServices(filter: any): any;
     set directory(directory: any);
     get directory(): any;
     get fullName(): any;
-    set packaging(value: Set<any>);
-    get packaging(): Set<any>;
+    set packaging(value: any);
+    get packaging(): any;
     get derivedPackaging(): any;
     get outputs(): Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
     preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
@@ -99,7 +110,13 @@ export class Base {
     get tags(): Set<any>;
     get isTemplate(): boolean;
     get properties(): any;
+    get globals(): any;
     property(name: any): any;
+    /**
+     *
+     * @param {any} object
+     * @returns {any}
+     */
     expand(object: any): any;
     finalize(action: any): void;
     execFinalize(): void;

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

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

package/types/owner.d.mts

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

package/types/services/bind.d.mts

@@ -1369,6 +1369,7 @@ export class BindService extends ExtraSourceService {
             };
         };
     };
+    constructor(owner: any, data: any);
     allowedUpdates: any[];
     recordTTL: string;
     hasSVRRecords: boolean;

package/types/services/chrony.d.mts

@@ -1205,6 +1205,7 @@ export class ChronyService extends ExtraSourceService {
             };
         };
     };
+    constructor(owner: any, data: any);
     _systemd: string;
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;

package/types/services/openldap.d.mts

@@ -729,6 +729,7 @@ export class OpenLDAPService extends Service {
             };
         };
     };
+    constructor(owner: any, data: any);
     _baseDN: any;
     _rootDN: any;
     _systemd: string;

package/types/subnet.d.mts

@@ -31,6 +31,7 @@ export class Subnet extends Base {
             family: import("pacc").AttributeDefinition;
         };
     };
+    constructor(owner: any, address: any);
     networks: Set<any>;
     prefix: any;
     prefixLength: any;