markdown-magic 3.3.2 → 3.4.0

package/lib/index.js

@@ -9,6 +9,7 @@ const remoteTransform = require('./transforms/remote')
 const { getSyntaxInfo } = require('./utils/syntax')
 const { onlyUnique, getCodeLocation, pluralize } = require('./utils')
 const { readFile, resolveOutputPath, resolveFlatPath } = require('./utils/fs')
+const stringBreak = require('./utils/string-break')
 const { processFile } = require('./process-file')
 const { processContents } = require('./process-contents')
 const { parseMarkdown } = require('@davidwells/md-utils')
@@ -737,9 +738,14 @@ async function asyncForEach(array, callback) {
   }
 }
 
+const stringUtils = {
+  stringBreak
+}
+
 module.exports = {
   markdownMagic,
   parseMarkdown,
   processContents,
-  processFile
+  processFile,
+  stringUtils
 }

package/lib/utils/string-break.js

@@ -0,0 +1,140 @@
+const stringWidth = require('string-width')
+
+const openPunctuations = [
+  '“',
+  '‘',
+  '（',
+  '《',
+  '〈',
+  '〔',
+  '【',
+
+  '(',
+  '[',
+  '{',
+]
+
+function isOpenPunctuation(char) {
+  return openPunctuations.includes(char)
+}
+
+const closePunctuations = [
+  '。',
+  '？',
+  '！',
+  '，',
+  '、',
+  '；',
+  '”',
+  '’',
+  '）',
+  '》',
+  '〉',
+  '〕',
+  '】',
+
+  '.',
+  '?',
+  '!',
+  ',',
+  ';',
+  ')',
+  ']',
+  '}',
+]
+
+function isClosePunctuation(char) {
+  return closePunctuations.includes(char)
+}
+
+const otherPunctuations = [
+  '：',
+  '─',
+  '…',
+  '·',
+
+  ':',
+  '-',
+  '–',
+  '—',
+  '"',
+  "'",
+]
+
+function isPunctuation(char) {
+  return (
+    openPunctuations.includes(char) ||
+    closePunctuations.includes(char) ||
+    otherPunctuations.includes(char)
+  )
+}
+
+function isFullWidthChar(char) {
+  return /[\u4e00-\u9fa5]/.test(char)
+}
+
+function getNextBreakPoint(str, width, from, lastIndex) {
+  let idealIndex = from
+  const length = str.length
+  let subWidth = 0
+
+  do {
+    idealIndex++
+    subWidth = stringWidth(str.slice(from, idealIndex))
+  } while (subWidth <= width && idealIndex <= length)
+
+  let index = idealIndex - 1
+
+  if (index >= length) {
+    return length
+  }
+
+  while (index > lastIndex) {
+    const preValue = str.charAt(index - 1)
+    const value = str.charAt(index)
+    const canBreak =
+      preValue === ' ' ||
+      value === ' ' ||
+      (isFullWidthChar(value) && isFullWidthChar(preValue)) ||
+      (isClosePunctuation(preValue) && !isPunctuation(value)) ||
+      (!isPunctuation(preValue) && isOpenPunctuation(value)) ||
+      (isClosePunctuation(preValue) && isOpenPunctuation(value))
+
+    if (canBreak) {
+      break
+    } else {
+      index--
+    }
+  }
+
+  if (index <= lastIndex) {
+    index = idealIndex
+  }
+
+  return index
+}
+
+function stringBreak(str, width) {
+  if (width < 2) {
+    throw new Error('Width must be greater than 2')
+  }
+
+  const length = str.length
+  let index = 0
+  let breakPoint = 0
+  let line
+  const lines = []
+
+  while (index < length) {
+    breakPoint = getNextBreakPoint(str, width, index, breakPoint)
+    line = str.slice(index, breakPoint).trim()
+
+    lines.push(line)
+
+    index = breakPoint
+  }
+
+  return lines
+}
+
+module.exports = stringBreak

package/lib/utils/toc.js

@@ -1,4 +1,4 @@
-const { transform } = require('@technote-space/doctoc')
+const { generateToc : generateTocUtils } = require('@davidwells/md-utils')
 const { removeLeadingAndTrailingLineBreaks, escapeRegexString } = require('./regex')
 const { findMinIndent } = require('./text')
 const { readFile } = require('./fs')
@@ -75,8 +75,11 @@ async function generateToc({
     // separator: '<span>|</span>',
     // footer: 'end',
   }
-  const t = await transform(contents, tocOptions)
-  let outputText = t.wrappedToc || ''
+
+  const tocObject = generateTocUtils(contents)
+
+  //  let outputText = t.wrappedToc || ''
+  let outputText = tocObject.text || ''
 
   if (debugFileMatch) {
     console.log('before firsth1 removal', outputText)
@@ -247,7 +250,9 @@ async function generateToc({
       // console.log('single', single)
       const subItems = outputText.match(findSubToc)
       if (subItems) {
-        const items = subItems[0].replace(single, '').split('\n')
+        const items = subItems[0]
+          .replace(single, '')
+          .split('\n')
           .filter(Boolean)
         // console.log('items', items)
         const finalItems = items // .slice(1, items.length)
@@ -277,7 +282,6 @@ ${outputText
 
 </details>`
   }
-
   return outputText.replace(removeLeadingAndTrailingLineBreaks, '')
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-magic",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "Automatically update markdown files with content from external sources",
   "main": "lib/index.js",
   "bin": {
@@ -43,8 +43,7 @@
     "url": "https://github.com/DavidWells/markdown-magic"
   },
   "dependencies": {
-    "@davidwells/md-utils": "^0.0.40",
-    "@technote-space/doctoc": "2.4.7",
+    "@davidwells/md-utils": "^0.0.44",
     "globrex": "^0.1.2",
     "gray-matter": "^4.0.3",
     "is-glob": "^4.0.3",
@@ -55,6 +54,7 @@
     "node-fetch": "^2.7.0",
     "oparser": "^3.0.22",
     "smart-glob": "^1.0.2",
+    "string-width": "^4.2.3",
     "sync-request": "^6.1.0"
   },
   "devDependencies": {