micromark-extension-cjk-friendly 1.1.0 → 1.2.0-rc.2

package/dist/ext/attention.d.ts

@@ -1,17 +1,5 @@
-import { Resolver, TokenizeContext, Effects, State } from 'micromark-util-types';
+import { Construct } from 'micromark-util-types';
 
-/** @type {Construct} */
-declare const attention: {
-    name: string;
-    resolveAll: typeof resolveAllAttention;
-    tokenize: typeof tokenizeAttention;
-};
-declare function resolveAllAttention(events: Parameters<Resolver>[0], context: Parameters<Resolver>[1]): ReturnType<Resolver>;
-/**
- * @this {TokenizeContext}
- *   Context.
- * @type {Tokenizer}
- */
-declare function tokenizeAttention(this: TokenizeContext, effects: Effects, ok: State): State;
+declare const attention: Construct;
 
 export { attention };

package/dist/ext/attention.js

@@ -2,18 +2,18 @@
 import { ok as assert } from "devlop";
 import {
   classifyCharacter,
+  classifyPrecedingCharacter,
   isCjk,
+  isCjkOrIvs,
   isCodeHighSurrogate,
   isCodeLowSurrogate,
-  isIvs,
   isNonCjkPunctuation,
   isSpaceOrPunctuation,
-  isSvsFollowingCjk,
   isUnicodeWhitespace,
-  tryGetCodeTwoBefore,
   tryGetGenuineNextCode,
   tryGetGenuinePreviousCode
 } from "micromark-extension-cjk-friendly-util";
+import { TwoPreviousCode } from "micromark-extension-cjk-friendly-util";
 import { push, splice } from "micromark-util-chunked";
 import { resolveAll } from "micromark-util-resolve-all";
 import { codes, types } from "micromark-util-symbol";
@@ -131,16 +131,12 @@ function tokenizeAttention(effects, ok) {
     tryGetGenuinePreviousCode(tentativePrevious, now(), sliceSerialize)
   ) : tentativePrevious;
   const before = classifyCharacter(previous);
