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

package/index.js

@@ -85,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'
@@ -705,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.1",
+  "version": "0.4.2",
   "main": "index.js",
   "type": "module",
   "scripts": {

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,6 +20,10 @@ 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) {
@@ -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.')