From d9be6a0f9446e2b3942675002a0a7a017647ed85 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Mon, 2 Apr 2018 15:08:53 -0400
Subject: [PATCH] Destructure Lodash `require`s

---
 app/attachments.js                               |  6 +++---
 app/menu.js                                      |  2 +-
 js/modules/database.js                           |  2 +-
 js/modules/debug.js                              | 16 +++++++++-------
 js/modules/messages_data_migrator.js             | 12 +++++++-----
 ...migrations_0_database_with_attachment_data.js |  2 +-
 js/modules/migrations/run_migrations.js          | 13 ++++++++-----
 js/modules/privacy.js                            | 10 ++++++----
 js/modules/settings.js                           |  3 +--
 js/modules/types/attachment.js                   |  3 +--
 .../attachment/migrate_data_to_file_system.js    | 10 ++++++----
 js/modules/types/message.js                      |  2 +-
 js/modules/types/schema_version.js               |  2 +-
 13 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/app/attachments.js b/app/attachments.js
index 0b7b5a068..46dca8589 100644
--- a/app/attachments.js
+++ b/app/attachments.js
@@ -1,9 +1,9 @@
 const crypto = require('crypto');
-const fse = require('fs-extra');
-const isArrayBuffer = require('lodash/isArrayBuffer');
-const isString = require('lodash/isString');
 const path = require('path');
+
+const fse = require('fs-extra');
 const toArrayBuffer = require('to-arraybuffer');
+const { isArrayBuffer, isString } = require('lodash');
 
 
 const PATH = 'attachments.noindex';
