firebase-tools 15.9.2-ct-studioexport3.0 → 15.10.1

package/lib/apphosting/utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEnvironmentName = getEnvironmentName;
 exports.promptForAppHostingYaml = promptForAppHostingYaml;
+exports.getAutoinitEnvVars = getAutoinitEnvVars;
 const error_1 = require("../error");
 const config_1 = require("./config");
 const prompt = require("../prompt");
@@ -36,3 +37,16 @@ async function promptForAppHostingYaml(apphostingFileNameToPathMap, promptMessag
     });
     return fileToExportPath;
 }
+function getAutoinitEnvVars(webappConfig) {
+    if (!webappConfig) {
+        return {};
+    }
+    return {
+        FIREBASE_WEBAPP_CONFIG: JSON.stringify(webappConfig),
+        FIREBASE_CONFIG: JSON.stringify({
+            databaseURL: webappConfig.databaseURL,
+            storageBucket: webappConfig.storageBucket,
+            projectId: webappConfig.projectId,
+        }),
+    };
+}

package/lib/apptesting/parseTestFiles.js

@@ -27,8 +27,8 @@ async function parseTestFiles(dir, targetUri, filePattern, namePattern) {
         }
         return accumulator;
     }, {});
-    const fileFilterFn = createFilter(filePattern);
-    const nameFilterFn = createFilter(namePattern);
+    const fileFilterFn = createFilter(filePattern, "file pattern");
+    const nameFilterFn = createFilter(namePattern, "test name pattern");
     const filteredInvocations = files
         .filter((file) => fileFilterFn(file.path))
         .flatMap((file) => file.invocations)
@@ -61,9 +61,18 @@ async function parseTestFiles(dir, targetUri, filePattern, namePattern) {
         };
     });
 }
