Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/less/lib/less/functions/string.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ export default {
return new Quoted('"', str instanceof JavaScript ? str.evaluated : str.value, true);
},
escape: function (str) {
return new Anonymous(
encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B')
.replace(/\(/g, '%28').replace(/\)/g, '%29'));
const escapedValue = encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B')
.replace(/\(/g, '%28').replace(/\)/g, '%29');
const escaped = new Anonymous(escapedValue);
// Percent escapes are literal CSS, not Less source.
escaped._preventReparse = escapedValue.includes('%');
return escaped;
},
replace: function (string, pattern, replacement, flags) {
let result = string.value;
Expand Down
6 changes: 5 additions & 1 deletion packages/less/lib/less/tree/anonymous.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ class Anonymous extends Node {
this._fileInfo = currentFileInfo;
this.mapLines = mapLines;
this.rulesetLike = (typeof rulesetLike === 'undefined') ? false : rulesetLike;
/** @type {boolean} */
this._preventReparse = false;
this.allowRoot = true;
this.copyVisibilityInfo(visibilityInfo);
}

/** @returns {Anonymous} */
eval() {
return new Anonymous(/** @type {string | null} */ (this.value), this._index, this._fileInfo, this.mapLines, this.rulesetLike, this.visibilityInfo());
const anonymous = new Anonymous(/** @type {string | null} */ (this.value), this._index, this._fileInfo, this.mapLines, this.rulesetLike, this.visibilityInfo());
anonymous._preventReparse = this._preventReparse;
return anonymous;
}

/**
Expand Down
4 changes: 3 additions & 1 deletion packages/less/lib/less/tree/ruleset.js
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,9 @@ class Ruleset extends Node {
const self = this;
/** @param {Declaration} decl */
function transformDeclaration(decl) {
if (decl.value instanceof Anonymous && !/** @type {Declaration & { parsed?: boolean }} */ (decl).parsed) {
if (decl.value instanceof Anonymous &&
!decl.value._preventReparse &&
!/** @type {Declaration & { parsed?: boolean }} */ (decl).parsed) {
if (typeof decl.value.value === 'string') {
new (/** @type {new (...args: [EvalContext, object, FileInfo, number]) => { parseNode: Function }} */ (/** @type {unknown} */ (Parser)))(/** @type {{ context: EvalContext, importManager: object }} */ (/** @type {Ruleset} */ (this).parse).context, /** @type {{ context: EvalContext, importManager: object }} */ (/** @type {Ruleset} */ (this).parse).importManager, decl.fileInfo(), decl.value.getIndex()).parseNode(
decl.value.value,
Expand Down
2 changes: 2 additions & 0 deletions packages/test-data/tests-unit/functions/functions.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
}
#built-in {
escaped: -Some::weird(#thing, y);
escaped-direct: a%20b%28c%29%3Dd%3Ae%23f%3Bg;
escaped-svg-literal: url("data:image/svg+xml,%3Csvg%20fill%3D%22red%22%3E%3C/svg%3E");
lighten: #ffcccc;
lighten-relative: #ff6666;
darken: #330000;
Expand Down
3 changes: 3 additions & 0 deletions packages/test-data/tests-unit/functions/functions.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

#built-in {
@r: 32;
@escaped-svg-literal: escape('<svg fill="red"></svg>');
escaped: e("-Some::weird(#thing, y)");
escaped-direct: escape('a b(c)=d:e#f;g');
escaped-svg-literal: url("data:image/svg+xml,@{escaped-svg-literal}");
lighten: lighten(#ff0000, 40%);
lighten-relative: lighten(#ff0000, 40%, relative);
darken: darken(#ff0000, 40%);
Expand Down
Loading