firebase-tools 14.19.1 → 14.21.0

package/lib/appUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractAppIdentifiersAndroid = exports.extractAppIdentifierIos = exports.extractAppIdentifiersFlutter = exports.detectApps = exports.getPlatformsFromFolder = exports.appDescription = exports.Framework = exports.Platform = void 0;
+exports.detectFiles = exports.extractAppIdentifiersAndroid = exports.extractAppIdentifierIos = exports.extractAppIdentifiersFlutter = exports.detectApps = exports.getPlatformsFromFolder = exports.appDescription = exports.Framework = exports.Platform = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const glob_1 = require("glob");
@@ -13,8 +13,8 @@ var Platform;
 })(Platform = exports.Platform || (exports.Platform = {}));
 var Framework;
 (function (Framework) {
-    Framework["REACT"] = "REACT";
-    Framework["ANGULAR"] = "ANGULAR";
+    Framework["REACT"] = "react";
+    Framework["ANGULAR"] = "angular";
 })(Framework = exports.Framework || (exports.Framework = {}));
 function appDescription(a) {
     return `${a.directory} (${a.platform.toLowerCase()})`;
@@ -119,8 +119,8 @@ async function packageJsonToWebApp(dirPath, packageJsonFile) {
 }
 const WEB_FRAMEWORKS = Object.values(Framework);
 const WEB_FRAMEWORKS_SIGNALS = {
-    REACT: ["react", "next"],
-    ANGULAR: ["@angular/core"],
+    react: ["react", "next"],
+    angular: ["@angular/core"],
 };
 async function detectAppIdsForPlatform(dirPath, platform) {
     let appIdFiles;
@@ -228,3 +228,4 @@ async function detectFiles(dirPath, filePattern) {
     };
     return (0, glob_1.glob)(`**/${filePattern}`, options);
 }
+exports.detectFiles = detectFiles;

package/lib/command.js

@@ -106,9 +106,8 @@ class Command {
                 const trackSuccess = (0, track_1.trackGA4)("command_execution", {
                     command_name: this.name,
                     result: "success",
-                    duration,
                     interactive: (0, utils_1.getInheritedOption)(options, "nonInteractive") ? "false" : "true",
-                });
+                }, duration);
                 if (!isEmulator) {
                     await (0, utils_1.withTimeout)(5000, trackSuccess);
                 }
