webpack 5.97.1 → 5.104.1

package/lib/css/walkCssTokens.js

@@ -7,25 +7,27 @@
 
 /**
  * @typedef {object} CssTokenCallbacks
- * @property {(function(string, number, number, number, number): number)=} url
- * @property {(function(string, number, number): number)=} comment
- * @property {(function(string, number, number): number)=} string
- * @property {(function(string, number, number): number)=} leftParenthesis
- * @property {(function(string, number, number): number)=} rightParenthesis
- * @property {(function(string, number, number): number)=} function
- * @property {(function(string, number, number): number)=} colon
- * @property {(function(string, number, number): number)=} atKeyword
- * @property {(function(string, number, number): number)=} delim
- * @property {(function(string, number, number): number)=} identifier
- * @property {(function(string, number, number, boolean): number)=} hash
- * @property {(function(string, number, number): number)=} leftCurlyBracket
- * @property {(function(string, number, number): number)=} rightCurlyBracket
- * @property {(function(string, number, number): number)=} semicolon
- * @property {(function(string, number, number): number)=} comma
- * @property {(function(): boolean)=} needTerminate
+ * @property {((input: string, start: number, end: number, innerStart: number, innerEnd: number) => number)=} url
+ * @property {((input: string, start: number, end: number) => number)=} comment
+ * @property {((input: string, start: number, end: number) => number)=} string
+ * @property {((input: string, start: number, end: number) => number)=} leftCurlyBracket
+ * @property {((input: string, start: number, end: number) => number)=} rightCurlyBracket
+ * @property {((input: string, start: number, end: number) => number)=} leftParenthesis
+ * @property {((input: string, start: number, end: number) => number)=} rightParenthesis
+ * @property {((input: string, start: number, end: number) => number)=} leftSquareBracket
+ * @property {((input: string, start: number, end: number) => number)=} rightSquareBracket
+ * @property {((input: string, start: number, end: number) => number)=} function
+ * @property {((input: string, start: number, end: number) => number)=} colon
+ * @property {((input: string, start: number, end: number) => number)=} atKeyword
+ * @property {((input: string, start: number, end: number) => number)=} delim
+ * @property {((input: string, start: number, end: number) => number)=} identifier
+ * @property {((input: string, start: number, end: number, isId: boolean) => number)=} hash
+ * @property {((input: string, start: number, end: number) => number)=} semicolon
+ * @property {((input: string, start: number, end: number) => number)=} comma
+ * @property {(() => boolean)=} needTerminate
  */
 
-/** @typedef {function(string, number, CssTokenCallbacks): number} CharHandler */
+/** @typedef {(input: string, pos: number, callbacks: CssTokenCallbacks) => number} CharHandler */
 
 // spec: https://drafts.csswg.org/css-syntax/
 
@@ -66,7 +68,7 @@ const CC_LOWER_Z = "z".charCodeAt(0);
 const CC_UPPER_A = "A".charCodeAt(0);
 const CC_UPPER_F = "F".charCodeAt(0);
 const CC_UPPER_E = "E".charCodeAt(0);
-const CC_UPPER_U = "E".charCodeAt(0);
+const CC_UPPER_U = "U".charCodeAt(0);
 const CC_UPPER_Z = "Z".charCodeAt(0);
 const CC_0 = "0".charCodeAt(0);
 const CC_9 = "9".charCodeAt(0);
