use better solution

hexojs · Oct 22, 2023 · 919132a · 919132a
1 parent 0af0983
commit 919132a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/lib/permalink.ts b/lib/permalink.ts
@@ -51,7 +51,8 @@ class Permalink {
 
   stringify(data) {
     return this.rule.replace(rParam, (match, name) => {
-      if (['permalink', 'path'].includes(name)) {
+      const descriptor = Object.getOwnPropertyDescriptor(data, name);
+      if (descriptor && typeof descriptor.get === 'function') {
         throw new Error('Invalid permalink setting!');
       }
       return data[name];

diff --git a/test/permalink.spec.js b/test/permalink.spec.js
@@ -78,9 +78,18 @@ describe('Permalink', () => {
   });
 
   it('stringify() - avoid infinite loops', () => {
-    permalink = new Permalink('/:permalink');
-    (() => permalink.stringify({})).should.throw('Invalid permalink setting!');
-    permalink = new Permalink('/:path');
-    (() => permalink.stringify({})).should.throw('Invalid permalink setting!');
+    const post = {
+      get path() {
+        return this.permalink;
+      },
+
+      get permalink() {
+        const permalink = new Permalink('/:permalink');
+        return permalink.stringify(post);
+      }
+    };
+
+    (() => post.path).should.throw('Invalid permalink setting!');
+    (() => post.permalink).should.throw('Invalid permalink setting!');
   });
 });