markdownlint 0.24.0 → 0.26.0

package/lib/md039.js

@@ -4,7 +4,8 @@
 
 const { addErrorContext, filterTokens } = require("../helpers");
 
-const spaceInLinkRe = /\[(?:\s+(?:[^\]]*?)\s*|(?:[^\]]*?)\s+)](?=\(\S*\))/;
+const spaceInLinkRe =
+  /\[(?:\s+(?:[^\]]*?)\s*|(?:[^\]]*?)\s+)](?=((?:\([^)]*\))|(?:\[[^\]]*\])))/;
 
 module.exports = {
   "names": [ "MD039", "no-space-in-links" ],
@@ -17,8 +18,8 @@ module.exports = {
       let inLink = false;
       let linkText = "";
       let lineIndex = 0;
-      children.forEach((child) => {
-        const { content, type } = child;
+      for (const child of children) {
+        const { content, markup, type } = child;
         if (type === "link_open") {
           inLink = true;
           linkText = "";
@@ -56,9 +57,11 @@ module.exports = {
           lineNumber++;
           lineIndex = 0;
         } else if (inLink) {
-          linkText += content;
+          linkText += type.endsWith("_inline") ?
+            `${markup}${content}${markup}` :
+            (content || markup);
         }
-      });
+      }
     });
   }
 };

package/lib/md042.js

@@ -2,11 +2,9 @@
 
 "use strict";
 
-const { addErrorContext, filterTokens, rangeFromRegExp } =
+const { addErrorContext, escapeForRegExp, filterTokens } =
   require("../helpers");
 
