Update for parse5@^5.0.0

Author: wooorm

index.js

@@ -2,8 +2,9 @@
 
 var information = require('property-information');
 var camelcase = require('camelcase');
-var vfileLocation = require('vfile-location');
 var h = require('hastscript');
+var xtend = require('xtend');
+var count = require('ccount');
 
 module.exports = wrapper;
 
@@ -32,7 +33,6 @@ function wrapper(ast, options) {
 
   return transform(ast, {
     file: file,
-    toPosition: file ? vfileLocation(file).toPosition : null,
     verbose: settings.verbose,
     location: false
   });
@@ -43,20 +43,20 @@ function transform(ast, config) {
   var fn = own.call(map, ast.nodeName) ? map[ast.nodeName] : element;
   var children;
   var node;
-  var position;
+  var pos;
 
   if (ast.childNodes) {
     children = nodes(ast.childNodes, config);
   }
 
   node = fn(ast, children, config);
 
-  if (ast.__location && config.toPosition) {
-    config.location = true;
-    position = location(ast.__location, ast, node, config);
+  if (ast.sourceCodeLocation && config.file) {
+    pos = location(node, ast.sourceCodeLocation, config.verbose);
 
-    if (position) {
-      node.position = position;
+    if (pos) {
+      config.location = true;
+      node.position = pos;
     }
   }
 
@@ -79,25 +79,18 @@ function nodes(children, config) {
 /* Transform a document.
  * Stores `ast.quirksMode` in `node.data.quirksMode`. */
 function root(ast, children, config) {
-  var quirks = ast.mode === 'quirks' || ast.mode === 'limited-quirks';
-  var node = {type: 'root', children: children};
-  var position;
-
-  node.data = {quirksMode: quirks};
+  var node = {type: 'root', children: children, data: {}};
+  var doc;
 
-  if (ast.__location) {
-    if (config.toPosition) {
-      config.location = true;
-      position = ast.__location;
-    }
-  } else if (config.file && config.location) {
-    position = {startOffset: 0, endOffset: String(config.file).length};
-  }
+  node.data.quirksMode = ast.mode === 'quirks' || ast.mode === 'limited-quirks';
 
-  position = position && location(position, ast, node, config);
+  if (config.file && config.location) {
+    doc = String(config.file);
 
-  if (position) {
-    node.position = position;
+    node.position = {
+      start: {line: 1, column: 1, offset: 0},
+      end: {line: count(doc, '\n') + 1, column: doc.length - doc.lastIndexOf('\n'), offset: doc.length}
+    };
   }
 
   return node;
@@ -131,7 +124,9 @@ function element(ast, children, config) {
   var index = -1;
   var attr;
   var node;
-  var fragment;
+  var pos;
+  var start;
+  var end;
 
   while (++index < length) {
     attr = values[index];
@@ -141,74 +136,65 @@ function element(ast, children, config) {
   node = h(ast.tagName, props, children);
 
   if (ast.nodeName === 'template' && 'content' in ast) {
-    fragment = ast.content;
-
-    if (ast.__location) {
-      fragment.__location = {
-        startOffset: ast.__location.startTag.endOffset,
-        endOffset: ast.__location.endTag.startOffset
-      };
-    }
+    pos = ast.sourceCodeLocation;
+    start = pos && pos.startTag && position(pos.startTag).end;
+    end = pos && pos.endTag && position(pos.endTag).start;
 
     node.content = transform(ast.content, config);
+
+    if ((start || end) && config.file) {
+      node.content.position = {start: start, end: end};
+    }
   }
 
   return node;
 }
 
 /* Create clean positional information. */
-function loc(toPosition, dirty) {
-  return {
-    start: toPosition(dirty.startOffset),
-    end: toPosition(dirty.endOffset)
-  };
-}
-
-/* Create clean positional information. */
-function location(info, ast, node, config) {
-  var start = info.startOffset;
-  var end = info.endOffset;
-  var values = info.attrs || {};
-  var propPositions = {};
+function location(node, location, verbose) {
+  var pos = position(location);
+  var reference;
+  var values;
+  var props;
   var prop;
   var name;
-  var reference;
-
-  for (prop in values) {
-    name = (information(prop) || {}).propertyName || camelcase(prop);
-    propPositions[name] = loc(config.toPosition, values[prop]);
-  }
 
-  /* Upstream: https://github.com/inikulin/parse5/issues/109 */
-  if (node.type === 'element' && !info.endTag) {
+  if (node.type === 'element') {
     reference = node.children[node.children.length - 1];
 
-    /* Unclosed with children: */
-    if (reference && reference.position) {
-      if (reference.position.end) {
-        end = reference.position.end.offset;
-      } else {
-        end = null;
-      }
+    /* Unclosed with children (upstream: https://github.com/inikulin/parse5/issues/109) */
+    if (!location.endTag && reference && reference.position && reference.position.end) {
+      pos.end = xtend(reference.position.end);
     }
-  }
 
-  if (config.verbose && node.type === 'element') {
-    node.data = {
-      position: {
-        opening: loc(config.toPosition, info.startTag),
-        closing: info.endTag ? loc(config.toPosition, info.endTag) : null,
-        properties: propPositions
+    if (verbose) {
+      values = location.attrs;
+      props = {};
+
+      for (prop in values) {
+        name = (information(prop) || {}).propertyName || camelcase(prop);
+        props[name] = position(values[prop]);
       }
-    };
+
+      node.data = {
+        position: {
+          opening: position(location.startTag),
+          closing: location.endTag ? position(location.endTag) : null,
+          properties: props
+        }
+      };
+    }
   }
 
-  start = typeof start === 'number' ? config.toPosition(start) : null;
-  end = typeof end === 'number' ? config.toPosition(end) : null;
+  return pos;
+}
 
-  if (!start && !end) {
-    return undefined;
-  }
+function position(loc) {
+  var start = point({line: loc.startLine, column: loc.startCol, offset: loc.startOffset});
+  var end = point({line: loc.endLine, column: loc.endCol, offset: loc.endOffset});
+  return start || end ? {start: start, end: end} : null;
+}
 
-  return {start: start, end: end};
+function point(point) {
+  return point.line && point.column ? point : null;
 }

package.json

@@ -19,28 +19,32 @@
     "index.js"
   ],
   "dependencies": {
-    "camelcase": "^3.0.0",
+    "camelcase": "^5.0.0",
+    "ccount": "^1.0.3",
     "hastscript": "^3.0.0",
     "property-information": "^3.1.0",
-    "vfile-location": "^2.0.0"
+    "xtend": "^4.0.1"
   },
   "devDependencies": {
-    "browserify": "^14.0.0",
+    "babel-core": "^6.26.3",
+    "babel-preset-env": "^1.7.0",
+    "babelify": "^8.0.0",
+    "browserify": "^16.0.0",
     "esmangle": "^1.0.1",
     "is-hidden": "^1.1.0",
     "not": "^0.1.0",
-    "nyc": "^11.0.0",
-    "parse5": "^3.0.0",
-    "remark-cli": "^4.0.0",
-    "remark-preset-wooorm": "^3.0.0",
+    "nyc": "^12.0.0",
+    "parse5": "^5.0.0",
+    "remark-cli": "^5.0.0",
+    "remark-preset-wooorm": "^4.0.0",
     "tape": "^4.0.0",
     "unist-util-visit": "^1.1.3",
-    "vfile": "^2.0.0",
-    "xo": "^0.18.0"
+    "vfile": "^3.0.0",
+    "xo": "^0.21.0"
   },
   "scripts": {
     "build-md": "remark . -qfo",
-    "build-bundle": "browserify index.js --bare -s hastUtilFromParse5 > hast-util-from-parse5.js",
+    "build-bundle": "browserify index.js --bare -s hastUtilFromParse5 -g [ babelify --presets [ \"babel-preset-env\" ] ] > hast-util-from-parse5.js",
     "build-mangle": "esmangle hast-util-from-parse5.js > hast-util-from-parse5.min.js",
     "build": "npm run build-md && npm run build-bundle && npm run build-mangle",
     "lint": "xo",

readme.md

@@ -27,7 +27,7 @@ var inspect = require('unist-util-inspect');
 var fromParse5 = require('hast-util-from-parse5');
 
 var doc = vfile.readSync('example.html');
-var ast = parse5.parse(String(doc), {locationInfo: true});
+var ast = parse5.parse(String(doc), {sourceCodeLocationInfo: true});
 var hast = fromParse5(ast, doc);
 
 console.log(inspect(hast));