firebase-tools 13.18.0 → 13.20.0

package/README.md

@@ -117,15 +117,16 @@ Detailed doc is [here](https://firebase.google.com/docs/cli/auth).
 
 ### Extensions Commands
 
-| Command           | Description                                                                                 |
-| ----------------- | ------------------------------------------------------------------------------------------- |
-| **ext**           | Display information on how to use ext commands and extensions installed to your project.    |
-| **ext:configure** | Configure an existing extension instance.                                                   |
-| **ext:info**      | Display information about an extension by name (extensionName@x.y.z for a specific version) |
-| **ext:install**   | Install an extension.                                                                       |
-| **ext:list**      | List all the extensions that are installed in your Firebase project.                        |
-| **ext:uninstall** | Uninstall an extension that is installed in your Firebase project by Instance ID.           |
-| **ext:update**    | Update an existing extension instance to the latest version.                                |
+| Command             | Description                                                                                 |
+| ------------------- | ------------------------------------------------------------------------------------------- |
+| **ext**             | Display information on how to use ext commands and extensions installed to your project.    |
+| **ext:configure**   | Configure an existing extension instance.                                                   |
+| **ext:info**        | Display information about an extension by name (extensionName@x.y.z for a specific version) |
+| **ext:install**     | Install an extension.                                                                       |
+| **ext:sdk:install** | Install and SDK for an extension so you can define the extension in a functions codebase.   |
+| **ext:list**        | List all the extensions that are installed in your Firebase project.                        |
+| **ext:uninstall**   | Uninstall an extension that is installed in your Firebase project by Instance ID.           |
+| **ext:update**      | Update an existing extension instance to the latest version.                                |
 
 ### Cloud Firestore Commands
 

package/lib/commands/dataconnect-sdk-generate.js

@@ -10,6 +10,7 @@ const fileUtils_1 = require("../dataconnect/fileUtils");
 const logger_1 = require("../logger");
 exports.command = new command_1.Command("dataconnect:sdk:generate")
     .description("generates typed SDKs for your Data Connect connectors")
+    .option("--watch", "watch for changes to your connector GQL files and regenerate your SDKs when updates occur")
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const services = (0, fileUtils_1.readFirebaseJson)(options.config);
@@ -17,10 +18,11 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
         const configDir = service.source;
         const serviceInfo = await (0, load_1.load)(projectId, options.config, configDir);
         const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
                 ((_b = c.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.kotlinSdk) ||
-                ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk));
+                ((_c = c.connectorYaml.generate) === null || _c === void 0 ? void 0 : _c.swiftSdk) ||
+                ((_d = c.connectorYaml.generate) === null || _d === void 0 ? void 0 : _d.dartSdk));
         });
         if (!hasGeneratables) {
             logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
@@ -32,6 +34,7 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
                 configDir,
                 connectorId: conn.connectorYaml.connectorId,
+                watch: options.watch,
             });
             logger_1.logger.info(output);
             logger_1.logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);

package/lib/commands/emulators-start.js

@@ -10,6 +10,7 @@ const types_1 = require("../emulator/types");
 const clc = require("colorette");
 const constants_1 = require("../emulator/constants");
 const utils_1 = require("../utils");
+const webhook_1 = require("../dataconnect/webhook");
 const Table = require("cli-table");
 function stylizeLink(url) {
     return clc.underline(clc.bold(url));
@@ -31,8 +32,10 @@ exports.command = new command_1.Command("emulators:start")
             let deprecationNotices;
             try {
                 ({ deprecationNotices } = await controller.startAll(options));
+                await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_STARTED });
             }
             catch (e) {
+                await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_START_ERRORED });
                 await controller.cleanShutdown();
                 throw e;
             }

package/lib/commands/ext-info.js

