firebase-tools 14.13.0 → 14.15.0

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.11.2",
+            "version": "2.12.0",
             "expectedSize": 29447008,
-            "expectedChecksum": "13bc7d3bb0a0bbfe601991361e4413c2",
-            "expectedChecksumSHA256": "e3b029eb461f0fe6f0c825c7a71d42c7a09c2b8ee4fac10c3e187d78fe5083f6",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.2",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2"
+            "expectedChecksum": "73a09e7f54b642c0232ce89e9a4dd14a",
+            "expectedChecksumSHA256": "5464803fec776eac553e1431474f3d4fcc7cc2f4fe43a58e8c1ce9d7ede28acd",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.12.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.12.0"
         },
         "win32": {
-            "version": "2.11.2",
-            "expectedSize": 29934592,
-            "expectedChecksum": "032a0749781fc338b446d753dd543bf5",
-            "expectedChecksumSHA256": "2d0498b3ef94b4e777d6fc1d526279376caf3842549f39f13a8ca327393bf810",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.2",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2.exe"
+            "version": "2.12.0",
+            "expectedSize": 29936128,
+            "expectedChecksum": "b4077d6d298024c9c454b8eb9ad9bf69",
+            "expectedChecksumSHA256": "37be096ab8d4d29fa902ca12df97327997b1dc06d4b5026e11aa11d65f183a71",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.12.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.12.0.exe"
         },
         "linux": {
-            "version": "2.11.2",
-            "expectedSize": 29368504,
-            "expectedChecksum": "065a7523f881952040ac678a9a1e9323",
-            "expectedChecksumSHA256": "41ca6561cf77107b5d1d829233844d21c46a5e4bb823c150b1b32591dc2463e0",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.2",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2"
+            "version": "2.12.0",
+            "expectedSize": 29372600,
+            "expectedChecksum": "04fb5bc9ef194170a5ba0966247eaa79",
+            "expectedChecksumSHA256": "42397dd1b23094944aaf20044bc1ec0a5b400c79b536d15803eb4fa6b2bba025",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.12.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.12.0"
         }
     }
 }

package/lib/emulator/functionsEmulator.js

@@ -329,6 +329,7 @@ class FunctionsEmulator {
                 projectId: this.args.projectId,
                 projectAlias: this.args.projectAlias,
                 isEmulator: true,
+                configDir: emulatableBackend.configDir,
             };
             const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
             const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, environment);