@@ -154,20 +153,18 @@ class Command {
     async prepare(options) {
         options = options || {};
         options.project = (0, utils_1.getInheritedOption)(options, "project");
-        if (!process.stdin.isTTY || (0, utils_1.getInheritedOption)(options, "nonInteractive")) {
+        if (!process.stdin.isTTY ||
+            (0, utils_1.getInheritedOption)(options, "nonInteractive") ||
+            (0, utils_1.getInheritedOption)(options, "json")) {
             options.nonInteractive = true;
         }
         if ((0, utils_1.getInheritedOption)(options, "interactive")) {
-            options.interactive = true;
             options.nonInteractive = false;
         }
         if ((0, utils_1.getInheritedOption)(options, "debug")) {
             options.debug = true;
         }
-        if ((0, utils_1.getInheritedOption)(options, "json")) {
-            options.nonInteractive = true;
-        }
-        else if (!options.isMCP) {
+        if (!(0, utils_1.getInheritedOption)(options, "json") && !options.isMCP) {
             (0, logger_1.useConsoleLoggers)();
         }
         if ((0, utils_1.getInheritedOption)(options, "config")) {

package/lib/commands/apps-init.js

@@ -8,7 +8,7 @@ const apps_1 = require("../management/apps");
 const requireAuth_1 = require("../requireAuth");
 const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
-const types_1 = require("../dataconnect/types");
+const appUtils_1 = require("../appUtils");
 const experiments_1 = require("../experiments");
 function logUse(platform, filePath) {
     switch (platform) {
@@ -42,12 +42,12 @@ for information about adding your config file to your project.`);
 }
 function toAppPlatform(str) {
     switch (str.toUpperCase()) {
-        case types_1.Platform.ANDROID:
-            return types_1.Platform.ANDROID;
-        case types_1.Platform.IOS:
-            return types_1.Platform.IOS;
-        case types_1.Platform.WEB:
-            return types_1.Platform.WEB;
+        case appUtils_1.Platform.ANDROID:
+            return appUtils_1.Platform.ANDROID;
+        case appUtils_1.Platform.IOS:
+            return appUtils_1.Platform.IOS;
+        case appUtils_1.Platform.WEB:
+            return appUtils_1.Platform.WEB;
     }
     throw new Error(`Platform ${str} is not compatible with apps:configure`);
 }

package/lib/commands/dataconnect-execute.js

@@ -0,0 +1,229 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const clc = require("colorette");
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const load_1 = require("../dataconnect/load");
+const requireAuth_1 = require("../requireAuth");
+const constants_1 = require("../emulator/constants");
+const apiv2_1 = require("../apiv2");
+const dataplaneClient_1 = require("../dataconnect/dataplaneClient");
+const dataplaneClient_2 = require("../dataconnect/dataplaneClient");
+const names_1 = require("../dataconnect/names");
+const error_1 = require("../error");
+const node_fs_1 = require("node:fs");
+const types_1 = require("../dataconnect/types");
+const hub_1 = require("../emulator/hub");
+const promises_1 = require("node:fs/promises");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const consumers_1 = require("node:stream/consumers");
+const logger_1 = require("../logger");
+const responseToError_1 = require("../responseToError");
+let stdinUsedFor = undefined;
+exports.command = new command_1.Command("dataconnect:execute [file] [operationName]")
+    .description("execute a Data Connect query or mutation. If FIREBASE_DATACONNECT_EMULATOR_HOST is set (such as during 'firebase emulator:exec', executes against the emulator instead.")
+    .option("--service <serviceId>", "The service ID to execute against (optional if there's only one service)")
+    .option("--location <locationId>", "The location ID to execute against (optional if there's only one service). Ignored by the emulator.")
+    .option("--vars, --variables <vars>", "Supply variables to the operation execution, which must be a JSON object whose keys are variable names. If vars begin with the character @, the rest is interpreted as a file name to read from, or - to read from stdin.")
+    .option("--no-debug-details", "Disables debug information in the response. Executions returns helpful errors or GQL extensions by default, which may expose too much for unprivilleged user or programs. If that's the case, this flag turns those output off.")
+    .action(async (file = "", operationName, options) => {
+    const emulatorHost = process.env[constants_1.Constants.FIREBASE_DATACONNECT_EMULATOR_HOST];
+    let projectId;
+    if (emulatorHost) {
+        projectId = (0, projectUtils_1.getProjectId)(options) || hub_1.EmulatorHub.MISSING_PROJECT_PLACEHOLDER;
+    }
+    else {
+        projectId = (0, projectUtils_1.needProjectId)(options);
+    }
+    let serviceName = undefined;
+    const serviceId = options.service;
+    const locationId = options.location;
+    if (!file && !operationName) {
+        if (process.stdin.isTTY) {
+            throw new error_1.FirebaseError("At least one of the [file] [operationName] arguments is required.");
+        }
+        file = "-";
+    }
+    let query;
+    if (file === "-") {
+        stdinUsedFor = "operation source code";
+        if (process.stdin.isTTY) {
+            process.stderr.write(`${clc.cyan("Reading GraphQL operation from stdin. EOF (CTRL+D) to finish and execute.")}${node_os_1.EOL}`);
+        }
+        query = await (0, consumers_1.text)(process.stdin);
+    }
+    else {
+        const stat = (0, node_fs_1.statSync)(file, { throwIfNoEntry: false });
+        if (stat === null || stat === void 0 ? void 0 : stat.isFile()) {
+            const opDisplay = operationName ? clc.bold(operationName) : "operation";
+            process.stderr.write(`${clc.cyan(`Executing ${opDisplay} in ${clc.bold(file)}`)}${node_os_1.EOL}`);
+            query = await (0, promises_1.readFile)(file, "utf-8");
+        }
+        else if (stat === null || stat === void 0 ? void 0 : stat.isDirectory()) {
+            query = await readQueryFromDir(file);
+        }
+        else {
+            if (operationName === undefined && (0, names_1.isGraphqlName)(file)) {
+                operationName = file;
+                file = "";
+            }
+            if (file) {
+                throw new error_1.FirebaseError(`${file}: no such file or directory`);
+            }
+            file = await pickConnectorDir();
+            query = await readQueryFromDir(file);
+        }
+    }
+    let apiClient;
+    if (emulatorHost) {
+        const url = new URL("http://placeholder");
+        url.host = emulatorHost;
+        apiClient = new apiv2_1.Client({
+            urlPrefix: url.toString(),
+            apiVersion: dataplaneClient_1.DATACONNECT_API_VERSION,
+        });
+    }
+    else {
+        await (0, requireAuth_1.requireAuth)(options);
+        apiClient = (0, dataplaneClient_2.dataconnectDataplaneClient)();
+    }
+    if (!serviceName) {
+        if (serviceId && (locationId || emulatorHost)) {
+            serviceName = `projects/${projectId}/locations/${locationId || "unused"}/services/${serviceId}`;
+        }
+        else {
+            serviceName = (await getServiceInfo()).serviceName;
+        }
+    }
+    if (!options.variables && !process.stdin.isTTY && !stdinUsedFor) {
+        options.variables = "@-";
+    }
+    const unparsedVars = await literalOrFile(options.variables, "--variables");
+    const response = await (0, dataplaneClient_1.executeGraphQL)(apiClient, serviceName, {
+        query,
+        operationName,
+        variables: parseJsonObject(unparsedVars, "--variables"),
+    });
+    let err = (0, responseToError_1.responseToError)(response, response.body);
+    if ((0, types_1.isGraphQLResponseError)(response.body)) {
+        const { status, message } = response.body.error;
+        if (!err) {
+            err = new error_1.FirebaseError(message, {
+                context: {
+                    body: response.body,
+                    response: response,
+                },
+                status: response.status,
+            });
+        }
+        if (status === "INVALID_ARGUMENT" && message.includes("operationName is required")) {
+            throw new error_1.FirebaseError(err.message + `\nHint: Append <operationName> as an argument to disambiguate.`, Object.assign(Object.assign({}, err), { original: err }));
+        }
+    }
+    if (err) {
+        throw err;
+    }
+    if (!(0, types_1.isGraphQLResponse)(response.body)) {
+        throw new error_1.FirebaseError("Got invalid response body with neither .data or .errors", {
+            context: {
+                body: response.body,
+                response: response,
+            },
+            status: response.status,
+        });
+    }
+    logger_1.logger.info(JSON.stringify(response.body, null, 2));
+    if (!response.body.data) {
+        throw new error_1.FirebaseError("GraphQL request error(s). See response body (above) for details.", {
+            context: {
+                body: response.body,
+                response: response,
+            },
+            status: response.status,
+        });
+    }
+    if (response.body.errors && response.body.errors.length > 0) {
+        throw new error_1.FirebaseError("Execution completed with error(s). See response body (above) for details.", {
+            context: {
+                body: response.body,
+                response: response,
+            },
+            status: response.status,
+        });
+    }
+    return response.body;
+    async function readQueryFromDir(dir) {
+        const opDisplay = operationName ? clc.bold(operationName) : "operation";
+        process.stderr.write(`${clc.cyan(`Executing ${opDisplay} in ${clc.bold(dir)}`)}${node_os_1.EOL}`);
+        const files = await (0, load_1.readGQLFiles)(dir);
+        const query = (0, load_1.squashGraphQL)({ files });
+        if (!query) {
+            throw new error_1.FirebaseError(`${dir} contains no GQL files or only empty ones`);
+        }
+        return query;
+    }
+    async function getServiceInfo() {
+        return (0, load_1.pickService)(projectId, options.config, serviceId || undefined).catch((e) => {
+            if (!(e instanceof error_1.FirebaseError)) {
+                return Promise.reject(e);
+            }
+            if (!serviceId) {
+                e = new error_1.FirebaseError(e.message +
+                    `\nHint: Try specifying the ${clc.yellow("--service <serviceId>")} option.`, Object.assign(Object.assign({}, e), { original: e }));
+            }
+            return Promise.reject(e);
+        });
+    }
+    async function pickConnectorDir() {
+        const serviceInfo = await getServiceInfo();
+        serviceName = serviceInfo.serviceName;
+        switch (serviceInfo.connectorInfo.length) {
+            case 1: {
+                const connector = serviceInfo.connectorInfo[0];
+                return (0, node_path_1.relative)(process.cwd(), connector.directory);
+            }
+            case 0:
+                throw new error_1.FirebaseError(`No connector found.\n` +
+                    "Hint: To execute an operation in a GraphQL file, run:\n" +
+                    `    firebase dataconnect:execute ${clc.yellow("./path/to/file.gql OPERATION_NAME")}`);
+            default: {
+                const example = (0, node_path_1.relative)(process.cwd(), serviceInfo.connectorInfo[0].directory);
+                throw new error_1.FirebaseError(`A file or directory must be explicitly specified when there are multiple connectors.\n` +
+                    "Hint: To execute an operation within a connector, try e.g.:\n" +
+                    `    firebase dataconnect:execute ${clc.yellow(`${example} OPERATION_NAME`)}`);
+            }
+        }
+    }
+});
+function parseJsonObject(json, subject) {
+    let obj;
+    try {
+        obj = JSON.parse(json || "{}");
+    }
+    catch (e) {
+        throw new error_1.FirebaseError(`expected ${subject} to be valid JSON string, got: ${json}`);
+    }
+    if (typeof obj !== "object" || obj == null)
+        throw new error_1.FirebaseError(`Provided ${subject} is not an object`);
+    return obj;
+}
+async function literalOrFile(arg, subject) {
+    let str = arg;
+    if (!str) {
+        return "";
+    }
+    if (str.startsWith("@")) {
+        if (str === "@-") {
+            if (stdinUsedFor) {
+                throw new error_1.FirebaseError(`standard input can only be used for one of ${stdinUsedFor} and ${subject}.`);
+            }
+            str = await (0, consumers_1.text)(process.stdin);
+        }
+        else {
+            str = await (0, promises_1.readFile)(str.substring(1), "utf-8");
+        }
+    }
+    return str;
+}

package/lib/commands/dataconnect-sdk-generate.js

@@ -6,28 +6,80 @@ const command_1 = require("../command");
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const projectUtils_1 = require("../projectUtils");
 const load_1 = require("../dataconnect/load");
-const logger_1 = require("../logger");
 const auth_1 = require("../auth");
 const utils_1 = require("../utils");
+const config_1 = require("../config");
+const dataconnectInit = require("../init/features/dataconnect");
+const dataconnectSdkInit = require("../init/features/dataconnect/sdk");
+const error_1 = require("../error");
+const init_1 = require("./init");
+const hub_1 = require("../emulator/hub");
 exports.command = new command_1.Command("dataconnect:sdk:generate")
     .description("generate typed SDKs for your Data Connect connectors")
     .option("--watch", "watch for changes to your connector GQL files and regenerate your SDKs when updates occur")
     .action(async (options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const serviceInfos = await (0, load_1.loadAll)(projectId, options.config);
-    const serviceInfosWithSDKs = serviceInfos.filter((serviceInfo) => serviceInfo.connectorInfo.some((c) => {
+    const projectId = (0, projectUtils_1.getProjectId)(options);
+    let justRanInit = false;
+    let config = options.config;
+    if (!config || !config.has("dataconnect")) {
+        if (options.nonInteractive) {
+            throw new error_1.FirebaseError(`No dataconnect project directory found. Please run ${clc.bold("firebase init dataconnect")} to set it up first.`);
+        }
+        (0, utils_1.logWarning)("No dataconnect project directory found.");
+        (0, utils_1.logBullet)(`Running ${clc.bold("firebase init dataconnect")} to setup a dataconnect project directory.`);
+        if (!config) {
+            const cwd = options.cwd || process.cwd();
+            config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
+        }
+        const setup = {
+            config: config.src,
+            projectId: projectId,
+            rcfile: options.rc.data,
+            featureInfo: {
+                dataconnectSource: "gen_sdk_init",
+            },
+            instructions: [],
+        };
+        await dataconnectInit.askQuestions(setup);
+        await dataconnectInit.actuate(setup, config, options);
+        await (0, init_1.postInitSaves)(setup, config);
+        justRanInit = true;
+        options.config = config;
+    }
+    let serviceInfosWithSDKs = await loadAllWithSDKs(projectId, config);
+    if (!serviceInfosWithSDKs.length) {
+        if (justRanInit || options.nonInteractive) {
+            throw new error_1.FirebaseError(`No generated SDKs are configured during init. Please run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+        }
+        (0, utils_1.logWarning)("No generated SDKs have been configured.");
+        (0, utils_1.logBullet)(`Running ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+        const setup = {
+            config: config.src,
+            projectId: projectId,
+            rcfile: options.rc.data,
+            featureInfo: {
+                dataconnectSource: "gen_sdk_init_sdk",
+            },
+            instructions: [],
+        };
+        await dataconnectSdkInit.askQuestions(setup);
+        await dataconnectSdkInit.actuate(setup, config);
+        justRanInit = true;
+        serviceInfosWithSDKs = await loadAllWithSDKs(projectId, config);
+    }
+    await generateSDKsInAll(options, serviceInfosWithSDKs, justRanInit);
+});
+async function loadAllWithSDKs(projectId, config) {
+    const serviceInfos = await (0, load_1.loadAll)(projectId || hub_1.EmulatorHub.MISSING_PROJECT_PLACEHOLDER, config);
+    return serviceInfos.filter((serviceInfo) => serviceInfo.connectorInfo.some((c) => {
         var _a, _b, _c, _d;
         return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
             ((_b = c.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.kotlinSdk) ||
             ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk) ||
             ((_d = c.connectorYaml.generate) === null || _d === void 0 ? void 0 : _d.dartSdk));
     }));
-    if (!serviceInfosWithSDKs.length) {
-        logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
-        logger_1.logger.warn(`Run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
-        logger_1.logger.warn(`See https://firebase.google.com/docs/data-connect/web-sdk for more details of how to configure generated SDKs.`);
-        return;
-    }
+}
+async function generateSDKsInAll(options, serviceInfosWithSDKs, justRanInit) {
     async function generateSDK(serviceInfo) {
         return dataconnectEmulator_1.DataConnectEmulator.generate({
             configDir: serviceInfo.sourceDirectory,
@@ -39,10 +91,13 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
         await Promise.race(serviceInfosWithSDKs.map(generateSDK));
     }
     else {
+        if (justRanInit) {
+            return;
+        }
         for (const s of serviceInfosWithSDKs) {
             await generateSDK(s);
         }
         const services = serviceInfosWithSDKs.map((s) => s.dataConnectYaml.serviceId).join(", ");
         (0, utils_1.logLabeledSuccess)("dataconnect", `Successfully Generated SDKs for services: ${clc.bold(services)}`);
     }
-});
+}

package/lib/commands/firestore-backups-delete.js

@@ -33,11 +33,6 @@ exports.command = new command_1.Command("firestore:backups:delete <backup>")
     catch (err) {
         throw new error_1.FirebaseError(`Failed to delete the backup ${backupName}`, { original: err });
     }
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(backup, undefined, 2));
-    }
-    else {
-        logger_1.logger.info(clc.bold(`Successfully deleted ${clc.yellow(backupName)}`));
-    }
+    logger_1.logger.info(clc.bold(`Successfully deleted ${clc.yellow(backupName)}`));
     return backup;
 });

package/lib/commands/firestore-backups-get.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
@@ -12,14 +11,9 @@ exports.command = new command_1.Command("firestore:backups:get <backup>")
     .description("get a Cloud Firestore database backup")
     .before(requirePermissions_1.requirePermissions, ["datastore.backups.get"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
-    .action(async (backupName, options) => {
+    .action(async (backupName) => {
     const backup = await (0, firestore_1.getBackup)(backupName);
     const printer = new pretty_print_1.PrettyPrint();
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(backup, undefined, 2));
-    }
-    else {
-        printer.prettyPrintBackup(backup);
-    }
+    printer.prettyPrintBackup(backup);
     return backup;
 });

package/lib/commands/firestore-backups-list.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
@@ -20,15 +19,10 @@ exports.command = new command_1.Command("firestore:backups:list")
     const location = (_a = options.location) !== null && _a !== void 0 ? _a : "-";
     const listBackupsResponse = await (0, firestore_1.listBackups)(options.project, location);
     const backups = listBackupsResponse.backups || [];
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(listBackupsResponse, undefined, 2));
-    }
-    else {
-        printer.prettyPrintBackups(backups);
-        if (listBackupsResponse.unreachable && listBackupsResponse.unreachable.length > 0) {
-            (0, utils_1.logWarning)("We were not able to reach the following locations: " +
-                listBackupsResponse.unreachable.join(", "));
-        }
+    printer.prettyPrintBackups(backups);
+    if (listBackupsResponse.unreachable && listBackupsResponse.unreachable.length > 0) {
+        (0, utils_1.logWarning)("We were not able to reach the following locations: " +
+            listBackupsResponse.unreachable.join(", "));
     }
     return backups;
 });

