firebase-tools 15.16.0 → 15.17.0

package/lib/api.js

@@ -66,7 +66,7 @@ const functionsV2Origin = () => utils.envOverride("FIREBASE_FUNCTIONS_V2_URL", "
 exports.functionsV2Origin = functionsV2Origin;
 const runOrigin = () => utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
 exports.runOrigin = runOrigin;
-const functionsDefaultRegion = () => utils.envOverride("FIREBASE_FUNCTIONS_DEFAULT_REGION", "us-central1");
+const functionsDefaultRegion = () => utils.envOverride("FIREBASE_FUNCTIONS_DEFAULT_REGION", "REGION_TBD");
 exports.functionsDefaultRegion = functionsDefaultRegion;
 const cloudbuildOrigin = () => utils.envOverride("FIREBASE_CLOUDBUILD_URL", "https://cloudbuild.googleapis.com");
 exports.cloudbuildOrigin = cloudbuildOrigin;

package/lib/deploy/apphosting/release.js

@@ -37,6 +37,7 @@ async function default_1(context, options) {
     (0, utils_1.logLabeledBullet)("apphosting", `You may also track the rollout(s) at:\n\t${(0, api_1.consoleOrigin)()}/project/${projectId}/apphosting`);
     const rolloutsSpinner = ora(`Starting rollout(s) for backend(s) ${backendIds.join(", ")}; this may take a few minutes. It's safe to exit now.\n`).start();
     const results = await Promise.allSettled(rollouts);
+    rolloutsSpinner.stop();
     let failed = false;
     for (let i = 0; i < results.length; i++) {
         const res = results[i];
@@ -51,7 +52,6 @@ async function default_1(context, options) {
             (0, utils_1.logLabeledError)("apphosting", `${res.reason}`);
         }
     }
-    rolloutsSpinner.stop();
     if (failed) {
         throw new error_1.FirebaseError("One or more rollouts failed. Please review the errors above and try again.");
     }

package/lib/deploy/functions/prepare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVENTARC_SOURCE_ENV = void 0;
+exports.DEFAULT_FUNCTION_REGION = exports.EVENTARC_SOURCE_ENV = void 0;
 exports.prepare = prepare;
 exports.matchRegionsForExisting = matchRegionsForExisting;
 exports.resolveDefaultRegions = resolveDefaultRegions;
@@ -23,6 +23,12 @@ const runtimes = require("./runtimes");
 const supported = require("./runtimes/supported");
 const validate = require("./validate");
 const ensure = require("./ensure");
+const events = require("../../functions/events/v1");
+const firestore_1 = require("./services/firestore");
+const storage_1 = require("./services/storage");
+const database_1 = require("./services/database");
+const ailogic_1 = require("./services/ailogic");
+const names_1 = require("../../dataconnect/names");
 const api_1 = require("../../api");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const utils_1 = require("../../utils");
@@ -43,6 +49,7 @@ const functional_1 = require("../../functional");
 const prepare_1 = require("../extensions/prepare");
 const prompt = require("../../prompt");
 exports.EVENTARC_SOURCE_ENV = "EVENTARC_CLOUD_EVENT_SOURCE";
+exports.DEFAULT_FUNCTION_REGION = "us-central1";
 async function prepare(context, options, payload) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
@@ -256,9 +263,112 @@ function matchRegionsForExisting(want, have) {
 }
 async function resolveDefaultRegions(want, have) {
     matchRegionsForExisting(want, have);
-    for (const endpoint of Object.values(want.endpoints[build.REGION_TBD] || {})) {
-        moveEndpointToRegion(want, endpoint, "us-central1");
+    const endpoints = Object.values(want.endpoints[build.REGION_TBD] || {});
+    for (const endpoint of endpoints) {
+        let resolvedRegion = "us-central1";
+        try {
+            if (backend.isBlockingTriggered(endpoint)) {
+                resolvedRegion = resolveRegionForBlockingTrigger(endpoint);
+            }
+            else if (backend.isEventTriggered(endpoint)) {
+                resolvedRegion = await resolveRegionForEventTrigger(endpoint);
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug(`Failed to resolve region for endpoint ${endpoint.id}. Defaulting to us-central1.`, (0, error_1.getErrStack)(err));
+        }
+        moveEndpointToRegion(want, endpoint, resolvedRegion);
+    }
+}
+function resolveRegionForBlockingTrigger(endpoint) {
+    const eventType = endpoint.blockingTrigger.eventType;
+    if (events.AUTH_BLOCKING_EVENTS.includes(eventType)) {
+        return "us-east1";
+    }
+    if ((0, ailogic_1.isGlobalAILogicEndpoint)(endpoint)) {
+        return "us-east1";
+    }
+    return exports.DEFAULT_FUNCTION_REGION;
+}
+async function resolveRegionForEventTrigger(endpoint) {
+    const eventTrigger = endpoint.eventTrigger;
+    const eventType = eventTrigger.eventType;
+    if (eventType.startsWith("google.cloud.pubsub.") ||
+        eventType.startsWith("providers/cloud.auth/eventTypes/") ||
+        eventType.startsWith("providers/firebase.auth/eventTypes/") ||
+        eventType.startsWith("google.firebase.testlab.") ||
+        eventType.startsWith("google.firebase.remoteconfig.") ||
+        eventType.startsWith("google.firebase.firebasealerts.")) {
+        return "us-east1";
+    }
+    if (eventType.startsWith("google.cloud.firestore.")) {
+        try {
+            const databaseId = eventTrigger.eventFilters?.database || "(default)";
+            const db = await (0, firestore_1.getDatabase)(endpoint.project, databaseId);
+            const locationId = db.locationId.toLowerCase();
+            if (locationId === "nam5" || locationId === "nam7")
+                return "us-central1";
+            if (locationId === "eur3")
+                return "europe-west1";
+            return locationId;
+        }
+        catch (err) {
+            logger_1.logger.debug("Failed to resolve Firestore database location", (0, error_1.getErrStack)(err));
+        }
+    }
+    if (eventType.startsWith("google.cloud.storage.")) {
+        try {
+            const bucketName = eventTrigger.eventFilters?.bucket;
+            if (bucketName) {
+                const bucket = await (0, storage_1.getBucket)(bucketName);
+                const locationId = bucket.location.toLowerCase();
+                if (locationId === "us")
+                    return "us-east1";
+                if (locationId === "eu")
+                    return "europe-west1";
+                if (locationId === "asia")
+                    return "asia-east1";
+                return locationId;
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug("Failed to resolve Cloud Storage bucket location", (0, error_1.getErrStack)(err));
+        }
+    }
+    if (eventType.startsWith("google.firebase.database.")) {
+        if (eventTrigger.region)
+            return eventTrigger.region;
+        try {
+            const instanceName = eventTrigger.eventFilters?.instance;
+            if (instanceName) {
+                const details = await (0, database_1.getDatabaseInstanceDetails)(endpoint.project, instanceName);
+                if (details.location && details.location !== "-") {
+                    return details.location.toLowerCase();
+                }
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug("Failed to resolve Realtime Database instance location", (0, error_1.getErrStack)(err));
+        }
+    }
+    if (eventType.startsWith("google.firebase.dataconnect.")) {
+        if (eventTrigger.region)
+            return eventTrigger.region;
+        try {
+            const service = eventTrigger.eventFilters?.service;
+            if (service) {
+                return (0, names_1.parseServiceName)(service).location;
+            }
+            const connector = eventTrigger.eventFilters?.connector;
+            if (connector) {
+                return (0, names_1.parseConnectorName)(connector).location;
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug("Failed to resolve DataConnect location", (0, error_1.getErrStack)(err));
+        }
     }
+    return exports.DEFAULT_FUNCTION_REGION;
 }
 function inferDetailsFromExisting(want, have, usedDotenv) {
     for (const wantE of backend.allEndpoints(want)) {

package/lib/deploy/functions/services/ailogic.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AILogicService = exports.AI_LOGIC_EVENTS = exports.AI_LOGIC_AFTER_GENERATE_CONTENT = exports.AI_LOGIC_BEFORE_GENERATE_CONTENT = void 0;
 exports.isAILogicEvent = isAILogicEvent;
+exports.isGlobalAILogicEndpoint = isGlobalAILogicEndpoint;
 const backend = require("../backend");
 const error_1 = require("../../../error");
 const ailogicApi = require("../../../gcp/ailogic");
@@ -19,6 +20,12 @@ function isAILogicEvent(endpoint) {
     }
     return exports.AI_LOGIC_EVENTS.includes(endpoint.blockingTrigger.eventType);
 }
+function isGlobalAILogicEndpoint(endpoint) {
+    if (!isAILogicEvent(endpoint)) {
+        return false;
+    }
+    return !endpoint.blockingTrigger.options?.regionalWebhook;
+}
 class AILogicService {
     constructor() {
         this.ensureTriggerRegion = () => Promise.resolve();

package/lib/deploy/functions/services/database.js

@@ -1,7 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearCache = clearCache;
+exports.getDatabaseInstanceDetails = getDatabaseInstanceDetails;
 exports.ensureDatabaseTriggerRegion = ensureDatabaseTriggerRegion;
 const error_1 = require("../../../error");
+const database_1 = require("../../../management/database");
+const instanceCache = new Map();
+function clearCache() {
+    instanceCache.clear();
+}
+async function getDatabaseInstanceDetails(projectId, instanceName) {
+    const key = `${projectId}/${instanceName}`;
+    if (instanceCache.has(key)) {
+        return instanceCache.get(key);
+    }
+    const details = await (0, database_1.getDatabaseInstanceDetails)(projectId, instanceName);
+    instanceCache.set(key, details);
+    return details;
+}
 function ensureDatabaseTriggerRegion(endpoint) {
     if (!endpoint.eventTrigger.region) {
         endpoint.eventTrigger.region = endpoint.region;

package/lib/deploy/functions/services/firestore.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearCache = clearCache;
+exports.getDatabase = getDatabase;
 exports.ensureFirestoreTriggerRegion = ensureFirestoreTriggerRegion;
 const firestore = require("../../../gcp/firestore");
 const error_1 = require("../../../error");

package/lib/deploy/functions/services/storage.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearCache = clearCache;
+exports.getBucket = getBucket;
 exports.obtainStorageBindings = obtainStorageBindings;
 exports.ensureStorageTriggerRegion = ensureStorageTriggerRegion;
 const storage = require("../../../gcp/storage");
@@ -7,6 +9,18 @@ const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const location_1 = require("../../../gcp/location");
 const PUBSUB_PUBLISHER_ROLE = "roles/pubsub.publisher";
+const bucketCache = new Map();
+function clearCache() {
+    bucketCache.clear();
+}
+async function getBucket(bucketName) {
+    if (bucketCache.has(bucketName)) {
+        return bucketCache.get(bucketName);
+    }
+    const b = await storage.getBucket(bucketName);
+    bucketCache.set(bucketName, b);
+    return b;
+}
 async function obtainStorageBindings(projectNumber) {
     const storageResponse = await storage.getServiceAccount(projectNumber);
     const storageServiceAgent = `serviceAccount:${storageResponse.email_address}`;
@@ -26,7 +40,7 @@ async function ensureStorageTriggerRegion(endpoint) {
         }
         logger_1.logger.debug(`Looking up bucket region for the storage event trigger on bucket ${eventTrigger.eventFilters.bucket}`);
         try {
-            const bucket = await storage.getBucket(eventTrigger.eventFilters.bucket);
+            const bucket = await getBucket(eventTrigger.eventFilters.bucket);
             eventTrigger.region = bucket.location.toLowerCase();
             logger_1.logger.debug("Setting the event trigger region to", eventTrigger.region, ".");
         }

package/lib/deploy/functions/triggerRegionHelper.js

@@ -3,13 +3,122 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureTriggerRegions = ensureTriggerRegions;
 const backend = require("./backend");
 const services_1 = require("./services");
+const logger_1 = require("../../logger");
+const utils = require("../../utils");
+const storage_1 = require("./services/storage");
+const firestore_1 = require("./services/firestore");
+const database_1 = require("./services/database");
 async function ensureTriggerRegions(want) {
     const regionLookups = [];
+    const triggerRegionMap = new Map();
     for (const ep of backend.allEndpoints(want)) {
-        if (ep.platform === "gcfv1" || !backend.isEventTriggered(ep)) {
+        if (!backend.isEventTriggered(ep)) {
             continue;
         }
-        regionLookups.push((0, services_1.serviceForEndpoint)(ep).ensureTriggerRegion(ep));
+        if (ep.platform === "gcfv1") {
+            const eventType = ep.eventTrigger.eventType || "";
+            const resource = ep.eventTrigger.eventFilters?.resource;
+            if (eventType.includes("storage")) {
+                const bucketName = extractBucketName(resource);
+                if (bucketName) {
+                    regionLookups.push((0, storage_1.getBucket)(bucketName)
+                        .then((bucket) => {
+                        triggerRegionMap.set(backend.functionName(ep), bucket.location.toLowerCase());
+                    })
+                        .catch((err) => {
+                        logger_1.logger.debug(`Failed to resolve trigger region for V1 storage function ${ep.id}:`, err);
+                    }));
+                }
+            }
+            else if (eventType.includes("firestore")) {
+                const dbId = extractDatabaseId(resource);
+                regionLookups.push((0, firestore_1.getDatabase)(ep.project, dbId)
+                    .then((db) => {
+                    triggerRegionMap.set(backend.functionName(ep), db.locationId.toLowerCase());
+                })
+                    .catch((err) => {
+                    logger_1.logger.debug(`Failed to resolve trigger region for V1 firestore function ${ep.id}:`, err);
+                }));
+            }
+            else if (eventType.includes("database")) {
+                const instanceName = extractInstanceName(resource);
+                if (instanceName) {
+                    regionLookups.push((0, database_1.getDatabaseInstanceDetails)(ep.project, instanceName)
+                        .then((details) => {
+                        if (details.location && details.location !== "-") {
+                            triggerRegionMap.set(backend.functionName(ep), details.location.toLowerCase());
+                        }
+                    })
+                        .catch((err) => {
+                        logger_1.logger.debug(`Failed to resolve trigger region for V1 database function ${ep.id}:`, err);
+                    }));
+                }
+            }
+        }
+        else {
+            regionLookups.push((0, services_1.serviceForEndpoint)(ep).ensureTriggerRegion(ep));
+        }
     }
     await Promise.all(regionLookups);
+    if (process.env.FIREBASE_SUPPRESS_REGION_WARNING === "true") {
+        return;
+    }
+    const offendingFunctions = [];
+    for (const ep of backend.allEndpoints(want)) {
+        if (!backend.isEventTriggered(ep)) {
+            continue;
+        }
+        let triggerRegion;
+        if (ep.platform === "gcfv1") {
+            triggerRegion = triggerRegionMap.get(backend.functionName(ep));
+        }
+        else {
+            triggerRegion = ep.eventTrigger.region;
+        }
+        if (ep.region !== "us-central1" || !triggerRegion || triggerRegion === "global") {
+            continue;
+        }
+        if (!isUSRegion(triggerRegion)) {
+            offendingFunctions.push(`- ${ep.id} (us-central1, Trigger: ${triggerRegion})`);
+        }
+    }
+    if (offendingFunctions.length > 0) {
+        utils.logLabeledWarning("functions", `The following functions have triggers in different regions than they are located:\n` +
+            offendingFunctions.join("\n") +
+            `\nTo avoid unnecessary cross-region network hops, consider assigning these functions to their trigger regions or collocating them. ` +
+            `To suppress this warning, set FIREBASE_SUPPRESS_REGION_WARNING=true in your environment variables.`);
+    }
+}
+function extractBucketName(resource) {
+    if (!resource)
+        return null;
+    const match = /buckets\/([^/]+)/.exec(resource);
+    if (match)
+        return match[1];
+    if (!resource.includes("/"))
+        return resource;
+    return null;
+}
+function extractDatabaseId(resource) {
+    if (!resource)
+        return "(default)";
+    const match = /databases\/([^/]+)/.exec(resource);
+    if (match)
+        return match[1];
+    if (!resource.includes("/"))
+        return resource;
+    return "(default)";
+}
+function extractInstanceName(resource) {
+    if (!resource)
+        return null;
+    const match = /instances\/([^/]+)/.exec(resource);
+    if (match)
+        return match[1];
+    if (!resource.includes("/"))
+        return resource;
+    return null;
+}
+function isUSRegion(region) {
+    return region === "us" || region.startsWith("nam") || region.startsWith("us-");
 }

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.4.6",
-            "expectedSize": 32361376,
-            "expectedChecksum": "85cf160307a0ff39b8e625676b89789e",
-            "expectedChecksumSHA256": "4f66d53776975c32df3c86870602965d2a5a495a14d86906cdbea84c8e40156b",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.6",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6"
+            "version": "3.4.7",
+            "expectedSize": 32361408,
+            "expectedChecksum": "b756c557573420a54da92e9d66934355",
+            "expectedChecksumSHA256": "d97bbc39e6c9960d233db975c3f2e66d43c2a34436f8e39fae3cbe2a815e2c6b",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.7",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7"
         },
         "darwin_arm64": {
-            "version": "3.4.6",
-            "expectedSize": 30504594,
-            "expectedChecksum": "c1e5c18caa1fadcaf813c98bc05a8d77",
-            "expectedChecksumSHA256": "1934ec8f6e8788a5521801072df278950b9525b0294c97cc009e65a7446d5567",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.6",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6"
+            "version": "3.4.7",
+            "expectedSize": 30504610,
+            "expectedChecksum": "f3015d7cfd03bd4fcb7d76d6aac29c84",
+            "expectedChecksumSHA256": "3b0d4d273dabd04dc01ef57001180ed6daae2f1781d25f1f01eb6da5d25d5ae5",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.7",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7"
         },
         "win32": {
-            "version": "3.4.6",
-            "expectedSize": 32401408,
-            "expectedChecksum": "c57c0ca3c50f358122ac741e501c9fde",
-            "expectedChecksumSHA256": "ed4bde0ebf9499ffd8915091f9ec3886a1c5ba145f54261b1c8c701a38268984",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.6",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6.exe"
+            "version": "3.4.7",
+            "expectedSize": 32403456,
+            "expectedChecksum": "7fac83eee96f4f638d84a9c3a6950040",
+            "expectedChecksumSHA256": "42a88d0377565a94b966336d45b45a8ec24c6a81b0206654327d7722107569de",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.7",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7.exe"
         },
         "linux": {
-            "version": "3.4.6",
+            "version": "3.4.7",
             "expectedSize": 31518904,
-            "expectedChecksum": "b05791a643618dd8fbdb5e56b474c45b",
-            "expectedChecksumSHA256": "716ca10ddb2341873fc0febcffbc84420ac1f20262c3d08f9422cee025d1f60e",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.6",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6"
+            "expectedChecksum": "2aa615b65f12a9efd768e13ab92bf457",
+            "expectedChecksumSHA256": "7ce36de105950172ee6f41100df93c92ba2cd2b2f89cb157740fc1ae808fcebb",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.7",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.7"
         }
     }
 }

package/lib/emulator/functionsEmulatorShared.js

@@ -21,6 +21,7 @@ const fs = require("fs");
 const crypto_1 = require("crypto");
 const _ = require("lodash");
 const backend = require("../deploy/functions/backend");
+const build = require("../deploy/functions/build");
 const constants_1 = require("./constants");
 const manifest_1 = require("../extensions/manifest");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
@@ -70,7 +71,7 @@ function prepareEndpoints(endpoints) {
 function emulatedFunctionsFromEndpoints(endpoints) {
     const regionDefinitions = [];
     for (const endpoint of endpoints) {
-        if (!endpoint.region) {
+        if (!endpoint.region || endpoint.region === build.REGION_TBD) {
             endpoint.region = "us-central1";
         }
         const def = {

package/lib/env.js

@@ -22,7 +22,7 @@ function setFirebaseMcp(value) {
     isFirebaseMcpFlag = value;
 }
 function detectAIAgent() {
-    if (process.env.ANTIGRAVITY_CLI_ALIAS)
+    if (process.env.ANTIGRAVITY_AGENT)
         return "antigravity";
     if (process.env.CLAUDECODE)
         return "claude_code";
@@ -36,5 +36,9 @@ function detectAIAgent() {
         return "gemini_cli";
     if (process.env.OPENCODE)
         return "open_code";
+    if (process.env.ANDROID_STUDIO_AGENT)
+        return "android_studio_agent";
+    if (process.env.KIRO_AGENT_PATH)
+        return "kiro";
     return "unknown";
 }

package/lib/firestore/api-sort.js

@@ -147,6 +147,9 @@ function compareIndexField(a, b) {
     if (a.vectorConfig !== b.vectorConfig) {
         return compareVectorConfig(a.vectorConfig, b.vectorConfig);
     }
+    if (a.searchConfig !== b.searchConfig) {
+        return compareSearchConfig(a.searchConfig, b.searchConfig);
+    }
     return 0;
 }
 function compareFieldIndex(a, b) {
@@ -232,6 +235,25 @@ function compareVectorConfig(a, b) {
     }
     return a.dimension - b.dimension;
 }
+function compareSearchConfig(a, b) {
+    if (!a) {
+        if (!b) {
+            return 0;
+        }
+        else {
+            return 1;
+        }
+    }
+    else if (!b) {
+        return -1;
+    }
+    const aTextSpecs = a?.textSpec?.indexSpecs?.length || 0;
+    const bTextSpecs = b?.textSpec?.indexSpecs?.length || 0;
+    if (aTextSpecs !== bTextSpecs) {
+        return aTextSpecs - bTextSpecs;
+    }
+    return 0;
+}
 function compareArrays(a, b, fn) {
     const minFields = Math.min(a.length, b.length);
     for (let i = 0; i < minFields; i++) {

package/lib/firestore/api-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecurrenceType = exports.DatabaseEdition = exports.DataAccessMode = exports.RealtimeUpdatesMode = exports.PointInTimeRecoveryEnablement = exports.DatabaseDeleteProtectionState = exports.EnablementOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.Density = exports.ApiScope = exports.QueryScope = exports.Mode = void 0;
+exports.RecurrenceType = exports.DatabaseEdition = exports.DataAccessMode = exports.RealtimeUpdatesMode = exports.PointInTimeRecoveryEnablement = exports.DatabaseDeleteProtectionState = exports.EnablementOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.TextMatchType = exports.TextIndexType = exports.ArrayConfig = exports.Order = exports.Density = exports.ApiScope = exports.QueryScope = exports.Mode = void 0;
 exports.validateEnablementOption = validateEnablementOption;
 const error_1 = require("../error");
 var Mode;
@@ -36,6 +36,16 @@ var ArrayConfig;
 (function (ArrayConfig) {
     ArrayConfig["CONTAINS"] = "CONTAINS";
 })(ArrayConfig || (exports.ArrayConfig = ArrayConfig = {}));
+var TextIndexType;
+(function (TextIndexType) {
+    TextIndexType["TEXT_INDEX_TYPE_UNSPECIFIED"] = "TEXT_INDEX_TYPE_UNSPECIFIED";
+    TextIndexType["TOKENIZED"] = "TOKENIZED";
+})(TextIndexType || (exports.TextIndexType = TextIndexType = {}));
+var TextMatchType;
+(function (TextMatchType) {
+    TextMatchType["TEXT_MATCH_TYPE_UNSPECIFIED"] = "TEXT_MATCH_TYPE_UNSPECIFIED";
+    TextMatchType["MATCH_GLOBALLY"] = "MATCH_GLOBALLY";
+})(TextMatchType || (exports.TextMatchType = TextMatchType = {}));
 var State;
 (function (State) {
     State["CREATING"] = "CREATING";

package/lib/firestore/api.js

@@ -254,7 +254,7 @@ class FirestoreApi {
         validator.assertHas(index, "fields");
         index.fields.forEach((field) => {
             validator.assertHas(field, "fieldPath");
-            validator.assertHasOneOf(field, ["order", "arrayConfig", "vectorConfig"]);
+            validator.assertHasOneOf(field, ["order", "arrayConfig", "searchConfig", "vectorConfig"]);
             if (field.order) {
                 validator.assertEnum(field, "order", Object.keys(types.Order));
             }
@@ -265,6 +265,20 @@ class FirestoreApi {
                 validator.assertType("vectorConfig.dimension", field.vectorConfig.dimension, "number");
                 validator.assertHas(field.vectorConfig, "flat");
             }
+            if (field.searchConfig) {
+                if (field.searchConfig.textSpec) {
+                    validator.assertHas(field.searchConfig.textSpec, "indexSpecs");
+                    for (const spec of field.searchConfig.textSpec.indexSpecs) {
+                        validator.assertHas(spec, "indexType");
+                        validator.assertEnum(spec, "indexType", Object.keys(types.TextIndexType));
+                        validator.assertHas(spec, "matchType");
+                        validator.assertEnum(spec, "matchType", Object.keys(types.TextMatchType));
+                    }
+                }
+                if (field.searchConfig.geoSpec?.geoJsonIndexingDisabled !== undefined) {
+                    validator.assertType("searchConfig.geoSpec.geoJsonIndexingDisabled", field.searchConfig.geoSpec.geoJsonIndexingDisabled, "boolean");
+                }
+            }
         });
     }
     validateField(field) {
@@ -405,6 +419,9 @@ class FirestoreApi {
             if (!utils.deepEqual(iField.vectorConfig, sField.vectorConfig)) {
                 return false;
             }
+            if (!utils.deepEqual(iField.searchConfig, sField.searchConfig)) {
+                return false;
+            }
             i++;
         }
         return true;
@@ -488,6 +505,9 @@ class FirestoreApi {
                     else if (field.vectorConfig) {
                         f.vectorConfig = field.vectorConfig;
                     }
+                    else if (field.searchConfig) {
+                        f.searchConfig = field.searchConfig;
+                    }
                     else if (field.mode === types.Mode.ARRAY_CONTAINS) {
                         f.arrayConfig = types.ArrayConfig.CONTAINS;
                     }

package/lib/firestore/fsConfig.js

@@ -35,6 +35,14 @@ function getFirestoreConfig(projectId, options) {
             return [];
         }
     }
+    if (onlyDatabases.has("rules")) {
+        onlyDatabases.delete("rules");
+        allDatabases = true;
+    }
+    if (onlyDatabases.has("indexes")) {
+        onlyDatabases.delete("indexes");
+        allDatabases = true;
+    }
     const results = [];
     for (const c of fsConfig) {
         const { database, target } = c;