firebase-tools 15.0.0 → 15.2.0

package/lib/apphosting/repo.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.parseConnectionName = void 0;
+exports.parseConnectionName = parseConnectionName;
+exports.linkGitHubRepository = linkGitHubRepository;
+exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
+exports.createConnection = createConnection;
+exports.getOrCreateConnection = getOrCreateConnection;
+exports.getOrCreateRepository = getOrCreateRepository;
+exports.listAppHostingConnections = listAppHostingConnections;
+exports.fetchAllRepositories = fetchAllRepositories;
 const clc = require("colorette");
 const gcb = require("../gcp/cloudbuild");
 const rm = require("../gcp/resourceManager");
@@ -16,7 +23,7 @@ const APPHOSTING_OAUTH_CONN_NAME = "apphosting-github-oauth";
 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;
@@ -26,7 +33,6 @@ function parseConnectionName(name) {
         id,
     };
 }
-exports.parseConnectionName = parseConnectionName;
 const gcbPollerOptions = {
     apiOrigin: (0, api_1.cloudbuildOrigin)(),
     apiVersion: "v2",
@@ -41,8 +47,7 @@ function extractRepoSlugFromUri(remoteUri) {
     return match[1];
 }
 function generateRepositoryId(remoteUri) {
-    var _a;
-    return (_a = extractRepoSlugFromUri(remoteUri)) === null || _a === void 0 ? void 0 : _a.replaceAll("/", "-");
+    return extractRepoSlugFromUri(remoteUri)?.replaceAll("/", "-");
 }
 function generateConnectionId() {
     const randomHash = Math.random().toString(36).slice(6);
@@ -50,7 +55,6 @@ function generateConnectionId() {
 }
 const ADD_CONN_CHOICE = "@ADD_CONN";
 async function linkGitHubRepository(projectId, location) {
-    var _a, _b;
     utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     const oauthConn = await getOrCreateOauthConnection(projectId, location);
     const existingConns = await listAppHostingConnections(projectId);
@@ -69,19 +73,17 @@ async function linkGitHubRepository(projectId, location) {
     } while (repoRemoteUri === ADD_CONN_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, repoRemoteUri);
     utils.logSuccess(`Successfully linked GitHub repository at remote URI`);
     utils.logSuccess(`\t${repoRemoteUri}`);
     return repo;
 }
-exports.linkGitHubRepository = linkGitHubRepository;
 async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn) {
-    var _a;
     let conn = await createConnection(projectId, location, connectionId, {
-        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 Cloud Build GitHub app to enable access to GitHub repositories");
@@ -119,7 +121,6 @@ async function getOrCreateOauthConnection(projectId, location) {
     }
     return conn;
 }
-exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
 async function promptRepositoryUri(projectId, connections) {
     const { repos, remoteUriToConnection } = await fetchAllRepositories(projectId, connections);
     const remoteUri = await (0, prompt_1.search)({
@@ -132,7 +133,7 @@ async function promptRepositoryUri(projectId, connections) {
             },
             new prompt_1.Separator(),
             ...fuzzy
-                .filter(input !== null && input !== void 0 ? input : "", repos, {
+                .filter(input ?? "", repos, {
                 extract: (repo) => extractRepoSlugFromUri(repo.remoteUri) || "",
             })
                 .map((result) => {
@@ -167,10 +168,13 @@ async function ensureSecretManagerAdminGrant(projectId) {
 }
 async function createConnection(projectId, location, connectionId, githubConfig) {
     const op = await gcb.createConnection(projectId, location, connectionId, githubConfig);
-    const conn = await poller.pollOperation(Object.assign(Object.assign({}, gcbPollerOptions), { pollerName: `create-${location}-${connectionId}`, operationResourceName: op.name }));
+    const conn = await poller.pollOperation({
+        ...gcbPollerOptions,
+        pollerName: `create-${location}-${connectionId}`,
+        operationResourceName: op.name,
+    });
     return conn;
 }
-exports.createConnection = createConnection;
 async function getOrCreateConnection(projectId, location, connectionId, githubConfig) {
     let conn;
     try {
@@ -186,7 +190,6 @@ async function getOrCreateConnection(projectId, location, connectionId, githubCo
     }
     return conn;
 }
-exports.getOrCreateConnection = getOrCreateConnection;
 async function getOrCreateRepository(projectId, location, connectionId, remoteUri) {
     const repositoryId = generateRepositoryId(remoteUri);
     if (!repositoryId) {
@@ -199,7 +202,11 @@ async function getOrCreateRepository(projectId, location, connectionId, remoteUr
     catch (err) {
         if (err.status === 404) {
             const op = await gcb.createRepository(projectId, location, connectionId, repositoryId, remoteUri);
-            repo = await poller.pollOperation(Object.assign(Object.assign({}, gcbPollerOptions), { pollerName: `create-${location}-${connectionId}-${repositoryId}`, operationResourceName: op.name }));
+            repo = await poller.pollOperation({
+                ...gcbPollerOptions,
+                pollerName: `create-${location}-${connectionId}-${repositoryId}`,
+                operationResourceName: op.name,
+            });
         }
         else {
             throw err;
@@ -207,14 +214,12 @@ async function getOrCreateRepository(projectId, location, connectionId, remoteUr
     }
     return repo;
 }
-exports.getOrCreateRepository = getOrCreateRepository;
 async function listAppHostingConnections(projectId) {
     const conns = await gcb.listConnections(projectId, "-");
     return conns.filter((conn) => APPHOSTING_CONN_PATTERN.test(conn.name) &&
         conn.installationState.stage === "COMPLETE" &&
         !conn.disabled);
 }
-exports.listAppHostingConnections = listAppHostingConnections;
 async function fetchAllRepositories(projectId, connections) {
     const repos = [];
     const remoteUriToConnection = {};
@@ -236,4 +241,3 @@ async function fetchAllRepositories(projectId, connections) {
     }
     return { repos, remoteUriToConnection };
 }
-exports.fetchAllRepositories = fetchAllRepositories;

package/lib/apphosting/rollout.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orchestrateRollout = exports.createRollout = void 0;
+exports.createRollout = createRollout;
+exports.orchestrateRollout = orchestrateRollout;
 const apphosting = require("../gcp/apphosting");
 const error_1 = require("../error");
 const ora = require("ora");
@@ -79,7 +80,6 @@ async function createRollout(backendId, projectId, branch, commit, force) {
     }
     createRolloutSpinner.succeed("Successfully created a new rollout!");
 }
-exports.createRollout = createRollout;
 async function orchestrateRollout(args) {
     const { projectId, location, backendId, buildInput, isFirstRollout } = args;
     const buildId = await apphosting.getNextRolloutId(projectId, location, backendId, isFirstRollout ? 1 : undefined);
@@ -109,8 +109,16 @@ async function orchestrateRollout(args) {
         }
     }
     const rolloutOp = await apphosting.createRollout(projectId, location, backendId, buildId, rolloutBody);
-    const rolloutPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-rollout-${buildId}`, operationResourceName: rolloutOp.name }));
-    const buildPoll = poller.pollOperation(Object.assign(Object.assign({}, apphostingPollerOptions), { pollerName: `create-${projectId}-${location}-backend-${backendId}-build-${buildId}`, operationResourceName: buildOp.name }));
+    const rolloutPoll = poller.pollOperation({
+        ...apphostingPollerOptions,
+        pollerName: `create-${projectId}-${location}-backend-${backendId}-rollout-${buildId}`,
+        operationResourceName: rolloutOp.name,
+    });
+    const buildPoll = poller.pollOperation({
+        ...apphostingPollerOptions,
+        pollerName: `create-${projectId}-${location}-backend-${backendId}-build-${buildId}`,
+        operationResourceName: buildOp.name,
+    });
     const [rollout, build] = await Promise.all([rolloutPoll, buildPoll]);
     if (build.state !== "READY") {
         if (!build.buildLogsUri) {
@@ -121,4 +129,3 @@ async function orchestrateRollout(args) {
     }
     return { rollout, build };
 }
-exports.orchestrateRollout = orchestrateRollout;

package/lib/apphosting/secrets/dialogs.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.envVarForSecret = exports.selectBackendServiceAccounts = exports.GRANT_ACCESS_IN_FUTURE = exports.WARN_NO_BACKENDS = exports.selectFromMetadata = exports.tableForBackends = exports.serviceAccountDisplay = exports.toMetadata = void 0;
+exports.GRANT_ACCESS_IN_FUTURE = exports.WARN_NO_BACKENDS = void 0;
+exports.toMetadata = toMetadata;
+exports.serviceAccountDisplay = serviceAccountDisplay;
+exports.tableForBackends = tableForBackends;
+exports.selectFromMetadata = selectFromMetadata;
+exports.selectBackendServiceAccounts = selectBackendServiceAccounts;
+exports.envVarForSecret = envVarForSecret;
 const clc = require("colorette");
 const Table = require("cli-table3");
 const _1 = require(".");
@@ -13,7 +19,7 @@ async function toMetadata(projectNumber, backends) {
     const metadata = [];
     for (const backend of backends) {
         const [, , , location, , id] = backend.name.split("/");
-        metadata.push(Object.assign({ location, id }, (await (0, _1.serviceAccountsForBackend)(projectNumber, backend))));
+        metadata.push({ location, id, ...(await (0, _1.serviceAccountsForBackend)(projectNumber, backend)) });
     }
     return metadata.sort((left, right) => {
         const cmplocation = left.location.localeCompare(right.location);
@@ -23,14 +29,12 @@ async function toMetadata(projectNumber, backends) {
         return left.id.localeCompare(right.id);
     });
 }
-exports.toMetadata = toMetadata;
 function serviceAccountDisplay(metadata) {
     if (sameServiceAccount(metadata)) {
         return metadata.runServiceAccount;
     }
     return `${metadata.buildServiceAccount}, ${metadata.runServiceAccount}`;
 }
-exports.serviceAccountDisplay = serviceAccountDisplay;
 function sameServiceAccount(metadata) {
     return metadata.buildServiceAccount === metadata.runServiceAccount;
 }
@@ -47,7 +51,6 @@ function tableForBackends(metadata) {
     const rows = metadata.map((m) => [m.location, m.id, serviceAccountDisplay(m)]);
     return [headers, rows];
 }
-exports.tableForBackends = tableForBackends;
 function selectFromMetadata(input, selected) {
     const buildAccounts = new Set();
     const runAccounts = new Set();
@@ -64,7 +67,6 @@ function selectFromMetadata(input, selected) {
         runServiceAccounts: [...runAccounts],
     };
 }
-exports.selectFromMetadata = selectFromMetadata;
 exports.WARN_NO_BACKENDS = "To use this secret, your backend's service account must be granted access." +
     "It does not look like you have a backend yet. After creating a backend, grant access with " +
     clc.bold("firebase apphosting:secrets:grantaccess");
@@ -135,7 +137,6 @@ async function selectBackendServiceAccounts(projectNumber, projectId, options) {
     }
     return selectFromMetadata(metadata, chosen);
 }
-exports.selectBackendServiceAccounts = selectBackendServiceAccounts;
 function toUpperSnakeCase(key) {
     return key
         .replace(/[.-]/g, "_")
@@ -152,7 +153,7 @@ async function envVarForSecret(secret, trimTestPrefix = false) {
             env.validateKey(secret);
             return secret;
         }
-        catch (_a) {
+        catch {
         }
     }
     do {
@@ -169,4 +170,3 @@ async function envVarForSecret(secret, trimTestPrefix = false) {
         }
     } while (true);
 }
-exports.envVarForSecret = envVarForSecret;

package/lib/apphosting/secrets/index.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSecretNameParts = exports.fetchSecrets = exports.upsertSecret = exports.grantEmailsSecretAccess = exports.grantSecretAccess = exports.serviceAccountsForBackend = exports.toMulti = void 0;
+exports.toMulti = toMulti;
+exports.serviceAccountsForBackend = serviceAccountsForBackend;
+exports.grantSecretAccess = grantSecretAccess;
+exports.grantEmailsSecretAccess = grantEmailsSecretAccess;
+exports.upsertSecret = upsertSecret;
+exports.fetchSecrets = fetchSecrets;
+exports.getSecretNameParts = getSecretNameParts;
 const error_1 = require("../../error");
 const gcsm = require("../../gcp/secretManager");
 const gcb = require("../../gcp/cloudbuild");
@@ -20,7 +26,6 @@ function toMulti(accounts) {
     }
     return m;
 }
-exports.toMulti = toMulti;
 async function serviceAccountsForBackend(projectNumber, backend) {
     if (backend.serviceAccount) {
         return {
@@ -33,7 +38,6 @@ async function serviceAccountsForBackend(projectNumber, backend) {
         runServiceAccount: await gce.getDefaultServiceAccount(projectNumber),
     };
 }
-exports.serviceAccountsForBackend = serviceAccountsForBackend;
 async function grantSecretAccess(projectId, projectNumber, secretName, accounts) {
     const p4saEmail = apphosting.serviceAgentEmail(projectNumber);
     const newBindings = [
@@ -67,7 +71,6 @@ async function grantSecretAccess(projectId, projectNumber, secretName, accounts)
     }
     utils.logSuccess(`Successfully set IAM bindings on secret ${secretName}.\n`);
 }
-exports.grantSecretAccess = grantSecretAccess;
 async function grantEmailsSecretAccess(projectId, secretNames, emails) {
     const typeGuesses = Object.fromEntries(emails.map((email) => [email, "user"]));
     for (const secretName of secretNames) {
@@ -108,9 +111,7 @@ async function grantEmailsSecretAccess(projectId, secretNames, emails) {
         utils.logSuccess(`Successfully set IAM bindings on secret ${secretName}.\n`);
     }
 }
-exports.grantEmailsSecretAccess = grantEmailsSecretAccess;
 async function upsertSecret(project, secret, location) {
-    var _a, _b, _c, _d;
     let existing;
     try {
         existing = await gcsm.getSecret(project, secret);
@@ -122,9 +123,9 @@ async function upsertSecret(project, secret, location) {
         await gcsm.createSecret(project, secret, gcsm.labels("apphosting"), location);
         return true;
     }
-    const replication = (_a = existing.replication) === null || _a === void 0 ? void 0 : _a.userManaged;
+    const replication = existing.replication?.userManaged;
     if (location &&
-        (((_b = replication === null || replication === void 0 ? void 0 : replication.replicas) === null || _b === void 0 ? void 0 : _b.length) !== 1 || ((_d = (_c = replication === null || replication === void 0 ? void 0 : replication.replicas) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.location) !== location)) {
+        (replication?.replicas?.length !== 1 || replication?.replicas?.[0]?.location !== location)) {
         utils.logLabeledError("apphosting", "Secret replication policies cannot be changed after creation");
         return null;
     }
@@ -143,7 +144,6 @@ async function upsertSecret(project, secret, location) {
     }
     return false;
 }
-exports.upsertSecret = upsertSecret;
 async function fetchSecrets(projectId, secrets) {
     let secretsKeyValuePairs;
     try {
@@ -162,7 +162,6 @@ async function fetchSecrets(projectId, secrets) {
     }
     return secretsKeyValuePairs;
 }
-exports.fetchSecrets = fetchSecrets;
 function getSecretNameParts(secret) {
     let [name, version] = secret.split("@");
     if (!version) {
@@ -170,4 +169,3 @@ function getSecretNameParts(secret) {
     }
     return [name, version];
 }
-exports.getSecretNameParts = getSecretNameParts;

package/lib/apphosting/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptForAppHostingYaml = exports.getEnvironmentName = void 0;
+exports.getEnvironmentName = getEnvironmentName;
+exports.promptForAppHostingYaml = promptForAppHostingYaml;
 const error_1 = require("../error");
 const config_1 = require("./config");
 const prompt = require("../prompt");
@@ -11,7 +12,6 @@ function getEnvironmentName(apphostingYamlFileName) {
     }
     return found[1].replaceAll(".", "");
 }
-exports.getEnvironmentName = getEnvironmentName;
 async function promptForAppHostingYaml(apphostingFileNameToPathMap, promptMessage = "Please select an App Hosting config:") {
     const fileNames = Array.from(apphostingFileNameToPathMap.keys());
     const baseFilePath = apphostingFileNameToPathMap.get(config_1.APPHOSTING_BASE_YAML_FILE);
@@ -36,4 +36,3 @@ async function promptForAppHostingYaml(apphostingFileNameToPathMap, promptMessag
     });
     return fileToExportPath;
 }
-exports.promptForAppHostingYaml = promptForAppHostingYaml;

package/lib/apphosting/yaml.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toEnvList = exports.toEnvMap = exports.AppHostingYamlConfig = void 0;
+exports.AppHostingYamlConfig = void 0;
+exports.toEnvMap = toEnvMap;
+exports.toEnvList = toEnvList;
 const path_1 = require("path");
 const utils_1 = require("../utils");
 const config_1 = require("./config");
@@ -14,14 +16,13 @@ class AppHostingYamlConfig {
         this.env = {};
     }
     static async loadFromFile(filePath) {
-        var _a;
         if (!(0, fsutils_1.fileExistsSync)(filePath)) {
             throw new error_1.FirebaseError(`Cannot load ${filePath} from given path, it doesn't exist`);
         }
         const config = new AppHostingYamlConfig();
         const file = await (0, utils_1.readFileFromDirectory)((0, path_1.dirname)(filePath), (0, path_1.basename)(filePath));
         config.filename = path.basename(filePath);
-        const loadedAppHostingYaml = (_a = (await (0, utils_1.wrappedSafeLoad)(file.source))) !== null && _a !== void 0 ? _a : {};
+        const loadedAppHostingYaml = (await (0, utils_1.wrappedSafeLoad)(file.source)) ?? {};
         if (loadedAppHostingYaml.env) {
             config.env = toEnvMap(loadedAppHostingYaml.env);
         }
@@ -31,16 +32,18 @@ class AppHostingYamlConfig {
         return new AppHostingYamlConfig();
     }
     merge(other, allowSecretsToBecomePlaintext = true) {
-        var _a;
         if (!allowSecretsToBecomePlaintext) {
             const wereSecrets = Object.entries(this.env)
                 .filter(([, env]) => env.secret)
                 .map(([key]) => key);
-            if (wereSecrets.some((key) => { var _a; return (_a = other.env[key]) === null || _a === void 0 ? void 0 : _a.value; })) {
-                throw new error_1.FirebaseError(`Cannot convert secret to plaintext in ${(_a = other.filename) !== null && _a !== void 0 ? _a : "apphosting yaml"}`);
+            if (wereSecrets.some((key) => other.env[key]?.value)) {
+                throw new error_1.FirebaseError(`Cannot convert secret to plaintext in ${other.filename ?? "apphosting yaml"}`);
             }
         }
-        this.env = Object.assign(Object.assign({}, this.env), other.env);
+        this.env = {
+            ...this.env,
+            ...other.env,
+        };
     }
     async upsertFile(filePath) {
         let yamlConfigToWrite = {};
@@ -56,15 +59,13 @@ exports.AppHostingYamlConfig = AppHostingYamlConfig;
 function toEnvMap(envs) {
     return Object.fromEntries(envs.map((env) => {
         const variable = env.variable;
-        const tmp = Object.assign({}, env);
+        const tmp = { ...env };
         delete env.variable;
         return [variable, tmp];
     }));
 }
-exports.toEnvMap = toEnvMap;
 function toEnvList(envs) {
     return Object.entries(envs).map(([variable, env]) => {
-        return Object.assign(Object.assign({}, env), { variable });
+        return { ...env, variable };
     });
 }
-exports.toEnvList = toEnvList;

package/lib/apptesting/ensureProjectConfigured.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureProjectConfigured = void 0;
+exports.ensureProjectConfigured = ensureProjectConfigured;
 const resourceManager_1 = require("../gcp/resourceManager");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const api_1 = require("../api");
@@ -29,7 +29,6 @@ async function ensureProjectConfigured(projectId) {
         await provisionServiceAccount(projectId, serviceAccount);
     }
 }
-exports.ensureProjectConfigured = ensureProjectConfigured;
 async function provisionServiceAccount(projectId, serviceAccount) {
     try {
         await iam.createServiceAccount(projectId, TEST_RUNNER_SERVICE_ACCOUNT_NAME, "Service Account used in Cloud Run, responsible for running tests", "Firebase App Testing Test Runner");

package/lib/apptesting/invokeTests.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pollInvocationStatus = exports.invokeTests = void 0;
+exports.invokeTests = invokeTests;
+exports.pollInvocationStatus = pollInvocationStatus;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const operationPoller = require("../operation-poller");
@@ -16,7 +17,6 @@ async function invokeTests(appId, startUri, testDefs) {
         throw new error_1.FirebaseError("Test invocation failed", { original: (0, error_1.getError)(err) });
     }
 }
-exports.invokeTests = invokeTests;
 function buildInvokeTestCasesRequest(testCaseInvocations) {
     return {
         resource: {
@@ -37,4 +37,3 @@ async function pollInvocationStatus(operationName, onPoll, backoff = 30 * 1000)
         onPoll,
     });
 }
-exports.pollInvocationStatus = pollInvocationStatus;

package/lib/apptesting/parseTestFiles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTestFiles = void 0;
+exports.parseTestFiles = parseTestFiles;
 const fsutils_1 = require("../fsutils");
 const path_1 = require("path");
 const logger_1 = require("../logger");
@@ -58,12 +58,11 @@ async function parseTestFiles(dir, targetUri, filePattern, namePattern) {
     }
     return parseTestFilesRecursive(dir);
 }
-exports.parseTestFiles = parseTestFiles;
 function toTestDef(testDef, targetUri, defaultConfig) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const steps = (_a = testDef.steps) !== null && _a !== void 0 ? _a : [];
-    const route = (_d = (_c = (_b = testDef.testConfig) === null || _b === void 0 ? void 0 : _b.route) !== null && _c !== void 0 ? _c : defaultConfig === null || defaultConfig === void 0 ? void 0 : defaultConfig.route) !== null && _d !== void 0 ? _d : "";
-    const browsers = (_g = (_f = (_e = testDef.testConfig) === null || _e === void 0 ? void 0 : _e.browsers) !== null && _f !== void 0 ? _f : defaultConfig === null || defaultConfig === void 0 ? void 0 : defaultConfig.browsers) !== null && _g !== void 0 ? _g : [types_1.Browser.CHROME];
+    const steps = testDef.steps ?? [];
+    const route = testDef.testConfig?.route ?? defaultConfig?.route ?? "";
+    const browsers = testDef.testConfig?.browsers ??
+        defaultConfig?.browsers ?? [types_1.Browser.CHROME];
     return {
         testCase: {
             startUri: targetUri + route,

package/lib/apptesting/types.js

@@ -5,7 +5,7 @@ var Browser;
 (function (Browser) {
     Browser["BROWSER_UNSPECIFIED"] = "BROWSER_UNSPECIFIED";
     Browser["CHROME"] = "CHROME";
-})(Browser = exports.Browser || (exports.Browser = {}));
+})(Browser || (exports.Browser = Browser = {}));
 var CompletionReason;
 (function (CompletionReason) {
     CompletionReason[CompletionReason["COMPLETION_REASON_UNSPECIFIED"] = 0] = "COMPLETION_REASON_UNSPECIFIED";
@@ -15,4 +15,4 @@ var CompletionReason;
     CompletionReason[CompletionReason["GOAL_INCONCLUSIVE"] = 4] = "GOAL_INCONCLUSIVE";
     CompletionReason[CompletionReason["TEST_CANCELLED"] = 5] = "TEST_CANCELLED";
     CompletionReason[CompletionReason["GOAL_SUCCEEDED"] = 6] = "GOAL_SUCCEEDED";
-})(CompletionReason = exports.CompletionReason || (exports.CompletionReason = {}));
+})(CompletionReason || (exports.CompletionReason = CompletionReason = {}));

package/lib/archiveDirectory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.archiveDirectory = void 0;
+exports.archiveDirectory = archiveDirectory;
 const archiver = require("archiver");
 const filesize = require("filesize");
 const fs = require("fs");
@@ -31,7 +31,6 @@ async function archiveDirectory(sourceDirectory, options = {}) {
         throw new error_1.FirebaseError("Failed to create archive.", { original: (0, error_1.getError)(err) });
     }
 }
-exports.archiveDirectory = archiveDirectory;
 async function zipDirectory(sourceDirectory, tempFile, options) {
     const archiveFileStream = fs.createWriteStream(tempFile.name, {
         flags: "w",