firebase-tools 15.0.0 → 15.2.0

package/lib/apphosting/app.js

@@ -13,7 +13,6 @@ exports.webApps = {
     generateWebAppName,
 };
 async function getOrCreateWebApp(projectId, firebaseWebAppId, backendId) {
-    var _a;
     const webAppsInProject = await (0, apps_1.listFirebaseApps)(projectId, apps_1.AppPlatform.WEB);
     if (firebaseWebAppId) {
         const webApp = webAppsInProject.find((app) => app.appId === firebaseWebAppId);
@@ -21,7 +20,7 @@ async function getOrCreateWebApp(projectId, firebaseWebAppId, backendId) {
             throw new error_1.FirebaseError(`The web app '${firebaseWebAppId}' does not exist in project ${projectId}`);
         }
         return {
-            name: (_a = webApp.displayName) !== null && _a !== void 0 ? _a : webApp.appId,
+            name: webApp.displayName ?? webApp.appId,
             id: webApp.appId,
         };
     }
@@ -56,19 +55,15 @@ async function generateWebAppName(projectId, backendId) {
     return webAppName;
 }
 function firebaseAppsToMap(apps) {
-    return new Map(apps.map((obj) => {
-        var _a;
-        return [
-            (_a = obj.displayName) !== null && _a !== void 0 ? _a : obj.appId,
-            obj.appId,
-        ];
-    }));
+    return new Map(apps.map((obj) => [
+        obj.displayName ?? obj.appId,
+        obj.appId,
+    ]));
 }
 function isQuotaError(error) {
-    var _a, _b, _c, _d, _e;
     const original = error.original;
-    const code = (original === null || original === void 0 ? void 0 : original.status) ||
-        ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) ||
-        ((_e = (_d = (_c = original === null || original === void 0 ? void 0 : original.context) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.error) === null || _e === void 0 ? void 0 : _e.code);
+    const code = original?.status ||
+        original?.context?.response?.statusCode ||
+        original?.context?.body?.error?.code;
     return code === 429;
 }

package/lib/apphosting/backend.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackend = exports.getBackendForAmbiguousLocation = exports.chooseBackends = exports.promptExistingBackend = exports.getBackendForLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.setDefaultTrafficPolicy = exports.createBackend = exports.promptNewBackendId = exports.ensureAppHostingComputeServiceAccount = exports.createGitRepoLink = exports.ensureRequiredApisEnabled = exports.doSetupSourceDeploy = exports.doSetup = void 0;
+exports.doSetup = doSetup;
+exports.doSetupSourceDeploy = doSetupSourceDeploy;
+exports.ensureRequiredApisEnabled = ensureRequiredApisEnabled;
+exports.createGitRepoLink = createGitRepoLink;
+exports.ensureAppHostingComputeServiceAccount = ensureAppHostingComputeServiceAccount;
+exports.promptNewBackendId = promptNewBackendId;
+exports.createBackend = createBackend;
+exports.setDefaultTrafficPolicy = setDefaultTrafficPolicy;
+exports.deleteBackendAndPoll = deleteBackendAndPoll;
+exports.promptLocation = promptLocation;
+exports.getBackendForLocation = getBackendForLocation;
+exports.promptExistingBackend = promptExistingBackend;
+exports.chooseBackends = chooseBackends;
+exports.getBackendForAmbiguousLocation = getBackendForAmbiguousLocation;
+exports.getBackend = getBackend;
 const clc = require("colorette");
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
@@ -28,15 +42,14 @@ const apphostingPollerOptions = {
     maxBackoff: 10000,
 };
 async function tlsReady(url) {
-    var _a;
     try {
         await (0, node_fetch_1.default)(url);
         return true;
     }
     catch (err) {
         const maybeNodeError = err;
-        if (/HANDSHAKE_FAILURE/.test((_a = maybeNodeError === null || maybeNodeError === void 0 ? void 0 : maybeNodeError.cause) === null || _a === void 0 ? void 0 : _a.code) ||
-            "EPROTO" === (maybeNodeError === null || maybeNodeError === void 0 ? void 0 : maybeNodeError.code)) {
+        if (/HANDSHAKE_FAILURE/.test(maybeNodeError?.cause?.code) ||
+            "EPROTO" === maybeNodeError?.code) {
             return false;
         }
         return true;
@@ -89,7 +102,7 @@ async function doSetup(projectId, nonInteractive, webAppName, backendId, service
         (0, utils_1.logWarning)(`Firebase web app not set`);
     }
     const createBackendSpinner = ora("Creating your new backend...").start();
-    const backend = await createBackend(projectId, location, backendId, serviceAccount ? serviceAccount : null, gitRepositoryLink, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
+    const backend = await createBackend(projectId, location, backendId, serviceAccount ? serviceAccount : null, gitRepositoryLink, webApp?.id, rootDir);
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     if (nonInteractive) {
         return;
@@ -130,7 +143,6 @@ async function doSetup(projectId, nonInteractive, webAppName, backendId, service
     }
     (0, utils_1.logSuccess)(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
 }
-exports.doSetup = doSetup;
 async function doSetupSourceDeploy(projectId, backendId) {
     const location = await promptLocation(projectId, "Select a primary region to host your backend:\n");
     const webAppSpinner = ora("Creating a new web app...\n").start();
@@ -140,14 +152,13 @@ async function doSetupSourceDeploy(projectId, backendId) {
     }
     webAppSpinner.stop();
     const createBackendSpinner = ora("Creating your new backend...").start();
-    const backend = await createBackend(projectId, location, backendId, null, undefined, webApp === null || webApp === void 0 ? void 0 : webApp.id);
+    const backend = await createBackend(projectId, location, backendId, null, undefined, webApp?.id);
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     return {
         backend,
         location,
     };
 }
-exports.doSetupSourceDeploy = doSetupSourceDeploy;
 async function ensureRequiredApisEnabled(projectId) {
     await Promise.all([
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.developerConnectOrigin)(), "apphosting", true),
@@ -158,7 +169,6 @@ async function ensureRequiredApisEnabled(projectId) {
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.iamOrigin)(), "apphosting", true),
     ]);
 }
-exports.ensureRequiredApisEnabled = ensureRequiredApisEnabled;
 async function createGitRepoLink(projectId, location, connectionId) {
     await Promise.all([
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.developerConnectOrigin)(), "apphosting", true),
@@ -176,7 +186,6 @@ async function createGitRepoLink(projectId, location, connectionId) {
             (await promptLocation(projectId, "Select a location for your GitRepoLink's connection:\n"));
     await githubConnections.linkGitHubRepository(projectId, location, connectionId);
 }
-exports.createGitRepoLink = createGitRepoLink;
 async function ensureAppHostingComputeServiceAccount(projectId, serviceAccount) {
     const sa = serviceAccount || defaultComputeServiceAccountEmail(projectId);
     const name = `projects/${projectId}/serviceAccounts/${sa}`;
@@ -196,7 +205,6 @@ async function ensureAppHostingComputeServiceAccount(projectId, serviceAccount)
     }
     await provisionDefaultComputeServiceAccount(projectId);
 }
-exports.ensureAppHostingComputeServiceAccount = ensureAppHostingComputeServiceAccount;
 async function promptNewBackendId(projectId, location) {
     while (true) {
         const backendId = await (0, prompt_1.input)({
@@ -216,7 +224,6 @@ async function promptNewBackendId(projectId, location) {
         (0, utils_1.logWarning)(`Backend with id ${backendId} already exists in ${location}`);
     }
 }
-exports.promptNewBackendId = promptNewBackendId;
 function defaultComputeServiceAccountEmail(projectId) {
     return `${DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME}@${projectId}.iam.gserviceaccount.com`;
 }
@@ -236,11 +243,14 @@ async function createBackend(projectId, location, backendId, serviceAccount, rep
     };
     async function createBackendAndPoll() {
         const op = await apphosting.createBackend(projectId, location, backendReqBody, backendId);
-        return await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
+        return await poller.pollOperation({
+            ...apphostingPollerOptions,
+            pollerName: `create-${projectId}-${location}-${backendId}`,
+            operationResourceName: op.name,
+        });
     }
     return await createBackendAndPoll();
 }
-exports.createBackend = createBackend;
 async function provisionDefaultComputeServiceAccount(projectId) {
     try {
         await iam.createServiceAccount(projectId, DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME, "Default service account used to run builds and deploys for Firebase App Hosting", "Firebase App Hosting compute service account");
@@ -274,14 +284,20 @@ async function setDefaultTrafficPolicy(projectId, location, backendId, codebaseB
         },
     };
     const op = await apphosting.updateTraffic(projectId, location, backendId, traffic);
-    await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `updateTraffic-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
+    await poller.pollOperation({
+        ...apphostingPollerOptions,
+        pollerName: `updateTraffic-${projectId}-${location}-${backendId}`,
+        operationResourceName: op.name,
+    });
 }
-exports.setDefaultTrafficPolicy = setDefaultTrafficPolicy;
 async function deleteBackendAndPoll(projectId, location, backendId) {
     const op = await apphosting.deleteBackend(projectId, location, backendId);
-    await poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `delete-${projectId}-${location}-${backendId}`, operationResourceName: op.name }));
+    await poller.pollOperation({
+        ...apphostingPollerOptions,
+        pollerName: `delete-${projectId}-${location}-${backendId}`,
+        operationResourceName: op.name,
+    });
 }
-exports.deleteBackendAndPoll = deleteBackendAndPoll;
 async function promptLocation(projectId, prompt = "Please select a location:") {
     const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
     if (allowedLocations.length === 1) {
@@ -295,7 +311,6 @@ async function promptLocation(projectId, prompt = "Please select a location:") {
     (0, utils_1.logSuccess)(`Location set to ${location}.\n`);
     return location;
 }
-exports.promptLocation = promptLocation;
 async function getBackendForLocation(projectId, location, backendId) {
     try {
         return await apphosting.getBackend(projectId, location, backendId);
@@ -306,7 +321,6 @@ async function getBackendForLocation(projectId, location, backendId) {
         });
     }
 }
-exports.getBackendForLocation = getBackendForLocation;
 async function promptExistingBackend(projectId, promptMessage) {
     const { backends } = await apphosting.listBackends(projectId, "-");
     const backendId = await (0, prompt_1.search)({
@@ -328,7 +342,6 @@ async function promptExistingBackend(projectId, promptMessage) {
     });
     return backendId;
 }
-exports.promptExistingBackend = promptExistingBackend;
 async function chooseBackends(projectId, backendId, chooseBackendPrompt, force) {
     let { unreachable, backends } = await apphosting.listBackends(projectId, "-");
     if (unreachable && unreachable.length !== 0) {
@@ -369,7 +382,6 @@ async function chooseBackends(projectId, backendId, chooseBackendPrompt, force)
     });
     return chosenBackends;
 }
-exports.chooseBackends = chooseBackends;
 async function getBackendForAmbiguousLocation(projectId, backendId, locationDisambugationPrompt, force) {
     let { unreachable, backends } = await apphosting.listBackends(projectId, "-");
     if (unreachable && unreachable.length !== 0) {
@@ -394,7 +406,6 @@ async function getBackendForAmbiguousLocation(projectId, backendId, locationDisa
     });
     return backendsByLocation.get(location);
 }
-exports.getBackendForAmbiguousLocation = getBackendForAmbiguousLocation;
 async function getBackend(projectId, backendId) {
     let { unreachable, backends } = await apphosting.listBackends(projectId, "-");
     backends = backends.filter((backend) => apphosting.parseBackendName(backend.name).id === backendId);
@@ -412,4 +423,3 @@ async function getBackend(projectId, backendId) {
     }
     throw new error_1.FirebaseError(`No backend named ${backendId} found.`);
 }
-exports.getBackend = getBackend;

package/lib/apphosting/config.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suggestedTestKeyName = exports.overrideChosenEnv = exports.maybeGenerateEmulatorYaml = exports.maybeAddSecretToYaml = exports.upsertEnv = exports.findEnv = exports.store = exports.load = exports.listAppHostingFilesInPath = exports.discoverBackendRoot = exports.APPHOSTING_YAML_FILE_REGEX = exports.APPHOSTING_LOCAL_YAML_FILE = exports.APPHOSTING_EMULATORS_YAML_FILE = exports.APPHOSTING_BASE_YAML_FILE = void 0;
+exports.APPHOSTING_YAML_FILE_REGEX = exports.APPHOSTING_LOCAL_YAML_FILE = exports.APPHOSTING_EMULATORS_YAML_FILE = exports.APPHOSTING_BASE_YAML_FILE = void 0;
+exports.discoverBackendRoot = discoverBackendRoot;
+exports.listAppHostingFilesInPath = listAppHostingFilesInPath;
+exports.load = load;
+exports.store = store;
+exports.findEnv = findEnv;
+exports.upsertEnv = upsertEnv;
+exports.maybeAddSecretToYaml = maybeAddSecretToYaml;
+exports.maybeGenerateEmulatorYaml = maybeGenerateEmulatorYaml;
+exports.overrideChosenEnv = overrideChosenEnv;
+exports.suggestedTestKeyName = suggestedTestKeyName;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const yaml = require("yaml");
@@ -33,14 +43,12 @@ function discoverBackendRoot(cwd) {
         dir = parent;
     }
 }
-exports.discoverBackendRoot = discoverBackendRoot;
 function listAppHostingFilesInPath(path) {
     return fs
         .listFiles(path)
         .filter((file) => exports.APPHOSTING_YAML_FILE_REGEX.test(file))
         .map((file) => (0, path_1.join)(path, file));
 }
-exports.listAppHostingFilesInPath = listAppHostingFilesInPath;
 function load(yamlPath) {
     let raw;
     try {
@@ -56,11 +64,9 @@ function load(yamlPath) {
     }
     return yaml.parseDocument(raw);
 }
-exports.load = load;
 function store(yamlPath, document) {
     (0, fs_1.writeFileSync)(yamlPath, document.toString());
 }
-exports.store = store;
 function findEnv(document, variable) {
     if (!document.has("env")) {
         return undefined;
@@ -73,7 +79,6 @@ function findEnv(document, variable) {
     }
     return undefined;
 }
-exports.findEnv = findEnv;
 function upsertEnv(document, env) {
     if (!document.has("env")) {
         document.set("env", document.createNode([env]));
@@ -89,7 +94,6 @@ function upsertEnv(document, env) {
     }
     envs.add(envYaml);
 }
-exports.upsertEnv = upsertEnv;
 const dynamicDispatch = exports;
 async function maybeAddSecretToYaml(secretName, fileName = exports.APPHOSTING_BASE_YAML_FILE) {
     const backendRoot = dynamicDispatch.discoverBackendRoot(process.cwd());
@@ -126,7 +130,6 @@ async function maybeAddSecretToYaml(secretName, fileName = exports.APPHOSTING_BA
     });
     dynamicDispatch.store(path, projectYaml);
 }
-exports.maybeAddSecretToYaml = maybeAddSecretToYaml;
 async function maybeGenerateEmulatorYaml(projectId, backendRoot) {
     const basePath = dynamicDispatch.discoverBackendRoot(backendRoot) || backendRoot;
     if (fs.fileExistsSync((0, path_1.join)(basePath, exports.APPHOSTING_EMULATORS_YAML_FILE))) {
@@ -137,7 +140,7 @@ async function maybeGenerateEmulatorYaml(projectId, backendRoot) {
     try {
         baseConfig = await yaml_1.AppHostingYamlConfig.loadFromFile((0, path_1.join)(basePath, exports.APPHOSTING_BASE_YAML_FILE));
     }
-    catch (_a) {
+    catch {
         baseConfig = yaml_1.AppHostingYamlConfig.empty();
     }
     const createFile = await prompt.confirm({
@@ -154,7 +157,7 @@ async function maybeGenerateEmulatorYaml(projectId, backendRoot) {
     if (envList.length) {
         const newYaml = new yaml.Document();
         for (const [variable, env] of envList) {
-            dynamicDispatch.upsertEnv(newYaml, Object.assign({ variable }, env));
+            dynamicDispatch.upsertEnv(newYaml, { variable, ...env });
         }
         dynamicDispatch.store((0, path_1.join)(basePath, exports.APPHOSTING_EMULATORS_YAML_FILE), newYaml);
     }
@@ -166,9 +169,8 @@ async function maybeGenerateEmulatorYaml(projectId, backendRoot) {
             "#  secret: cloud-secret-manager-id\n";
         (0, fs_1.writeFileSync)((0, path_1.join)(basePath, exports.APPHOSTING_EMULATORS_YAML_FILE), sample);
     }
-    return (0, yaml_1.toEnvList)(Object.assign(Object.assign({}, baseConfig.env), newEnv));
+    return (0, yaml_1.toEnvList)({ ...baseConfig.env, ...newEnv });
 }
-exports.maybeGenerateEmulatorYaml = maybeGenerateEmulatorYaml;
 async function overrideChosenEnv(projectId, env) {
     const names = Object.keys(env);
     if (!names.length) {
@@ -218,8 +220,6 @@ async function overrideChosenEnv(projectId, env) {
     }
     return newEnv;
 }
-exports.overrideChosenEnv = overrideChosenEnv;
 function suggestedTestKeyName(variable) {
     return "test-" + variable.replace(/_/g, "-").toLowerCase();
 }
-exports.suggestedTestKeyName = suggestedTestKeyName;

package/lib/apphosting/githubConnections.js

@@ -1,6 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGitHubCommit = exports.getGitHubBranch = exports.fetchRepositoryCloneUris = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.listValidInstallations = exports.promptGitHubInstallation = exports.getConnectionForInstallation = exports.linkGitHubRepository = exports.getOrCreateFullyInstalledGithubConnection = exports.generateConnectionId = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
+exports.generateConnectionId = void 0;
+exports.parseConnectionName = parseConnectionName;
+exports.extractRepoSlugFromUri = extractRepoSlugFromUri;
+exports.generateRepositoryId = generateRepositoryId;
+exports.getOrCreateFullyInstalledGithubConnection = getOrCreateFullyInstalledGithubConnection;
+exports.linkGitHubRepository = linkGitHubRepository;
+exports.getConnectionForInstallation = getConnectionForInstallation;
+exports.promptGitHubInstallation = promptGitHubInstallation;
+exports.listValidInstallations = listValidInstallations;
+exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
+exports.promptGitHubBranch = promptGitHubBranch;
+exports.ensureSecretManagerAdminGrant = ensureSecretManagerAdminGrant;
+exports.createConnection = createConnection;
+exports.getOrCreateConnection = getOrCreateConnection;
+exports.getOrCreateRepository = getOrCreateRepository;
+exports.listAppHostingConnections = listAppHostingConnections;
+exports.fetchRepositoryCloneUris = fetchRepositoryCloneUris;
+exports.getGitHubBranch = getGitHubBranch;
+exports.getGitHubCommit = getGitHubCommit;
 const clc = require("colorette");
 const devConnect = require("../gcp/devConnect");
 const rm = require("../gcp/resourceManager");
@@ -17,7 +35,7 @@ const APPHOSTING_CONN_PATTERN = /.+\/apphosting-github-conn-.+$/;
 const CONNECTION_NAME_REGEX = /^projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/connections\/(?<id>[^\/]+)$/;
 function parseConnectionName(name) {
     const match = CONNECTION_NAME_REGEX.exec(name);
-    if (!match || typeof match.groups === undefined) {
+    if (!match || typeof match.groups === "undefined") {
         return;
     }
     const { projectId, location, id } = match.groups;
@@ -27,7 +45,6 @@ function parseConnectionName(name) {
         id,
     };
 }
-exports.parseConnectionName = parseConnectionName;
 const devConnectPollerOptions = {
     apiOrigin: (0, api_1.developerConnectOrigin)(),
     apiVersion: "v1",
@@ -41,12 +58,9 @@ function extractRepoSlugFromUri(cloneUri) {
     }
     return match[1];
 }
-exports.extractRepoSlugFromUri = extractRepoSlugFromUri;
 function generateRepositoryId(remoteUri) {
-    var _a;
-    return (_a = extractRepoSlugFromUri(remoteUri)) === null || _a === void 0 ? void 0 : _a.replaceAll("/", "-");
+    return extractRepoSlugFromUri(remoteUri)?.replaceAll("/", "-");
 }
-exports.generateRepositoryId = generateRepositoryId;
 const generateConnectionId = () => {
     const randomHash = Math.random().toString(36).slice(6);
     return `apphosting-github-conn-${randomHash}`;
@@ -92,9 +106,7 @@ async function getOrCreateFullyInstalledGithubConnection(projectId, location, cr
     const connection = await createFullyInstalledConnection(projectId, location, createConnectionId, oauthConn, installationId);
     return connection;
 }
-exports.getOrCreateFullyInstalledGithubConnection = getOrCreateFullyInstalledGithubConnection;
 async function linkGitHubRepository(projectId, location, createConnectionId) {
-    var _a, _b;
     const connection = await getOrCreateFullyInstalledGithubConnection(projectId, location, createConnectionId);
     let repoCloneUri;
     do {
@@ -105,18 +117,16 @@ async function linkGitHubRepository(projectId, location, createConnectionId) {
     } while (repoCloneUri === MANAGE_INSTALLATION_CHOICE);
     const { id: connectionId } = parseConnectionName(connection.name);
     await getOrCreateConnection(projectId, location, connectionId, {
-        authorizerCredential: (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
-        appInstallationId: (_b = connection.githubConfig) === null || _b === void 0 ? void 0 : _b.appInstallationId,
+        authorizerCredential: connection.githubConfig?.authorizerCredential,
+        appInstallationId: connection.githubConfig?.appInstallationId,
     });
     const repo = await getOrCreateRepository(projectId, location, connectionId, repoCloneUri);
     return repo;
 }
-exports.linkGitHubRepository = linkGitHubRepository;
 async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn, installationId) {
-    var _a;
     let conn = await createConnection(projectId, location, connectionId, {
         appInstallationId: installationId,
-        authorizerCredential: (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
+        authorizerCredential: oauthConn.githubConfig?.authorizerCredential,
     });
     while (conn.installationState.stage !== "COMPLETE") {
         utils.logBullet("Install the Firebase App Hosting GitHub app to enable access to GitHub repositories");
@@ -129,9 +139,8 @@ async function createFullyInstalledConnection(projectId, location, connectionId,
     return conn;
 }
 async function manageInstallation(connection) {
-    var _a;
     utils.logBullet("Manage the Firebase App Hosting GitHub app to enable access to GitHub repositories");
-    const targetUri = (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.installationUri;
+    const targetUri = connection.githubConfig?.installationUri;
     if (!targetUri) {
         throw new error_1.FirebaseError("Failed to get Installation URI. Please try again.");
     }
@@ -141,7 +150,7 @@ async function manageInstallation(connection) {
 }
 async function getConnectionForInstallation(projectId, location, installationId) {
     const connections = await listAppHostingConnections(projectId, location);
-    const connectionsMatchingInstallation = connections.filter((conn) => { var _a; return ((_a = conn.githubConfig) === null || _a === void 0 ? void 0 : _a.appInstallationId) === installationId; });
+    const connectionsMatchingInstallation = connections.filter((conn) => conn.githubConfig?.appInstallationId === installationId);
     if (connectionsMatchingInstallation.length === 0) {
         return null;
     }
@@ -151,7 +160,6 @@ async function getConnectionForInstallation(projectId, location, installationId)
     }
     return connectionsMatchingInstallation[0];
 }
-exports.getConnectionForInstallation = getConnectionForInstallation;
 async function promptGitHubInstallation(projectId, location, connection) {
     const installations = await listValidInstallations(projectId, location, connection);
     const installationName = await (0, prompt_1.search)({
@@ -177,19 +185,16 @@ async function promptGitHubInstallation(projectId, location, connection) {
     });
     return installationName;
 }
-exports.promptGitHubInstallation = promptGitHubInstallation;
 async function listValidInstallations(projectId, location, connection) {
     const { id: connId } = parseConnectionName(connection.name);
     let installations = await devConnect.fetchGitHubInstallations(projectId, location, connId);
     installations = installations.filter((installation) => {
-        var _a, _b;
         return ((installation.type === "user" &&
-            installation.name === ((_b = (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential) === null || _b === void 0 ? void 0 : _b.username)) ||
+            installation.name === connection.githubConfig?.authorizerCredential?.username) ||
             installation.type === "organization");
     });
     return installations;
 }
-exports.listValidInstallations = listValidInstallations;
 async function getOrCreateOauthConnection(projectId, location) {
     let conn;
     const completedConnections = await listAppHostingConnections(projectId, location);
@@ -210,7 +215,6 @@ async function getOrCreateOauthConnection(projectId, location) {
     utils.logSuccess("Connected with GitHub successfully\n");
     return conn;
 }
-exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
 async function promptCloneUri(projectId, connection) {
     const cloneUris = await fetchRepositoryCloneUris(projectId, connection);
     const cloneUri = await (0, prompt_1.search)({
@@ -251,7 +255,6 @@ async function promptGitHubBranch(repoLink) {
     });
     return branch;
 }
-exports.promptGitHubBranch = promptGitHubBranch;
 async function ensureSecretManagerAdminGrant(projectId) {
     const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
     const dcsaEmail = devConnect.serviceAgentEmail(projectNumber);
@@ -274,7 +277,7 @@ async function ensureSecretManagerAdminGrant(projectId) {
         await rm.addServiceAccountToRoles(projectId, dcsaEmail, ["roles/secretmanager.admin"], true);
     }
     catch (e) {
-        if ((e === null || e === void 0 ? void 0 : e.code) === 400 || (e === null || e === void 0 ? void 0 : e.status) === 400) {
+        if (e?.code === 400 || e?.status === 400) {
             await devConnect.generateP4SA(projectNumber);
             await rm.addServiceAccountToRoles(projectId, dcsaEmail, ["roles/secretmanager.admin"], true);
         }
@@ -284,13 +287,15 @@ async function ensureSecretManagerAdminGrant(projectId) {
     }
     utils.logSuccess("Successfully granted the required role to the Developer Connect Service Agent!\n");
 }
-exports.ensureSecretManagerAdminGrant = ensureSecretManagerAdminGrant;
 async function createConnection(projectId, location, connectionId, githubConfig) {
     const op = await devConnect.createConnection(projectId, location, connectionId, githubConfig);
-    const conn = await poller.pollOperation(Object.assign(Object.assign({}, devConnectPollerOptions), { pollerName: `create-${location}-${connectionId}`, operationResourceName: op.name }));
+    const conn = await poller.pollOperation({
+        ...devConnectPollerOptions,
+        pollerName: `create-${location}-${connectionId}`,
+        operationResourceName: op.name,
+    });
     return conn;
 }
-exports.createConnection = createConnection;
 async function getOrCreateConnection(projectId, location, connectionId, githubConfig) {
     let conn;
     try {
@@ -307,7 +312,6 @@ async function getOrCreateConnection(projectId, location, connectionId, githubCo
     }
     return conn;
 }
-exports.getOrCreateConnection = getOrCreateConnection;
 async function getOrCreateRepository(projectId, location, connectionId, cloneUri) {
     const repositoryId = generateRepositoryId(cloneUri);
     if (!repositoryId) {
@@ -320,7 +324,11 @@ async function getOrCreateRepository(projectId, location, connectionId, cloneUri
     catch (err) {
         if (err.status === 404) {
             const op = await devConnect.createGitRepositoryLink(projectId, location, connectionId, repositoryId, cloneUri);
-            repo = await poller.pollOperation(Object.assign(Object.assign({}, devConnectPollerOptions), { pollerName: `create-${location}-${connectionId}-${repositoryId}`, operationResourceName: op.name }));
+            repo = await poller.pollOperation({
+                ...devConnectPollerOptions,
+                pollerName: `create-${location}-${connectionId}-${repositoryId}`,
+                operationResourceName: op.name,
+            });
         }
         else {
             throw err;
@@ -328,21 +336,18 @@ async function getOrCreateRepository(projectId, location, connectionId, cloneUri
     }
     return repo;
 }
-exports.getOrCreateRepository = getOrCreateRepository;
 async function listAppHostingConnections(projectId, location) {
     const conns = await devConnect.listAllConnections(projectId, location);
     return conns.filter((conn) => APPHOSTING_CONN_PATTERN.test(conn.name) &&
         conn.installationState.stage === "COMPLETE" &&
         !conn.disabled);
 }
-exports.listAppHostingConnections = listAppHostingConnections;
 async function fetchRepositoryCloneUris(projectId, connection) {
     const { location, id } = parseConnectionName(connection.name);
     const connectionRepos = await devConnect.listAllLinkableGitRepositories(projectId, location, id);
     const cloneUris = connectionRepos.map((conn) => conn.cloneUri);
     return cloneUris;
 }
-exports.fetchRepositoryCloneUris = fetchRepositoryCloneUris;
 async function getGitHubBranch(owner, repo, branch, readToken) {
     const headers = { Authorization: `Bearer ${readToken}`, "User-Agent": "Firebase CLI" };
     const { body } = await githubApiClient.get(`/repos/${owner}/${repo}/branches/${branch}`, {
@@ -350,7 +355,6 @@ async function getGitHubBranch(owner, repo, branch, readToken) {
     });
     return body;
 }
-exports.getGitHubBranch = getGitHubBranch;
 async function getGitHubCommit(owner, repo, ref, readToken) {
     const headers = { Authorization: `Bearer ${readToken}`, "User-Agent": "Firebase CLI" };
     const { body } = await githubApiClient.get(`/repos/${owner}/${repo}/commits/${ref}`, {
@@ -358,4 +362,3 @@ async function getGitHubCommit(owner, repo, ref, readToken) {
     });
     return body;
 }
-exports.getGitHubCommit = getGitHubCommit;

package/lib/apphosting/localbuilds.js

@@ -1,23 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.localBuild = void 0;
+exports.localBuild = localBuild;
 const build_1 = require("@apphosting/build");
 async function localBuild(projectRoot, framework) {
-    var _a, _b, _c;
     const apphostingBuildOutput = await (0, build_1.localBuild)(projectRoot, framework);
     const annotations = Object.fromEntries(Object.entries(apphostingBuildOutput.metadata).map(([key, value]) => [key, String(value)]));
-    const env = (_a = apphostingBuildOutput.runConfig.environmentVariables) === null || _a === void 0 ? void 0 : _a.map(({ variable, value, availability }) => ({
+    const env = apphostingBuildOutput.runConfig.environmentVariables?.map(({ variable, value, availability }) => ({
         variable,
         value,
         availability,
     }));
     return {
-        outputFiles: (_c = (_b = apphostingBuildOutput.outputFiles) === null || _b === void 0 ? void 0 : _b.serverApp.include) !== null && _c !== void 0 ? _c : [],
+        outputFiles: apphostingBuildOutput.outputFiles?.serverApp.include ?? [],
         annotations,
         buildConfig: {
             runCommand: apphostingBuildOutput.runConfig.runCommand,
-            env: env !== null && env !== void 0 ? env : [],
+            env: env ?? [],
         },
     };
 }
-exports.localBuild = localBuild;