Removed lodash dependency to reduce code size/speed

JamesMessinger · JamesMessinger · commit c0f79bc81244 · 2015-09-09T17:24:17.000-05:00
diff --git a/dist/ref-parser.js b/dist/ref-parser.js
diff --git a/dist/ref-parser.js.map b/dist/ref-parser.js.map
diff --git a/dist/ref-parser.min.js b/dist/ref-parser.min.js
diff --git a/dist/ref-parser.min.js.map b/dist/ref-parser.min.js.map
diff --git a/lib/dereference.js b/lib/dereference.js
@@ -1,11 +1,8 @@
 'use strict';
 
-var $Ref      = require('./ref'),
-    util      = require('./util'),
-    url       = require('url'),
-    _forEach  = require('lodash/collection/forEach'),
-    _isArray  = require('lodash/lang/isArray'),
-    _isObject = require('lodash/lang/isObject');
+var $Ref = require('./ref'),
+    util = require('./util'),
+    url  = require('url');
 
 module.exports = dereference;
 
@@ -31,11 +28,12 @@ function dereference(parser, options) {
  * @param {$RefParserOptions} options
  */
 function crawl(obj, path, parents, $refs, options) {
-  if (_isObject(obj) || _isArray(obj)) {
+  if (obj && typeof(obj) === 'object') {
     parents.push(obj);
 
-    _forEach(obj, function(value, key) {
+    Object.keys(obj).forEach(function(key) {
       var keyPath = path + '/' + key;
+      var value = obj[key];
 
       if ($Ref.isAllowed(value, options)) {
         // We found a $ref, so resolve it
diff --git a/lib/index.js b/lib/index.js
@@ -1,19 +1,15 @@
 'use strict';
 
-var Promise        = require('./promise'),
-    Options        = require('./options'),
-    $Refs          = require('./refs'),
-    read           = require('./read'),
-    resolve        = require('./resolve'),
-    bundle         = require('./bundle'),
-    dereference    = require('./dereference'),
-    util           = require('./util'),
-    url            = require('url'),
-    ono            = require('ono'),
-    _isFunction    = require('lodash/lang/isFunction'),
-    _isObject      = require('lodash/lang/isObject'),
-    _isPlainObject = require('lodash/lang/isPlainObject'),
-    _isString      = require('lodash/lang/isString');
+var Promise     = require('./promise'),
+    Options     = require('./options'),
+    $Refs       = require('./refs'),
+    read        = require('./read'),
+    resolve     = require('./resolve'),
+    bundle      = require('./bundle'),
+    dereference = require('./dereference'),
+    util        = require('./util'),
+    url         = require('url'),
+    ono         = require('ono');
 
 module.exports = $RefParser;
 module.exports.YAML = require('./yaml');
@@ -75,7 +71,7 @@ $RefParser.parse = function(schema, options, callback) {
 $RefParser.prototype.parse = function(schema, options, callback) {
   var args = normalizeArgs(arguments);
 
-  if (args.schema && _isObject(args.schema)) {
+  if (args.schema && typeof(args.schema) === 'object') {
     // The schema is an object, not a path/url
     this.schema = args.schema;
     this._basePath = '';
@@ -84,7 +80,7 @@ $RefParser.prototype.parse = function(schema, options, callback) {
     return Promise.resolve(this.schema);
   }
 
-  if (!args.schema || !_isString(args.schema)) {
+  if (!args.schema || typeof(args.schema) !== 'string') {
     var err = ono('Expected a file path, URL, or object. Got %s', args.schema);
     util.doCallback(args.callback, err, args.schema);
     return Promise.reject(err);
@@ -99,15 +95,14 @@ $RefParser.prototype.parse = function(schema, options, callback) {
   // Read the schema file/url
   return read(args.schema, this.$refs, args.options)
     .then(function($ref) {
-      // Make sure the file was a POJO (in JSON or YAML format), NOT a Buffer or string
-      if ($ref.value && _isPlainObject($ref.value)) {
+      if (!$ref.value || typeof($ref.value) !== 'object' || $ref.value instanceof Buffer) {
+        throw ono.syntax('"%s" is not a valid JSON Schema', me._basePath);
+      }
+      else {
         me.schema = $ref.value;
         util.doCallback(args.callback, null, me.schema);
         return me.schema;
       }
-      else {
-        throw ono.syntax('"%s" is not a valid JSON Schema', me._basePath);
-      }
     })
     .catch(function(err) {
       util.doCallback(args.callback, err);
@@ -250,7 +245,7 @@ $RefParser.prototype.dereference = function(schema, options, callback) {
  */
 function normalizeArgs(args) {
   var options = args[1], callback = args[2];
-  if (_isFunction(options)) {
+  if (typeof(options) === 'function') {
     callback = options;
     options = undefined;
   }
diff --git a/lib/options.js b/lib/options.js
@@ -1,7 +1,5 @@
 'use strict';
 
-var _merge = require('lodash/object/merge');
-
 module.exports = $RefParserOptions;
 
 /**
@@ -82,5 +80,29 @@ function $RefParserOptions(options) {
     https: 5 * 60 // 5 minutes
   };
 
-  _merge(this, options);
+  merge(options, this);
+}
+
+/**
+ * Fast, two-level object merge.
+ *
+ * @param {?object} src - The object to merge into dest
+ * @param {object} dest - The object to be modified
+ */
+function merge(src, dest) {
+  if (src) {
+    var topKeys = Object.keys(src);
+    for (var i = 0; i < topKeys.length; i++) {
+      var topKey = topKeys[i];
+      var child = src[topKey];
+      var childKeys = Object.keys(child);
+      for (var j = 0; j < childKeys.length; j++) {
+        var childKey = childKeys[j];
+        var childValue = child[childKey];
+        if (childValue !== undefined) {
+          dest[topKey][childKey] = childValue;
+        }
+      }
+    }
+  }
 }
diff --git a/lib/parse.js b/lib/parse.js
@@ -1,10 +1,8 @@
 'use strict';
 
-var YAML      = require('./yaml'),
-    util      = require('./util'),
-    ono       = require('ono'),
-    _isEmpty  = require('lodash/lang/isEmpty'),
-    _isString = require('lodash/lang/isString');
+var YAML = require('./yaml'),
+    util = require('./util'),
+    ono  = require('ono');
 
 module.exports = parse;
 
@@ -50,13 +48,22 @@ function parse(data, path, options) {
     }
   }
 
-  var empty = _isEmpty(parsed) ||                           // empty objects
-    parsed.length === 0 ||                                  // empty Buffers
-    (_isString(parsed) && (parsed.trim().length === 0));    // empty strings
-
-  if (empty && !options.allow.empty) {
+  if (isEmpty(parsed) && !options.allow.empty) {
     throw ono.syntax('Error parsing "%s". \nParsed value is empty', path);
   }
 
   return parsed;
 }
+
+/**
+ * Determines whether the parsed value is "empty".
+ *
+ * @param {*} value
+ * @returns {boolean}
+ */
+function isEmpty(value) {
+  return !value ||
+    (typeof(value) === 'object' && Object.keys(value) === 0) ||
+    (typeof(value) === 'string' && value.trim().length === 0) ||
+    (value instanceof Buffer && value.length === 0);
+}
diff --git a/lib/read.js b/lib/read.js
@@ -1,15 +1,14 @@
 'use strict';
 
-var fs          = require('fs'),
-    http        = require('http'),
-    https       = require('https'),
-    parse       = require('./parse'),
-    util        = require('./util'),
-    $Ref        = require('./ref'),
-    Promise     = require('./promise'),
-    url         = require('url'),
-    ono         = require('ono'),
-    _isFunction = require('lodash/lang/isFunction');
+var fs      = require('fs'),
+    http    = require('http'),
+    https   = require('https'),
+    parse   = require('./parse'),
+    util    = require('./util'),
+    $Ref    = require('./ref'),
+    Promise = require('./promise'),
+    url     = require('url'),
+    ono     = require('ono');
 
 module.exports = read;
 
@@ -176,7 +175,7 @@ function download(protocol, u, options) {
         onResponse
       );
 
-      if (_isFunction(req.setTimeout)) {
+      if (typeof(req.setTimeout) === 'function') {
         req.setTimeout(5000);
       }
 
diff --git a/lib/ref.js b/lib/ref.js
@@ -3,9 +3,6 @@
 var util         = require('./util'),
     url          = require('url'),
     ono          = require('ono'),
-    _isObject    = require('lodash/lang/isObject'),
-    _isNumber    = require('lodash/lang/isNumber'),
-    _isString    = require('lodash/lang/isString'),
     escapedSlash = /~1/g,
     escapedTilde = /~0/g;
 
@@ -83,7 +80,7 @@ $Ref.prototype.setValue = function(value, options) {
 
   // Extend the cache expiration
   var cacheDuration = options.cache[this.type];
-  if (_isNumber(cacheDuration) && cacheDuration > 0) {
+  if (cacheDuration > 0) {
     var expires = Date.now() + (cacheDuration * 1000);
     this.expires = new Date(expires);
   }
@@ -210,7 +207,7 @@ $Ref.prototype.set = function(path, value, options) {
  * @returns {boolean}
  */
 $Ref.is$Ref = function(value) {
-  return value && _isObject(value) && _isString(value.$ref);
+  return value && typeof(value) === 'object' && typeof(value.$ref) === 'string';
 };
 
 /**
diff --git a/lib/refs.js b/lib/refs.js
@@ -1,9 +1,8 @@
 'use strict';
 
-var Options  = require('./options'),
-    util     = require('./util'),
-    ono      = require('ono'),
-    _flatten = require('lodash/array/flatten');
+var Options = require('./options'),
+    util    = require('./util'),
+    ono     = require('ono');
 
 module.exports = $Refs;
 
@@ -30,7 +29,7 @@ function $Refs() {
 $Refs.prototype.paths = function(types) {
   var $refs = this._$refs;
   var keys = Object.keys($refs);
-  types = _flatten(arguments);
+  types = Array.isArray(types) ? types : Array.prototype.slice.call(arguments);
 
   if (types.length > 0) {
     keys = keys.filter(function(key) {
diff --git a/lib/resolve.js b/lib/resolve.js
@@ -1,14 +1,10 @@
 'use strict';
 
-var Promise   = require('./promise'),
-    read      = require('./read'),
-    util      = require('./util'),
-    url       = require('url'),
-    ono       = require('ono'),
-    _forEach  = require('lodash/collection/forEach'),
-    _isArray  = require('lodash/lang/isArray'),
-    _isObject = require('lodash/lang/isObject'),
-    _isString = require('lodash/lang/isString');
+var Promise = require('./promise'),
+    read    = require('./read'),
+    util    = require('./util'),
+    url     = require('url'),
+    ono     = require('ono');
 
 module.exports = resolve;
 
@@ -58,9 +54,10 @@ function resolve(parser, options) {
 function crawl(obj, path, $refs, options) {
   var promises = [];
 
-  if (_isObject(obj) || _isArray(obj)) {
-    _forEach(obj, function(value, key) {
+  if (obj && typeof(obj) === 'object') {
+    Object.keys(obj).forEach(function(key) {
       var keyPath = path + '/' + key;
+      var value = obj[key];
 
       if (isExternal$Ref(key, value)) {
         // We found a $ref
@@ -115,5 +112,5 @@ function crawl$Ref(path, $refs, options) {
  * @returns {boolean}
  */
 function isExternal$Ref(key, value) {
-  return key === '$ref' && value && _isString(value) && value[0] !== '#';
+  return key === '$ref' && value && typeof(value) === 'string' && value[0] !== '#';
 }
diff --git a/lib/util.js b/lib/util.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var debug           = require('debug'),
-    _isFunction     = require('lodash/lang/isFunction'),
     protocolPattern = /^[a-z0-9.+-]+:\/\//i;
 
 /**
@@ -80,7 +79,7 @@ exports.extname = function extname(path) {
  * @param {...*}    [params]
  */
 exports.doCallback = function doCallback(callback, err, params) {
-  if (_isFunction(callback)) {
+  if (typeof(callback) === 'function') {
     var args = Array.prototype.slice.call(arguments, 1);
 
     /* istanbul ignore if: code-coverage doesn't run in the browser */
diff --git a/lib/yaml.js b/lib/yaml.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var yaml      = require('js-yaml'),
-    _isString = require('lodash/lang/isString');
+var yaml = require('js-yaml');
 
 /**
  * Simple YAML parsing functions, similar to {@link JSON.parse} and {@link JSON.stringify}
@@ -27,7 +26,7 @@ module.exports = {
    * @returns {string}
    */
   stringify: function yamlStringify(value, replacer, space) {
-    var indent = (_isString(space) ? space.length : space) || 2;
+    var indent = (typeof(space) === 'string' ? space.length : space) || 2;
     return yaml.safeDump(value, {indent: indent});
   }
 };
diff --git a/package.json b/package.json
@@ -64,7 +64,6 @@
     "debug": "^2.2.0",
     "es6-promise": "^3.0.2",
     "js-yaml": "^3.4.2",
-    "lodash": "^3.10.1",
     "ono": "^1.0.22"
   }
-}
+}
