eslint-plugin-markdown-preferences 0.36.0 → 0.36.2

package/lib/index.d.ts

@@ -373,7 +373,6 @@ type MarkdownPreferencesLinkBracketSpacing = [] | [{
 type MarkdownPreferencesLinkDestinationStyle = [] | [{
   style?: ("bare" | "pointy-brackets");
   avoidEscape?: boolean;
-  [k: string]: unknown | undefined;
 }];
 type MarkdownPreferencesLinkParenNewline = [] | [{
   newline?: ("always" | "never" | "consistent");
@@ -385,7 +384,6 @@ type MarkdownPreferencesLinkParenSpacing = [] | [{
 type MarkdownPreferencesLinkTitleStyle = [] | [{
   style?: ("double" | "single" | "parentheses");
   avoidEscape?: boolean;
-  [k: string]: unknown | undefined;
 }];
 type MarkdownPreferencesListMarkerAlignment = [] | [{
   align?: ("left" | "right");
@@ -438,9 +436,7 @@ type MarkdownPreferencesPreferInlineCodeWords = [] | [{
     node?: {
       [k: string]: unknown | undefined;
     };
-    [k: string]: unknown | undefined;
   }[];
-  [k: string]: unknown | undefined;
 }];
 type MarkdownPreferencesPreferLinkReferenceDefinitions = [] | [{
   minLinks?: number;
@@ -454,9 +450,7 @@ type MarkdownPreferencesPreferLinkedWords = [] | [{
     node?: {
       [k: string]: unknown | undefined;
     };
-    [k: string]: unknown | undefined;
   }[];
-  [k: string]: unknown | undefined;
 }];
 type MarkdownPreferencesSetextHeadingUnderlineLength = [] | [{
   mode?: ("exact" | "minimum" | "consistent" | "consistent-line-length");
@@ -545,7 +539,7 @@ declare namespace meta_d_exports {
   export { name, version };
 }
 declare const name: "eslint-plugin-markdown-preferences";
-declare const version: "0.36.0";
+declare const version: "0.36.2";
 //#endregion
 //#region src/language/ast-types.d.ts
 type Node = mdast.Node;

package/lib/index.js

@@ -40,7 +40,7 @@ function createRule(ruleName, rule) {
 
 //#endregion
 //#region src/utils/ast.ts
-const RE_HTML_COMMENT = /<!--(.*?)-->/u;
+const RE_HTML_COMMENT = /<!--(.*?)-->/gu;
 /**
 * Get the parent of a node.
 */
@@ -138,17 +138,25 @@ function getThematicBreakMarker(sourceCode, node) {
 	};
 }
 /**
-* Check whether a node is an HTML comment.
+* Get all HTML comments in a node.
 */
-function isHTMLComment(node) {
-	return node.type === "html" && RE_HTML_COMMENT.test(node.value);
-}
-/**
-* Get the value of an HTML comment.
-*/
-function getHTMLCommentValue(node) {
-	if (!isHTMLComment(node)) return null;
-	return RE_HTML_COMMENT.exec(node.value)?.[1] ?? null;
+function getHTMLComments(sourceCode, node) {
+	const [startIndex] = sourceCode.getRange(node);
+	return [...iterate()];
+	/**
+	* An iterator which iterates HTML comments.
+	*/
+	function* iterate() {
+		let match;
+		while (match = RE_HTML_COMMENT.exec(node.value)) {
+			const start = startIndex + match.index;
+			const end = start + match[0].length;
+			yield {
+				value: match[1],
+				range: [start, end]
+			};
+		}
+	}
 }
 
 //#endregion
@@ -7075,7 +7083,8 @@ var link_destination_style_default = createRule("link-destination-style", {
 			properties: {
 				style: { enum: ["bare", "pointy-brackets"] },
 				avoidEscape: { type: "boolean" }
-			}
+			},
+			additionalProperties: false
 		}],
 		messages: {
 			expectedBare: "Link destination should not be enclosed in pointy brackets.",
@@ -7509,7 +7518,8 @@ var link_title_style_default = createRule("link-title-style", {
 					"parentheses"
 				] },
 				avoidEscape: { type: "boolean" }
-			}
+			},
+			additionalProperties: false
 		}],
 		messages: {
 			expectedDouble: "Expected link title to be double quoted.",
@@ -9503,9 +9513,14 @@ var padding_line_between_blocks_default = createRule("padding-line-between-block
 		* Check if the previous block is ignored
 		*/
 		function isIgnore(prevBlock) {
-			if (isHTMLComment(prevBlock)) {
-				const value = getHTMLCommentValue(prevBlock);
-				if (/^\s*(?:eslint|markdownlint)-disable-next-line\b/u.test(value)) return true;
+			if (prevBlock.type === "html") {
+				const comments = getHTMLComments(sourceCode, prevBlock);
+				const loc = sourceCode.getLoc(prevBlock);
+				for (const comment of comments) {
+					const value = comment.value;
+					if (!/^\s*(?:eslint|markdownlint)-disable-next-line\b/u.test(value)) continue;
+					if (sourceCode.getLocFromIndex(comment.range[1]).line === loc.end.line) return true;
+				}
 			}
 			return false;
 		}
@@ -9674,7 +9689,7 @@ const IGNORES_SCHEMA = {
 			}] },
 			node: { type: "object" }
 		},
-		additionalProperties: true
+		additionalProperties: false
 	}
 };
 /**
@@ -9737,7 +9752,7 @@ var prefer_inline_code_words_default = createRule("prefer-inline-code-words", {
 				ignores: IGNORES_SCHEMA
 			},
 			required: ["words"],
-			additionalProperties: true
+			additionalProperties: false
 		}],
 		messages: { requireInlineCode: "The word \"{{name}}\" should be in inline code." }
 	},
@@ -9980,7 +9995,7 @@ var prefer_linked_words_default = createRule("prefer-linked-words", {
 				ignores: IGNORES_SCHEMA
 			},
 			required: ["words"],
-			additionalProperties: true
+			additionalProperties: false
 		}],
 		messages: { requireLink: "The word \"{{name}}\" should be a link." }
 	},
@@ -12213,7 +12228,7 @@ var meta_exports = /* @__PURE__ */ __export({
 	version: () => version
 });
 const name = "eslint-plugin-markdown-preferences";
-const version = "0.36.0";
+const version = "0.36.2";
 
 //#endregion
 //#region src/language/extensions/micromark-custom-container.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-markdown-preferences",
-  "version": "0.36.0",
+  "version": "0.36.2",
   "description": "ESLint plugin that enforces our markdown preferences",
   "type": "module",
   "exports": {