Merge pull request #1622 from arangodb/underscore2lodash

underscore -> lodash

js/apps/system/_admin/aardvark/APP/aardvark.js

@@ -33,7 +33,7 @@
 var Foxx = require("@arangodb/foxx");
 var publicController = new Foxx.Controller(applicationContext);
 var controller = new Foxx.Controller(applicationContext);
-var underscore = require("underscore");
+var underscore = require("lodash");
 var cluster = require("@arangodb/cluster");
 var joi = require("joi");
 var util = require("util");

js/apps/system/_admin/aardvark/APP/cluster.js

@@ -38,7 +38,7 @@
     cluster = require("@arangodb/cluster"),
     load = require("internal").download,
     db = require("internal").db,
-    _ = require("underscore");
+    _ = require("lodash");
 
   controller.activateSessions({
     autoCreateSession: false,

js/apps/system/_admin/aardvark/APP/foxxes.js

@@ -43,7 +43,7 @@
   var marked = require("marked");
   var highlightAuto = require("highlight.js").highlightAuto;
   var docu = require("./lib/swagger").Swagger;
-  var underscore = require("underscore");
+  var underscore = require("lodash");
   var mountPoint = {
     type: joi.string().required().description(
       "The mount point of the app. Has to be url-encoded."

js/apps/system/_admin/aardvark/APP/lib/foxxes.js

@@ -31,7 +31,7 @@ exports.Foxxes = function () {
   // Define the Repository
   var aal = require("internal").db._collection("_tmp_aal"),
     foxxmanager = require("@arangodb/foxx/manager"),
-    _ = require("underscore"),
+    _ = require("lodash"),
     ArangoError = require("@arangodb").ArangoError,
     fs = require("fs");
 
@@ -94,7 +94,7 @@ exports.Foxxes = function () {
     result.forEach(function(r, i) {
       // inject development flag
       if (r._key.match(/^dev:/)) {
-        result[i] = _.clone(r);
+        result[i] = _.extend({}, r);
         result[i].development = true;
       }
     });

js/apps/system/_admin/aardvark/APP/repositories/plans.js

@@ -29,7 +29,7 @@
 (function () {
   "use strict";
 
-  var _ = require("underscore"),
+  var _ = require("lodash"),
     Foxx = require("@arangodb/foxx"),
     version = require("@arangodb/database-version").CURRENT_VERSION + "", // do not use new String, there is bug in update
     Plans;

js/apps/system/_admin/aardvark/APP/test/lib/jshint.js

@@ -2874,7 +2874,7 @@ function now() {
 /*global console:true */
 /*exported console */
 
-var _        = require("underscore");
+var _        = require("lodash");
 var events   = require("events");
 var vars     = require("./vars.js");
 var messages = require("./messages.js");
@@ -7975,7 +7975,7 @@ module.exports=require('fNbQ4d');
 
 "use strict";
 
-var _      = require("underscore");
+var _      = require("lodash");
 var events = require("events");
 var reg    = require("./reg.js");
 var state  = require("./state.js").state;
@@ -9671,7 +9671,7 @@ exports.Lexer = Lexer;
 },{"../data/ascii-identifier-data.js":1,"../data/non-ascii-identifier-part-only.js":2,"../data/non-ascii-identifier-start.js":3,"./reg.js":19,"./state.js":20,"events":7,"underscore":14}],18:[function(require,module,exports){
 "use strict";
 
-var _ = require("underscore");
+var _ = require("lodash");
 
 var errors = {
   // JSHint options

js/apps/system/_api/gharial/APP/gharial.js

@@ -36,7 +36,7 @@
     actions = require("@arangodb/actions"),
     Model = require("@arangodb/foxx").Model,
     Graph = require("@arangodb/general-graph"),
-    _ = require("underscore"),
+    _ = require("lodash"),
     joi = require("joi"),
     arangodb = require("@arangodb"),
     errors = arangodb.errors,

js/apps/system/_system/sessions/APP/storage.js

@@ -1,5 +1,5 @@
 'use strict';
-const _ = require('underscore');
+const _ = require('lodash');
 const joi = require('joi');
 const internal = require('internal');
 const arangodb = require('@arangodb');

js/apps/system/_system/users/APP/storage.js

@@ -1,5 +1,5 @@
 'use strict';
-const _ = require('underscore');
+const _ = require('lodash');
 const joi = require('joi');
 const arangodb = require('@arangodb');
 const db = arangodb.db;

js/common/modules/@arangodb/foxx/manager-utils.js

@@ -32,7 +32,7 @@
 
 var joi = require("joi");
 var fs = require("fs");
-var _ = require('underscore');
+var _ = require('lodash');
 var arangodb = require("@arangodb");
 var db = arangodb.db;
 var internal = require('internal');

js/common/modules/@arangodb/foxx/preprocessor.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var extend = require('underscore').extend;
+var extend = require('lodash').extend;
 
 function ArrayIterator(arr) {
   this.array = arr;

js/common/modules/@arangodb/general-graph.js

@@ -34,7 +34,7 @@ var arangodb = require("@arangodb"),
   ArangoError = arangodb.ArangoError,
   db = arangodb.db,
   errors = arangodb.errors,
-  _ = require("underscore");
+  _ = require("lodash");
 
 // -----------------------------------------------------------------------------
 // --SECTION--                             module "@arangodb/general-graph"
@@ -52,7 +52,7 @@ var stringToArray = function (x) {
   if (typeof x === "string") {
     return [x];
   }
-  return _.clone(x);
+  return x.slice();
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -964,7 +964,7 @@ AQLGenerator.prototype.neighbors = function(vertexExample, options) {
     + this.stack.length + ')';
   var opts;
   if (options) {
-    opts = _.clone(options);
+    opts = _.extend({}, options);
   } else {
     opts = {};
   }
@@ -2471,7 +2471,7 @@ var _renameCollection = function(oldName, newName) {
         return;
       }
       gdb.toArray().forEach(function(doc) {
-        var c = _.clone(doc), i, j, changed = false;
+        var c = _.extend({}, doc), i, j, changed = false;
         if (c.edgeDefinitions) {
           for (i = 0; i < c.edgeDefinitions.length; ++i) {
             var def = c.edgeDefinitions[i];

js/common/modules/@arangodb/request.js

@@ -31,7 +31,7 @@
 
 const internal = require('internal');
 const Buffer = require('buffer').Buffer;
-const extend = require('underscore').extend;
+const extend = require('lodash').extend;
 const httperr = require('http-errors');
 const is = require('@arangodb/is');
 const querystring = require('querystring');

js/common/modules/@arangodb/testrunner.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var runTest = require('jsunity').runTest,
-  _ = require('underscore'),
+  _ = require('lodash'),
   internal = require('internal');
 
 ////////////////////////////////////////////////////////////////////////////////

js/common/modules/jasmine.js

@@ -10,7 +10,7 @@
  */
 
 var jasmine = require('jasmine/core'),
-  _ = require('underscore'),
+  _ = require('lodash'),
   fs = require('fs'),
   Reporter = require('jasmine/reporter').Reporter;
   
@@ -68,7 +68,7 @@ exports.executeTestSuite = function (specFileNames, options) {
   var arangoReporter = new Reporter({ format: format });
   sandbox.addReporter(arangoReporter);
 
-  var _ = require('underscore'),
+  var _ = require('lodash'),
     internal = require('internal');
 
   _.each(specFileNames, function (specFileName) {

js/common/modules/jasmine/reporter.js

@@ -5,7 +5,7 @@
 //  documentation: Group and example names
 
 var Reporter,
-  _ = require('underscore'),
+  _ = require('lodash'),
   internal = require('internal'),
   inspect = internal.inspect,
   failureColor = internal.COLORS.COLOR_RED,

js/common/modules/jslint.js

@@ -29,7 +29,7 @@
 var internal = require("internal");
 var fs = require("fs");
 var console = require("console");
-var _ = require('underscore')
+var _ = require('lodash')
 
 var JSHINT = require("jshint").JSHINT;
 var jshintrc = {};

js/common/tests/shell-cluster-simple.js

@@ -32,7 +32,7 @@ var jsunity = require("jsunity");
 var arangodb = require("@arangodb");
 var ERRORS = arangodb.errors;
 var db = arangodb.db;
-var _ = require("underscore");
+var _ = require("lodash");
 
 var createCollection = function (properties) {
   'use strict';

js/common/tests/shell-general-graph.js

@@ -35,7 +35,7 @@ var graph = require("@arangodb/general-graph");
 var cluster = require("@arangodb/cluster");
 var ERRORS = arangodb.errors;
 
-var _ = require("underscore");
+var _ = require("lodash");
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                      graph module

js/server/modules/@arangodb/actions.js

@@ -37,7 +37,7 @@ var internal = require("internal");
 var fs = require("fs");
 var util = require("util");
 var console = require("console");
-var _ = require("underscore");
+var _ = require("lodash");
 
 var arangodb = require("@arangodb");
 var foxxManager = require("@arangodb/foxx/manager");
@@ -1106,7 +1106,7 @@ function buildRouting (dbname) {
 
     while (i.hasNext()) {
       var n = i.next();
-      var c = _.clone(n);
+      var c = _.extend({}, n);
       
       c.name = '_routing.document("' + c._key + '")';
 

js/server/modules/@arangodb/aql.js

@@ -34,7 +34,7 @@ var TRAVERSAL = require("@arangodb/graph/traversal");
 var ArangoError = require("@arangodb").ArangoError;
 var ShapedJson = INTERNAL.ShapedJson;
 var isCoordinator = require("@arangodb/cluster").isCoordinator();
-var underscore = require("underscore");
+var underscore = require("lodash");
 var graphModule = require("@arangodb/general-graph");
 
 // -----------------------------------------------------------------------------

js/server/modules/@arangodb/cluster/agency-communication.js

@@ -42,7 +42,7 @@ exports.Communication = function() {
     updateCollectionRouteForName,
     updateDatabaseRoutes,
     self = this,
-    _ = require("underscore");
+    _ = require("lodash");
 
   splitServerName = function(route) {
     var splits = route.split("/");
@@ -787,7 +787,7 @@ exports.Communication = function() {
             diff.missing.push(toAdd);
             return;
           }
-          var compTo = _.clone(inferior[k]);
+          var compTo = _.extend({}, inferior[k]);
           delete compTo.address;
           if (JSON.stringify(v) !== JSON.stringify(compTo)) {
             diff.difference[k] = {};

js/server/modules/@arangodb/cluster/planner.js

@@ -69,7 +69,7 @@ var PlannerLocalDefaults = {
 
 // Some helpers using underscore:
 
-var _ = require("underscore");
+var _ = require("lodash");
 
 function objmap (o, f) {
   var r = {};

js/server/modules/@arangodb/foxx/authentication.js

@@ -31,7 +31,7 @@ var db = require("@arangodb").db,
   crypto = require("@arangodb/crypto"),
   internal = require("internal"),
   is = require("@arangodb/is"),
-  _ = require("underscore"),
+  _ = require("lodash"),
   errors = internal.errors,
   defaultsFor = {};
 

js/server/modules/@arangodb/foxx/base_middleware.js

@@ -40,7 +40,7 @@ function BaseMiddleware() {
     var responseFunctions,
       requestFunctions,
       trace,
-      _ = require("underscore"),
+      _ = require("lodash"),
       console = require("console"),
       crypto = require("@arangodb/crypto"),
       actions = require("@arangodb/actions"),

js/server/modules/@arangodb/foxx/console.js

@@ -30,7 +30,7 @@
 
 var qb = require('aqb');
 var util = require('util');
-var extend = require('underscore').extend;
+var extend = require('lodash').extend;
 var arangoConsole = require('console');
 var ErrorStackParser = require('error-stack-parser');
 var AssertionError = require('assert').AssertionError;

js/server/modules/@arangodb/foxx/controller.js

@@ -29,7 +29,7 @@
 
 const RequestContext = require('@arangodb/foxx/request_context');
 const BaseMiddleware = require('@arangodb/foxx/base_middleware').BaseMiddleware;
-const _ = require('underscore');
+const _ = require('lodash');
 const is = require('@arangodb/is');
 const internal = require('@arangodb/foxx/internals');
 const swagger = require('@arangodb/foxx/swagger');

js/server/modules/@arangodb/foxx/internals.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require("underscore"),
+var _ = require("lodash"),
   is = require("@arangodb/is");
 
 ////////////////////////////////////////////////////////////////////////////////

js/server/modules/@arangodb/foxx/manager.js

@@ -35,7 +35,7 @@
 // --SECTION--                                                           imports
 // -----------------------------------------------------------------------------
 
-const _ = require('underscore');
+const _ = require('lodash');
 const fs = require('fs');
 const joi = require('joi');
 const util = require('util');
@@ -267,7 +267,7 @@ function refillCaches(dbname) {
 
   while (cursor.hasNext()) {
     var config = cursor.next();
-    var app = new FoxxService(_.clone(config));
+    var app = new FoxxService(_.extend({}, config));
     var mount = app.mount;
     cache[mount] = app;
     routes.push(mount);

js/server/modules/@arangodb/foxx/model.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-const _ = require('underscore');
+const _ = require('lodash');
 const joi = require('joi');
 const is = require('@arangodb/is');
 const toJSONSchema = require('@arangodb/foxx/schema').toJSONSchema;

js/server/modules/@arangodb/foxx/query.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2014, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore'),
+var _ = require('lodash'),
   db = require('@arangodb').db;
 
 exports.createQuery = function createQuery (cfg) {

js/server/modules/@arangodb/foxx/queues.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2015, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore');
+var _ = require('lodash');
 var flatten = require('internal').flatten;
 var arangodb = require('@arangodb');
 var joi = require('joi');

js/server/modules/@arangodb/foxx/queues/manager.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2014, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore');
+var _ = require('lodash');
 var tasks = require('@arangodb/tasks');
 var db = require('@arangodb').db;
 var qb = require('aqb');

js/server/modules/@arangodb/foxx/queues/worker.js

@@ -28,7 +28,7 @@
 /// @author Copyright 2015, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore');
+var _ = require('lodash');
 var db = require('@arangodb').db;
 var flatten = require('internal').flatten;
 var exponentialBackOff = require('internal').exponentialBackOff;

js/server/modules/@arangodb/foxx/repository.js

@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 const Model = require('@arangodb/foxx/model').Model;
-const _ = require('underscore');
+const _ = require('lodash');
 const extend = require('@arangodb/extend').extend;
 const EventEmitter = require('events').EventEmitter;
 

js/server/modules/@arangodb/foxx/request_context.js

@@ -30,7 +30,7 @@
 
 const SwaggerDocs = require('@arangodb/foxx/swaggerDocs').Docs;
 const joi = require('joi');
-const _ = require('underscore');
+const _ = require('lodash');
 const internal = require('@arangodb/foxx/internals');
 const toJSONSchema = require('@arangodb/foxx/schema').toJSONSchema;
 const is = require('@arangodb/is');

js/server/modules/@arangodb/foxx/routing.js

@@ -37,7 +37,7 @@ var arangodb = require("@arangodb");
 var ArangoError = arangodb.ArangoError;
 var errors = arangodb.errors;
 var preprocess = require("@arangodb/foxx/preprocessor").preprocess;
-var _ = require("underscore");
+var _ = require("lodash");
 var fs = require("fs");
 var is = require("@arangodb/is");
 var console = require("console");

js/server/modules/@arangodb/foxx/schema.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2015, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore'),
+var _ = require('lodash'),
   joi = require('joi');
 
 function toJSONSchema(id, schema) {

js/server/modules/@arangodb/foxx/service.js

@@ -1,5 +1,5 @@
 'use strict';
-const _ = require('underscore');
+const _ = require('lodash');
 const ArangoError = require('@arangodb').ArangoError;
 const errors = require('@arangodb').errors;
 const internal = require('internal');
@@ -320,7 +320,7 @@ class FoxxService {
     var options = this.options.configuration;
     _.each(definitions, function (dfn, name) {
       var value = options[name] === undefined ? dfn.default : options[name];
-      config[name] = simple ? value : _.extend(_.clone(dfn), {
+      config[name] = simple ? value : _.extend({}, dfn, {
         title: getReadableName(name),
         current: value
       });

js/server/modules/@arangodb/foxx/swagger.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2015, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore');
+var _ = require('lodash');
 var fs = require('fs');
 var internal = require('internal');
 var ArangoError = require('@arangodb').ArangoError;

js/server/modules/@arangodb/foxx/swaggerDocs.js

@@ -27,7 +27,7 @@
 /// @author Copyright 2015, ArangoDB GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require("underscore");
+var _ = require("lodash");
 var internal = require("internal");
 
 // Wraps the docs object of a route to add swagger compatible documentation

js/server/modules/@arangodb/foxx/templateEngine.js

@@ -29,7 +29,7 @@
 /// @author Copyright 2013-2015, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore');
+var _ = require('lodash');
 var fs = require('fs');
 var internal = require('internal');
 var i = require('i')();

js/server/modules/@arangodb/foxx/template_middleware.js

@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 var db = require("@arangodb").db,
-  _ = require("underscore");
+  _ = require("lodash");
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @start Docu Block JSF_foxx_TemplateMiddleware_initializer
@@ -54,7 +54,7 @@ var db = require("@arangodb").db,
 function TemplateMiddleware(templateCollection, helper) {
   var middleware = function (request, response) {
     var responseFunctions,
-      _ = require("underscore");
+      _ = require("lodash");
 
     responseFunctions = {
 

js/server/modules/@arangodb/foxx/templates/controller.js.tmpl

@@ -1,5 +1,5 @@
 'use strict';
-var _ = require('underscore');
+var _ = require('lodash');
 var joi = require('joi');
 var Foxx = require('@arangodb/foxx');
 var ArangoError = require('@arangodb').ArangoError;

js/server/modules/@arangodb/testing.js

@@ -96,7 +96,7 @@ var optionsDocumentation = [
   ''
 ];
 
-var _ = require("underscore");
+var _ = require("lodash");
 var cleanupDirectories = [];
 var testFuncs = {'all': function(){}};
 var print = require("internal").print;

js/server/tests/aql-graph-traverser.js

@@ -39,7 +39,7 @@ const gm = require("@arangodb/general-graph");
 const vn = "UnitTestVertexCollection";
 const en = "UnitTestEdgeCollection";
 const isCluster = require("@arangodb/cluster").isCluster();
-var _ = require("underscore");
+var _ = require("lodash");
 var vertex = {};
 var edge = {};
 var vc;

js/server/tests/aql-optimizer-dynamic-bounds.js

@@ -32,7 +32,7 @@ var jsunity = require("jsunity");
 var helper = require("@arangodb/aql-helper");
 var isEqual = helper.isEqual;
 var db = require("@arangodb").db;
-var _ = require("underscore");
+var _ = require("lodash");
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test suite

js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js

@@ -32,7 +32,7 @@ var jsunity = require("jsunity");
 var helper = require("@arangodb/aql-helper");
 var isEqual = helper.isEqual;
 var db = require("@arangodb").db;
-var _ = require("underscore");
+var _ = require("lodash");
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test suite

js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js

@@ -32,7 +32,7 @@ var jsunity = require("jsunity");
 var helper = require("@arangodb/aql-helper");
 var isEqual = helper.isEqual;
 var db = require("@arangodb").db;
-var _ = require("underscore");
+var _ = require("lodash");
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test suite

js/server/tests/aql-optimizer-rule-merge-traversal-filter.js

@@ -31,7 +31,7 @@
 var jsunity = require("jsunity");
 var helper = require("@arangodb/aql-helper");
 var isEqual = helper.isEqual;
-var _ = require("underscore");
+var _ = require("lodash");
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test suite

js/server/tests/shell-cluster-agency-communication.js

@@ -28,7 +28,7 @@
 /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
   var jsunity = require("jsunity");
-  var _ = require("underscore");
+  var _ = require("lodash");
 
   // -----------------------------------------------------------------------------
   // --SECTION--                                              agency-result-helper

js/server/tests/shell-foxx-model.js

@@ -28,7 +28,7 @@
 /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require("underscore"),
+var _ = require("lodash"),
   joi = require("joi"),
   jsunity = require("jsunity");
 

js/server/tests/shell-foxx-query-spec.js

@@ -28,7 +28,7 @@
 /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-var _ = require('underscore'),
+var _ = require('lodash'),
   createQuery = require('@arangodb/foxx/query').createQuery,
   arangodb = require('@arangodb'),
   db = arangodb.db;

js/server/tests/shell-foxx.js

@@ -36,7 +36,7 @@ var stub,
   mockConstructor,
   joi = require("joi"),
   transformRoute = require("@arangodb/foxx/routing").__test_transformControllerToRoute,
-  _ = require("underscore");
+  _ = require("lodash");
 
 // Sorry for Yak Shaving. But I can't take it anymore.