eslint-plugin-formatjs 6.1.0 → 6.1.1

package/emoji-utils.d.ts

@@ -5,7 +5,9 @@ import { type EmojiVersion } from "./emoji-data.generated.js";
 export type { EmojiVersion } from "./emoji-data.generated.js";
 /**
 * Check if a string contains any emoji
-* Uses Unicode \p{Emoji} property which covers all emoji
+* Uses Unicode 17.0.0 Emoji_Presentation data and variation selector (U+FE0F)
+* to properly detect emoji while avoiding false positives from characters like
+* #, *, digits 0-9, and text symbols like © which have \p{Emoji} but are not visual emoji
 */
 export declare function hasEmoji(text: string): boolean;
 /**

package/emoji-utils.js

@@ -2,19 +2,51 @@
 * Emoji detection utilities using Intl.Segmenter
 */
 import { EMOJI_VERSIONS, EMOJI_RANGES } from "./emoji-data.generated.js";
+import * as emojiPresentationRegex from "@unicode/unicode-17.0.0/Binary_Property/Emoji_Presentation/regex.js";
+import * as emojiPropertyRegex from "@unicode/unicode-17.0.0/Binary_Property/Emoji/regex.js";
 /**
 * Cached Intl.Segmenter instance for emoji extraction
 * Reused across all extractEmojis calls for better performance
 */
 const graphemeSegmenter = new Intl.Segmenter("en", { granularity: "grapheme" });
 /**
+* Regex for detecting emoji using Unicode 17.0.0 Emoji_Presentation data
+* Generated from @unicode/unicode-17.0.0/Binary_Property/Emoji_Presentation
+* This avoids false positives from #, *, digits, and text symbols like ©
+*/
+const emojiPresentationRegexCompiled = emojiPresentationRegex.default ?? emojiPresentationRegex;
+/**
+* Regex for detecting emoji-capable characters using Unicode 17.0.0 Emoji property
+* This includes characters that can have emoji presentation (like ❤, ☀)
+*/
+const emojiPropertyRegexCompiled = emojiPropertyRegex.default ?? emojiPropertyRegex;
+/**
 * Check if a string contains any emoji
-* Uses Unicode \p{Emoji} property which covers all emoji
+* Uses Unicode 17.0.0 Emoji_Presentation data and variation selector (U+FE0F)
+* to properly detect emoji while avoiding false positives from characters like
+* #, *, digits 0-9, and text symbols like © which have \p{Emoji} but are not visual emoji
 */
 export function hasEmoji(text) {
-	// Use \p{Emoji} to match emoji characters
-	// This includes all emoji, both text and emoji presentation
-	return /\p{Emoji}/u.test(text);
+	// First check for Emoji_Presentation characters (always displayed as emoji)
+	if (emojiPresentationRegexCompiled.test(text)) {
+		return true;
+	}
+	// Check for variation selector (U+FE0F) which indicates emoji presentation
+	// But only if it follows an emoji-capable character to avoid false positives
+	// like "Hello\uFE0F" or "A\uFE0F"
+	if (text.includes("️")) {
+		const segments = graphemeSegmenter.segment(text);
+		for (const { segment } of segments) {
+			if (segment.includes("️")) {
+				// Has VS, check if the character before it has the Emoji property
+				const beforeVS = segment.replace(/\uFE0F/g, "");
+				if (emojiPropertyRegexCompiled.test(beforeVS)) {
+					return true;
+				}
+			}
+		}
+	}
+	return false;
 }
 /**
 * Extract all emoji from a string using Intl.Segmenter
@@ -32,8 +64,18 @@ export function extractEmojis(text) {
 	const emojis = [];
 	for (const { segment } of segments) {
 		// Check if this grapheme cluster contains emoji
-		if (/\p{Emoji}/u.test(segment)) {
+		// First check for Emoji_Presentation (always displayed as emoji)
+		if (emojiPresentationRegexCompiled.test(segment)) {
 			emojis.push(segment);
+			continue;
+		}
+		// Check for variation selector (U+FE0F) which indicates emoji presentation
+		// But only if it follows an emoji-capable character to avoid false positives
+		if (segment.includes("️")) {
+			const beforeVS = segment.replace(/\uFE0F/g, "");
+			if (emojiPropertyRegexCompiled.test(beforeVS)) {
+				emojis.push(segment);
+			}
 		}
 	}
 	return emojis;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-formatjs",
   "description": "ESLint plugin for formatjs",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
   "type": "module",
@@ -9,11 +9,12 @@
   "dependencies": {
     "@types/picomatch": "^4.0.0",
     "@typescript-eslint/utils": "^8.52.0",
+    "@unicode/unicode-17.0.0": "^1.6.16",
     "magic-string": "^0.30.0",
     "picomatch": "2 || 3 || 4",
     "tslib": "^2.8.1",
-    "@formatjs/icu-messageformat-parser": "3.4.0",
-    "@formatjs/ts-transformer": "4.3.0"
+    "@formatjs/icu-messageformat-parser": "3.5.0",
+    "@formatjs/ts-transformer": "4.3.1"
   },
   "peerDependencies": {
     "eslint": "9"