mirror of
https://github.com/S2-/minifyfromhtml.git
synced 2025-08-03 12:20:04 +02:00
update packages to latest version
This commit is contained in:
371
node_modules/clean-css/lib/tokenizer/tokenize.js
generated
vendored
371
node_modules/clean-css/lib/tokenizer/tokenize.js
generated
vendored
@@ -28,8 +28,8 @@ var BLOCK_RULES = [
|
||||
'@supports'
|
||||
];
|
||||
|
||||
var IGNORE_END_COMMENT_PATTERN = /\/\* clean\-css ignore:end \*\/$/;
|
||||
var IGNORE_START_COMMENT_PATTERN = /^\/\* clean\-css ignore:start \*\//;
|
||||
var IGNORE_END_COMMENT_PATTERN = /\/\* clean-css ignore:end \*\/$/;
|
||||
var IGNORE_START_COMMENT_PATTERN = /^\/\* clean-css ignore:start \*\//;
|
||||
|
||||
var PAGE_MARGIN_BOXES = [
|
||||
'@bottom-center',
|
||||
@@ -60,8 +60,8 @@ var EXTRA_PAGE_BOXES = [
|
||||
];
|
||||
|
||||
var REPEAT_PATTERN = /^\[\s{0,31}\d+\s{0,31}\]$/;
|
||||
var RULE_WORD_SEPARATOR_PATTERN = /[\s\(]/;
|
||||
var TAIL_BROKEN_VALUE_PATTERN = /[\s|\}]*$/;
|
||||
var TAIL_BROKEN_VALUE_PATTERN = /([^}])\}*$/;
|
||||
var RULE_WORD_SEPARATOR_PATTERN = /[\s(]/;
|
||||
|
||||
function tokenize(source, externalContext) {
|
||||
var internalContext = {
|
||||
@@ -107,6 +107,8 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
var isEscaped;
|
||||
var wasEscaped = false;
|
||||
var characterWithNoSpecialMeaning;
|
||||
var isPreviousDash = false;
|
||||
var isVariable = false;
|
||||
var isRaw = false;
|
||||
var seekingValue = false;
|
||||
var seekingPropertyBlockClosing = false;
|
||||
@@ -119,17 +121,25 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
isQuoted = level == Level.SINGLE_QUOTE || level == Level.DOUBLE_QUOTE;
|
||||
isSpace = character == Marker.SPACE || character == Marker.TAB;
|
||||
isNewLineNix = character == Marker.NEW_LINE_NIX;
|
||||
isNewLineWin = character == Marker.NEW_LINE_NIX && source[position.index - 1] == Marker.CARRIAGE_RETURN;
|
||||
isCarriageReturn = character == Marker.CARRIAGE_RETURN && source[position.index + 1] && source[position.index + 1] != Marker.NEW_LINE_NIX;
|
||||
isCommentStart = !wasCommentEnd && level != Level.COMMENT && !isQuoted && character == Marker.ASTERISK && source[position.index - 1] == Marker.FORWARD_SLASH;
|
||||
isCommentEndMarker = !wasCommentStart && !isQuoted && character == Marker.FORWARD_SLASH && source[position.index - 1] == Marker.ASTERISK;
|
||||
isNewLineWin = character == Marker.NEW_LINE_NIX
|
||||
&& source[position.index - 1] == Marker.CARRIAGE_RETURN;
|
||||
isCarriageReturn = character == Marker.CARRIAGE_RETURN
|
||||
&& source[position.index + 1] && source[position.index + 1] != Marker.NEW_LINE_NIX;
|
||||
isCommentStart = !wasCommentEnd
|
||||
&& level != Level.COMMENT && !isQuoted
|
||||
&& character == Marker.ASTERISK && source[position.index - 1] == Marker.FORWARD_SLASH;
|
||||
isCommentEndMarker = !wasCommentStart
|
||||
&& !isQuoted && character == Marker.FORWARD_SLASH
|
||||
&& source[position.index - 1] == Marker.ASTERISK;
|
||||
isCommentEnd = level == Level.COMMENT && isCommentEndMarker;
|
||||
characterWithNoSpecialMeaning = !isSpace && !isCarriageReturn && (character >= 'A' && character <= 'Z' || character >= 'a' && character <= 'z' || character >= '0' && character <= '9' || character == '-');
|
||||
isVariable = isVariable || (level != Level.COMMENT && !seekingValue && isPreviousDash && character === '-');
|
||||
isPreviousDash = character === '-';
|
||||
roundBracketLevel = Math.max(roundBracketLevel, 0);
|
||||
|
||||
metadata = isBufferEmpty ?
|
||||
[position.line, position.column, position.source] :
|
||||
metadata;
|
||||
metadata = isBufferEmpty
|
||||
? [position.line, position.column, position.source]
|
||||
: metadata;
|
||||
|
||||
if (isEscaped) {
|
||||
// previous character was a backslash
|
||||
@@ -150,6 +160,15 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
} else if (!isCommentStart && !isCommentEnd && isRaw) {
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
} else if (isCommentStart
|
||||
&& isVariable
|
||||
&& (level == Level.BLOCK || level == Level.RULE) && buffer.length > 1) {
|
||||
// comment start within a variable, e.g. var(/*<--
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
|
||||
levels.push(level);
|
||||
level = Level.COMMENT;
|
||||
} else if (isCommentStart && (level == Level.BLOCK || level == Level.RULE) && buffer.length > 1) {
|
||||
// comment start within block preceded by some content, e.g. div/*<--
|
||||
metadatas.push(metadata);
|
||||
@@ -168,10 +187,18 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
level = Level.COMMENT;
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
} else if (isCommentEnd && isVariable) {
|
||||
// comment end within a variable, e.g. var(/*!*/<--
|
||||
buffer.push(character);
|
||||
level = levels.pop();
|
||||
} else if (isCommentEnd && isIgnoreStartComment(buffer)) {
|
||||
// ignore:start comment end, e.g. /* clean-css ignore:start */<--
|
||||
serializedBuffer = buffer.join('').trim() + character;
|
||||
lastToken = [Token.COMMENT, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]];
|
||||
lastToken = [
|
||||
Token.COMMENT,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
];
|
||||
newTokens.push(lastToken);
|
||||
|
||||
isRaw = true;
|
||||
@@ -184,12 +211,20 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
lastCommentStartAt = serializedBuffer.lastIndexOf(Marker.FORWARD_SLASH + Marker.ASTERISK);
|
||||
|
||||
serializedBufferPart = serializedBuffer.substring(0, lastCommentStartAt);
|
||||
lastToken = [Token.RAW, serializedBufferPart, [originalMetadata(metadata, serializedBufferPart, externalContext)]];
|
||||
lastToken = [
|
||||
Token.RAW,
|
||||
serializedBufferPart,
|
||||
[originalMetadata(metadata, serializedBufferPart, externalContext)]
|
||||
];
|
||||
newTokens.push(lastToken);
|
||||
|
||||
serializedBufferPart = serializedBuffer.substring(lastCommentStartAt);
|
||||
metadata = [position.line, position.column - serializedBufferPart.length + 1, position.source];
|
||||
lastToken = [Token.COMMENT, serializedBufferPart, [originalMetadata(metadata, serializedBufferPart, externalContext)]];
|
||||
lastToken = [
|
||||
Token.COMMENT,
|
||||
serializedBufferPart,
|
||||
[originalMetadata(metadata, serializedBufferPart, externalContext)]
|
||||
];
|
||||
newTokens.push(lastToken);
|
||||
|
||||
isRaw = false;
|
||||
@@ -200,7 +235,11 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
} else if (isCommentEnd) {
|
||||
// comment end, e.g. /* comment */<--
|
||||
serializedBuffer = buffer.join('').trim() + character;
|
||||
lastToken = [Token.COMMENT, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]];
|
||||
lastToken = [
|
||||
Token.COMMENT,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
];
|
||||
newTokens.push(lastToken);
|
||||
|
||||
level = levels.pop();
|
||||
@@ -233,17 +272,24 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
level = levels.pop();
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
} else if (!isCommentStart && !isCommentEnd && character != Marker.CLOSE_ROUND_BRACKET && character != Marker.OPEN_ROUND_BRACKET && level != Level.COMMENT && !isQuoted && roundBracketLevel > 0) {
|
||||
} else if (character != Marker.CLOSE_ROUND_BRACKET
|
||||
&& character != Marker.OPEN_ROUND_BRACKET
|
||||
&& level != Level.COMMENT && !isQuoted && roundBracketLevel > 0) {
|
||||
// character inside any function, e.g. hsla(.<--
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
} else if (character == Marker.OPEN_ROUND_BRACKET && !isQuoted && level != Level.COMMENT && !seekingValue) {
|
||||
} else if (character == Marker.OPEN_ROUND_BRACKET
|
||||
&& !isQuoted && level != Level.COMMENT
|
||||
&& !seekingValue) {
|
||||
// round open bracket, e.g. @import url(<--
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
|
||||
roundBracketLevel++;
|
||||
} else if (character == Marker.CLOSE_ROUND_BRACKET && !isQuoted && level != Level.COMMENT && !seekingValue) {
|
||||
} else if (character == Marker.CLOSE_ROUND_BRACKET
|
||||
&& !isQuoted
|
||||
&& level != Level.COMMENT
|
||||
&& !seekingValue) {
|
||||
// round open bracket, e.g. @import url(test.css)<--
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
@@ -252,14 +298,22 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
} else if (character == Marker.SEMICOLON && level == Level.BLOCK && buffer[0] == Marker.AT) {
|
||||
// semicolon ending rule at block level, e.g. @import '...';<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
allTokens.push([Token.AT_RULE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
allTokens.push([
|
||||
Token.AT_RULE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.COMMA && level == Level.BLOCK && ruleToken) {
|
||||
// comma separator at block level, e.g. a,div,<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleToken[1].push([tokenScopeFrom(ruleToken[0]), serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext, ruleToken[1].length)]]);
|
||||
ruleToken[1].push([
|
||||
tokenScopeFrom(ruleToken[0]),
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext, ruleToken[1].length)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
@@ -272,14 +326,25 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
// comma separator at block level, e.g. a,<--
|
||||
ruleToken = [tokenTypeFrom(buffer), [], []];
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleToken[1].push([tokenScopeFrom(ruleToken[0]), serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext, 0)]]);
|
||||
ruleToken[1].push([
|
||||
tokenScopeFrom(ruleToken[0]),
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext, 0)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.OPEN_CURLY_BRACKET && level == Level.BLOCK && ruleToken && ruleToken[0] == Token.NESTED_BLOCK) {
|
||||
} else if (character == Marker.OPEN_CURLY_BRACKET
|
||||
&& level == Level.BLOCK
|
||||
&& ruleToken
|
||||
&& ruleToken[0] == Token.NESTED_BLOCK) {
|
||||
// open brace opening at-rule at block level, e.g. @media{<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleToken[1].push([Token.NESTED_BLOCK_SCOPE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
ruleToken[1].push([
|
||||
Token.NESTED_BLOCK_SCOPE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
allTokens.push(ruleToken);
|
||||
|
||||
levels.push(level);
|
||||
@@ -290,11 +355,17 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
|
||||
ruleToken[2] = intoTokens(source, externalContext, internalContext, true);
|
||||
ruleToken = null;
|
||||
} else if (character == Marker.OPEN_CURLY_BRACKET && level == Level.BLOCK && tokenTypeFrom(buffer) == Token.NESTED_BLOCK) {
|
||||
} else if (character == Marker.OPEN_CURLY_BRACKET
|
||||
&& level == Level.BLOCK
|
||||
&& tokenTypeFrom(buffer) == Token.NESTED_BLOCK) {
|
||||
// open brace opening at-rule at block level, e.g. @media{<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleToken = ruleToken || [Token.NESTED_BLOCK, [], []];
|
||||
ruleToken[1].push([Token.NESTED_BLOCK_SCOPE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
ruleToken[1].push([
|
||||
Token.NESTED_BLOCK_SCOPE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
allTokens.push(ruleToken);
|
||||
|
||||
levels.push(level);
|
||||
@@ -302,6 +373,7 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
position.index++;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
isVariable = false;
|
||||
|
||||
ruleToken[2] = intoTokens(source, externalContext, internalContext, true);
|
||||
ruleToken = null;
|
||||
@@ -309,7 +381,11 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
// open brace opening rule at block level, e.g. div{<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleToken = ruleToken || [tokenTypeFrom(buffer), [], []];
|
||||
ruleToken[1].push([tokenScopeFrom(ruleToken[0]), serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext, ruleToken[1].length)]]);
|
||||
ruleToken[1].push([
|
||||
tokenScopeFrom(ruleToken[0]),
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext, ruleToken[1].length)]
|
||||
]);
|
||||
newTokens = ruleToken[2];
|
||||
allTokens.push(ruleToken);
|
||||
|
||||
@@ -332,7 +408,11 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleTokens.push(ruleToken);
|
||||
ruleToken = [Token.AT_RULE_BLOCK, [], []];
|
||||
ruleToken[1].push([Token.AT_RULE_BLOCK_SCOPE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
ruleToken[1].push([
|
||||
Token.AT_RULE_BLOCK_SCOPE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
newTokens.push(ruleToken);
|
||||
newTokens = ruleToken[2];
|
||||
|
||||
@@ -343,36 +423,75 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
} else if (character == Marker.COLON && level == Level.RULE && !seekingValue) {
|
||||
// colon at rule level, e.g. a{color:<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken = [Token.PROPERTY, [Token.PROPERTY_NAME, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]];
|
||||
propertyToken = [
|
||||
Token.PROPERTY,
|
||||
[
|
||||
Token.PROPERTY_NAME,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]
|
||||
];
|
||||
newTokens.push(propertyToken);
|
||||
|
||||
seekingValue = true;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.SEMICOLON && level == Level.RULE && propertyToken && ruleTokens.length > 0 && !isBufferEmpty && buffer[0] == Marker.AT) {
|
||||
} else if (character == Marker.SEMICOLON
|
||||
&& level == Level.RULE
|
||||
&& propertyToken
|
||||
&& ruleTokens.length > 0
|
||||
&& !isBufferEmpty
|
||||
&& buffer[0] == Marker.AT) {
|
||||
// semicolon at rule level for at-rule, e.g. a{--color:{@apply(--other-color);<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
ruleToken[1].push([Token.AT_RULE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
ruleToken[1].push([
|
||||
Token.AT_RULE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.SEMICOLON && level == Level.RULE && propertyToken && !isBufferEmpty) {
|
||||
// semicolon at rule level, e.g. a{color:red;<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
propertyToken = null;
|
||||
seekingValue = false;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
isVariable = false;
|
||||
} else if (character == Marker.SEMICOLON
|
||||
&& level == Level.RULE
|
||||
&& propertyToken
|
||||
&& isBufferEmpty
|
||||
&& isVariable
|
||||
&& !propertyToken[2]) {
|
||||
// semicolon after empty variable value at rule level, e.g. a{--color: ;<--
|
||||
propertyToken.push([Token.PROPERTY_VALUE, ' ', [originalMetadata(metadata, ' ', externalContext)]]);
|
||||
isVariable = false;
|
||||
propertyToken = null;
|
||||
seekingValue = false;
|
||||
} else if (character == Marker.SEMICOLON && level == Level.RULE && propertyToken && isBufferEmpty) {
|
||||
// semicolon after bracketed value at rule level, e.g. a{color:rgb(...);<--
|
||||
propertyToken = null;
|
||||
seekingValue = false;
|
||||
} else if (character == Marker.SEMICOLON && level == Level.RULE && !isBufferEmpty && buffer[0] == Marker.AT) {
|
||||
} else if (character == Marker.SEMICOLON
|
||||
&& level == Level.RULE
|
||||
&& !isBufferEmpty
|
||||
&& buffer[0] == Marker.AT) {
|
||||
// semicolon for at-rule at rule level, e.g. a{@apply(--variable);<--
|
||||
serializedBuffer = buffer.join('');
|
||||
newTokens.push([Token.AT_RULE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
newTokens.push([
|
||||
Token.AT_RULE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
seekingValue = false;
|
||||
buffer = [];
|
||||
@@ -385,10 +504,18 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
} else if (character == Marker.SEMICOLON && level == Level.RULE && isBufferEmpty) {
|
||||
// stray semicolon at rule level, e.g. a{;<--
|
||||
// noop
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE && propertyToken && seekingValue && !isBufferEmpty && ruleTokens.length > 0) {
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& propertyToken
|
||||
&& seekingValue
|
||||
&& !isBufferEmpty && ruleTokens.length > 0) {
|
||||
// close brace at rule level, e.g. a{--color:{color:red}<--
|
||||
serializedBuffer = buffer.join('');
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
propertyToken = null;
|
||||
ruleToken = ruleTokens.pop();
|
||||
newTokens = ruleToken[2];
|
||||
@@ -397,10 +524,19 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
seekingValue = false;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE && propertyToken && !isBufferEmpty && buffer[0] == Marker.AT && ruleTokens.length > 0) {
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& propertyToken
|
||||
&& !isBufferEmpty
|
||||
&& buffer[0] == Marker.AT
|
||||
&& ruleTokens.length > 0) {
|
||||
// close brace at rule level for at-rule, e.g. a{--color:{@apply(--other-color)}<--
|
||||
serializedBuffer = buffer.join('');
|
||||
ruleToken[1].push([Token.AT_RULE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
ruleToken[1].push([
|
||||
Token.AT_RULE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
propertyToken = null;
|
||||
ruleToken = ruleTokens.pop();
|
||||
newTokens = ruleToken[2];
|
||||
@@ -409,7 +545,10 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
seekingValue = false;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE && propertyToken && ruleTokens.length > 0) {
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& propertyToken
|
||||
&& ruleTokens.length > 0) {
|
||||
// close brace at rule level after space, e.g. a{--color:{color:red }<--
|
||||
propertyToken = null;
|
||||
ruleToken = ruleTokens.pop();
|
||||
@@ -417,10 +556,17 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
|
||||
level = levels.pop();
|
||||
seekingValue = false;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE && propertyToken && !isBufferEmpty) {
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& propertyToken
|
||||
&& !isBufferEmpty) {
|
||||
// close brace at rule level, e.g. a{color:red}<--
|
||||
serializedBuffer = buffer.join('');
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
propertyToken = null;
|
||||
ruleToken = ruleTokens.pop();
|
||||
newTokens = allTokens;
|
||||
@@ -429,19 +575,28 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
seekingValue = false;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE && !isBufferEmpty && buffer[0] == Marker.AT) {
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& !isBufferEmpty
|
||||
&& buffer[0] == Marker.AT) {
|
||||
// close brace after at-rule at rule level, e.g. a{@apply(--variable)}<--
|
||||
propertyToken = null;
|
||||
ruleToken = null;
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
newTokens.push([Token.AT_RULE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
newTokens.push([
|
||||
Token.AT_RULE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
newTokens = allTokens;
|
||||
|
||||
level = levels.pop();
|
||||
seekingValue = false;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE && levels[levels.length - 1] == Level.RULE) {
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& levels[levels.length - 1] == Level.RULE) {
|
||||
// close brace after a property block at rule level, e.g. a{--custom:{color:red;}<--
|
||||
propertyToken = null;
|
||||
ruleToken = ruleTokens.pop();
|
||||
@@ -452,6 +607,21 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
seekingPropertyBlockClosing = true;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& isVariable
|
||||
&& propertyToken
|
||||
&& !propertyToken[2]) {
|
||||
// close brace after an empty variable declaration inside a rule, e.g. a{--color: }<--
|
||||
propertyToken.push([Token.PROPERTY_VALUE, ' ', [originalMetadata(metadata, ' ', externalContext)]]);
|
||||
isVariable = false;
|
||||
propertyToken = null;
|
||||
ruleToken = null;
|
||||
newTokens = allTokens;
|
||||
|
||||
level = levels.pop();
|
||||
seekingValue = false;
|
||||
isVariable = false;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.RULE) {
|
||||
// close brace after a rule, e.g. a{color:red;}<--
|
||||
propertyToken = null;
|
||||
@@ -460,7 +630,11 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
|
||||
level = levels.pop();
|
||||
seekingValue = false;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET && level == Level.BLOCK && !isNested && position.index <= source.length - 1) {
|
||||
isVariable = false;
|
||||
} else if (character == Marker.CLOSE_CURLY_BRACKET
|
||||
&& level == Level.BLOCK
|
||||
&& !isNested
|
||||
&& position.index <= source.length - 1) {
|
||||
// stray close brace at block level, e.g. a{color:red}color:blue}<--
|
||||
externalContext.warnings.push('Unexpected \'}\' at ' + formatPosition([position.line, position.column, position.source]) + '.');
|
||||
buffer.push(character);
|
||||
@@ -473,67 +647,123 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
roundBracketLevel++;
|
||||
} else if (character == Marker.CLOSE_ROUND_BRACKET && level == Level.RULE && seekingValue && roundBracketLevel == 1) {
|
||||
} else if (character == Marker.CLOSE_ROUND_BRACKET
|
||||
&& level == Level.RULE
|
||||
&& seekingValue
|
||||
&& roundBracketLevel == 1) {
|
||||
// round close bracket, e.g. a{color:hsla(0,0%,0%)<--
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
roundBracketLevel--;
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
isVariable = false;
|
||||
} else if (character == Marker.CLOSE_ROUND_BRACKET && level == Level.RULE && seekingValue) {
|
||||
// round close bracket within other brackets, e.g. a{width:calc((10rem / 2)<--
|
||||
buffer.push(character);
|
||||
isBufferEmpty = false;
|
||||
isVariable = false;
|
||||
roundBracketLevel--;
|
||||
} else if (character == Marker.FORWARD_SLASH && source[position.index + 1] != Marker.ASTERISK && level == Level.RULE && seekingValue && !isBufferEmpty) {
|
||||
} else if (character == Marker.FORWARD_SLASH
|
||||
&& source[position.index + 1] != Marker.ASTERISK
|
||||
&& level == Level.RULE
|
||||
&& seekingValue
|
||||
&& !isBufferEmpty) {
|
||||
// forward slash within a property, e.g. a{background:url(image.png) 0 0/<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([Token.PROPERTY_VALUE, character, [[position.line, position.column, position.source]]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
character,
|
||||
[[position.line, position.column, position.source]]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.FORWARD_SLASH && source[position.index + 1] != Marker.ASTERISK && level == Level.RULE && seekingValue) {
|
||||
} else if (character == Marker.FORWARD_SLASH
|
||||
&& source[position.index + 1] != Marker.ASTERISK
|
||||
&& level == Level.RULE
|
||||
&& seekingValue) {
|
||||
// forward slash within a property after space, e.g. a{background:url(image.png) 0 0 /<--
|
||||
propertyToken.push([Token.PROPERTY_VALUE, character, [[position.line, position.column, position.source]]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
character,
|
||||
[[position.line, position.column, position.source]]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.COMMA && level == Level.RULE && seekingValue && !isBufferEmpty) {
|
||||
// comma within a property, e.g. a{background:url(image.png),<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([Token.PROPERTY_VALUE, character, [[position.line, position.column, position.source]]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
character,
|
||||
[[position.line, position.column, position.source]]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.COMMA && level == Level.RULE && seekingValue) {
|
||||
// comma within a property after space, e.g. a{background:url(image.png) ,<--
|
||||
propertyToken.push([Token.PROPERTY_VALUE, character, [[position.line, position.column, position.source]]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
character,
|
||||
[[position.line, position.column, position.source]]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (character == Marker.CLOSE_SQUARE_BRACKET && propertyToken && propertyToken.length > 1 && !isBufferEmpty && isRepeatToken(buffer)) {
|
||||
} else if (character == Marker.CLOSE_SQUARE_BRACKET
|
||||
&& propertyToken
|
||||
&& propertyToken.length > 1
|
||||
&& !isBufferEmpty
|
||||
&& isRepeatToken(buffer)) {
|
||||
buffer.push(character);
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken[propertyToken.length - 1][1] += serializedBuffer;
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if ((isSpace || (isNewLineNix && !isNewLineWin)) && level == Level.RULE && seekingValue && propertyToken && !isBufferEmpty) {
|
||||
} else if ((isSpace || (isNewLineNix && !isNewLineWin))
|
||||
&& level == Level.RULE
|
||||
&& seekingValue
|
||||
&& propertyToken
|
||||
&& !isBufferEmpty) {
|
||||
// space or *nix newline within property, e.g. a{margin:0 <--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
} else if (isNewLineWin && level == Level.RULE && seekingValue && propertyToken && buffer.length > 1) {
|
||||
// win newline within property, e.g. a{margin:0\r\n<--
|
||||
serializedBuffer = buffer.join('').trim();
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
isBufferEmpty = true;
|
||||
@@ -565,8 +795,12 @@ function intoTokens(source, externalContext, internalContext, isNested) {
|
||||
}
|
||||
|
||||
if (seekingValue && buffer.length > 0) {
|
||||
serializedBuffer = buffer.join('').replace(TAIL_BROKEN_VALUE_PATTERN, '');
|
||||
propertyToken.push([Token.PROPERTY_VALUE, serializedBuffer, [originalMetadata(metadata, serializedBuffer, externalContext)]]);
|
||||
serializedBuffer = buffer.join('').trimRight().replace(TAIL_BROKEN_VALUE_PATTERN, '$1').trimRight();
|
||||
propertyToken.push([
|
||||
Token.PROPERTY_VALUE,
|
||||
serializedBuffer,
|
||||
[originalMetadata(metadata, serializedBuffer, externalContext)]
|
||||
]);
|
||||
|
||||
buffer = [];
|
||||
}
|
||||
@@ -589,9 +823,9 @@ function isIgnoreEndComment(buffer) {
|
||||
function originalMetadata(metadata, value, externalContext, selectorFallbacks) {
|
||||
var source = metadata[2];
|
||||
|
||||
return externalContext.inputSourceMapTracker.isTracking(source) ?
|
||||
externalContext.inputSourceMapTracker.originalPositionFor(metadata, value.length, selectorFallbacks) :
|
||||
metadata;
|
||||
return externalContext.inputSourceMapTracker.isTracking(source)
|
||||
? externalContext.inputSourceMapTracker.originalPositionFor(metadata, value.length, selectorFallbacks)
|
||||
: metadata;
|
||||
}
|
||||
|
||||
function tokenTypeFrom(buffer) {
|
||||
@@ -600,21 +834,20 @@ function tokenTypeFrom(buffer) {
|
||||
|
||||
if (isAtRule && BLOCK_RULES.indexOf(ruleWord) > -1) {
|
||||
return Token.NESTED_BLOCK;
|
||||
} else if (isAtRule && AT_RULES.indexOf(ruleWord) > -1) {
|
||||
} if (isAtRule && AT_RULES.indexOf(ruleWord) > -1) {
|
||||
return Token.AT_RULE;
|
||||
} else if (isAtRule) {
|
||||
} if (isAtRule) {
|
||||
return Token.AT_RULE_BLOCK;
|
||||
} else {
|
||||
return Token.RULE;
|
||||
}
|
||||
return Token.RULE;
|
||||
}
|
||||
|
||||
function tokenScopeFrom(tokenType) {
|
||||
if (tokenType == Token.RULE) {
|
||||
return Token.RULE_SCOPE;
|
||||
} else if (tokenType == Token.NESTED_BLOCK) {
|
||||
} if (tokenType == Token.NESTED_BLOCK) {
|
||||
return Token.NESTED_BLOCK_SCOPE;
|
||||
} else if (tokenType == Token.AT_RULE_BLOCK) {
|
||||
} if (tokenType == Token.AT_RULE_BLOCK) {
|
||||
return Token.AT_RULE_BLOCK_SCOPE;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user