@@ -110,7 +110,9 @@ exports.command = new command_1.Command("ext:info <extensionName>")
     else {
         marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
         logger_1.logger.info(await (0, marked_1.marked)(lines.join("\n")));
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install this extension, type ` +
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install this extension, run ` +
             clc.bold(`firebase ext:install ${extensionName} --project=YOUR_PROJECT`));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install an autogenerated SDK for this extension into your functions codebase, run ` +
+            clc.bold(`firebase ext:sdk:install ${extensionName} --project=YOUR_PROJECT`));
     }
 });

package/lib/commands/ext-sdk-install.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const clc = require("colorette");
+const semver = require("semver");
+const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
+const command_1 = require("../command");
+const extensionsApi = require("../extensions/extensionsApi");
+const extensionsHelper_1 = require("../extensions/extensionsHelper");
+const localHelper_1 = require("../extensions/localHelper");
+const requirePermissions_1 = require("../requirePermissions");
+const common_1 = require("../extensions/runtimes/common");
+const error_1 = require("../error");
+const displayExtensionInfo_1 = require("../extensions/displayExtensionInfo");
+const refs = require("../extensions/refs");
+const logger_1 = require("../logger");
+const prompt_1 = require("../prompt");
+const utils = require("../utils");
+exports.command = new command_1.Command("ext:sdk:install <extensionName>")
+    .description("get an SDK for this extension. The SDK will be put in the 'generated' directory")
+    .option(`--codebase <codebase>`, `specifies a codebase to install the SDK into`)
+    .option(`--force`, `will overwrite existing sdk files if true`)
+    .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extDevMinVersion")
+    .action(async (extensionName, options) => {
+    const runtime = await (0, common_1.getCodebaseRuntime)(options);
+    if (!runtime.startsWith("nodejs")) {
+        throw new error_1.FirebaseError(`Extension SDK generation is currently only supported for NodeJs. We detected the target source to be: ${runtime}`);
+    }
+    let spec;
+    let extensionRef;
+    let localPath;
+    if ((0, localHelper_1.isLocalExtension)(extensionName)) {
+        spec = await (0, localHelper_1.getLocalExtensionSpec)(extensionName);
+        spec.systemParams = [];
+        localPath = extensionName;
+        await (0, displayExtensionInfo_1.displayExtensionVersionInfo)({ spec });
+    }
+    else {
+        await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.sources.get"]);
+        await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
+        const hasPublisherId = extensionName.split("/").length >= 2;
+        if (hasPublisherId) {
+            const nameAndVersion = extensionName.split("/")[1];
+            if (nameAndVersion.split("@").length < 2) {
+                extensionName = extensionName + "@latest";
+            }
+        }
+        else {
+            const [name, version] = extensionName.split("@");
+            extensionName = `firebase/${name}@${version || "latest"}`;
+        }
+        const ref = refs.parse(extensionName);
+        const extension = await extensionsApi.getExtension(refs.toExtensionRef(ref));
+        const version = await extensionsApi.getExtensionVersion(extensionName);
+        spec = version.spec;
+        extensionRef = version.ref;
+        await (0, displayExtensionInfo_1.displayExtensionVersionInfo)({
+            spec,
+            extensionVersion: version,
+            latestApprovedVersion: extension.latestApprovedVersion,
+            latestVersion: extension.latestVersion,
+        });
+        if (version.state === "DEPRECATED") {
+            throw new error_1.FirebaseError(`Extension version ${clc.bold(extensionName)} is deprecated and cannot be installed. To install an SDK for the ` +
+                `latest non-deprecated version, omit the version in the extension ref.`);
+        }
+        logger_1.logger.info();
+        if ((extension.latestApprovedVersion &&
+            semver.gt(extension.latestApprovedVersion, version.spec.version)) ||
+            (!extension.latestApprovedVersion &&
+                extension.latestVersion &&
+                semver.gt(extension.latestVersion, version.spec.version))) {
+            const latest = extension.latestApprovedVersion || extension.latestVersion;
+            logger_1.logger.info(`You are about to install an SDK for extension version ${clc.bold(version.spec.version)} which is older than the latest ${extension.latestApprovedVersion ? "accepted version" : "version"} ${clc.bold(latest)}.`);
+        }
+    }
+    if (!(await (0, prompt_1.confirm)({
+        nonInteractive: options.nonInteractive,
+        force: options.force,
+        default: true,
+    }))) {
+        return;
+    }
+    const codeSample = await (0, common_1.writeSDK)(extensionRef, localPath, spec, options);
+    logger_1.logger.info();
+    utils.logSuccess("Extension SDK installed successfully");
+    logger_1.logger.info(codeSample);
+});

package/lib/commands/ext.js

@@ -23,6 +23,7 @@ exports.command = new command_1.Command("ext")
         "ext:configure",
         "ext:update",
         "ext:uninstall",
+        "ext:sdk:install",
     ];
     for (const commandName of commandNames) {
         const command = firebaseTools.getCommand(commandName);

package/lib/commands/index.js

@@ -83,6 +83,8 @@ function load(client) {
     client.ext.list = loadCommand("ext-list");
     client.ext.uninstall = loadCommand("ext-uninstall");
     client.ext.update = loadCommand("ext-update");
+    client.ext.sdk = {};
+    client.ext.sdk.install = loadCommand("ext-sdk-install");
     client.ext.dev = {};
     client.ext.dev.init = loadCommand("ext-dev-init");
     client.ext.dev.list = loadCommand("ext-dev-list");

package/lib/commands/init.js

@@ -21,10 +21,10 @@ const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
 function isOutside(from, to) {
     return !!/^\.\./.exec(path.relative(from, to));
 }
-const choices = [
+let choices = [
     {
-        value: "database",
-        name: "Realtime Database: Configure a security rules file for Realtime Database and (optionally) provision default instance",
+        value: "dataconnect",
+        name: "Data Connect: Set up a Firebase Data Connect service",
         checked: false,
     },
     {
@@ -42,12 +42,6 @@ const choices = [
         name: "Hosting: Configure files for Firebase Hosting and (optionally) set up GitHub Action deploys",
         checked: false,
     },
-    {
-        value: "hosting:github",
-        name: "Hosting: Set up GitHub Action deploys",
-        checked: false,
-        hidden: true,
-    },
     {
         value: "storage",
         name: "Storage: Configure a security rules file for Cloud Storage",
@@ -69,10 +63,16 @@ const choices = [
         checked: false,
     },
     {
-        value: "dataconnect",
-        name: "Data Connect: Set up a Firebase Data Connect service",
+        value: "database",
+        name: "Realtime Database: Configure a security rules file for Realtime Database and (optionally) provision default instance",
         checked: false,
     },
+    {
+        value: "hosting:github",
+        name: "Hosting: Set up GitHub Action deploys",
+        checked: false,
+        hidden: true,
+    },
     {
         value: "dataconnect:sdk",
         name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
@@ -81,11 +81,15 @@ const choices = [
     },
 ];
 if ((0, experiments_1.isEnabled)("genkit")) {
-    choices.push({
-        value: "genkit",
-        name: "Genkit: Setup a new Genkit project with Firebase",
-        checked: false,
-    });
+    choices = [
+        ...choices.slice(0, 2),
+        {
+            value: "genkit",
+            name: "Genkit: Setup a new Genkit project with Firebase",
+            checked: false,
+        },
+        ...choices.slice(2),
+    ];
 }
 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.

package/lib/commands/setup-emulators-dataconnect.js

@@ -3,30 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const types_1 = require("../emulator/types");
-const emulators_1 = require("../init/features/emulators");
-const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const downloadableEmulators_1 = require("../emulator/downloadableEmulators");
 const NAME = types_1.Emulators.DATACONNECT;
 exports.command = new command_1.Command(`setup:emulators:${NAME}`)
     .description(`downloads the ${NAME} emulator`)
     .action(async (options) => {
-    var _a, _b;
     await (0, downloadableEmulators_1.downloadIfNecessary)(NAME);
     if (!options.config) {
         logger_1.logger.info("Not currently in a Firebase project directory. Run this command from a project directory to configure the Data Connect emulator.");
         return;
     }
-    if (!options.nonInteractive) {
-        const dataconnectEmulatorConfig = options.rc.getDataconnect();
-        const defaultConnectionString = (_b = (_a = dataconnectEmulatorConfig === null || dataconnectEmulatorConfig === void 0 ? void 0 : dataconnectEmulatorConfig.postgres) === null || _a === void 0 ? void 0 : _a.localConnectionString) !== null && _b !== void 0 ? _b : emulators_1.DEFAULT_POSTGRES_CONNECTION;
-        const localConnectionString = await (0, prompt_1.promptOnce)({
-            type: "input",
-            name: "localConnectionString",
-            message: `What is the connection string of the local Postgres instance you would like to use with the Data Connect emulator?`,
-            default: defaultConnectionString,
-        });
-        options.rc.setDataconnect(localConnectionString);
-    }
     logger_1.logger.info("Setup complete!");
 });

package/lib/dataconnect/ensureApis.js

@@ -12,7 +12,6 @@ async function ensureApis(projectId) {
 exports.ensureApis = ensureApis;
 async function ensureSparkApis(projectId) {
     const prefix = "dataconnect";
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix);
     await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix);
 }
 exports.ensureSparkApis = ensureSparkApis;

package/lib/dataconnect/fileUtils.js

@@ -8,7 +8,7 @@ const types_1 = require("./types");
 const utils_1 = require("../utils");
 const load_1 = require("./load");
 function readFirebaseJson(config) {
-    if (!config.has("dataconnect")) {
+    if (!(config === null || config === void 0 ? void 0 : config.has("dataconnect"))) {
         return [];
     }
     const validator = (cfg) => {
@@ -96,28 +96,34 @@ exports.pickService = pickService;
 const WEB_INDICATORS = ["package.json", "package-lock.json", "node_modules"];
 const IOS_INDICATORS = ["info.plist", "podfile", "package.swift"];
 const ANDROID_INDICATORS = ["androidmanifest.xml", "build.gradle", "build.gradle.kts"];
+const DART_INDICATORS = ["pubspec.yaml", "pubspec.lock"];
 const IOS_POSTFIX_INDICATORS = [".xcworkspace", ".xcodeproj"];
 async function getPlatformFromFolder(dirPath) {
     const fileNames = await fs.readdir(dirPath);
     let hasWeb = false;
     let hasAndroid = false;
     let hasIOS = false;
+    let hasDart = false;
     for (const fileName of fileNames) {
         const cleanedFileName = fileName.toLowerCase();
         hasWeb || (hasWeb = WEB_INDICATORS.some((indicator) => indicator === cleanedFileName));
         hasAndroid || (hasAndroid = ANDROID_INDICATORS.some((indicator) => indicator === cleanedFileName));
         hasIOS || (hasIOS = IOS_INDICATORS.some((indicator) => indicator === cleanedFileName) ||
             IOS_POSTFIX_INDICATORS.some((indicator) => cleanedFileName.endsWith(indicator)));
+        hasDart || (hasDart = DART_INDICATORS.some((indicator) => indicator === cleanedFileName));
     }
-    if (hasWeb && !hasAndroid && !hasIOS) {
+    if (hasWeb && !hasAndroid && !hasIOS && !hasDart) {
         return types_1.Platform.WEB;
     }
-    else if (hasAndroid && !hasWeb && !hasIOS) {
+    else if (hasAndroid && !hasWeb && !hasIOS && !hasDart) {
         return types_1.Platform.ANDROID;
     }
-    else if (hasIOS && !hasWeb && !hasAndroid) {
+    else if (hasIOS && !hasWeb && !hasAndroid && !hasDart) {
         return types_1.Platform.IOS;
     }
+    else if (hasDart && !hasWeb && !hasIOS && !hasAndroid) {
+        return types_1.Platform.DART;
+    }
     return types_1.Platform.UNDETERMINED;
 }
 exports.getPlatformFromFolder = getPlatformFromFolder;
@@ -151,6 +157,12 @@ function generateSdkYaml(platform, connectorYaml, connectorYamlFolder, appFolder
             package: `connectors.${connectorYaml.connectorId}`,
         };
     }
+    if (platform === types_1.Platform.DART) {
+        connectorYaml.generate.dartSdk = {
+            outputDir,
+            package: connectorYaml.connectorId,
+        };
+    }
     return connectorYaml;
 }
 exports.generateSdkYaml = generateSdkYaml;

package/lib/dataconnect/freeTrial.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.printFreeTrialUnavailable = exports.checkForFreeTrialInstance = exports.freeTrialTermsLink = void 0;
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
+const clc = require("colorette");
 function freeTrialTermsLink() {
     return "https://firebase.google.com/pricing";
 }
@@ -13,11 +14,12 @@ async function checkForFreeTrialInstance(projectId) {
     return (_a = instances.find((i) => { var _a; return ((_a = i.settings.userLabels) === null || _a === void 0 ? void 0 : _a["firebase-data-connect"]) === "ft"; })) === null || _a === void 0 ? void 0 : _a.name;
 }
 exports.checkForFreeTrialInstance = checkForFreeTrialInstance;
-function printFreeTrialUnavailable(projectId, instanceId) {
-    const message = `Project '${projectId}' already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect free trial. ` +
-        "The free trial only includes one CloudSQL instance. " +
-        `Consider using a separate database on ${instanceId}, or creating a new CloudSQL instance at ` +
-        "https://console.cloud.google.com/sql/instances";
-    utils.logLabeledError("dataconnect", message);
+function printFreeTrialUnavailable(projectId, instanceId, configYamlPath) {
+    utils.logLabeledError("dataconnect", `Project '${projectId} already has a CloudSQL instance '${instanceId}' on the Firebase Data Connect no-cost trial.`);
+    const reuseHint = `To use a different database in the same instance, ${clc.bold(`change the ${clc.blue("instanceId")} to "${instanceId}"`)} in ` +
+        `${clc.green(configYamlPath)}. (Also, update the ${clc.blue("database")} field (i.e. DB name in the instance) ` +
+        `and ${clc.blue("location")} as needed.)`;
+    utils.logLabeledBullet("dataconnect", reuseHint);
+    utils.logLabeledBullet("dataconnect", `Or you may create a new (paid) CloudSQL instance at https://console.cloud.google.com/sql/instances`);
 }
 exports.printFreeTrialUnavailable = printFreeTrialUnavailable;

