@peaceroad/markdown-it-numbering-ul-regarded-as-ol 0.2.3 → 0.4.0

package/src/phase3-attributes.js

@@ -7,72 +7,59 @@ import { buildListCloseIndexMap, findMatchingClose } from './list-helpers.js'
 /**
  * Add attributes to lists
  * @param {Array} tokens - Token array
- * @param {Array} listInfos - List information
  * @param {Object} opt - Options
  */
-export function addAttributes(tokens, listInfos, opt) {
-  const listInfoMap = buildListInfoMap(listInfos)
+export function addAttributes(tokens, opt) {
   const closeMap = buildListCloseIndexMap(tokens)
   const listCloseByOpen = closeMap.listCloseByOpen
+  let hasAnyListItemValue = false
   
   // Traverse token array and add attributes to ordered_list_open tokens
   // Token array may have been rebuilt in Phase2,
-  // so don't use listInfo.startIndex, check token's _markerInfo/_listInfo
+  // so rely on token._markerInfo instead of index-based lookups.
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i]
     
     if (token.type === 'ordered_list_open') {
-      // Find listInfo corresponding to this token
-      // Check _markerInfo or _convertedFromBullet flag saved in Phase2
-      if (token._markerInfo || token._convertedFromBullet) {
-        addListAttributesForToken(tokens, token, i, opt, null, listCloseByOpen)
-      } else {
-        // If originally ordered_list, find from listInfos
-        const listInfo = listInfoMap.get(i)
-        if (listInfo) {
-          addListAttributesForToken(tokens, token, i, opt, listInfo, listCloseByOpen)
-        }
-      }
+      addListAttributesForToken(tokens, token, i, opt, listCloseByOpen)
+      continue
+    }
+    if (!hasAnyListItemValue && token.type === 'list_item_open' && hasValueAttr(token)) {
+      hasAnyListItemValue = true
     }
   }
   
   // Normalize value attributes of ordered_list generated by markdown-it
   // Remove unnecessary value attributes after Phase2 simplification
   // Normalize value attributes and marker metadata for all ordered lists
-  normalizeAndConvertValueAttributes(tokens, opt, listCloseByOpen)
+  if (hasAnyListItemValue) {
+    normalizeAndConvertValueAttributes(tokens, listCloseByOpen)
+  }
 }
 
