firebase-tools 14.15.1 → 14.16.0

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

@@ -8,37 +8,41 @@ 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");
 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);
-    for (const serviceInfo of serviceInfos) {
-        const configDir = serviceInfo.sourceDirectory;
-        const hasGeneratables = 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));
+    const serviceInfosWithSDKs = 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 generateSDK(serviceInfo) {
+        return dataconnectEmulator_1.DataConnectEmulator.generate({
+            configDir: serviceInfo.sourceDirectory,
+            watch: options.watch,
+            account: (0, auth_1.getProjectDefaultAccount)(options.projectRoot),
         });
-        if (!hasGeneratables) {
-            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;
-        }
-        for (const conn of serviceInfo.connectorInfo) {
-            const account = (0, auth_1.getProjectDefaultAccount)(options.projectRoot);
-            const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
-                configDir,
-                connectorId: conn.connectorYaml.connectorId,
-                watch: options.watch,
-                account,
-            });
-            logger_1.logger.info(output);
-            logger_1.logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);
+    }
+    if (options.watch) {
+        await Promise.race(serviceInfosWithSDKs.map(generateSDK));
+    }
+    else {
+        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-bulkdelete.js

@@ -0,0 +1,73 @@
+"use strict";
+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");
+const prompt_1 = require("../prompt");
+const utils = require("../utils");
+const clc = require("colorette");
+const utils_1 = require("../utils");
+const error_1 = require("../error");
+function confirmationMessage(options, databaseId, collectionIds) {
+    const root = `projects/${options.project}/databases/${databaseId}/documents`;
+    return ("You are about to delete all documents in the following collection groups: " +
+        clc.cyan(collectionIds.map((item) => `"${item}"`).join(", ")) +
+        " in " +
+        clc.cyan(`"${root}"`) +
+        ". Are you sure?");
+}
+exports.command = new command_1.Command("firestore:bulkdelete")
+    .description("managed bulk delete service to delete data from one or more collection groups")
+    .option("--database <databaseName>", 'Database ID for database to delete from. "(default)" if none is provided.')
+    .option("--collection-ids <collectionIds>", "A comma-separated list of collection group IDs to delete. Deletes all documents in the specified collection groups.")
+    .before(requirePermissions_1.requirePermissions, ["datastore.databases.bulkDeleteDocuments"])
+    .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
+    .action(async (options) => {
+    if (!options.collectionIds) {
+        throw new error_1.FirebaseError("Missing required flag --collection-ids=[comma separated list of collection groups]");
+    }
+    let collectionIds = [];
+    try {
+        collectionIds = options.collectionIds
+            .split(",")
+            .filter((id) => id.trim() !== "");
+    }
+    catch (e) {
+        throw new error_1.FirebaseError("The value for --collection-ids must a list of comma separated collection group names");
+    }
+    if (collectionIds.length === 0) {
+        throw new error_1.FirebaseError("Must specify at least one collection ID in --collection-ids.");
+    }
+    const databaseId = options.database || "(default)";
+    const api = new fsi.FirestoreApi();
+    const confirmed = await (0, prompt_1.confirm)({
+        message: confirmationMessage(options, databaseId, collectionIds),
+        default: false,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
+    if (!confirmed) {
+        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));
+    }
+    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.`);
+        }
+    }
+    return op;
+});

package/lib/commands/firestore-operations-cancel.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const fsi = require("../firestore/api");
+const types_1 = require("../emulator/types");
+const commandUtils_1 = require("../emulator/commandUtils");
+const firestore_utils_1 = require("./firestore-utils");
+const prompt_1 = require("../prompt");
+const clc = require("colorette");
+const utils = require("../utils");
+const logger_1 = require("../logger");
+exports.command = new command_1.Command("firestore:operations:cancel <operationName>")
+    .description("cancels a long-running Cloud Firestore admin operation")
+    .option("--database <databaseName>", 'Database ID for which the operation is running. "(default)" if none is provided.')
+    .option("--force", "Forces the operation cancellation without asking for confirmation")
+    .before(commandUtils_1.errorMissingProject)
+    .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
+    .action(async (operationName, options) => {
+    const databaseId = options.database || "(default)";
+    operationName = (0, firestore_utils_1.getShortOperationName)(operationName);
+    if (!options.force) {
+        const fullName = `/projects/${options.project}/databases/${databaseId}/operations/${operationName}`;
+        const confirmMessage = `You are about to cancel the operation: ${clc.bold(clc.yellow(clc.underline(fullName)))}. Do you wish to continue?`;
+        const consent = await (0, prompt_1.confirm)(confirmMessage);
+        if (!consent) {
+            return utils.reject("Command aborted.", { exit: 1 });
+        }
+    }
+    const api = new fsi.FirestoreApi();
+    const status = await api.cancelOperation(options.project, databaseId, operationName);
+    if (options.json) {
+        logger_1.logger.info(JSON.stringify(status, undefined, 2));
+    }
+    else {
+        if (status.success) {
+            utils.logSuccess("Operation cancelled successfully.");
+        }
+        else {
+            utils.logWarning("Canceling the operation failed.");
+        }
+    }
+    return status;
+});

package/lib/commands/firestore-operations-describe.js

@@ -0,0 +1,29 @@
+"use strict";
+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 types_1 = require("../emulator/types");
+const commandUtils_1 = require("../emulator/commandUtils");
+const pretty_print_1 = require("../firestore/pretty-print");
+const firestore_utils_1 = require("./firestore-utils");
+exports.command = new command_1.Command("firestore:operations:describe <operationName>")
+    .description("retrieves information about a Cloud Firestore admin operation")
+    .option("--database <databaseName>", 'Database ID for which the operation is running. "(default)" if none is provided.')
+    .before(commandUtils_1.errorMissingProject)
+    .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
+    .action(async (operationName, options) => {
+    const databaseId = options.database || "(default)";
+    operationName = (0, firestore_utils_1.getShortOperationName)(operationName);
+    const api = new fsi.FirestoreApi();
+    const operation = await api.describeOperation(options.project, databaseId, operationName);
+    if (options.json) {
+        logger_1.logger.info(JSON.stringify(operation, undefined, 2));
+    }
+    else {
+        const printer = new pretty_print_1.PrettyPrint();
+        printer.prettyPrintOperation(operation);
+    }
+    return operation;
+});

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

@@ -0,0 +1,29 @@
+"use strict";
+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 types_1 = require("../emulator/types");
+const commandUtils_1 = require("../emulator/commandUtils");
+const pretty_print_1 = require("../firestore/pretty-print");
+exports.command = new command_1.Command("firestore:operations:list")
+    .description("list pending Cloud Firestore admin operations and their status")
+    .option("--database <databaseName>", 'Database ID for database to list operations for. "(default)" if none is provided.')
+    .option("--limit <number>", "The maximum number of operations to list. Uses 100 by default.")
+    .before(commandUtils_1.errorMissingProject)
+    .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
+    .action(async (options) => {
+    const databaseId = options.database || "(default)";
+    const limit = options.limit === undefined ? 100 : Number(options.limit);
+    const api = new fsi.FirestoreApi();
+    const { operations } = await api.listOperations(options.project, databaseId, limit);
+    if (options.json) {
+        logger_1.logger.info(JSON.stringify(operations, undefined, 2));
+    }
+    else {
+        const printer = new pretty_print_1.PrettyPrint();
+        printer.prettyPrintOperations(operations);
+    }
+    return operations;
+});

package/lib/commands/firestore-utils.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getShortOperationName = void 0;
+const error_1 = require("../error");
+function getShortOperationName(operationName) {
+    let opName = operationName;
+    if (operationName.includes("/operations/")) {
+        opName = operationName.split("/operations/")[1];
+    }
+    if (opName.length === 0 || opName.includes("/")) {
+        throw new error_1.FirebaseError(`"${operationName}" is not a valid operation name.`);
+    }
+    return opName;
+}
+exports.getShortOperationName = getShortOperationName;

package/lib/commands/functions-config-export.js

@@ -78,7 +78,10 @@ exports.command = new command_1.Command("functions:config:export")
     .before(requireInteractive_1.default)
     .action(async (options) => {
     const config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
-    const functionsDir = config.source;
+    const configDir = (0, projectConfig_1.resolveConfigDir)(config);
+    if (!configDir) {
+        throw new error_1.FirebaseError("functions:config:export requires a local env directory. Set functions[].configDir in firebase.json when using remoteSource.");
+    }
     let pInfos = configExport.getProjectInfos(options);
     checkReservedAliases(pInfos);
     (0, utils_1.logBullet)("Importing functions configs from projects [" +
@@ -111,6 +114,6 @@ exports.command = new command_1.Command("functions:config:export")
     filesToWrite[".env"] =
         `${header}# .env file contains environment variables that applies to all projects.\n`;
     for (const [filename, content] of Object.entries(filesToWrite)) {
-        await options.config.askWriteProjectFile(path.join(functionsDir, filename), content);
+        await options.config.askWriteProjectFile(path.join(configDir, filename), content);
     }
 });

package/lib/commands/index.js

@@ -96,8 +96,13 @@ function load(client) {
     client.ext.dev.usage = loadCommand("ext-dev-usage");
     client.firestore = {};
     client.firestore.delete = loadCommand("firestore-delete");
+    client.firestore.bulkDelete = loadCommand("firestore-bulkdelete");
     client.firestore.indexes = loadCommand("firestore-indexes-list");
     client.firestore.locations = loadCommand("firestore-locations");
+    client.firestore.operations = {};
+    client.firestore.operations.cancel = loadCommand("firestore-operations-cancel");
+    client.firestore.operations.describe = loadCommand("firestore-operations-describe");
+    client.firestore.operations.list = loadCommand("firestore-operations-list");
     client.firestore.databases = {};
     client.firestore.databases.list = loadCommand("firestore-databases-list");
     client.firestore.databases.get = loadCommand("firestore-databases-get");

package/lib/config.js

@@ -42,13 +42,25 @@ class Config {
         });
         if (this.get("functions")) {
             if (this.projectDir && fsutils.dirExistsSync(this.path(Config.DEFAULT_FUNCTIONS_SOURCE))) {
-                if (Array.isArray(this.get("functions"))) {
-                    if (!this.get("functions.[0].source")) {
-                        this.set("functions.[0].source", Config.DEFAULT_FUNCTIONS_SOURCE);
+                const funcs = this.get("functions");
+                if (Array.isArray(funcs)) {
+                    let emptyIdx;
+                    for (let i = 0; i < funcs.length; i++) {
+                        const hasSource = this.get(`functions.[${i}].source`);
+                        const hasRemote = this.get(`functions.[${i}].remoteSource`);
+                        if (!hasSource && !hasRemote) {
+                            emptyIdx = i;
+                            break;
+                        }
+                    }
+                    if (emptyIdx !== undefined) {
+                        this.set(`functions.[${emptyIdx}].source`, Config.DEFAULT_FUNCTIONS_SOURCE);
                     }
                 }
                 else {
-                    if (!this.get("functions.source")) {
+                    const hasSource = this.get("functions.source");
+                    const hasRemote = this.get("functions.remoteSource");
+                    if (!hasSource && !hasRemote) {
                         this.set("functions.source", Config.DEFAULT_FUNCTIONS_SOURCE);
                     }
                 }

package/lib/dataconnect/ensureApis.js

@@ -4,10 +4,10 @@ exports.ensureGIFApis = exports.ensureApis = void 0;
 const api = require("../api");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const prefix = "dataconnect";
-async function ensureApis(projectId) {
+async function ensureApis(projectId, silent = false) {
     await Promise.all([
-        (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix),
-        (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix),
+        (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix, silent),
+        (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix, silent),
     ]);
 }
 exports.ensureApis = ensureApis;

package/lib/deploy/functions/build.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyPrefix = exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
-const api = require("../../.../../api");
+const api = require("../../api");
 const params = require("./params");
 const error_1 = require("../../error");
 const functional_1 = require("../../functional");
-const env_1 = require("../../functions/env");
 const cel_1 = require("./cel");
 function empty() {
     return {
@@ -56,17 +55,7 @@ exports.AllIngressSettings = [
     "ALLOW_INTERNAL_AND_GCLB",
 ];
 async function resolveBackend(opts) {
-    let paramValues = {};
-    paramValues = await params.resolveParams(opts.build.params, opts.firebaseConfig, envWithTypes(opts.build.params, opts.userEnvs), opts.nonInteractive, opts.isEmulator);
-    const toWrite = {};
-    for (const paramName of Object.keys(paramValues)) {
-        const paramValue = paramValues[paramName];
-        if (Object.prototype.hasOwnProperty.call(opts.userEnvs, paramName) || paramValue.internal) {
-            continue;
-        }
-        toWrite[paramName] = paramValue.toString();
-    }
-    (0, env_1.writeUserEnvs)(toWrite, opts.userEnvOpt);
+    const paramValues = await params.resolveParams(opts.build.params, opts.firebaseConfig, envWithTypes(opts.build.params, opts.userEnvs), opts.nonInteractive, opts.isEmulator);
     return { backend: toBackend(opts.build, paramValues), envs: paramValues };
 }
 exports.resolveBackend = resolveBackend;

package/lib/deploy/functions/deploy.js

@@ -51,7 +51,7 @@ async function uploadSourceV2(projectId, source, wantBackend) {
     return res.storageSource;
 }
 async function uploadCodebase(context, codebase, wantBackend) {
-    var _a;
+    var _a, _b, _c, _d;
     const source = (_a = context.sources) === null || _a === void 0 ? void 0 : _a[codebase];
     if (!source || (!source.functionsSourceV1 && !source.functionsSourceV2)) {
         return;
@@ -67,9 +67,10 @@ async function uploadCodebase(context, codebase, wantBackend) {
         if (storage) {
             source.storage = storage;
         }
-        const sourceDir = (0, projectConfig_1.configForCodebase)(context.config, codebase).source;
+        const cfg = (0, projectConfig_1.configForCodebase)(context.config, codebase);
+        const label = (_d = (_b = cfg.source) !== null && _b !== void 0 ? _b : (_c = cfg.remoteSource) === null || _c === void 0 ? void 0 : _c.dir) !== null && _d !== void 0 ? _d : "remote";
         if (uploads.length) {
-            (0, utils_1.logSuccess)(`${clc.green(clc.bold("functions:"))} ${clc.bold(sourceDir)} folder uploaded successfully`);
+            (0, utils_1.logLabeledSuccess)("functions", `${clc.bold(label)} source uploaded successfully`);
         }
     }
     catch (err) {

package/lib/deploy/functions/prepare.js

@@ -59,6 +59,7 @@ async function prepare(context, options, payload) {
     if (allowFunctionsConfig && checkAPIsEnabled[1]) {
         runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
     }
+    context.hasRuntimeConfig = Object.keys(runtimeConfig).some((k) => k !== "firebase");
     const wantBuilds = await loadCodebases(context.config, options, firebaseConfig, runtimeConfig, context.filters);
     if (Object.values(wantBuilds).some((b) => b.extensions)) {
         const extContext = {};
@@ -72,22 +73,23 @@ async function prepare(context, options, payload) {
     for (const [codebase, wantBuild] of Object.entries(wantBuilds)) {
         const config = (0, projectConfig_1.configForCodebase)(context.config, codebase);
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
+        const localCfg = (0, projectConfig_1.requireLocal)(config, "Remote sources are not supported.");
         const userEnvOpt = {
-            functionsSource: options.config.path(config.source),
+            functionsSource: options.config.path(localCfg.source),
             projectId: projectId,
             projectAlias: options.projectAlias,
         };
-        proto.convertIfPresent(userEnvOpt, config, "configDir", (cd) => options.config.path(cd));
+        proto.convertIfPresent(userEnvOpt, localCfg, "configDir", (cd) => options.config.path(cd));
         const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
         const envs = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
         const { backend: wantBackend, envs: resolvedEnvs } = await build.resolveBackend({
             build: wantBuild,
             firebaseConfig,
-            userEnvOpt,
             userEnvs,
             nonInteractive: options.nonInteractive,
             isEmulator: false,
         });
+        functionsEnv.writeResolvedParams(resolvedEnvs, userEnvs, userEnvOpt);
         let hasEnvsFromParams = false;
         wantBackend.environmentVariables = envs;
         for (const envName of Object.keys(resolvedEnvs)) {
@@ -141,20 +143,21 @@ async function prepare(context, options, payload) {
     validate.endpointsAreUnique(wantBackends);
     context.sources = {};
     for (const [codebase, wantBackend] of Object.entries(wantBackends)) {
-        const config = (0, projectConfig_1.configForCodebase)(context.config, codebase);
-        const sourceDirName = config.source;
+        const cfg = (0, projectConfig_1.configForCodebase)(context.config, codebase);
+        const localCfg = (0, projectConfig_1.requireLocal)(cfg, "Remote sources are not supported.");
+        const sourceDirName = localCfg.source;
         const sourceDir = options.config.path(sourceDirName);
         const source = {};
         if (backend.someEndpoint(wantBackend, () => true)) {
             (0, utils_1.logLabeledBullet)("functions", `preparing ${clc.bold(sourceDirName)} directory for uploading...`);
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
-            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, config);
+            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, localCfg);
             source.functionsSourceV2 = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.pathToSource;
             source.functionsSourceV2Hash = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.hash;
         }
         if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
-            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, config, runtimeConfig);
+            const packagedSource = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, localCfg, runtimeConfig);
             source.functionsSourceV1 = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.pathToSource;
             source.functionsSourceV1Hash = packagedSource === null || packagedSource === void 0 ? void 0 : packagedSource.hash;
         }

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -6,7 +6,7 @@ const fs = require("fs");
 const path = require("path");
 const yaml = require("yaml");
 const logger_1 = require("../../../../logger");
-const api = require("../../.../../../../api");
+const api = require("../../../../api");
 const v1alpha1 = require("./v1alpha1");
 const error_1 = require("../../../../error");
 const TIMEOUT_OVERRIDE_ENV_VAR = "FUNCTIONS_DISCOVERY_TIMEOUT";

package/lib/emulator/auth/operations.js

@@ -1512,7 +1512,16 @@ async function mfaSignInFinalize(state, reqBody) {
     (0, errors_1.assert)(sessionInfo, "MISSING_SESSION_INFO");
     const phoneNumber = verifyPhoneNumber(state, sessionInfo, code);
     let { user, signInProvider } = parsePendingCredential(state, reqBody.mfaPendingCredential);
-    const enrollment = (_b = user.mfaInfo) === null || _b === void 0 ? void 0 : _b.find((enrollment) => enrollment.unobfuscatedPhoneInfo === phoneNumber);
+    const enrollment = (_b = user.mfaInfo) === null || _b === void 0 ? void 0 : _b.find((enrollment) => {
+        if (enrollment.unobfuscatedPhoneInfo === phoneNumber) {
+            return true;
+        }
+        if (!!enrollment.unobfuscatedPhoneInfo &&
+            obfuscatePhoneNumber(enrollment.unobfuscatedPhoneInfo) === phoneNumber) {
+            return true;
+        }
+        return false;
+    });
     const { updates, extraClaims } = await fetchBlockingFunction(state, state_1.BlockingFunctionEvents.BEFORE_SIGN_IN, user, { signInMethod: signInProvider, signInSecondFactor: "phone" });
     user = state.updateUserByLocalId(user.localId, Object.assign(Object.assign({}, updates), { lastLoginAt: Date.now().toString() }));
     (0, errors_1.assert)(enrollment && enrollment.mfaEnrollmentId, "MFA_ENROLLMENT_NOT_FOUND");

package/lib/emulator/commandUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JAVA_DEPRECATION_WARNING = exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = exports.checkJavaMajorVersion = exports.emulatorExec = exports.getListenOverview = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DEFAULT_CONFIG = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.DESC_VERBOSITY = exports.FLAG_VERBOSITY = exports.FLAG_VERBOSITY_NAME = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
+exports.JAVA_DEPRECATION_WARNING = exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = exports.checkJavaMajorVersion = exports.emulatorExec = exports.getListenOverview = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.errorMissingProject = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DEFAULT_CONFIG = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.DESC_VERBOSITY = exports.FLAG_VERBOSITY = exports.FLAG_VERBOSITY_NAME = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
 const clc = require("colorette");
 const childProcess = require("child_process");
 const controller = require("../emulator/controller");
@@ -86,6 +86,12 @@ async function warnEmulatorNotSupported(options, emulator) {
     }
 }
 exports.warnEmulatorNotSupported = warnEmulatorNotSupported;
+async function errorMissingProject(options) {
+    if (!options.project) {
+        throw new error_1.FirebaseError("Project is not defined. Either use `--project` or use `firebase use` to set your active project.");
+    }
+}
+exports.errorMissingProject = errorMissingProject;
 async function beforeEmulatorCommand(options) {
     const optionsWithDefaultConfig = Object.assign(Object.assign({}, options), { config: exports.DEFAULT_CONFIG });
     const optionsWithConfig = options.config ? options : optionsWithDefaultConfig;