-const emptyLinkRe = /\[[^\]]*](?:\((?:#?|(?:<>))\))/;
-
 module.exports = {
   "names": [ "MD042", "no-empty-links" ],
   "description": "No empty links",
@@ -16,27 +14,36 @@ module.exports = {
       let inLink = false;
       let linkText = "";
       let emptyLink = false;
-      token.children.forEach(function forChild(child) {
+      for (const child of token.children) {
         if (child.type === "link_open") {
           inLink = true;
           linkText = "";
-          child.attrs.forEach(function forAttr(attr) {
+          for (const attr of child.attrs) {
             if (attr[0] === "href" && (!attr[1] || (attr[1] === "#"))) {
               emptyLink = true;
             }
-          });
+          }
         } else if (child.type === "link_close") {
           inLink = false;
           if (emptyLink) {
-            addErrorContext(onError, child.lineNumber,
-              "[" + linkText + "]()", null, null,
-              rangeFromRegExp(child.line, emptyLinkRe));
+            let context = `[${linkText}]`;
+            let range = null;
+            const match = child.line.match(
+              new RegExp(`${escapeForRegExp(context)}\\((?:|#|<>)\\)`)
+            );
+            if (match) {
+              context = match[0];
+              range = [ match.index + 1, match[0].length ];
+            }
+            addErrorContext(
+              onError, child.lineNumber, context, null, null, range
+            );
             emptyLink = false;
           }
         } else if (inLink) {
           linkText += child.content;
         }
-      });
+      }
     });
   }
 };

package/lib/md043.js

@@ -13,14 +13,13 @@ module.exports = {
     const requiredHeadings = params.config.headings || params.config.headers;
     if (Array.isArray(requiredHeadings)) {
       const levels = {};
-      [ 1, 2, 3, 4, 5, 6 ].forEach((level) => {
+      for (const level of [ 1, 2, 3, 4, 5, 6 ]) {
         levels["h" + level] = "######".substr(-level);
-      });
+      }
       let i = 0;
       let matchAny = false;
       let hasError = false;
       let anyHeadings = false;
-      // eslint-disable-next-line func-style
       const getExpected = () => requiredHeadings[i++] || "[None]";
       forEachHeading(params, (heading, content) => {
         if (!hasError) {

package/lib/md044.js

@@ -3,8 +3,10 @@
 "use strict";
 
 const { addErrorDetailIf, bareUrlRe, escapeForRegExp, forEachLine,
-  overlapsAnyRange, linkRe, linkReferenceRe } = require("../helpers");
-const { inlineCodeSpanRanges, lineMetadata } = require("./cache");
+  forEachLink, withinAnyRange, linkReferenceDefinitionRe } =
+  require("../helpers");
+const { codeBlockAndSpanRanges, htmlElementRanges, lineMetadata } =
+  require("./cache");
 
 module.exports = {
   "names": [ "MD044", "proper-names" ],
@@ -15,28 +17,34 @@ module.exports = {
     names = Array.isArray(names) ? names : [];
     names.sort((a, b) => (b.length - a.length) || a.localeCompare(b));
     const codeBlocks = params.config.code_blocks;
-    const includeCodeBlocks = (codeBlocks === undefined) ? true : !!codeBlocks;
+    const includeCodeBlocks =
+      (codeBlocks === undefined) ? true : !!codeBlocks;
+    const htmlElements = params.config.html_elements;
+    const includeHtmlElements =
+      (htmlElements === undefined) ? true : !!htmlElements;
     const exclusions = [];
     forEachLine(lineMetadata(), (line, lineIndex) => {
-      if (linkReferenceRe.test(line)) {
+      if (linkReferenceDefinitionRe.test(line)) {
         exclusions.push([ lineIndex, 0, line.length ]);
       } else {
         let match = null;
         while ((match = bareUrlRe.exec(line)) !== null) {
           exclusions.push([ lineIndex, match.index, match[0].length ]);
         }
-        while ((match = linkRe.exec(line)) !== null) {
-          const [ , text, destination ] = match;
+        forEachLink(line, (index, _, text, destination) => {
           if (destination) {
             exclusions.push(
-              [ lineIndex, match.index + text.length, destination.length ]
+              [ lineIndex, index + text.length, destination.length ]
             );
           }
-        }
+        });
       }
     });
     if (!includeCodeBlocks) {
-      exclusions.push(...inlineCodeSpanRanges());
+      exclusions.push(...codeBlockAndSpanRanges());
+    }
+    if (!includeHtmlElements) {
+      exclusions.push(...htmlElementRanges());
     }
     for (const name of names) {
       const escapedName = escapeForRegExp(name);
@@ -52,7 +60,10 @@ module.exports = {
             const [ , leftMatch, nameMatch ] = match;
             const index = match.index + leftMatch.length;
             const length = nameMatch.length;
-            if (!overlapsAnyRange(exclusions, lineIndex, index, length)) {
+            if (
+              !withinAnyRange(exclusions, lineIndex, index, length) &&
+              !names.includes(nameMatch)
+            ) {
               addErrorDetailIf(
                 onError,
                 lineIndex + 1,

package/lib/md046.js

@@ -15,18 +15,19 @@ module.exports = {
   "tags": [ "code" ],
   "function": function MD046(params, onError) {
     let expectedStyle = String(params.config.style || "consistent");
-    params.tokens
-      .filter((token) => token.type === "code_block" || token.type === "fence")
-      .forEach((token) => {
-        const { lineNumber, type } = token;
-        if (expectedStyle === "consistent") {
-          expectedStyle = tokenTypeToStyle[type];
-        }
-        addErrorDetailIf(
-          onError,
-          lineNumber,
-          expectedStyle,
-          tokenTypeToStyle[type]);
-      });
+    const codeBlocksAndFences = params.tokens.filter(
+      (token) => (token.type === "code_block") || (token.type === "fence")
+    );
+    for (const token of codeBlocksAndFences) {
+      const { lineNumber, type } = token;
+      if (expectedStyle === "consistent") {
+        expectedStyle = tokenTypeToStyle[type];
+      }
+      addErrorDetailIf(
+        onError,
+        lineNumber,
+        expectedStyle,
+        tokenTypeToStyle[type]);
+    }
   }
 };

package/lib/md048.js

@@ -11,19 +11,18 @@ module.exports = {
   "function": function MD048(params, onError) {
     const style = String(params.config.style || "consistent");
     let expectedStyle = style;
-    params.tokens
-      .filter((token) => token.type === "fence")
-      .forEach((fenceToken) => {
-        const { lineNumber, markup } = fenceToken;
-        if (expectedStyle === "consistent") {
-          expectedStyle = fencedCodeBlockStyleFor(markup);
-        }
-        addErrorDetailIf(
-          onError,
-          lineNumber,
-          expectedStyle,
-          fencedCodeBlockStyleFor(markup)
-        );
-      });
+    const fenceTokens = params.tokens.filter((token) => token.type === "fence");
+    for (const fenceToken of fenceTokens) {
+      const { lineNumber, markup } = fenceToken;
+      if (expectedStyle === "consistent") {
+        expectedStyle = fencedCodeBlockStyleFor(markup);
+      }
+      addErrorDetailIf(
+        onError,
+        lineNumber,
+        expectedStyle,
+        fencedCodeBlockStyleFor(markup)
+      );
+    }
   }
 };

package/lib/md049-md050.js

@@ -0,0 +1,73 @@
+// @ts-check
+
+"use strict";
+
+const { addError, emphasisOrStrongStyleFor, forEachInlineChild,
+  getNextChildToken, getRangeAndFixInfoIfFound } = require("../helpers");
+
+const impl = (params, onError, tagPrefix, asterisk, underline, style) => {
+  let lastLineNumber = -1;
+  const instances = new Map();
+  forEachInlineChild(params, `${tagPrefix}_open`, (token, parent) => {
+    const { lineNumber, markup } = token;
+    const markupStyle = emphasisOrStrongStyleFor(markup);
+    if (style === "consistent") {
+      style = markupStyle;
+    }
+    if (style !== markupStyle) {
+      let rangeAndFixInfo = {};
+      const contentToken = getNextChildToken(
+        parent, token, "text", `${tagPrefix}_close`
+      );
+      if (contentToken) {
+        const { content } = contentToken;
+        const actual = `${markup}${content}${markup}`;
+        const expectedMarkup =
+          (style === "asterisk") ? asterisk : underline;
+        const expected = `${expectedMarkup}${content}${expectedMarkup}`;
+        if (lastLineNumber !== lineNumber) {
+          lastLineNumber = lineNumber;
+          instances.clear();
+        }
+        const instance = (instances.get(expected) || 0) + 1;
+        instances.set(expected, instance);
+        rangeAndFixInfo = getRangeAndFixInfoIfFound(
+          params.lines,
+          lineNumber - 1,
+          actual,
+          expected,
+          instance
+        );
+      }
+      addError(
+        onError,
+        lineNumber,
+        `Expected: ${style}; Actual: ${markupStyle}`,
+        null,
+        rangeAndFixInfo.range,
+        rangeAndFixInfo.fixInfo
+      );
+    }
+  });
+};
+
+module.exports = [
+  {
+    "names": [ "MD049", "emphasis-style" ],
+    "description": "Emphasis style should be consistent",
+    "tags": [ "emphasis" ],
+    "function": function MD049(params, onError) {
+      const style = String(params.config.style || "consistent");
+      return impl(params, onError, "em", "*", "_", style);
+    }
+  },
+  {
+    "names": [ "MD050", "strong-style" ],
+    "description": "Strong style should be consistent",
+    "tags": [ "emphasis" ],
+    "function": function MD050(params, onError) {
+      const style = String(params.config.style || "consistent");
+      return impl(params, onError, "strong", "**", "__", style);
+    }
+  }
+];

package/lib/md051.js

@@ -0,0 +1,84 @@
+// @ts-check
+
+"use strict";
+
+const { addError, escapeForRegExp, filterTokens, forEachInlineChild,
+  forEachHeading, htmlElementRe } = require("../helpers");
+
+// Regular expression for identifying HTML anchor names
+const identifierRe = /(?:id|name)\s*=\s*['"]?([^'"\s>]+)/iu;
+
+/**
+ * Converts a Markdown heading into an HTML fragment according to the rules
+ * used by GitHub.
+ *
+ * @param {Object} inline Inline token for heading.
+ * @returns {string} Fragment string for heading.
+ */
+function convertHeadingToHTMLFragment(inline) {
+  const inlineText = inline.children.map((token) => token.content).join("");
+  return "#" + encodeURIComponent(
+    inlineText
+      .toLowerCase()
+      // RegExp source with Ruby's \p{Word} expanded into its General Categories
+      // eslint-disable-next-line max-len
+      // https://github.com/gjtorikian/html-pipeline/blob/main/lib/html/pipeline/toc_filter.rb
+      // https://ruby-doc.org/core-3.0.2/Regexp.html
+      .replace(
+        /[^\p{Letter}\p{Mark}\p{Number}\p{Connector_Punctuation}\- ]/gu,
+        ""
+      )
+      .replace(/ /gu, "-")
+  );
+}
+
+module.exports = {
+  "names": [ "MD051", "link-fragments" ],
+  "description": "Link fragments should be valid",
+  "tags": [ "links" ],
+  "function": function MD051(params, onError) {
+    const fragments = new Map();
+    // Process headings
+    forEachHeading(params, (heading, content, inline) => {
+      const fragment = convertHeadingToHTMLFragment(inline);
+      const count = fragments.get(fragment) || 0;
+      if (count) {
+        fragments.set(`${fragment}-${count}`, 0);
+      }
+      fragments.set(fragment, count + 1);
+    });
+    // Process HTML anchors
+    const processHtmlToken = (token) => {
+      let match = null;
+      while ((match = htmlElementRe.exec(token.content)) !== null) {
+        const [ tag, , element ] = match;
+        if (element.toLowerCase() === "a") {
+          const idMatch = identifierRe.exec(tag);
+          if (idMatch) {
+            fragments.set(`#${idMatch[1]}`, 0);
+          }
+        }
+      }
+    };
+    filterTokens(params, "html_block", processHtmlToken);
+    forEachInlineChild(params, "html_inline", processHtmlToken);
+    // Process link fragments
+    forEachInlineChild(params, "link_open", (token) => {
+      const { attrs, lineNumber, line } = token;
+      const href = attrs.find((attr) => attr[0] === "href");
+      const id = href && href[1];
+      if (id && (id.length > 1) && (id[0] === "#") && !fragments.has(id)) {
+        let context = id;
+        let range = null;
+        const match = line.match(
+          new RegExp(`\\[.*?\\]\\(${escapeForRegExp(context)}\\)`)
+        );
+        if (match) {
+          context = match[0];
+          range = [ match.index + 1, match[0].length ];
+        }
+        addError(onError, lineNumber, null, context, range);
+      }
+    });
+  }
+};

package/lib/md052.js

@@ -0,0 +1,35 @@
+// @ts-check
+
+"use strict";
+
+const { addError } = require("../helpers");
+const { referenceLinkImageData } = require("./cache");
+
+module.exports = {
+  "names": [ "MD052", "reference-links-images" ],
+  "description":
+    "Reference links and images should use a label that is defined",
+  "tags": [ "images", "links" ],
+  "function": function MD052(params, onError) {
+    const { lines } = params;
+    const { references, definitions } = referenceLinkImageData();
+    // Look for links/images that use an undefined link reference
+    for (const reference of references.entries()) {
+      const [ label, datas ] = reference;
+      if (!definitions.has(label)) {
+        for (const data of datas) {
+          const [ lineIndex, index, length ] = data;
+          // Context will be incomplete if reporting for a multi-line link
+          const context = lines[lineIndex].slice(index, index + length);
+          addError(
+            onError,
+            lineIndex + 1,
+            `Missing link or image reference definition: "${label}"`,
+            context,
+            [ index + 1, context.length ]
+          );
+        }
+      }
+    }
+  }
+};

package/lib/md053.js

@@ -0,0 +1,52 @@
+// @ts-check
+
+"use strict";
+
+const { addError, ellipsify, linkReferenceDefinitionRe } =
+  require("../helpers");
+const { referenceLinkImageData } = require("./cache");
+
+module.exports = {
+  "names": [ "MD053", "link-image-reference-definitions" ],
+  "description": "Link and image reference definitions should be needed",
+  "tags": [ "images", "links" ],
+  "function": function MD053(params, onError) {
+    const { lines } = params;
+    const { references, shortcuts, definitions, duplicateDefinitions } =
+      referenceLinkImageData();
+    const singleLineDefinition = (line) => (
+      line.replace(linkReferenceDefinitionRe, "").trim().length > 0
+    );
+    const deleteFixInfo = {
+      "deleteCount": -1
+    };
+    // Look for unused link references (unreferenced by any link/image)
+    for (const definition of definitions.entries()) {
+      const [ label, lineIndex ] = definition;
+      if (!references.has(label) && !shortcuts.has(label)) {
+        const line = lines[lineIndex];
+        addError(
+          onError,
+          lineIndex + 1,
+          `Unused link or image reference definition: "${label}"`,
+          ellipsify(line),
+          [ 1, line.length ],
+          singleLineDefinition(line) ? deleteFixInfo : 0
+        );
+      }
+    }
+    // Look for duplicate link references (defined more than once)
+    for (const duplicateDefinition of duplicateDefinitions) {
+      const [ label, lineIndex ] = duplicateDefinition;
+      const line = lines[lineIndex];
+      addError(
+        onError,
+        lineIndex + 1,
+        `Duplicate link or image reference definition: "${label}"`,
+        ellipsify(line),
+        [ 1, line.length ],
+        singleLineDefinition(line) ? deleteFixInfo : 0
+      );
+    }
+  }
+};

package/lib/rules.js

@@ -2,9 +2,7 @@
 
 "use strict";
 
-const packageJson = require("../package.json");
-const homepage = packageJson.homepage;
-const version = packageJson.version;
+const { homepage, version } = require("./constants");
 
 const rules = [
   require("./md001"),
@@ -50,12 +48,16 @@ const rules = [
   require("./md045"),
   require("./md046"),
   require("./md047"),
-  require("./md048")
+  require("./md048"),
+  ...require("./md049-md050"),
+  require("./md051"),
+  require("./md052"),
+  require("./md053")
 ];
-rules.forEach((rule) => {
+for (const rule of rules) {
   const name = rule.names[0].toLowerCase();
   // eslint-disable-next-line dot-notation
   rule["information"] =
     new URL(`${homepage}/blob/v${version}/doc/Rules.md#${name}`);
-});
+}
 module.exports = rules;

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "markdownlint",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "description": "A Node.js style checker and lint tool for Markdown/CommonMark files.",
+  "type": "commonjs",
   "main": "lib/markdownlint.js",
   "types": "lib/markdownlint.d.ts",
   "author": "David Anson (https://dlaa.me/)",
@@ -16,11 +17,10 @@
     "build-config": "npm run build-config-schema && npm run build-config-example",
     "build-config-example": "node schema/build-config-example.js",
     "build-config-schema": "node schema/build-config-schema.js",
-    "build-declaration": "tsc --allowJs --declaration --emitDeclarationOnly --resolveJsonModule lib/markdownlint.js && rimraf 'lib/{c,md,r}*.d.ts' 'helpers/*.d.ts'",
-    "build-demo": "cpy node_modules/markdown-it/dist/markdown-it.min.js demo && cd demo && rimraf markdownlint-browser.* && webpack --no-stats",
+    "build-declaration": "tsc --allowJs --declaration --emitDeclarationOnly --module commonjs --resolveJsonModule --target es2015 lib/markdownlint.js && node scripts delete 'lib/{c,md,r}*.d.ts' 'helpers/*.d.ts'",
+    "build-demo": "node scripts copy node_modules/markdown-it/dist/markdown-it.min.js demo/markdown-it.min.js && cd demo && webpack --no-stats",
     "build-example": "npm install --no-save --ignore-scripts grunt grunt-cli gulp through2",
-    "ci": "npm-run-all --continue-on-error --parallel test-cover lint declaration build-config build-demo && git diff --exit-code",
-    "clean-test-repos": "rimraf test-repos",
+    "ci": "npm-run-all --continue-on-error --parallel build-config lint serial-declaration-demo test-cover && git diff --exit-code",
     "clone-test-repos-dotnet-docs": "cd test-repos && git clone https://github.com/dotnet/docs dotnet-docs --depth 1 --no-tags --quiet",
     "clone-test-repos-eslint-eslint": "cd test-repos && git clone https://github.com/eslint/eslint eslint-eslint --depth 1 --no-tags --quiet",
     "clone-test-repos-mkdocs-mkdocs": "cd test-repos && git clone https://github.com/mkdocs/mkdocs mkdocs-mkdocs --depth 1 --no-tags --quiet",
@@ -33,43 +33,48 @@
     "clone-test-repos-large": "npm run clone-test-repos && cd test-repos && npm run clone-test-repos-dotnet-docs && npm run clone-test-repos-v8-v8-dev",
     "declaration": "npm run build-declaration && npm run test-declaration",
     "example": "cd example && node standalone.js && grunt markdownlint --force && gulp markdownlint",
+    "docker-npm-install": "docker run --rm --tty --name npm-install --volume $PWD:/home/workdir --workdir /home/workdir --user node node:16 npm install",
+    "docker-npm-run-upgrade": "docker run --rm --tty --name npm-run-upgrade --volume $PWD:/home/workdir --workdir /home/workdir --user node node:16 npm run upgrade",
     "lint": "eslint --max-warnings 0 .",
     "lint-test-repos": "ava --timeout=5m test/markdownlint-test-repos.js",
-    "test": "ava test/markdownlint-test.js test/markdownlint-test-custom-rules.js test/markdownlint-test-helpers.js test/markdownlint-test-result-object.js test/markdownlint-test-scenarios.js",
+    "serial-declaration-demo": "npm run build-declaration && npm-run-all --continue-on-error --parallel build-demo test-declaration",
+    "test": "ava test/markdownlint-test.js test/markdownlint-test-config.js test/markdownlint-test-custom-rules.js test/markdownlint-test-helpers.js test/markdownlint-test-result-object.js test/markdownlint-test-scenarios.js",
     "test-cover": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 npm test",
     "test-declaration": "cd example/typescript && tsc && node type-check.js",
-    "test-extra": "ava --timeout=5m test/markdownlint-test-extra.js"
+    "test-extra": "ava --timeout=5m test/markdownlint-test-extra-parse.js test/markdownlint-test-extra-type.js",
+    "update-snapshots": "ava --update-snapshots test/markdownlint-test-scenarios.js",
+    "upgrade": "npx --yes npm-check-updates --upgrade"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=14"
   },
   "dependencies": {
-    "markdown-it": "12.2.0"
+    "markdown-it": "13.0.1"
   },
   "devDependencies": {
-    "ava": "~3.15.0",
-    "c8": "~7.8.0",
-    "cpy-cli": "~3.1.1",
-    "eslint": "~7.32.0",
-    "eslint-plugin-jsdoc": "~36.0.7",
-    "eslint-plugin-node": "~11.1.0",
-    "eslint-plugin-unicorn": "~35.0.0",
-    "globby": "~11.0.4",
-    "js-yaml": "~4.1.0",
-    "markdown-it-for-inline": "~0.1.1",
-    "markdown-it-sub": "~1.0.0",
-    "markdown-it-sup": "~1.0.0",
-    "markdown-it-texmath": "~0.9.1",
-    "markdownlint-rule-helpers": "~0.14.0",
-    "npm-run-all": "~4.1.5",
-    "rimraf": "~3.0.2",
-    "strip-json-comments": "~3.1.1",
-    "toml": "~3.0.0",
-    "ts-loader": "~9.2.5",
-    "tv4": "~1.3.0",
-    "typescript": "~4.3.5",
-    "webpack": "~5.51.1",
-    "webpack-cli": "~4.8.0"
+    "ava": "4.3.0",
+    "c8": "7.11.3",
+    "eslint": "8.18.0",
+    "eslint-plugin-es": "4.1.0",
+    "eslint-plugin-jsdoc": "39.3.3",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-unicorn": "42.0.0",
+    "globby": "13.1.2",
+    "js-yaml": "4.1.0",
+    "markdown-it-for-inline": "0.1.1",
+    "markdown-it-sub": "1.0.0",
+    "markdown-it-sup": "1.0.0",
+    "markdown-it-texmath": "1.0.0",
+    "markdownlint-rule-github-internal-links": "0.1.0",
+    "markdownlint-rule-helpers": "0.16.0",
+    "npm-run-all": "4.1.5",
+    "strip-json-comments": "4.0.0",
+    "toml": "3.0.0",
+    "ts-loader": "9.3.0",
+    "tv4": "1.3.0",
+    "typescript": "4.7.4",
+    "webpack": "5.73.0",
+    "webpack-cli": "4.10.0"
   },
   "keywords": [
     "markdown",