package/lib/commands/firestore-backups-schedules-create.js

@@ -54,11 +54,6 @@ exports.command = new command_1.Command("firestore:backups:schedules:create")
         };
     }
     const backupSchedule = await (0, firestore_1.createBackupSchedule)(options.project, databaseId, retention, dailyRecurrence, weeklyRecurrence);
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(backupSchedule, undefined, 2));
-    }
-    else {
-        logger_1.logger.info(clc.bold(`Successfully created ${printer.prettyBackupScheduleString(backupSchedule)}`));
-    }
+    logger_1.logger.info(clc.bold(`Successfully created ${printer.prettyBackupScheduleString(backupSchedule)}`));
     return backupSchedule;
 });

package/lib/commands/firestore-backups-schedules-delete.js

@@ -35,11 +35,6 @@ exports.command = new command_1.Command("firestore:backups:schedules:delete <bac
             original: err,
         });
     }
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(backupSchedule, undefined, 2));
-    }
-    else {
-        logger_1.logger.info(clc.bold(`Successfully deleted ${clc.yellow(backupScheduleName)}`));
-    }
+    logger_1.logger.info(clc.bold(`Successfully deleted ${clc.yellow(backupScheduleName)}`));
     return backupSchedule;
 });

package/lib/commands/firestore-backups-schedules-list.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
@@ -18,11 +17,6 @@ exports.command = new command_1.Command("firestore:backups:schedules:list")
     const printer = new pretty_print_1.PrettyPrint();
     const databaseId = (_a = options.database) !== null && _a !== void 0 ? _a : "(default)";
     const backupSchedules = await (0, firestore_1.listBackupSchedules)(options.project, databaseId);
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(backupSchedules, undefined, 2));
-    }
-    else {
-        printer.prettyPrintBackupSchedules(backupSchedules, databaseId);
-    }
+    printer.prettyPrintBackupSchedules(backupSchedules, databaseId);
     return backupSchedules;
 });

