@peaceroad/markdown-it-strong-ja 0.4.0 → 0.4.2

package/index.js

@@ -1,6 +1,7 @@
 const REG_ASTERISKS = /^\*+$/
 const REG_ATTRS = /{[^{}\n!@#%^&*()]+?}$/
 const REG_PUNCTUATION = /[!-/:-@[-`{-~ ]/
+const REG_JAPANESE = /[\u3040-\u309F\u30A0-\u30FF\u4E00-\u9FFF\uFF66-\uFF9F\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF01-\uFF60\uFFE0-\uFFE6]/ //漢字、ひらがな、カタカナ（半角含む）、全角英数字、絵文字、全角記号：/(?:[\p{Hiragana}\p{Katakana}\p{Han}]|[\uFF66-\uFF9F]|[Ａ-Ｚａ-ｚ０-９]|[\p{Emoji}]|[\uFF01-\uFF60\uFFE0-\uFFE6])/u;/(?:[\p{Hiragana}\p{Katakana}\p{Han}]|[\uFF66-\uFF9F]|[Ａ-Ｚａ-ｚ０-９]|[\p{Emoji}])/u
 
 const hasBackslash = (state, start) => {
   let slashNum = 0
@@ -84,7 +85,7 @@ const setToken = (state, inlines, opt) => {
         let j = 0
         while (j < childTokens[0].children.length) {
           const t = childTokens[0].children[j]
-          if (t.type === 'softbreak') {
+          if (t.type === 'softbreak' && !opt.mdBreaks) {
             t.type = 'text'
             t.tag = ''
             t.content = '\n'
@@ -314,19 +315,20 @@ const setStrong = (state, inlines, marks, n, memo, opt) => {
     let strongNum = Math.trunc(Math.min(inlines[n].len, inlines[i].len) / 2)
 
     if (inlines[i].len > 1) {
-     //console.log('    hasPunctuation: ' + hasPunctuation(state, inlines, n, i) + ', memo.inlineMarkEnd: ' + memo.inlineMarkEnd)
-      if (hasPunctuation(state, inlines, n, i)) {
+      //console.log('    hasPunctuationOrNonJapanese: ' + hasPunctuationOrNonJapanese(state, inlines, n, i) + ', memo.inlineMarkEnd: ' + memo.inlineMarkEnd)
+
+      if (hasPunctuationOrNonJapanese(state, inlines, n, i)) {
         if (memo.inlineMarkEnd) {
          //console.log('check nest em.')
          //console.log('~~~~~~~~~~~~~~~~~')
-          marks.push(...createMarks(state, inlines, i, inlines.length - 1, memo, opt))
+         marks.push(...createMarks(state, inlines, i, inlines.length - 1, memo, opt))
          //console.log('~~~~~~~~~~~~~~~~~')
           if (inlines[i].len === 0) { i++; continue }
         } else {
           return n, nest
         }
       }
-     //console.log('    ===> strong normal push. n: ' + n + ', i: ' + i +  ' , nest: ' + nest + ',strongNum: ' + strongNum)
+      //console.log('    ===> strong normal push. n: ' + n + ', i: ' + i +  ' , nest: ' + nest + ',strongNum: ' + strongNum)
 
       j = 0
       while (j < strongNum) {
@@ -357,7 +359,7 @@ const setStrong = (state, inlines, marks, n, memo, opt) => {
     }
 
     if (inlines[n].len === 1 && inlines[i].len > 0) {
-     //console.log('    check em that warp strong.')
+      //console.log('    check em that warp strong.')
       nest++
       n, nest = setEm(state, inlines, marks, n, memo, opt, nest)
     }
@@ -402,26 +404,22 @@ const checkInsideTags = (inlines, i, memo) => {
 const isPunctuation = (ch) => {
   return REG_PUNCTUATION.test(ch)
 }
+const isJapanese = (ch) => {
+  return REG_JAPANESE.test(ch)
+}
 
-const hasPunctuation = (state, inlines, n, i) => {
+const hasPunctuationOrNonJapanese = (state, inlines, n, i) => {
   const src = state.src
-  const openNextChar = isPunctuation(src[inlines[n].e + 1] || '')
-  //const openPrevChar = isPunctuation(src[inlines[n].s - 1] || '') || n === 0
-  let closePrevChar = isPunctuation(src[inlines[i].s - 1] || '')
-  if (i + 1 < inlines.length) {
-    //closePrevChar = closePrevChar && inlines[i+1] !== 'html_inline'
-  }
-  let closeNextChar = isPunctuation(src[inlines[i].e + 1] || '') || i === inlines.length - 1
-  //const lastCharIsAsterisk = memo.inlineMarkEnd
-  //const firstCharIsAsterisk = memo.inlineMarkStart
-
-  //console.log('openPrevChar: ' + openPrevChar + ', openNextChar: ' + openNextChar + ', closePrevChar: ' + closePrevChar + ', closeNextChar: ' + closeNextChar + ', lastCharIsAsterisk: ' + lastCharIsAsterisk + ', firstCharIsAsterisk: ' + firstCharIsAsterisk + ', next condition: ' + ((openNextChar || closePrevChar) && !closeNextChar))
-  //if ((openNextChar || closePrevChar) && !closeNextChar) {
-  if ((openNextChar || closePrevChar) && !closeNextChar) {
-    return true
-  } else {
-    return false
-  }
+  const openPrevChar = src[inlines[n].s - 1] || ''
+  //const checkOpenPrevChar = 
+  const openNextChar = src[inlines[n].e + 1]  || ''
+  const checkOpenNextChar = isPunctuation(openNextChar)
+  const closePrevChar = src[inlines[i].s - 1] || ''
+  const checkClosePrevChar = isPunctuation(closePrevChar)
+  const closeNextChar = src[inlines[i].e + 1] || ''
+  const checkCloseNextChar = (isPunctuation(closeNextChar) || i === inlines.length - 1) 
+  if ((checkOpenNextChar || checkClosePrevChar) && !checkCloseNextChar && !(isJapanese(openPrevChar) || isJapanese(closeNextChar)))  return true
+  return false
 }
 
 const setEm = (state, inlines, marks, n, memo, opt, sNest) => {
@@ -470,8 +468,8 @@ const setEm = (state, inlines, marks, n, memo, opt, sNest) => {
     if (nest === -1) return n, nest
 
     if (emNum === 1) {
-      //console.log('    hasPunctuation: ' + hasPunctuation(state, inlines, n, i) + ', memo.inlineMarkEnd: ' + memo.inlineMarkEnd)
-      if (hasPunctuation(state, inlines, n, i)) {
+      //console.log('    hasPunctuationOrNonJapanese: ' + hasPunctuationOrNonJapanese(state, inlines, n, i) + ', memo.inlineMarkEnd: ' + memo.inlineMarkEnd)
+      if (hasPunctuationOrNonJapanese(state, inlines, n, i)) {
         if (memo.inlineMarkEnd) {
           //console.log('check nest em.')
           //console.log('~~~~~~~~~~~~~~~~~')
@@ -707,6 +705,7 @@ const mditStrongJa = (md, option) => {
   const opt = {
     dollarMath: true, //inline math $...$
     mditAttrs: true, //markdown-it-attrs
+    mdBreaks: md.options.breaks,
   }
   if (option) Object.assign(opt, option)
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peaceroad/markdown-it-strong-ja",
   "description": "This is a plugin for markdown-it. It is an alternative to the standard `**` (strong)  and `*` (em) processing. It also processes strings that cannot be converted by the standard.",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "main": "index.js",
   "type": "module",
   "scripts": {

package/test/example-complex.txt

@@ -478,4 +478,29 @@ e*z<span> *a*b*
 [HTML:false]
 <p>*<strong>&lt;sPan&gt;a&lt;/spaN&gt;b</strong></p>
 [HTML:true]
-<p>*<strong><sPan>a</spaN>b</strong></p>
+<p>*<strong><sPan>a</spaN>b</strong></p>
+
+[Markdown]
+a**`b`**a
+[HTML:false]
+<p>a**<code>b</code>**a</p>
+
+[Markdown]
+a(**`b`**)a
+[HTML:false]
+<p>a(<strong><code>b</code></strong>)a</p>
+
+[Markdown]
+あ**`b`**あ
+[HTML:false :: commommark: <p>あ**<code>b</code>**あ</p>]
+<p>あ<strong><code>b</code></strong>あ</p>
+
+[Markdown]
+あ（**`b`**）あ
+[HTML:false]
+<p>あ（<strong><code>b</code></strong>）あ</p>
+
+[Markdown]
+（**`b`**）あ
+[HTML:false]
+<p>（<strong><code>b</code></strong>）あ</p>

package/test/mditNoAttrs/example-complex.txt

@@ -477,4 +477,36 @@ e*z<span> *a*b*
 [HTML:false]
 <p>*<strong>&lt;sPan&gt;a&lt;/spaN&gt;b</strong></p>
 [HTML:true]
-<p>*<strong><sPan>a</spaN>b</strong></p>
+<p>*<strong><sPan>a</spaN>b</strong></p>
+
+
+[Markdown]
+a**`b`**a
+[HTML:false]
+<p>a**<code>b</code>**a</p>
+
+[Markdown]
+a(**`b`**)a
+[HTML:false]
+<p>a(<strong><code>b</code></strong>)a</p>
+
+[Markdown]
+あ**`b`**あ
+[HTML:false :: commommark: <p>あ**<code>b</code>**あ</p>]
+<p>あ<strong><code>b</code></strong>あ</p>
+
+[Markdown]
+あ（**`b`**）あ
+[HTML:false]
+<p>あ（<strong><code>b</code></strong>）あ</p>
+
+[Markdown]
+（**`b`**）あ
+[HTML:false]
+<p>（<strong><code>b</code></strong>）あ</p>
+
+
+
+
+
+

package/test/mditNoAttrs/example-mdit-linebrek.txt

@@ -0,0 +1,46 @@
+[Markdown]
+吾輩は猫である。名前は<span>まだ</span>無い。
+どこで生れたか*とんと見当*が<span>つかぬ</span>。
+何でも薄暗い*じめじめした所*でニャーニャー泣いていた事だけは記憶している。
+[HTML:false]
+<p>吾輩は猫である。名前は&lt;span&gt;まだ&lt;/span&gt;無い。<br>
+どこで生れたか<em>とんと見当</em>が&lt;span&gt;つかぬ&lt;/span&gt;。<br>
+何でも薄暗い<em>じめじめした所</em>でニャーニャー泣いていた事だけは記憶している。</p>
+[HTML:true]
+<p>吾輩は猫である。名前は<span>まだ</span>無い。<br>
+どこで生れたか<em>とんと見当</em>が<span>つかぬ</span>。<br>
+何でも薄暗い<em>じめじめした所</em>でニャーニャー泣いていた事だけは記憶している。</p>
+
+[Markdown]
+a*b
+c*d
+[HTML:false]
+<p>a<em>b<br>
+c</em>d</p>
+[HTML:true]
+<p>a<em>b<br>
+c</em>d</p>
+
+[Markdown]
+a**b
+c*d*e**f
+[HTML:false]
+<p>a<strong>b<br>
+c<em>d</em>e</strong>f</p>
+[HTML:true]
+<p>a<strong>b<br>
+c<em>d</em>e</strong>f</p>
+
+[Markdown]
+- *aあ {.li-style}
+\{.ul-style} aa {.next-li-style}
+[HTML:false]
+<ul>
+<li>*aあ {.li-style}<br>
+{.ul-style} aa {.next-li-style}</li>
+</ul>
+[HTML:true]
+<ul>
+<li>*aあ {.li-style}<br>
+{.ul-style} aa {.next-li-style}</li>
+</ul>

package/test/test.js

@@ -20,10 +20,14 @@ const mditNoAttrsWithHtml = mdit({html: true}).use(mditStrongJa, {mditAttrs: fal
 const mditNoAttrsCJKBreaks = mdit().use(mditStrongJa, {mditAttrs: false}).use(mditCJKBreaks, {either: true})
 const mditNoAttrsCJKBreaksWithHtml = mdit({html: true}).use(mditStrongJa, {mditAttrs: false}).use(mditCJKBreaks, {either: true})
 
+const mditNoAttrsLinebreak = mdit({breaks: true}).use(mditStrongJa, {mditAttrs: false})
+const mditNoAttrsLinebreakWithHtml = mdit({html: true, breaks: true}).use(mditStrongJa, {mditAttrs: false})
+
+
 const check = (ms, example, allPass, useAttrs) => {
   let n = 1
   while (n < ms.length) {
-    //if (n !== 72) { n++; continue }
+    //if (n !== 81) { n++; continue }
     const m = ms[n].markdown
     let h = ''
     if (example === 'withLineBreak') {
@@ -58,6 +62,34 @@ const check = (ms, example, allPass, useAttrs) => {
   return allPass
 }
 
+const checkBreaks = (ms, example, allPass, useAttrs) => {
+  let n = 1
+  while (n < ms.length) {
+    //if (n !== 81) { n++; continue }
+    const m = ms[n].markdown
+    const h = mditNoAttrsLinebreak.render(ms[n].markdown);
+    try {
+      assert.strictEqual(h, ms[n].html);
+    } catch(e) {
+      console.log('Test [linebreak, HTML: false, useAttrs: ' + useAttrs + '] >>>');
+      console.log('Input: ' + ms[n].markdown + '\nOutput: ' + h + ' Correct: ' + ms[n].html)
+      allPass = false
+    }
+    if (ms[n].htmlWithHtmlTrue) {
+      let hh = mditNoAttrsLinebreakWithHtml.render(ms[n].markdown)
+      try {
+        assert.strictEqual(hh, ms[n].htmlWithHtmlTrue)
+      } catch(e) {
+        console.log('Test [' + n + ', HTML: true, useAttrs: ' + useAttrs + '] >>>')
+        console.log('Input: ' + ms[n].markdown + '\nOutput: ' + hh + 'Correct: ' + ms[n].htmlWithHtmlTrue)
+        allPass = false
+      }
+    }
+    n++
+  }
+  return allPass
+}
+
 const examples = {
   strong: __dirname + '/example-strong.txt',
   em: __dirname + '/example-em.txt',
@@ -72,7 +104,11 @@ const examplesMditNoAttrs = {
   withLineBreak: __dirname + '/mditNoAttrs/example-with-linebreak.txt',
 }
 
-const runTests = (examples, useAttrs) => {
+const examplesMditBreaks = {
+  linebreak: __dirname + '/mditNoAttrs/example-mdit-linebrek.txt',
+}
+
+const runTests = (examples, checkFunction, useAttrs) => {
   let allPass = true
   for (let example in examples) {
     const exampleCont = fs.readFileSync(examples[example], 'utf-8').trim()
@@ -98,12 +134,13 @@ const runTests = (examples, useAttrs) => {
       n++
     }
     console.log('Check ' + example + ' process [mditAttrs: ' + useAttrs + '] =======================')
-    allPass = check(ms, example, allPass, useAttrs)
+    allPass = checkFunction(ms, example, allPass, useAttrs)
   }
   return allPass
 }
 
-let allPass = runTests(examples, true)
-allPass = runTests(examplesMditNoAttrs, false) && allPass
+let allPass = runTests(examples, check, true)
+allPass = runTests(examplesMditNoAttrs, check, false) && allPass
+allPass = runTests(examplesMditBreaks, checkBreaks, false) && allPass
 
 if (allPass) console.log('Passed all tests.')