firebase-tools 13.28.0 → 13.29.0

package/lib/dataconnect/fileUtils.js

@@ -53,6 +53,9 @@ function validateConnectorYaml(unvalidated) {
     return unvalidated;
 }
 async function readGQLFiles(sourceDir) {
+    if (!fs.existsSync(sourceDir)) {
+        return [];
+    }
     const files = await fs.readdir(sourceDir);
     return files
         .filter((f) => f.endsWith(".gql") || f.endsWith(".graphql"))

package/lib/deploy/functions/backend.js

@@ -25,9 +25,7 @@ function endpointTriggerType(endpoint) {
     else if (isBlockingTriggered(endpoint)) {
         return endpoint.blockingTrigger.eventType;
     }
-    else {
-        throw new Error("Unexpected trigger type for endpoint " + JSON.stringify(endpoint));
-    }
+    (0, functional_1.assertExhaustive)(endpoint);
 }
 exports.endpointTriggerType = endpointTriggerType;
 exports.AllVpcEgressSettings = ["PRIVATE_RANGES_ONLY", "ALL_TRAFFIC"];

package/lib/deploy/functions/build.js

@@ -259,7 +259,9 @@ function discoverTrigger(endpoint, region, r) {
         return { httpsTrigger };
     }
     else if (isCallableTriggered(endpoint)) {
-        return { callableTrigger: {} };
+        const trigger = { callableTrigger: {} };
+        proto.copyIfPresent(trigger.callableTrigger, endpoint.callableTrigger, "genkitAction");
+        return trigger;
     }
     else if (isBlockingTriggered(endpoint)) {
         return { blockingTrigger: endpoint.blockingTrigger };

package/lib/deploy/functions/release/planner.js

@@ -7,7 +7,6 @@ const error_1 = require("../../../error");
 const utils = require("../../../utils");
 const backend = require("../backend");
 const v2events = require("../../../functions/events/v2");
-const v2_1 = require("../../../functions/events/v2");
 function calculateChangesets(want, have, keyFn, deleteAll) {
     const toCreate = utils.groupBy(Object.keys(want)
         .filter((id) => !have[id])
@@ -167,9 +166,9 @@ function upgradedScheduleFromV1ToV2(want, have) {
 exports.upgradedScheduleFromV1ToV2 = upgradedScheduleFromV1ToV2;
 function checkForUnsafeUpdate(want, have) {
     return (backend.isEventTriggered(want) &&
-        v2_1.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX.test(want.eventTrigger.eventType) &&
         backend.isEventTriggered(have) &&
-        v2_1.FIRESTORE_EVENT_REGEX.test(have.eventTrigger.eventType));
+        want.eventTrigger.eventType ===
+            v2events.CONVERTABLE_EVENTS[have.eventTrigger.eventType]);
 }
 exports.checkForUnsafeUpdate = checkForUnsafeUpdate;
 function checkForIllegalUpdate(want, have) {
@@ -196,7 +195,8 @@ function checkForIllegalUpdate(want, have) {
     };
     const wantType = triggerType(want);
     const haveType = triggerType(have);
-    if (wantType !== haveType) {
+    const upgradingHttpsFunction = backend.isHttpsTriggered(have) && backend.isCallableTriggered(want);
+    if (wantType !== haveType && !upgradingHttpsFunction) {
         throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_1.getFunctionLabel)(want)}] Changing from ${haveType} function to ${wantType} function is not allowed. Please delete your function and create a new one instead.`);
     }
     if (want.platform === "gcfv1" && have.platform === "gcfv2") {

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -134,6 +134,9 @@ function assertBuildEndpoint(ep, id) {
         });
     }
     else if (build.isCallableTriggered(ep)) {
+        (0, parsing_1.assertKeyTypes)(prefix + ".callableTrigger", ep.callableTrigger, {
+            genkitAction: "string?",
+        });
     }
     else if (build.isScheduleTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
@@ -216,6 +219,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     }
     else if (build.isCallableTriggered(ep)) {
         triggered = { callableTrigger: {} };
+        (0, proto_1.copyIfPresent)(triggered.callableTrigger, ep.callableTrigger, "genkitAction");
     }
     else if (build.isScheduleTriggered(ep)) {
         const st = {

package/lib/deploy/functions/runtimes/supported/types.js

@@ -55,7 +55,7 @@ exports.RUNTIMES = runtimes({
     },
     nodejs22: {
         friendly: "Node.js 22",
-        status: "beta",
+        status: "GA",
         deprecationDate: "2027-04-30",
         decommissionDate: "2027-10-31",
     },

package/lib/emulator/controller.js

@@ -577,6 +577,20 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             utils.assertIsString(options.import);
             const importDirAbsPath = path.resolve(options.import);
             const exportMetadataFilePath = path.resolve(importDirAbsPath, exportMetadata.dataconnect.path);
+            const dataDirectory = options.config.get("emulators.dataconnect.dataDir");
+            if (exportMetadataFilePath && dataDirectory) {
+                emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT).logLabeled("WARN", "dataconnect", "'firebase.json#emulators.dataconnect.dataDir' is set and `--import` flag was passed. " +
+                    "This will overwrite any data saved from previous runs.");
+                if (!options.nonInteractive &&
+                    !(await (0, prompt_1.promptOnce)({
+                        type: "confirm",
+                        message: `Do you wish to continue and overwrite data in ${dataDirectory}?`,
+                        default: false,
+                    }))) {
+                    await cleanShutdown();
+                    return { deprecationNotices: [] };
+                }
+            }
             emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT).logLabeled("BULLET", "dataconnect", `Importing data from ${exportMetadataFilePath}`);
             args.importPath = exportMetadataFilePath;
             void (0, track_1.trackEmulator)("emulator_import", {

package/lib/emulator/dataconnect/pgliteServer.js

@@ -27,6 +27,7 @@ const fs = require("fs");
 const index_1 = require("./pg-gateway/index");
 const node_1 = require("./pg-gateway/platforms/node");
 const logger_1 = require("../../logger");
+const error_1 = require("../../error");
 exports.TRUNCATE_TABLES_SQL = `
 DO $do$
 BEGIN
@@ -62,6 +63,7 @@ class PostgresServer {
                 server.emit("error", err);
             });
         });
+        this.server = server;
         const listeningPromise = new Promise((resolve) => {
             server.listen(port, host, () => {
                 resolve();
@@ -77,7 +79,7 @@ class PostgresServer {
             const pgliteArgs = {
                 username: this.username,
                 database: this.database,
-                debug: 0,
+                debug: this.debug,
                 extensions: {
                     vector,
                     uuidOssp,
@@ -90,7 +92,7 @@ class PostgresServer {
                 const file = new File([rf], this.importPath);
                 pgliteArgs.loadDataDir = file;
             }
-            this.db = await pglite_1.PGlite.create(pgliteArgs);
+            this.db = await this.forceCreateDB(pgliteArgs);
             await this.db.waitReady;
         }
         return this.db;
@@ -105,12 +107,37 @@ class PostgresServer {
         const arrayBuff = await dump.arrayBuffer();
         fs.writeFileSync(exportPath, new Uint8Array(arrayBuff));
     }
-    constructor(database, username, dataDirectory, importPath) {
+    async forceCreateDB(pgliteArgs) {
+        try {
+            const db = await pglite_1.PGlite.create(pgliteArgs);
+            return db;
+        }
+        catch (err) {
+            if (pgliteArgs.dataDir && (0, error_1.hasMessage)(err) && /Database already exists/.test(err.message)) {
+                fs.rmSync(pgliteArgs.dataDir, { force: true, recursive: true });
+                const db = await pglite_1.PGlite.create(pgliteArgs);
+                return db;
+            }
+            throw err;
+        }
+    }
+    async stop() {
+        if (this.db) {
+            await this.db.close();
+        }
+        if (this.server) {
+            this.server.close();
+        }
+        return;
+    }
+    constructor(args) {
         this.db = undefined;
-        this.username = username;
-        this.database = database;
-        this.dataDirectory = dataDirectory;
-        this.importPath = importPath;
+        this.server = undefined;
+        this.username = args.username;
+        this.database = args.database;
+        this.dataDirectory = args.dataDirectory;
+        this.importPath = args.importPath;
+        this.debug = args.debug ? 5 : 0;
     }
 }
 exports.PostgresServer = PostgresServer;

package/lib/emulator/dataconnectEmulator.js

@@ -69,7 +69,13 @@ class DataConnectEmulator {
                 const postgresDumpPath = this.args.importPath
                     ? path.join(this.args.importPath, "postgres.tar.gz")
                     : undefined;
-                this.postgresServer = new pgliteServer_1.PostgresServer(dbId, "postgres", dataDirectory, postgresDumpPath);
+                this.postgresServer = new pgliteServer_1.PostgresServer({
+                    database: dbId,
+                    username: "fdc",
+                    dataDirectory,
+                    importPath: postgresDumpPath,
+                    debug: this.args.debug,
+                });
                 const server = await this.postgresServer.createPGServer(pgHost, pgPort);
                 const connectableHost = (0, utils_1.connectableHostname)(pgHost);
                 connStr = `postgres://${connectableHost}:${pgPort}/${dbId}?sslmode=disable`;
@@ -101,6 +107,9 @@ class DataConnectEmulator {
             this.logger.logLabeled("INFO", "dataconnect", "Skipping cleanup of Data Connect emulator, as it was not started by this process.");
             return;
         }
+        if (this.postgresServer) {
+            await this.postgresServer.stop();
+        }
         return (0, downloadableEmulators_1.stop)(types_1.Emulators.DATACONNECT);
     }
     getInfo() {

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.7.4",
-            expectedSize: 25277184,
-            expectedChecksum: "74f6b66c79a8a903132c7ab26c644593",
+            version: "1.7.5",
+            expectedSize: 25281280,
+            expectedChecksum: "85d0de96b5c08b553fd8506a2bc381bb",
         }
         : process.platform === "win32"
             ? {
-                version: "1.7.4",
-                expectedSize: 25707520,
-                expectedChecksum: "66eec92e2d57ae42a8b58f33b65b4184",
+                version: "1.7.5",
+                expectedSize: 25711616,
+                expectedChecksum: "c99d67fa8e74d41760b96122b055b8e2",
             }
             : {
-                version: "1.7.4",
+                version: "1.7.5",
                 expectedSize: 25190552,
-                expectedChecksum: "acb7be487020afa6e1a597ceb8c6e862",
+                expectedChecksum: "61d966b781e6f2887f8b38ec271b54e2",
             },
 };
 exports.DownloadDetails = {
@@ -475,8 +475,7 @@ async function start(targetName, args, extraEnv = {}) {
 exports.start = start;
 function isIncomaptibleArchError(err) {
     var _a;
-    const hasMessage = (e) => !!(e === null || e === void 0 ? void 0 : e.message);
-    return (hasMessage(err) &&
+    return ((0, error_1.hasMessage)(err) &&
         /Unknown system error/.test((_a = err.message) !== null && _a !== void 0 ? _a : "") &&
         process.platform === "darwin");
 }

package/lib/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBillingError = exports.getError = exports.getErrStatus = exports.isObject = exports.getErrStack = exports.getErrMsg = exports.FirebaseError = void 0;
+exports.hasMessage = exports.isBillingError = exports.getError = exports.getErrStatus = exports.isObject = exports.getErrStack = exports.getErrMsg = exports.FirebaseError = void 0;
 const lodash_1 = require("lodash");
 const DEFAULT_CHILDREN = [];
 const DEFAULT_EXIT = 1;
@@ -65,3 +65,5 @@ function isBillingError(e) {
     }));
 }
 exports.isBillingError = isBillingError;
+const hasMessage = (e) => !!(e === null || e === void 0 ? void 0 : e.message);
+exports.hasMessage = hasMessage;

package/lib/functions/events/v2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX = exports.FIRESTORE_EVENT_REGEX = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.CONVERTABLE_EVENTS = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 exports.STORAGE_EVENTS = [
     "google.cloud.storage.object.v1.finalized",
@@ -28,5 +28,9 @@ exports.FIRESTORE_EVENTS = [
     "google.cloud.firestore.document.v1.deleted.withAuthContext",
 ];
 exports.FIREALERTS_EVENT = "google.firebase.firebasealerts.alerts.v1.published";
-exports.FIRESTORE_EVENT_REGEX = /^google\.cloud\.firestore\.document\.v1\.[^\.]*$/;
-exports.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX = /^google\.cloud\.firestore\.document\.v1\..*\.withAuthContext$/;
+exports.CONVERTABLE_EVENTS = {
+    "google.cloud.firestore.document.v1.created": "google.cloud.firestore.document.v1.created.withAuthContext",
+    "google.cloud.firestore.document.v1.updated": "google.cloud.firestore.document.v1.updated.withAuthContext",
+    "google.cloud.firestore.document.v1.deleted": "google.cloud.firestore.document.v1.deleted.withAuthContext",
+    "google.cloud.firestore.document.v1.written": "google.cloud.firestore.document.v1.written.withAuthContext",
+};

package/lib/gcp/cloudfunctionsv2.js

@@ -259,6 +259,9 @@ function functionFromEndpoint(endpoint) {
     }
     else if (backend.isCallableTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
+        if (endpoint.callableTrigger.genkitAction) {
+            gcfFunction.labels["genkit-action"] = endpoint.callableTrigger.genkitAction;
+        }
     }
     else if (backend.isBlockingTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.BLOCKING_LABEL]: constants_1.BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
@@ -294,6 +297,9 @@ function endpointFromFunction(gcfFunction) {
         trigger = {
             callableTrigger: {},
         };
+        if (gcfFunction.labels["genkit-action"]) {
+            trigger.callableTrigger.genkitAction = gcfFunction.labels["genkit-action"];
+        }
     }
     else if ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d[constants_1.BLOCKING_LABEL]) {
         trigger = {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.actuate = exports.doSetup = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
+const fs = require("fs-extra");
 const prompt_1 = require("../../../prompt");
 const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
 const freeTrial_1 = require("../../../dataconnect/freeTrial");
@@ -137,6 +138,9 @@ async function writeFiles(config, info) {
             await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content);
         }
     }
+    else {
+        fs.ensureFileSync((0, path_1.join)(dir, "schema", "schema.gql"));
+    }
     for (const c of info.connectors) {
         await writeConnectorFiles(config, c);
     }

package/lib/management/projects.js

@@ -26,12 +26,34 @@ exports.PROJECTS_CREATE_QUESTIONS = [
         default: "",
         message: "Please specify a unique project id " +
             `(${clc.yellow("warning")}: cannot be modified afterward) [6-30 characters]:\n`,
+        validate: (projectId) => {
+            if (projectId.length < 6) {
+                return "Project ID must be at least 6 characters long";
+            }
+            else if (projectId.length > 30) {
+                return "Project ID cannot be longer than 30 characters";
+            }
+            else {
+                return true;
+            }
+        },
     },
     {
         type: "input",
         name: "displayName",
-        default: "",
+        default: (answers) => answers.projectId,
         message: "What would you like to call your project? (defaults to your project ID)",
+        validate: (displayName) => {
+            if (displayName.length < 4) {
+                return "Project name must be at least 4 characters long";
+            }
+            else if (displayName.length > 30) {
+                return "Project name cannot be longer than 30 characters";
+            }
+            else {
+                return true;
+            }
+        },
     },
 ];
 const firebaseAPIClient = new apiv2_1.Client({

package/package.json

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

package/templates/init/functions/javascript/package.lint.json

@@ -10,7 +10,7 @@
     "logs": "firebase functions:log"
   },
   "engines": {
-    "node": "18"
+    "node": "22"
   },
   "main": "index.js",
   "dependencies": {

package/templates/init/functions/javascript/package.nolint.json

@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "engines": {
-    "node": "18"
+    "node": "22"
   },
   "main": "index.js",
   "dependencies": {

package/templates/init/functions/typescript/package.lint.json

@@ -11,7 +11,7 @@
     "logs": "firebase functions:log"
   },
   "engines": {
-    "node": "18"
+    "node": "22"
   },
   "main": "lib/index.js",
   "dependencies": {

package/templates/init/functions/typescript/package.nolint.json

@@ -10,7 +10,7 @@
     "logs": "firebase functions:log"
   },
   "engines": {
-    "node": "18"
+    "node": "22"
   },
   "main": "lib/index.js",
   "dependencies": {

package/templates/init/functions/typescript/tsconfig.json

@@ -1,6 +1,8 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "NodeNext",
+    "esModuleInterop": true,
+    "moduleResolution": "nodenext",
     "noImplicitReturns": true,
     "noUnusedLocals": true,
     "outDir": "lib",