@electron/lint-roller 2.0.0 → 2.2.0

package/configs/markdownlint.json

@@ -26,6 +26,7 @@
   "no-inline-html": false,
   "no-angle-brackets": false,
   "no-curly-braces": false,
+  "no-newline-in-links": false,
   "link-image-style": {
     "shortcut": false
   }

package/dist/bin/markdownlint-cli-wrapper.js

@@ -7,7 +7,7 @@ if (require.main === module) {
     const { status } = cp.spawnSync(process.execPath, [
         require.resolve('markdownlint-cli'),
         '-r',
-        path.resolve(__dirname, '../../markdownlint-rules'),
+        path.resolve(__dirname, '../../markdownlint-rules/index.js'),
         ...process.argv.slice(2),
     ], { stdio: 'inherit' });
     if (status)

package/dist/bin/markdownlint-cli-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdownlint-cli-wrapper.js","sourceRoot":"","sources":["../../bin/markdownlint-cli-wrapper.ts"],"names":[],"mappings":";;;AAEA,yCAAyC;AACzC,kCAAkC;AAElC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS,CAC7B,OAAO,CAAC,QAAQ,EAChB;QACE,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACnC,IAAI;QACJ,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,0BAA0B,CAAC;QACnD,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KACzB,EACD,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;IACF,IAAI,MAAM;QAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"markdownlint-cli-wrapper.js","sourceRoot":"","sources":["../../bin/markdownlint-cli-wrapper.ts"],"names":[],"mappings":";;;AAEA,yCAAyC;AACzC,kCAAkC;AAElC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS,CAC7B,OAAO,CAAC,QAAQ,EAChB;QACE,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACnC,IAAI;QACJ,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,mCAAmC,CAAC;QAC5D,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KACzB,EACD,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;IACF,IAAI,MAAM;QAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC"}

package/markdownlint-rules/emd002.js

@@ -9874,9 +9874,19 @@ function EMD002(params, onError) {
           tree,
           (node2) => node2.type === "text",
           (node2) => {
-            const rawContent = childToken.line.slice(node2.position.start.offset, node2.position.end.offset);
-            if (rawContent.match(UNESCAPED_REGEX) !== null) {
-              (0, import_helpers.addError)(onError, token.lineNumber, "Unescaped opening angle bracket");
+            const rawContent = childToken.line.slice(
+              node2.position.start.offset,
+              node2.position.end.offset
+            );
+            const matches = rawContent.matchAll(UNESCAPED_REGEX);
+            for (const match of matches) {
+              (0, import_helpers.addError)(
+                onError,
+                childToken.lineNumber,
+                "Unescaped opening angle bracket",
+                void 0,
+                [node2.position.start.offset + 1 + match.index, 1]
+              );
             }
           }
         );

package/markdownlint-rules/emd002.mjs

@@ -4,7 +4,8 @@ import { fromMarkdown } from 'mdast-util-from-markdown';
 import { visit } from 'unist-util-visit';
 
 export const names = ['EMD002', 'no-angle-brackets'];
-export const description = 'No unescaped opening angle brackets in text (does not play nice with MDX)';
+export const description =
+  'No unescaped opening angle brackets in text (does not play nice with MDX)';
 export const tags = ['brackets'];
 
 const UNESCAPED_REGEX = /(?<!\\)<(?!\s)/g;
@@ -32,16 +33,27 @@ function EMD002(params, onError) {
           tree,
           (node) => node.type === 'text',
           (node) => {
-            const rawContent = childToken.line.slice(node.position.start.offset, node.position.end.offset);
+            const rawContent = childToken.line.slice(
+              node.position.start.offset,
+              node.position.end.offset,
+            );
 
-            if (rawContent.match(UNESCAPED_REGEX) !== null) {
-              addError(onError, token.lineNumber, 'Unescaped opening angle bracket');
+            const matches = rawContent.matchAll(UNESCAPED_REGEX);
+
+            for (const match of matches) {
+              addError(
+                onError,
+                childToken.lineNumber,
+                'Unescaped opening angle bracket',
+                undefined,
+                [node.position.start.offset + 1 + match.index, 1],
+              );
             }
           },
         );
       }
     }
   });
-};
+}
 
 export { EMD002 as function };

package/markdownlint-rules/emd003.js

