Use individual lodash functions (cheeriojs#864)

* Use individual lodash functions

* Use `_` object for lodash functions

lib/api/attributes.js

@@ -1,13 +1,17 @@
-var _ = require('lodash'),
-  $ = require('../static'),
-  utils = require('../utils'),
-  isTag = utils.isTag,
-  domEach = utils.domEach,
-  hasOwn = Object.prototype.hasOwnProperty,
-  camelCase = utils.camelCase,
-  cssCase = utils.cssCase,
-  rspace = /\s+/,
-  dataAttrPrefix = 'data-',
+var $ = require('../static'),
+    utils = require('../utils'),
+    isTag = utils.isTag,
+    domEach = utils.domEach,
+    hasOwn = Object.prototype.hasOwnProperty,
+    camelCase = utils.camelCase,
+    cssCase = utils.cssCase,
+    rspace = /\s+/,
+    dataAttrPrefix = 'data-',
+    _ = {
+      forEach: require('lodash.foreach'),
+      extend: require('lodash.assignin'),
+      some: require('lodash.some')
+    },
 
   // Lookup table for coercing string data-* attributes to their corresponding
   // JavaScript primitives
@@ -74,7 +78,7 @@ exports.attr = function(name, value) {
       if (!isTag(el)) return;
 
       if (typeof name === 'object') {
-        _.each(name, function(value, name) {
+        _.forEach(name, function(value, name) {
           setAttr(el, name, value);
         });
       } else {
@@ -108,7 +112,7 @@ exports.prop = function (name, value) {
       case 'style':
         property = this.css();
 
-        _.each(property, function (v, p) {
+        _.forEach(property, function (v, p) {
           property[i++] = p;
         });
 
@@ -139,7 +143,7 @@ exports.prop = function (name, value) {
 
       if (typeof name === 'object') {
 
-        _.each(name, function(val, name) {
+        _.forEach(name, function(val, name) {
           setProp(el, name, val);
         });
 
@@ -160,7 +164,7 @@ var setData = function(el, name, value) {
   if (typeof name === 'string' && value !== undefined) {
     el.data[name] = value;
   } else if (typeof name === 'object') {
-    _.exend(el.data, name);
+    _.extend(el.data, name);
   }
 };
 

lib/api/css.js

@@ -1,5 +1,8 @@
-var _ = require('lodash'),
-    domEach = require('../utils').domEach;
+var domEach = require('../utils').domEach,
+    _ = {
+      pick: require('lodash.pick'),
+    };
+
 var toString = Object.prototype.toString;
 
 /**

lib/api/forms.js

@@ -1,9 +1,11 @@
 // https://github.com/jquery/jquery/blob/2.1.3/src/manipulation/var/rcheckableType.js
 // https://github.com/jquery/jquery/blob/2.1.3/src/serialize.js
-var _ = require('lodash'),
-    submittableSelector = 'input,select,textarea,keygen',
+var submittableSelector = 'input,select,textarea,keygen',
     r20 = /%20/g,
-    rCRLF = /\r?\n/g;
+    rCRLF = /\r?\n/g,
+    _ = {
+      map: require('lodash.map')
+    };
 
 exports.serialize = function() {
   // Convert form elements into name/value objects

lib/api/manipulation.js

@@ -1,13 +1,17 @@
-var _ = require('lodash'),
-    parse = require('../parse'),
+var parse = require('../parse'),
     $ = require('../static'),
     updateDOM = parse.update,
     evaluate = parse.evaluate,
     utils = require('../utils'),
     domEach = utils.domEach,
     cloneDom = utils.cloneDom,
     isHtml = utils.isHtml,
-    slice = Array.prototype.slice;
+    slice = Array.prototype.slice,
+    _ = {
+      flatten: require('lodash.flatten'),
+      bind: require('lodash.bind'),
+      forEach: require('lodash.foreach')
+    };
 
 // Create an array of nodes, recursing into arrays and parsing strings if
 // necessary
@@ -346,7 +350,7 @@ exports.replaceWith = function(content) {
 
 exports.empty = function() {
   domEach(this, function(i, el) {
-    _.each(el.children, function(el) {
+    _.forEach(el.children, function(el) {
       el.next = el.prev = el.parent = null;
     });
 
@@ -367,7 +371,7 @@ exports.html = function(str) {
   var opts = this.options;
 
   domEach(this, function(i, el) {
-    _.each(el.children, function(el) {
+    _.forEach(el.children, function(el) {
       el.next = el.prev = el.parent = null;
     });
 
@@ -397,7 +401,7 @@ exports.text = function(str) {
 
   // Append text node to each selected elements
   domEach(this, function(i, el) {
-    _.each(el.children, function(el) {
+    _.forEach(el.children, function(el) {
       el.next = el.prev = el.parent = null;
     });
 

lib/api/traversing.js

@@ -1,9 +1,15 @@
-var _ = require('lodash'),
-    select = require('css-select'),
+var select = require('css-select'),
     utils = require('../utils'),
     domEach = utils.domEach,
     uniqueSort = require('htmlparser2').DomUtils.uniqueSort,
-    isTag = utils.isTag;
+    isTag = utils.isTag,
+    _ = {
+      bind: require('lodash.bind'),
+      forEach: require('lodash.foreach'),
+      reject: require('lodash.reject'),
+      filter: require('lodash.filter'),
+      reduce: require('lodash.reduce')
+    };
 
 exports.find = function(selectorOrHaystack) {
   var elems = _.reduce(this, function(memo, elem) {

lib/cheerio.js

@@ -4,7 +4,12 @@
 
 var parse = require('./parse'),
     isHtml = require('./utils').isHtml,
-    _ = require('lodash');
+    _ = {
+      extend: require('lodash.assignin'),
+      bind: require('lodash.bind'),
+      forEach: require('lodash.foreach'),
+      defaults: require('lodash.defaults')
+    };
 
 /*
  * The API

lib/static.js

@@ -2,10 +2,13 @@
  * Module dependencies
  */
 
-var select = require('css-select'),
+var serialize = require('dom-serializer'),
+    select = require('css-select'),
     parse = require('./parse'),
-    serialize = require('dom-serializer'),
-    _ = require('lodash');
+    _ = {
+      merge: require('lodash.merge'),
+      defaults: require('lodash.defaults')
+    };
 
 /**
  * $.load(str)
@@ -34,7 +37,7 @@ exports.load = function(content, options) {
   // Mimic jQuery's prototype alias for plugin authors.
   initialize.fn = initialize.prototype;
 
-  // Keep a reference to the top-level scope so we can chain methods that implicitly 
+  // Keep a reference to the top-level scope so we can chain methods that implicitly
   // resolve selectors; e.g. $("<span>").(".bar"), which otherwise loses ._root
   initialize.prototype._originalRoot = root;
 

package.json

@@ -26,10 +26,21 @@
   },
   "dependencies": {
     "css-select": "~1.2.0",
+    "dom-serializer": "~0.1.0",
     "entities": "~1.1.1",
     "htmlparser2": "~3.8.1",
-    "dom-serializer": "~0.1.0",
-    "lodash": "^4.1.0"
+    "lodash.assignin": "^4.0.9",
+    "lodash.bind": "^4.1.4",
+    "lodash.defaults": "^4.0.1",
+    "lodash.filter": "^4.4.0",
+    "lodash.flatten": "^4.2.0",
+    "lodash.foreach": "^4.3.0",
+    "lodash.map": "^4.4.0",
+    "lodash.merge": "^4.4.0",
+    "lodash.pick": "^4.2.1",
+    "lodash.reduce": "^4.4.0",
+    "lodash.reject": "^4.4.0",
+    "lodash.some": "^4.4.0"
   },
   "devDependencies": {
     "benchmark": "~1.0.0",

test/cheerio.js

@@ -1,10 +1,12 @@
 var expect = require('expect.js'),
-    _ = require('lodash'),
     htmlparser2 = require('htmlparser2'),
     $ = require('../'),
     fixtures = require('./fixtures'),
     fruits = fixtures.fruits,
-    food = fixtures.food;
+    food = fixtures.food,
+    _ = {
+      filter: require('lodash.filter')
+    };
 
 // HTML
 var script = '<script src="script.js" type="text/javascript"></script>',

test/xml.js

@@ -1,6 +1,8 @@
 var expect = require('expect.js'),
-    _ = require('lodash'),
-    cheerio = require('..');
+    cheerio = require('..'),
+    _ = {
+      extend: require('lodash.assignin')
+    };
 
 var xml = function(str, options) {
   options = _.extend({ xmlMode: true }, options);