fix(tag): show source file in error message

hexojs · Aug 11, 2022 · fd882ab · fd882ab
1 parent 1ee76ce
commit fd882ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/extend/tag.js b/lib/extend/tag.js
@@ -160,15 +160,15 @@ const getContext = (lines, errLine, location, type) => {
  * @return {Error}    New error object with embedded context
  */
 const formatNunjucksError = (err, input, source = '') => {
-  err.stack = err.stack.replace('(unknown path)', source ? magenta(source) : '');
+  err.message = err.message.replace('(unknown path)', source ? magenta(source) : '');
 
   const match = err.message.match(/Line (\d+), Column \d+/);
   if (!match) return err;
   const errLine = parseInt(match[1], 10);
   if (isNaN(errLine)) return err;
 
   // trim useless info from Nunjucks Error
-  const splited = err.message.replace('(unknown path)', source ? magenta(source) : '').split('\n');
+  const splited = err.message.split('\n');
 
   const e = new Error();
   e.name = 'Nunjucks Error';
@@ -245,7 +245,9 @@ class Tag {
         options,
         cb
       );
-    }).catch(err => Promise.reject(formatNunjucksError(err, str, source)))
+    }).catch(err => {
+      return Promise.reject(formatNunjucksError(err, str, source));
+    })
       .asCallback(callback);
   }
 }

diff --git a/test/scripts/extend/tag_errors.js b/test/scripts/extend/tag_errors.js
@@ -142,8 +142,8 @@ describe('Tag Errors', () => {
     try {
       await tag.render(body, { source });
     } catch (err) {
-      err.should.have.property('stack');
-      err.stack.should.contains(source);
+      err.should.have.property('message');
+      err.message.should.contains(source);
     }
   });
 });