@peaceroad/markdown-it-strong-ja 0.3.0 → 0.3.2

package/index.js

@@ -1,4 +1,4 @@
-const hasSlashFlag = (state, start) => {
+const hasBackslash = (state, start) => {
   let slashNum = 0
   let i = start - 1
   while(i >= 0) {
@@ -31,9 +31,12 @@ const setToken = (state, inlines) => {
         continue
       }
       const childTokens = state.md.parseInline(content, state.env)
+
       if (childTokens[0] && childTokens[0].children) {
+        //console.log(state.tokens[state.tokens.length - 1])
         state.tokens[state.tokens.length - 1].children = childTokens[0].children
         childTokens[0].children.forEach(t => {
+          //console.log('t.type: ' + t.type + ', t.tag: ' + t.tag + ', t.nesting: ' + t.nesting)
           const token = state.push(t.type, t.tag, t.nesting)
           token.attrs = t.attrs
           token.map = t.map
@@ -47,6 +50,25 @@ const setToken = (state, inlines) => {
           token.hidden = t.hidden
         })
       }
+      //console.log(childTokens[0].children)
+      /*
+      if (childTokens[0] && childTokens[0].children) {
+        state.tokens[state.tokens.length - 1].children = childTokens[0].children
+        childTokens[0].children.forEach(t => {
+          //console.log('t.type: ' + t.type + ', t.tag: ' + t.tag + ', t.nesting: ' + t.nesting)
+          const token = state.push(t.type, t.tag, t.nesting)
+          token.attrs = t.attrs
+          token.map = t.map
+          token.level = t.level
+          token.children = t.children
+          token.content = t.content
+          token.markup = t.markup
+          token.info = t.info
+          token.meta = t.meta
+          token.block = t.block
+          token.hidden = t.hidden
+        })
+      }*/
     }
 
     if (/_close$/.test(type)) {
@@ -69,15 +91,25 @@ const inlinesPush = (inlines, s, e, len, type) => {
   })
 }
 
-const crateInlines = (state, start, max) => {
+const createInlines = (state, start, max, opt) => {
   let n = start
   let inlines = []
   let noMark = ''
   let mark = ''
+  let isInCode = false
+  let isInMath = false
   let beforeIsMark = true
   while (n < max) {
-    if (state.src.charCodeAt(n) === 0x2A) {
-      if (hasSlashFlag(state, n)) {
+    if (state.src.charCodeAt(n) === 0x60) {
+      if (!hasBackslash(state, n)) isInCode = isInCode ? false : true
+    }
+    if (opt.dollarMath) {
+      if (state.src.charCodeAt(n) === 0x24) {
+        if (!hasBackslash(state, n)) isInMath = isInMath ? false : true
+      }
+    }
+    if (state.src.charCodeAt(n) === 0x2A && !isInCode && !isInMath) {
+      if (hasBackslash(state, n)) {
         beforeIsMark = false
         noMark += state.src[n]
         if (n === max - 1) {
@@ -323,15 +355,25 @@ const createMarks = (inlines, inlinesStart, inlinesEnd, memo) => {
   return marks
 }
 
-const strongJa = (state, silent) => {
-  const max = state.posMax
-  const start = state.pos
+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) {
+    attributesSrc = state.src.match(/( *){.*?}$/)
+    if (attributesSrc) {
+      max = state.src.slice(0, attributesSrc.index).length
+    }
+  }
   if (start > max) return false
   if (state.src.charCodeAt(start) !== 0x2A) return false
-  if (hasSlashFlag(state, start)) return false
+  if (hasBackslash(state, start)) return false
   //console.log('state.src.length: ' + state.src.length + ', start: ' + start +  ', state.src: ' + state.src)
-  let inlines = crateInlines(state, start, max)
+  let inlines = createInlines(state, start, max, opt)
   //console.log('inlines: ')
   //console.log(inlines)
 
@@ -380,12 +422,25 @@ const strongJa = (state, silent) => {
 
   //console.log('state.pos: ' + state.pos + ', inlines[inlines.length - 1].e + 1: ' + (inlines[inlines.length - 1].e + 1) + ', max: ' + max)
   state.pos = inlines[inlines.length - 1].e + 1
+  if (attributesSrc) {
+    if (attributesSrc[1].length > 1) {
+     state.pos += attributesSrc[1].length
+    }
+  }
   return true
 }
 
-const mditStrongJa = (md) => {
+const mditStrongJa = (md, option) => {
+  const opt = {
+    dollarMath: true
+  }
+  if (option !== undefined) {
+    for (let o in option) {
+        opt[o] = option[o]
+    }
+  }
   md.inline.ruler.before('emphasis', 'strong_ja', (state, silent) => {
-    return strongJa(state, silent)
+    return strongJa(state, silent, opt)
   })
 }
 export default mditStrongJa

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.0",
+  "version": "0.3.2",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -11,6 +11,7 @@
   "author": "peaceroad <peaceroad@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "markdown-it": "^14.1.0"
+    "markdown-it": "^14.1.0",
+    "markdown-it-attrs": "^4.2.0"
   }
 }

package/test/example-complex.txt

@@ -139,3 +139,48 @@ a[*](https://example.com)*b
 a[*](https://example*.com)*b*
 [HTML]
 <p>a<a href="https://example*.com">*</a><em>b</em></p>
+
+[Markdown]
+**重要な文・文節や語句**は`**`を使って囲みます。*文脈上強調する語句*は`*`を使って囲みます。
+[HTML]
+<p><strong>重要な文・文節や語句</strong>は<code>**</code>を使って囲みます。<em>文脈上強調する語句</em>は<code>*</code>を使って囲みます。</p>
+
+[Markdown]
+インライン数式は$x * y = z$のように*書きます*。
+[HTML]
+<p>インライン数式は$x * y = z$のように<em>書きます</em>。</p>
+
+[Markdown]
+[node_modules/*](#)の*はすべてを意味します。
+[HTML]
+<p><a href="#">node_modules/*</a>の*はすべてを意味します。</p>
+
+[Markdown]
+**test** {.style}
+[HTML]
+<p class="style"><strong>test</strong></p>
+
+[Markdown]
+a**test**b {.style}
+[HTML]
+<p class="style">a<strong>test</strong>b</p>
+
+[Markdown]
+z*a**test**{.style}b*c*d
+[HTML]
+<p>z<em>a<strong class="style">test</strong>b</em>c*d</p>
+
+[Markdown]
+a**b**c{.style}
+[HTML]
+<p class="style">a<strong>b</strong>c</p>
+
+[Markdown]
+a**b**{.style}
+[HTML]
+<p>a<strong class="style">b</strong></p>
+
+[Markdown]
+a**b**c  {.style}
+[HTML]
+<p class="style">a<strong>b</strong>c</p>

package/test/test.js

@@ -4,16 +4,17 @@ import path from 'path'
 import url from 'url'
 
 import mdit from 'markdown-it'
+import mditAttrs from 'markdown-it-attrs'
 import mditStrongJa from '../index.js'
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url)).replace(/\\/g, '/')
 
 const check = (ms, example) => {
-  const md = mdit().use(mditStrongJa)
-  const mdWithHtml = mdit({html: true}).use(mditStrongJa)
+  const md = mdit().use(mditStrongJa).use(mditAttrs)
+  const mdWithHtml = mdit({html: true}).use(mditStrongJa).use(mditAttrs)
   let n = 1
   while (n < ms.length) {
-   //if (n != 1 ) { n++; continue }
+  //if (n != 29 ) { n++; continue }
     const m = ms[n].markdown
     console.log('Test [' + n + ', HTML: false] >>>')
     const h = md.render(m)

package/.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "cSpell.ignoreWords": [
-        "inlines"
-    ]
-}