markshell 1.5.0 → 1.7.0

package/lib/admonitions/index.js

@@ -95,21 +95,23 @@ const offset = () => {
 
     let offsetLength;
 
-    // console.log(typeof this.styles.indent.beforeIndent, this.styles.indent.beforeIndent);
-    // console.log(typeof this.styles.indent.afterIndent, this.styles.indent.afterIndent);
-    // console.log(typeof this.styles.indent.titleIndent, this.styles.indent.titleIndent);
+    const currentStyles = styles || formatBlock;
 
-    offsetLength = (this.styles.indent.beforeIndent) + 2 + this.styles.indent.afterIndent + this.styles.indent.titleIndent;
+    // console.log(typeof currentStyles.indent.beforeIndent, currentStyles.indent.beforeIndent);
+    // console.log(typeof currentStyles.indent.afterIndent, currentStyles.indent.afterIndent);
+    // console.log(typeof currentStyles.indent.titleIndent, currentStyles.indent.titleIndent);
+
+    offsetLength = (currentStyles.indent.beforeIndent) + 2 + currentStyles.indent.afterIndent + currentStyles.indent.titleIndent;
 
     // console.log(process.stdout.columns < offsetLength, offsetLength);
 
     if (process.stdout.columns < offsetLength) {
 
-        this.styles.indent.beforeIndent = defBeforeIndent;
-        this.styles.indent.afterIndent = defAfterIndent;
-        this.styles.indent.titleIndent = defTitleIndent;
+        currentStyles.indent.beforeIndent = defBeforeIndent;
+        currentStyles.indent.afterIndent = defAfterIndent;
+        currentStyles.indent.titleIndent = defTitleIndent;
 
-        offsetLength = this.styles.indent.beforeIndent + 2 + this.styles.indent.afterIndent + this.styles.indent.titleIndent;
+        offsetLength = currentStyles.indent.beforeIndent + 2 + currentStyles.indent.afterIndent + currentStyles.indent.titleIndent;
 
     }
 
@@ -119,18 +121,19 @@ const offset = () => {
 
 const formatOutput = (title, style) => {
 
+    const currentStyles = styles || formatBlock;
     let indentOffset = offset();
     let outTitle = " " + title + " "
 
-    if (this.styles.indent.beforeIndent === 0 && this.styles.indent.titleIndent === 0) {
+    if (currentStyles.indent.beforeIndent === 0 && currentStyles.indent.titleIndent === 0) {
         outTitle = title + " ";
     }
 
-    return " ".repeat(this.styles.indent.beforeIndent) +
-        style(" ".repeat(this.styles.indent.titleIndent)) +
+    return " ".repeat(currentStyles.indent.beforeIndent) +
+        style(" ".repeat(currentStyles.indent.titleIndent)) +
         chalk.bgHex('#000').white(outTitle) +
         style(" ".repeat(process.stdout.columns - indentOffset - title.length)) +
-        chalk.bgHex('#000')(" ".repeat(this.styles.indent.afterIndent)) +
+        chalk.bgHex('#000')(" ".repeat(currentStyles.indent.afterIndent)) +
         EOL;
 
 }
@@ -226,13 +229,13 @@ const _getBlocks = (content, beforeIndent, afterIndent, titleIndent, useSafeStyl
  */
 const _getStyles = () => {
 
-    if (this.styles === null || this.styles === undefined) {
+    if (styles === null || styles === undefined) {
 
         return formatBlock;
 
     } else {
 
-        return this.styles;
+        return styles;
 
     }
 
@@ -240,7 +243,7 @@ const _getStyles = () => {
 
 const _setStyles = (styleBlock) => {
 
-    this.styles = styleBlock;
+    styles = styleBlock;
 
 }
 

package/lib/index.js

@@ -7,6 +7,15 @@ const syntaxHighlighter = require('./syntaxhighlighter');
 const admonitions = require('./admonitions');
 const EOL = require('os').EOL;
 
+/**
+ * Escape special regex characters to prevent ReDoS attacks
+ * @param {string} str - String to escape
+ * @returns {string} - Escaped string safe for use in RegExp
+ */
+const escapeRegex = (str) => {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+};
+
 const theme = require('./syntaxhighlighter/themes/okaidia.theme');
 let _theme;
 
@@ -96,7 +105,7 @@ const _highlightText = (content, regexMatch, colorFunction, removeChars = null)
 
             if (removeChars === null) {
 
-                let findAllRegex = new RegExp(match[0], "ig");
+                let findAllRegex = new RegExp(escapeRegex(match[0]), "ig");
 
                 newContent = newContent.replace(findAllRegex, colorFunction(match[1]));
 
@@ -191,13 +200,13 @@ const _codeBlock = (content) => {
 
         if (langIdentifiere.length === 1) {
 
-            let lang = langIdentifiere[0].replace(/\`\`\`/, '').replace(/\r?\n/, '');
+            let lang = langIdentifiere[0].replace(/```/, '').replace(/\n/, '');
 
             //Replace language
-            let source = element.replace(`\`\`\`${lang}\r?\n`, '');
+            let source = element.replace(`\`\`\`${lang}\n`, '');
 
             //Replace ```
-            source = source.replace(`\`\`\``, '');
+            source = source.replace('```', '');
 
             try {
                 let hlSource = syntaxHighlighter.highlight(source, lang.trim(), this._theme.sourceCodeTheme);
@@ -237,7 +246,7 @@ const _highlightedCodeBlock = (content) => {
 
         if (langIdentifiere.length === 1) {
 
-            let lang = langIdentifiere[0].replace(/\`\`\`/, '').replace(/\r?\n/, '').trim();
+            let lang = langIdentifiere[0].replace(/\`\`\`/, '').replace(/\n/, '').trim();
 
             //Replace language
             let source = element.replace(`\`\`\`${lang}\n`, '');
@@ -274,7 +283,7 @@ const _highlightedCodeBlock = (content) => {
  */
 const _addBlockQuote = (content, indentLeft = 3, indentRight = 3) => {
 
-    let newContent = content.split(EOL);
+    let newContent = content.split('\n');
     var columns = process.stdout.columns - 4;
     let maxWordLength = columns - indentLeft - indentRight;
 
@@ -299,7 +308,7 @@ const _addBlockQuote = (content, indentLeft = 3, indentRight = 3) => {
 
                     curLine = calcLine;
 
-                    newLine += EOL + element;
+                    newLine += '\n' + element;
 
                 } else {
 
@@ -322,7 +331,7 @@ const _addBlockQuote = (content, indentLeft = 3, indentRight = 3) => {
                 newContent[index] += " ".repeat(indentLeft) +
                     this._theme.blockQuote(
                         line.trim() + fillUpString
-                    ) + EOL;
+                    ) + '\n';
 
             })
 
@@ -330,7 +339,7 @@ const _addBlockQuote = (content, indentLeft = 3, indentRight = 3) => {
 
     })
 
-    return newContent.join(EOL);
+    return newContent.join('\n');
 
 }
 
@@ -379,7 +388,7 @@ const _includeExternals = (content, externalFound, baseDir, regexDelimiter) => {
 
     for (let i = 0; i < keys.length; i++) {
 
-        var regExp = new RegExp(keys[i], 'ig');
+        var regExp = new RegExp(escapeRegex(keys[i]), 'ig');
         newContent = newContent.replace(regExp, replacements[keys[i]]);
 
     }
@@ -452,7 +461,7 @@ const _addBold = (content) => {
  */
 const _addItalic = (content) => {
 
-    let regExp = new RegExp(/\b(\_(.*?)\_\b)/ig);
+    let regExp = new RegExp(/(?<!\w)_([^_\n]+?)_(?!\w)/g);
 
     return _highlightText(content, regExp, this._theme.italic);
 
@@ -485,7 +494,7 @@ const _addCode = (content) => {
 const _addInlineCode = (content) => {
 
     // return _highlightText(content, /\`/ig, this._theme.inlineCode);
-    return _highlightText(content, /`(.*?[^`])`/ig, this._theme.inlineCode);
+    return _highlightText(content, /`([^`]*)`/g, this._theme.inlineCode);
 
 }
 
@@ -597,7 +606,7 @@ const _addDefinitionList = (content, leftIndent = 3) => {
 
             });
 
-            contentBlocks[index] = formattedLines.join(EOL);
+            contentBlocks[index] = formattedLines.join('\n');
 
         }
 
@@ -605,7 +614,7 @@ const _addDefinitionList = (content, leftIndent = 3) => {
 
     // console.log(contentBlocks);
 
-    return contentBlocks.join(EOL);
+    return contentBlocks.join('\n');
 
 }
 
@@ -651,7 +660,7 @@ const _toRawContent = (filepath) => {
     }
 
     try {
-        content = _removeImages(content, /\!\[(?<alttag>.*?)\]\((.*?) \"(.*?)\"\)/ig);
+        content = _removeImages(content, /!\[([^\]]*)\]\(([^)"'\s]+)(?:\s+["']([^"']*)["'])?\)/g);
     } catch (e) {
         throw `Error in remove images: ${e}`;
     }
@@ -739,7 +748,7 @@ const _toRawContent = (filepath) => {
 
     }
 
-    return content;
+    return content.replace(/\n/ig, EOL);
 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markshell",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "markshell allows you to output any markdown file formatted and style to the console",
   "keywords": [
     "markdown",
@@ -22,7 +22,11 @@
   },
   "homepage": "https://github.com/stfbauer/markshell#readme",
   "scripts": {
-    "test": "node test/index.js",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run",
+    "test:coverage": "vitest --coverage",
+    "test:old": "node test/index.js",
     "testRun": "node ./lib/index.js",
     "update-types": "./tools/typings.sh"
   },
@@ -38,16 +42,18 @@
   "author": "Stefan Bauer",
   "license": "MIT",
   "dependencies": {
-    "@types/node": "^10.17.28",
-    "@types/prismjs": "1.16",
+    "@types/prismjs": "1.26",
     "chalk": "^4.1.2",
-    "jsdom": "^16.4.0",
-    "prismjs": "^1.25.0",
-    "wrap-ansi": "^7.0.0"
+    "jsdom": "^27.3.0",
+    "prismjs": "^1.30.0",
+    "wrap-ansi": "^9.0.2"
   },
   "devDependencies": {
-    "@types/node": "^10.17.28",
-    "@types/prismjs": "^1.16.1"
+    "@types/node": "^24.10.2",
+    "@types/prismjs": "^1.16.1",
+    "@vitest/coverage-v8": "^1.6.1",
+    "@vitest/ui": "^1.0.0",
+    "vitest": "^1.0.0"
   },
   "repository": {
     "type": "git",