chore: remove per-method packages and use the latest lodash everywhere (#4502)

mcasimir · addaleax · web-flow · commit 0f5f9531917e · 2023-06-13T16:10:02.000+02:00
Co-authored-by: Anna Henningsen &lt;anna.henningsen@mongodb.com&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -79,7 +79,7 @@
     "enzyme": "^3.11.0",
     "eslint": "^7.25.0",
     "hadron-app-registry": "^9.0.7",
-    "lodash.clonedeep": "^4.5.0",
+    "lodash": "^4.17.21",
     "mocha": "^10.2.0",
     "mongodb": "^5.5.0",
     "mongodb-data-service": "^22.8.0",
diff --git a/packages/compass-indexes/src/modules/indexes.ts b/packages/compass-indexes/src/modules/indexes.ts
@@ -2,7 +2,7 @@ import { localAppRegistryEmit } from '@mongodb-js/mongodb-redux-common/app-regis
 import type { IndexDefinition as _IndexDefinition } from 'mongodb-data-service';
 import type { ThunkAction, ThunkDispatch } from 'redux-thunk';
 import _debug from 'debug';
-import cloneDeep from 'lodash.clonedeep';
+import { cloneDeep } from 'lodash';
 import type { AnyAction } from 'redux';
 
 import type { RootState } from './index';
diff --git a/packages/compass-indexes/src/typings.d.ts b/packages/compass-indexes/src/typings.d.ts
@@ -7,5 +7,3 @@ declare module 'mongodb-query-parser' {
 }
 
 declare module '@mongodb-js/mongodb-redux-common/app-registry';
-declare module 'lodash.contains';
-declare module 'lodash.clonedeep';
diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json
@@ -73,7 +73,6 @@
     "@testing-library/react": "^12.1.4",
     "@testing-library/user-event": "^13.5.0",
     "@types/chai": "^4.2.21",
-    "@types/lodash.find": "^4.6.7",
     "@types/mocha": "^9.0.0",
     "@types/react": "^17.0.5",
     "@types/react-dom": "^17.0.10",
@@ -86,21 +85,6 @@
     "leaflet-defaulticon-compatibility": "^0.1.1",
     "leaflet-draw": "^1.0.4",
     "lodash": "^4.17.21",
-    "lodash.debounce": "^4.0.8",
-    "lodash.find": "^4.6.0",
-    "lodash.groupby": "^4.6.0",
-    "lodash.isequal": "^4.5.0",
-    "lodash.isstring": "^4.0.1",
-    "lodash.map": "^4.6.0",
-    "lodash.maxby": "^4.0.1",
-    "lodash.minby": "^4.0.1",
-    "lodash.pluck": "^3.1.2",
-    "lodash.range": "^3.2.0",
-    "lodash.samplesize": "^4.2.0",
-    "lodash.slice": "^4.2.0",
-    "lodash.sortby": "^4.7.0",
-    "lodash.sortbyorder": "^3.4.4",
-    "lodash.sum": "^4.0.2",
     "mocha": "^10.2.0",
     "moment": "^2.29.4",
     "mongodb": "^5.5.0",
diff --git a/packages/compass-schema/src/components/coordinates-minichart/coordinates-minichart.jsx b/packages/compass-schema/src/components/coordinates-minichart/coordinates-minichart.jsx
@@ -16,7 +16,7 @@ import GeoscatterMapItem from './marker';
 
 import { LIGHTMODE_TILE_URL, DARKMODE_TILE_URL } from './constants';
 import { getHereAttributionMessage } from './utils';
-import debounce from 'lodash.debounce';
+import { debounce } from 'lodash';
 import { withDarkMode } from '@mongodb-js/compass-components';
 
 // TODO: Disable boxZoom handler for circle lasso.
diff --git a/packages/compass-schema/src/components/field.tsx b/packages/compass-schema/src/components/field.tsx
@@ -8,7 +8,7 @@ import {
   spacing,
   KeylineCard,
 } from '@mongodb-js/compass-components';
-import find from 'lodash.find';
+import { find } from 'lodash';
 import { withPreferences } from 'compass-preferences-model';
 import type AppRegistry from 'hadron-app-registry';
 import type {
diff --git a/packages/compass-schema/src/components/unique-minichart/unique-minichart.jsx b/packages/compass-schema/src/components/unique-minichart/unique-minichart.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { ValueBubble } from '../value-bubble';
-import sampleSize from 'lodash.samplesize';
+import { sampleSize } from 'lodash';
 import { Icon, IconButton } from '@mongodb-js/compass-components';
 
 class UniqueMiniChart extends Component {
diff --git a/packages/compass-schema/src/components/value-bubble.tsx b/packages/compass-schema/src/components/value-bubble.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import isString from 'lodash.isstring';
+import { isString } from 'lodash';
 import { hasDistinctValue } from 'mongodb-query-util';
 import {
   Body,
diff --git a/packages/compass-schema/src/modules/boolean.js b/packages/compass-schema/src/modules/boolean.js
@@ -1,8 +1,8 @@
 /* eslint camelcase: 0 */
 import d3 from 'd3';
-import groupBy from 'lodash.groupby';
-import map from 'lodash.map';
-import sortByOrder from 'lodash.sortbyorder';
+import { groupBy } from 'lodash';
+import { map } from 'lodash';
+import { orderBy } from 'lodash';
 import few from './few';
 import shared from './shared';
 
@@ -35,7 +35,8 @@ const minicharts_d3fns_boolean = (localAppRegistry) => {
           count: v.length,
         };
       });
-      const grouped = sortByOrder(grdm, 'label', [false]); // order: false, true
+
+      const grouped = orderBy(grdm, ['label'], ['desc']);
 
       fewChart.width(innerWidth).height(innerHeight).options(options);
 
diff --git a/packages/compass-schema/src/modules/date.js b/packages/compass-schema/src/modules/date.js
@@ -1,12 +1,6 @@
 /* eslint-disable no-use-before-define */
 import d3 from 'd3';
-import isEqual from 'lodash.isequal';
-import range from 'lodash.range';
-import minBy from 'lodash.minby';
-import maxBy from 'lodash.maxby';
-import sortBy from 'lodash.sortby';
-import groupBy from 'lodash.groupby';
-import map from 'lodash.map';
+import { isEqual, range, minBy, maxBy, sortBy, groupBy, map } from 'lodash';
 import moment from 'moment';
 import { inValueRange } from 'mongodb-query-util';
 import { palette, spacing } from '@mongodb-js/compass-components';
diff --git a/packages/compass-schema/src/modules/few.js b/packages/compass-schema/src/modules/few.js
@@ -1,9 +1,6 @@
 /* eslint no-use-before-define: 0, camelcase: 0 */
 import d3 from 'd3';
-import map from 'lodash.map';
-import sortBy from 'lodash.sortby';
-import sum from 'lodash.sum';
-import slice from 'lodash.slice';
+import { map, sortBy, sum, slice } from 'lodash';
 import shared from './shared';
 import { hasDistinctValue } from 'mongodb-query-util';
 import { palette } from '@mongodb-js/compass-components';
diff --git a/packages/compass-schema/src/modules/many.js b/packages/compass-schema/src/modules/many.js
@@ -1,10 +1,6 @@
 /* eslint no-use-before-define: 0, camelcase: 0 */
 import d3 from 'd3';
-import pluck from 'lodash.pluck';
-import map from 'lodash.map';
-import minBy from 'lodash.minby';
-import maxBy from 'lodash.maxby';
-import sortBy from 'lodash.sortby';
+import { map, minBy, maxBy, sortBy } from 'lodash';
 import shared from './shared';
 import { hasDistinctValue, inValueRange } from 'mongodb-query-util';
 import { createD3Tip } from './create-d3-tip';
@@ -256,7 +252,7 @@ const minicharts_d3fns_many = (appRegistry) => {
   function chart(selection) {
     /* eslint complexity: 0 */
     selection.each(function (data) {
-      const values = pluck(data, 'count');
+      const values = map(data, 'count');
       const maxValue = d3.max(values);
       const sumValues = d3.sum(values);
       const percentFormat = shared.friendlyPercentFormat(
@@ -265,7 +261,7 @@ const minicharts_d3fns_many = (appRegistry) => {
       let labels = options.labels;
       el = d3.select(this);
 
-      xScale.domain(pluck(data, 'label')).rangeRoundBands([0, width], 0.3, 0.0);
+      xScale.domain(map(data, 'label')).rangeRoundBands([0, width], 0.3, 0.0);
 
       brush.x(xScale);
       brush.extent(brush.extent());
diff --git a/packages/compass-schema/src/modules/number.js b/packages/compass-schema/src/modules/number.js
@@ -1,8 +1,6 @@
 /* eslint camelcase: 0 */
 import d3 from 'd3';
-import groupBy from 'lodash.groupby';
-import sortBy from 'lodash.sortby';
-import map from 'lodash.map';
+import { groupBy, sortBy, map } from 'lodash';
 import many from './many';
 import shared from './shared';
 
diff --git a/packages/compass-schema/src/modules/string.js b/packages/compass-schema/src/modules/string.js
@@ -1,8 +1,6 @@
 /* eslint camelcase: 0 */
 import d3 from 'd3';
-import map from 'lodash.map';
-import groupBy from 'lodash.groupby';
-import sortByOrder from 'lodash.sortbyorder';
+import { map, groupBy, orderBy } from 'lodash';
 import few from './few';
 import many from './many';
 import shared from './shared';
@@ -37,7 +35,8 @@ const minicharts_d3fns_string = (appRegistry) => {
           count: v.length,
         };
       });
-      const grouped = sortByOrder(grm, 'count', [false]); // descending on value
+
+      const grouped = orderBy(grm, ['count'], ['desc']);
 
       const g = el.selectAll('g').data([grouped]);
 
diff --git a/packages/compass-serverstats/package.json b/packages/compass-serverstats/package.json
@@ -49,12 +49,7 @@
     "eslint-plugin-react": "^7.24.0",
     "hadron-app": "^5.8.0",
     "hadron-app-registry": "^9.0.7",
-    "lodash.has": "^4.5.2",
-    "lodash.isequal": "^4.5.0",
-    "lodash.max": "^4.0.1",
-    "lodash.remove": "^4.7.0",
-    "lodash.round": "^4.0.4",
-    "lodash.isempty": "^4.0.4",
+    "lodash": "^4.17.21",
     "mocha": "^10.2.0",
     "mongodb-data-service": "^22.8.0",
     "mongodb-js-errors": "^0.3.2",
diff --git a/packages/compass-serverstats/src/stores/current-op-store.js b/packages/compass-serverstats/src/stores/current-op-store.js
@@ -1,8 +1,7 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const toNS = require('mongodb-ns');
-const round = require('lodash.round');
-
+const { round } = require('lodash');
 const debug = require('debug')('mongodb-compass:server-stats:current-op-store');
 
 /* eslint complexity:0 */
diff --git a/packages/compass-serverstats/src/stores/dberror-store.js b/packages/compass-serverstats/src/stores/dberror-store.js
@@ -1,9 +1,7 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const translate = require('mongodb-js-errors').translate;
-const isEqual = require('lodash.isequal');
-
-// const debug = require('debug')('mongodb-compass:server-stats:dberror-store');
+const { isEqual } = require('lodash');
 
 const DBErrorStore = Reflux.createStore({
 
diff --git a/packages/compass-serverstats/src/stores/globallock-store.js b/packages/compass-serverstats/src/stores/globallock-store.js
@@ -1,7 +1,7 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const ServerStatsStore = require('./server-stats-graphs-store');
-const max = require('lodash.max');
+const { max } = require('lodash');
 
 // const debug = require('debug')('mongodb-compass:server-stats:globallock-store');
 
diff --git a/packages/compass-serverstats/src/stores/mem-store.js b/packages/compass-serverstats/src/stores/mem-store.js
@@ -1,12 +1,7 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const ServerStatsStore = require('./server-stats-graphs-store');
-const remove = require('lodash.remove');
-const has = require('lodash.has');
-const round = require('lodash.round');
-const max = require('lodash.max');
-
-// const debug = require('debug')('mongodb-compass:server-stats:mem-store');
+const { remove, has, round, max } = require('lodash');
 
 /* eslint complexity:0 */
 
diff --git a/packages/compass-serverstats/src/stores/network-store.js b/packages/compass-serverstats/src/stores/network-store.js
@@ -1,10 +1,8 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const ServerStatsStore = require('./server-stats-graphs-store');
-const round = require('lodash.round');
-const max = require('lodash.max');
-
-// const debug = require('debug')('mongodb-compass:server-stats:network-store');
+const { round } = require('lodash');
+const { max } = require('lodash');
 
 /* eslint complexity:0 */
 
diff --git a/packages/compass-serverstats/src/stores/opcounters-store.js b/packages/compass-serverstats/src/stores/opcounters-store.js
@@ -1,9 +1,7 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const ServerStatsStore = require('./server-stats-graphs-store');
-const max = require('lodash.max');
-
-// const debug = require('debug')('mongodb-compass:server-stats:opcounters-store');
+const { max } = require('lodash');
 
 /* eslint complexity:0 */
 
diff --git a/packages/compass-serverstats/src/stores/top-store.js b/packages/compass-serverstats/src/stores/top-store.js
@@ -1,8 +1,7 @@
 const Reflux = require('reflux');
 const Actions = require('../actions');
 const toNS = require('mongodb-ns');
-const round = require('lodash.round');
-const isEmpty = require('lodash.isempty');
+const { round, isEmpty } = require('lodash');
 
 const debug = require('debug')('mongodb-compass:server-stats:top-store');
 
diff --git a/packages/compass-user-model/.depcheckrc b/packages/compass-user-model/.depcheckrc
@@ -1,14 +1 @@
-ignores: [
-  "ampersand-collection-filterable",
-  "ampersand-rest-collection",
-  "ampersand-state",
-  "debug",
-  "lodash.get",
-  "mongodb-collection-model",
-  "mongodb-database-model",
-  "mongodb-ns",
-  "raf",
-  "lodash.clone",
-  "lodash.result",
-  "mongodb-compass"
-]
+ignores: []
diff --git a/packages/compass-user-model/package.json b/packages/compass-user-model/package.json
@@ -34,16 +34,7 @@
     "test-ci": "npm run test"
   },
   "dependencies": {
-    "ampersand-collection-filterable": "^0.3.0",
     "ampersand-model": "^8.0.1",
-    "ampersand-rest-collection": "^6.0.0",
-    "ampersand-state": "5.0.3",
-    "debug": "^2.2.0",
-    "lodash.get": "^4.4.2",
-    "mongodb-collection-model": "^5.8.0",
-    "mongodb-database-model": "^2.8.0",
-    "mongodb-ns": "^2.4.0",
-    "raf": "^3.4.1",
     "storage-mixin": "^5.1.5",
     "uuid": "^3.3.2"
   },
@@ -52,7 +43,6 @@
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
     "eslint-config-mongodb-js": "^3.0.1",
-    "lodash.result": "^4.5.2",
     "mocha": "^10.2.0"
   }
 }
diff --git a/packages/hadron-document/.depcheckrc b/packages/hadron-document/.depcheckrc
@@ -2,7 +2,6 @@ ignores: [
   '@mongodb-js/prettier-config-compass',
   '@mongodb-js/tsconfig-compass',
   "debug",
-  "lodash.foreach",
   "@babel/register",
   "babel-loader"
 ]
diff --git a/packages/hadron-document/package.json b/packages/hadron-document/package.json
@@ -50,21 +50,13 @@
     "debug": "^4.2.0",
     "eventemitter3": "^4.0.0",
     "hadron-type-checker": "^7.0.3",
-    "lodash.foreach": "^4.5.0",
-    "lodash.isarray": "^4.0.0",
-    "lodash.isequal": "^4.5.0",
-    "lodash.isplainobject": "^4.0.6",
-    "lodash.isstring": "^4.0.1"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@mongodb-js/eslint-config-compass": "^1.0.6",
     "@mongodb-js/mocha-config-compass": "^1.2.0",
     "@mongodb-js/prettier-config-compass": "^1.0.0",
     "@mongodb-js/tsconfig-compass": "^1.0.2",
-    "@types/lodash.isarray": "^4.0.6",
-    "@types/lodash.isequal": "^4.5.5",
-    "@types/lodash.isplainobject": "^4.0.6",
-    "@types/lodash.isstring": "^4.0.6",
     "chai": "^4.2.0",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
diff --git a/packages/hadron-document/src/element.ts b/packages/hadron-document/src/element.ts
@@ -1,10 +1,7 @@
 'use strict';
 
 import EventEmitter from 'eventemitter3';
-import isObject from 'lodash.isplainobject';
-import isArray from 'lodash.isarray';
-import isEqual from 'lodash.isequal';
-import isString from 'lodash.isstring';
+import { isPlainObject, isArray, isEqual, isString } from 'lodash';
 import type { ObjectGeneratorOptions } from './object-generator';
 import ObjectGenerator from './object-generator';
 import TypeChecker from 'hadron-type-checker';
@@ -775,7 +772,7 @@ export class Element extends EventEmitter {
    * @returns If the value is expandable.
    */
   _isExpandable(value: BSONValue): value is BSONObject | BSONArray {
-    return isObject(value) || isArray(value);
+    return isPlainObject(value) || isArray(value);
   }
 
   /**
diff --git a/packages/hadron-document/src/object-generator.ts b/packages/hadron-document/src/object-generator.ts
@@ -1,7 +1,7 @@
 import type { Element } from './element';
 import type { Document } from './document';
 import type { BSONArray, BSONObject, BSONValue } from './utils';
-import isEqual from 'lodash.isequal';
+import { isEqual } from 'lodash';
 
 const DECRYPTED_KEYS = Symbol.for('@@mdb.decryptedKeys');
 
diff --git a/packages/hadron-ipc/lib/main.js b/packages/hadron-ipc/lib/main.js
@@ -1,8 +1,7 @@
 'use strict';
 
 const getResponseChannel = require('./common').getResponseChannel;
-const forIn = require('lodash.forin');
-const isPlainObject = require('lodash.isplainobject');
+const { forIn, isPlainObject } = require('lodash');
 const isPromise = require('is-promise');
 const electron = require('electron');
 const BrowserWindow = electron.BrowserWindow;
diff --git a/packages/hadron-ipc/package.json b/packages/hadron-ipc/package.json

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,3 @@ declare module 'mongodb-query-parser' {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`declare module '@mongodb-js/mongodb-redux-common/app-registry';`
`10`		`-declare module 'lodash.contains';`
`11`		`-declare module 'lodash.clonedeep';`