-  let beforePrimary = before;
-  if (isSvsFollowingCjk(before)) {
-    const twoPrevious = tryGetCodeTwoBefore(
-      // biome-ignore lint/style/noNonNullAssertion: if `previous` were null, before would be `undefined`
-      previous,
-      now(),
-      sliceSerialize
-    );
-    if (twoPrevious !== null) beforePrimary = classifyCharacter(twoPrevious);
-  }
+  const twoPrevious = new TwoPreviousCode(previous, now(), sliceSerialize);
+  const beforePrimary = classifyPrecedingCharacter(
+    before,
+    twoPrevious.value.bind(twoPrevious),
+    previous
+  );
   let marker;
   return start;
   function start(code) {
@@ -161,15 +157,15 @@ function tokenizeAttention(effects, ok) {
     const next = isCodeHighSurrogate(code) ? tryGetGenuineNextCode(code, now(), sliceSerialize) : code;
     const after = classifyCharacter(next);
     assert(attentionMarkers, "expected `attentionMarkers` to be populated");
-    const beforeNonCjkPunctuation = isNonCjkPunctuation(before);
-    const beforeSpaceOrNonCjkPunctuation = beforeNonCjkPunctuation || isUnicodeWhitespace(before);
+    const beforeNonCjkPunctuation = isNonCjkPunctuation(beforePrimary);
+    const beforeSpaceOrNonCjkPunctuation = beforeNonCjkPunctuation || isUnicodeWhitespace(beforePrimary);
     const afterNonCjkPunctuation = isNonCjkPunctuation(after);
     const afterSpaceOrNonCjkPunctuation = afterNonCjkPunctuation || isUnicodeWhitespace(after);
-    const beforeCjkOrIvs = isCjk(beforePrimary) || isIvs(before);
+    const beforeCjkOrIvs = isCjkOrIvs(beforePrimary);
     const open = !afterSpaceOrNonCjkPunctuation || afterNonCjkPunctuation && (beforeSpaceOrNonCjkPunctuation || beforeCjkOrIvs) || attentionMarkers.includes(code);
     const close = !beforeSpaceOrNonCjkPunctuation || beforeNonCjkPunctuation && (afterSpaceOrNonCjkPunctuation || isCjk(after)) || attentionMarkers.includes(previous);
     token._open = Boolean(
-      marker === codes.asterisk ? open : open && (isSpaceOrPunctuation(before) || !close)
+      marker === codes.asterisk ? open : open && (isSpaceOrPunctuation(beforePrimary) || !close)
     );
     token._close = Boolean(
       marker === codes.asterisk ? close : close && (isSpaceOrPunctuation(after) || !open)

package/dist/index.js

@@ -5,18 +5,18 @@ import { codes as codes2 } from "micromark-util-symbol";
 import { ok as assert } from "devlop";
 import {
   classifyCharacter,
+  classifyPrecedingCharacter,
   isCjk,
+  isCjkOrIvs,
   isCodeHighSurrogate,
   isCodeLowSurrogate,
-  isIvs,
   isNonCjkPunctuation,
   isSpaceOrPunctuation,
-  isSvsFollowingCjk,
   isUnicodeWhitespace,
-  tryGetCodeTwoBefore,
   tryGetGenuineNextCode,
   tryGetGenuinePreviousCode
 } from "micromark-extension-cjk-friendly-util";
+import { TwoPreviousCode } from "micromark-extension-cjk-friendly-util";
 import { push, splice } from "micromark-util-chunked";
 import { resolveAll } from "micromark-util-resolve-all";
 import { codes, types } from "micromark-util-symbol";
@@ -134,16 +134,12 @@ function tokenizeAttention(effects, ok) {
     tryGetGenuinePreviousCode(tentativePrevious, now(), sliceSerialize)
   ) : tentativePrevious;
   const before = classifyCharacter(previous);
-  let beforePrimary = before;
-  if (isSvsFollowingCjk(before)) {
-    const twoPrevious = tryGetCodeTwoBefore(
-      // biome-ignore lint/style/noNonNullAssertion: if `previous` were null, before would be `undefined`
-      previous,
-      now(),
-      sliceSerialize
-    );
-    if (twoPrevious !== null) beforePrimary = classifyCharacter(twoPrevious);
-  }
+  const twoPrevious = new TwoPreviousCode(previous, now(), sliceSerialize);
+  const beforePrimary = classifyPrecedingCharacter(
+    before,
+    twoPrevious.value.bind(twoPrevious),
+    previous
+  );
   let marker;
   return start;
   function start(code) {
@@ -164,15 +160,15 @@ function tokenizeAttention(effects, ok) {
     const next = isCodeHighSurrogate(code) ? tryGetGenuineNextCode(code, now(), sliceSerialize) : code;
     const after = classifyCharacter(next);
     assert(attentionMarkers, "expected `attentionMarkers` to be populated");
-    const beforeNonCjkPunctuation = isNonCjkPunctuation(before);
-    const beforeSpaceOrNonCjkPunctuation = beforeNonCjkPunctuation || isUnicodeWhitespace(before);
+    const beforeNonCjkPunctuation = isNonCjkPunctuation(beforePrimary);
+    const beforeSpaceOrNonCjkPunctuation = beforeNonCjkPunctuation || isUnicodeWhitespace(beforePrimary);
     const afterNonCjkPunctuation = isNonCjkPunctuation(after);
     const afterSpaceOrNonCjkPunctuation = afterNonCjkPunctuation || isUnicodeWhitespace(after);
-    const beforeCjkOrIvs = isCjk(beforePrimary) || isIvs(before);
+    const beforeCjkOrIvs = isCjkOrIvs(beforePrimary);
     const open = !afterSpaceOrNonCjkPunctuation || afterNonCjkPunctuation && (beforeSpaceOrNonCjkPunctuation || beforeCjkOrIvs) || attentionMarkers.includes(code);
     const close = !beforeSpaceOrNonCjkPunctuation || beforeNonCjkPunctuation && (afterSpaceOrNonCjkPunctuation || isCjk(after)) || attentionMarkers.includes(previous);
     token._open = Boolean(
-      marker === codes.asterisk ? open : open && (isSpaceOrPunctuation(before) || !close)
+      marker === codes.asterisk ? open : open && (isSpaceOrPunctuation(beforePrimary) || !close)
     );
     token._close = Boolean(
       marker === codes.asterisk ? close : close && (isSpaceOrPunctuation(after) || !open)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micromark-extension-cjk-friendly",
-  "version": "1.1.0",
+  "version": "1.2.0-rc.2",
   "type": "module",
   "exports": {
     ".": {
@@ -37,7 +37,7 @@
     "micromark-util-chunked": "^2.0.0",
     "micromark-util-resolve-all": "^2.0.0",
     "micromark-util-symbol": "^2.0.0",
-    "micromark-extension-cjk-friendly-util": "^1.1.0"
+    "micromark-extension-cjk-friendly-util": "^2.0.0-rc.2"
   },
   "devDependencies": {
     "micromark": "^4.0.1",