markdown-magic 3.3.0 → 3.3.1

package/lib/transforms/file.js

@@ -5,7 +5,6 @@ const isLocalPath = require('is-local-path')
 module.exports = function FILE(api) {
   /*
   console.log('FILE API', api)
-
   /** */
   const { options, srcPath } = api
   if (!options.src) {
@@ -19,6 +18,10 @@ module.exports = function FILE(api) {
       // console.log('READFILE', resolvedFilePath)
       fileContents = fs.readFileSync(resolvedFilePath, 'utf8')
     } catch (e) {
+      // if demo path. Todo probably remove
+      if (options.src === './path/to/file') {
+        return api.content
+      }
       console.log(`FILE NOT FOUND ${resolvedFilePath}`)
       throw e
     }

package/lib/transforms/remote.js

@@ -4,6 +4,7 @@ module.exports = async function REMOTE(api) {
   // console.log('REMOTE api', api)
   const { options, content, settings } = api
   const { regex } = settings
+
   // console.log('MAKE REMOTE REQUEST')
   const remoteContent = await remoteRequest(options.url, settings, api.srcPath)
   if (!remoteContent) {

package/lib/utils/remoteRequest.js

@@ -26,6 +26,10 @@ function remoteRequestSync(url, settings = {}, srcPath) {
 async function remoteRequest(url, settings = {}, srcPath) {
   let body
   const finalUrl = formatUrl(url)
+  // ignore demo url todo remove one day
+  if (finalUrl === 'http://url-to-raw-md-file.md') {
+    return
+  }
   try {
     const res = await fetch(finalUrl)
     body = await res.text()

package/lib/utils/text.js

@@ -1,3 +1,4 @@
+const { match } = require('uvu/assert')
 const { syntaxMap } = require('./syntax')
 
 function getLines(str = '') {
@@ -77,7 +78,7 @@ function getTextBetweenLines(content, startLine, endLine) {
   if (startDefined && !endDefined) {
     return lines.slice(startLine - 1, startLine).join('')
   }
-  if ((startLine) && (endLine) && parseInt(startLine, 10) <= parseInt(endLine, 10)) {
+  if (startLine && endLine && parseInt(startLine, 10) <= parseInt(endLine, 10)) {
     return lines.slice(startLine - 1, endLine).join('\n')
   }
 }
@@ -119,7 +120,11 @@ function indentString(string, count = 1, options = {}) {
 		includeEmptyLines = false
 	} = options;
 	if (count === 0) return string
-	const regex = includeEmptyLines ? /^/gm : /^(?!\s*$)/gm
+	// const regex = includeEmptyLines ? /^/gm : /^(?!\s*$)/gm
+  const indentPattern = indent.repeat(count)
+  const regex = includeEmptyLines
+    ? new RegExp(`^(?!${indentPattern})`, 'gm')
+    : new RegExp(`^(?!${indentPattern})(?!\\s*$)`, 'gm')
 	return string.replace(regex, indent.repeat(count))
 }
 
@@ -133,14 +138,14 @@ function dedentString(str) {
   str = str.replace(/^[ \t]*\r?\n/, ''); // remove leading blank line
   var indent = /^[ \t]+/m.exec(str); // detected indent
   if (indent) str = str.replace(new RegExp('^' + indent[0], 'gm'), ''); // remove indent
-  return str.replace(/(\r?\n)[ \t]+$/, '$1'); // remove trailling blank line
+  return str.replace(/(\r?\n)[ \t]+$/, '$1'); // remove trailing blank line
 }
 
 /**
  * Strip out comment blocks
  * @param {string} str 
  * @param {'md' | 'js'} syntax 
- * @returns {string} clean commentless string
+ * @returns {string} clean comment-less string
  */
 function stripCommentBlockOld(str, syntax = 'md') {
   const [ openPattern, closePattern ] = syntaxMap[syntax].pattern
@@ -177,7 +182,7 @@ function stripCommentBlockOld(str, syntax = 'md') {
  * Strip out comment blocks
  * @param {string} str 
  * @param {typeof import('../types')['syntaxType']} syntax 
- * @returns {string} clean commentless string
+ * @returns {string} clean comment-less string
  */
 function stripComments(str, syntax = 'md') {
   const syntaxData = syntaxMap[syntax]
@@ -204,6 +209,7 @@ function stripOutMultilineJsComments(str = '') {
   })
 }
 
+
 // @TODO export as util to import into CODE
 function stripHTMLComments(block, opts) {
   const options = opts || {}
@@ -231,8 +237,8 @@ function stripHTMLComments(block, opts) {
     console.log('trailingNewLine', trailingNewLine)
     /** */
     const newLineCount = (trailingNewLine || '').length
-    const trailing = (!trailingText && newLineCount > 1) ? `${trailingNewLine || ''}` : ''
-    const leading = (leadingSpace) ? leadingSpace.slice(1) : ''
+    const trailing = (!trailingText && !leadingText && newLineCount >= 1) ? `${trailingNewLine || ''}` : ''
+    let leading = (leadingSpace) ? leadingSpace : ''
 
     if (options.multilineOnly && comment.indexOf('\n') === -1) {
       continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-magic",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Automatically update markdown files with content from external sources",
   "main": "lib/index.js",
   "bin": {
@@ -21,7 +21,6 @@
     "test": "npm run test:lib && npm run test:test && echo 'tests done'",
     "test:lib": "uvu lib '.test.([mc]js|[jt]sx?)$'",
     "test:test": "uvu test '.test.([mc]js|[jt]sx?)$'",
-    "test:options": "uvu lib 'options-parser.test.([mc]js|[jt]sx?)$'",
     "test:block": "uvu lib 'block-parser.test.([mc]js|[jt]sx?)$'",
     "test:cli": "uvu lib 'cli.test.([mc]js|[jt]sx?)$'",
     "test:md": "uvu lib 'md.test.([mc]js|[jt]sx?)$'",
@@ -54,7 +53,7 @@
     "micro-mdx-parser": "^1.1.0",
     "mri": "^1.2.0",
     "node-fetch": "^2.7.0",
-    "oparser": "^3.0.13",
+    "oparser": "^3.0.22",
     "smart-glob": "^1.0.2",
     "sync-request": "^6.1.0"
   },