eslint-markdown 0.6.1 → 0.8.0

package/README.md

@@ -1,8 +1,7 @@
 # eslint-markdown
 
-[![lint](https://img.shields.io/github/actions/workflow/status/lumirlumir/npm-eslint-markdown/lint.yml?label=lint&color=6358d4&labelColor=333333&logo=github)](https://github.com/lumirlumir/npm-eslint-markdown/actions/workflows/lint.yml)
+[![ci](https://img.shields.io/github/actions/workflow/status/lumirlumir/npm-eslint-markdown/ci.yml?label=ci&color=6358d4&labelColor=333333&logo=github)](https://github.com/lumirlumir/npm-eslint-markdown/actions/workflows/ci.yml)
 [![test](https://img.shields.io/github/actions/workflow/status/lumirlumir/npm-eslint-markdown/test.yml?label=test&color=6358d4&labelColor=333333&logo=github)](https://github.com/lumirlumir/npm-eslint-markdown/actions/workflows/test.yml)
-[![test-cross-platform](https://img.shields.io/github/actions/workflow/status/lumirlumir/npm-eslint-markdown/test-cross-platform.yml?label=test-cross-platform&color=6358d4&labelColor=333333&logo=github)](https://github.com/lumirlumir/npm-eslint-markdown/actions/workflows/test-cross-platform.yml)
 [![codecov](https://img.shields.io/codecov/c/gh/lumirlumir/npm-eslint-markdown?token=LJMUst9eR3&label=Codecov&color=6358d4&labelColor=333333&logo=codecov)](https://codecov.io/gh/lumirlumir/npm-eslint-markdown)
 ![Node Current](https://img.shields.io/node/v/eslint-markdown?color=6358d4&labelColor=333333&logo=node.js)
 

package/build/configs/all.d.ts

@@ -26,6 +26,7 @@ export default function all(plugin: ESLint.Plugin): {
         readonly 'md/consistent-unordered-list-style': "error";
         readonly 'md/no-control-character': "error";
         readonly 'md/no-curly-quote': "error";
+        readonly 'md/no-double-punctuation': "error";
         readonly 'md/no-double-space': "error";
         readonly 'md/no-emoji': "error";
         readonly 'md/no-git-conflict-marker': "error";

package/build/rules/index.d.ts

@@ -11,8 +11,9 @@ declare const _default: {
     'consistent-unordered-list-style': import("../core/types.js").RuleModule<import("./consistent-unordered-list-style.js").RuleOptions, "style">;
     'no-control-character': import("../core/types.js").RuleModule<import("./no-control-character.js").RuleOptions, "noControlCharacter">;
     'no-curly-quote': import("../core/types.js").RuleModule<import("./no-curly-quote.js").RuleOptions, "noCurlyQuote">;
+    'no-double-punctuation': import("../core/types.js").RuleModule<import("./no-double-punctuation.js").RuleOptions, "noDoublePunctuation">;
     'no-double-space': import("../core/types.js").RuleModule<import("./no-double-space.js").RuleOptions, import("./no-double-space.js").MessageIds>;
-    'no-emoji': import("../core/types.js").RuleModule<[], "noEmoji">;
+    'no-emoji': import("../core/types.js").RuleModule<import("./no-emoji.js").RuleOptions, "noEmoji">;
     'no-git-conflict-marker': import("../core/types.js").RuleModule<import("./no-git-conflict-marker.js").RuleOptions, "noGitConflictMarker">;
     'no-irregular-dash': import("../core/types.js").RuleModule<import("./no-irregular-dash.js").RuleOptions, "noIrregularDash">;
     'no-irregular-whitespace': import("../core/types.js").RuleModule<import("./no-irregular-whitespace.js").RuleOptions, "noIrregularWhitespace">;

package/build/rules/no-double-punctuation.d.ts

@@ -0,0 +1,49 @@
+declare const _default: {
+    meta: {
+        type: "problem";
+        docs: {
+            description: string;
+            url: string;
+            recommended: boolean;
+            stylistic: false;
+        };
+        schema: {
+            type: "object";
+            properties: {
+                allow: {
+                    type: "array";
+                    items: {
+                        type: "string";
+                        minLength: number;
+                        maxLength: number;
+                        pattern: string;
+                    };
+                    uniqueItems: true;
+                };
+            };
+            additionalProperties: false;
+        }[];
+        defaultOptions: [{
+            allow: never[];
+        }];
+        messages: {
+            noDoublePunctuation: string;
+        };
+        language: string;
+        dialects: string[];
+    };
+    create(context: import("@eslint/core").RuleContext<{
+        LangOptions: import("@eslint/markdown").MarkdownLanguageOptions;
+        Code: import("@eslint/markdown").MarkdownSourceCode;
+        RuleOptions: RuleOptions;
+        Node: import("mdast").Node;
+        MessageIds: "noDoublePunctuation";
+    }>): {
+        text(node: import("mdast").Text): void;
+    };
+};
+export default _default;
+export type RuleOptions = [{
+    allow: string[];
+}];
+export type MessageIds = "noDoublePunctuation";

package/build/rules/no-emoji.d.ts

@@ -7,6 +7,22 @@ declare const _default: {
             recommended: boolean;
             stylistic: false;
         };
+        schema: {
+            type: "object";
+            properties: {
+                allow: {
+                    type: "array";
+                    items: {
+                        type: "string";
+                    };
+                    uniqueItems: true;
+                };
+            };
+            additionalProperties: false;
+        }[];
+        defaultOptions: [{
+            allow: never[];
+        }];
         messages: {
             noEmoji: string;
         };
@@ -16,7 +32,7 @@ declare const _default: {
     create(context: import("@eslint/core").RuleContext<{
         LangOptions: import("@eslint/markdown").MarkdownLanguageOptions;
         Code: import("@eslint/markdown").MarkdownSourceCode;
-        RuleOptions: [];
+        RuleOptions: RuleOptions;
         Node: import("mdast").Node;
         MessageIds: "noEmoji";
     }>): {
@@ -24,5 +40,7 @@ declare const _default: {
     };
 };
 export default _default;
-export type RuleOptions = [];
+export type RuleOptions = [{
+    allow: string[];
+}];
 export type MessageIds = "noEmoji";

package/build/rules/no-git-conflict-marker.d.ts

@@ -7,6 +7,7 @@ declare const _default: {
             recommended: boolean;
             stylistic: false;
         };
+        fixable: "code";
         schema: {
             type: "object";
             properties: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-markdown",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "type": "module",
   "description": "Lint your Markdown with ESLint.🛠️",
   "exports": {
@@ -59,7 +59,7 @@
   },
   "scripts": {
     "prepublishOnly": "npm run build",
-    "build": "node ../../scripts/build-config.mjs && npx tsc && node ../../scripts/cp.mjs ../../LICENSE.md LICENSE.md ../../README.md README.md",
+    "build": "node ../../scripts/build-config.js && tsc && node ../../scripts/cp.js ../../LICENSE.md LICENSE.md ../../README.md README.md",
     "test": "npm run test:types && npm run test:unit",
     "test:types": "tsc -p ./tsconfig.test.json",
     "test:unit": "node --test"
@@ -75,7 +75,7 @@
   "dependencies": {
     "@eslint/markdown": "^7.5.1",
     "micromark-util-normalize-identifier": "^2.0.1",
-    "parse5": "^8.0.0"
+    "parse5": "^8.0.1"
   },
   "devDependencies": {
     "@types/mdast": "^4.0.4",

package/src/configs/all.js

@@ -1,6 +1,6 @@
 /**
  * @fileoverview `all` configuration.
- * WARNING: This file is autogenerated using the `scripts/build-config.mjs`
+ * WARNING: This file is autogenerated using the `scripts/build-config.js`
  */
 
 // --------------------------------------------------------------------------------
@@ -50,6 +50,7 @@ export default function all(plugin) {
       'md/consistent-unordered-list-style': 'error',
       'md/no-control-character': 'error',
       'md/no-curly-quote': 'error',
+      'md/no-double-punctuation': 'error',
       'md/no-double-space': 'error',
       'md/no-emoji': 'error',
       'md/no-git-conflict-marker': 'error',

package/src/configs/base.js

@@ -1,6 +1,6 @@
 /**
  * @fileoverview `base` configuration.
- * WARNING: This file is autogenerated using the `scripts/build-config.mjs`
+ * WARNING: This file is autogenerated using the `scripts/build-config.js`
  */
 
 // --------------------------------------------------------------------------------

package/src/configs/recommended.js

@@ -1,6 +1,6 @@
 /**
  * @fileoverview `recommended` configuration.
- * WARNING: This file is autogenerated using the `scripts/build-config.mjs`
+ * WARNING: This file is autogenerated using the `scripts/build-config.js`
  */
 
 // --------------------------------------------------------------------------------

package/src/configs/stylistic.js

@@ -1,6 +1,6 @@
 /**
  * @fileoverview `stylistic` configuration.
- * WARNING: This file is autogenerated using the `scripts/build-config.mjs`
+ * WARNING: This file is autogenerated using the `scripts/build-config.js`
  */
 
 // --------------------------------------------------------------------------------

package/src/rules/index.js

@@ -18,6 +18,7 @@ import consistentUnorderedListStyle from './consistent-unordered-list-style.js';
 // import noBoldParagraph from './no-bold-paragraph.js';
 import noControlCharacter from './no-control-character.js';
 import noCurlyQuote from './no-curly-quote.js';
+import noDoublePunctuation from './no-double-punctuation.js';
 import noDoubleSpace from './no-double-space.js';
 import noEmoji from './no-emoji.js';
 import noGitConflictMarker from './no-git-conflict-marker.js';
@@ -45,6 +46,7 @@ export default {
   // 'no-bold-paragraph': noBoldParagraph,
   'no-control-character': noControlCharacter,
   'no-curly-quote': noCurlyQuote,
+  'no-double-punctuation': noDoublePunctuation,
   'no-double-space': noDoubleSpace,
   'no-emoji': noEmoji,
   'no-git-conflict-marker': noGitConflictMarker,

package/src/rules/no-double-punctuation.js

@@ -0,0 +1,115 @@
+/**
+ * @fileoverview Rule to disallow double consecutive punctuation in text.
+ * @author 루밀LuMir(lumirlumir)
+ */
+
+// --------------------------------------------------------------------------------
+// Import
+// --------------------------------------------------------------------------------
+
+import { URL_RULE_DOCS } from '../core/constants.js';
+
+// --------------------------------------------------------------------------------
+// Typedef
+// --------------------------------------------------------------------------------
+
+/**
+ * @import { RuleModule } from '../core/types.js';
+ * @typedef {[{ allow: string[] }]} RuleOptions
+ * @typedef {'noDoublePunctuation'} MessageIds
+ */
+
+// --------------------------------------------------------------------------------
+// Helper
+// --------------------------------------------------------------------------------
+
+/**
+ * This pattern is based on the punctuation list used by `remark-lint`.
+ * @see https://github.com/remarkjs/remark-lint/tree/main/packages/remark-lint-no-heading-punctuation#parameters
+ */
+const doublePunctuationRegex = /(?:^|(?<=[^!,.:;?]))[!,.:;?]{2}(?:$|(?=[^!,.:;?]))/g;
+
+// --------------------------------------------------------------------------------
+// Rule Definition
+// --------------------------------------------------------------------------------
+
+/** @type {RuleModule<RuleOptions, MessageIds>} */
+export default {
+  meta: {
+    type: 'problem',
+
+    docs: {
+      description: 'Disallow double consecutive punctuation in text',
+      url: URL_RULE_DOCS('no-double-punctuation'),
+      recommended: false,
+      stylistic: false,
+    },
+
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          allow: {
+            type: 'array',
+            items: {
+              type: 'string',
+              minLength: 2,
+              maxLength: 2,
+              pattern: '^[!,.:;?]{2}$',
+            },
+            uniqueItems: true,
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+
+    defaultOptions: [
+      {
+        allow: [],
+      },
+    ],
+
+    messages: {
+      noDoublePunctuation: 'Double punctuation mark `{{ punctuation }}` is not allowed.',
+    },
+
+    language: 'markdown',
+
+    dialects: ['commonmark', 'gfm'],
+  },
+
+  create(context) {
+    const { sourceCode } = context;
+    const [{ allow }] = context.options;
+
+    return {
+      text(node) {
+        const [nodeStartOffset] = sourceCode.getRange(node);
+        const matches = sourceCode.getText(node).matchAll(doublePunctuationRegex);
+
+        for (const match of matches) {
+          const punctuation = match[0];
+
+          const startOffset = nodeStartOffset + match.index;
+          const endOffset = startOffset + punctuation.length;
+
+          if (allow.includes(punctuation)) continue;
+
+          context.report({
+            loc: {
+              start: sourceCode.getLocFromIndex(startOffset),
+              end: sourceCode.getLocFromIndex(endOffset),
+            },
+
+            data: {
+              punctuation,
+            },
+
+            messageId: 'noDoublePunctuation',
+          });
+        }
+      },
+    };
+  },
+};

package/src/rules/no-emoji.js

@@ -15,7 +15,7 @@ import { URL_RULE_DOCS } from '../core/constants.js';
 
 /**
  * @import { RuleModule } from '../core/types.js';
- * @typedef {[]} RuleOptions
+ * @typedef {[{ allow: string[] }]} RuleOptions
  * @typedef {'noEmoji'} MessageIds
  */
 
@@ -41,6 +41,28 @@ export default {
       stylistic: false,
     },
 
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          allow: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+            uniqueItems: true,
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+
+    defaultOptions: [
+      {
+        allow: [],
+      },
+    ],
+
     messages: {
       noEmoji: 'Emojis are not allowed.',
     },
@@ -52,6 +74,7 @@ export default {
 
   create(context) {
     const { sourceCode } = context;
+    const [{ allow }] = context.options;
 
     return {
       text(node) {
@@ -59,8 +82,12 @@ export default {
         const matches = sourceCode.getText(node).matchAll(emojiRegex);
 
         for (const match of matches) {
+          const emoji = match[0];
+
+          if (allow.includes(emoji)) continue;
+
           const startOffset = nodeStartOffset + match.index;
-          const endOffset = startOffset + match[0].length;
+          const endOffset = startOffset + emoji.length;
 
           context.report({
             loc: {

package/src/rules/no-git-conflict-marker.js

@@ -24,7 +24,8 @@ import { URL_RULE_DOCS } from '../core/constants.js';
 // Helper
 // --------------------------------------------------------------------------------
 
-const gitConflictMarkerRegex = /(?:^|(?<=[\r\n]))(?:<{7}(?!<)|={7}(?!=)|>{7}(?!>))/gu;
+const gitConflictMarkerRegex =
+  /(?:^|(?<=[\r\n]))(?<gitConflictMarker><{7}(?!<)|={7}(?!=)|>{7}(?!>))[^\r\n]*\r?\n?/gu;
 
 // --------------------------------------------------------------------------------
 // Rule Definition
@@ -42,6 +43,8 @@ export default {
       stylistic: false,
     },
 
+    fixable: 'code',
+
     schema: [
       {
         type: 'object',
@@ -99,7 +102,7 @@ export default {
         const matches = sourceCode.text.matchAll(gitConflictMarkerRegex);
 
         for (const match of matches) {
-          const gitConflictMarker = match[0];
+          const gitConflictMarker = match[1];
 
           const startOffset = match.index;
           const endOffset = startOffset + gitConflictMarker.length;
@@ -117,6 +120,11 @@ export default {
             },
 
             messageId: 'noGitConflictMarker',
+
+            fix(fixer) {
+              // Remove the entire line containing the git conflict marker, including the newline character.
+              return fixer.removeRange([startOffset, startOffset + match[0].length]);
+            },
           });
         }
       },