@peaceroad/markdown-it-strong-ja 0.3.3 → 0.3.5

package/index.js

@@ -85,32 +85,39 @@ const hasNextSymbol = (state, n, max, symbol, noMark) => {
     while (i < max) {
       tempNoMark += state.src[i]
       if (state.src.charCodeAt(i) === symbol && !hasBackslash(state, i)) {
-        noMark += state.src[n]
+        noMark += state.src.substring(n, i + 1)
         nextSymbolPos = i
         break
       }
       i++
     }
   }
-  return nextSymbolPos
+  return [nextSymbolPos, noMark]
 }
 
 const createInlines = (state, start, max, opt) => {
   let n = start
   let inlines = []
   let noMark = ''
-  let isInStartMark = true
   let textStart = n
-
   while (n < max) {
-    let nextSymbolPos = hasNextSymbol(state, n, max, 0x60, noMark)  // '`'
+    let nextSymbolPos = -1;
+    [nextSymbolPos, noMark] = hasNextSymbol(state, n, max, 0x60, noMark)  // '`'
     if (nextSymbolPos !== -1) {
+      if (nextSymbolPos === max - 1) {
+        inlinesPush(inlines, textStart, nextSymbolPos, nextSymbolPos - textStart + 1, 'text')
+        break
+      }
       n = nextSymbolPos + 1
       continue
     }
     if (opt.dollarMath) {
-      nextSymbolPos = hasNextSymbol(state, n, max, 0x24, noMark)  // '$'
+      [nextSymbolPos, noMark] = hasNextSymbol(state, n, max, 0x24, noMark)  // '$'
       if (nextSymbolPos !== -1) {
+        if (nextSymbolPos === max - 1) {
+          inlinesPush(inlines, textStart, nextSymbolPos, nextSymbolPos - textStart + 1, 'text')
+          break
+        }
         n = nextSymbolPos + 1
         continue
       }
@@ -142,9 +149,8 @@ const createInlines = (state, start, max, opt) => {
         continue
       }
     }
-
     if (state.src.charCodeAt(n) === 0x2A && !hasBackslash(state, n)) { // '*'
-      if (!isInStartMark) {
+      if (n !== 0) {
         inlinesPush(inlines, textStart, n - 1, n - textStart, 'text')
       }
       if (n === max - 1) {
@@ -165,10 +171,8 @@ const createInlines = (state, start, max, opt) => {
       n = i
       continue
     }
-    isInStartMark = false
     noMark += state.src[n]
-    //console.log('noMark: ' + noMark)
-    if (n === max - 1 || max < 3) {
+    if (n === max - 1) {
       inlinesPush(inlines, textStart, n, n - textStart + 1, 'text')
       break
     }
@@ -235,9 +239,9 @@ const setStrong = (inlines, marks, n, memo) => {
       if (i > inlines.length - 1) return n, nest, memo
     }
 
+    //console.log('memo.html: ' + memo.html + 'insideTagsIsClose: ' + insideTagsIsClose + 'inlines[i].len: ' + inlines[i].len)
     if (memo.html && !insideTagsIsClose && inlines[i].len !== 1) {
-      memo.htmlTags = {}
-      return n, nest, memo
+      i++; continue
     }
     let strongNum = Math.trunc(Math.min(inlines[n].len, inlines[i].len) / 2)
 
@@ -258,7 +262,8 @@ const setStrong = (inlines, marks, n, memo) => {
       if (inlines[n].len === 0) return n, nest, memo
     }
 
-    if (inlines[n].len === 1) {
+    //console.log('len: ', inlines[n].len, inlines[i].len)
+    if ((inlines[n].len > 0 && inlines[i] === 1) || (inlines[n].len === 1 && inlines[i].len > 0)) {
       //console.log('check em that warp strong.')
       nest++
       n, nest, memo = setEm(inlines, marks, n, memo, nest)
@@ -345,8 +350,7 @@ const setEm = (inlines, marks, n, memo, sNest) => {
     if (emNum === 1) {
       //console.log(n, i, 'insideTagsIsClose: ' + insideTagsIsClose)
       if (memo.html && !insideTagsIsClose && inlines[i].len !== 2) {
-        memo.htmlTags = {}
-        return n, nest, memo
+        i++; continue;
       }
       //console.log('n: ' + n +  ' [em]: normal push, nest: ' + nest)
       //console.log('strongPNum: ' + strongPNum)
@@ -391,6 +395,7 @@ const checkNest = (inlines, marks, n, i) => {
   let strongNest = 0
   let emNest = 0
   let j = 0
+  //console.log(inlines)
   //console.log(marks)
   //console.log('n: ' + n + ', i: ' + i + ', inlines[n].s: ' + inlines[n].s + ', inlines[i].s: ' + inlines[i].s)
   while (j < marks.length) {
@@ -408,10 +413,16 @@ const checkNest = (inlines, marks, n, i) => {
   if (parentCloseN < marks.length) {
     while (parentCloseN < marks.length) {
       if (marks[parentCloseN].nest === parentNest) break
+      //if (marks.length - 1 == parentCloseN) break
       parentCloseN++
     }
-    //console.log(parentCloseN, marks[parentCloseN].s, i, inlines[i].s)
-    if (marks[parentCloseN].s < inlines[i].s) isRange = false
+    //console.log('parentCloseN: ' + parentCloseN)
+    if (parentCloseN >  marks.length - 1) {
+      isRange = true
+    } else {
+      //console.log(marks[parentCloseN].s, i, inlines[i].s)
+      if (marks[parentCloseN].s < inlines[i].s) isRange = false
+    }
   }
   //console.log('isRange: ' + isRange)
 
@@ -431,13 +442,13 @@ const createMarks = (inlines, start, end, memo) => {
     memo.isEm = inlines[n].len === 1 ? true : false
     memo.wrapEm = 0
     let nest = 0
-     //console.log('n: ' + n +  ' ----- inlines.length: ' + inlines.length + ', memo.isEm: ' + memo.isEm)
+    //console.log('n: ' + n +  ' ----- inlines.length: ' + inlines.length + ', memo.isEm: ' + memo.isEm)
     if (!memo.isEm) {
       n, nest, memo = setStrong(inlines, marks, n, memo)
     }
     n, nest, memo = setEm(inlines, marks, n, memo)
-
     if (inlines[n].len !== 0) setText(inlines, marks, n, nest)
+    //console.log(marks)
     n++
   }
   return marks
@@ -475,11 +486,8 @@ const strongJa = (state, silent, opt) => {
   if (silent) return false
   const start = state.pos
   let max = state.posMax
-  const hasCurlyAttributes = state.md.core.ruler.__rules__.filter(rule => {
-    rule.name === 'curly_attributes' // markdown-it-attrs
-  })
   let attributesSrc
-  if (hasCurlyAttributes) {
+  if (opt.hasCurlyAttributes) {
     attributesSrc = state.src.match(/( *){.*?}$/)
     if (attributesSrc) {
       max = state.src.slice(0, attributesSrc.index).length
@@ -503,11 +511,6 @@ const strongJa = (state, silent, opt) => {
     inlineMarkStart: state.src.charCodeAt(0) === 0x2A ? true : false,
     inlineMarkEnd: state.src.charCodeAt(max - 1) === 0x2A ? true : false,
   }
-  /*
-  if (memo.html) {
-    let beforeInlines = createInlines(state, 0, start - 1, opt)
-    isJumpTag(beforeInlines, beforeInlines.length - 1, memo)
-  }*/
   let marks = createMarks(inlines, 0, inlines.length, memo)
   //console.log('marks: ')
   //console.log(marks)
@@ -534,7 +537,11 @@ const strongJa = (state, silent, opt) => {
 const mditStrongJa = (md, option) => {
   const opt = {
     dollarMath: true,
+    hasCurlyAttributes: false,
   }
+  opt.hasCurlyAttributes = md.core.ruler.__rules__.filter(rule => {
+    rule.name === 'curly_attributes' // markdown-it-attrs
+  })
   if (option !== undefined) {
     for (let o in option) {
         opt[o] = option[o]

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.3.3",
+  "version": "0.3.5",
   "main": "index.js",
   "type": "module",
   "scripts": {

package/test/example-complex.txt

@@ -191,7 +191,7 @@ z*a<span>b*c</span>d*e
 [HTML]
 <p>z<em>a&lt;span&gt;b</em>c&lt;/span&gt;d*e</p>
 [HTML:true]
-<p>z*a<span>b*c</span>d*e</p>
+<p>z<em>a<span>b*c</span>d</em>e</p>
 
 [Markdown]
 a<span>b*c</span>d*e*f
@@ -258,3 +258,109 @@ aa<span>b*e<s>f</s>*</span>cc
 <p><em>aa&lt;span&gt;b<strong>e&lt;s&gt;f&lt;/s&gt;</strong>&lt;/span&gt;cc</em></p>
 [HTML:true]
 <p><em>aa<span>b<strong>e<s>f</s></strong></span>cc</em></p>
+
+
+[Markdown]
+*ab
+[HTML]
+<p>*ab</p>
+[HTML:true]
+<p>*ab</p>
+
+[Markdown]
+*a<span>b</span>
+[HTML]
+<p>*a&lt;span&gt;b&lt;/span&gt;</p>
+[HTML:true]
+<p>*a<span>b</span></p>
+
+
+[Markdown]
+bc*
+[HTML]
+<p>bc*</p>
+[HTML:true]
+<p>bc*</p>
+
+[Markdown]
+b<span>c</span>*
+[HTML]
+<p>b&lt;span&gt;c&lt;/span&gt;*</p>
+[HTML:true]
+<p>b<span>c</span>*</p>
+
+
+[Markdown]
+***a***
+[HTML]
+<p><em><strong>a</strong></em></p>
+
+
+[Markdown]
+****a***
+[HTML]
+<p>*<em><strong>a</strong></em></p>
+
+
+[Markdown]
+***a****
+[HTML]
+<p><em><strong>a</strong></em>*</p>
+
+[Markdown]
+*****a***
+[HTML]
+<p>**<em><strong>a</strong></em></p>
+
+[Markdown]
+*****a*****
+[HTML]
+<p><em><strong><strong>a</strong></strong></em></p>
+
+[Markdown]
+******a******
+[HTML]
+<p><strong><strong><strong>a</strong></strong></strong></p>
+
+
+[Markdown]
+***a*b*
+[HTML]
+<p>*<em><em>a</em>b</em></p>
+
+[Markdown]
+***<span>a</span>*b*
+[HTML]
+<p>*<em><em>&lt;span&gt;a&lt;/span&gt;</em>b</em></p>
+[HTML: true]
+<p>*<em><em><span>a</span></em>b</em></p>
+
+
+[Markdown]
+*`a`*
+[HTML]
+<p><em><code>a</code></em></p>
+
+[Markdown]
+**z`a`b**
+[HTML]
+<p><strong>z<code>a</code>b</strong></p>
+
+[Markdown]
+**`a`
+[HTML]
+<p>**<code>a</code></p>
+
+[Markdown]
+**<b>a</b>**
+[HTML:false]
+<p><strong>&lt;b&gt;a&lt;/b&gt;</strong></p>
+[HTML:true]
+<p><strong><b>a</b></strong></p>
+
+[Markdown]
+**<br>
+[HTML:false]
+<p>**&lt;br&gt;</p>
+[HTML:true]
+<p>**<br></p>

package/test/test.js

@@ -14,8 +14,8 @@ const check = (ms, example) => {
   const mdWithHtml = mdit({html: true}).use(mditStrongJa).use(mditAttrs)
   let n = 1
   while (n < ms.length) {
-    //if (n !== 43 ) { n++; continue }
-    //if (n !== 36 ) { n++; continue }
+    //if (n !== 23 ) { n++; continue }
+    //if (n !== 59 ) { n++; continue }
     const m = ms[n].markdown
     console.log('Test [' + n + ', HTML: false] >>>')
     const h = md.render(m)