firebase-tools 14.11.2 → 14.12.1

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.crashlyticsApiOrigin = exports.messagingApiOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authManagementOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
-exports.setScopes = exports.getScopes = exports.appTestingOrigin = exports.cloudAiCompanionOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = void 0;
+exports.setScopes = exports.getScopes = exports.appTestingOrigin = exports.cloudAiCompanionOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.studioApiOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = void 0;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
 const scopes = require("./scopes");
@@ -120,6 +120,8 @@ const cloudRunApiOrigin = () => utils.envOverride("CLOUD_RUN_API_URL", "https://
 exports.cloudRunApiOrigin = cloudRunApiOrigin;
 const serviceUsageOrigin = () => utils.envOverride("FIREBASE_SERVICE_USAGE_URL", "https://serviceusage.googleapis.com");
 exports.serviceUsageOrigin = serviceUsageOrigin;
+const studioApiOrigin = () => utils.envOverride("FIREBASE_STUDIO_URL", "https://monospace-pa.googleapis.com");
+exports.studioApiOrigin = studioApiOrigin;
 const githubOrigin = () => utils.envOverride("GITHUB_URL", "https://github.com");
 exports.githubOrigin = githubOrigin;
 const githubApiOrigin = () => utils.envOverride("GITHUB_API_URL", "https://api.github.com");

package/lib/command.js

@@ -12,8 +12,10 @@ const detectProjectRoot_1 = require("./detectProjectRoot");
 const track_1 = require("./track");
 const auth_1 = require("./auth");
 const projects_1 = require("./management/projects");
+const studio_1 = require("./management/studio");
 const requireAuth_1 = require("./requireAuth");
 const logger_1 = require("./logger");
+const env_1 = require("./env");
 class Command {
     constructor(cmd) {
         this.cmd = cmd;
@@ -184,19 +186,23 @@ class Command {
         if (activeAccount) {
             (0, auth_1.setActiveAccount)(options, activeAccount);
         }
-        this.applyRC(options);
+        await this.applyRC(options);
         if (options.project) {
             await this.resolveProjectIdentifiers(options);
             validateProjectId(options.projectId);
         }
     }
-    applyRC(options) {
+    async applyRC(options) {
         var _a, _b;
         const rc = (0, rc_1.loadRC)(options);
         options.rc = rc;
-        const activeProject = options.projectRoot
+        let activeProject = options.projectRoot
             ? ((_a = configstore_1.configstore.get("activeProjects")) !== null && _a !== void 0 ? _a : {})[options.projectRoot]
             : undefined;
+        const isUseCommand = process.argv.includes("use");
+        if ((0, env_1.isFirebaseStudio)() && !options.project && !isUseCommand) {
+            activeProject = await (0, studio_1.reconcileStudioFirebaseProject)(options, activeProject);
+        }
         options.project = (_b = options.project) !== null && _b !== void 0 ? _b : activeProject;
         if (options.config && !options.project) {
             options.project = options.config.defaults.project;

package/lib/commands/firestore-databases-create.js

@@ -14,6 +14,7 @@ const error_1 = require("../error");
 exports.command = new command_1.Command("firestore:databases:create <database>")
     .description("create a database in your Firebase project")
     .option("--location <locationId>", "region to create database, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations (required)")
+    .option("--edition <edition>", "the edition of the database to create, for example 'standard' or 'enterprise'. If not provided, 'standard' is used as a default.")
     .option("--delete-protection <deleteProtectionState>", "whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'")
     .option("--point-in-time-recovery <enablement>", "whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'")
     .option("-k, --kms-key-name <kmsKeyName>", "the resource ID of a Cloud KMS key. If set, the database created will be a " +
@@ -29,6 +30,15 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
         throw new error_1.FirebaseError(`Missing required flag --location. ${helpCommandText}`);
     }
     const type = types.DatabaseType.FIRESTORE_NATIVE;
+    let databaseEdition = types.DatabaseEdition.STANDARD;
+    if (options.edition) {
+        const edition = options.edition.toUpperCase();
+        if (edition !== types.DatabaseEdition.STANDARD &&
+            edition !== types.DatabaseEdition.ENTERPRISE) {
+            throw new error_1.FirebaseError(`Invalid value for flag --edition. ${helpCommandText}`);
+        }
+        databaseEdition = edition;
+    }
     if (options.deleteProtection &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.ENABLED &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.DISABLED) {
@@ -56,6 +66,7 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
         databaseId: database,
         locationId: options.location,
         type,
+        databaseEdition,
         deleteProtectionState,
         pointInTimeRecoveryEnablement,
         cmekConfig,

package/lib/commands/init.js

@@ -16,7 +16,6 @@ const utils = require("../utils");
 const experiments_1 = require("../experiments");
 const templates_1 = require("../templates");
 const error_1 = require("../error");
-const track_1 = require("../track");
 const homeDir = os.homedir();
 const BANNER_TEXT = (0, templates_1.readTemplateSync)("banner.txt");
 const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
@@ -106,6 +105,12 @@ if ((0, experiments_1.isEnabled)("apptesting")) {
         checked: false,
     });
 }
+choices.push({
+    value: "aitools",
+    name: "AI Tools: Configure AI coding assistants to work with your Firebase project",
+    checked: false,
+    hidden: true,
+});
 const featureNames = choices.map((choice) => choice.value);
 const HELP = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 
@@ -122,14 +127,13 @@ exports.command = new command_1.Command("init [feature]")
     .before(requireAuth_1.requireAuth)
     .action(initAction);
 async function initAction(feature, options) {
-    var _a, _b;
+    var _a;
     if (feature && !featureNames.includes(feature)) {
         return utils.reject(clc.bold(feature) +
             " is not a supported feature; must be one of " +
             featureNames.join(", ") +
             ".");
     }
-    const start = process.uptime();
     const cwd = options.cwd || process.cwd();
     const warnings = [];
     let warningText = "";
@@ -209,8 +213,6 @@ async function initAction(feature, options) {
     if (!fsutils.fileExistsSync(config.path(".gitignore"))) {
         config.writeProjectFile(".gitignore", GITIGNORE_TEMPLATE);
     }
-    const duration = Math.floor((process.uptime() - start) * 1000);
-    await (0, track_1.trackGA4)("product_init", { products_initialized: (_b = setup.features) === null || _b === void 0 ? void 0 : _b.join(",") }, duration);
     logger_1.logger.info();
     utils.logSuccess("Firebase initialization complete!");
 }

package/lib/commands/internaltesting-functions-discover.js

@@ -8,6 +8,10 @@ const projectConfig_1 = require("../functions/projectConfig");
 const adminSdkConfig_1 = require("../emulator/adminSdkConfig");
 const projectUtils_1 = require("../projectUtils");
 const error_1 = require("../error");
+const ensureApiEnabled = require("../ensureApiEnabled");
+const api_1 = require("../api");
+const experiments = require("../experiments");
+const prepareFunctionsUpload_1 = require("../deploy/functions/prepareFunctionsUpload");
 exports.command = new command_1.Command("internaltesting:functions:discover")
     .description("discover function triggers defined in the current project directory")
     .action(async (options) => {
@@ -17,9 +21,20 @@ exports.command = new command_1.Command("internaltesting:functions:discover")
     if (!firebaseConfig) {
         throw new error_1.FirebaseError("Admin SDK config unexpectedly undefined - have you run firebase init?");
     }
-    const builds = await (0, prepare_1.loadCodebases)(fnConfig, options, firebaseConfig, {
-        firebase: firebaseConfig,
-    });
-    logger_1.logger.info(JSON.stringify(builds, null, 2));
-    return builds;
+    let runtimeConfig = { firebase: firebaseConfig };
+    const allowFunctionsConfig = experiments.isEnabled("dangerouslyAllowFunctionsConfig");
+    if (allowFunctionsConfig) {
+        try {
+            const runtimeConfigApiEnabled = await ensureApiEnabled.check(projectId, (0, api_1.runtimeconfigOrigin)(), "runtimeconfig", true);
+            if (runtimeConfigApiEnabled) {
+                runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug("Could not check Runtime Config API status, assuming disabled:", err);
+        }
+    }
+    const wantBuilds = await (0, prepare_1.loadCodebases)(fnConfig, options, firebaseConfig, runtimeConfig, undefined);
+    logger_1.logger.info(JSON.stringify(wantBuilds, null, 2));
+    return wantBuilds;
 });

package/lib/commands/use.js

@@ -4,12 +4,14 @@ exports.command = exports.setNewActive = void 0;
 const clc = require("colorette");
 const command_1 = require("../command");
 const projects_1 = require("../management/projects");
+const studio_1 = require("../management/studio");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const requireAuth_1 = require("../requireAuth");
 const command_2 = require("../command");
 const utils = require("../utils");
 const error_1 = require("../error");
+const env_1 = require("../env");
 function listAliases(options) {
     if (options.rc.hasProjects) {
         logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot || "") + ":");
@@ -41,6 +43,9 @@ async function setNewActive(projectOrAlias, aliasOpt, rc, projectRoot) {
     catch (_a) {
         throw new error_1.FirebaseError("Invalid project selection, " + verifyMessage(projectOrAlias));
     }
+    if ((0, env_1.isFirebaseStudio)()) {
+        await (0, studio_1.updateStudioFirebaseProject)(resolvedProject);
+    }
     if (aliasOpt) {
         if (!project) {
             throw new error_1.FirebaseError(`Cannot create alias ${clc.bold(aliasOpt)}, ${verifyMessage(projectOrAlias)}`);

package/lib/crashlytics/buildToolsJarHelper.js

@@ -8,7 +8,6 @@ const spawn = require("cross-spawn");
 const downloadUtils = require("../downloadUtils");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const node_fs_1 = require("node:fs");
 const utils = require("../utils");
 const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
     path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
@@ -26,7 +25,7 @@ async function fetchBuildtoolsJar() {
     }
     if (fs.existsSync(JAR_CACHE_DIR)) {
         logger_1.logger.debug(`Deleting Jar cache at ${JAR_CACHE_DIR} because the CLI was run with a newer Jar version`);
-        (0, node_fs_1.rmSync)(JAR_CACHE_DIR, { recursive: true });
+        fs.rmSync(JAR_CACHE_DIR, { recursive: true, force: true });
     }
     utils.logBullet("Downloading crashlytics-buildtools.jar to " + jarPath);
     utils.logBullet("For open source licenses used by this command, look in the META-INF directory in the buildtools.jar file");

package/lib/dataconnect/ensureApis.js

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

package/lib/deploy/dataconnect/prepare.js

@@ -19,7 +19,7 @@ const types_1 = require("../../dataconnect/types");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 const freeTrial_1 = require("../../dataconnect/freeTrial");
 async function default_1(context, options) {
-    var _a;
+    var _a, _b, _c;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     if (!(await (0, cloudbilling_1.checkBillingEnabled)(projectId))) {
         throw new error_1.FirebaseError((0, freeTrial_1.upgradeInstructions)(projectId));
@@ -53,7 +53,7 @@ async function default_1(context, options) {
     utils.logLabeledBullet("dataconnect", `Successfully prepared schema and connectors`);
     if (options.dryRun) {
         for (const si of serviceInfos) {
-            await (0, schemaMigration_1.diffSchema)(options, si.schema, (_a = si.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation);
+            await (0, schemaMigration_1.diffSchema)(options, si.schema, (_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);
         }
         utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
         await Promise.all(serviceInfos

package/lib/deploy/dataconnect/release.js

@@ -17,10 +17,10 @@ async function default_1(context, options) {
             }));
     })
         .map((s) => {
-        var _a;
+        var _a, _b, _c, _d;
         return ({
             schema: s.schema,
-            validationMode: (_a = s.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation,
+            validationMode: (_d = (_c = (_b = (_a = s.dataConnectYaml) === null || _a === void 0 ? void 0 : _a.schema) === null || _b === void 0 ? void 0 : _b.datasource) === null || _c === void 0 ? void 0 : _c.postgresql) === null || _d === void 0 ? void 0 : _d.schemaValidation,
         });
     });
     if (wantSchemas.length) {

package/lib/deploy/firestore/deploy.js

@@ -22,6 +22,15 @@ async function createDatabase(context, options) {
     if (!firestoreCfg.database) {
         firestoreCfg.database = "(default)";
     }
+    let edition = types.DatabaseEdition.STANDARD;
+    if (firestoreCfg.edition) {
+        const upperEdition = firestoreCfg.edition.toUpperCase();
+        if (upperEdition !== types.DatabaseEdition.STANDARD &&
+            upperEdition !== types.DatabaseEdition.ENTERPRISE) {
+            throw new error_1.FirebaseError(`Invalid edition specified for database in firebase.json: ${firestoreCfg.edition}`);
+        }
+        edition = upperEdition;
+    }
     const api = new api_1.FirestoreApi();
     try {
         await api.getDatabase(options.projectId, firestoreCfg.database);
@@ -34,6 +43,7 @@ async function createDatabase(context, options) {
                 databaseId: firestoreCfg.database,
                 locationId: firestoreCfg.location || "nam5",
                 type: types.DatabaseType.FIRESTORE_NATIVE,
+                databaseEdition: edition,
                 deleteProtectionState: types.DatabaseDeleteProtectionState.DISABLED,
                 pointInTimeRecoveryEnablement: types.PointInTimeRecoveryEnablement.DISABLED,
             };

package/lib/deploy/functions/prepare.js

@@ -11,6 +11,7 @@ const runtimes = require("./runtimes");
 const supported = require("./runtimes/supported");
 const validate = require("./validate");
 const ensure = require("./ensure");
+const experiments = require("../../experiments");
 const api_1 = require("../../api");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const utils_1 = require("../../utils");
@@ -51,13 +52,12 @@ async function prepare(context, options, payload) {
     ]);
     const firebaseConfig = await functionsConfig.getFirebaseConfig(options);
     context.firebaseConfig = firebaseConfig;
+    context.codebaseDeployEvents = {};
     let runtimeConfig = { firebase: firebaseConfig };
-    if (checkAPIsEnabled[1]) {
-        const config = await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId);
-        runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), config);
-        context.hasRuntimeConfig = Object.keys(config).length > 0;
+    const allowFunctionsConfig = experiments.isEnabled("dangerouslyAllowFunctionsConfig");
+    if (allowFunctionsConfig && checkAPIsEnabled[1]) {
+        runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
     }
-    context.codebaseDeployEvents = {};
     const wantBuilds = await loadCodebases(context.config, options, firebaseConfig, runtimeConfig, context.filters);
     if (Object.values(wantBuilds).some((b) => b.extensions)) {
         const extContext = {};

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -74,7 +74,9 @@ async function packageSource(sourceDir, config, runtimeConfig) {
                 name: CONFIG_DEST_FILE,
                 mode: 420,
             });
-            (0, deprecationWarnings_1.logFunctionsConfigDeprecationWarning)();
+            if (Object.keys(runtimeConfig).some((k) => k !== "firebase")) {
+                (0, deprecationWarnings_1.logFunctionsConfigDeprecationWarning)();
+            }
         }
         await pipeAsync(archive, fileStream);
     }

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.10.1",
-            "expectedSize": 29336416,
-            "expectedChecksum": "328ae0a354505430f1c162edf37da776",
-            "expectedChecksumSHA256": "ede5dc299045151f228b2adc346f47ad5d3ee10c3c9d7528df5fc0f0c6d70808",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.10.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.10.1"
+            "version": "2.11.1",
+            "expectedSize": 29352800,
+            "expectedChecksum": "52d86a5546bbb9e2fcd67faa90b9f07e",
+            "expectedChecksumSHA256": "217b66589c32d4378201100fa968e69f7c94537044b892be1aaa14d7f6ce6b12",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1"
         },
         "win32": {
-            "version": "2.10.1",
-            "expectedSize": 29829632,
-            "expectedChecksum": "82e82e35c1728a214db37967dba751e7",
-            "expectedChecksumSHA256": "ba509e921c692ac60c1138b5b9c83a23b4e11feb339f08df5f1cfced44cffc91",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.10.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.10.1.exe"
+            "version": "2.11.1",
+            "expectedSize": 29841920,
+            "expectedChecksum": "704cee75ad2d384cf28ac1683c8d1179",
+            "expectedChecksumSHA256": "fadb5a1d0f03160c133389df9d452cc620cfdface041971a5356ac5a69e937ff",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1.exe"
         },
         "linux": {
-            "version": "2.10.1",
-            "expectedSize": 29266104,
-            "expectedChecksum": "d183c2335e16f8c568bdc9e782dcd240",
-            "expectedChecksumSHA256": "338e0cce561d29993737b91abfe7fc12c7d82d014ef114348ccdafeb3b7be3ae",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.10.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.10.1"
+            "version": "2.11.1",
+            "expectedSize": 29282488,
+            "expectedChecksum": "435656eab760033228bf7b7e77d56dde",
+            "expectedChecksumSHA256": "0abb33c0bba0ed8ef1394cc1cab5a333ec81b3dddf48aa625abe8ca28f38840e",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1"
         }
     }
 }

package/lib/firestore/api-sort.js

@@ -8,6 +8,19 @@ const QUERY_SCOPE_SEQUENCE = [
     API.QueryScope.COLLECTION,
     undefined,
 ];
+const API_SCOPE_SEQUENCE = [
+    API.ApiScope.ANY_API,
+    API.ApiScope.DATASTORE_MODE_API,
+    API.ApiScope.MONGODB_COMPATIBLE_API,
+    undefined,
+];
+const DENSITY_SEQUENCE = [
+    API.Density.DENSITY_UNSPECIFIED,
+    API.Density.SPARSE_ALL,
+    API.Density.SPARSE_ANY,
+    API.Density.DENSE,
+    undefined,
+];
 const ORDER_SEQUENCE = [API.Order.ASCENDING, API.Order.DESCENDING, undefined];
 const ARRAY_CONFIG_SEQUENCE = [API.ArrayConfig.CONTAINS, undefined];
 function compareSpecIndex(a, b) {
@@ -17,7 +30,23 @@ function compareSpecIndex(a, b) {
     if (a.queryScope !== b.queryScope) {
         return compareQueryScope(a.queryScope, b.queryScope);
     }
-    return compareArrays(a.fields, b.fields, compareIndexField);
+    let cmp = compareArrays(a.fields, b.fields, compareIndexField);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareApiScope(a.apiScope, b.apiScope);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareDensity(a.density, b.density);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareBoolean(a.multikey, b.multikey);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    return compareBoolean(a.unique, b.unique);
 }
 exports.compareSpecIndex = compareSpecIndex;
 function compareApiIndex(a, b) {
@@ -31,7 +60,23 @@ function compareApiIndex(a, b) {
     if (a.queryScope !== b.queryScope) {
         return compareQueryScope(a.queryScope, b.queryScope);
     }
-    return compareArrays(a.fields, b.fields, compareIndexField);
+    let cmp = compareArrays(a.fields, b.fields, compareIndexField);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareApiScope(a.apiScope, b.apiScope);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareDensity(a.density, b.density);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareBoolean(a.multikey, b.multikey);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    return compareBoolean(a.unique, b.unique);
 }
 exports.compareApiIndex = compareApiIndex;
 function compareApiDatabase(a, b) {
@@ -115,14 +160,62 @@ function compareFieldIndex(a, b) {
     if (a.arrayConfig !== b.arrayConfig) {
         return compareArrayConfig(a.arrayConfig, b.arrayConfig);
     }
-    return 0;
+    let cmp = compareApiScope(a.apiScope, b.apiScope);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareDensity(a.density, b.density);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    cmp = compareBoolean(a.multikey, b.multikey);
+    if (cmp !== 0) {
+        return cmp;
+    }
+    return compareBoolean(a.unique, b.unique);
 }
 function compareQueryScope(a, b) {
     return QUERY_SCOPE_SEQUENCE.indexOf(a) - QUERY_SCOPE_SEQUENCE.indexOf(b);
 }
+function compareApiScope(a, b) {
+    if (a === b) {
+        return 0;
+    }
+    if (a === undefined) {
+        return -1;
+    }
+    if (b === undefined) {
+        return 1;
+    }
+    return API_SCOPE_SEQUENCE.indexOf(a) - API_SCOPE_SEQUENCE.indexOf(b);
+}
+function compareDensity(a, b) {
+    if (a === b) {
+        return 0;
+    }
+    if (a === undefined) {
+        return -1;
+    }
+    if (b === undefined) {
+        return 1;
+    }
+    return DENSITY_SEQUENCE.indexOf(a) - DENSITY_SEQUENCE.indexOf(b);
+}
 function compareOrder(a, b) {
     return ORDER_SEQUENCE.indexOf(a) - ORDER_SEQUENCE.indexOf(b);
 }
+function compareBoolean(a, b) {
+    if (a === b) {
+        return 0;
+    }
+    if (a === undefined) {
+        return -1;
+    }
+    if (b === undefined) {
+        return 1;
+    }
+    return Number(a) - Number(b);
+}
 function compareArrayConfig(a, b) {
     return ARRAY_CONFIG_SEQUENCE.indexOf(a) - ARRAY_CONFIG_SEQUENCE.indexOf(b);
 }

package/lib/firestore/api-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecurrenceType = exports.PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablementOption = exports.DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionStateOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
+exports.RecurrenceType = exports.DatabaseEdition = exports.PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablementOption = exports.DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionStateOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.Density = exports.ApiScope = exports.QueryScope = exports.Mode = void 0;
 var Mode;
 (function (Mode) {
     Mode["ASCENDING"] = "ASCENDING";
@@ -12,6 +12,19 @@ var QueryScope;
     QueryScope["COLLECTION"] = "COLLECTION";
     QueryScope["COLLECTION_GROUP"] = "COLLECTION_GROUP";
 })(QueryScope = exports.QueryScope || (exports.QueryScope = {}));
+var ApiScope;
+(function (ApiScope) {
+    ApiScope["ANY_API"] = "ANY_API";
+    ApiScope["DATASTORE_MODE_API"] = "DATASTORE_MODE_API";
+    ApiScope["MONGODB_COMPATIBLE_API"] = "MONGODB_COMPATIBLE_API";
+})(ApiScope = exports.ApiScope || (exports.ApiScope = {}));
+var Density;
+(function (Density) {
+    Density["DENSITY_UNSPECIFIED"] = "DENSITY_UNSPECIFIED";
+    Density["SPARSE_ALL"] = "SPARSE_ALL";
+    Density["SPARSE_ANY"] = "SPARSE_ANY";
+    Density["DENSE"] = "DENSE";
+})(Density = exports.Density || (exports.Density = {}));
 var Order;
 (function (Order) {
     Order["ASCENDING"] = "ASCENDING";
@@ -58,6 +71,12 @@ var PointInTimeRecoveryEnablement;
     PointInTimeRecoveryEnablement["ENABLED"] = "POINT_IN_TIME_RECOVERY_ENABLED";
     PointInTimeRecoveryEnablement["DISABLED"] = "POINT_IN_TIME_RECOVERY_DISABLED";
 })(PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablement || (exports.PointInTimeRecoveryEnablement = {}));
+var DatabaseEdition;
+(function (DatabaseEdition) {
+    DatabaseEdition["DATABASE_EDITION_UNSPECIFIED"] = "DATABASE_EDITION_UNSPECIFIED";
+    DatabaseEdition["STANDARD"] = "STANDARD";
+    DatabaseEdition["ENTERPRISE"] = "ENTERPRISE";
+})(DatabaseEdition = exports.DatabaseEdition || (exports.DatabaseEdition = {}));
 var RecurrenceType;
 (function (RecurrenceType) {
     RecurrenceType["DAILY"] = "DAILY";