@@ -9874,9 +9874,16 @@ function EMD003(params, onError) {
           tree,
           (node2) => node2.type === "text",
           (node2) => {
-            const rawContent = childToken.line.slice(node2.position.start.offset, node2.position.end.offset);
-            if (rawContent.match(UNESCAPED_REGEX) !== null) {
-              (0, import_helpers.addError)(onError, token.lineNumber, "Unescaped opening curly brace");
+            const rawContent = childToken.line.slice(
+              node2.position.start.offset,
+              node2.position.end.offset
+            );
+            const matches = rawContent.matchAll(UNESCAPED_REGEX);
+            for (const match of matches) {
+              (0, import_helpers.addError)(onError, childToken.lineNumber, "Unescaped opening curly brace", void 0, [
+                node2.position.start.offset + 1 + match.index,
+                1
+              ]);
             }
           }
         );

package/markdownlint-rules/emd003.mjs

@@ -4,7 +4,8 @@ import { fromMarkdown } from 'mdast-util-from-markdown';
 import { visit } from 'unist-util-visit';
 
 export const names = ['EMD003', 'no-curly-braces'];
-export const description = 'No unescaped opening curly braces in text (does not play nice with MDX)';
+export const description =
+  'No unescaped opening curly braces in text (does not play nice with MDX)';
 export const tags = ['braces'];
 
 const UNESCAPED_REGEX = /(?<!\\){/g;
@@ -31,16 +32,24 @@ function EMD003(params, onError) {
           tree,
           (node) => node.type === 'text',
           (node) => {
-            const rawContent = childToken.line.slice(node.position.start.offset, node.position.end.offset);
+            const rawContent = childToken.line.slice(
+              node.position.start.offset,
+              node.position.end.offset,
+            );
 
-            if (rawContent.match(UNESCAPED_REGEX) !== null) {
-              addError(onError, token.lineNumber, 'Unescaped opening curly brace');
+            const matches = rawContent.matchAll(UNESCAPED_REGEX);
+
+            for (const match of matches) {
+              addError(onError, childToken.lineNumber, 'Unescaped opening curly brace', undefined, [
+                node.position.start.offset + 1 + match.index,
+                1,
+              ]);
             }
           },
         );
       }
     }
   });
-};
+}
 
 export { EMD003 as function };

package/markdownlint-rules/emd004.js

@@ -0,0 +1,30 @@
+const { addError, filterTokens } = require('markdownlint/helpers');
+
+module.exports = {
+  names: ['EMD004', 'no-newline-in-links'],
+  description: 'Newlines inside link text',
+  tags: ['newline', 'links'],
+  parser: 'markdownit',
+  function: function EMD004(params, onError) {
+    filterTokens(params, 'inline', (token) => {
+      const { children } = token;
+      let { lineNumber } = token;
+      let inLink = false;
+      for (const child of children) {
+        const { type } = child;
+        if (type === 'link_open') {
+          inLink = true;
+        } else if (type === 'link_close') {
+          inLink = false;
+        } else if (type === 'softbreak') {
+          if (inLink) {
+            addError(onError, lineNumber);
+            break;
+          } else {
+            lineNumber++;
+          }
+        }
+      }
+    });
+  },
+};

package/markdownlint-rules/index.js

@@ -0,0 +1,5 @@
+const EMD002 = require('./emd002.js');
+const EMD003 = require('./emd003.js');
+const EMD004 = require('./emd004.js');
+
+module.exports = [EMD002, EMD003, EMD004];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electron/lint-roller",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "Markdown linting helpers for Electron org repos",
   "engines": {
     "node": ">=18.0.0"
@@ -25,14 +25,14 @@
     "build:emd002": "esbuild --platform=node --target=node18 --format=cjs --bundle --outfile=markdownlint-rules/emd002.js markdownlint-rules/emd002.mjs",
     "build:emd003": "esbuild --platform=node --target=node18 --format=cjs --bundle --outfile=markdownlint-rules/emd003.js markdownlint-rules/emd003.mjs",
     "prepublishOnly": "yarn run build",
-    "lint:eslint": "eslint \"{bin,lib,markdownlint-rules,tests}/**/*.{js,ts}\"",
-    "lint:eslint:fix": "eslint --fix \"{bin,lib,markdownlint-rules,tests}/**/*.{js,ts}\"",
+    "lint:eslint": "eslint \"{bin,lib,markdownlint-rules,tests}/**/*.{js,mjs,ts}\"",
+    "lint:eslint:fix": "eslint --fix \"{bin,lib,markdownlint-rules,tests}/**/*.{js,mjs,ts}\"",
     "lint:markdown": "yarn run build && node ./dist/bin/markdownlint-cli-wrapper.js \"*.md\" && node ./dist/bin/lint-markdown-links.js \"*.md\"",
-    "lint:prettier": "prettier --check \"{bin,lib,markdownlint-rules,tests}/**/*.{js,ts}\"",
-    "lint:prettier:fix": "prettier --write \"{bin,lib,markdownlint-rules,tests}/**/*.{js,ts}\"",
+    "lint:prettier": "prettier --check \"{bin,lib,markdownlint-rules,tests}/**/*.{js,mjs,ts}\"",
+    "lint:prettier:fix": "prettier --write \"{bin,lib,markdownlint-rules,tests}/**/*.{js,mjs,ts}\"",
     "lint": "yarn run lint:prettier && yarn run lint:markdown",
     "lint:fix": "yarn run lint:eslint:fix && yarn run lint:prettier:fix",
-    "test": "yarn run build && jest"
+    "test": "yarn run build && vitest run --reporter=verbose"
   },
   "repository": {
     "type": "git",
@@ -48,7 +48,6 @@
     "@electron-internal/eslint-config": "^1.0.1",
     "@types/balanced-match": "^1.0.3",
     "@types/glob": "^8.1.0",
-    "@types/jest": "^29.5.8",
     "@types/markdown-it": "^13.0.6",
     "@types/minimist": "^1.2.5",
     "@types/node": "20.1.2",
@@ -56,10 +55,9 @@
     "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "jest": "^29.7.0",
     "prettier": "^3.2.5",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "vitest": "^1.5.3"
   },
   "dependencies": {
     "@dsanders11/vscode-markdown-languageservice": "^0.3.0",