firebase-tools 15.1.0 → 15.2.0

package/lib/dataconnect/schemaMigration.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureServiceIsConnectedToCloudSql = exports.getIdentifiers = exports.grantRoleToUserInSchema = exports.migrateSchema = exports.diffSchema = void 0;
+exports.diffSchema = diffSchema;
+exports.migrateSchema = migrateSchema;
+exports.upsertSecondarySchema = upsertSecondarySchema;
+exports.grantRoleToUserInSchema = grantRoleToUserInSchema;
+exports.getIdentifiers = getIdentifiers;
+exports.serviceNameFromSchema = serviceNameFromSchema;
+exports.ensureServiceIsConnectedToCloudSql = ensureServiceIsConnectedToCloudSql;
 const clc = require("colorette");
 const sql_formatter_1 = require("sql-formatter");
 const types_1 = require("./types");
@@ -40,7 +46,7 @@ async function setupSchemaIfNecessary(instanceId, databaseId, options) {
     }
 }
 async function diffSchema(options, schema, schemaValidation) {
-    let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "STRICT";
+    let validationMode = schemaValidation ?? "STRICT";
     setSchemaValidationMode(schema, validationMode);
     displayStartSchemaDiff(validationMode);
     const { serviceName, instanceName, databaseId, instanceId } = getIdentifiers(schema);
@@ -51,7 +57,7 @@ async function diffSchema(options, schema, schemaValidation) {
         displayNoSchemaDiff(instanceId, databaseId, validationMode);
     }
     catch (err) {
-        if ((err === null || err === void 0 ? void 0 : err.status) !== 400) {
+        if (err?.status !== 400) {
             throw err;
         }
         incompatible = errors.getIncompatibleSchemaError(err);
@@ -84,7 +90,7 @@ async function diffSchema(options, schema, schemaValidation) {
         displayNoSchemaDiff(instanceId, databaseId, validationMode);
     }
     catch (err) {
-        if ((err === null || err === void 0 ? void 0 : err.status) !== 400) {
+        if (err?.status !== 400) {
             throw err;
         }
         compatibleIncompatible = errors.getIncompatibleSchemaError(err);
@@ -101,11 +107,9 @@ async function diffSchema(options, schema, schemaValidation) {
     }
     return incompatible.diffs;
 }
-exports.diffSchema = diffSchema;
 async function migrateSchema(args) {
-    var _a;
     const { options, schema, validateOnly, schemaValidation, stats } = args;
-    let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
+    let validationMode = schemaValidation ?? "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     displayStartSchemaDiff(validationMode);
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -116,7 +120,7 @@ async function migrateSchema(args) {
         if (stats) {
             stats.numSchemaSkippedDueToPendingCreate++;
         }
-        const postgresql = (_a = schema.datasources.find((d) => d.postgresql)) === null || _a === void 0 ? void 0 : _a.postgresql;
+        const postgresql = schema.datasources.find((d) => d.postgresql)?.postgresql;
         if (!postgresql) {
             throw new error_1.FirebaseError(`Cannot find Postgres datasource in the schema to deploy: ${serviceName}/schemas/${types_1.MAIN_SCHEMA_ID}.\nIts datasources: ${JSON.stringify(schema.datasources)}`);
         }
@@ -136,7 +140,7 @@ async function migrateSchema(args) {
         displayNoSchemaDiff(instanceId, databaseId, validationMode);
     }
     catch (err) {
-        if ((err === null || err === void 0 ? void 0 : err.status) !== 400) {
+        if (err?.status !== 400) {
             throw err;
         }
         const incompatible = errors.getIncompatibleSchemaError(err);
@@ -206,7 +210,34 @@ async function migrateSchema(args) {
     }
     return diffs;
 }
-exports.migrateSchema = migrateSchema;
+async function upsertSecondarySchema(args) {
+    const { options, schema, stats } = args;
+    const serviceName = serviceNameFromSchema(schema);
+    try {
+        await (0, client_1.upsertSchema)(schema, false);
+    }
+    catch (err) {
+        if (err?.status !== 400) {
+            throw err;
+        }
+        const invalidConnectors = errors.getInvalidConnectors(err);
+        if (!invalidConnectors.length) {
+            const gqlErrs = errors.getGQLErrors(err);
+            if (gqlErrs) {
+                throw new error_1.FirebaseError(`There are errors in your schema files:\n${gqlErrs}`);
+            }
+            throw err;
+        }
+        if (stats) {
+            stats.numSchemaInvalidConnectors += invalidConnectors.length;
+        }
+        const shouldDeleteInvalidConnectors = await promptForInvalidConnectorError(options, serviceName, invalidConnectors, false);
+        if (shouldDeleteInvalidConnectors) {
+            await deleteInvalidConnectors(invalidConnectors);
+        }
+        await (0, client_1.upsertSchema)(schema, false);
+    }
+}
 async function grantRoleToUserInSchema(options, schema) {
     const role = options.role;
     const email = options.email;
@@ -218,7 +249,6 @@ async function grantRoleToUserInSchema(options, schema) {
     }
     await (0, permissionsSetup_1.grantRoleTo)(options, instanceId, databaseId, role, email);
 }
-exports.grantRoleToUserInSchema = grantRoleToUserInSchema;
 function diffsEqual(x, y) {
     if (x.length !== y.length) {
         return false;
@@ -234,23 +264,22 @@ function diffsEqual(x, y) {
 }
 function setSchemaValidationMode(schema, schemaValidation) {
     const postgresDatasource = schema.datasources.find((d) => d.postgresql);
-    if (postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) {
+    if (postgresDatasource?.postgresql) {
         postgresDatasource.postgresql.schemaValidation = schemaValidation;
     }
 }
 function getIdentifiers(schema) {
-    var _a, _b, _c;
     const postgresDatasource = schema.datasources.find((d) => d.postgresql);
-    const databaseId = (_a = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;
+    const databaseId = postgresDatasource?.postgresql?.database;
     if (!databaseId) {
         throw new error_1.FirebaseError("Data Connect schema must have a postgres datasource with a database name.");
     }
-    const instanceName = (_c = (_b = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql) === null || _c === void 0 ? void 0 : _c.instance;
+    const instanceName = postgresDatasource?.postgresql?.cloudSql?.instance;
     if (!instanceName) {
         throw new error_1.FirebaseError("Data Connect schema must have a postgres datasource with a CloudSQL instance.");
     }
     const instanceId = instanceName.split("/").pop();
-    const serviceName = schema.name.replace(`/schemas/${types_1.MAIN_SCHEMA_ID}`, "");
+    const serviceName = serviceNameFromSchema(schema);
     return {
         databaseId,
         instanceId,
@@ -258,7 +287,10 @@ function getIdentifiers(schema) {
         serviceName,
     };
 }
-exports.getIdentifiers = getIdentifiers;
+function serviceNameFromSchema(schema) {
+    const regex = /\/schemas\/[^/]*$/;
+    return schema.name.replace(regex, "");
+}
 function suggestedCommand(serviceName, invalidConnectorNames) {
     const serviceId = serviceName.split("/")[5];
     const connectorIds = invalidConnectorNames.map((i) => i.split("/")[7]);
@@ -371,7 +403,10 @@ async function promptForInvalidConnectorError(options, serviceName, invalidConne
         return true;
     }
     if (!options.nonInteractive &&
-        (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: `Would you like to delete and recreate these connectors? This will cause ${clc.red(`downtime`)}.` })))) {
+        (await (0, prompt_1.confirm)({
+            ...options,
+            message: `Would you like to delete and recreate these connectors? This will cause ${clc.red(`downtime`)}.`,
+        }))) {
         return true;
     }
     const cmd = suggestedCommand(serviceName, invalidConnectors);
@@ -386,13 +421,12 @@ function displayInvalidConnectors(invalidConnectors) {
     (0, utils_1.logLabeledWarning)("dataconnect", `This is a ${clc.red("breaking")} change and may break existing apps.`);
 }
 async function ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, linkIfNotConnected) {
-    var _a, _b, _c, _d;
     let currentSchema = await (0, client_1.getSchema)(serviceName);
-    let postgresql = (_b = (_a = currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema.datasources) === null || _a === void 0 ? void 0 : _a.find((d) => d.postgresql)) === null || _b === void 0 ? void 0 : _b.postgresql;
-    if ((currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema.reconciling) &&
-        (postgresql === null || postgresql === void 0 ? void 0 : postgresql.ephemeral) &&
-        ((_c = postgresql === null || postgresql === void 0 ? void 0 : postgresql.cloudSql) === null || _c === void 0 ? void 0 : _c.instance) &&
-        (postgresql === null || postgresql === void 0 ? void 0 : postgresql.schemaValidation) === "NONE") {
+    let postgresql = currentSchema?.datasources?.find((d) => d.postgresql)?.postgresql;
+    if (currentSchema?.reconciling &&
+        postgresql?.ephemeral &&
+        postgresql?.cloudSql?.instance &&
+        postgresql?.schemaValidation === "NONE") {
         const [, , , , , serviceId] = serviceName.split("/");
         const [, projectId, , , , instanceId] = postgresql.cloudSql.instance.split("/");
         throw new error_1.FirebaseError(`While checking the service ${serviceId}, ` + (0, provisionCloudSql_1.cloudSQLBeingCreated)(projectId, instanceId));
@@ -419,7 +453,7 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceName, dat
         postgresql = currentSchema.datasources[0].postgresql;
     }
     let alreadyConnected = !postgresql.ephemeral || false;
-    if (((_d = postgresql.cloudSql) === null || _d === void 0 ? void 0 : _d.instance) && postgresql.cloudSql.instance !== instanceName) {
+    if (postgresql.cloudSql?.instance && postgresql.cloudSql.instance !== instanceName) {
         alreadyConnected = false;
         (0, utils_1.logLabeledWarning)("dataconnect", `Switching connected Cloud SQL instance\n From ${postgresql.cloudSql.instance}\n To ${instanceName}`);
     }
@@ -437,13 +471,12 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceName, dat
         await (0, client_1.upsertSchema)(currentSchema, false);
     }
     catch (err) {
-        if ((err === null || err === void 0 ? void 0 : err.status) >= 500) {
+        if (err?.status >= 500) {
             throw err;
         }
         logger_1.logger.debug(`Failed to ensure service is connected to Cloud SQL: ${err.message}`);
     }
 }
-exports.ensureServiceIsConnectedToCloudSql = ensureServiceIsConnectedToCloudSql;
 function displayStartSchemaDiff(validationMode) {
     switch (validationMode) {
         case "COMPATIBLE":

package/lib/dataconnect/types.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGraphQLResponseError = exports.isGraphQLResponse = exports.isMainSchema = exports.mainSchema = exports.mainSchemaYaml = exports.toDatasource = exports.requiresVector = exports.MAIN_SCHEMA_ID = void 0;
+exports.isGraphQLResponseError = exports.isGraphQLResponse = exports.MAIN_SCHEMA_ID = void 0;
+exports.requiresVector = requiresVector;
+exports.toDatasource = toDatasource;
+exports.mainSchemaYaml = mainSchemaYaml;
+exports.mainSchema = mainSchema;
+exports.isMainSchema = isMainSchema;
 exports.MAIN_SCHEMA_ID = "main";
 function requiresVector(dm) {
-    var _a, _b, _c, _d;
-    return (_d = (_c = (_b = (_a = dm === null || dm === void 0 ? void 0 : dm.primaryDataSource) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.requiredExtensions) === null || _c === void 0 ? void 0 : _c.includes("vector")) !== null && _d !== void 0 ? _d : false;
+    return dm?.primaryDataSource?.postgres?.requiredExtensions?.includes("vector") ?? false;
 }
-exports.requiresVector = requiresVector;
 function toDatasource(projectId, locationId, ds) {
-    if (ds === null || ds === void 0 ? void 0 : ds.postgresql) {
+    if (ds?.postgresql) {
         return {
             postgresql: {
                 database: ds.postgresql.database,
@@ -19,7 +22,7 @@ function toDatasource(projectId, locationId, ds) {
             },
         };
     }
-    if (ds === null || ds === void 0 ? void 0 : ds.httpGraphql) {
+    if (ds?.httpGraphql) {
         return {
             httpGraphql: {
                 uri: ds.httpGraphql.uri,
@@ -29,19 +32,16 @@ function toDatasource(projectId, locationId, ds) {
     }
     return {};
 }
-exports.toDatasource = toDatasource;
 function mainSchemaYaml(dataconnectYaml) {
-    var _a;
     if (dataconnectYaml.schema) {
         return dataconnectYaml.schema;
     }
-    const mainSch = (_a = dataconnectYaml.schemas) === null || _a === void 0 ? void 0 : _a.find((s) => s.id === exports.MAIN_SCHEMA_ID || !s.id);
+    const mainSch = dataconnectYaml.schemas?.find((s) => s.id === exports.MAIN_SCHEMA_ID || !s.id);
     if (!mainSch) {
         throw new Error(`Service ${dataconnectYaml.serviceId} has no main schema defined`);
     }
     return mainSch;
 }
-exports.mainSchemaYaml = mainSchemaYaml;
 function mainSchema(schemas) {
     const mainSch = schemas.find((s) => isMainSchema(s));
     if (!mainSch) {
@@ -49,11 +49,9 @@ function mainSchema(schemas) {
     }
     return mainSch;
 }
-exports.mainSchema = mainSchema;
 function isMainSchema(schema) {
     return schema.name.endsWith(`/schemas/${exports.MAIN_SCHEMA_ID}`);
 }
-exports.isMainSchema = isMainSchema;
 const isGraphQLResponse = (g) => !!g.data || !!g.errors;
 exports.isGraphQLResponse = isGraphQLResponse;
 const isGraphQLResponseError = (g) => !!g.error;

package/lib/dataconnect/webhook.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendVSCodeMessage = exports.port = exports.DEFAULT_PORT = exports.VSCODE_MESSAGE = void 0;
+exports.port = exports.DEFAULT_PORT = exports.VSCODE_MESSAGE = void 0;
+exports.sendVSCodeMessage = sendVSCodeMessage;
 const node_fetch_1 = require("node-fetch");
 const logger_1 = require("../logger");
 var VSCODE_MESSAGE;
@@ -8,7 +9,7 @@ var 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 = {}));
+})(VSCODE_MESSAGE || (exports.VSCODE_MESSAGE = VSCODE_MESSAGE = {}));
 exports.DEFAULT_PORT = "40001";
 exports.port = process.env.VSCODE_WEBHOOK_PORT || exports.DEFAULT_PORT;
 async function sendVSCodeMessage(body) {
@@ -29,4 +30,3 @@ async function sendVSCodeMessage(body) {
         logger_1.logger.debug(`Could not find VSCode notification endpoint: ${e}. If you are not running the Firebase Data Connect VSCode extension, this is expected and not an issue.`);
     }
 }
-exports.sendVSCodeMessage = sendVSCodeMessage;

package/lib/defaultCredentials.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasDefaultCredentials = exports.clearCredentials = exports.getCredentialPathAsync = void 0;
+exports.getCredentialPathAsync = getCredentialPathAsync;
+exports.clearCredentials = clearCredentials;
+exports.hasDefaultCredentials = hasDefaultCredentials;
 const fs = require("fs");
 const path = require("path");
 const google_auth_library_1 = require("google-auth-library");
@@ -29,7 +31,6 @@ async function getCredentialPathAsync(account) {
         });
     });
 }
-exports.getCredentialPathAsync = getCredentialPathAsync;
 function clearCredentials(account) {
     const filePath = credFilePath(account.user);
     if (!filePath) {
@@ -40,7 +41,6 @@ function clearCredentials(account) {
     }
     fs.unlinkSync(filePath);
 }
-exports.clearCredentials = clearCredentials;
 function getCredential(tokens) {
     if (tokens.refresh_token) {
         return {
@@ -88,4 +88,3 @@ async function hasDefaultCredentials() {
         return false;
     }
 }
-exports.hasDefaultCredentials = hasDefaultCredentials;

package/lib/deploy/apphosting/deploy.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const fs = require("fs");
 const path = require("path");
 const error_1 = require("../../error");
@@ -49,8 +50,7 @@ async function default_1(context, options) {
         bucketsPerLocation[loc] = resolvedName;
     }));
     await Promise.all(Object.values(context.backendConfigs).map(async (cfg) => {
-        var _a;
-        const rootDir = (_a = options.projectRoot) !== null && _a !== void 0 ? _a : process.cwd();
+        const rootDir = options.projectRoot ?? process.cwd();
         let builtAppDir;
         if (cfg.localBuild) {
             builtAppDir = context.backendLocalBuilds[cfg.backendId].buildDir;
@@ -75,4 +75,3 @@ async function default_1(context, options) {
             `gs://${bucketName}/${path.basename(zippedSourcePath)}`;
     }));
 }
-exports.default = default_1;

package/lib/deploy/apphosting/prepare.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackendConfigs = void 0;
+exports.default = default_1;
+exports.getBackendConfigs = getBackendConfigs;
 const path = require("path");
 const backend_1 = require("../../apphosting/backend");
 const apphosting_1 = require("../../gcp/apphosting");
@@ -11,7 +12,6 @@ const utils_1 = require("../../utils");
 const localbuilds_1 = require("../../apphosting/localbuilds");
 const error_1 = require("../../error");
 async function default_1(context, options) {
-    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, apphosting_1.ensureApiEnabled)(options);
     await (0, backend_1.ensureRequiredApisEnabled)(projectId);
@@ -55,7 +55,7 @@ async function default_1(context, options) {
         }
         const backend = filteredBackends[0];
         const { location } = (0, apphosting_1.parseBackendName)(backend.name);
-        if (cfg.alwaysDeployFromSource === undefined && ((_a = backend.codebase) === null || _a === void 0 ? void 0 : _a.repository)) {
+        if (cfg.alwaysDeployFromSource === undefined && backend.codebase?.repository) {
             const { connectionName, id } = (0, devConnect_1.parseGitRepositoryLinkName)(backend.codebase.repository);
             const gitRepositoryLink = await (0, devConnect_1.getGitRepositoryLink)(projectId, location, connectionName, id);
             if (!options.force) {
@@ -129,7 +129,6 @@ async function default_1(context, options) {
         }
     }
 }
-exports.default = default_1;
 function getBackendConfigs(options) {
     if (!options.config.src.apphosting) {
         return [];
@@ -158,4 +157,3 @@ function getBackendConfigs(options) {
     }
     return backendConfigs.filter((cfg) => backendIds.includes(cfg.backendId));
 }
-exports.getBackendConfigs = getBackendConfigs;

package/lib/deploy/apphosting/release.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const ora = require("ora");
 const api_1 = require("../../api");
 const backend_1 = require("../../apphosting/backend");
@@ -52,4 +53,3 @@ async function default_1(context, options) {
     }
     rolloutsSpinner.stop();
 }
-exports.default = default_1;

package/lib/deploy/apphosting/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createArchive = void 0;
+exports.createArchive = createArchive;
 const archiver = require("archiver");
 const fs = require("fs");
 const path = require("path");
@@ -39,7 +39,6 @@ async function createArchive(config, rootDir, targetSubDir) {
     }
     return tmpFile;
 }
-exports.createArchive = createArchive;
 function parseGitIgnorePatterns(projectRoot, gitIgnorePath = ".gitignore") {
     const absoluteFilePath = path.resolve(projectRoot, gitIgnorePath);
     if (!fs.existsSync(absoluteFilePath)) {

package/lib/deploy/database/deploy.js

@@ -1,5 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = void 0;
-async function deploy() { }
 exports.deploy = deploy;
+async function deploy() { }

package/lib/deploy/database/prepare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepare = void 0;
+exports.prepare = prepare;
 const clc = require("colorette");
 const path = require("path");
 const error_1 = require("../../error");
@@ -49,4 +49,3 @@ function prepare(context, options) {
         });
     }));
 }
-exports.prepare = prepare;

package/lib/deploy/database/release.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.release = void 0;
+exports.release = release;
 const clc = require("colorette");
 const rtdb = require("../../rtdb");
 const utils = require("../../utils");
@@ -27,4 +27,3 @@ function release(context) {
         });
     }));
 }
-exports.release = release;

package/lib/deploy/dataconnect/context.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployStatsParams = exports.initDeployStats = void 0;
+exports.initDeployStats = initDeployStats;
+exports.deployStatsParams = deployStatsParams;
 function initDeployStats() {
     return {
         numBuildErrors: 0,
@@ -15,12 +16,22 @@ function initDeployStats() {
         numSchemaInvalidConnectors: 0,
     };
 }
-exports.initDeployStats = initDeployStats;
 function deployStatsParams(stats) {
     const buildWarnings = {};
     for (const [type, num] of stats.numBuildWarnings.entries()) {
         buildWarnings[`num_build_warnings_${type}`] = num;
     }
-    return Object.assign({ missing_billing: (!!stats.missingBilling).toString(), num_service_created: stats.numServiceCreated, num_service_deleted: stats.numServiceDeleted, num_schema_migrated: stats.numSchemaMigrated, num_connector_updated_before_schema: stats.numConnectorUpdatedBeforeSchema, num_connector_updated_after_schema: stats.numConnectorUpdatedAfterSchema, num_schema_skipped_due_to_pending_create: stats.numSchemaSkippedDueToPendingCreate, num_schema_sql_diffs: stats.numSchemaSqlDiffs, num_schema_invalid_connectors: stats.numSchemaInvalidConnectors, num_build_errors: stats.numBuildErrors }, buildWarnings);
+    return {
+        missing_billing: (!!stats.missingBilling).toString(),
+        num_service_created: stats.numServiceCreated,
+        num_service_deleted: stats.numServiceDeleted,
+        num_schema_migrated: stats.numSchemaMigrated,
+        num_connector_updated_before_schema: stats.numConnectorUpdatedBeforeSchema,
+        num_connector_updated_after_schema: stats.numConnectorUpdatedAfterSchema,
+        num_schema_skipped_due_to_pending_create: stats.numSchemaSkippedDueToPendingCreate,
+        num_schema_sql_diffs: stats.numSchemaSqlDiffs,
+        num_schema_invalid_connectors: stats.numSchemaInvalidConnectors,
+        num_build_errors: stats.numBuildErrors,
+        ...buildWarnings,
+    };
 }
-exports.deployStatsParams = deployStatsParams;

package/lib/deploy/dataconnect/deploy.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const client = require("../../dataconnect/client");
 const utils = require("../../utils");
 const types_1 = require("../../dataconnect/types");
@@ -27,7 +28,7 @@ async function default_1(context, options) {
         .filter((si) => !services.some((s) => matches(si, s)))
         .filter((si) => {
         return (!filters ||
-            (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId)));
+            filters?.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
     });
     dataconnect.deployStats.numServiceCreated = servicesToCreate.length;
     const servicesToDelete = filters
@@ -57,14 +58,13 @@ async function default_1(context, options) {
     await Promise.all(serviceInfos
         .filter((si) => {
         return (!filters ||
-            (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId)));
+            filters?.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
     })
         .map(async (s) => {
-        var _a, _b, _c;
         const postgresDatasource = (0, types_1.mainSchema)(s.schemas).datasources.find((d) => d.postgresql);
         if (postgresDatasource) {
-            const instanceId = (_b = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance.split("/").pop();
-            const databaseId = (_c = postgresDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database;
+            const instanceId = postgresDatasource.postgresql?.cloudSql?.instance.split("/").pop();
+            const databaseId = postgresDatasource.postgresql?.database;
             if (!instanceId || !databaseId) {
                 return Promise.resolve();
             }
@@ -80,7 +80,6 @@ async function default_1(context, options) {
     }));
     return;
 }
-exports.default = default_1;
 function matches(si, s) {
     return si.serviceName === s.name;
 }

package/lib/deploy/dataconnect/prepare.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const clc = require("colorette");
 const load_1 = require("../../dataconnect/load");
 const logger_1 = require("../../logger");
@@ -18,7 +19,6 @@ const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 const cloudbilling_1 = require("../../gcp/cloudbilling");
 const context_1 = require("./context");
 async function default_1(context, options) {
-    var _a, _b, _c;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
     context.dataconnect = {
@@ -34,7 +34,7 @@ async function default_1(context, options) {
     for (const si of serviceInfos) {
         si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory, deployStats);
     }
-    const unmatchedFilters = filters === null || filters === void 0 ? void 0 : filters.filter((f) => {
+    const unmatchedFilters = filters?.filter((f) => {
         const serviceMatched = serviceInfos.some((s) => s.dataConnectYaml.serviceId === f.serviceId);
         const connectorMatched = f.connectorId
             ? serviceInfos.some((s) => {
@@ -44,25 +44,24 @@ async function default_1(context, options) {
             : true;
         return !serviceMatched || !connectorMatched;
     });
-    if (unmatchedFilters === null || unmatchedFilters === void 0 ? void 0 : unmatchedFilters.length) {
+    if (unmatchedFilters?.length) {
         throw new error_1.FirebaseError(`The following filters were specified in --only but didn't match anything in this project: ${unmatchedFilters.map(filters_1.toString).map(clc.bold).join(", ")}`);
     }
     utils.logLabeledBullet("dataconnect", `Successfully compiled schema and connectors`);
     if (options.dryRun) {
         for (const si of serviceInfos) {
-            await (0, schemaMigration_1.diffSchema)(options, (0, types_1.mainSchema)(si.schemas), (_c = (_b = (_a = si.dataConnectYaml.schema) === null || _a === void 0 ? void 0 : _a.datasource) === null || _b === void 0 ? void 0 : _b.postgresql) === null || _c === void 0 ? void 0 : _c.schemaValidation);
+            await (0, schemaMigration_1.diffSchema)(options, (0, types_1.mainSchema)(si.schemas), si.dataConnectYaml.schema?.datasource?.postgresql?.schemaValidation);
         }
         utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
         await Promise.all(serviceInfos
             .filter((si) => {
-            return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
+            return !filters || filters?.some((f) => si.dataConnectYaml.serviceId === f.serviceId);
         })
             .map(async (s) => {
-            var _a, _b, _c;
             const postgresDatasource = (0, types_1.mainSchema)(s.schemas).datasources.find((d) => d.postgresql);
             if (postgresDatasource) {
-                const instanceId = (_b = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance.split("/").pop();
-                const databaseId = (_c = postgresDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database;
+                const instanceId = postgresDatasource.postgresql?.cloudSql?.instance.split("/").pop();
+                const databaseId = postgresDatasource.postgresql?.database;
                 if (!instanceId || !databaseId) {
                     return Promise.resolve();
                 }
@@ -81,4 +80,3 @@ async function default_1(context, options) {
     logger_1.logger.debug(JSON.stringify(context.dataconnect, null, 2));
     return;
 }
-exports.default = default_1;

package/lib/deploy/dataconnect/release.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const utils = require("../../utils");
 const types_1 = require("../../dataconnect/types");
 const client_1 = require("../../dataconnect/client");
@@ -23,13 +24,10 @@ async function default_1(context, options) {
                 return f.serviceId === si.dataConnectYaml.serviceId && (f.schemaOnly || f.fullService);
             }));
     })
-        .map((s) => {
-        var _a, _b;
-        return ({
-            schema: (0, types_1.mainSchema)(s.schemas),
-            validationMode: (_b = (_a = (0, types_1.mainSchemaYaml)(s.dataConnectYaml).datasource) === null || _a === void 0 ? void 0 : _a.postgresql) === null || _b === void 0 ? void 0 : _b.schemaValidation,
-        });
-    });
+        .map((s) => ({
+        schema: (0, types_1.mainSchema)(s.schemas),
+        validationMode: (0, types_1.mainSchemaYaml)(s.dataConnectYaml).datasource?.postgresql?.schemaValidation,
+    }));
     const wantConnectors = serviceInfos.flatMap((si) => si.connectorInfo
         .filter((c) => {
         return (!filters ||
@@ -72,8 +70,8 @@ async function default_1(context, options) {
         .map((s) => s.schemas.filter((s) => !(0, types_1.isMainSchema)(s)))
         .flatMap((s) => s);
     for (const schema of wantSecondarySchemas) {
-        await (0, client_1.upsertSchema)(schema, false);
-        utils.logLabeledSuccess("dataconnect", `Migrated schema ${schema.name}`);
+        await (0, schemaMigration_1.upsertSecondarySchema)({ options, schema, stats: dataconnect.deployStats });
+        utils.logLabeledSuccess("dataconnect", `Deployed schema ${schema.name}`);
         dataconnect.deployStats.numSchemaMigrated++;
     }
     await Promise.all(remainingConnectors.map(async (c) => {
@@ -101,7 +99,6 @@ async function default_1(context, options) {
 `);
     return;
 }
-exports.default = default_1;
 async function deployedConnectors(serviceInfos) {
     let connectors = [];
     for (const si of serviceInfos) {