package/lib/commands/firestore-backups-schedules-update.js

@@ -24,11 +24,6 @@ exports.command = new command_1.Command("firestore:backups:schedules:update <bac
     }
     const retention = (0, backupUtils_1.calculateRetention)(options.retention);
     const backupSchedule = await (0, firestore_1.updateBackupSchedule)(backupScheduleName, retention);
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(backupSchedule, undefined, 2));
-    }
-    else {
-        logger_1.logger.info(clc.bold(`Successfully updated ${printer.prettyBackupScheduleString(backupSchedule)}`));
-    }
+    logger_1.logger.info(clc.bold(`Successfully updated ${printer.prettyBackupScheduleString(backupSchedule)}`));
     return backupSchedule;
 });

package/lib/commands/firestore-bulkdelete.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const fsi = require("../firestore/api");
-const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
@@ -54,20 +53,15 @@ exports.command = new command_1.Command("firestore:bulkdelete")
         return utils.reject("Command aborted.", { exit: 1 });
     }
     const op = await api.bulkDeleteDocuments(options.project, databaseId, collectionIds);
-    if (options.json) {
-        logger_1.logger.info(JSON.stringify(op, undefined, 2));
+    if (op.name) {
+        (0, utils_1.logSuccess)(`Successfully started bulk delete operation.`);
+        (0, utils_1.logBullet)(`Operation name: ` + clc.cyan(op.name));
+        (0, utils_1.logBullet)("You can monitor the operation's progress using the " +
+            clc.cyan(`gcloud firestore operations describe`) +
+            ` command.`);
     }
     else {
-        if (op.name) {
-            (0, utils_1.logSuccess)(`Successfully started bulk delete operation.`);
-            (0, utils_1.logBullet)(`Operation name: ` + clc.cyan(op.name));
-            (0, utils_1.logBullet)("You can monitor the operation's progress using the " +
-                clc.cyan(`gcloud firestore operations describe`) +
-                ` command.`);
-        }
-        else {
-            (0, utils_1.logLabeledError)(`Bulk Delete:`, `Failed to start a bulk delete operation.`);
-        }
+        (0, utils_1.logLabeledError)(`Bulk Delete:`, `Failed to start a bulk delete operation.`);
     }
     return op;
 });