Use parse5 as a default parser (closes cheeriojs#863)

lib/api/attributes.js

@@ -93,7 +93,7 @@ exports.attr = function(name, value) {
 var getProp = function (el, name) {
   if (!el || !isTag(el)) return;
 
-  return el.hasOwnProperty(name)
+  return hasOwn.call(el, name)
       ? el[name]
       : rboolean.test(name)
           ? getAttr(el, name) !== undefined
@@ -272,7 +272,7 @@ exports.val = function(value) {
           returnValue;
       if (option === undefined) return undefined;
       if (!querying) {
-        if (!this.attr().hasOwnProperty('multiple') && typeof value == 'object') {
+        if (!hasOwn.call(this.attr(), 'multiple') && typeof value == 'object') {
           return this;
         }
         if (typeof value != 'object') {
@@ -285,7 +285,7 @@ exports.val = function(value) {
         return this;
       }
       returnValue = option.attr('value');
-      if (this.attr().hasOwnProperty('multiple')) {
+      if (hasOwn.call(this.attr(), 'multiple')) {
         returnValue = [];
         domEach(option, function(__, el) {
           returnValue.push(getAttr(el, 'value'));

lib/cheerio.js

@@ -3,6 +3,7 @@
 */
 
 var parse = require('./parse'),
+    defaultOptions = require('./defaults'),
     isHtml = require('./utils').isHtml,
     _ = {
       extend: require('lodash/assignIn'),
@@ -30,7 +31,7 @@ var api = [
 var Cheerio = module.exports = function(selector, context, root, options) {
   if (!(this instanceof Cheerio)) return new Cheerio(selector, context, root, options);
 
-  this.options = _.defaults(options || {}, this.options);
+  this.options = _.defaults(options, this.options, defaultOptions);
 
   // $(), $(null), $(undefined), $(false)
   if (!selector) return this;
@@ -98,17 +99,6 @@ _.extend(Cheerio, require('./static'));
 
 Cheerio.prototype.cheerio = '[cheerio object]';
 
-/*
- * Cheerio default options
- */
-
-Cheerio.prototype.options = {
-  withDomLvl1: true,
-  normalizeWhitespace: false,
-  xmlMode: false,
-  decodeEntities: true
-};
-
 /*
  * Make cheerio an array-like object
  */

lib/defaults.js

@@ -0,0 +1,11 @@
+/*
+ * Cheerio default options
+ */
+
+module.exports = {
+  withDomLvl1: true,
+  normalizeWhitespace: false,
+  xmlMode: false,
+  decodeEntities: true,
+  useHtmlParser2: false
+};

lib/parse.js

@@ -1,7 +1,10 @@
 /*
   Module Dependencies
 */
-var htmlparser = require('htmlparser2');
+var htmlparser = require('htmlparser2'),
+    parse5 = require('parse5'),
+    defaultOptions = require('./defaults'),
+    isEqual = require('lodash/isEqual');
 
 /*
   Parser
@@ -12,20 +15,33 @@ exports = module.exports = function(content, options) {
       root = exports.evaluate('<root></root>', options)[0];
 
   root.type = 'root';
+  root.parent = null;
 
   // Update the dom using the root
   exports.update(dom, root);
 
   return root;
 };
 
+function parseWithParse5 (content) {
+  var parseAsDocument = /^(\s|<!--.*?-->)*?<(!doctype|html|head|body)(.*?)>/i.test(content),
+      parse = parseAsDocument ? parse5.parse : parse5.parseFragment,
+      root = parse(content, { treeAdapter: parse5.treeAdapters.htmlparser2 });
+
+  return root.children;
+}
+
 exports.evaluate = function(content, options) {
   // options = options || $.fn.options;
 
-  var dom;
+  var dom,
+      useParse5 = isEqual(options, defaultOptions);
+
+  if (Buffer.isBuffer(content))
+    content = content.toString();
 
-  if (typeof content === 'string' || Buffer.isBuffer(content)) {
-    dom = htmlparser.parseDOM(content, options);
+  if (typeof content === 'string') {
+    dom = useParse5 ? parseWithParse5(content) : htmlparser.parseDOM(content, options);
   } else {
     dom = content;
   }

lib/static.js

@@ -3,6 +3,7 @@
  */
 
 var serialize = require('dom-serializer'),
+    defaultOptions = require('./defaults'),
     select = require('css-select'),
     parse = require('./parse'),
     _ = {
@@ -17,7 +18,7 @@ var serialize = require('dom-serializer'),
 exports.load = function(content, options) {
   var Cheerio = require('./cheerio');
 
-  options = _.defaults(options || {}, Cheerio.prototype.options);
+  options = _.defaults(options || {}, defaultOptions);
 
   var root = parse(content, options);
 
@@ -75,8 +76,6 @@ function render(that, dom, options) {
  */
 
 exports.html = function(dom, options) {
-  var Cheerio = require('./cheerio');
-
   // be flexible about parameters, sometimes we call html(),
   // with options as only parameter
   // check dom argument for dom element specific properties
@@ -89,7 +88,7 @@ exports.html = function(dom, options) {
 
   // sometimes $.html() used without preloading html
   // so fallback non existing options to the default ones
-  options = _.defaults(options || {}, this._options, Cheerio.prototype.options);
+  options = _.defaults(options || {}, this._options, defaultOptions);
 
   return render(this, dom, options);
 };

package.json

@@ -29,15 +29,16 @@
     "dom-serializer": "~0.1.0",
     "entities": "~1.1.1",
     "htmlparser2": "^3.9.1",
-    "lodash": "^4.15.0"
+    "lodash": "^4.15.0",
+    "parse5": "^3.0.1"
   },
   "devDependencies": {
     "benchmark": "^2.1.0",
     "coveralls": "^2.11.9",
     "expect.js": "~0.3.1",
     "istanbul": "^0.4.3",
-    "jsdom": "^9.2.1",
     "jquery": "^3.0.0",
+    "jsdom": "^9.2.1",
     "jshint": "^2.9.2",
     "mocha": "^3.1.2",
     "xyz": "~1.1.0"

test/parse.js

@@ -1,6 +1,7 @@
 var expect = require('expect.js'),
     parse = require('../lib/parse'),
-    defaultOpts = require('..').prototype.options;
+    defaults = require('lodash/defaults'),
+    defaultOpts = require('../lib/defaults');
 
 
 // Tags
@@ -46,7 +47,7 @@ describe('parse', function() {
       var tag = parse.evaluate(basic, defaultOpts)[0];
       expect(tag.type).to.equal('tag');
       expect(tag.tagName).to.equal('html');
-      expect(tag.childNodes).to.be.empty();
+      expect(tag.childNodes).to.have.length(2);
     });
 
     it('should handle sibling tags: ' + siblings, function() {
@@ -78,7 +79,15 @@ describe('parse', function() {
       expect(tag.type).to.equal('tag');
       expect(tag.tagName).to.equal('html');
       expect(tag.childNodes).to.be.ok();
+      expect(tag.childNodes[1].tagName).to.equal('body');
+      expect(tag.childNodes[1].childNodes).to.have.length(1);
+
+      tag = parse.evaluate(children, defaults({ useHtmlParser2: true }, defaultOpts))[0];
+      expect(tag.type).to.equal('tag');
+      expect(tag.tagName).to.equal('html');
+      expect(tag.childNodes).to.be.ok();
       expect(tag.childNodes).to.have.length(1);
+      expect(tag.childNodes[0].tagName).to.equal('br');
     });
 
     it('should handle tags with children: ' + li, function() {
@@ -141,7 +150,7 @@ describe('parse', function() {
     it('should handle directives: ' + directive, function() {
       var elem = parse.evaluate(directive, defaultOpts)[0];
       expect(elem.type).to.equal('directive');
-      expect(elem.data).to.equal('!doctype html');
+      expect(elem.data).to.equal('!DOCTYPE html');
       expect(elem.tagName).to.equal('!doctype');
     });
 
@@ -209,7 +218,7 @@ describe('parse', function() {
     it('should add root to: ' + directive, function() {
       var root = parse(directive, defaultOpts);
       rootTest(root);
-      expect(root.childNodes).to.have.length(1);
+      expect(root.childNodes).to.have.length(2);
       expect(root.childNodes[0].type).to.equal('directive');
     });