Skip to content

Commit

Permalink
update: refine tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
Koooooo-7 committed Jul 18, 2024
1 parent 90c0b02 commit 152d243
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 12 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.2",
"marked": "^12.0.2",
"marked": "^13.0.2",
"npm-run-all": "^4.1.5",
"postcss-cli": "^11.0.0",
"prettier": "^3.2.5",
Expand Down
3 changes: 2 additions & 1 deletion src/core/render/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ export class Compiler {
* @param {Number} level Type of heading (h<level> tag)
* @returns {String} Heading element
*/
origin.heading = renderer.heading = function (text, level) {
origin.heading = renderer.heading = function ({ tokens, depth: level }) {
const text = this.parser.parseInline(tokens);
let { str, config } = getAndRemoveConfig(text);
const nextToc = { level, title: str };

Expand Down
2 changes: 1 addition & 1 deletion src/core/render/compiler/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Prism from 'prismjs';
import 'prismjs/components/prism-markup-templating.js';

export const highlightCodeCompiler = ({ renderer }) =>
(renderer.code = function (code, lang = 'markup') {
(renderer.code = function ({ text: code, lang = 'markup' }) {
const langOrMarkup = Prism.languages[lang] || Prism.languages.markup;
const text = Prism.highlight(
code.replace(/@DOCSIFY_QM@/g, '`'),
Expand Down
2 changes: 1 addition & 1 deletion src/core/render/compiler/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getAndRemoveConfig } from '../utils.js';
import { isAbsolutePath, getPath, getParentPath } from '../../router/util.js';

export const imageCompiler = ({ renderer, contentBase, router }) =>
(renderer.image = (href, title, text) => {
(renderer.image = ({ href, title, text }) => {
let url = href;
const attrs = [];

Expand Down
3 changes: 2 additions & 1 deletion src/core/render/compiler/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ export const linkCompiler = ({
linkRel,
compilerClass,
}) =>
(renderer.link = (href, title = '', text) => {
(renderer.link = function ({ href, title = '', tokens }) {
const attrs = [];
const text = this.parser.parseInline(tokens) || '';
const { str, config } = getAndRemoveConfig(title);
linkTarget = config.target || linkTarget;
linkRel =
Expand Down
3 changes: 2 additions & 1 deletion src/core/render/compiler/paragraph.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { helper as helperTpl } from '../tpl.js';

export const paragraphCompiler = ({ renderer }) =>
(renderer.paragraph = text => {
(renderer.paragraph = function ({ tokens }) {
const text = this.parser.parseInline(tokens);
let result;
if (/^!&gt;/.test(text)) {
result = helperTpl('tip', text);
Expand Down
11 changes: 10 additions & 1 deletion src/core/render/compiler/taskList.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
export const taskListCompiler = ({ renderer }) =>
(renderer.list = (body, ordered, start) => {
(renderer.list = function (token) {
const ordered = token.ordered;
const start = token.start;

let body = '';
for (let j = 0; j < token.items.length; j++) {
const item = token.items[j];
body += this.listitem?.(item);
}

const isTaskList = /<li class="task-list-item">/.test(
body.split('class="task-list"')[0],
);
Expand Down
30 changes: 29 additions & 1 deletion src/core/render/compiler/taskListItem.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
export const taskListItemCompiler = ({ renderer }) =>
(renderer.listitem = text => {
(renderer.listitem = function (item) {
let text = '';
if (item.task) {
const checkbox = this.checkbox?.({ checked: !!item.checked });
if (item.loose) {
if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
if (
item.tokens[0].tokens &&
item.tokens[0].tokens.length > 0 &&
item.tokens[0].tokens[0].type === 'text'
) {
item.tokens[0].tokens[0].text =
checkbox + ' ' + item.tokens[0].tokens[0].text;
}
} else {
item.tokens.unshift({
type: 'text',
raw: checkbox + ' ',
text: checkbox + ' ',
});
}
} else {
text += checkbox + ' ';
}
}

text += this.parser?.parse(item.tokens, !!item.loose);

const isTaskItem = /^(<input.*type="checkbox"[^>]*>)/.test(text);
const html = isTaskItem
? /* html */ `<li class="task-list-item"><label>${text}</label></li>`
Expand Down

0 comments on commit 152d243

Please sign in to comment.