-function createFilter(pattern) {
-    const regex = pattern ? new RegExp(pattern) : undefined;
-    return (s) => !regex || regex.test(s);
+function createFilter(pattern, context) {
+    try {
+        const regex = pattern ? new RegExp(pattern) : undefined;
+        return (s) => !regex || regex.test(s);
+    }
+    catch (ex) {
+        if (ex instanceof SyntaxError) {
+            const errMsg = context ? `Invalid ${context} regex: ${pattern}` : `Invalid regex: ${pattern}`;
+            throw new error_1.FirebaseError(errMsg, { original: (0, error_1.getError)(ex) });
+        }
+        throw ex;
+    }
 }
 async function parseTestFilesRecursive(params) {
     const testDir = params.testDir;

package/lib/commands/apptesting.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const requireAuth_1 = require("../requireAuth");
 const command_1 = require("../command");
-const logger_1 = require("../logger");
-const clc = require("colorette");
 const parseTestFiles_1 = require("../apptesting/parseTestFiles");
 const ora = require("ora");
 const error_1 = require("../error");
 const client_1 = require("../appdistribution/client");
 const distribution_1 = require("../appdistribution/distribution");
 const options_parser_util_1 = require("../appdistribution/options-parser-util");
+const utils = require("../utils");
+const fsutils_1 = require("../fsutils");
+const path = require("path");
 const defaultDevices = [
     {
         model: "MediumPhone.arm",
@@ -24,35 +25,44 @@ exports.command = new command_1.Command("apptesting:execute <release-binary-file
     .option("--app <app_id>", "The app id of your Firebase web app. Optional if the project contains exactly one web app.")
     .option("--test-file-pattern <pattern>", "Test file pattern. Only tests contained in files that match this pattern will be executed.")
     .option("--test-name-pattern <pattern>", "Test name pattern. Only tests with names that match this pattern will be executed.")
-    .option("--test-dir <test_dir>", "Directory where tests can be found.")
-    .option("--test-devices <string>", "semicolon-separated list of devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
-    .option("--test-devices-file <string>", "path to file containing a list of semicolon- or newline-separated devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
+    .option("--test-dir <test_dir>", "Directory where tests can be found. Defaults to './tests'.")
+    .option("--test-devices <string>", "Semicolon-separated list of devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
+    .option("--test-devices-file <string>", "Path to file containing a list of semicolon- or newline-separated devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
+    .option("--test-non-blocking", "Run automated tests without waiting for them to complete. Visit the Firebase console for the test results.")
     .before(requireAuth_1.requireAuth)
     .action(async (target, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
-    const testDir = options.testDir || "tests";
+    const testDir = path.resolve(options.testDir || "tests");
+    if (!(0, fsutils_1.dirExistsSync)(testDir)) {
+        throw new error_1.FirebaseError(`Tests directory not found: ${testDir}. Use the --test-dir flag to choose a different directory.`);
+    }
     const tests = await (0, parseTestFiles_1.parseTestFiles)(testDir, undefined, options.testFilePattern, options.testNamePattern);
     const testDevices = (0, options_parser_util_1.parseTestDevices)(options.testDevices, options.testDevicesFile);
     if (!tests.length) {
         throw new error_1.FirebaseError("No tests found");
     }
     const invokeSpinner = ora("Requesting test execution");
+    const client = new client_1.AppDistributionClient();
     let releaseTests;
     let release;
     try {
-        const client = new client_1.AppDistributionClient();
         release = await (0, distribution_1.upload)(client, appName, new distribution_1.Distribution(target));
         invokeSpinner.start();
         releaseTests = await invokeTests(client, release.name, tests, !testDevices.length ? defaultDevices : testDevices);
-        invokeSpinner.text = "Test execution requested";
+        invokeSpinner.text = `${pluralizeTests(releaseTests.length)} started successfully!`;
         invokeSpinner.succeed();
     }
     catch (ex) {
         invokeSpinner.fail("Failed to request test execution");
         throw ex;
     }
-    logger_1.logger.info(clc.bold(`\n${clc.white("===")} Running ${pluralizeTests(releaseTests.length)}`));
-    logger_1.logger.info(`View progress and results in the Firebase Console:\n${release.firebaseConsoleUri}`);
+    if (options.testNonBlocking) {
+        utils.logBullet(`View progress and results in the Firebase Console:\n${release.firebaseConsoleUri}`);
+    }
+    else {
+        await (0, distribution_1.awaitTestResults)(releaseTests, client);
+        utils.logBullet(`View detailed results in the Firebase Console:\n${release.firebaseConsoleUri}`);
+    }
 });
 function pluralizeTests(numTests) {
     return `${numTests} test${numTests === 1 ? "" : "s"}`;

package/lib/commands/index.js

@@ -33,6 +33,11 @@ function load(client) {
     client.appdistribution.testCases = {};
     client.appdistribution.testCases.export = loadCommand("appdistribution-testcases-export");
     client.appdistribution.testCases.import = loadCommand("appdistribution-testcases-import");
+    client.apptesting = {};
+    client.apptesting.execute = loadCommand("apptesting");
+    if (experiments.isEnabled("apptesting")) {
+        client.apptesting.wata = loadCommand("apptesting-wata");
+    }
     client.apps = {};
     client.apps.create = loadCommand("apps-create");
     client.apps.list = loadCommand("apps-list");
@@ -254,11 +259,6 @@ function load(client) {
     client.target.clear = loadCommand("target-clear");
     client.target.remove = loadCommand("target-remove");
     client.use = loadCommand("use");
-    client.apptesting = {};
-    client.apptesting.execute = loadCommand("apptesting");
-    if (experiments.isEnabled("apptesting")) {
-        client.apptesting.wata = loadCommand("apptesting-wata");
-    }
     const t1 = process.hrtime.bigint();
     const diffMS = (t1 - t0) / BigInt(1e6);
     if (diffMS > 100) {

package/lib/commands/studio-export.js

@@ -10,7 +10,7 @@ const unzip_1 = require("../unzip");
 const fs = require("fs");
 exports.command = new command_1.Command("studio:export <path>")
     .description("Bootstrap Firebase Studio apps for migration to Antigravity. Run on the unzipped folder from the Firebase Studio download, or directly on the downloaded zip file.")
-    .option("--no-start-agy", "skip starting the Antigravity IDE after migration")
+    .option("--no-start-antigravity", "skip starting the Antigravity IDE after migration")
     .action(async (exportPath, options) => {
     if (!exportPath) {
         throw new error_1.FirebaseError("Must specify a path for migration.", { exit: 1 });
@@ -34,6 +34,6 @@ exports.command = new command_1.Command("studio:export <path>")
             rootPath = extractPath;
         }
     }
-    logger_1.logger.info(`⏳ Exporting Studio apps from ${rootPath} to Antigravity...`);
+    logger_1.logger.info(`⏳ Exporting Studio app from ${rootPath} to Antigravity...`);
     await (0, migrate_1.migrate)(rootPath, options);
 });

package/lib/dataconnect/load.js

@@ -6,6 +6,7 @@ exports.loadAll = loadAll;
 exports.load = load;
 exports.readFirebaseJson = readFirebaseJson;
 exports.readDataConnectYaml = readDataConnectYaml;
+exports.inferClientCache = inferClientCache;
 exports.readConnectorYaml = readConnectorYaml;
 exports.readGQLFiles = readGQLFiles;
 exports.squashGraphQL = squashGraphQL;
@@ -28,7 +29,7 @@ async function pickOneService(projectId, config, service, location) {
 async function pickServices(projectId, config, serviceId, location) {
     const serviceInfos = await loadAll(projectId, config);
     if (serviceInfos.length === 0) {
-        throw new error_1.FirebaseError("No Data Connect services found in firebase.json." +
+        throw new error_1.FirebaseError("No Data Connect services found in firebase.json. " +
             `\nYou can run ${clc.bold("firebase init dataconnect")} to add a Data Connect service.`);
     }
     const matchingServices = serviceInfos.filter((i) => (!serviceId || i.dataConnectYaml.serviceId === serviceId) &&
@@ -63,6 +64,7 @@ async function load(projectId, config, sourceDirectory) {
         const connectorDir = path.join(resolvedDir, dir);
         const connectorYaml = await readConnectorYaml(connectorDir);
         const connectorGqls = await readGQLFiles(connectorDir);
+        const clientCache = inferClientCache(connectorYaml);
         return {
             directory: connectorDir,
             connectorYaml,
@@ -71,6 +73,7 @@ async function load(projectId, config, sourceDirectory) {
                 source: {
                     files: connectorGqls,
                 },
+                client_cache: clientCache,
             },
         };
     }));
@@ -122,6 +125,26 @@ function validateDataConnectYaml(unvalidated) {
     }
     return unvalidated;
 }
+function inferClientCache(connectorYaml) {
+    const platforms = [
+        connectorYaml.generate?.javascriptSdk,
+        connectorYaml.generate?.swiftSdk,
+        connectorYaml.generate?.kotlinSdk,
+        connectorYaml.generate?.dartSdk,
+    ];
+    for (const sdk of platforms) {
+        if (sdk) {
+            const sdkList = Array.isArray(sdk) ? sdk : [sdk];
+            if (sdkList.some((s) => s.clientCache)) {
+                return {
+                    strict_validation_enabled: true,
+                    entity_id_included: true,
+                };
+            }
+        }
+    }
+    return undefined;
+}
 async function readConnectorYaml(sourceDirectory) {
     const file = await (0, utils_1.readFileFromDirectory)(sourceDirectory, "connector.yaml");
     const connectorYaml = await (0, utils_1.wrappedSafeLoad)(file.source);

package/lib/deploy/apphosting/util.js

@@ -35,7 +35,7 @@ async function createArchive(config, rootDir, targetSubDir) {
         await pipeAsync(archive, fileStream);
     }
     catch (err) {
-        throw new error_1.FirebaseError("Could not read source directory. Remove links and shortcuts and try again.", { original: err, exit: 1 });
+        throw new error_1.FirebaseError(`Could not read source directory. Remove links and shortcuts and try again. Original: ${err}`, { original: err, exit: 1 });
     }
     return tmpFile;
 }

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -98,7 +98,7 @@ async function packageSource(projectDir, sourceDir, config, additionalSources, r
         if (err instanceof error_1.FirebaseError) {
             throw err;
         }
-        throw new error_1.FirebaseError("Could not read source directory. Remove links and shortcuts and try again.", {
+        throw new error_1.FirebaseError(`Could not read source directory. Remove links and shortcuts and try again. Original: ${err}`, {
             original: err,
             exit: 1,
         });

package/lib/emulator/apphosting/serve.js

@@ -20,9 +20,10 @@ const utils_1 = require("../../utils");
 const apphosting = require("../../gcp/apphosting");
 const constants_2 = require("../constants");
 const fetchWebSetup_1 = require("../../fetchWebSetup");
-const apps_1 = require("../../management/apps");
 const child_process_1 = require("child_process");
 const semver_1 = require("semver");
+const utils_2 = require("../../apphosting/utils");
+const apps_1 = require("../../management/apps");
 const secretResourceRegex = /^projects\/([^/]+)\/secrets\/([^/]+)(?:\/versions\/((?:latest)|\d+))?$/;
 const secretShorthandRegex = /^([^/@]+)(?:@((?:latest)|\d+))?$/;
 async function loadSecret(project, name) {
@@ -81,6 +82,15 @@ async function start(options) {
         startCommand = await (0, developmentServer_1.detectPackageManagerStartCommand)(backendRoot);
         developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${startCommand}'`);
     }
+    const packageManager = await (0, developmentServer_1.detectPackageManager)(backendRoot).catch(() => undefined);
+    let autoinitEnvVars = {};
+    if (packageManager === "pnpm") {
+        (0, utils_1.logLabeledWarning)("apphosting", "Firebase JS SDK autoinit does not currently support PNPM.");
+    }
+    else {
+        const webappConfig = await getBackendAppConfig(options?.projectId, options?.backendId);
+        autoinitEnvVars = (0, utils_2.getAutoinitEnvVars)(webappConfig);
+    }
     const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(backendRoot);
     const resolveEnv = Object.entries(apphostingLocalConfig.env).map(async ([key, value]) => [
         key,
@@ -88,6 +98,7 @@ async function start(options) {
     ]);
     const environmentVariablesToInject = {
         NODE_ENV: process.env.NODE_ENV,
+        ...autoinitEnvVars,
         ...getEmulatorEnvs(),
         ...Object.fromEntries(await Promise.all(resolveEnv)),
         FIREBASE_APP_HOSTING: "1",
@@ -96,20 +107,7 @@ async function start(options) {
         PROJECT_ID: options?.projectId,
         PORT: port.toString(),
     };
-    const packageManager = await (0, developmentServer_1.detectPackageManager)(backendRoot).catch(() => undefined);
-    if (packageManager === "pnpm") {
-        (0, utils_1.logLabeledWarning)("apphosting", `Firebase JS SDK autoinit does not currently support PNPM.`);
-    }
-    else {
-        const webappConfig = await getBackendAppConfig(options?.projectId, options?.backendId);
-        if (webappConfig) {
-            environmentVariablesToInject["FIREBASE_WEBAPP_CONFIG"] || (environmentVariablesToInject["FIREBASE_WEBAPP_CONFIG"] = JSON.stringify(webappConfig));
-            environmentVariablesToInject["FIREBASE_CONFIG"] || (environmentVariablesToInject["FIREBASE_CONFIG"] = JSON.stringify({
-                databaseURL: webappConfig.databaseURL,
-                storageBucket: webappConfig.storageBucket,
-                projectId: webappConfig.projectId,
-            }));
-        }
+    if (packageManager !== "pnpm") {
         await tripFirebasePostinstall(backendRoot, environmentVariablesToInject);
     }
     (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject)

package/lib/emulator/downloadableEmulatorInfo.json

@@ -44,13 +44,13 @@
         }
     },
     "pubsub": {
-        "version": "0.8.27",
-        "expectedSize": 52924291,
-        "expectedChecksum": "cb0d35db6aa1bb5e3f7e2a5a690c631d",
-        "expectedChecksumSHA256": "0b793b420b608b68c200a0d15123c63967ac2863bbd9545ecb087d5b28871339",
-        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.27.zip",
-        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.27.zip",
-        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.27/pubsub-emulator/bin/cloud-pubsub-emulator"
+        "version": "0.8.29",
+        "expectedSize": 52906482,
+        "expectedChecksum": "8345b0a923dda5634dd56a25f913cf37",
+        "expectedChecksumSHA256": "31228112fb95a6818d13a88e801f4be6fb5ea5b601175b74528cc61823ea5507",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.29.zip",
+        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.29.zip",
+        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.29/pubsub-emulator/bin/cloud-pubsub-emulator"
     },
     "dataconnect": {
         "darwin": {