mehdown 2.56.0 → 2.58.0

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.58.0] - 2024-02-13
+### Added
+- Added support for collapsibles via the HTML <details> and <summary> elements
+
+## [2.57.0] - 2024-12-04
+### Added
+- Added support for amazon.com affiliate links
+
 ## [2.56.0] - 2024-11-26
 ### Added
 - Added support for <video> tag rendering for .mp4 and .webm links

package/lib/index.js

@@ -706,6 +706,8 @@ exports.render = function(markdown, options, callback) {
             md.linkify.tlds('horse', true);
             md.linkify.tlds('deals', true);
 
+            md.use(require('markdown-it-collapsible'));
+            md.use(require('./plugins/amazon'));
             md.use(require('./plugins/anchors'), { suffix: options.id });
             md.use(require('./plugins/appleMusic'));
             md.use(require('./plugins/audio'));
@@ -786,6 +788,26 @@ exports.render = function(markdown, options, callback) {
             }, function() {
                 callback();
             });
+        },
+        // https://github.com/markdown-it/markdown-it/issues/1031
+        function _urlEncodeFix(callback) {
+            const aElements = exports.html.getElementsByTagName(html, 'a');
+
+            if (!aElements?.length) {
+                return callback();
+            }
+
+            aElements.forEach(aElement => {
+                const href = exports.html.getAttributeValue(aElement, 'href');
+
+                if (!href?.includes('&')) {
+                    return;
+                }
+
+                html = html.replaceAll(`href="${href}"`, `href="${href.replaceAll('&', '&')}"`);
+            });
+
+            return callback();
         }
     ], function(err) {
         if (err) {

package/lib/plugins/amazon.js

@@ -0,0 +1,29 @@
+const regExp = /https?:\/\/(?:[a-z0-9-]+\.)?amazon\.com(?:\/[^\s]*)?(?=\s|$)/i;
+
+module.exports = function(md) {
+    const defaultRender = md.renderer.rules.link_open || function(tokens, idx, options, env, self) {
+        return self.renderToken(tokens, idx, options);
+    };
+
+    md.renderer.rules.link_open = function(tokens, idx, options, env, self) {
+        const openToken = tokens[idx];
+        const hrefIndex = openToken.attrIndex('href');
+
+        // Ensure we have an "href" attribute
+        if (hrefIndex !== -1) {
+            const href = openToken.attrs[hrefIndex][1];
+
+            // Ensure we have an "href" attribute value that matches the Amazon URL pattern
+            if (href && regExp.test(href)) {
+                const url = new URL(href);
+
+                if (!url.searchParams.has('tag')) {
+                    url.searchParams.set('tag', 'mehdown-20');
+                    openToken.attrs[hrefIndex][1] = url.toString();
+                }
+            }
+        }
+
+        return defaultRender(tokens, idx, options, env, self);
+    };
+};

package/lib/plugins/linkRelTarget.js

@@ -1,25 +1,25 @@
 module.exports = function(md, args) {
-    var defaultRender = md.renderer.rules.link_open || function(tokens, idx, options, env, self) {
+    const defaultRender = md.renderer.rules.link_open || function(tokens, idx, options, env, self) {
         return self.renderToken(tokens, idx, options);
     };
 
     md.renderer.rules.link_open = function(tokens, idx, options, env, self) {
-        var baseUrl = (args && args.baseUrl) || (options && options.baseUrl);
+        const baseUrl = args?.baseUrl || options?.baseUrl;
 
         if (baseUrl) {
-            var token = tokens[idx];
-            var hrefIndex = token.attrIndex('href');
+            const token = tokens[idx];
+            const hrefIndex = token.attrIndex('href');
 
             if (hrefIndex !== -1) {
-                var domain = baseUrl.substring(baseUrl.indexOf('//') + 2);
+                const domain = baseUrl.substring(baseUrl.indexOf('//') + 2);
 
-                var href = token.attrs[hrefIndex][1];
+                let href = token.attrs[hrefIndex][1];
                 href = href.substring(href.indexOf('//') > 0 ? href.indexOf('//') + 2 : 0);
 
-                var isLocal = (href.indexOf('/') === 0 && href.indexOf('//') === -1) || href.indexOf(domain) === 0;
+                const isLocal = (href.indexOf('/') === 0 && href.indexOf('//') === -1) || href.indexOf(domain) === 0;
 
                 if (!isLocal) {
-                    var relIndex = token.attrIndex('rel');
+                    const relIndex = token.attrIndex('rel');
 
                     if (relIndex === -1) {
                         token.attrPush(['rel', 'nofollow']);
@@ -27,7 +27,7 @@ module.exports = function(md, args) {
                         token.attrs[relIndex][1] = 'nofollow';
                     }
 
-                    var targetIndex = token.attrIndex('target');
+                    const targetIndex = token.attrIndex('target');
 
                     if (targetIndex === -1) {
                         token.attrPush(['target', '_blank']);
@@ -40,4 +40,4 @@ module.exports = function(md, args) {
 
         return defaultRender(tokens, idx, options, env, self);
     };
-};
+};

package/package.json

@@ -1,19 +1,20 @@
 {
     "dependencies": {
-        "async": "~3.2.0",
+        "async": "~3.2.6",
         "emoji-toolkit": "~6.6.0",
         "flip": "~1.0.0",
         "lolspeak": "~1.4.0",
         "markdown-it": "~14.1.0",
+        "markdown-it-collapsible": "~2.0.2",
         "mehdown-cowsay": "~1.1.6",
         "minimist": "~1.2.5",
         "natural": "~5.2.4",
         "probe-image-size": "~7.2.0",
         "rel-to-abs": "~0.1.0",
-        "request": "~2.88.0",
+        "request": "~2.88.2",
         "roll": "~1.3.1",
         "shell-quote": "~1.8.0",
-        "slug": "~9.0.0",
+        "slug": "~9.1.0",
         "textify": "~0.0.12",
         "youtube-search": "~1.1.4"
     },
@@ -33,5 +34,5 @@
         "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
         "test": "mocha --reporter spec test/*"
     },
-    "version": "2.56.0"
+    "version": "2.58.0"
 }