pmcf 4.6.2 → 4.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.6.2",
+  "version": "4.7.0",
   "publishConfig": {
     "access": "public"
   },
@@ -60,7 +60,7 @@
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^25.0.8",
+    "@types/node": "^25.0.9",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -310,29 +310,35 @@ export class Base {
     return this.owner.addObject(object);
   }
 
-  *_allExtends(all) {
-    for (const e of this.extends) {
-      if (!all.has(e)) {
-        all.add(e);
-        yield e;
-        yield* e._allExtends(all);
-      }
-    }
+  *walkDirections(directions = ["this", "extends", "owner"]) {
+    yield* this._walkDirections(
+      directions,
+      directions.indexOf("this") >= 0,
+      new Set()
+    );
   }
 
-  *allExtends() {
-    yield* this._allExtends(new Set());
-  }
+  *_walkDirections(directions, withThis, seen) {
+    if (!seen.has(this)) {
+      seen.add(this);
 
-  *owners() {
-    if (this.owner) {
-      yield* this.owner.thisAndOwners();
-    }
-  }
+      if (withThis) {
+        yield this;
+      }
+      for (const direction of directions) {
+        const value = this[direction];
 
-  *thisAndOwners() {
-    yield this;
-    yield* this.owners();
+        if (value) {
+          if (value[Symbol.iterator]) {
+            for (const node of value) {
+              yield* node._walkDirections(directions, true, seen);
+            }
+          } else {
+            yield* value._walkDirections(directions, true, seen);
+          }
+        }
+      }
+    }
   }
 
   forOwner(owner) {
@@ -375,7 +381,7 @@ export class Base {
         }
       }
 
-      for (const e of this.allExtends()) {
+      for (const e of this.walkDirections(["extends"])) {
         yield* e._extendedPropertyIterator(propertyName, seen);
       }
     }
@@ -384,7 +390,7 @@ export class Base {
   _extendedProperty(propertyName, seen) {
     if (!seen.has(this)) {
       seen.add(this);
-      for (const e of this.allExtends()) {
+      for (const e of this.walkDirections(["extends"])) {
         const value =
           getAttribute(e, propertyName) ??
           e._extendedProperty(propertyName, seen);
@@ -581,15 +587,16 @@ export class Base {
       )
     ];
 
-    return [...this.allExtends(), this].map(e => {
-      const dir = join(e.directory, "content") + "/";
-      console.log("DIR", dir);
-
-      return transform(
-        new FileContentProvider(dir, entryProperties, directoryProperties),
+    return [...this.walkDirections(["this", "extends"])].map(e =>
+      transform(
+        new FileContentProvider(
+          { dir: join(e.directory, "content"), pattern: "**/*" },
+          entryProperties,
+          directoryProperties
+        ),
         transformers
-      );
-    });
+      )
+    );
   }
 
   get tags() {
@@ -616,14 +623,14 @@ export class Base {
     return this._properties;
   }
 
+  /**
+   *
+   * @param {string} name
+   * @returns {any}
+   */
   property(name) {
-    let value = this._properties?.[name];
-    if (value !== undefined) {
-      return value;
-    }
-
-    for (const o of this.owners()) {
-      const value = o.property(name);
+    for (const node of this.walkDirections(["this", "extends", "owner"])) {
+      const value = node._properties?.[name];
       if (value !== undefined) {
         return value;
       }

package/types/base.d.mts

@@ -60,10 +60,8 @@ export class Base {
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
-    _allExtends(all: any): Generator<any, void, any>;
-    allExtends(): Generator<any, void, any>;
-    owners(): any;
-    thisAndOwners(): any;
+    walkDirections(directions?: string[]): Generator<any, void, any>;
+    _walkDirections(directions: any, withThis: any, seen: any): Generator<any, void, any>;
     forOwner(owner: any): any;
     isNamed(name: any): boolean;
     relativeName(name: any): any;
@@ -129,7 +127,12 @@ export class Base {
     get isTemplate(): any;
     getGlobal(a: any): any;
     get properties(): any;
-    property(name: any): any;
+    /**
+     *
+     * @param {string} name
+     * @returns {any}
+     */
+    property(name: string): any;
     /**
      *
      * @param {any} object