Fix exception for link in image, identifier matching

Author: wooorm

index.js

@@ -125,7 +125,6 @@ function compiler() {
   var characterReferenceType
   var expectingFirstListItemValue
   var atHardBreak
-  var inImage
   var inReference
   var referenceType
 
@@ -319,7 +318,6 @@ function compiler() {
 
     function enter(token) {
       var node = create(token)
-
       context.children.push(node)
       context = node
       stack.push(node)
@@ -399,8 +397,10 @@ function compiler() {
     context.value = data
   }
 
-  function onexitdefinitionlabelstring() {
-    var data = resume()
+  function onexitdefinitionlabelstring(token) {
+    // Discard label, use the source content instead.
+    resume()
+    var data = this.sliceSerialize(token)
     context.label = data
     context.identifier = normalizeIdentifier(data).toLowerCase()
   }
@@ -503,7 +503,6 @@ function compiler() {
 
   function onenterimage() {
     buffer()
-    inImage = true
   }
 
   function onexitlink() {
@@ -551,10 +550,10 @@ function compiler() {
     // Assume a reference.
     inReference = true
 
-    if (inImage) {
+    // If we’re in a fragment, we’re in an image and buffering.
+    if (context.type === 'fragment') {
       data = resume()
       context.alt = data
-      inImage = undefined
     }
   }
 
@@ -576,8 +575,9 @@ function compiler() {
     referenceType = 'collapsed'
   }
 
-  function onexitreferencestring() {
-    var data = resume()
+  function onexitreferencestring(token) {
+    resume()
+    var data = this.sliceSerialize(token)
     context.label = data
     context.identifier = normalizeIdentifier(data).toLowerCase()
     referenceType = 'full'
@@ -659,11 +659,11 @@ function compiler() {
   }
 
   function image() {
-    return {type: 'image', title: null, url: null, alt: null}
+    return {type: 'image', title: null, url: '', alt: null}
   }
 
   function link() {
-    return {type: 'link', title: null, url: null, children: []}
+    return {type: 'link', title: null, url: '', children: []}
   }
 
   function list(token) {

package.json

@@ -36,13 +36,19 @@
   },
   "devDependencies": {
     "browserify": "^16.0.0",
+    "commonmark.json": "^0.29.0",
     "gzip-size-cli": "^3.0.0",
+    "hast-util-to-html": "^7.0.0",
+    "mdast-util-to-hast": "^9.0.0",
     "nyc": "^15.0.0",
     "prettier": "^2.0.0",
+    "rehype-parse": "^7.0.0",
+    "rehype-stringify": "^8.0.0",
     "remark-cli": "^8.0.0",
     "remark-preset-wooorm": "^7.0.0",
     "tape": "^5.0.0",
     "tinyify": "^3.0.0",
+    "unified": "^9.0.0",
     "xo": "^0.33.0"
   },
   "scripts": {
@@ -72,6 +78,7 @@
     "esnext": false,
     "rules": {
       "complexity": "off",
+      "unicorn/no-fn-reference-in-iterator": "off",
       "unicorn/prefer-number-properties": "off",
       "unicorn/prefer-optional-catch-binding": "off",
       "unicorn/prefer-set-has": "off"

test/fixtures/image-reference.json

@@ -55,9 +55,6 @@
         },
         {
           "type": "imageReference",
-          "identifier": "e",
-          "label": "e",
-          "referenceType": "shortcut",
           "alt": "e",
           "position": {
             "start": {
@@ -70,7 +67,10 @@
               "column": 17,
               "offset": 79
             }
-          }
+          },
+          "label": "e",
+          "identifier": "e",
+          "referenceType": "shortcut"
         },
         {
           "type": "text",
@@ -90,9 +90,6 @@
         },
         {
           "type": "imageReference",
-          "identifier": "f",
-          "label": "f",
-          "referenceType": "collapsed",
           "alt": "f",
           "position": {
             "start": {
@@ -105,7 +102,10 @@
               "column": 25,
               "offset": 87
             }
-          }
+          },
+          "label": "f",
+          "identifier": "f",
+          "referenceType": "collapsed"
         },
         {
           "type": "text",
@@ -125,9 +125,6 @@
         },
         {
           "type": "imageReference",
-          "identifier": "h",
-          "label": "h",
-          "referenceType": "full",
           "alt": "g",
           "position": {
             "start": {
@@ -140,7 +137,10 @@
               "column": 34,
               "offset": 96
             }
-          }
+          },
+          "label": "h",
+          "identifier": "h",
+          "referenceType": "full"
         }
       ],
       "position": {

test/fixtures/image-resource.json

@@ -293,7 +293,7 @@
         {
           "type": "image",
           "title": null,
-          "url": null,
+          "url": "",
           "alt": "",
           "position": {
             "start": {

test/fixtures/link-reference.json

@@ -55,9 +55,6 @@
         },
         {
           "type": "linkReference",
-          "identifier": "e",
-          "label": "e",
-          "referenceType": "shortcut",
           "children": [
             {
               "type": "text",
@@ -87,7 +84,10 @@
               "column": 16,
               "offset": 75
             }
-          }
+          },
+          "label": "e",
+          "identifier": "e",
+          "referenceType": "shortcut"
         },
         {
           "type": "text",
@@ -107,9 +107,6 @@
         },
         {
           "type": "linkReference",
-          "identifier": "f",
-          "label": "f",
-          "referenceType": "collapsed",
           "children": [
             {
               "type": "text",
@@ -139,7 +136,10 @@
               "column": 23,
               "offset": 82
             }
-          }
+          },
+          "label": "f",
+          "identifier": "f",
+          "referenceType": "collapsed"
         },
         {
           "type": "text",
@@ -159,9 +159,6 @@
         },
         {
           "type": "linkReference",
-          "identifier": "h",
-          "label": "h",
-          "referenceType": "full",
           "children": [
             {
               "type": "text",
@@ -191,7 +188,10 @@
               "column": 31,
               "offset": 90
             }
-          }
+          },
+          "label": "h",
+          "identifier": "h",
+          "referenceType": "full"
         }
       ],
       "position": {

test/fixtures/link-resource.json

@@ -460,7 +460,7 @@
         {
           "type": "link",
           "title": null,
-          "url": null,
+          "url": "",
           "children": [],
           "position": {
             "start": {

test/index.js

@@ -4,8 +4,13 @@ var fs = require('fs')
 var path = require('path')
 var test = require('tape')
 var unified = require('unified')
-var parse = require('remark-parse')
+var remarkParse = require('remark-parse')
+var rehypeParse = require('rehype-parse')
+var rehypeStringify = require('rehype-stringify')
 var visit = require('unist-util-visit')
+var toHast = require('mdast-util-to-hast')
+var toHtml = require('hast-util-to-html')
+var commonmark = require('commonmark.json')
 var fromMarkdown = require('..')
 
 var join = path.join
@@ -798,8 +803,37 @@ test('fixtures', function (t) {
   }
 })
 
+test('commonmark', function (t) {
+  commonmark.forEach(each)
+
+  t.end()
+
+  function each(example, index) {
+    var html = toHtml(
+      toHast(fromMarkdown(example.markdown.slice(0, -1)), {
+        allowDangerousHtml: true,
+        commonmark: true
+      }),
+      {
+        allowDangerousHtml: true,
+        entities: {useNamedReferences: true},
+        closeSelfClosing: true
+      }
+    )
+
+    var reformat = unified()
+      .use(rehypeParse, {fragment: true})
+      .use(rehypeStringify)
+
+    var actual = reformat.processSync(html).toString()
+    var expected = reformat.processSync(example.html.slice(0, -1)).toString()
+
+    t.equal(actual, expected, example.section + ' (' + index + ')')
+  }
+})
+
 function remarkLegacyParse(doc) {
-  var processor = unified().use(parse, {commonmark: true}).use(clean)
+  var processor = unified().use(remarkParse, {commonmark: true}).use(clean)
   return processor.runSync(processor.parse(doc))
 }