package/lib/dataconnect/provisionCloudSql.js

@@ -11,7 +11,7 @@ const freeTrial_1 = require("./freeTrial");
 const error_1 = require("../error");
 async function provisionCloudSql(args) {
     let connectionName = "";
-    const { projectId, locationId, instanceId, databaseId, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
+    const { projectId, locationId, instanceId, databaseId, configYamlPath, enableGoogleMlIntegration, waitForCreation, silent, dryRun, } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         silent || utils.logLabeledBullet("dataconnect", `Found existing instance ${instanceId}.`);
@@ -35,14 +35,14 @@ async function provisionCloudSql(args) {
         }
         const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(projectId);
         if (freeTrialInstanceId) {
-            (0, freeTrial_1.printFreeTrialUnavailable)(projectId, freeTrialInstanceId);
-            throw new error_1.FirebaseError("Free trial unavailable.");
+            (0, freeTrial_1.printFreeTrialUnavailable)(projectId, freeTrialInstanceId, configYamlPath);
+            throw new error_1.FirebaseError("Cannot create another no-cost trial Cloud SQL instance.");
         }
         const cta = dryRun ? "It will be created on your next deploy" : "Creating it now.";
         silent ||
             utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found.` +
                 cta +
-                `\nThis instance is provided under the terms of the Data Connect free trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
+                `\nThis instance is provided under the terms of the Data Connect no-cost trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
                 `\nMonitor the progress at ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}`);
         if (!dryRun) {
             const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration, waitForCreation), "Creating your instance...");

package/lib/dataconnect/types.js

@@ -12,6 +12,7 @@ var Platform;
     Platform["ANDROID"] = "ANDROID";
     Platform["WEB"] = "WEB";
     Platform["IOS"] = "IOS";
+    Platform["DART"] = "DART";
     Platform["UNDETERMINED"] = "UNDETERMINED";
 })(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {

package/lib/dataconnect/webhook.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendVSCodeMessage = exports.port = exports.DEFAULT_PORT = exports.VSCODE_MESSAGE = void 0;
+const node_fetch_1 = require("node-fetch");
+const logger_1 = require("../logger");
+var VSCODE_MESSAGE;
+(function (VSCODE_MESSAGE) {
+    VSCODE_MESSAGE["EMULATORS_STARTED"] = "EMULATORS_STARTED";
+    VSCODE_MESSAGE["EMULATORS_START_ERRORED"] = "EMULATORS_START_ERRORED";
+    VSCODE_MESSAGE["EMULATORS_SHUTDOWN"] = "EMULATORS_SHUTDOWN";
+})(VSCODE_MESSAGE = exports.VSCODE_MESSAGE || (exports.VSCODE_MESSAGE = {}));
+exports.DEFAULT_PORT = "40001";
+exports.port = process.env.VSCODE_WEBHOOK_PORT || exports.DEFAULT_PORT;
+async function sendVSCodeMessage(body) {
+    const jsonBody = JSON.stringify(body);
+    try {
+        return await (0, node_fetch_1.default)(`http://localhost:${exports.port}/vscode/notify`, {
+            method: "POST",
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+                "x-mantle-admin": "all",
+            },
+            body: jsonBody,
+        });
+    }
+    catch (e) {
+        logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}`);
+    }
+}
+exports.sendVSCodeMessage = sendVSCodeMessage;

package/lib/deploy/dataconnect/deploy.js

@@ -8,6 +8,7 @@ const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
 const names_1 = require("../../dataconnect/names");
 const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
+const node_path_1 = require("node:path");
 async function default_1(context, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
@@ -57,6 +58,7 @@ async function default_1(context, options) {
                 locationId: (0, names_1.parseServiceName)(s.serviceName).location,
                 instanceId,
                 databaseId,
+                configYamlPath: (0, node_path_1.join)(s.sourceDirectory, "dataconnect.yaml"),
                 enableGoogleMlIntegration,
                 waitForCreation: true,
             });

package/lib/deploy/dataconnect/prepare.js

@@ -16,6 +16,7 @@ const names_1 = require("../../dataconnect/names");
 const error_1 = require("../../error");
 const types_1 = require("../../dataconnect/types");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
+const node_path_1 = require("node:path");
 async function default_1(context, options) {
     var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -70,6 +71,7 @@ async function default_1(context, options) {
                     locationId: (0, names_1.parseServiceName)(s.serviceName).location,
                     instanceId,
                     databaseId,
+                    configYamlPath: (0, node_path_1.join)(s.sourceDirectory, "dataconnect.yaml"),
                     enableGoogleMlIntegration,
                     waitForCreation: true,
                     dryRun: options.dryRun,

package/lib/deploy/dataconnect/release.js

@@ -4,7 +4,9 @@ const utils = require("../../utils");
 const client_1 = require("../../dataconnect/client");
 const prompts_1 = require("../../dataconnect/prompts");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
+const projectUtils_1 = require("../../projectUtils");
 async function default_1(context, options) {
+    const project = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
     const filters = context.dataconnect.filters;
     const wantSchemas = serviceInfos
@@ -22,7 +24,7 @@ async function default_1(context, options) {
         });
     });
     if (wantSchemas.length) {
-        utils.logLabeledBullet("dataconnect", "Releasing Data Connect schemas...");
+        utils.logLabeledBullet("dataconnect", "Deploying Data Connect schemas...");
         for (const s of wantSchemas) {
             await (0, schemaMigration_1.migrateSchema)({
                 options,
@@ -31,7 +33,7 @@ async function default_1(context, options) {
                 schemaValidation: s.validationMode,
             });
         }
-        utils.logLabeledBullet("dataconnect", "Schemas released.");
+        utils.logLabeledBullet("dataconnect", "Schemas deployed.");
     }
     let wantConnectors = [];
     wantConnectors = wantConnectors.concat(...serviceInfos.map((si) => si.connectorInfo
@@ -48,7 +50,7 @@ async function default_1(context, options) {
         ? []
         : haveConnectors.filter((h) => !wantConnectors.some((w) => w.name === h.name));
     if (wantConnectors.length) {
-        utils.logLabeledBullet("dataconnect", "Releasing connectors...");
+        utils.logLabeledBullet("dataconnect", "Deploying connectors...");
         await Promise.all(wantConnectors.map(async (c) => {
             await (0, client_1.upsertConnector)(c);
             utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
@@ -56,9 +58,12 @@ async function default_1(context, options) {
         for (const c of connectorsToDelete) {
             await (0, prompts_1.promptDeleteConnector)(options, c.name);
         }
-        utils.logLabeledBullet("dataconnect", "Connectors released.");
+        utils.logLabeledBullet("dataconnect", "Connectors deployed.");
     }
-    utils.logLabeledSuccess("dataconnect", "Deploy complete!");
+    else {
+        utils.logLabeledBullet("dataconnect", "No connectors to deploy.");
+    }
+    utils.logLabeledSuccess("dataconnect", `Deployment complete! View your deployed schema and connectors at ${utils.consoleUrl(project, "/dataconnect")}`);
     return;
 }
 exports.default = default_1;

package/lib/deploy/extensions/deploymentSummary.js

@@ -47,10 +47,11 @@ function configuresSummary(toConfigure) {
         : "";
 }
 exports.configuresSummary = configuresSummary;
-function deletesSummary(toDelete) {
+function deletesSummary(toDelete, isDynamic) {
     const instancesToDelete = toDelete.map((s) => `\t${(0, exports.humanReadable)(s)}`).join("\n");
+    const definedLocation = isDynamic ? "your local source code" : "'firebase.json'";
     return toDelete.length
-        ? `The following extension instances are not listed in 'firebase.json':\n${instancesToDelete}\n`
+        ? `The following extension instances are found in your project but do not exist in ${definedLocation}:\n${instancesToDelete}\n`
         : "";
 }
 exports.deletesSummary = deletesSummary;

package/lib/deploy/extensions/planner.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVersion = exports.want = exports.wantDynamic = exports.have = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
+exports.resolveVersion = exports.want = exports.wantDynamic = exports.have = exports.haveDynamic = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
 const semver = require("semver");
 const extensionsApi = require("../../extensions/extensionsApi");
 const refs = require("../../extensions/refs");
@@ -49,9 +49,33 @@ async function getExtensionSpec(i) {
     return i.extensionSpec;
 }
 exports.getExtensionSpec = getExtensionSpec;
+async function haveDynamic(projectId) {
+    return (await extensionsApi.listInstances(projectId))
+        .filter((i) => { var _a; return ((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"; })
+        .map((i) => {
+        var _a;
+        const dep = {
+            instanceId: i.name.split("/").pop(),
+            params: i.config.params,
+            systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
+            allowedEventTypes: i.config.allowedEventTypes,
+            eventarcChannel: i.config.eventarcChannel,
+            etag: i.etag,
+            labels: i.labels,
+        };
+        if (i.config.extensionRef) {
+            const ref = refs.parse(i.config.extensionRef);
+            dep.ref = ref;
+            dep.ref.version = i.config.extensionVersion;
+        }
+        return dep;
+    });
+}
+exports.haveDynamic = haveDynamic;
 async function have(projectId) {
-    const instances = await extensionsApi.listInstances(projectId);
-    return instances.map((i) => {
+    return (await extensionsApi.listInstances(projectId))
+        .filter((i) => { var _a; return !(((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"); })
+        .map((i) => {
         var _a;
         const dep = {
             instanceId: i.name.split("/").pop(),
@@ -61,6 +85,9 @@ async function have(projectId) {
             eventarcChannel: i.config.eventarcChannel,
             etag: i.etag,
         };
+        if (i.labels) {
+            dep.labels = i.labels;
+        }
         if (i.config.extensionRef) {
             const ref = refs.parse(i.config.extensionRef);
             dep.ref = ref;
@@ -97,6 +124,7 @@ async function wantDynamic(args) {
                 systemParams,
                 allowedEventTypes,
                 eventarcChannel,
+                labels: ext.labels,
             });
         }
         else if (ext.ref) {
@@ -107,6 +135,7 @@ async function wantDynamic(args) {
                 systemParams,
                 allowedEventTypes,
                 eventarcChannel,
+                labels: ext.labels,
             });
         }
     }