@peaceroad/markdown-it-cjk-breaks-mod 0.1.8 → 0.1.10

package/index.js

@@ -239,7 +239,6 @@ function process_inlines(tokens, ctx, inlineToken) {
   }
 
   var lastTextContent = '';
-  var hasLastText = false;
   var sawEmptySinceLast = false;
 
   for (i = 0; i < tokens.length; i++) {
@@ -261,7 +260,7 @@ function process_inlines(tokens, ctx, inlineToken) {
         skippedEmptyAfter = nextSkippedEmpty ? nextSkippedEmpty[i] : false;
       }
 
-      if (hasLastText) {
+      if (lastTextContent) {
         c1 = lastTextContent.charCodeAt(lastTextContent.length - 2);
         c2 = lastTextContent.charCodeAt(lastTextContent.length - 1);
         last = lastTextContent.slice(is_surrogate(c1, c2) ? -2 : -1);
@@ -305,7 +304,7 @@ function process_inlines(tokens, ctx, inlineToken) {
 
       if (remove_break) {
         var insertPunctuationSpace = false;
-        if (needsPunctuation && hasLastText && nextIdx !== -1 && next !== '\u200b') {
+        if (needsPunctuation && lastTextContent && nextIdx !== -1 && next !== '\u200b') {
           if (punctuationEndCharMap[last]) {
             if (matches_punctuation_sequence(lastTextContent, punctuationConfig, true)) {
               if (!nextWidthComputed) {
@@ -326,7 +325,6 @@ function process_inlines(tokens, ctx, inlineToken) {
         if (considerInlineBoundaries) sawEmptySinceLast = true;
       } else {
         lastTextContent = token.content;
-        hasLastText = true;
         if (considerInlineBoundaries) sawEmptySinceLast = false;
       }
     }
@@ -352,10 +350,7 @@ function normalize_text_tokens(tokens) {
       normalized = tokens.slice(0, idx);
     }
 
-    var replacement = split_text_token(token);
-    for (var r = 0; r < replacement.length; r++) {
-      normalized.push(replacement[r]);
-    }
+    append_split_text_token(normalized, token);
   }
 
   if (normalized) {
@@ -367,28 +362,33 @@ function normalize_text_tokens(tokens) {
 }
 
 
-function split_text_token(token) {
+function append_split_text_token(target, token) {
   var TokenConstructor = token.constructor;
-  var parts = [];
   var content = token.content;
   var start = 0;
+  var reusedToken = false;
+
+  function push_text_part(text) {
+    if (!text) return;
+    if (!reusedToken) {
+      token.content = text;
+      target.push(token);
+      reusedToken = true;
+      return;
+    }
+    target.push(clone_text_token(TokenConstructor, token, text));
+  }
 
   for (var pos = 0; pos < content.length; pos++) {
     if (content.charCodeAt(pos) !== 0x0A) continue;
 
-    if (pos > start) {
-      parts.push(clone_text_token(TokenConstructor, token, content.slice(start, pos)));
-    }
+    if (pos > start) push_text_part(content.slice(start, pos));
 
-    parts.push(create_softbreak_token(TokenConstructor, token));
+    target.push(create_softbreak_token(TokenConstructor, token));
     start = pos + 1;
   }
 
-  if (start < content.length) {
-    parts.push(clone_text_token(TokenConstructor, token, content.slice(start)));
-  }
-
-  return parts;
+  if (start < content.length) push_text_part(content.slice(start));
 }
 
 
@@ -450,7 +450,13 @@ function apply_missing_punctuation_spacing(tokens, inlineToken, punctuationSpace
     if (nextInfo.token.type === 'text' && has_leading_whitespace(nextInfo.token.content)) continue;
     if (nextInfo.hasActiveBreak) continue;
 
-    if (!raw_boundary_includes_newline(inlineToken.content, tokens, idx, nextInfo.index, nextInfo.fragment, rawSearchState)) {
+    if (!raw_boundary_includes_newline(
+      inlineToken.content,
+      current.content,
+      nextInfo.betweenMarkup,
+      nextInfo.fragment,
+      rawSearchState
+    )) {
       continue;
     }
 
@@ -460,37 +466,33 @@ function apply_missing_punctuation_spacing(tokens, inlineToken, punctuationSpace
 
 }
 
-function raw_boundary_includes_newline(source, tokens, fromIdx, nextIdx, afterFragment, state) {
+function raw_boundary_includes_newline(source, beforeFragment, betweenFragment, afterFragment, state) {
   if (!source || !afterFragment) return false;
-  var beforeFragment = tokens[fromIdx].content || '';
-  var betweenFragment = '';
-  for (var k = fromIdx + 1; k < nextIdx; k++) {
-    if (tokens[k].markup) betweenFragment += tokens[k].markup;
+  if (!beforeFragment) return false;
+  var beforeBoundary = betweenFragment ? beforeFragment + betweenFragment : beforeFragment;
+  var newlinePositions = get_newline_positions(source, state);
+  var startIndex = state.newlineIndex || 0;
+
+  while (startIndex < newlinePositions.length && newlinePositions[startIndex] < state.pos) {
+    startIndex++;
   }
-  if (Array.isArray(afterFragment)) {
-    for (var i = 0; i < afterFragment.length; i++) {
-      var fragment = afterFragment[i];
-      if (!fragment) continue;
-      var candidate = beforeFragment + betweenFragment + '\n' + fragment;
-      var startPos = source.indexOf(candidate, state.pos);
-      if (startPos === -1) continue;
-      state.pos = startPos + candidate.length - fragment.length;
-      return true;
-    }
-    return false;
+  state.newlineIndex = startIndex;
+
+  for (var idx = startIndex; idx < newlinePositions.length; idx++) {
+    var newlinePos = newlinePositions[idx];
+    if (!matches_raw_newline_boundary(source, newlinePos, beforeBoundary, afterFragment)) continue;
+    state.pos = newlinePos + 1;
+    state.newlineIndex = idx + 1;
+    return true;
   }
-  var fragment = afterFragment;
-  if (!fragment) return false;
-  var candidate = beforeFragment + betweenFragment + '\n' + fragment;
-  var startPos = source.indexOf(candidate, state.pos);
-  if (startPos === -1) return false;
-  state.pos = startPos + candidate.length - fragment.length;
-  return true;
+
+  return false;
 }
 
 
 function find_next_visible_token(tokens, startIdx) {
   var hasActiveBreak = false;
+  var betweenMarkup = '';
   for (var idx = startIdx; idx < tokens.length; idx++) {
     var token = tokens[idx];
     if (!token) continue;
@@ -498,13 +500,43 @@ function find_next_visible_token(tokens, startIdx) {
       hasActiveBreak = true;
     }
     var fragment = derive_after_fragment(token);
-    if (!fragment) continue;
-    return { index: idx, token: token, fragment: fragment, hasActiveBreak: hasActiveBreak };
+    if (!fragment) {
+      if (token.markup) betweenMarkup += token.markup;
+      continue;
+    }
+    return { index: idx, token: token, fragment: fragment, hasActiveBreak: hasActiveBreak, betweenMarkup: betweenMarkup };
   }
   return null;
 }
 
 
+function get_newline_positions(source, state) {
+  if (state.newlinePositions) return state.newlinePositions;
+  var newlinePositions = [];
+  for (var idx = 0; idx < source.length; idx++) {
+    if (source.charCodeAt(idx) === 0x0A) newlinePositions.push(idx);
+  }
+  state.newlinePositions = newlinePositions;
+  return newlinePositions;
+}
+
+
+function matches_raw_newline_boundary(source, newlinePos, beforeBoundary, afterFragment) {
+  var beforeStart = newlinePos - beforeBoundary.length;
+  if (beforeStart < 0) return false;
+  if (!source.startsWith(beforeBoundary, beforeStart)) return false;
+  var afterStart = newlinePos + 1;
+  if (Array.isArray(afterFragment)) {
+    for (var i = 0; i < afterFragment.length; i++) {
+      var fragment = afterFragment[i];
+      if (fragment && source.startsWith(fragment, afterStart)) return true;
+    }
+    return false;
+  }
+  return source.startsWith(afterFragment, afterStart);
+}
+
+
 function derive_after_fragment(token) {
   if (!token) return '';
   if (token.type === 'text' || token.type === 'html_inline' || token.type === 'code_inline') {
@@ -555,7 +587,6 @@ function apply_single_text_token_spacing(tokens, inlineToken, punctuationSpace,
   if (maxPunctuationLength <= 0) return;
 
   var segments = inlineToken.content.split('\n');
-  if (segments.length < 2) return;
   var cumulativeLength = 0;
   var offsetDelta = 0;
   var updatedContent = token.content;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-cjk-breaks-mod",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "description": "Suppress linebreaks between east asian (Especially Japanese) characters",
   "repository": {
@@ -22,7 +22,7 @@
     "eastasianwidth": "^0.3.0"
   },
   "devDependencies": {
-    "@peaceroad/markdown-it-strong-ja": "^0.8.0",
+    "@peaceroad/markdown-it-strong-ja": "^0.8.1",
     "markdown-it": "^14.1.0"
   }
 }