@@ -98,7 +100,7 @@ const consumeSpace = (input, pos, _callbacks) => {
  * @param {number} cc char code
  * @returns {boolean} true, if cc is a newline
  */
-const _isNewline = cc =>
+const _isNewline = (cc) =>
 	cc === CC_LINE_FEED || cc === CC_CARRIAGE_RETURN || cc === CC_FORM_FEED;
 
 /**
@@ -119,13 +121,13 @@ const consumeExtraNewline = (cc, input, pos) => {
  * @param {number} cc char code
  * @returns {boolean} true, if cc is a space (U+0009 CHARACTER TABULATION or U+0020 SPACE)
  */
-const _isSpace = cc => cc === CC_TAB || cc === CC_SPACE;
+const _isSpace = (cc) => cc === CC_TAB || cc === CC_SPACE;
 
 /**
  * @param {number} cc char code
  * @returns {boolean} true, if cc is a whitespace
  */
-const _isWhiteSpace = cc => _isNewline(cc) || _isSpace(cc);
+const _isWhiteSpace = (cc) => _isNewline(cc) || _isSpace(cc);
 
 /**
  * ident-start code point
@@ -134,7 +136,7 @@ const _isWhiteSpace = cc => _isNewline(cc) || _isSpace(cc);
  * @param {number} cc char code
  * @returns {boolean} true, if cc is a start code point of an identifier
  */
-const isIdentStartCodePoint = cc =>
+const isIdentStartCodePoint = (cc) =>
 	(cc >= CC_LOWER_A && cc <= CC_LOWER_Z) ||
 	(cc >= CC_UPPER_A && cc <= CC_UPPER_Z) ||
 	cc === CC_LOW_LINE ||
@@ -189,7 +191,7 @@ const consumeComments = (input, pos, callbacks) => {
  * @param {number} cc char code
  * @returns {boolean} true, if cc is a hex digit
  */
-const _isHexDigit = cc =>
+const _isHexDigit = (cc) =>
 	_isDigit(cc) ||
 	(cc >= CC_UPPER_A && cc <= CC_UPPER_F) ||
 	(cc >= CC_LOWER_A && cc <= CC_LOWER_F);
@@ -320,11 +322,12 @@ const consumeAStringToken = (input, pos, callbacks) => {
 const isNonASCIICodePoint = (cc, q) =>
 	// Simplify
 	cc > 0x80;
+
 /**
  * @param {number} cc char code
  * @returns {boolean} is letter
  */
-const isLetter = cc =>
+const isLetter = (cc) =>
 	(cc >= CC_LOWER_A && cc <= CC_LOWER_Z) ||
 	(cc >= CC_UPPER_A && cc <= CC_UPPER_Z);
 
@@ -347,7 +350,7 @@ const _isIdentCodePoint = (cc, q) =>
  * @param {number} cc char code
  * @returns {boolean} is digit
  */
-const _isDigit = cc => cc >= CC_0 && cc <= CC_9;
+const _isDigit = (cc) => cc >= CC_0 && cc <= CC_9;
 
 /**
  * @param {string} input input
@@ -716,14 +719,22 @@ const consumeRightParenthesis = (input, pos, callbacks) => {
 };
 
 /** @type {CharHandler} */
-const consumeLeftSquareBracket = (input, pos, callbacks) =>
+const consumeLeftSquareBracket = (input, pos, callbacks) => {
 	// Return a <]-token>.
-	pos;
+	if (callbacks.leftSquareBracket !== undefined) {
+		return callbacks.leftSquareBracket(input, pos - 1, pos);
+	}
+	return pos;
+};
 
 /** @type {CharHandler} */
-const consumeRightSquareBracket = (input, pos, callbacks) =>
+const consumeRightSquareBracket = (input, pos, callbacks) => {
 	// Return a <]-token>.
-	pos;
+	if (callbacks.rightSquareBracket !== undefined) {
+		return callbacks.rightSquareBracket(input, pos - 1, pos);
+	}
+	return pos;
+};
 
 /** @type {CharHandler} */
 const consumeLeftCurlyBracket = (input, pos, callbacks) => {
@@ -798,7 +809,7 @@ const _consumeAnIdentSequence = (input, pos) => {
  * @param {number} cc char code
  * @returns {boolean} true, when cc is the non-printable code point, otherwise false
  */
-const _isNonPrintableCodePoint = cc =>
+const _isNonPrintableCodePoint = (cc) =>
 	(cc >= 0x00 && cc <= 0x08) ||
 	cc === 0x0b ||
 	(cc >= 0x0e && cc <= 0x1f) ||
@@ -1196,14 +1207,112 @@ module.exports = (input, pos = 0, callbacks = {}) => {
 	return pos;
 };
 
-module.exports.isIdentStartCodePoint = isIdentStartCodePoint;
+/**
+ * @param {string} input input css
+ * @param {number} pos pos
+ * @param {CssTokenCallbacks} callbacks callbacks
+ * @param {CssTokenCallbacks=} additional additional callbacks
+ * @param {{ onlyTopLevel?: boolean, declarationValue?: boolean, atRulePrelude?: boolean, functionValue?: boolean }=} options options
+ * @returns {number} pos
+ */
+const consumeUntil = (input, pos, callbacks, additional, options = {}) => {
+	let needHandle = true;
+	let needTerminate = false;
+
+	/** @type {CssTokenCallbacks} */
+	const servicedCallbacks = {};
+
+	let balanced = 0;
+
+	if (options.onlyTopLevel) {
+		servicedCallbacks.function = (input, start, end) => {
+			balanced++;
+			if (!options.functionValue) {
+				needHandle = false;
+			}
+
+			if (additional && additional.function !== undefined) {
+				return additional.function(input, start, end);
+			}
+
+			return end;
+		};
+
+		servicedCallbacks.leftParenthesis = (_input, _start, end) => {
+			balanced++;
+			needHandle = false;
+			return end;
+		};
+		servicedCallbacks.rightParenthesis = (_input, _start, end) => {
+			balanced--;
+			if (balanced === 0) {
+				needHandle = true;
+			}
+			return end;
+		};
+	}
+
+	if (options.declarationValue) {
+		servicedCallbacks.semicolon = (_input, _start, end) => {
+			needTerminate = true;
+			return end;
+		};
+
+		servicedCallbacks.rightCurlyBracket = (_input, _start, end) => {
+			needTerminate = true;
+			return end;
+		};
+	} else if (options.functionValue) {
+		servicedCallbacks.rightParenthesis = (_input, _start, end) => {
+			balanced--;
+			if (balanced === 0) {
+				needTerminate = true;
+			}
+			return end;
+		};
+	} else if (options.atRulePrelude) {
+		servicedCallbacks.leftCurlyBracket = (_input, _start, end) => {
+			needTerminate = true;
+			return end;
+		};
+		servicedCallbacks.semicolon = (_input, _start, end) => {
+			needTerminate = true;
+			return end;
+		};
+	}
+
+	while (pos < input.length) {
+		// Consume comments.
+		pos = consumeComments(
+			input,
+			pos,
+			needHandle ? { ...servicedCallbacks, ...callbacks } : servicedCallbacks
+		);
+
+		const start = pos;
+
+		// Consume the next input code point.
+		pos++;
+		pos = consumeAToken(
+			input,
+			pos,
+			needHandle ? { ...servicedCallbacks, ...callbacks } : servicedCallbacks
+		);
+
+		if (needTerminate) {
+			return start;
+		}
+	}
+
+	return pos;
+};
 
 /**
  * @param {string} input input
  * @param {number} pos position
  * @returns {number} position after comments
  */
-module.exports.eatComments = (input, pos) => {
+const eatComments = (input, pos) => {
 	for (;;) {
 		const originalPos = pos;
 		pos = consumeComments(input, pos, {});
@@ -1220,7 +1329,7 @@ module.exports.eatComments = (input, pos) => {
  * @param {number} pos position
  * @returns {number} position after whitespace
  */
-module.exports.eatWhitespace = (input, pos) => {
+const eatWhitespace = (input, pos) => {
 	while (_isWhiteSpace(input.charCodeAt(pos))) {
 		pos++;
 	}
@@ -1231,13 +1340,18 @@ module.exports.eatWhitespace = (input, pos) => {
 /**
  * @param {string} input input
  * @param {number} pos position
- * @returns {number} position after whitespace and comments
+ * @returns {[number, boolean]} position after whitespace and comments
  */
-module.exports.eatWhitespaceAndComments = (input, pos) => {
+const eatWhitespaceAndComments = (input, pos) => {
+	let foundWhitespace = false;
+
 	for (;;) {
 		const originalPos = pos;
 		pos = consumeComments(input, pos, {});
 		while (_isWhiteSpace(input.charCodeAt(pos))) {
+			if (!foundWhitespace) {
+				foundWhitespace = true;
+			}
 			pos++;
 		}
 		if (originalPos === pos) {
@@ -1245,24 +1359,7 @@ module.exports.eatWhitespaceAndComments = (input, pos) => {
 		}
 	}
 
-	return pos;
-};
-
-/**
- * @param {string} input input
- * @param {number} pos position
- * @returns {number} position after whitespace and comments
- */
-module.exports.eatComments = (input, pos) => {
-	for (;;) {
-		const originalPos = pos;
-		pos = consumeComments(input, pos, {});
-		if (originalPos === pos) {
-			break;
-		}
-	}
-
-	return pos;
+	return [pos, foundWhitespace];
 };
 
 /**
@@ -1270,7 +1367,7 @@ module.exports.eatComments = (input, pos) => {
  * @param {number} pos position
  * @returns {number} position after whitespace
  */
-module.exports.eatWhiteLine = (input, pos) => {
+const eatWhiteLine = (input, pos) => {
 	for (;;) {
 		const cc = input.charCodeAt(pos);
 		if (_isSpace(cc)) {
@@ -1290,8 +1387,8 @@ module.exports.eatWhiteLine = (input, pos) => {
  * @param {number} pos position
  * @returns {[number, number] | undefined} positions of ident sequence
  */
-module.exports.skipCommentsAndEatIdentSequence = (input, pos) => {
-	pos = module.exports.eatComments(input, pos);
+const skipCommentsAndEatIdentSequence = (input, pos) => {
+	pos = eatComments(input, pos);
 
 	const start = pos;
 
@@ -1315,8 +1412,8 @@ module.exports.skipCommentsAndEatIdentSequence = (input, pos) => {
  * @param {number} pos position
  * @returns {[number, number] | undefined} positions of ident sequence
  */
-module.exports.eatString = (input, pos) => {
-	pos = module.exports.eatWhitespaceAndComments(input, pos);
+const eatString = (input, pos) => {
+	pos = eatWhitespaceAndComments(input, pos)[0];
 
 	const start = pos;
 
@@ -1336,7 +1433,7 @@ module.exports.eatString = (input, pos) => {
  * @param {CssTokenCallbacks} cbs callbacks
  * @returns {[number, number][]} positions of ident sequence
  */
-module.exports.eatImageSetStrings = (input, pos, cbs) => {
+const eatImageSetStrings = (input, pos, cbs) => {
 	/** @type {[number, number][]} */
 	const result = [];
 
@@ -1406,10 +1503,10 @@ module.exports.eatImageSetStrings = (input, pos, cbs) => {
  * @param {CssTokenCallbacks} cbs callbacks
  * @returns {[[number, number, number, number] | undefined, [number, number] | undefined, [number, number] | undefined, [number, number] | undefined]} positions of top level tokens
  */
-module.exports.eatImportTokens = (input, pos, cbs) => {
+const eatImportTokens = (input, pos, cbs) => {
 	const result =
 		/** @type {[[number, number, number, number] | undefined, [number, number] | undefined, [number, number] | undefined, [number, number] | undefined]} */
-		(new Array(4));
+		(Array.from({ length: 4 }));
 
 	/** @type {0 | 1 | 2 | undefined} */
 	let scope;
@@ -1548,8 +1645,8 @@ module.exports.eatImportTokens = (input, pos, cbs) => {
  * @param {number} pos position
  * @returns {[number, number] | undefined} positions of ident sequence
  */
-module.exports.eatIdentSequence = (input, pos) => {
-	pos = module.exports.eatWhitespaceAndComments(input, pos);
+const eatIdentSequence = (input, pos) => {
+	pos = eatWhitespaceAndComments(input, pos)[0];
 
 	const start = pos;
 
@@ -1573,8 +1670,8 @@ module.exports.eatIdentSequence = (input, pos) => {
  * @param {number} pos position
  * @returns {[number, number, boolean] | undefined} positions of ident sequence or string
  */
-module.exports.eatIdentSequenceOrString = (input, pos) => {
-	pos = module.exports.eatWhitespaceAndComments(input, pos);
+const eatIdentSequenceOrString = (input, pos) => {
+	pos = eatWhitespaceAndComments(input, pos)[0];
 
 	const start = pos;
 
@@ -1602,12 +1699,12 @@ module.exports.eatIdentSequenceOrString = (input, pos) => {
  * @param {string} chars characters
  * @returns {(input: string, pos: number) => number} function to eat characters
  */
-module.exports.eatUntil = chars => {
+const eatUntil = (chars) => {
 	const charCodes = Array.from({ length: chars.length }, (_, i) =>
 		chars.charCodeAt(i)
 	);
 	const arr = Array.from(
-		{ length: charCodes.reduce((a, b) => Math.max(a, b), 0) + 1 },
+		{ length: Math.max(...charCodes, 0) + 1 },
 		() => false
 	);
 	for (const cc of charCodes) {
@@ -1625,3 +1722,19 @@ module.exports.eatUntil = chars => {
 		}
 	};
 };
+
+module.exports.consumeUntil = consumeUntil;
+module.exports.eatComments = eatComments;
+module.exports.eatIdentSequence = eatIdentSequence;
+module.exports.eatIdentSequenceOrString = eatIdentSequenceOrString;
+module.exports.eatImageSetStrings = eatImageSetStrings;
+module.exports.eatImportTokens = eatImportTokens;
+module.exports.eatString = eatString;
+module.exports.eatUntil = eatUntil;
+module.exports.eatWhiteLine = eatWhiteLine;
+module.exports.eatWhitespace = eatWhitespace;
+module.exports.eatWhitespaceAndComments = eatWhitespaceAndComments;
+module.exports.isIdentStartCodePoint = isIdentStartCodePoint;
+module.exports.isWhiteSpace = _isWhiteSpace;
+module.exports.skipCommentsAndEatIdentSequence =
+	skipCommentsAndEatIdentSequence;