firebase-tools 13.11.1 → 13.11.2

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

@@ -20,6 +20,17 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             configDir = path.resolve(path.join(cwd), configDir);
         }
         const serviceInfo = await (0, load_1.load)(projectId, service.location, configDir);
+        const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
+            var _a, _b, _c;
+            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));
+        });
+        if (!hasGeneratables) {
+            logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
+            logger_1.logger.warn("See https://firebase.google.com/docs/data-connect/quickstart#configure-sdk-outputs for examples of how to configure generated SDKs.");
+            return;
+        }
         for (const conn of serviceInfo.connectorInfo) {
             const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
                 configDir,

package/lib/dataconnect/names.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseConnectorName = exports.parseServiceName = void 0;
+exports.parseCloudSQLInstanceName = exports.parseConnectorName = exports.parseServiceName = void 0;
 const error_1 = require("../error");
 const serviceNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/services\/(?<serviceId>[^\/]+)/;
 function parseServiceName(serviceName) {
@@ -46,3 +46,24 @@ function parseConnectorName(connectorName) {
     };
 }
 exports.parseConnectorName = parseConnectorName;
+const cloudSQLInstanceNameRegex = /projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/instances\/(?<instanceId>[^\/]+)/;
+function parseCloudSQLInstanceName(cloudSQLInstanceName) {
+    var _a, _b, _c;
+    const res = cloudSQLInstanceNameRegex.exec(cloudSQLInstanceName);
+    const projectId = (_a = res === null || res === void 0 ? void 0 : res.groups) === null || _a === void 0 ? void 0 : _a.projectId;
+    const location = (_b = res === null || res === void 0 ? void 0 : res.groups) === null || _b === void 0 ? void 0 : _b.location;
+    const instanceId = (_c = res === null || res === void 0 ? void 0 : res.groups) === null || _c === void 0 ? void 0 : _c.instanceId;
+    if (!projectId || !location || !instanceId) {
+        throw new error_1.FirebaseError(`${cloudSQLInstanceName} is not a valid cloudSQL instance name`);
+    }
+    const toString = () => {
+        return `projects/${projectId}/locations/${location}/services/${instanceId}`;
+    };
+    return {
+        projectId,
+        location,
+        instanceId,
+        toString,
+    };
+}
+exports.parseCloudSQLInstanceName = parseCloudSQLInstanceName;

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

@@ -47,6 +47,10 @@ async function doSetup(setup, config) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     const subbedDataconnectYaml = subValues(DATACONNECT_YAML_TEMPLATE, info);
     const subbedConnectorYaml = subValues(CONNECTOR_YAML_TEMPLATE, info);
+    if (!config.has("dataconnect")) {
+        config.set("dataconnect.source", dir);
+        config.set("dataconnect.location", info.locationId);
+    }
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
     await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
     await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "connector.yaml"), subbedConnectorYaml);
@@ -116,8 +120,10 @@ async function promptForService(setup, info) {
                 info.serviceId = serviceName.serviceId;
                 info.locationId = serviceName.location;
                 if (choice.schema) {
-                    info.cloudSqlInstanceId =
-                        (_b = (_a = choice.schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) !== null && _b !== void 0 ? _b : "";
+                    if ((_a = choice.schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
+                        const instanceName = (0, names_1.parseCloudSQLInstanceName)((_b = choice.schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance);
+                        info.cloudSqlInstanceId = instanceName.instanceId;
+                    }
                     info.cloudSqlDatabase = (_d = (_c = choice.schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
                 }
             }
@@ -149,7 +155,9 @@ async function promptForCloudSQLInstance(setup, info) {
                 type: "list",
                 choices,
             });
-            info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
+            if (info.cloudSqlInstanceId !== "") {
+                info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
+            }
         }
     }
     if (info.cloudSqlInstanceId === "") {
@@ -191,11 +199,6 @@ async function locationChoices(setup) {
     }
 }
 async function promptForDatabase(setup, config, info) {
-    const dir = config.get("dataconnect.source") || "dataconnect";
-    if (!config.has("dataconnect")) {
-        config.set("dataconnect.source", dir);
-        config.set("dataconnect.location", info.locationId);
-    }
     if (!info.isNewInstance && setup.projectId) {
         try {
             const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);

package/package.json

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