markdown-it-cjk-friendly 2.0.2 → 3.0.0-rc.0

package/dist/index.js

@@ -2,37 +2,64 @@ import { eastAsianWidthType } from "get-east-asian-width";
 import { isMdAsciiPunct, isPunctChar, isWhiteSpace } from "markdown-it/lib/common/utils.mjs";
 
 //#region src/index.ts
-function isEmoji(uc) {
+function isDefaultEmoji(uc) {
 	return /^\p{Emoji_Presentation}/u.test(String.fromCodePoint(uc));
 }
+function canBeEmoji(uc) {
+	return /^\p{Emoji}/u.test(String.fromCodePoint(uc));
+}
 /**
 * Check if `uc` is CJK. Deferred (returns `null`) if IVS.
 *
 * @param uc code point
-* @returns `true` if `uc` is CJK, `false` if not, `null` if IVS
+* @returns 0: not CJK, 1: CJK, 2: possibly variation selector, 3: emoji or CJK
 */
 function isCjkBase(uc) {
-	if (uc < 4352) return false;
+	if (uc < 4352) return 0;
 	switch (eastAsianWidthType(uc)) {
 		case "fullwidth":
-		case "halfwidth": return true;
-		case "wide": return !isEmoji(uc);
-		case "narrow": return false;
-		case "ambiguous": return null;
-		case "neutral": return /^\p{sc=Hangul}/u.test(String.fromCodePoint(uc));
+		case "halfwidth": return 1;
+		case "wide": return canBeEmoji(uc) ? 3 : 1;
+		case "narrow": return 0;
+		case "ambiguous": return 2;
+		case "neutral": return /^\p{sc=Hangul}/u.test(String.fromCodePoint(uc)) ? 1 : 0;
 	}
 }
+function isQuotationMark(uc) {
+	return uc === 8216 || uc === 8217 || uc === 8220 || uc === 8221;
+}
 function is2PreviousCjk(uc, prev) {
-	return isCjkBase(uc) ?? (prev === 65025 && isQuotationMark(uc));
-	function isQuotationMark(uc$1) {
-		return uc$1 === 8216 || uc$1 === 8217 || uc$1 === 8220 || uc$1 === 8221;
+	switch (isCjkBase(uc)) {
+		case 1: return true;
+		case 2: return prev === 65025 && isQuotationMark(uc);
+		case 3: return !isDefaultEmoji(uc) || prev === 65038;
 	}
+	return false;
 }
 function isPreviousCjk(uc) {
-	return isCjkBase(uc) ?? (917760 <= uc && uc <= 917999);
+	switch (isCjkBase(uc)) {
+		case 1: return true;
+		case 2: return 917760 <= uc && uc <= 917999;
+		case 3: return !isDefaultEmoji(uc);
+	}
+	return false;
 }
-function isNextCjk(uc) {
-	return isCjkBase(uc) ?? false;
+function isNextCjk(uc, src, nextPos, max) {
+	switch (isCjkBase(uc)) {
+		case 1: return true;
+		case 2:
+			if (!isQuotationMark(uc)) return false;
+			return getNextCharCode(src, nextPos + (uc > 65535 ? 2 : 1), max) === 65025;
+		case 3: {
+			const nextNext = getNextCharCode(src, nextPos + (uc > 65535 ? 2 : 1), max);
+			return isDefaultEmoji(uc) ? nextNext === 65038 : nextNext !== 65039;
+		}
+	}
+	return false;
+	function getNextCharCode(src$1, pos, max$1) {
+		if (pos >= max$1) return 32;
+		return src$1.codePointAt(pos) ?? 32;
+	}
 }
 function nonEmojiGeneralUseVS(uc) {
 	return uc >= 65024 && uc <= 65038;
@@ -66,7 +93,7 @@ function markdownItCjkFriendlyPlugin(md) {
 			let left_flanking = isLastPunctChar;
 			let right_flanking = isNextPunctChar;
 			if (canSplitWord) {
-				const isEitherCJKChar = isNextCjk(nextChar) || (twoPrevChar !== null ? is2PreviousCjk(twoPrevChar, lastChar) : isPreviousCjk(lastChar));
+				const isEitherCJKChar = isNextCjk(nextChar, this.src, pos, max) || (twoPrevChar !== null ? is2PreviousCjk(twoPrevChar, lastChar) : isPreviousCjk(lastChar));
 				left_flanking ||= isEitherCJKChar || !isNextPunctChar;
 				right_flanking ||= isEitherCJKChar || !isLastPunctChar;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-it-cjk-friendly",
-  "version": "2.0.2",
+  "version": "3.0.0-rc.0",
   "type": "module",
   "exports": {
     ".": {