firebase-tools 13.14.1 → 13.14.2

package/lib/bin/firebase.js

@@ -105,8 +105,12 @@ process.on("exit", (code) => {
         configstore_1.configstore.delete("lastError");
     }
     try {
+        const installMethod = !process.env.FIREPIT_VERSION ? "npm" : "automatic script";
+        const updateCommand = !process.env.FIREPIT_VERSION
+            ? "npm install -g firebase-tools"
+            : "curl -sL https://firebase.tools | upgrade=true bash";
         const updateMessage = `Update available ${clc.gray("{currentVersion}")} → ${clc.green("{latestVersion}")}\n` +
-            `To update to the latest version using npm, run\n${clc.cyan("npm install -g firebase-tools")}\n` +
+            `To update to the latest version using ${installMethod}, run\n${clc.cyan(updateCommand)}\n` +
             `For other CLI management options, visit the ${(0, marked_1.marked)("[CLI documentation](https://firebase.google.com/docs/cli#update-cli)")}`;
         updateNotifier.notify({ defer: false, isGlobal: true, message: updateMessage });
     }

package/lib/commands/init.js

@@ -44,8 +44,9 @@ const choices = [
     },
     {
         value: "hosting:github",
-        name: " └── Hosting: Set up GitHub Action deploys",
+        name: "Hosting: Set up GitHub Action deploys",
         checked: false,
+        hidden: true,
     },
     {
         value: "storage",
@@ -67,6 +68,17 @@ const choices = [
         name: "Extensions: Set up an empty Extensions manifest",
         checked: false,
     },
+    {
+        value: "dataconnect",
+        name: "Data Connect: Set up a Firebase Data Connect service",
+        checked: false,
+    },
+    {
+        value: "dataconnect:sdk",
+        name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
+        checked: false,
+        hidden: true,
+    },
 ];
 if ((0, experiments_1.isEnabled)("genkit")) {
     choices.push({
@@ -75,16 +87,6 @@ if ((0, experiments_1.isEnabled)("genkit")) {
         checked: false,
     });
 }
-choices.push({
-    value: "dataconnect",
-    name: "Data Connect: Set up a Firebase Data Connect service",
-    checked: false,
-});
-choices.push({
-    value: "dataconnect:sdk",
-    name: " └── Data Connect: Set up a generated SDK for your Firebase Data Connect service",
-    checked: false,
-});
 const featureNames = choices.map((choice) => choice.value);
 const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 
@@ -165,7 +167,7 @@ function initAction(feature, options) {
                 name: "features",
                 message: "Which Firebase features do you want to set up for this directory? " +
                     "Press Space to select features, then Enter to confirm your choices.",
-                choices: choices,
+                choices: choices.filter((c) => !c.hidden),
             },
         ]);
     })

package/lib/emulator/dataconnectEmulator.js

@@ -26,8 +26,9 @@ class DataConnectEmulator {
         this.emulatorClient = new DataConnectEmulatorClient();
     }
     async start() {
+        let resolvedConfigDir;
         try {
-            const resolvedConfigDir = this.args.config.path(this.args.configDir);
+            resolvedConfigDir = this.args.config.path(this.args.configDir);
             const info = await DataConnectEmulator.build({ configDir: resolvedConfigDir });
             if ((0, types_2.requiresVector)(info.metadata)) {
                 if (constants_1.Constants.isDemoProject(this.args.projectId)) {
@@ -51,7 +52,7 @@ class DataConnectEmulator {
             await (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
                 auto_download: this.args.auto_download,
                 listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
-                config_dir: this.args.configDir,
+                config_dir: resolvedConfigDir,
             });
             this.usingExistingEmulator = false;
         }

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

@@ -1,18 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.actuate = exports.doSetup = void 0;
 const yaml = require("yaml");
-const fs = require("fs-extra");
+const fs = require("fs");
 const clc = require("colorette");
 const prompt_1 = require("../../../prompt");
 const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const load_1 = require("../../../dataconnect/load");
 const logger_1 = require("../../../logger");
 const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
+const error_1 = require("../../../error");
 const IOS = "ios";
 const WEB = "web";
 const ANDROID = "android";
 async function doSetup(setup, config) {
+    const sdkInfo = await askQuestions(setup, config);
+    await actuate(sdkInfo, setup.projectId);
+}
+exports.doSetup = doSetup;
+async function askQuestions(setup, config) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(config);
     const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(setup.projectId || "", config, c.source)));
@@ -27,8 +33,7 @@ async function doSetup(setup, config) {
     })
         .flat();
     if (!connectorChoices.length) {
-        logger_1.logger.info(`Your config has no connectors to set up SDKs for. Run ${clc.bold("firebase init dataconnect")} to set up a service and conenctors.`);
-        return;
+        throw new error_1.FirebaseError(`Your config has no connectors to set up SDKs for. Run ${clc.bold("firebase init dataconnect")} to set up a service and conenctors.`);
     }
     const connectorInfo = await (0, prompt_1.promptOnce)({
         message: "Which connector do you want set up a generated SDK for?",
@@ -102,20 +107,24 @@ async function doSetup(setup, config) {
         };
         newConnectorYaml.generate.kotlinSdk = kotlinSdk;
     }
-    const connectorYamlContents = yaml.stringify(newConnectorYaml);
-    const connectorYamlPath = `${connectorInfo.directory}/connector.yaml`;
-    fs.writeFileSync(connectorYamlPath, connectorYamlContents, "utf8");
-    logger_1.logger.info(`Wrote new config to ${connectorYamlPath}`);
-    if (setup.projectId &&
+    const shouldGenerate = !!(setup.projectId &&
         (await (0, prompt_1.confirm)({
             message: "Would you like to generate SDK code now?",
             default: true,
-        }))) {
+        })));
+    const connectorYamlContents = yaml.stringify(newConnectorYaml);
+    return { connectorYamlContents, connectorInfo, shouldGenerate };
+}
+async function actuate(sdkInfo, projectId) {
+    const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
+    fs.writeFileSync(connectorYamlPath, sdkInfo.connectorYamlContents, "utf8");
+    logger_1.logger.info(`Wrote new config to ${connectorYamlPath}`);
+    if (projectId && sdkInfo.shouldGenerate) {
         await dataconnectEmulator_1.DataConnectEmulator.generate({
-            configDir: connectorInfo.directory,
-            connectorId: connectorInfo.connectorYaml.connectorId,
+            configDir: sdkInfo.connectorInfo.directory,
+            connectorId: sdkInfo.connectorInfo.connectorYaml.connectorId,
         });
-        logger_1.logger.info(`Generated SDK code for ${connectorInfo.connectorYaml.connectorId}`);
+        logger_1.logger.info(`Generated SDK code for ${sdkInfo.connectorInfo.connectorYaml.connectorId}`);
     }
 }
-exports.doSetup = doSetup;
+exports.actuate = actuate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.14.1",
+  "version": "13.14.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {