Skip to content

Commit

Permalink
fix(#135): filter was executed before it was loaded (#175)
Browse files Browse the repository at this point in the history
* fix(#135): filter was executed before it was loaded

* test: unit test enchancement
  • Loading branch information
ewfian authored Feb 4, 2022
1 parent 4d4d4bd commit 7bf600b
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 6 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const renderer = new Renderer(hexo);
renderer.disableNunjucks = Boolean(hexo.config.markdown.disableNunjucks);

function render(data, options) {
return renderer.parser.render(data.text);
return renderer.render(data, options);
}

hexo.extend.renderer.register('md', 'html', render, true);
Expand Down
7 changes: 6 additions & 1 deletion lib/renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class Renderer {
* @param {*} hexo context of hexo
*/
constructor(hexo) {
this.hexo = hexo;

let { markdown } = hexo.config;

Expand Down Expand Up @@ -44,7 +45,11 @@ class Renderer {
if (anchors) {
this.parser.use(require('./anchors'), anchors);
}
hexo.execFilterSync('markdown-it:renderer', this.parser, { context: this });
}

render(data, options) {
this.hexo.execFilterSync('markdown-it:renderer', this.parser, { context: this });
return this.parser.render(data.text);
}
}

Expand Down
44 changes: 40 additions & 4 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,21 +256,57 @@ describe('Hexo Renderer Markdown-it', () => {
it('default', () => {

const renderer = new Renderer(hexo);
const result = renderer.parser.render('[foo](javascript:bar)');
const result = renderer.render({ text: '[foo](javascript:bar)' });

result.should.equal('<p>[foo](javascript:bar)</p>\n');
});

it('enable unsafe link', () => {
hexo.extend.filter.register('markdown-it:renderer', md => {
const filter = md => {
md.validateLink = function() { return true; };
});
};
hexo.extend.filter.register('markdown-it:renderer', filter);

const renderer = new Renderer(hexo);
const result = renderer.parser.render('[foo](javascript:bar)');
const result = renderer.render({ text: '[foo](javascript:bar)' });

hexo.extend.filter.unregister('markdown-it:renderer', filter);

result.should.equal('<p><a href="javascript:bar">foo</a></p>\n');
});

it('should execute loaded scripts', async () => {
const renderer = new Renderer(hexo);

hexo.env.init = true;
await hexo.init();

const result = renderer.render({ text: '[foo](javascript:bar)' });

result.should.equal('<p><a href="javascript:bar">foo</a></p>\n');
});

it('should be called in render', () => {
const iterates = 3;
const spy = {
called: 0,
call() {
this.called++;
}
};

const filter = md => spy.call(md);
hexo.extend.filter.register('markdown-it:renderer', filter);

const renderer = new Renderer(hexo);
for (let i = 0; i < iterates; i++) {
renderer.render({ text: '' });
}

hexo.extend.filter.unregister('markdown-it:renderer', filter);

spy.called.should.equal(iterates);
});
});

describe('nunjucks', () => {
Expand Down
6 changes: 6 additions & 0 deletions test/scripts/enable_unsafe_link.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict';

// eslint-disable-next-line no-undef
hexo.extend.filter.register('markdown-it:renderer', md => {
md.validateLink = function() { return true; };
});

0 comments on commit 7bf600b

Please sign in to comment.