-/**
- * Build a lookup map for listInfos keyed by startIndex.
- */
-function buildListInfoMap(listInfos) {
-  if (!Array.isArray(listInfos) || listInfos.length === 0) {
-    return new Map()
+function hasValueAttr(token) {
+  if (!Array.isArray(token.attrs)) {
+    return false
   }
-  
-  const map = new Map()
-  for (const info of listInfos) {
-    if (!info || typeof info.startIndex !== 'number' || !info.markerInfo) {
-      continue
-    }
-    if (!map.has(info.startIndex)) {
-      map.set(info.startIndex, info)
+  for (const [name] of token.attrs) {
+    if (name === 'value') {
+      return true
     }
   }
-  return map
+  return false
 }
 
 /**
  * Add attributes to a single list token
  */
-function addListAttributesForToken(tokens, token, tokenIndex, opt, listInfo = null, listCloseByOpen = null) {
+function addListAttributesForToken(tokens, token, tokenIndex, opt, listCloseByOpen = null) {
   // Initialize attribute array
   if (!token.attrs) {
     token.attrs = []
   }
   
   // Get marker info
-  const markerInfo = token._markerInfo || listInfo?.markerInfo
+  const markerInfo = token._markerInfo
   
   if (!markerInfo) {
     // Default attributes for lists without markerInfo
@@ -107,13 +94,10 @@ function addListAttributesForToken(tokens, token, tokenIndex, opt, listInfo = nu
   
   // 1. type attribute or role attribute (add first)
   // Always use role="list" for alwaysMarkerSpan
-  if (opt.useCounterStyle) {
-    // When user chooses @counter-style, we avoid role and inline styles.
-    // Still add class so users can target with CSS (e.g., counter-reset/counter-increment or @counter-style usage).
-    // Do not add type attribute (counter-style will handle visuals)
-  } else if (typeAttrs.type && !opt.alwaysMarkerSpan) {
+  if (!opt.useCounterStyle && typeAttrs.type && !opt.alwaysMarkerSpan) {
     addAttr(token, 'type', typeAttrs.type)
-  } else {
+  } else if (!opt.useCounterStyle) {
+    // In non-counter-style mode, custom markers (or alwaysMarkerSpan) use role=list.
     addAttr(token, 'role', 'list')
     if (opt.hasListStyleNone) {
       addAttr(token, 'style', 'list-style: none;')
@@ -149,12 +133,6 @@ function addListAttributesForToken(tokens, token, tokenIndex, opt, listInfo = nu
       addAttr(token, 'class', typeAttrs.class)
     }
   }
-
-  // If user requested @counter-style, add a helper class to identify lists
-  if (opt.useCounterStyle) {
-    // Do not add helper class when using counter-style; user CSS should target generated ol-* classes.
-  }
-  
   // 4. data-marker-prefix/suffix
   if (!opt.omitMarkerMetadata) {
     if (markerInfo.markers[0].prefix) {
@@ -229,9 +207,8 @@ function addListItemValues(tokens, listOpenIndex, markerInfo, listCloseByOpen =
  * Normalize value attributes generated by markdown-it for ordered lists.
  * Remove value attributes for consecutive numbers.
  * @param {Array} tokens - Token array
- * @param {Object} opt - Plugin options
  */
-function normalizeAndConvertValueAttributes(tokens, opt, listCloseByOpen = null) {
+function normalizeAndConvertValueAttributes(tokens, listCloseByOpen = null) {
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i]
 

package/src/phase5-spans.js

@@ -7,15 +7,24 @@ import { buildListCloseIndexMap, findMatchingClose } from './list-helpers.js'
 /**
  * Generate marker spans
  * @param {Array} tokens - Token array
- * @param {Array} listInfos - List information
  * @param {Object} opt - Options
  */
-export function generateSpans(tokens, listInfos, opt) {
+export function generateSpans(tokens, opt) {
   if (opt.useCounterStyle) {
     return
   }
-  const closeMap = buildListCloseIndexMap(tokens)
-  const listCloseByOpen = closeMap.listCloseByOpen
+  const rawSpanClass = opt?.markerSpanClass
+  const normalizedSpanClass = typeof rawSpanClass === 'string'
+    ? rawSpanClass.trim()
+    : ''
+  const spanClass = normalizedSpanClass || 'li-num'
+  let listCloseByOpen = null
+  const getListCloseByOpen = () => {
+    if (!listCloseByOpen) {
+      listCloseByOpen = buildListCloseIndexMap(tokens).listCloseByOpen
+    }
+    return listCloseByOpen
+  }
 
   // Traverse token array and add spans to ordered_list_open tokens
   for (let i = 0; i < tokens.length; i++) {
@@ -23,12 +32,16 @@ export function generateSpans(tokens, listInfos, opt) {
     
     if (token.type === 'ordered_list_open' && token._markerInfo) {
       const markerInfo = token._markerInfo
+      if (opt.alwaysMarkerSpan) {
+        addMarkerSpans(tokens, token, i, markerInfo, opt, spanClass, getListCloseByOpen())
+        continue
+      }
       const firstMarker = markerInfo.markers[0]
       const typeAttrs = getTypeAttributes(markerInfo.type, firstMarker, opt)
       
-      // Generate span if no type attribute (custom marker) or alwaysMarkerSpan mode
-      if (!typeAttrs.type || opt.alwaysMarkerSpan) {
-        addMarkerSpans(tokens, token, i, markerInfo, opt, listCloseByOpen)
+      // Generate span for custom marker lists.
+      if (!typeAttrs.type) {
+        addMarkerSpans(tokens, token, i, markerInfo, opt, spanClass, getListCloseByOpen())
       }
     }
   }
@@ -37,7 +50,7 @@ export function generateSpans(tokens, listInfos, opt) {
 /**
  * Add marker <span> to the first inline token of each list item.
  */
-function addMarkerSpans(tokens, listToken, listIndex, markerInfo, opt, listCloseByOpen = null) {
+function addMarkerSpans(tokens, listToken, listIndex, markerInfo, opt, spanClass, listCloseByOpen = null) {
   // Find end position of this ordered_list
   let listCloseIndex = listCloseByOpen ? listCloseByOpen[listIndex] : -1
   if (typeof listCloseIndex !== 'number' || listCloseIndex === -1) {
@@ -60,55 +73,61 @@ function addMarkerSpans(tokens, listToken, listIndex, markerInfo, opt, listClose
     // Add span only to first inline token in list_item
     else if (token.type === 'inline' && inListItem && !listItemInlineFound) {
       const marker = markerInfo.markers[markerIndex]
-      if (marker && marker.marker) {
-        // Insert span_open, text, span_close before inline token
-        const spanOpen = new tokens[i].constructor('span_open', 'span', 1)
-        const spanClass = (opt && opt.markerSpanClass) ? String(opt.markerSpanClass) : 'li-num'
-        spanOpen.attrSet('class', spanClass)
-        spanOpen.attrSet('aria-hidden', 'true')
-        
-        const text = new tokens[i].constructor('text', '', 0)
-        
-        // Determine marker content
-        // If marker.number exists, get correct symbol based on it
-        let markerContent = marker.marker
-        
-        if (marker.number !== undefined && markerInfo.type) {
-          // Get correct symbol if number is specified
-          const correctSymbol = getSymbolForNumber(markerInfo.type, marker.number)
-          if (correctSymbol) {
-            // Build in prefix + correctSymbol + suffix format
-            markerContent = (marker.prefix || '') + correctSymbol + (marker.suffix || '')
-          }
-        }
-        
-        // Include entire marker (prefix+number+suffix) for alwaysMarkerSpan mode
-        if (!opt.alwaysMarkerSpan) {
-          // Normal mode: remove suffix for custom markers
-          if (marker.suffix && markerContent.endsWith(marker.suffix)) {
-            markerContent = markerContent.slice(0, -marker.suffix.length)
-          }
-        }
-        // Use markerContent as-is (prefix+symbol+suffix) for alwaysMarkerSpan
-        text.content = markerContent
-        
-        const spanClose = new tokens[i].constructor('span_close', 'span', -1)
-        
-        // Initialize children if not exist
-        if (!token.children) {
-          token.children = []
+      if (!marker) {
+        listItemInlineFound = true
+        continue
+      }
+      // Insert span_open, text, span_close before inline token
+      const spanOpen = new tokens[i].constructor('span_open', 'span', 1)
+      spanOpen.attrSet('class', spanClass)
+      spanOpen.attrSet('aria-hidden', 'true')
+      
+      const text = new tokens[i].constructor('text', '', 0)
+      
+      // Determine marker content
+      // If marker.number exists, get correct symbol based on it
+      let markerContent = marker.marker || ''
+      
+      if (marker.number !== undefined && markerInfo.type) {
+        // Get correct symbol if number is specified
+        const correctSymbol = getSymbolForNumber(markerInfo.type, marker.number)
+        if (correctSymbol) {
+          // Build in prefix + correctSymbol + suffix format
+          markerContent = (marker.prefix || '') + correctSymbol + (marker.suffix || '')
         }
-        
-        // Add span element at beginning of children
-        token.children.unshift(spanOpen, text, spanClose)
-        
-        // Add space before content if exists
-        if (token.content) {
-          const spaceToken = new tokens[i].constructor('text', '', 0)
-          spaceToken.content = ' '
-          token.children.push(spaceToken)
+      }
+
+      if (!markerContent) {
+        listItemInlineFound = true
+        continue
+      }
+      
+      // Include entire marker (prefix+number+suffix) for alwaysMarkerSpan mode
+      if (!opt.alwaysMarkerSpan) {
+        // Normal mode: remove suffix for custom markers
+        if (marker.suffix && markerContent.endsWith(marker.suffix)) {
+          markerContent = markerContent.slice(0, -marker.suffix.length)
         }
       }
+      // Use markerContent as-is (prefix+symbol+suffix) for alwaysMarkerSpan
+      text.content = markerContent
+      
+      const spanClose = new tokens[i].constructor('span_close', 'span', -1)
+      
+      // Initialize children if not exist
+      if (!token.children) {
+        token.children = []
+      }
+      
+      // Add span element at beginning of children
+      token.children.unshift(spanOpen, text, spanClose)
+      
+      // Add space before content if exists
+      if (token.content) {
+        const spaceToken = new tokens[i].constructor('text', '', 0)
+        spaceToken.content = ' '
+        token.children.push(spaceToken)
+      }
       listItemInlineFound = true  // First inline of this list_item is processed
     }
     // When list_item_close is found, go to next list_item