Update MD054/link-image-style to split reference parameter into full/collapsed/shortcut parameters (fixes #918).

demo/markdownlint-browser.js

@@ -6633,8 +6633,10 @@ module.exports = {
       config = params.config;
     var autolink = config.autolink === undefined || !!config.autolink;
     var inline = config.inline === undefined || !!config.inline;
-    var reference = config.reference === undefined || !!config.reference;
+    var full = config.full === undefined || !!config.full;
-    if (autolink && inline && reference) {
+    var collapsed = config.collapsed === undefined || !!config.collapsed;
+    var shortcut = config.shortcut === undefined || !!config.shortcut;
+    if (autolink && inline && full && collapsed && shortcut) {
       // Everything allowed, nothing to check
       return;
     }
@@ -6671,11 +6673,15 @@ module.exports = {
             // link kind is an inline link
             isError = !inline;
           } else {
-            // link kind is a reference link
+            // link kind is a full/collapsed/shortcut reference link
-            var referenceLabel = getTokenTextByType(descendents, "referenceString") || label;
+            var isShortcut = !children.some(function (t) {
-            var definition = definitions.get(referenceLabel);
+              return t.type === "reference";
+            });
+            var referenceString = getTokenTextByType(descendents, "referenceString");
+            var isCollapsed = referenceString === null;
+            var definition = definitions.get(referenceString || label);
             destination = definition && definition[1];
-            isError = !reference && destination;
+            isError = destination && (isShortcut ? !shortcut : isCollapsed ? !collapsed : !full);
           }
         }
         if (isError) {

doc-build/md054.md

@@ -1,10 +1,9 @@
 Links and images in Markdown can provide the link destination or image source at
 the time of use or can use a label to reference a definition elsewhere in the
-document. The reference format is convenient for keeping paragraph text
+document. The three reference formats are convenient for keeping paragraph text
-clutter-free and makes it easy to reuse the same URL in multiple places.
+clutter-free and make it easy to reuse the same URL in multiple places.
 
-By default, this rule allows all link/image styles. It is possible to disable
+By default, this rule allows all link/image styles.
-one or more of those styles.
 
 Setting the `autolink` parameter to `false` disables autolinks:
 
@@ -20,20 +19,34 @@ Setting the `inline` parameter to `false` disables inline links and images:
 ![image](https://example.com)
 ```
 
-Setting the `reference` parameter to `false` disables full, collapsed, and
+Setting the `full` parameter to `false` disables full reference links and
-shortcut reference links and images:
+images:
 
 ```markdown
 [link][url]
 
-[url][]
-
-[url]
-
 ![image][url]
 
+[url]: https://example.com
+```
+
+Setting the `collapsed` parameter to `false` disables collapsed reference links
+and images:
+
+```markdown
+[url][]
+
 ![url][]
 
+[url]: https://example.com
+```
+
+Setting the `shortcut` parameter to `false` disables shortcut reference links
+and images:
+
+```markdown
+[url]
+
 ![url]
 
 [url]: https://example.com
@@ -43,12 +56,12 @@ To fix violations of this rule, change the link or image to use an allowed
 style. This rule can automatically fix violations when a link or image can be
 converted to the `inline` style (preferred) or a link can be converted to the
 `autolink` style (which does not support images and must be an absolute URL).
-This rule does not fix scenarios that require converting a link or image to the
+This rule does *not* fix scenarios that require converting a link or image to
-`reference` style because that involves naming the reference and knowing where
+the `full`, `collapsed`, or `shortcut` reference styles because that involves
-in the document to insert it.
+naming the reference and determining where to insert it in the document.
 
 Rationale: Consistent formatting makes it easier to understand a document.
 Autolinks are concise, but appear as URLs which can be long and confusing.
 Inline links and images can include descriptive text, but take up more space in
 Markdown form. Reference links and images can be easier to read and manipulate
-in Markdown form, but require editing two locations.
+in Markdown form, but require a separate link reference definition.

doc/Rules.md

@@ -2234,18 +2234,21 @@ Aliases: `link-image-style`
 Parameters:
 
 - `autolink`: Allow autolinks (`boolean`, default `true`)
+- `collapsed`: Allow collapsed reference links and images (`boolean`, default
+  `true`)
+- `full`: Allow full reference links and images (`boolean`, default `true`)
 - `inline`: Allow inline links and images (`boolean`, default `true`)
-- `reference`: Allow reference links and images (`boolean`, default `true`)
+- `shortcut`: Allow shortcut reference links and images (`boolean`, default
+  `true`)
 
 Fixable: Some violations can be fixed by tooling
 
 Links and images in Markdown can provide the link destination or image source at
 the time of use or can use a label to reference a definition elsewhere in the
-document. The reference format is convenient for keeping paragraph text
+document. The three reference formats are convenient for keeping paragraph text
-clutter-free and makes it easy to reuse the same URL in multiple places.
+clutter-free and make it easy to reuse the same URL in multiple places.
 
-By default, this rule allows all link/image styles. It is possible to disable
+By default, this rule allows all link/image styles.
-one or more of those styles.
 
 Setting the `autolink` parameter to `false` disables autolinks:
 
@@ -2261,20 +2264,34 @@ Setting the `inline` parameter to `false` disables inline links and images:
 ![image](https://example.com)
 ```
 
-Setting the `reference` parameter to `false` disables full, collapsed, and
+Setting the `full` parameter to `false` disables full reference links and
-shortcut reference links and images:
+images:
 
 ```markdown
 [link][url]
 
-[url][]
-
-[url]
-
 ![image][url]
 
+[url]: https://example.com
+```
+
+Setting the `collapsed` parameter to `false` disables collapsed reference links
+and images:
+
+```markdown
+[url][]
+
 ![url][]
 
+[url]: https://example.com
+```
+
+Setting the `shortcut` parameter to `false` disables shortcut reference links
+and images:
+
+```markdown
+[url]
+
 ![url]
 
 [url]: https://example.com
@@ -2284,15 +2301,15 @@ To fix violations of this rule, change the link or image to use an allowed
 style. This rule can automatically fix violations when a link or image can be
 converted to the `inline` style (preferred) or a link can be converted to the
 `autolink` style (which does not support images and must be an absolute URL).
-This rule does not fix scenarios that require converting a link or image to the
+This rule does *not* fix scenarios that require converting a link or image to
-`reference` style because that involves naming the reference and knowing where
+the `full`, `collapsed`, or `shortcut` reference styles because that involves
-in the document to insert it.
+naming the reference and determining where to insert it in the document.
 
 Rationale: Consistent formatting makes it easier to understand a document.
 Autolinks are concise, but appear as URLs which can be long and confusing.
 Inline links and images can include descriptive text, but take up more space in
 Markdown form. Reference links and images can be easier to read and manipulate
-in Markdown form, but require editing two locations.
+in Markdown form, but require a separate link reference definition.
 
 <!-- markdownlint-configure-file {
   "no-inline-html": {

doc/md054.md

@@ -7,18 +7,21 @@ Aliases: `link-image-style`
 Parameters:
 
 - `autolink`: Allow autolinks (`boolean`, default `true`)
+- `collapsed`: Allow collapsed reference links and images (`boolean`, default
+  `true`)
+- `full`: Allow full reference links and images (`boolean`, default `true`)
 - `inline`: Allow inline links and images (`boolean`, default `true`)
-- `reference`: Allow reference links and images (`boolean`, default `true`)
+- `shortcut`: Allow shortcut reference links and images (`boolean`, default
+  `true`)
 
 Fixable: Some violations can be fixed by tooling
 
 Links and images in Markdown can provide the link destination or image source at
 the time of use or can use a label to reference a definition elsewhere in the
-document. The reference format is convenient for keeping paragraph text
+document. The three reference formats are convenient for keeping paragraph text
-clutter-free and makes it easy to reuse the same URL in multiple places.
+clutter-free and make it easy to reuse the same URL in multiple places.
 
-By default, this rule allows all link/image styles. It is possible to disable
+By default, this rule allows all link/image styles.
-one or more of those styles.
 
 Setting the `autolink` parameter to `false` disables autolinks:
 
@@ -34,20 +37,34 @@ Setting the `inline` parameter to `false` disables inline links and images:
 ![image](https://example.com)
 ```
 
-Setting the `reference` parameter to `false` disables full, collapsed, and
+Setting the `full` parameter to `false` disables full reference links and
-shortcut reference links and images:
+images:
 
 ```markdown
 [link][url]
 
-[url][]
-
-[url]
-
 ![image][url]
 
+[url]: https://example.com
+```
+
+Setting the `collapsed` parameter to `false` disables collapsed reference links
+and images:
+
+```markdown
+[url][]
+
 ![url][]
 
+[url]: https://example.com
+```
+
+Setting the `shortcut` parameter to `false` disables shortcut reference links
+and images:
+
+```markdown
+[url]
+
 ![url]
 
 [url]: https://example.com
@@ -57,12 +74,12 @@ To fix violations of this rule, change the link or image to use an allowed
 style. This rule can automatically fix violations when a link or image can be
 converted to the `inline` style (preferred) or a link can be converted to the
 `autolink` style (which does not support images and must be an absolute URL).
-This rule does not fix scenarios that require converting a link or image to the
+This rule does *not* fix scenarios that require converting a link or image to
-`reference` style because that involves naming the reference and knowing where
+the `full`, `collapsed`, or `shortcut` reference styles because that involves
-in the document to insert it.
+naming the reference and determining where to insert it in the document.
 
 Rationale: Consistent formatting makes it easier to understand a document.
 Autolinks are concise, but appear as URLs which can be long and confusing.
 Inline links and images can include descriptive text, but take up more space in
 Markdown form. Reference links and images can be easier to read and manipulate
-in Markdown form, but require editing two locations.
+in Markdown form, but require a separate link reference definition.

lib/configuration.d.ts

@@ -1009,9 +1009,17 @@ export interface Configuration {
          */
         inline?: boolean;
         /**
-         * Allow reference links and images
+         * Allow full reference links and images
          */
-        reference?: boolean;
+        full?: boolean;
+        /**
+         * Allow collapsed reference links and images
+         */
+        collapsed?: boolean;
+        /**
+         * Allow shortcut reference links and images
+         */
+        shortcut?: boolean;
       };
   /**
    * MD054/link-image-style : Link and image style : https://github.com/DavidAnson/markdownlint/blob/v0.31.1/doc/md054.md
@@ -1028,9 +1036,17 @@ export interface Configuration {
          */
         inline?: boolean;
         /**
-         * Allow reference links and images
+         * Allow full reference links and images
          */
-        reference?: boolean;
+        full?: boolean;
+        /**
+         * Allow collapsed reference links and images
+         */
+        collapsed?: boolean;
+        /**
+         * Allow shortcut reference links and images
+         */
+        shortcut?: boolean;
       };
   /**
    * headings : MD001, MD003, MD018, MD019, MD020, MD021, MD022, MD023, MD024, MD025, MD026, MD036, MD041, MD043

lib/md054.js

@@ -29,8 +29,10 @@ module.exports = {
     const { parsers, config } = params;
     const autolink = (config.autolink === undefined) || !!config.autolink;
     const inline = (config.inline === undefined) || !!config.inline;
-    const reference = (config.reference === undefined) || !!config.reference;
+    const full = (config.full === undefined) || !!config.full;
-    if (autolink && inline && reference) {
+    const collapsed = (config.collapsed === undefined) || !!config.collapsed;
+    const shortcut = (config.shortcut === undefined) || !!config.shortcut;
+    if (autolink && inline && full && collapsed && shortcut) {
       // Everything allowed, nothing to check
       return;
     }
@@ -62,12 +64,14 @@ module.exports = {
           // link kind is an inline link
           isError = !inline;
         } else {
-          // link kind is a reference link
+          // link kind is a full/collapsed/shortcut reference link
-          const referenceLabel =
+          const isShortcut = !children.some((t) => t.type === "reference");
-            getTokenTextByType(descendents, "referenceString") || label;
+          const referenceString = getTokenTextByType(descendents, "referenceString");
-          const definition = definitions.get(referenceLabel);
+          const isCollapsed = (referenceString === null);
+          const definition = definitions.get(referenceString || label);
           destination = definition && definition[1];
-          isError = !reference && destination;
+          isError = destination &&
+            (isShortcut ? !shortcut : (isCollapsed ? !collapsed : !full));
         }
       }
       if (isError) {

schema/.markdownlint.jsonc

@@ -285,7 +285,11 @@
     "autolink": true,
     // Allow inline links and images
     "inline": true,
-    // Allow reference links and images
+    // Allow full reference links and images
-    "reference": true
+    "full": true,
+    // Allow collapsed reference links and images
+    "collapsed": true,
+    // Allow shortcut reference links and images
+    "shortcut": true
   }
 }

schema/.markdownlint.yaml

@@ -256,5 +256,9 @@ MD054:
   autolink: true
   # Allow inline links and images
   inline: true
-  # Allow reference links and images
+  # Allow full reference links and images
-  reference: true
+  full: true
+  # Allow collapsed reference links and images
+  collapsed: true
+  # Allow shortcut reference links and images
+  shortcut: true

schema/build-config-schema.js

@@ -509,8 +509,18 @@ for (const rule of rules) {
           "type": "boolean",
           "default": true
         },
-        "reference": {
+        "full": {
-          "description": "Allow reference links and images",
+          "description": "Allow full reference links and images",
+          "type": "boolean",
+          "default": true
+        },
+        "collapsed": {
+          "description": "Allow collapsed reference links and images",
+          "type": "boolean",
+          "default": true
+        },
+        "shortcut": {
+          "description": "Allow shortcut reference links and images",
           "type": "boolean",
           "default": true
         }

schema/markdownlint-config-schema.json

@@ -1573,8 +1573,18 @@
           "type": "boolean",
           "default": true
         },
-        "reference": {
+        "full": {
-          "description": "Allow reference links and images",
+          "description": "Allow full reference links and images",
+          "type": "boolean",
+          "default": true
+        },
+        "collapsed": {
+          "description": "Allow collapsed reference links and images",
+          "type": "boolean",
+          "default": true
+        },
+        "shortcut": {
+          "description": "Allow shortcut reference links and images",
           "type": "boolean",
           "default": true
         }
@@ -1599,8 +1609,18 @@
           "type": "boolean",
           "default": true
         },
-        "reference": {
+        "full": {
-          "description": "Allow reference links and images",
+          "description": "Allow full reference links and images",
+          "type": "boolean",
+          "default": true
+        },
+        "collapsed": {
+          "description": "Allow collapsed reference links and images",
+          "type": "boolean",
+          "default": true
+        },
+        "shortcut": {
+          "description": "Allow shortcut reference links and images",
           "type": "boolean",
           "default": true
         }

test/break-all-the-rules.md

@@ -119,7 +119,7 @@ Strong **with** different style {MD050}
     ]
   },
   "link-image-style": {
-    "reference": false
+    "full": false
   }
 } -->
 

test/link-style-autolink-only.md

@@ -73,6 +73,8 @@ Text [url](https://example.com/an>g<le>) text {MD054}
   "link-image-reference-definitions": false,
   "link-image-style": {
     "inline": false,
-    "reference": false
+    "full": false,
+    "collapsed": false,
+    "shortcut": false
   }
 } -->

test/link-style-autolink-or-inline.md

@@ -72,6 +72,8 @@ Text [url](https://example.com/an>g<le>) text
   "link-fragments": false,
   "link-image-reference-definitions": false,
   "link-image-style": {
-    "reference": false
+    "full": false,
+    "collapsed": false,
+    "shortcut": false
   }
 } -->

test/link-style-collapsed-only.md

@@ -0,0 +1,79 @@
+# Link Style reference_only
+
+Text [url](https://example.com) text {MD054}
+
+Text ![url](https://example.com) text {MD054}
+
+Text [url](<https://example.com>) text {MD054}
+
+Text ![url](<https://example.com>) text {MD054}
+
+Text [url](https://example.com "title") text {MD054}
+
+Text ![url](https://example.com "title") text {MD054}
+
+Text {MD054} [url](https://example.com
+"title") text
+
+Text {MD054} ![url](https://example.com
+"title") text
+
+Text [text][url] text {MD054}
+
+Text ![text][url] text {MD054}
+
+Text [url][] text
+
+Text ![url][] text
+
+Text [url] text {MD054}
+
+Text ![url] text {MD054}
+
+Text <https://example.com> text {MD054}
+
+[url]: https://example.com "title"
+
+[undefined]
+
+Text [url](https://example.com/embedded\3backslash) text {MD054}
+
+Text [url](https://example.com/backslash\[escape) text {MD054}
+
+Text [embedded-backslash] text {MD054}
+
+Text [backslash-escape] text {MD054}
+
+Text <https://example.com/embedded\3backslash> text {MD054}
+
+Text <https://example.com/backslash[no-escape> text {MD054}
+
+[embedded-backslash]: https://example.com/embedded\3backslash
+
+[backslash-escape]: https://example.com/backslash\[escape
+
+Text [url](<https://example.com/embedded space>) text {MD054}
+
+Text [url](<https://example.com/embedded)paren>) text {MD054}
+
+Text [url](https://example.com/\(parens\)) text {MD054}
+
+Text [url](https://example.com/pa(re(ns))) text {MD054}
+
+Text [url](relative/path) text {MD054}
+
+Text [url](#fragment) text {MD054}
+
+Text <https://example.com/pa)re(ns> text {MD054}
+
+Text [url](https://example.com/an>g<le>) text {MD054}
+
+<!-- markdownlint-configure-file {
+  "link-fragments": false,
+  "link-image-style": {
+    "autolink": false,
+    "inline": false,
+    "full": false,
+    "shortcut": false
+  }
+} -->

test/link-style-full-only.md

@@ -0,0 +1,79 @@
+# Link Style reference_only
+
+Text [url](https://example.com) text {MD054}
+
+Text ![url](https://example.com) text {MD054}
+
+Text [url](<https://example.com>) text {MD054}
+
+Text ![url](<https://example.com>) text {MD054}
+
+Text [url](https://example.com "title") text {MD054}
+
+Text ![url](https://example.com "title") text {MD054}
+
+Text {MD054} [url](https://example.com
+"title") text
+
+Text {MD054} ![url](https://example.com
+"title") text
+
+Text [text][url] text
+
+Text ![text][url] text
+
+Text [url][] text {MD054}
+
+Text ![url][] text {MD054}
+
+Text [url] text {MD054}
+
+Text ![url] text {MD054}
+
+Text <https://example.com> text {MD054}
+
+[url]: https://example.com "title"
+
+[undefined]
+
+Text [url](https://example.com/embedded\3backslash) text {MD054}
+
+Text [url](https://example.com/backslash\[escape) text {MD054}
+
+Text [embedded-backslash] text {MD054}
+
+Text [backslash-escape] text {MD054}
+
+Text <https://example.com/embedded\3backslash> text {MD054}
+
+Text <https://example.com/backslash[no-escape> text {MD054}
+
+[embedded-backslash]: https://example.com/embedded\3backslash
+
+[backslash-escape]: https://example.com/backslash\[escape
+
+Text [url](<https://example.com/embedded space>) text {MD054}
+
+Text [url](<https://example.com/embedded)paren>) text {MD054}
+
+Text [url](https://example.com/\(parens\)) text {MD054}
+
+Text [url](https://example.com/pa(re(ns))) text {MD054}
+
+Text [url](relative/path) text {MD054}
+
+Text [url](#fragment) text {MD054}
+
+Text <https://example.com/pa)re(ns> text {MD054}
+
+Text [url](https://example.com/an>g<le>) text {MD054}
+
+<!-- markdownlint-configure-file {
+  "link-fragments": false,
+  "link-image-style": {
+    "autolink": false,
+    "inline": false,
+    "collapsed": false,
+    "shortcut": false
+  }
+} -->

test/link-style-inline-only.md

@@ -73,6 +73,8 @@ Text [url](https://example.com/an>g<le>) text
   "link-image-reference-definitions": false,
   "link-image-style": {
     "autolink": false,
-    "reference": false
+    "full": false,
+    "collapsed": false,
+    "shortcut": false
   }
 } -->

test/link-style-none.md

@@ -0,0 +1,81 @@
+# Link Style autolink_only
+
+Text [url](https://example.com) text {MD054}
+
+Text ![url](https://example.com) text {MD054}
+
+Text [url](<https://example.com>) text {MD054}
+
+Text ![url](<https://example.com>) text {MD054}
+
+Text [url](https://example.com "title") text {MD054}
+
+Text ![url](https://example.com "title") text {MD054}
+
+Text {MD054} [url](https://example.com
+"title") text
+
+Text {MD054} ![url](https://example.com
+"title") text
+
+Text [text][url] text {MD054}
+
+Text ![text][url] text {MD054}
+
+Text [url][] text {MD054}
+
+Text ![url][] text {MD054}
+
+Text [url] text {MD054}
+
+Text ![url] text {MD054}
+
+Text <https://example.com> text {MD054}
+
+[url]: https://example.com "title"
+
+[undefined]
+
+Text [url](https://example.com/embedded\3backslash) text {MD054}
+
+Text [url](https://example.com/backslash\[escape) text {MD054}
+
+Text [embedded-backslash] text {MD054}
+
+Text [backslash-escape] text {MD054}
+
+Text <https://example.com/embedded\3backslash> text {MD054}
+
+Text <https://example.com/backslash[no-escape> text {MD054}
+
+[embedded-backslash]: https://example.com/embedded\3backslash
+
+[backslash-escape]: https://example.com/backslash\[escape
+
+Text [url](<https://example.com/embedded space>) text {MD054}
+
+Text [url](<https://example.com/embedded)paren>) text {MD054}
+
+Text [url](https://example.com/\(parens\)) text {MD054}
+
+Text [url](https://example.com/pa(re(ns))) text {MD054}
+
+Text [url](relative/path) text {MD054}
+
+Text [url](#fragment) text {MD054}
+
+Text <https://example.com/pa)re(ns> text {MD054}
+
+Text [url](https://example.com/an>g<le>) text {MD054}
+
+<!-- markdownlint-configure-file {
+  "link-fragments": false,
+  "link-image-reference-definitions": false,
+  "link-image-style": {
+    "autolink": false,
+    "inline": false,
+    "full": false,
+    "collapsed": false,
+    "shortcut": false
+  }
+} -->

test/link-style-shortcut-only.md

@@ -0,0 +1,79 @@
+# Link Style reference_only
+
+Text [url](https://example.com) text {MD054}
+
+Text ![url](https://example.com) text {MD054}
+
+Text [url](<https://example.com>) text {MD054}
+
+Text ![url](<https://example.com>) text {MD054}
+
+Text [url](https://example.com "title") text {MD054}
+
+Text ![url](https://example.com "title") text {MD054}
+
+Text {MD054} [url](https://example.com
+"title") text
+
+Text {MD054} ![url](https://example.com
+"title") text
+
+Text [text][url] text {MD054}
+
+Text ![text][url] text {MD054}
+
+Text [url][] text {MD054}
+
+Text ![url][] text {MD054}
+
+Text [url] text
+
+Text ![url] text
+
+Text <https://example.com> text {MD054}
+
+[url]: https://example.com "title"
+
+[undefined]
+
+Text [url](https://example.com/embedded\3backslash) text {MD054}
+
+Text [url](https://example.com/backslash\[escape) text {MD054}
+
+Text [embedded-backslash] text
+
+Text [backslash-escape] text
+
+Text <https://example.com/embedded\3backslash> text {MD054}
+
+Text <https://example.com/backslash[no-escape> text {MD054}
+
+[embedded-backslash]: https://example.com/embedded\3backslash
+
+[backslash-escape]: https://example.com/backslash\[escape
+
+Text [url](<https://example.com/embedded space>) text {MD054}
+
+Text [url](<https://example.com/embedded)paren>) text {MD054}
+
+Text [url](https://example.com/\(parens\)) text {MD054}
+
+Text [url](https://example.com/pa(re(ns))) text {MD054}
+
+Text [url](relative/path) text {MD054}
+
+Text [url](#fragment) text {MD054}
+
+Text <https://example.com/pa)re(ns> text {MD054}
+
+Text [url](https://example.com/an>g<le>) text {MD054}
+
+<!-- markdownlint-configure-file {
+  "link-fragments": false,
+  "link-image-style": {
+    "autolink": false,
+    "inline": false,
+    "full": false,
+    "collapsed": false
+  }
+} -->

test/markdownlint-test.js

@@ -915,7 +915,7 @@ test("readme", async(t) => {
 });
 
 test("validateJsonUsingConfigSchemaStrict", async(t) => {
-  t.plan(165);
+  t.plan(169);
   const { addSchema, validate } =
     await import("@hyperjump/json-schema/draft-07");
   addSchema(configSchemaStrict, configSchemaStrictUri);