markdown-magic 3.2.0 → 3.3.0

package/lib/transforms/code/index.js

@@ -3,7 +3,7 @@ const path = require('path')
 const { remoteRequest } = require('../../utils/remoteRequest')
 const { isLocalPath } = require('../../utils/fs')
 const { deepLog } = require('../../utils/logs')
-const { getLineCount, getTextBetweenLines, stripOutMultiLineDoubleDashComments } = require('../../utils/text')
+const { getLineCount, getTextBetweenLines, stripMultiLineDoubleDashComments, stripHTMLComments } = require('../../utils/text')
 const { resolveGithubContents, isGithubLink } = require('./resolve-github-file')
 
 const GITHUB_LINK = /https:\/\/github\.com\/([^/\s]*)\/([^/\s]*)\/blob\//
@@ -133,6 +133,9 @@ module.exports = async function CODE(api) {
     }
   }
 
+  /* Ensure lowercase on syntax */
+  syntax = (syntax || '').toLowerCase()
+
   /* Check for Id */
   if (id) {
     const lines = code.split("\n")
@@ -163,9 +166,13 @@ module.exports = async function CODE(api) {
   if (options.header) {
     header = `\n${options.header}`
   }
-
+  
   if (options.trimDeadCode) {
-    code = stripOutMultiLineDoubleDashComments(code)
+    if (syntax === 'js' || syntax === 'ts' || syntax === 'javascript' || syntax === 'typescript') {
+      code = stripMultiLineDoubleDashComments(code)
+    } else if (syntax === 'html') {
+      code = stripHTMLComments(code, { multilineOnly: true })
+    }
   }
 
   return `\`\`\`${syntax}${header}

package/lib/utils/text.js

@@ -193,7 +193,7 @@ function stripComments(str, syntax = 'md') {
 
 
 // https://regex101.com/r/nCnt2J/1
-function stripOutMultiLineDoubleDashComments(str = '') {
+function stripMultiLineDoubleDashComments(str = '') {
   return str.replace(/(?:\n\s*\/\/.*){2,}/g, '')
 }
 
@@ -205,7 +205,8 @@ function stripOutMultilineJsComments(str = '') {
 }
 
 // @TODO export as util to import into CODE
-function stripAllHTMLComments(block) {
+function stripHTMLComments(block, opts) {
+  const options = opts || {}
   // ([^\s]*)?([ \t]*)?(\/\*{1,}[\n\*]*(\s?[\s\S]*?)?\*\/)([^\s<]*)?(\n{1,2})?
   // https://regex101.com/r/WSioZ7/1
   const pattern = new RegExp(`([^\\s]*)?([ \\t]*)?(<!-{2,}(\\s?[\\s\\S]*?)?-{2,}>)([^\\s<]*)?(\n{1,2})?`, 'gi')
@@ -232,6 +233,10 @@ function stripAllHTMLComments(block) {
     const newLineCount = (trailingNewLine || '').length
     const trailing = (!trailingText && newLineCount > 1) ? `${trailingNewLine || ''}` : ''
     const leading = (leadingSpace) ? leadingSpace.slice(1) : ''
+
+    if (options.multilineOnly && comment.indexOf('\n') === -1) {
+      continue
+    }
     remove.push(`${leading}${comment}${trailing}`)
   }
   return remove.reduce((acc, curr) => {
@@ -341,7 +346,8 @@ module.exports = {
   dedentString,
   stripComments,
   convertCommentSyntax,
-  stripOutMultiLineDoubleDashComments,
+  stripMultiLineDoubleDashComments,
+  stripHTMLComments,
   // stripCommentBlockJS,
   trimString,
   // future https://github.com/junfengliang/autowrap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-magic",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Automatically update markdown files with content from external sources",
   "main": "lib/index.js",
   "bin": {