fix: s modifier should have precedence over flag (#102)

mathiasbynens · Oct 11, 2024 · 60a4444 · 60a4444
1 parent 51de91b
commit 60a4444
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/rewrite-pattern.js b/rewrite-pattern.js
@@ -610,9 +610,9 @@ const processTerm = (item, regenerateOptions, groups) => {
 			if (config.transform.unicodeFlag) {
 				update(
 					item,
-					getUnicodeDotSet(config.flags.dotAll || config.modifiersData.s).toString(regenerateOptions)
+					getUnicodeDotSet(config.isDotAllMode).toString(regenerateOptions)
 				);
-			} else if (config.transform.dotAllFlag || config.modifiersData.s) {
+			} else if ((config.modifiersData.s != null ? config.modifiersData.s : config.transform.dotAllFlag)) {
 				// TODO: consider changing this at the regenerate level.
 				update(item, '[^]');
 			}
@@ -797,6 +797,9 @@ const config = {
 	},
 	get useUnicodeFlag() {
 		return (this.flags.unicode || this.flags.unicodeSets) && !this.transform.unicodeFlag;
+	},
+	get isDotAllMode() {
+		return (this.modifiersData.s !== undefined ? this.modifiersData.s : this.flags.dotAll);
 	}
 };
 

diff --git a/tests/fixtures/modifiers.js b/tests/fixtures/modifiers.js
@@ -263,6 +263,29 @@ const modifiersFixtures = [
 		'expected': '([^](?:.))',
 		'expectedFlags': ''
 	},
+	{
+		'pattern': '(.(?-s:.))',
+		'flags': 's',
+		'options': { dotAllFlag: 'transform', modifiers: 'transform' },
+		'expected': '([^](?:.))',
+		'expectedFlags': ''
+	},
+	{
+		'pattern': '(.(?-s:.))',
+		'flags': 'su',
+		'options': { dotAllFlag: 'transform', modifiers: 'transform' },
+		'expected': '([^](?:.))',
+		'expectedFlags': 'u'
+	},
+	{
+		'pattern': '(.(?-s:.))',
+		'flags': 'su',
+		'options': { dotAllFlag: 'transform', modifiers: 'transform', unicodeFlag: 'transform' },
+		'expected': '((?:[\\0-\\uD7FF\\uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF])(?:(?:[\\0-\\t\\x0B\\f\\x0E-\\u2027\\u202A-\\uD7FF\\uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF])))',
+		'expectedFlags': '',
+		'matches': ['\na'],
+		'nonMatches': ['a\n']
+	},
 	// +ims
 	{
 		'pattern': '(?ims:^[a-z])',