fix(escapeAllSwigTags): check tag completeness #5395

uiolee · 2024-01-14T07:44:05Z

What does it do?

fix #5301
fix hexojs/hexo-renderer-pandoc#60

Before escape tags, check if it contains a complete tag.
In others words, just escape complete tags.

Screenshots

Pull request tasks

Add test cases for the changes.
Passed the CI test.

github-actions · 2024-01-14T07:44:15Z

How to test

git clone -b escape https://github.com/uiolee/hexo.git
cd hexo
npm install
npm test

coveralls · 2024-01-14T07:45:10Z

Pull Request Test Coverage Report for Build 7554903652

0 of 0 changed or added relevant lines in 0 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage decreased (-0.02%) to 99.519%

Totals
Change from base Build 7499174786:	-0.02%
Covered Lines:	9099
Relevant Lines:	9143

💛 - Coveralls

github-actions · 2024-01-14T07:45:30Z

flamegraph

https://e0ff35f3f2a7e732fc5b345e0c7af15b02eed7ee-14-hexo.surge.sh/flamegraph.html
https://e0ff35f3f2a7e732fc5b345e0c7af15b02eed7ee-16-hexo.surge.sh/flamegraph.html
https://e0ff35f3f2a7e732fc5b345e0c7af15b02eed7ee-18-hexo.surge.sh/flamegraph.html

SukkaW · 2024-01-16T07:37:13Z

lib/hexo/post.ts

            state = STATE_SWIG_VAR;
            idx++;
