HidemaruOwO/micromark-extension-directive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to properly parse character references

Browse source
This commit is contained in:
Titus Wormer 2021-09-19 16:47:58 +02:00
parent 9029e1ccc0
commit 063e6651ad
No known key found for this signature in database
GPG key ID: E6E581152ED04E2E
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dev/lib/html.js
View file

@ -22,7 +22,7 @@
*/ */
import assert from 'assert' import assert from 'assert'
import {decodeEntity} from 'parse-entities/decode-entity.js' import {parseEntities} from 'parse-entities'
const own = {}.hasOwnProperty const own = {}.hasOwnProperty
@ -131,7 +131,7 @@ export function directiveHtml(options = {}) {
/** @type {Attribute[]} */ /** @type {Attribute[]} */
// @ts-expect-error // @ts-expect-error
const attributes = this.getData('directiveAttributes') const attributes = this.getData('directiveAttributes')
attributes.push(['id', decodeLight(this.sliceSerialize(token))]) attributes.push(['id', parseEntities(this.sliceSerialize(token))])
} }
/** @type {_Handle} */ /** @type {_Handle} */
@ -140,7 +140,7 @@ export function directiveHtml(options = {}) {
// @ts-expect-error // @ts-expect-error
const attributes = this.getData('directiveAttributes') const attributes = this.getData('directiveAttributes')
attributes.push(['class', decodeLight(this.sliceSerialize(token))]) attributes.push(['class', parseEntities(this.sliceSerialize(token))])
} }
/** @type {_Handle} */ /** @type {_Handle} */
@ -159,7 +159,7 @@ export function directiveHtml(options = {}) {
/** @type {Attribute[]} */ /** @type {Attribute[]} */
// @ts-expect-error // @ts-expect-error
const attributes = this.getData('directiveAttributes') const attributes = this.getData('directiveAttributes')
attributes[attributes.length - 1][1] = decodeLight( attributes[attributes.length - 1][1] = parseEntities(
this.sliceSerialize(token) this.sliceSerialize(token)
) )
} }
@ -240,23 +240,3 @@ export function directiveHtml(options = {}) {
} }
} }
} }
/**
* @param {string} value
* @returns {string}
*/
function decodeLight(value) {
return value.replace(
/&(#(\d{1,7}|x[\da-f]{1,6})|[\da-z]{1,31});/gi,
decodeIfPossible
)
}
/**
* @param {string} $0
* @param {string} $1
* @returns {string}
*/
function decodeIfPossible($0, $1) {
return decodeEntity($1) || $0
}