Update parse5

Author: wooorm

index.js

@@ -13,7 +13,7 @@ var one = zwitch('type')
 var all = mapz(one, {key: 'children', indices: false})
 
 var customProps = [
-  '__location',
+  'sourceCodeLocation',
   'childNodes',
   'content',
   'parentNode',
@@ -108,8 +108,8 @@ function doctype(node) {
   return wrap(node, {
     nodeName: '#documentType',
     name: node.name,
-    publicId: node.public || null,
-    systemId: node.system || null
+    publicId: node.public || '',
+    systemId: node.system || ''
   })
 }
 
@@ -129,12 +129,16 @@ function comment(node) {
 
 /* Patch position. */
 function wrap(node, ast, content) {
-  if (node.position && node.position.start && node.position.end) {
-    ast.__location = {
-      line: node.position.start.line,
-      col: node.position.start.column,
-      startOffset: node.position.start.offset,
-      endOffset: node.position.end.offset
+  var position = node.position
+
+  if (position && position.start && position.end) {
+    ast.sourceCodeLocation = {
+      startLine: position.start.line,
+      startCol: position.start.column,
+      startOffset: position.start.offset,
+      endLine: position.end.line,
+      endCol: position.end.column,
+      endOffset: position.end.offset
     }
   }
 
@@ -148,7 +152,7 @@ function wrap(node, ast, content) {
 /* Patch a tree recursively, by adding namespaces
  * and parent references where needed. */
 function patch(node, parent, ns) {
-  var location = node.__location
+  var location = node.sourceCodeLocation
   var children = node.childNodes
   var name = node.tagName
   var replacement = {}
@@ -189,7 +193,7 @@ function patch(node, parent, ns) {
   }
 
   if (location) {
-    replacement.__location = location
+    replacement.sourceCodeLocation = location
   }
 
   return replacement

package.json

@@ -29,7 +29,7 @@
     "browserify": "^16.0.0",
     "esmangle": "^1.0.1",
     "nyc": "^12.0.0",
-    "parse5": "^3.0.0",
+    "parse5": "^5.0.0",
     "prettier": "^1.13.5",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",

test/position.js

@@ -6,11 +6,13 @@ var parse5 = require('parse5')
 var toParse5 = require('..')
 
 test('position', function(t) {
-  var node = parse5.parseFragment('<h1>Alpha', {locationInfo: true})
+  var node = parse5.parseFragment('<h1>Alpha', {sourceCodeLocationInfo: true})
 
   node = node.childNodes[0]
   delete node.parentNode
-  delete node.__location
+
+  /* Not possible yet to map this one. */
+  delete node.sourceCodeLocation.startTag
 
   t.deepEqual(
     inspect(
@@ -26,13 +28,11 @@ test('position', function(t) {
               end: {line: 1, column: 10, offset: 9}
             }
           }
-        ]
-        // Hidden for now, see https://github.com/inikulin/parse5/issues/224.
-        // ,
-        // position: {
-        //   start: {line: 1, column: 1, offset: 0},
-        //   end: {line: 1, column: 10, offset: 9}
-        // }
+        ],
+        position: {
+          start: {line: 1, column: 1, offset: 0},
+          end: {line: 1, column: 10, offset: 9}
+        }
       }),
       {depth: null}
     ),