remove more lodash functions - sortBy, assign, etc (#4670)

* remove more lodash functions - sortBy, assign, etc

* removing more lodash

* remove logging

* remove unused import

Co-authored-by: joehan <joehanley@google.com>

src/accountImporter.ts

@@ -1,5 +1,4 @@
 import * as clc from "cli-color";
-import * as _ from "lodash";
 
 import { Client } from "./apiv2";
 import { googleOrigin } from "./api";
@@ -260,7 +259,9 @@ function validateProviderUserInfo(providerUserInfo: { providerId: string; error?
       error: JSON.stringify(providerUserInfo, null, 2) + " has unsupported providerId",
     };
   }
-  const keydiff = _.difference(Object.keys(providerUserInfo), ALLOWED_PROVIDER_USER_INFO_KEYS);
+  const keydiff = Object.keys(providerUserInfo).filter(
+    (k) => !ALLOWED_PROVIDER_USER_INFO_KEYS.includes(k)
+  );
   if (keydiff.length) {
     return {
       error:
@@ -271,7 +272,7 @@ function validateProviderUserInfo(providerUserInfo: { providerId: string; error?
 }
 
 export function validateUserJson(userJson: any): { error?: string } {
-  const keydiff = _.difference(Object.keys(userJson), ALLOWED_JSON_KEYS);
+  const keydiff = Object.keys(userJson).filter((k) => !ALLOWED_JSON_KEYS.includes(k));
   if (keydiff.length) {
     return {
       error: JSON.stringify(userJson, null, 2) + " has unsupported keys: " + keydiff.join(","),

src/commands/database-push.ts

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import * as clc from "cli-color";
 import * as fs from "fs";
 
@@ -26,8 +25,8 @@ export const command = new Command("database:push <path> [infile]")
   .before(requireDatabaseInstance)
   .before(populateInstanceDetails)
   .before(printNoticeIfEmulated, Emulators.DATABASE)
-  .action(async (path, infile, options) => {
-    if (!_.startsWith(path, "/")) {
+  .action(async (path: string, infile, options) => {
+    if (!path.startsWith("/")) {
       throw new FirebaseError("Path must begin with /");
     }
     const inStream =
@@ -53,7 +52,7 @@ export const command = new Command("database:push <path> [infile]")
       throw new FirebaseError(`Unexpected error while pushing data: ${err}`, { exit: 2 });
     }
 
-    if (!_.endsWith(path, "/")) {
+    if (!path.endsWith("/")) {
       path += "/";
     }
 

src/commands/database-remove.ts

@@ -9,7 +9,6 @@ import { realtimeOriginOrEmulatorOrCustomUrl } from "../database/api";
 import * as utils from "../utils";
 import { promptOnce } from "../prompt";
 import * as clc from "cli-color";
-import * as _ from "lodash";
 
 export const command = new Command("database:remove <path>")
   .description("remove data from your Firebase at the specified path")
@@ -22,8 +21,8 @@ export const command = new Command("database:remove <path>")
   .before(requireDatabaseInstance)
   .before(populateInstanceDetails)
   .before(warnEmulatorNotSupported, Emulators.DATABASE)
-  .action(async (path, options) => {
-    if (!_.startsWith(path, "/")) {
+  .action(async (path: string, options) => {
+    if (!path.startsWith("/")) {
       return utils.reject("Path must begin with /", { exit: 1 });
     }
     const origin = realtimeOriginOrEmulatorOrCustomUrl(options.instanceDetails.databaseUrl);

src/commands/database-set.ts

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import * as clc from "cli-color";
 import * as fs from "fs";
 
@@ -28,8 +27,8 @@ export const command = new Command("database:set <path> [infile]")
   .before(requireDatabaseInstance)
   .before(populateInstanceDetails)
   .before(printNoticeIfEmulated, Emulators.DATABASE)
-  .action(async (path, infile, options) => {
-    if (!_.startsWith(path, "/")) {
+  .action(async (path: string, infile, options) => {
+    if (!path.startsWith("/")) {
       throw new FirebaseError("Path must begin with /");
     }
     const origin = realtimeOriginOrEmulatorOrCustomUrl(options.instanceDetails.databaseUrl);

src/commands/ext-dev-list.ts

@@ -1,6 +1,5 @@
 import * as clc from "cli-color";
 import Table = require("cli-table");
-import * as _ from "lodash";
 
 import { Command } from "../command";
 import { FirebaseError } from "../error";
@@ -41,7 +40,9 @@ export const command = new Command("ext:dev:list <publisherId>")
       style: { head: ["yellow"] },
     });
     // Order extensions newest to oldest.
-    const sorted = _.sortBy(extensions, "createTime", "asc").reverse();
+    const sorted = extensions.sort(
+      (a, b) => new Date(b.createTime).valueOf() - new Date(a.createTime).valueOf()
+    );
     sorted.forEach((extension) => {
       table.push([
         last(extension.ref.split("/")),

src/commands/open.ts

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import * as clc from "cli-color";
 import * as open from "open";
 
@@ -56,7 +55,7 @@ export const command = new Command("open [link]")
   .before(requirePermissions)
   .before(requireDatabaseInstance)
   .action(async (linkName: string, options: any): Promise<void> => {
-    let link = _.find(LINKS, { arg: linkName });
+    let link = LINKS.find((l) => l.arg === linkName);
     if (linkName && !link) {
       throw new FirebaseError(
         "Unrecognized link name. Valid links are:\n\n" + LINKS.map((l) => l.arg).join("\n")
@@ -69,7 +68,7 @@ export const command = new Command("open [link]")
         message: "What link would you like to open?",
         choices: CHOICES,
       });
-      link = _.find(LINKS, { name });
+      link = LINKS.find((l) => l.name === name);
     }
     if (!link) {
       throw new FirebaseError(

src/commands/serve.ts

@@ -1,5 +1,4 @@
 import * as clc from "cli-color";
-import * as _ from "lodash";
 
 import { Command } from "../command";
 import { logger } from "../logger";
@@ -13,18 +12,14 @@ import { FirebaseError } from "../error";
 
 const VALID_TARGETS = ["hosting", "functions"];
 const REQUIRES_AUTH = ["hosting", "functions"];
-const ALL_TARGETS = _.union(VALID_TARGETS, ["database", "firestore"]);
+const ALL_TARGETS = Array.from(new Set(["database", "firestore", ...VALID_TARGETS]));
 
 function filterOnly(list: string[], only = ""): string[] {
   if (!only) {
     return [];
   }
-  return _.intersection(
-    list,
-    only.split(",").map((opt) => {
-      return opt.split(":")[0];
-    })
-  );
+  const targets = only.split(",").map((o) => o.split(":")[0]);
+  return targets.filter((t) => list.includes(t));
 }
 
 export const command = new Command("serve")

src/deploy/lifecycleHooks.ts

@@ -60,7 +60,7 @@ function getChildEnvironment(target: string, overallOptions: any, config: any) {
   }
 
   // Copying over environment variables
-  return _.assign({}, process.env, {
+  return Object.assign({}, process.env, {
     GCLOUD_PROJECT: projectId,
     PROJECT_DIR: projectDir,
     RESOURCE_DIR: resourceDir,

src/deploy/storage/prepare.ts

@@ -22,7 +22,7 @@ export default async function (context: any, options: Options): Promise<void> {
 
   if (_.isPlainObject(rulesConfig)) {
     const defaultBucket = await gcp.storage.getDefaultBucket(options.project);
-    rulesConfig = [_.assign(rulesConfig, { bucket: defaultBucket })];
+    rulesConfig = [Object.assign(rulesConfig, { bucket: defaultBucket })];
     _.set(context, "storage.rules", rulesConfig);
   }
 

src/emulator/controller.ts

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import * as clc from "cli-color";
 import * as fs from "fs";
 import * as path from "path";
@@ -205,7 +204,7 @@ export function filterEmulatorTargets(options: any): Emulators[] {
     const only = onlyOptions.split(",").map((o) => {
       return o.split(":")[0];
     });
-    targets = _.intersection(targets, only as Emulators[]);
+    targets = targets.filter((t) => only.includes(t));
   }
 
   return targets;
@@ -380,7 +379,7 @@ export async function startAll(
     const requested: string[] = onlyOptions.split(",").map((o) => {
       return o.split(":")[0];
     });
-    const ignored = _.difference(requested, targets);
+    const ignored = requested.filter((k) => !targets.includes(k as Emulators));
 
     for (const name of ignored) {
       if (isEmulator(name)) {

src/extensions/askUserForParam.ts

@@ -372,8 +372,6 @@ async function addNewSecretVersion(
 }
 
 export function getInquirerDefault(options: ParamOption[], def: string): string {
-  const defaultOption = _.find(options, (option) => {
-    return option.value === def;
-  });
+  const defaultOption = options.find((o) => o.value === def);
   return defaultOption ? defaultOption.label || defaultOption.value : "";
 }

src/extensions/listExtensions.ts

@@ -1,4 +1,3 @@
-import * as _ from "lodash";
 import * as clc from "cli-color";
 import Table = require("cli-table");
 
@@ -13,7 +12,7 @@ import * as extensionsUtils from "./utils";
  * @param projectId ID of the project we're querying
  * @return mapping that contains a list of instances under the "instances" key
  */
-export async function listExtensions(projectId: string): Promise<any> {
+export async function listExtensions(projectId: string): Promise<Record<string, string>[]> {
   const instances = await listInstances(projectId);
   if (instances.length < 1) {
     logLabeledBullet(
@@ -28,21 +27,23 @@ export async function listExtensions(projectId: string): Promise<any> {
     style: { head: ["yellow"] },
   });
   // Order instances newest to oldest.
-  const sorted = _.sortBy(instances, "createTime", "asc").reverse();
+  const sorted = instances.sort(
+    (a, b) => new Date(b.createTime).valueOf() - new Date(a.createTime).valueOf()
+  );
   const formatted: Record<string, string>[] = [];
   sorted.forEach((instance) => {
-    let extension = _.get(instance, "config.extensionRef", "");
+    let extension = instance.config.extensionRef || "";
     let publisher;
     if (extension === "") {
-      extension = _.get(instance, "config.source.spec.name", "");
+      extension = instance.config.source.spec.name || "";
       publisher = "N/A";
     } else {
       publisher = extension.split("/")[0];
     }
     const instanceId = last(instance.name.split("/")) ?? "";
     const state =
       instance.state +
-      (_.get(instance, "config.source.state", "ACTIVE") === "DELETED" ? " (UNPUBLISHED)" : "");
+      ((instance.config.source.state || "ACTIVE") === "DELETED" ? " (UNPUBLISHED)" : "");
     const version = instance?.config?.source?.spec?.version;
     const updateTime = extensionsUtils.formatTimestamp(instance.updateTime);
     table.push([extension, publisher, instanceId, state, version, updateTime]);

src/functionsConfig.ts

@@ -88,7 +88,7 @@ export async function setVariablesRecursive(
   val: string | { [key: string]: any }
 ): Promise<any> {
   let parsed = val;
-  if (_.isString(val)) {
+  if (typeof val === "string") {
     try {
       // Only attempt to parse 'val' if it is a String (takes care of unparsed JSON, numbers, quoted string, etc.)
       parsed = JSON.parse(val);
@@ -186,7 +186,7 @@ export function parseUnsetArgs(args: string[]): ParsedArg[] {
   const parsed: ParsedArg[] = [];
   let splitArgs: string[] = [];
   for (const arg of args) {
-    splitArgs = _.union(splitArgs, arg.split(","));
+    splitArgs = Array.from(new Set([...splitArgs, ...arg.split(",")]));
   }
 
   for (const key of splitArgs) {

src/gcp/rules.ts

@@ -32,7 +32,7 @@ export async function getLatestRulesetName(
 ): Promise<string | null> {
   const releases = await listAllReleases(projectId);
   const prefix = `projects/${projectId}/releases/${service}`;
-  const release = _.find(releases, (r) => r.name.startsWith(prefix));
+  const release = releases.find((r) => r.name.startsWith(prefix));
 
   if (!release) {
     return null;

src/test/emulators/auth/setAccountInfo.spec.ts

@@ -550,7 +550,7 @@ describeAuthEmulator("accounts:update", ({ authApi, getClock }) => {
     const { localId, idToken } = await registerUser(authApi(), user);
     const savedUserInfo = await getAccountInfoByIdToken(authApi(), idToken);
     expect(savedUserInfo.mfaInfo).to.have.length(2);
-    const oldEnrollmentIds = savedUserInfo.mfaInfo!.map((_) => _.mfaEnrollmentId);
+    const oldEnrollmentIds = savedUserInfo.mfaInfo!.map((info) => info.mfaEnrollmentId);
 
     const newMfaInfo = {
       displayName: "New New",