-          } else if (next_char === '#') {
+          } else if (next_char === '#' && /\{#.+?#\}/.test(str)) {


With the change, we will run regexp.test again and again for every character inside str.

The .test should be hoist to the top of the function.

thanks, I have updated it

appotry · 2024-01-21T13:29:58Z

7.1 没有完全修复，解析下面代码会报错。7.0 反而解析正常。

Version 7.1 is not fully fixed; parsing the following code will result in an error. Surprisingly, parsing is normal in version 7.0

{% valkyrurl
[url=/posts/f4926c88/]
[title="RSS的使用与Tiny Tiny RSS Selfhost自建"]
[avatar=/medias_webp/cover/rss.webp]
[desc="RSS是一种消息来源的格式规范，网站可以按照这种格式规范提供文章的标题、摘要、全文等信息给订阅用户，用户可以通过订阅不同网站 RSS 链接的方式将不同的信息源进行聚合，在一个工具里阅读这些内容"]
%}

err log

13:09:23.020 FATAL Something's wrong. Maybe you can find the solution here: https://hexo.io/docs/troubleshooting.html
Template render error: (unknown path)
  TypeError: Cannot read properties of null (reading '1')
    at Object._prettifyError (/app/node_modules/nunjucks/src/lib.js:32:11)
    at /app/node_modules/nunjucks/src/environment.js:464:19
    at eval (eval at _compile (/app/node_modules/nunjucks/src/environment.js:527:18), <anonymous>:11:11)
    at tryCatcher (/app/node_modules/bluebird/js/release/util.js:16:23)
    at Promise._settlePromiseFromHandler (/app/node_modules/bluebird/js/release/promise.js:547:31)
    at Promise._settlePromise (/app/node_modules/bluebird/js/release/promise.js:604:18)
    at Promise._settlePromiseCtx (/app/node_modules/bluebird/js/release/promise.js:641:10)
    at _drainQueueStep (/app/node_modules/bluebird/js/release/async.js:97:12)
    at _drainQueue (/app/node_modules/bluebird/js/release/async.js:86:9)
    at Async._drainQueues (/app/node_modules/bluebird/js/release/async.js:102:5)
    at Async.drainQueues (/app/node_modules/bluebird/js/release/async.js:15:14)
    at process.processImmediate (node:internal/timers:478:21)

appotry · 2024-01-21T13:33:19Z

7.1版本不止上面这一个tag 报错，7.0反而正常

D-Sketon · 2024-01-21T13:33:28Z

7.1 没有完全修复，解析下面代码会报错。7.0 反而解析正常。

Version 7.1 is not fully fixed; parsing the following code will result in an error. Surprisingly, parsing is normal in version 7.0

{% valkyrurl
[url=/posts/f4926c88/]
[title="RSS的使用与Tiny Tiny RSS Selfhost自建"]
[avatar=/medias_webp/cover/rss.webp]
[desc="RSS是一种消息来源的格式规范，网站可以按照这种格式规范提供文章的标题、摘要、全文等信息给订阅用户，用户可以通过订阅不同网站 RSS 链接的方式将不同的信息源进行聚合，在一个工具里阅读这些内容"]
%}

err log

13:09:23.020 FATAL Something's wrong. Maybe you can find the solution here: https://hexo.io/docs/troubleshooting.html
Template render error: (unknown path)
  TypeError: Cannot read properties of null (reading '1')
    at Object._prettifyError (/app/node_modules/nunjucks/src/lib.js:32:11)
    at /app/node_modules/nunjucks/src/environment.js:464:19
    at eval (eval at _compile (/app/node_modules/nunjucks/src/environment.js:527:18), <anonymous>:11:11)
    at tryCatcher (/app/node_modules/bluebird/js/release/util.js:16:23)
    at Promise._settlePromiseFromHandler (/app/node_modules/bluebird/js/release/promise.js:547:31)
    at Promise._settlePromise (/app/node_modules/bluebird/js/release/promise.js:604:18)
    at Promise._settlePromiseCtx (/app/node_modules/bluebird/js/release/promise.js:641:10)
    at _drainQueueStep (/app/node_modules/bluebird/js/release/async.js:97:12)
    at _drainQueue (/app/node_modules/bluebird/js/release/async.js:86:9)
    at Async._drainQueues (/app/node_modules/bluebird/js/release/async.js:102:5)
    at Async.drainQueues (/app/node_modules/bluebird/js/release/async.js:15:14)
    at process.processImmediate (node:internal/timers:478:21)

见 #5401，和换行有关

appotry · 2024-01-21T13:39:10Z

7.1 没有完全修复，解析下面代码会报错。7.0 反而解析正常。
Version 7.1 is not fully fixed; parsing the following code will result in an error. Surprisingly, parsing is normal in version 7.0

{% valkyrurl
[url=/posts/f4926c88/]
[title="RSS的使用与Tiny Tiny RSS Selfhost自建"]
[avatar=/medias_webp/cover/rss.webp]
[desc="RSS是一种消息来源的格式规范，网站可以按照这种格式规范提供文章的标题、摘要、全文等信息给订阅用户，用户可以通过订阅不同网站 RSS 链接的方式将不同的信息源进行聚合，在一个工具里阅读这些内容"]
%}

err log

13:09:23.020 FATAL Something's wrong. Maybe you can find the solution here: https://hexo.io/docs/troubleshooting.html
Template render error: (unknown path)
  TypeError: Cannot read properties of null (reading '1')
    at Object._prettifyError (/app/node_modules/nunjucks/src/lib.js:32:11)
    at /app/node_modules/nunjucks/src/environment.js:464:19
    at eval (eval at _compile (/app/node_modules/nunjucks/src/environment.js:527:18), <anonymous>:11:11)
    at tryCatcher (/app/node_modules/bluebird/js/release/util.js:16:23)
    at Promise._settlePromiseFromHandler (/app/node_modules/bluebird/js/release/promise.js:547:31)
    at Promise._settlePromise (/app/node_modules/bluebird/js/release/promise.js:604:18)
    at Promise._settlePromiseCtx (/app/node_modules/bluebird/js/release/promise.js:641:10)
    at _drainQueueStep (/app/node_modules/bluebird/js/release/async.js:97:12)
    at _drainQueue (/app/node_modules/bluebird/js/release/async.js:86:9)
    at Async._drainQueues (/app/node_modules/bluebird/js/release/async.js:102:5)
    at Async.drainQueues (/app/node_modules/bluebird/js/release/async.js:15:14)
    at process.processImmediate (node:internal/timers:478:21)

见 #5401，和换行有关

那个issue看过，找到这里来的

文章太多，不可能一个个tag修改过去，只能先降级到7.0版本使用了。等待后面修复

uiolee added 2 commits January 14, 2024 15:01

fix: check tag completeness

dfe0d03

test(escapeTag): dont drop uncomplete tags

8fd34c9

uiolee requested a review from SukkaW January 14, 2024 07:48

SukkaW requested changes Jan 16, 2024

View reviewed changes

early return

5dd70e8

uiolee requested a review from SukkaW January 17, 2024 11:53

SukkaW approved these changes Jan 18, 2024

View reviewed changes

uiolee merged commit c1c5aaa into hexojs:master Jan 18, 2024
20 of 22 checks passed

D-Sketon mentioned this pull request Jan 20, 2024

Has the parsing of tags changed in Hexo v7.1.0? #5401

Closed

5 tasks

uiolee mentioned this pull request Nov 3, 2024

Curly brackets parse error? #5571

Open

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(escapeAllSwigTags): check tag completeness #5395

fix(escapeAllSwigTags): check tag completeness #5395

uiolee commented Jan 14, 2024 •

edited

Loading

github-actions bot commented Jan 14, 2024

coveralls commented Jan 14, 2024 •

edited

Loading

github-actions bot commented Jan 14, 2024 •

edited

Loading

SukkaW Jan 16, 2024

uiolee Jan 17, 2024

appotry commented Jan 21, 2024

appotry commented Jan 21, 2024

D-Sketon commented Jan 21, 2024 •

edited

Loading

appotry commented Jan 21, 2024

fix(escapeAllSwigTags): check tag completeness #5395

fix(escapeAllSwigTags): check tag completeness #5395

Conversation

uiolee commented Jan 14, 2024 • edited Loading

What does it do?

Screenshots

Pull request tasks

github-actions bot commented Jan 14, 2024

How to test

coveralls commented Jan 14, 2024 • edited Loading

Pull Request Test Coverage Report for Build 7554903652

💛 - Coveralls

github-actions bot commented Jan 14, 2024 • edited Loading

flamegraph

SukkaW Jan 16, 2024

Choose a reason for hiding this comment

uiolee Jan 17, 2024

Choose a reason for hiding this comment

appotry commented Jan 21, 2024

appotry commented Jan 21, 2024

D-Sketon commented Jan 21, 2024 • edited Loading

appotry commented Jan 21, 2024

uiolee commented Jan 14, 2024 •

edited

Loading

coveralls commented Jan 14, 2024 •

edited

Loading

github-actions bot commented Jan 14, 2024 •

edited

Loading

D-Sketon commented Jan 21, 2024 •

edited

Loading