markdownlint 0.34.0 → 0.35.0

package/lib/md046.js

@@ -3,7 +3,7 @@
 "use strict";
 
 const { addErrorDetailIf } = require("../helpers");
-const { filterByTypes } = require("../helpers/micromark.cjs");
+const { filterByTypesCached } = require("./cache");
 
 const tokenTypeToStyle = {
   "codeFenced": "fenced",
@@ -19,13 +19,7 @@ module.exports = {
   "parser": "micromark",
   "function": function MD046(params, onError) {
     let expectedStyle = String(params.config.style || "consistent");
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
-    const codeBlocksAndFences = filterByTypes(micromarkTokens, [ "codeFenced", "codeIndented" ]);
-    for (const token of codeBlocksAndFences) {
+    for (const token of filterByTypesCached([ "codeFenced", "codeIndented" ])) {
       const { startLine, type } = token;
       if (expectedStyle === "consistent") {
         expectedStyle = tokenTypeToStyle[type];

package/lib/md048.js

@@ -3,7 +3,8 @@
 "use strict";
 
 const { addErrorDetailIf, fencedCodeBlockStyleFor } = require("../helpers");
-const { filterByTypes, tokenIfType } = require("../helpers/micromark.cjs");
+const { tokenIfType } = require("../helpers/micromark.cjs");
+const { filterByTypesCached } = require("./cache");
 
 // eslint-disable-next-line jsdoc/valid-types
 /** @type import("./markdownlint").Rule */
@@ -14,13 +15,8 @@ module.exports = {
   "parser": "micromark",
   "function": function MD048(params, onError) {
     const style = String(params.config.style || "consistent");
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
     let expectedStyle = style;
-    const codeFenceds = filterByTypes(micromarkTokens, [ "codeFenced" ]);
+    const codeFenceds = filterByTypesCached([ "codeFenced" ]);
     for (const codeFenced of codeFenceds) {
       const codeFencedFence = tokenIfType(codeFenced.children[0], "codeFencedFence");
       if (codeFencedFence) {

package/lib/md049-md050.js

@@ -18,14 +18,9 @@ const intrawordRe = /^\w$/;
  */
 const impl =
   (params, onError, type, typeSequence, asterisk, underline, style = "consistent") => {
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
-    const { lines } = params;
+    const { lines, parsers } = params;
     const emphasisTokens = filterByPredicate(
-      micromarkTokens,
+      parsers.micromark.tokens,
       (token) => token.type === type,
       (token) => ((token.type === "htmlFlow") ? [] : token.children)
     );

package/lib/md051.js

@@ -2,10 +2,9 @@
 
 "use strict";
 
-const { addError, addErrorDetailIf, getHtmlAttributeRe } =
-  require("../helpers");
-const { filterByPredicate, filterByTypes, getHtmlTagInfo } =
-  require("../helpers/micromark.cjs");
+const { addError, addErrorDetailIf, getHtmlAttributeRe } = require("../helpers");
+const { filterByPredicate, filterByTypes, getHtmlTagInfo } = require("../helpers/micromark.cjs");
+const { filterByTypesCached } = require("./cache");
 
 // Regular expression for identifying HTML anchor names
 const idRe = getHtmlAttributeRe("id");
@@ -69,15 +68,10 @@ module.exports = {
   "tags": [ "links" ],
   "parser": "micromark",
   "function": function MD051(params, onError) {
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
     const fragments = new Map();
 
     // Process headings
-    const headingTexts = filterByTypes(micromarkTokens, [ "atxHeadingText", "setextHeadingText" ]);
+    const headingTexts = filterByTypesCached([ "atxHeadingText", "setextHeadingText" ]);
     for (const headingText of headingTexts) {
       const fragment = convertHeadingToHTMLFragment(headingText);
       if (fragment !== "#") {
@@ -97,7 +91,7 @@ module.exports = {
     }
 
     // Process HTML anchors
-    for (const token of filterByTypes(micromarkTokens, [ "htmlText" ])) {
+    for (const token of filterByTypesCached([ "htmlText" ], true)) {
       const htmlTagInfo = getHtmlTagInfo(token);
       if (htmlTagInfo && !htmlTagInfo.close) {
         const anchorMatch = idRe.exec(token.text) ||
@@ -116,7 +110,7 @@ module.exports = {
       [ "definition", "definitionDestinationString" ]
     ];
     for (const [ parentType, definitionType ] of parentChilds) {
-      const links = filterByTypes(micromarkTokens, [ parentType ]);
+      const links = filterByTypesCached([ parentType ]);
       for (const link of links) {
         const definitions = filterByTypes(link.children, [ definitionType ]);
         for (const definition of definitions) {

package/lib/md052.js

@@ -3,7 +3,7 @@
 "use strict";
 
 const { addError } = require("../helpers");
-const { referenceLinkImageData } = require("./cache");
+const { getReferenceLinkImageData } = require("./cache");
 
 // eslint-disable-next-line jsdoc/valid-types
 /** @type import("./markdownlint").Rule */
@@ -16,7 +16,7 @@ module.exports = {
   "function": function MD052(params, onError) {
     const { config, lines } = params;
     const shortcutSyntax = config.shortcut_syntax || false;
-    const { definitions, references, shortcuts } = referenceLinkImageData();
+    const { definitions, references, shortcuts } = getReferenceLinkImageData();
     const entries = shortcutSyntax ?
       [ ...references.entries(), ...shortcuts.entries() ] :
       references.entries();

package/lib/md053.js

@@ -4,7 +4,7 @@
 
 const { addError, ellipsify, linkReferenceDefinitionRe } =
   require("../helpers");
-const { referenceLinkImageData } = require("./cache");
+const { getReferenceLinkImageData } = require("./cache");
 
 // eslint-disable-next-line jsdoc/valid-types
 /** @type import("./markdownlint").Rule */
@@ -17,7 +17,7 @@ module.exports = {
     const ignored = new Set(params.config.ignored_definitions || [ "//" ]);
     const lines = params.lines;
     const { references, shortcuts, definitions, duplicateDefinitions } =
-      referenceLinkImageData();
+      getReferenceLinkImageData();
     const singleLineDefinition = (line) => (
       line.replace(linkReferenceDefinitionRe, "").trim().length > 0
     );

package/lib/md054.js

@@ -3,9 +3,8 @@
 "use strict";
 
 const { addErrorContext, nextLinesRe } = require("../helpers");
-const { filterByTypes, filterByPredicate, getTokenTextByType } =
-  require("../helpers/micromark.cjs");
-const { referenceLinkImageData } = require("./cache");
+const { filterByPredicate, getTokenTextByType } = require("../helpers/micromark.cjs");
+const { getReferenceLinkImageData, filterByTypesCached } = require("./cache");
 
 const backslashEscapeRe = /\\([!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{|}~])/g;
 const removeBackslashEscapes = (text) => text.replace(backslashEscapeRe, "$1");
@@ -40,13 +39,8 @@ module.exports = {
       // Everything allowed, nothing to check
       return;
     }
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
-    const { definitions } = referenceLinkImageData();
-    const links = filterByTypes(micromarkTokens, [ "autolink", "image", "link" ]);
+    const { definitions } = getReferenceLinkImageData();
+    const links = filterByTypesCached([ "autolink", "image", "link" ]);
     for (const link of links) {
       let label = null;
       let destination = null;
@@ -89,7 +83,8 @@ module.exports = {
         }
       }
       if (isError) {
-        let range = null;
+        // eslint-disable-next-line no-undef-init
+        let range = undefined;
         let fixInfo = null;
         if (startLine === endLine) {
           range = [ startColumn, endColumn - startColumn ];
@@ -119,8 +114,8 @@ module.exports = {
           onError,
           startLine,
           text.replace(nextLinesRe, ""),
-          null,
-          null,
+          undefined,
+          undefined,
           range,
           fixInfo
         );

package/lib/md055.js

@@ -4,6 +4,7 @@
 
 const { addErrorDetailIf } = require("../helpers");
 const { filterByTypes } = require("../helpers/micromark.cjs");
+const { filterByTypesCached } = require("./cache");
 
 const whitespaceTypes = new Set([ "linePrefix", "whitespace" ]);
 const ignoreWhitespace = (tokens) => tokens.filter(
@@ -27,14 +28,12 @@ module.exports = {
       ((expectedStyle !== "no_leading_or_trailing") && (expectedStyle !== "trailing_only"));
     let expectedTrailingPipe =
       ((expectedStyle !== "no_leading_or_trailing") && (expectedStyle !== "leading_only"));
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
-    const tables = filterByTypes(micromarkTokens, [ "table" ]);
+    const tables = filterByTypesCached([ "table" ]);
     for (const table of tables) {
-      const rows = filterByTypes(table.children, [ "tableDelimiterRow", "tableRow" ]);
+      const rows = filterByTypes(
+        table.children,
+        [ "tableDelimiterRow", "tableRow" ]
+      );
       for (const row of rows) {
         // The following uses of first/lastOrNothing lack fallback handling
         // because it seems not to be possible (i.e., 0% coverage)
@@ -77,4 +76,4 @@ module.exports = {
       }
     }
   }
-}
+};

package/lib/md056.js

@@ -4,6 +4,7 @@
 
 const { addErrorDetailIf } = require("../helpers");
 const { filterByTypes } = require("../helpers/micromark.cjs");
+const { filterByTypesCached } = require("./cache");
 
 const makeRange = (start, end) => [ start, end - start + 1 ];
 
@@ -15,21 +16,24 @@ module.exports = {
   "tags": [ "table" ],
   "parser": "micromark",
   "function": function MD056(params, onError) {
-    // eslint-disable-next-line jsdoc/valid-types
-    /** @type import("../helpers/micromark.cjs").Token[] */
-    const micromarkTokens =
-      // @ts-ignore
-      params.parsers.micromark.tokens;
-    const tables = filterByTypes(micromarkTokens, [ "table" ]);
+    const tables = filterByTypesCached([ "table" ]);
     for (const table of tables) {
-      const rows = filterByTypes(table.children, [ "tableDelimiterRow", "tableRow" ]);
+      const rows = filterByTypes(
+        table.children,
+        [ "tableDelimiterRow", "tableRow" ]
+      );
       let expectedCount = 0;
       for (const row of rows) {
-        const cells = filterByTypes(row.children, [ "tableData", "tableDelimiter", "tableHeader" ]);
+        const cells = filterByTypes(
+          row.children,
+          [ "tableData", "tableDelimiter", "tableHeader" ]
+        );
         const actualCount = cells.length;
         expectedCount ||= actualCount;
-        let detail = null;
-        let range = null;
+        // eslint-disable-next-line no-undef-init
+        let detail = undefined;
+        // eslint-disable-next-line no-undef-init
+        let range = undefined;
         if (actualCount < expectedCount) {
           detail = "Too few cells, row will be missing data";
           range = [ row.endColumn - 1, 1 ];
@@ -43,7 +47,7 @@ module.exports = {
           expectedCount,
           actualCount,
           detail,
-          null,
+          undefined,
           range
         );
       }

package/lib/md058.js

@@ -0,0 +1,43 @@
+// @ts-check
+
+"use strict";
+
+const { addErrorContextForLine, isBlankLine } = require("../helpers");
+const { filterByTypesCached } = require("./cache");
+
+// eslint-disable-next-line jsdoc/valid-types
+/** @type import("./markdownlint").Rule */
+module.exports = {
+  "names": [ "MD058", "blanks-around-tables" ],
+  "description": "Tables should be surrounded by blank lines",
+  "tags": [ "table" ],
+  "parser": "micromark",
+  "function": function MD058(params, onError) {
+    const { lines } = params;
+    // For every table...
+    const tables = filterByTypesCached([ "table" ]);
+    for (const table of tables) {
+      // Look for a blank line above the table
+      const firstIndex = table.startLine - 1;
+      if (!isBlankLine(lines[firstIndex - 1])) {
+        addErrorContextForLine(
+          onError,
+          // @ts-ignore
+          lines,
+          firstIndex
+        );
+      }
+      // Look for a blank line below the table
+      const lastIndex = table.endLine - 1;
+      if (!isBlankLine(lines[lastIndex + 1])) {
+        addErrorContextForLine(
+          onError,
+          // @ts-ignore
+          lines,
+          lastIndex,
+          lastIndex + 2
+        );
+      }
+    }
+  }
+};

package/lib/rules.js

@@ -4,6 +4,11 @@
 
 const { homepage, version } = require("./constants");
 
+// @ts-ignore
+const [ md019, md021 ] = require("./md019-md021");
+// @ts-ignore
+const [ md049, md050 ] = require("./md049-md050");
+
 const rules = [
   require("./md001"),
   // md002: Deprecated and removed
@@ -19,9 +24,9 @@ const rules = [
   require("./md013"),
   require("./md014"),
   require("./md018"),
-  require("./md019"),
+  md019,
   require("./md020"),
-  require("./md021"),
+  md021,
   require("./md022"),
   require("./md023"),
   require("./md024"),
@@ -49,14 +54,16 @@ const rules = [
   require("./md046"),
   require("./md047"),
   require("./md048"),
-  ...require("./md049-md050"),
+  md049,
+  md050,
   require("./md051"),
   require("./md052"),
   require("./md053"),
   require("./md054"),
   require("./md055"),
-  require("./md056")
+  require("./md056"),
   // md057: See https://github.com/markdownlint/markdownlint
+  require("./md058")
 ];
 for (const rule of rules) {
   const name = rule.names[0].toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdownlint",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "A Node.js style checker and lint tool for Markdown/CommonMark files.",
   "type": "commonjs",
   "main": "./lib/markdownlint.js",
@@ -49,13 +49,13 @@
     "docker-npm-install": "docker run --rm --tty --name npm-install --volume $PWD:/home/workdir --workdir /home/workdir --user node node:latest npm install",
     "docker-npm-run-upgrade": "docker run --rm --tty --name npm-run-upgrade --volume $PWD:/home/workdir --workdir /home/workdir --user node node:latest npm run upgrade",
     "install-micromark": "cd micromark && npm install",
-    "lint": "eslint --ext .js,.cjs,.mjs --max-warnings 0 .",
+    "lint": "eslint --max-warnings 0",
     "lint-test-repos": "ava --timeout=10m test/markdownlint-test-repos-*.js",
     "serial-config-docs": "npm run build-config && npm run build-docs",
     "serial-declaration-demo": "npm run build-declaration && npm-run-all --continue-on-error --parallel build-demo test-declaration",
     "test": "ava --timeout=30s test/markdownlint-test.js test/markdownlint-test-config.js test/markdownlint-test-custom-rules.js test/markdownlint-test-helpers.js test/markdownlint-test-micromark.mjs test/markdownlint-test-result-object.js test/markdownlint-test-scenarios.js",
     "test-cover": "c8 --100 npm test",
-    "test-declaration": "cd example/typescript && tsc && node type-check.js",
+    "test-declaration": "cd example/typescript && tsc --module nodenext && tsc --module commonjs && node type-check.js",
     "test-extra": "ava --timeout=10m test/markdownlint-test-extra-parse.js test/markdownlint-test-extra-type.js",
     "update-snapshots": "ava --update-snapshots test/markdownlint-test-micromark.mjs test/markdownlint-test-scenarios.js",
     "update-snapshots-test-repos": "ava --timeout=10m --update-snapshots test/markdownlint-test-repos-*.js",
@@ -66,31 +66,33 @@
   },
   "dependencies": {
     "markdown-it": "14.1.0",
-    "markdownlint-micromark": "0.1.9"
+    "markdownlint-micromark": "0.1.10"
   },
   "devDependencies": {
-    "ajv": "8.12.0",
-    "ava": "6.1.2",
-    "c8": "9.1.0",
+    "@eslint/js": "9.9.1",
+    "ajv": "8.17.1",
+    "ava": "6.1.3",
+    "c8": "10.1.2",
     "character-entities": "2.0.2",
-    "eslint": "8.57.0",
-    "eslint-plugin-jsdoc": "48.2.1",
-    "eslint-plugin-n": "16.6.2",
-    "eslint-plugin-regexp": "2.3.0",
-    "eslint-plugin-unicorn": "51.0.1",
+    "eslint": "9.9.1",
+    "eslint-plugin-jsdoc": "50.2.2",
+    "eslint-plugin-n": "17.10.2",
+    "eslint-plugin-regexp": "2.6.0",
+    "eslint-plugin-unicorn": "55.0.0",
     "gemoji": "8.1.0",
-    "globby": "14.0.1",
+    "globby": "14.0.2",
     "js-yaml": "4.1.0",
-    "json-schema-to-typescript": "13.1.2",
-    "jsonc-parser": "3.2.1",
+    "json-schema-to-typescript": "15.0.1",
+    "jsonc-parser": "3.3.1",
     "markdown-it-for-inline": "2.0.1",
     "markdown-it-sub": "2.0.0",
     "markdown-it-sup": "2.0.0",
+    "markdownlint-rule-extended-ascii": "0.1.0",
     "npm-run-all": "4.1.5",
     "terser-webpack-plugin": "5.3.10",
     "toml": "3.0.0",
-    "typescript": "5.4.3",
-    "webpack": "5.91.0",
+    "typescript": "5.5.4",
+    "webpack": "5.94.0",
     "webpack-cli": "5.1.4"
   },
   "keywords": [