FIx lint error, add test in travis and Appveyor

trunkcode · Apr 16, 2021 · 9d6554a · 9d6554a
1 parent 5c2d9bd
commit 9d6554a
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,5 @@ install:
   npm install --dev
 script:
   - npm run lint
+  - npm run test:download
   - npm run test:title
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Build Status][travis-image]][travis-url]
 [![AppVeyor Build Status][appveyor-image]][appveyor-url]
 
-[Remarkable](https://www.npmjs.com/package/remarkable) plugin adds `title` attribute on link and image tags.
+[Remarkable](https://www.npmjs.com/package/remarkable) plugin adds `title` attribute on URL and image tags and `download` attribute on URL if `title` set to `download`.
 
 ## Install
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -21,6 +21,7 @@ install:
 
 test_script:
   - npm run lint
+  - npm run test:download
   - npm run test:title
 
 build: off
diff --git a/index.js b/index.js
@@ -22,17 +22,32 @@ const remarkableSeo = (md, options) => {
             return defaultImageRender(tokens, idx, ...args);
         };
     }
-    if ((config.link && config.link.includes('title')) || config.download) {
+    if (config.link && config.link.includes('title')) {
+        const defaultLinkRender = md.renderer.rules.link_open;
+        md.renderer.rules.link_open = (tokens, idx, ...args) => {
+            tokens.map((token) => {
+                if (token && token.title === '') {
+                    const linkTextId = idx + 1;
+                    if (tokens[linkTextId]) {
+                        const linkContent = tokens[linkTextId];
+                        if (linkContent.type === 'text') {
+                            token.title = linkContent.content;
+                        }
+                    }
+                }
+            });
+            return defaultLinkRender(tokens, idx, ...args);
+        };
+    }
+    if (config.download) {
         const defaultLinkRender = md.renderer.rules.link_open;
         md.renderer.rules.link_open = (tokens, idx, ...args) => {
             let downloadAttr = false;
             tokens.map((token) => {
                 if (token) {
-                    if (token.title === '' || token.title === 'download') {
+                    if (token.title === 'download') {
                         const linkTextId = idx + 1;
-                        if (config.download && token.title === 'download') {
-                            downloadAttr = true;
-                        }
+                        downloadAttr = true;
                         if (tokens[linkTextId]) {
                             const linkContent = tokens[linkTextId];
                             if (linkContent.type === 'text') {

diff --git a/src/index.ts b/src/index.ts
@@ -34,20 +34,38 @@ const remarkableSeo = (md: Remarkable, options?: types.configOptions): void => {
     };
   }
 
-  if ((config.link && config.link.includes('title')) || config.download) {
+  if (config.link && config.link.includes('title')) {
     const defaultLinkRender = md.renderer.rules.link_open;
 
     // eslint-disable-next-line camelcase
     md.renderer.rules.link_open = (tokens: Remarkable.LinkOpenToken[], idx: number, ...args: []) => {
-      let downloadAttr: boolean = false;
       tokens.map((token: Remarkable.LinkOpenToken) => {
-        if (token) {
-          if (token.title === '' || token.title === 'download') {
-            const linkTextId = idx + 1;
-            if (config.download && token.title === 'download') {
-              downloadAttr = true;
+        if (token && token.title === '') {
+          const linkTextId = idx + 1;
+          if (tokens[linkTextId]) {
+            const linkContent: Remarkable.ContentToken = tokens[linkTextId];
+            if (linkContent.type === 'text') {
+              token.title = linkContent.content;
             }
+          }
+        }
+      });
+
+      return defaultLinkRender(tokens, idx, ...args);
+    };
+  }
 
+  if (config.download) {
+    const defaultLinkRender = md.renderer.rules.link_open;
+
+    // eslint-disable-next-line camelcase
+    md.renderer.rules.link_open = (tokens: Remarkable.LinkOpenToken[], idx: number, ...args: []) => {
+      let downloadAttr = false;
+      tokens.map((token: Remarkable.LinkOpenToken) => {
+        if (token) {
+          if (token.title === 'download') {
+            const linkTextId = idx + 1;
+            downloadAttr = true;
             if (tokens[linkTextId]) {
               const linkContent: Remarkable.ContentToken = tokens[linkTextId];
               if (linkContent.type === 'text') {