@@ -879,6 +880,7 @@ class FunctionsEmulator {
     getUserEnvs(backend) {
         const projectInfo = {
             functionsSource: backend.functionsDir,
+            configDir: backend.configDir,
             projectId: this.args.projectId,
             projectAlias: this.args.projectAlias,
             isEmulator: true,

package/lib/functions/env.js

@@ -140,7 +140,7 @@ function parseStrict(data) {
     return envs;
 }
 exports.parseStrict = parseStrict;
-function findEnvfiles(functionsSource, projectId, projectAlias, isEmulator) {
+function findEnvfiles(configDir, projectId, projectAlias, isEmulator) {
     const files = [".env"];
     files.push(`.env.${projectId}`);
     if (projectAlias) {
@@ -150,26 +150,28 @@ function findEnvfiles(functionsSource, projectId, projectAlias, isEmulator) {
         files.push(FUNCTIONS_EMULATOR_DOTENV);
     }
     return files
-        .map((f) => path.join(functionsSource, f))
+        .map((f) => path.join(configDir, f))
         .filter(fs.existsSync)
         .map((p) => path.basename(p));
 }
-function hasUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, }) {
-    return findEnvfiles(functionsSource, projectId, projectAlias, isEmulator).length > 0;
+function hasUserEnvs(opts) {
+    const configDir = opts.configDir || opts.functionsSource;
+    return findEnvfiles(configDir, opts.projectId, opts.projectAlias, opts.isEmulator).length > 0;
 }
 exports.hasUserEnvs = hasUserEnvs;
 function writeUserEnvs(toWrite, envOpts) {
     if (Object.keys(toWrite).length === 0) {
         return;
     }
-    const { functionsSource, projectId, projectAlias, isEmulator } = envOpts;
-    const allEnvFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
+    const { projectId, projectAlias, isEmulator } = envOpts;
+    const configDir = envOpts.configDir || envOpts.functionsSource;
+    const allEnvFiles = findEnvfiles(configDir, projectId, projectAlias, isEmulator);
     const targetEnvFile = envOpts.isEmulator
         ? FUNCTIONS_EMULATOR_DOTENV
         : `.env.${envOpts.projectId}`;
     const targetEnvFileExists = allEnvFiles.includes(targetEnvFile);
     if (!targetEnvFileExists) {
-        fs.writeFileSync(path.join(envOpts.functionsSource, targetEnvFile), "", { flag: "wx" });
+        fs.writeFileSync(path.join(configDir, targetEnvFile), "", { flag: "wx" });
         (0, utils_1.logBullet)(clc.yellow(clc.bold("functions: ")) +
             `Created new local file ${targetEnvFile} to store param values. We suggest explicitly adding or excluding this file from version control.`);
     }
@@ -186,7 +188,7 @@ function writeUserEnvs(toWrite, envOpts) {
     for (const k of Object.keys(toWrite)) {
         lines += formatUserEnvForWrite(k, toWrite[k]);
     }
-    fs.appendFileSync(path.join(functionsSource, targetEnvFile), lines);
+    fs.appendFileSync(path.join(configDir, targetEnvFile), lines);
 }
 exports.writeUserEnvs = writeUserEnvs;
 function checkForDuplicateKeys(isEmulator, keys, fullEnv, envsWithoutLocal) {
@@ -210,22 +212,24 @@ function formatUserEnvForWrite(key, value) {
     }
     return `${key}=${escapedValue}\n`;
 }
-function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, }) {
+function loadUserEnvs(opts) {
     var _a;
-    const envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
+    const configDir = opts.configDir || opts.functionsSource;
+    const envFiles = findEnvfiles(configDir, opts.projectId, opts.projectAlias, opts.isEmulator);
     if (envFiles.length === 0) {
         return {};
     }
-    if (projectAlias) {
-        if (envFiles.includes(`.env.${projectId}`) && envFiles.includes(`.env.${projectAlias}`)) {
-            throw new error_1.FirebaseError(`Can't have both dotenv files with projectId (env.${projectId}) ` +
-                `and projectAlias (.env.${projectAlias}) as extensions.`);
+    if (opts.projectAlias) {
+        if (envFiles.includes(`.env.${opts.projectId}`) &&
+            envFiles.includes(`.env.${opts.projectAlias}`)) {
+            throw new error_1.FirebaseError(`Can't have both dotenv files with projectId (env.${opts.projectId}) ` +
+                `and projectAlias (.env.${opts.projectAlias}) as extensions.`);
         }
     }
     let envs = {};
     for (const f of envFiles) {
         try {
-            const data = fs.readFileSync(path.join(functionsSource, f), "utf8");
+            const data = fs.readFileSync(path.join(configDir, f), "utf8");
             envs = Object.assign(Object.assign({}, envs), parseStrict(data));
         }
         catch (err) {

package/lib/gcp/cloudsql/connect.js

@@ -72,7 +72,7 @@ async function execute(sqlStatements, opts) {
         sqlStatements.push("COMMIT;");
     }
     for (const s of sqlStatements) {
-        logFn(`Executing: '${s}'`);
+        logFn(`> ${s}`);
         try {
             results.push(await conn.query(s));
         }
@@ -84,6 +84,7 @@ async function execute(sqlStatements, opts) {
         }
     }
     await cleanUpFn();
+    logFn(``);
     return results;
 }
 exports.execute = execute;

package/lib/gcp/cloudsql/permissionsSetup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.brownfieldSqlSetup = exports.setupBrownfieldAsGreenfield = exports.getSchemaMetadata = exports.greenFieldSchemaSetup = exports.setupSQLPermissions = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.SchemaSetupStatus = void 0;
+exports.grantRoleTo = exports.brownfieldSqlSetup = exports.setupBrownfieldAsGreenfield = exports.getSchemaMetadata = exports.greenFieldSchemaSetup = exports.setupSQLPermissions = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.SchemaSetupStatus = void 0;
 const clc = require("colorette");
 const permissions_1 = require("./permissions");
 const cloudsqladmin_1 = require("./cloudsqladmin");
@@ -12,6 +12,7 @@ const connect_1 = require("./connect");
 const lodash_1 = require("lodash");
 const connect_2 = require("./connect");
 const utils = require("../../utils");
+const cloudSqlAdminClient = require("./cloudsqladmin");
 var SchemaSetupStatus;
 (function (SchemaSetupStatus) {
     SchemaSetupStatus["NotSetup"] = "not-setup";
@@ -220,3 +221,11 @@ async function brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, s
     await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, brownfieldSetupCmds, silent, true);
 }
 exports.brownfieldSqlSetup = brownfieldSqlSetup;
+async function grantRoleTo(options, instanceId, databaseId, role, email) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const { user, mode } = (0, connect_2.toDatabaseUser)(email);
+    await cloudSqlAdminClient.createUser(projectId, instanceId, mode, user);
+    const fdcSqlRole = exports.fdcSqlRoleMap[role](databaseId);
+    await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, [`GRANT "${fdcSqlRole}" TO "${user}"`], false);
+}
+exports.grantRoleTo = grantRoleTo;

package/lib/init/features/dataconnect/create_app.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNextApp = exports.createReactApp = void 0;
+const child_process_1 = require("child_process");
+const clc = require("colorette");
+const utils_1 = require("../../../utils");
+async function createReactApp(webAppId) {
+    const args = ["create", "vite@latest", webAppId, "--", "--template", "react"];
+    await executeCommand("npm", args);
+}
+exports.createReactApp = createReactApp;
+async function createNextApp(webAppId) {
+    const args = [
+        "create-next-app@latest",
+        webAppId,
+        "--ts",
+        "--eslint",
+        "--tailwind",
+        "--src-dir",
+        "--app",
+        "--turbopack",
+        "--import-alias",
+        '"@/*"',
+        "--skip-install",
+    ];
+    await executeCommand("npx", args);
+}
+exports.createNextApp = createNextApp;
+async function executeCommand(command, args) {
+    (0, utils_1.logLabeledBullet)("dataconnect", `Running ${clc.bold(`${command} ${args.join(" ")}`)}`);
+    return new Promise((resolve, reject) => {
+        const childProcess = (0, child_process_1.spawn)(command, args, {
+            stdio: "inherit",
+            shell: true,
+        });
+        childProcess.on("close", (code) => {
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                reject(new Error(`Command failed with exit code ${code}`));
+            }
+        });
+        childProcess.on("error", (err) => {
+            reject(err);
+        });
+    });
+}

package/lib/init/features/dataconnect/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDNSCompatibleId = exports.postSetup = exports.actuate = exports.askQuestions = void 0;
+exports.newUniqueId = exports.toDNSCompatibleId = exports.postSetup = exports.actuate = exports.askQuestions = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -15,9 +15,9 @@ const names_1 = require("../../../dataconnect/names");
 const logger_1 = require("../../../logger");
 const templates_1 = require("../../../templates");
 const utils_1 = require("../../../utils");
+Object.defineProperty(exports, "newUniqueId", { enumerable: true, get: function () { return utils_1.newUniqueId; } });
 const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const sdk = require("./sdk");
-const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const fdcExperience_1 = require("../../../gemini/fdcExperience");
 const configstore_1 = require("../../../configstore");
 const track_1 = require("../../../track");
@@ -64,7 +64,7 @@ async function askQuestions(setup) {
                 (0, utils_1.logBullet)("Learn more about Gemini in Firebase and how it uses your data: https://firebase.google.com/docs/gemini-in-firebase#how-gemini-in-firebase-uses-your-data");
             }
             info.appDescription = await (0, prompt_1.input)({
-                message: `Describe your app to automatically generate a schema [Enter to skip]:`,
+                message: `Describe your app to automatically generate a schema with Gemini [Enter to skip]:`,
             });
             if (info.appDescription) {
                 configstore_1.configstore.set("gemini", true);
@@ -77,6 +77,7 @@ async function askQuestions(setup) {
     }
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnect = info;
+    await sdk.askQuestions(setup);
 }
 exports.askQuestions = askQuestions;
 async function actuate(setup, config, options) {
@@ -94,6 +95,7 @@ async function actuate(setup, config, options) {
     info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
     try {
         await actuateWithInfo(setup, config, info, options);
+        await sdk.actuate(setup, config);
     }
     finally {
         void (0, track_1.trackGA4)("dataconnect_init", {
@@ -154,7 +156,7 @@ async function actuateWithInfo(setup, config, info, options) {
                 path: "./example",
                 files: [
                     {
-                        path: "queries",
+                        path: "queries.gql",
                         content: operationGql,
                     },
                 ],
@@ -220,31 +222,27 @@ function schemasDeploySequence(projectId, info, schemaFiles, linkToCloudSql) {
         },
     ];
 }
-async function postSetup(setup, config, options) {
+async function postSetup(setup) {
     var _a;
     const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnect;
     if (!info) {
         throw new Error("Data Connect feature RequiredInfo is not provided");
     }
     const instructions = [];
-    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
-    if (cwdPlatformGuess !== types_1.Platform.NONE || (0, utils_1.envOverride)("FDC_CONNECTOR", "")) {
-        await sdk.doSetup(setup, config, options);
-    }
-    else {
-        instructions.push(`To add the generated SDK to your app, run ${clc.bold("firebase init dataconnect:sdk")}`);
-    }
     if (info.appDescription) {
         instructions.push(`You can visualize the Data Connect Schema in Firebase Console:
 
     https://console.firebase.google.com/project/${setup.projectId}/dataconnect/locations/${info.locationId}/services/${info.serviceId}/schema`);
     }
-    if (setup.projectId && !setup.isBillingEnabled) {
-        instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId));
+    if (!setup.isBillingEnabled) {
+        instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId || "your-firebase-project"));
     }
-    logger_1.logger.info(`\n${clc.bold("To get started with Firebase Data Connect:")}`);
-    for (const i of instructions) {
-        (0, utils_1.logBullet)(i + "\n");
+    instructions.push(`Install the Data Connect VS Code Extensions. You can explore Data Connect Query on local pgLite and Cloud SQL Postgres Instance.`);
+    if (instructions.length) {
+        logger_1.logger.info(`\n${clc.bold("To get started with Firebase Data Connect:")}`);
+        for (const i of instructions) {
+            (0, utils_1.logBullet)(i + "\n");
+        }
     }
 }
 exports.postSetup = postSetup;
@@ -271,7 +269,7 @@ async function writeFiles(config, info, serviceGql, options) {
 async function writeConnectorFiles(config, connectorInfo, options) {
     const subbedConnectorYaml = subConnectorYamlValues({ connectorId: connectorInfo.id });
     const dir = config.get("dataconnect.source") || "dataconnect";
-    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, "connector.yaml"), subbedConnectorYaml, !!options.force);
+    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, "connector.yaml"), subbedConnectorYaml, !!options.force, true);
     for (const f of connectorInfo.files) {
         await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, f.path), f.content, !!options.force);
     }
@@ -315,7 +313,7 @@ async function promptForExistingServices(setup, info) {
     const choice = await chooseExistingService(existingServicesAndSchemas);
     if (!choice) {
         const existingServiceIds = existingServices.map((s) => s.name.split("/").pop());
-        info.serviceId = newUniqueId(defaultServiceId(), existingServiceIds);
+        info.serviceId = (0, utils_1.newUniqueId)(defaultServiceId(), existingServiceIds);
         info.analyticsFlow += "_pick_new_service";
         return;
     }
@@ -346,7 +344,7 @@ async function promptForExistingServices(setup, info) {
                 const id = c.name.split("/").pop();
                 return {
                     id,
-                    path: connectors.length === 1 ? "./connector" : `./${id}`,
+                    path: connectors.length === 1 ? "./example" : `./${id}`,
                     files: c.source.files || [],
                 };
             });
@@ -419,7 +417,7 @@ async function promptForCloudSQL(setup, info) {
                 info.analyticsFlow += "_pick_new_csql";
                 info.cloudSqlInstanceId = await (0, prompt_1.input)({
                     message: `What ID would you like to use for your new CloudSQL instance?`,
-                    default: newUniqueId(`${defaultServiceId().toLowerCase()}-fdc`, instances.map((i) => i.name)),
+                    default: (0, utils_1.newUniqueId)(`${defaultServiceId().toLowerCase()}-fdc`, instances.map((i) => i.name)),
                 });
             }
         }
@@ -436,7 +434,7 @@ async function promptForCloudSQL(setup, info) {
         try {
             const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
             const existing = dbs.map((d) => d.name);
-            info.cloudSqlDatabase = newUniqueId("fdcdb", existing);
+            info.cloudSqlDatabase = (0, utils_1.newUniqueId)("fdcdb", existing);
         }
         catch (err) {
             logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
@@ -464,15 +462,6 @@ async function locationChoices(setup) {
         ];
     }
 }
-function newUniqueId(recommended, existingIDs) {
-    let id = recommended;
-    let i = 1;
-    while (existingIDs.includes(id)) {
-        id = `${recommended}-${i}`;
-        i++;
-    }
-    return id;
-}
 function defaultServiceId() {
     return toDNSCompatibleId((0, path_1.basename)(process.cwd()));
 }