diff --git a/app/menu.js b/app/menu.js
index 16c0fe23f..ecc1f654b 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -1,4 +1,4 @@
-const isString = require('lodash/isString');
+const { isString } = require('lodash');
 
 
 exports.createTemplate = (options, messages) => {
diff --git a/js/modules/database.js b/js/modules/database.js
index f780a4031..24c20555e 100644
--- a/js/modules/database.js
+++ b/js/modules/database.js
@@ -4,7 +4,7 @@
 // and using promises. Revisit use of `idb` dependency as it might cover
 // this functionality.
 
-const isObject = require('lodash/isObject');
+const { isObject } = require('lodash');
 
 
 exports.open = (name, version) => {
diff --git a/js/modules/debug.js b/js/modules/debug.js
index cfa39cd45..75e4e6513 100644
--- a/js/modules/debug.js
+++ b/js/modules/debug.js
@@ -1,10 +1,12 @@
-const isFunction = require('lodash/isFunction');
-const isNumber = require('lodash/isNumber');
-const isObject = require('lodash/isObject');
-const isString = require('lodash/isString');
-const random = require('lodash/random');
-const range = require('lodash/range');
-const sample = require('lodash/sample');
+const {
+  isFunction,
+  isNumber,
+  isObject,
+  isString,
+  random,
+  range,
+  sample,
+} = require('lodash');
 
 const Message = require('./types/message');
 const { deferredToPromise } = require('./deferred_to_promise');
diff --git a/js/modules/messages_data_migrator.js b/js/modules/messages_data_migrator.js
index 7357b9a6b..f97872389 100644
--- a/js/modules/messages_data_migrator.js
+++ b/js/modules/messages_data_migrator.js
@@ -6,11 +6,13 @@
 
 /* global IDBKeyRange */
 
-const isFunction = require('lodash/isFunction');
-const isNumber = require('lodash/isNumber');
-const isObject = require('lodash/isObject');
-const isString = require('lodash/isString');
-const last = require('lodash/last');
+const {
+  isFunction,
+  isNumber,
+  isObject,
+  isString,
+  last,
+} = require('lodash');
 
 const database = require('./database');
 const Message = require('./types/message');
diff --git a/js/modules/migrations/migrations_0_database_with_attachment_data.js b/js/modules/migrations/migrations_0_database_with_attachment_data.js
index c47f032a5..2c42b9e90 100644
--- a/js/modules/migrations/migrations_0_database_with_attachment_data.js
+++ b/js/modules/migrations/migrations_0_database_with_attachment_data.js
@@ -1,4 +1,4 @@
-const last = require('lodash/last');
+const { last } = require('lodash');
 
 const { runMigrations } = require('./run_migrations');
 
diff --git a/js/modules/migrations/run_migrations.js b/js/modules/migrations/run_migrations.js
index ce3e3cee1..cc54a408c 100644
--- a/js/modules/migrations/run_migrations.js
+++ b/js/modules/migrations/run_migrations.js
@@ -1,10 +1,13 @@
 /* eslint-env browser */
 
-const isFunction = require('lodash/isFunction');
-const isObject = require('lodash/isObject');
-const isString = require('lodash/isString');
-const head = require('lodash/head');
-const last = require('lodash/last');
+const {
+  head,
+  isFunction,
+  isObject,
+  isString,
+  last,
+} = require('lodash');
+
 
 const db = require('../database');
 const { deferredToPromise } = require('../deferred_to_promise');
diff --git a/js/modules/privacy.js b/js/modules/privacy.js
index 9e5f26646..1a90884c5 100644
--- a/js/modules/privacy.js
+++ b/js/modules/privacy.js
@@ -2,10 +2,12 @@
 
 const Path = require('path');
 
-const compose = require('lodash/fp/compose');
-const escapeRegExp = require('lodash/escapeRegExp');
-const isRegExp = require('lodash/isRegExp');
-const isString = require('lodash/isString');
+const {
+  escapeRegExp,
+  isRegExp,
+  isString,
+} = require('lodash');
+const { compose } = require('lodash/fp');
 
 
 const PHONE_NUMBER_PATTERN = /\+\d{7,12}(\d{3})/g;
diff --git a/js/modules/settings.js b/js/modules/settings.js
index 9786be7fc..d99bfdeb9 100644
--- a/js/modules/settings.js
+++ b/js/modules/settings.js
@@ -1,5 +1,4 @@
-const isObject = require('lodash/isObject');
-const isString = require('lodash/isString');
+const { isObject, isString } = require('lodash');
 
 
 const ITEMS_STORE_NAME = 'items';
diff --git a/js/modules/types/attachment.js b/js/modules/types/attachment.js
index 07e8c825d..c807afc2b 100644
--- a/js/modules/types/attachment.js
+++ b/js/modules/types/attachment.js
@@ -1,5 +1,4 @@
-const isFunction = require('lodash/isFunction');
-const isString = require('lodash/isString');
+const { isFunction, isString } = require('lodash');
 
 const MIME = require('./mime');
 const { arrayBufferToBlob, blobToArrayBuffer, dataURLToBlob } = require('blob-util');
diff --git a/js/modules/types/attachment/migrate_data_to_file_system.js b/js/modules/types/attachment/migrate_data_to_file_system.js
index ed21cb2ab..d2709d90f 100644
--- a/js/modules/types/attachment/migrate_data_to_file_system.js
+++ b/js/modules/types/attachment/migrate_data_to_file_system.js
@@ -1,7 +1,9 @@
-const isArrayBuffer = require('lodash/isArrayBuffer');
-const isFunction = require('lodash/isFunction');
-const isUndefined = require('lodash/isUndefined');
-const omit = require('lodash/omit');
+const {
+  isArrayBuffer,
+  isFunction,
+  isUndefined,
+  omit,
+} = require('lodash');
 
 
 // type Context :: {
diff --git a/js/modules/types/message.js b/js/modules/types/message.js
index a43e9c664..d501532e7 100644
--- a/js/modules/types/message.js
+++ b/js/modules/types/message.js
@@ -1,4 +1,4 @@
-const isFunction = require('lodash/isFunction');
+const { isFunction } = require('lodash');
 
 const Attachment = require('./attachment');
 const Errors = require('./errors');
diff --git a/js/modules/types/schema_version.js b/js/modules/types/schema_version.js
index 3a0d08980..058a36a1e 100644
--- a/js/modules/types/schema_version.js
+++ b/js/modules/types/schema_version.js
@@ -1,4 +1,4 @@
-const isNumber = require('lodash/isNumber');
+const { isNumber } = require('lodash');
 
 
 exports.isValid = value =>