@peaceroad/markdown-it-strong-ja 0.5.2 → 0.5.3

package/README.md

@@ -172,3 +172,18 @@ md.render('string**[text](url)**')
 // <p>string**<a href="url">text</a>**</p>
 ```
 
+### coreRulesBeforePostprocess
+
+`strong_ja_postprocess` runs inside the markdown-it core pipeline. When other plugins register core rules, you can keep their rules ahead of `strong_ja_postprocess` by listing them in `coreRulesBeforePostprocess`. Each name is normalized, deduplicated, and re-ordered once during plugin setup.
+
+```js
+const md = mdit()
+  .use(cjkBreaks)
+  .use(mditStrongJa, {
+    coreRulesBeforePostprocess: ['cjk_breaks', 'my_custom_rule']
+  })
+```
+
+- Default: `[]`
+- Specify `['cjk_breaks']` (or other rule names) when you rely on plugins such as `@peaceroad/markdown-it-cjk-breaks-mod` and need them to run first.
+- Pass an empty array if you do not want `mditStrongJa` to reorder any core rules.

package/index.js

@@ -15,6 +15,10 @@ const CHAR_OPEN_BRACKET = 0x5B // [
 const CHAR_CLOSE_BRACKET = 0x5D // ]
 const CHAR_OPEN_PAREN = 0x28 // (
 const CHAR_CLOSE_PAREN = 0x29 // )
+const CHAR_NEWLINE = 0x0A     // \n
+const CHAR_TAB = 0x09        // tab
+//const CHAR_OPEN_CURLY = 0x7B // {
+const CHAR_CLOSE_CURLY = 0x7D // }
 
 const REG_ASTERISKS = /^\*+$/
 const REG_ATTRS = /{[^{}\n!@#%^&*()]+?}$/
@@ -1104,6 +1108,7 @@ const strongJa = (state, silent, opt) => {
   if (silent) return false
   const start = state.pos
   let max = state.posMax
+  const originalMax = max
   const src = state.src
   let attributesSrc
   if (start > max) return false
@@ -1117,19 +1122,37 @@ const strongJa = (state, silent, opt) => {
   }
 
   if (opt.mditAttrs) {
-    attributesSrc = src.match(/((\n)? *){([^{}\n!@#%^&*()]+?)} *$/)
-    if (attributesSrc && attributesSrc[3] !== '.') {
-      max = src.slice(0, attributesSrc.index).length
-      if (attributesSrc[2] === '\n') {
-        max = src.slice(0, attributesSrc.index - 1).length
+    let attrCandidate = false
+    let probe = originalMax - 1
+    while (probe >= start) {
+      const code = src.charCodeAt(probe)
+      if (code === CHAR_CLOSE_CURLY) {
+        attrCandidate = true
+        break
       }
-      if(hasBackslash(state, attributesSrc.index) && attributesSrc[2] === '' && attributesSrc[1].length === 0) {
-        max = state.posMax
+      if (code === CHAR_SPACE || code === CHAR_TAB || code === CHAR_NEWLINE) {
+        probe--
+        continue
       }
-    } else {
-      let endCurlyKet = src.match(/(\n *){([^{}\n!@#%^&*()]*?)}.*(} *?)$/)
-      if (endCurlyKet) {
-        max -= endCurlyKet[3].length
+      break
+    }
+
+    if (attrCandidate) {
+      const attrScanTarget = originalMax === src.length ? src : src.slice(0, originalMax)
+      attributesSrc = attrScanTarget.match(/((\n)? *){([^{}\n!@#%^&*()]+?)} *$/)
+      if (attributesSrc && attributesSrc[3] !== '.') {
+        max = attrScanTarget.slice(0, attributesSrc.index).length
+        if (attributesSrc[2] === '\n') {
+          max = attrScanTarget.slice(0, attributesSrc.index - 1).length
+        }
+        if (hasBackslash(state, attributesSrc.index) && attributesSrc[2] === '' && attributesSrc[1].length === 0) {
+          max = state.posMax
+        }
+      } else {
+        const endCurlyKet = attrScanTarget.match(/(\n *){([^{}\n!@#%^&*()]*?)}.*(} *?)$/)
+        if (endCurlyKet) {
+          max -= endCurlyKet[3].length
+        }
       }
     }
   }
@@ -1143,13 +1166,16 @@ const strongJa = (state, silent, opt) => {
     state.__strongJaReferenceCount = references ? Object.keys(references).length : 0
   }
 
-  let refRanges
-  const refCache = state.__strongJaRefRangeCache
-  if (refCache && refCache.max === max && refCache.start <= start) {
-    refRanges = refCache.ranges
-  } else {
-    refRanges = computeReferenceRanges(state, start, max)
-    state.__strongJaRefRangeCache = { start, max, ranges: refRanges }
+  let refRanges = []
+  const hasReferenceDefinitions = state.__strongJaReferenceCount > 0
+  if (hasReferenceDefinitions) {
+    const refCache = state.__strongJaRefRangeCache
+    if (refCache && refCache.max === max && refCache.start <= start) {
+      refRanges = refCache.ranges
+    } else {
+      refRanges = computeReferenceRanges(state, start, max)
+      state.__strongJaRefRangeCache = { start, max, ranges: refRanges }
+    }
   }
   if (refRanges.length > 0) {
     state.__strongJaHasCollapsedRefs = true
@@ -1243,11 +1269,17 @@ const normalizeReferenceCandidate = (state, text, { useClean = false } = {}) =>
   return normalizeRefKey(state, source)
 }
 
-const normalizeRefKey = (state, label) => {
+const getNormalizeRef = (state) => {
+  if (state.__strongJaNormalizeRef) return state.__strongJaNormalizeRef
   const normalize = state.md && state.md.utils && state.md.utils.normalizeReference
     ? state.md.utils.normalizeReference
     : (str) => str.trim().replace(/\s+/g, ' ').toUpperCase()
-  return normalize(label)
+  state.__strongJaNormalizeRef = normalize
+  return normalize
+}
+
+const normalizeRefKey = (state, label) => {
+  return getNormalizeRef(state)(label)
 }
 
 const adjustTokenLevels = (tokens, startIdx, endIdx, delta) => {
@@ -1272,10 +1304,22 @@ const cloneTextToken = (source, content) => {
 const splitBracketToken = (tokens, index, options) => {
   const token = tokens[index]
   if (!token || token.type !== 'text') return false
+  if (token.__strongJaBracketAtomic) return false
+  if (token.__strongJaHasBracket === false) return false
   const content = token.content
-  if (!content || (content.indexOf('[') === -1 && content.indexOf(']') === -1)) {
+  if (!content) {
+    token.__strongJaHasBracket = false
+    token.__strongJaBracketAtomic = false
     return false
   }
+  if (token.__strongJaHasBracket !== true) {
+    if (content.indexOf('[') === -1 && content.indexOf(']') === -1) {
+      token.__strongJaHasBracket = false
+      token.__strongJaBracketAtomic = false
+      return false
+    }
+    token.__strongJaHasBracket = true
+  }
   const splitEmptyPair = options && options.splitEmptyPair
   const segments = []
   let buffer = ''
@@ -1304,11 +1348,49 @@ const splitBracketToken = (tokens, index, options) => {
     pos++
   }
   if (buffer) segments.push(buffer)
-  if (segments.length <= 1) return false
+  if (segments.length <= 1) {
+    if (segments.length === 0) {
+      token.__strongJaHasBracket = false
+      token.__strongJaBracketAtomic = false
+    } else {
+      const seg = segments[0]
+      if (seg === '[' || seg === ']') {
+        token.__strongJaHasBracket = true
+        token.__strongJaBracketAtomic = true
+      } else if (seg === '[]') {
+        token.__strongJaHasBracket = true
+        token.__strongJaBracketAtomic = false
+      } else {
+        token.__strongJaHasBracket = false
+        token.__strongJaBracketAtomic = false
+      }
+    }
+    return false
+  }
   token.content = segments[0]
+  if (token.content === '[' || token.content === ']') {
+    token.__strongJaHasBracket = true
+    token.__strongJaBracketAtomic = true
+  } else if (token.content === '[]') {
+    token.__strongJaHasBracket = true
+    token.__strongJaBracketAtomic = false
+  } else {
+    token.__strongJaHasBracket = false
+    token.__strongJaBracketAtomic = false
+  }
   let insertIdx = index + 1
   for (let s = 1; s < segments.length; s++) {
     const newToken = cloneTextToken(token, segments[s])
+    if (segments[s] === '[' || segments[s] === ']') {
+      newToken.__strongJaHasBracket = true
+      newToken.__strongJaBracketAtomic = true
+    } else if (segments[s] === '[]') {
+      newToken.__strongJaHasBracket = true
+      newToken.__strongJaBracketAtomic = false
+    } else {
+      newToken.__strongJaHasBracket = false
+      newToken.__strongJaBracketAtomic = false
+    }
     tokens.splice(insertIdx, 0, newToken)
     insertIdx++
   }
@@ -1787,8 +1869,16 @@ const mditStrongJa = (md, option) => {
     mditAttrs: true, //markdown-it-attrs
     mdBreaks: md.options.breaks,
     disallowMixed: false, //Non-Japanese text handling
+    coreRulesBeforePostprocess: [] // e.g. ['cjk_breaks'] when CJK line-break plugins are active
   }
   if (option) Object.assign(opt, option)
+  const rawCoreRules = opt.coreRulesBeforePostprocess
+  const hasCoreRuleConfig = Array.isArray(rawCoreRules)
+    ? rawCoreRules.length > 0
+    : !!rawCoreRules
+  const coreRulesBeforePostprocess = hasCoreRuleConfig
+    ? normalizeCoreRulesBeforePostprocess(rawCoreRules)
+    : []
 
   md.inline.ruler.before('emphasis', 'strong_ja', (state, silent) => {
     return strongJa(state, silent, opt)
@@ -1808,6 +1898,54 @@ const mditStrongJa = (md, option) => {
     delete state.env.__strongJaPostProcessTargets
     delete state.env.__strongJaPostProcessTargetSet
   })
+
+  if (coreRulesBeforePostprocess.length > 0) {
+    ensureCoreRuleOrder(md, coreRulesBeforePostprocess)
+  }
 }
 
 export default mditStrongJa
+
+
+function normalizeCoreRulesBeforePostprocess(value) {
+  if (!value) return []
+  const list = Array.isArray(value) ? value : [value]
+  const normalized = []
+  const seen = new Set()
+  for (let idx = 0; idx < list.length; idx++) {
+    const raw = list[idx]
+    if (typeof raw !== 'string') continue
+    const trimmed = raw.trim()
+    if (!trimmed || seen.has(trimmed)) continue
+    seen.add(trimmed)
+    normalized.push(trimmed)
+  }
+  return normalized
+}
+
+
+function ensureCoreRuleOrder(md, ruleNames) {
+  if (!md || !md.core || !md.core.ruler) return
+  if (!ruleNames || ruleNames.length === 0) return
+  for (let idx = 0; idx < ruleNames.length; idx++) {
+    moveRuleBefore(md.core.ruler, ruleNames[idx], 'strong_ja_postprocess')
+  }
+}
+
+
+function moveRuleBefore(ruler, ruleName, beforeName) {
+  if (!ruler || !ruler.__rules__) return
+  const rules = ruler.__rules__
+  let fromIdx = -1
+  let beforeIdx = -1
+  for (let idx = 0; idx < rules.length; idx++) {
+    if (rules[idx].name === ruleName) fromIdx = idx
+    if (rules[idx].name === beforeName) beforeIdx = idx
+    if (fromIdx !== -1 && beforeIdx !== -1) break
+  }
+  if (fromIdx === -1 || beforeIdx === -1 || fromIdx < beforeIdx) return
+
+  const rule = rules.splice(fromIdx, 1)[0]
+  rules.splice(beforeIdx, 0, rule)
+  ruler.__cache__ = null
+}

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.5.2",
+  "version": "0.5.3",
   "main": "index.js",
   "type": "module",
   "files": [