firebase-tools 11.16.1 → 11.18.0

package/lib/emulator/auth/operations.js

@@ -1126,7 +1126,8 @@ async function signInWithIdp(state, reqBody) {
         oauthExpiresIn: coercePrimitiveToString(response.oauthExpireIn),
     };
     if (response.isNewUser) {
-        let updates = Object.assign(Object.assign({}, accountUpdates.fields), { lastLoginAt: Date.now().toString(), providerUserInfo: [providerUserInfo], tenantId: state instanceof state_1.TenantProjectState ? state.tenantId : undefined });
+        const timestamp = new Date();
+        let updates = Object.assign(Object.assign({}, accountUpdates.fields), { createdAt: timestamp.getTime().toString(), lastLoginAt: timestamp.getTime().toString(), providerUserInfo: [providerUserInfo], tenantId: state instanceof state_1.TenantProjectState ? state.tenantId : undefined });
         const localId = state.generateLocalId();
         const userBeforeCreate = Object.assign({ localId }, updates);
         const blockingResponse = await fetchBlockingFunction(state, state_1.BlockingFunctionEvents.BEFORE_CREATE, userBeforeCreate, {
@@ -1187,7 +1188,8 @@ async function signInWithIdp(state, reqBody) {
 async function signInWithPassword(state, reqBody) {
     (0, errors_1.assert)(!state.disableAuth, "PROJECT_DISABLED");
     (0, errors_1.assert)(state.allowPasswordSignup, "PASSWORD_LOGIN_DISABLED");
-    (0, errors_1.assert)(reqBody.email, "MISSING_EMAIL");
+    (0, errors_1.assert)(reqBody.email !== undefined, "MISSING_EMAIL");
+    (0, errors_1.assert)((0, utils_1.isValidEmailAddress)(reqBody.email), "INVALID_EMAIL");
     (0, errors_1.assert)(reqBody.password, "MISSING_PASSWORD");
     if (reqBody.captchaResponse || reqBody.captchaChallenge) {
         throw new errors_1.NotImplementedError("captcha unimplemented");

package/lib/emulator/auth/server.js

@@ -97,14 +97,24 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
     registerLegacyRoutes(app);
     (0, handlers_1.registerHandlers)(app, (apiKey, tenantId) => getProjectStateById(getProjectIdByApiKey(apiKey), tenantId));
     const apiKeyAuthenticator = (ctx, info) => {
-        if (info.in !== "query") {
-            throw new Error('apiKey must be defined as in: "query" in API spec.');
-        }
         if (!info.name) {
-            throw new Error("apiKey param name is undefined in API spec.");
+            throw new Error("apiKey param/header name is undefined in API spec.");
+        }
+        let key;
+        const req = ctx.req;
+        switch (info.in) {
+            case "header":
+                key = req.get(info.name);
+                break;
+            case "query": {
+                const q = req.query[info.name];
+                key = typeof q === "string" ? q : undefined;
+                break;
+            }
+            default:
+                throw new Error('apiKey must be defined as in: "query" or "header" in API spec.');
         }
-        const key = ctx.req.query[info.name];
-        if (typeof key === "string" && key.length > 0) {
+        if (key) {
             return { type: "success", user: getProjectIdByApiKey(key) };
         }
         else {
@@ -138,7 +148,8 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
     const apis = await exegesisExpress.middleware(specForRouter(), {
         controllers: { auth: toExegesisController(operations_1.authOperations, getProjectStateById) },
         authenticators: {
-            apiKey: apiKeyAuthenticator,
+            apiKeyQuery: apiKeyAuthenticator,
+            apiKeyHeader: apiKeyAuthenticator,
             Oauth2: oauth2Authenticator,
         },
         autoHandleHttpErrors(err) {
@@ -206,7 +217,7 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
                         postController(ctx) {
                             if (ctx.res.statusCode === 401) {
                                 const requirements = ctx.api.operationObject.security;
-                                if (requirements === null || requirements === void 0 ? void 0 : requirements.some((req) => req.apiKey)) {
+                                if (requirements === null || requirements === void 0 ? void 0 : requirements.some((req) => req.apiKeyQuery || req.apiKeyHeader)) {
                                     throw new errors_2.PermissionDeniedError("The request is missing a valid API key.");
                                 }
                                 else {

package/lib/emulator/eventarcEmulator.js

@@ -8,6 +8,7 @@ const utils_1 = require("../utils");
 const emulatorLogger_1 = require("./emulatorLogger");
 const registry_1 = require("./registry");
 const error_1 = require("../error");
+const eventarcEmulatorUtils_1 = require("./eventarcEmulatorUtils");
 class EventarcEmulator {
     constructor(args) {
         this.args = args;
@@ -89,7 +90,7 @@ class EventarcEmulator {
             .request({
             method: "POST",
             path: `/functions/projects/${trigger.projectId}/triggers/${trigger.triggerName}`,
-            body: JSON.stringify(event),
+            body: JSON.stringify((0, eventarcEmulatorUtils_1.cloudEventFromProtoToJson)(event)),
             responseType: "stream",
             resolveOnHTTPError: true,
         })

package/lib/emulator/eventarcEmulatorUtils.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloudEventFromProtoToJson = void 0;
+const error_1 = require("../error");
+const BUILT_IN_ATTRS = ["time", "datacontenttype", "subject"];
+function cloudEventFromProtoToJson(ce) {
+    if (ce["id"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'id' is required.");
+    }
+    if (ce["type"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'type' is required.");
+    }
+    if (ce["specVersion"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'specVersion' is required.");
+    }
+    if (ce["source"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'source' is required.");
+    }
+    const out = {
+        id: ce["id"],
+        type: ce["type"],
+        specversion: ce["specVersion"],
+        source: ce["source"],
+        subject: getOptionalAttribute(ce, "subject", "ceString"),
+        time: getRequiredAttribute(ce, "time", "ceTimestamp"),
+        data: getData(ce),
+        datacontenttype: getRequiredAttribute(ce, "datacontenttype", "ceString"),
+    };
+    for (const attr in ce["attributes"]) {
+        if (BUILT_IN_ATTRS.includes(attr)) {
+            continue;
+        }
+        out[attr] = getRequiredAttribute(ce, attr, "ceString");
+    }
+    return out;
+}
+exports.cloudEventFromProtoToJson = cloudEventFromProtoToJson;
+function getOptionalAttribute(ce, attr, type) {
+    return ce["attributes"][attr][type];
+}
+function getRequiredAttribute(ce, attr, type) {
+    const val = ce["attributes"][attr][type];
+    if (val === undefined) {
+        throw new error_1.FirebaseError("CloudEvent must contain " + attr + " attribute");
+    }
+    return val;
+}
+function getData(ce) {
+    const contentType = getRequiredAttribute(ce, "datacontenttype", "ceString");
+    switch (contentType) {
+        case "application/json":
+            return JSON.parse(ce["textData"]);
+        case "text/plain":
+            return ce["textData"];
+        case undefined:
+            return undefined;
+        default:
+            throw new error_1.FirebaseError("Unsupported content type: " + contentType);
+    }
+}

package/lib/emulator/extensions/validation.js

@@ -59,6 +59,8 @@ function checkForUnemulatedTriggerTypes(backend, options) {
                     return !(0, controller_1.shouldStart)(options, types_1.Emulators.AUTH);
                 case constants_1.Constants.SERVICE_STORAGE:
                     return !(0, controller_1.shouldStart)(options, types_1.Emulators.STORAGE);
+                case constants_1.Constants.SERVICE_EVENTARC:
+                    return !(0, controller_1.shouldStart)(options, types_1.Emulators.EVENTARC);
                 default:
                     return true;
             }

package/lib/emulator/extensionsEmulator.js

@@ -142,7 +142,7 @@ class ExtensionsEmulator {
         const emulatableBackend = {
             functionsDir,
             env: nonSecretEnv,
-            codebase: "",
+            codebase: instance.instanceId,
             secretEnv: secretEnvVariables,
             predefinedTriggers: extensionTriggers,
             nodeMajorVersion: nodeMajorVersion,

package/lib/emulator/functionsEmulator.js

@@ -334,7 +334,7 @@ class FunctionsEmulator {
                         added = await this.addFirestoreTrigger(this.args.projectId, key, definition.eventTrigger);
                         break;
                     case constants_1.Constants.SERVICE_REALTIME_DATABASE:
-                        added = await this.addRealtimeDatabaseTrigger(this.args.projectId, key, definition.eventTrigger, signature, definition.region);
+                        added = await this.addRealtimeDatabaseTrigger(this.args.projectId, definition.id, key, definition.eventTrigger, signature, definition.region);
                         break;
                     case constants_1.Constants.SERVICE_PUBSUB:
                         added = await this.addPubsubTrigger(definition.name, key, definition.eventTrigger, signature, definition.schedule);
@@ -377,6 +377,12 @@ class FunctionsEmulator {
             }
         }
         if (this.args.debugPort) {
+            emulatableBackend.secretEnv = Object.values(toSetup.reduce((acc, curr) => {
+                for (const secret of curr.secretEnvironmentVariables || []) {
+                    acc[secret.key] = secret;
+                }
+                return acc;
+            }, {}));
             await this.startRuntime(emulatableBackend);
         }
     }
@@ -438,7 +444,7 @@ class FunctionsEmulator {
         }
         return { bundle, apiPath, instance };
     }
-    getV2DatabaseApiAttributes(projectId, key, eventTrigger, region) {
+    getV2DatabaseApiAttributes(projectId, id, key, eventTrigger, region) {
         var _a, _b, _c;
         const instance = ((_a = eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.instance) || ((_b = eventTrigger.eventFilterPathPatterns) === null || _b === void 0 ? void 0 : _b.instance);
         if (!instance) {
@@ -448,6 +454,9 @@ class FunctionsEmulator {
         if (!ref) {
             throw new error_1.FirebaseError("A database reference must be supplied.");
         }
+        if (region !== "us-central1") {
+            this.logger.logLabeled("WARN", `functions[${id}]`, `function region is defined outside the database region, will not trigger.`);
+        }
         const bundle = JSON.stringify({
             name: `projects/${projectId}/locations/${region}/triggers/${key}`,
             path: ref,
@@ -458,12 +467,12 @@ class FunctionsEmulator {
         const apiPath = "/.settings/functionTriggers.json";
         return { bundle, apiPath, instance };
     }
-    async addRealtimeDatabaseTrigger(projectId, key, eventTrigger, signature, region) {
+    async addRealtimeDatabaseTrigger(projectId, id, key, eventTrigger, signature, region) {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.DATABASE)) {
             return false;
         }
         const { bundle, apiPath, instance } = signature === "cloudevent"
-            ? this.getV2DatabaseApiAttributes(projectId, key, eventTrigger, region)
+            ? this.getV2DatabaseApiAttributes(projectId, id, key, eventTrigger, region)
             : this.getV1DatabaseApiAttributes(projectId, key, eventTrigger);
         logger_1.logger.debug(`addRealtimeDatabaseTrigger[${instance}]`, JSON.stringify(bundle));
         const client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATABASE);
@@ -746,34 +755,32 @@ class FunctionsEmulator {
                 this.logger.logLabeled("ERROR", "functions", `Failed to read local secrets file ${secretPath}: ${e.message}`);
             }
         }
-        if (trigger) {
-            const secrets = trigger.secretEnvironmentVariables || [];
-            const accesses = secrets
-                .filter((s) => !secretEnvs[s.key])
-                .map(async (s) => {
-                var _a;
-                this.logger.logLabeled("INFO", "functions", `Trying to access secret ${s.secret}@latest`);
-                const value = await (0, secretManager_1.accessSecretVersion)(this.getProjectId(), s.secret, (_a = s.version) !== null && _a !== void 0 ? _a : "latest");
-                return [s.key, value];
-            });
-            const accessResults = await (0, utils_1.allSettled)(accesses);
-            const errs = [];
-            for (const result of accessResults) {
-                if (result.status === "rejected") {
-                    errs.push(result.reason);
-                }
-                else {
-                    const [k, v] = result.value;
-                    secretEnvs[k] = v;
-                }
+        const secrets = (trigger === null || trigger === void 0 ? void 0 : trigger.secretEnvironmentVariables) || backend.secretEnv;
+        const accesses = secrets
+            .filter((s) => !secretEnvs[s.key])
+            .map(async (s) => {
+            var _a;
+            this.logger.logLabeled("INFO", "functions", `Trying to access secret ${s.secret}@latest`);
+            const value = await (0, secretManager_1.accessSecretVersion)(this.getProjectId(), s.secret, (_a = s.version) !== null && _a !== void 0 ? _a : "latest");
+            return [s.key, value];
+        });
+        const accessResults = await (0, utils_1.allSettled)(accesses);
+        const errs = [];
+        for (const result of accessResults) {
+            if (result.status === "rejected") {
+                errs.push(result.reason);
             }
-            if (errs.length > 0) {
-                this.logger.logLabeled("ERROR", "functions", "Unable to access secret environment variables from Google Cloud Secret Manager. " +
-                    "Make sure the credential used for the Functions Emulator have access " +
-                    `or provide override values in ${secretPath}:\n\t` +
-                    errs.join("\n\t"));
+            else {
+                const [k, v] = result.value;
+                secretEnvs[k] = v;
             }
         }
+        if (errs.length > 0) {
+            this.logger.logLabeled("ERROR", "functions", "Unable to access secret environment variables from Google Cloud Secret Manager. " +
+                "Make sure the credential used for the Functions Emulator have access " +
+                `or provide override values in ${secretPath}:\n\t` +
+                errs.join("\n\t"));
+        }
         return secretEnvs;
     }
     async startRuntime(backend, trigger) {
@@ -881,6 +888,10 @@ class FunctionsEmulator {
             return;
         }
         const record = this.getTriggerRecordByKey(triggerId);
+        if (!record.enabled) {
+            res.status(204).send("Background triggers are currently disabled.");
+            return;
+        }
         const trigger = record.def;
         logger_1.logger.debug(`Accepted request ${method} ${req.url} --> ${triggerId}`);
         const reqBody = req.rawBody;

package/lib/extensions/billingMigrationHelper.js

@@ -7,6 +7,7 @@ const error_1 = require("../error");
 const extensionsHelper_1 = require("./extensionsHelper");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
+const utils_1 = require("./utils");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
@@ -34,7 +35,7 @@ function hasRuntime(spec, runtime) {
     const specVersion = spec.specVersion || defaultSpecVersion;
     const defaultRuntime = defaultRuntimes[specVersion];
     const resources = spec.resources || [];
-    return resources.some((r) => { var _a; return runtime === (((_a = r.properties) === null || _a === void 0 ? void 0 : _a.runtime) || defaultRuntime); });
+    return resources.some((r) => runtime === ((0, utils_1.getResourceRuntime)(r) || defaultRuntime));
 }
 function displayNode10UpdateBillingNotice(curSpec, newSpec) {
     if (hasRuntime(curSpec, "nodejs8") && hasRuntime(newSpec, "nodejs10")) {

package/lib/extensions/displayExtensionInfo.js

@@ -8,6 +8,7 @@ const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
+const types_1 = require("./types");
 const iam = require("../gcp/iam");
 const secretsUtils_1 = require("./secretsUtils");
 marked.setOptions({
@@ -80,7 +81,7 @@ function displayApis(apis) {
     return "**APIs used by this Extension**:\n" + lines.join("\n");
 }
 function usesTasks(spec) {
-    return spec.resources.some((r) => { var _a; return ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.taskQueueTrigger) !== undefined; });
+    return spec.resources.some((r) => { var _a; return r.type === types_1.FUNCTIONS_RESOURCE_TYPE && ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.taskQueueTrigger) !== undefined; });
 }
 function impliedRoles(spec) {
     var _a, _b, _c;

package/lib/extensions/emulator/specHelper.js

@@ -6,11 +6,13 @@ const path = require("path");
 const fs = require("fs-extra");
 const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
+const utils_1 = require("../utils");
 const functionsEmulatorUtils_1 = require("../../emulator/functionsEmulatorUtils");
 const SPEC_FILE = "extension.yaml";
 const POSTINSTALL_FILE = "POSTINSTALL.md";
 const validFunctionTypes = [
     "firebaseextensions.v1beta.function",
+    "firebaseextensions.v1beta.v2function",
     "firebaseextensions.v1beta.scheduledFunction",
 ];
 function wrappedSafeLoad(source) {
@@ -68,9 +70,8 @@ exports.getFunctionProperties = getFunctionProperties;
 function getNodeVersion(resources) {
     const invalidRuntimes = [];
     const versions = resources.map((r) => {
-        var _a, _b;
-        if ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.runtime) {
-            const runtimeName = (_b = r.properties) === null || _b === void 0 ? void 0 : _b.runtime;
+        if ((0, utils_1.getResourceRuntime)(r)) {
+            const runtimeName = (0, utils_1.getResourceRuntime)(r);
             const runtime = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(runtimeName);
             if (!runtime) {
                 invalidRuntimes.push(runtimeName);

package/lib/extensions/emulator/triggerHelper.js

@@ -4,30 +4,74 @@ exports.functionResourceToEmulatedTriggerDefintion = void 0;
 const functionsEmulatorShared_1 = require("../../emulator/functionsEmulatorShared");
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
 const types_1 = require("../../emulator/types");
+const types_2 = require("../../extensions/types");
 const proto = require("../../gcp/proto");
+const error_1 = require("../../error");
 function functionResourceToEmulatedTriggerDefintion(resource) {
-    const etd = {
-        name: resource.name,
-        entryPoint: resource.name,
-        platform: "gcfv1",
-    };
-    const properties = resource.properties || {};
-    proto.convertIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
-    proto.convertIfPresent(etd, properties, "regions", "location", (str) => [str]);
-    proto.copyIfPresent(etd, properties, "availableMemoryMb");
-    if (properties.httpsTrigger) {
-        etd.httpsTrigger = properties.httpsTrigger;
-    }
-    if (properties.eventTrigger) {
-        etd.eventTrigger = {
-            eventType: properties.eventTrigger.eventType,
-            resource: properties.eventTrigger.resource,
-            service: (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType),
+    const resourceType = resource.type;
+    if (resource.type === types_2.FUNCTIONS_RESOURCE_TYPE) {
+        const etd = {
+            name: resource.name,
+            entryPoint: resource.name,
+            platform: "gcfv1",
         };
+        const properties = resource.properties || {};
+        proto.convertIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+        proto.convertIfPresent(etd, properties, "regions", "location", (str) => [str]);
+        proto.copyIfPresent(etd, properties, "availableMemoryMb");
+        if (properties.httpsTrigger) {
+            etd.httpsTrigger = properties.httpsTrigger;
+        }
+        if (properties.eventTrigger) {
+            etd.eventTrigger = {
+                eventType: properties.eventTrigger.eventType,
+                resource: properties.eventTrigger.resource,
+                service: (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType),
+            };
+        }
+        else {
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);
+        }
+        return etd;
     }
-    else {
-        emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);
+    if (resource.type === types_2.FUNCTIONS_V2_RESOURCE_TYPE) {
+        const etd = {
+            name: resource.name,
+            entryPoint: resource.name,
+            platform: "gcfv2",
+        };
+        const properties = resource.properties || {};
+        proto.convertIfPresent(etd, properties, "regions", "location", (str) => [str]);
+        if (properties.serviceConfig) {
+            proto.copyIfPresent(etd, properties.serviceConfig, "timeoutSeconds");
+            proto.convertIfPresent(etd, properties.serviceConfig, "availableMemoryMb", "availableMemory", (mem) => parseInt(mem));
+        }
+        if (properties.eventTrigger) {
+            etd.eventTrigger = {
+                eventType: properties.eventTrigger.eventType,
+                service: (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType),
+            };
+            proto.copyIfPresent(etd.eventTrigger, properties.eventTrigger, "channel");
+            if (properties.eventTrigger.eventFilters) {
+                const eventFilters = {};
+                const eventFilterPathPatterns = {};
+                for (const filter of properties.eventTrigger.eventFilters) {
+                    if (filter.operator === undefined) {
+                        eventFilters[filter.attribute] = filter.value;
+                    }
+                    else if (filter.operator === "match-path-pattern") {
+                        eventFilterPathPatterns[filter.attribute] = filter.value;
+                    }
+                }
+                etd.eventTrigger.eventFilters = eventFilters;
+                etd.eventTrigger.eventFilterPathPatterns = eventFilterPathPatterns;
+            }
+        }
+        else {
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);
+        }
+        return etd;
     }
-    return etd;
+    throw new error_1.FirebaseError("Unexpected resource type " + resourceType);
 }
 exports.functionResourceToEmulatedTriggerDefintion = functionResourceToEmulatedTriggerDefintion;

package/lib/extensions/extensionsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.incrementPrereleaseVersion = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.incrementPrereleaseVersion = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
@@ -66,9 +66,6 @@ exports.AUTOPOULATED_PARAM_PLACEHOLDERS = {
     DATABASE_INSTANCE: "project-id-default-rtdb",
     DATABASE_URL: "https://project-id-default-rtdb.firebaseio.com",
 };
-exports.resourceTypeToNiceName = {
-    "firebaseextensions.v1beta.function": "Cloud Function",
-};
 function getDBInstanceFromURL(databaseUrl = "") {
     const instanceRegex = new RegExp("(?:https://)(.*)(?:.firebaseio.com)");
     const matches = instanceRegex.exec(databaseUrl);
@@ -558,12 +555,15 @@ async function diagnoseAndFixProject(options) {
     }
 }
 exports.diagnoseAndFixProject = diagnoseAndFixProject;
-async function canonicalizeRefInput(extensionName) {
-    if (extensionName.split("/").length < 2) {
-        const [extensionID, version] = extensionName.split("@");
-        extensionName = `firebase/${extensionID}@${version || "latest"}`;
+async function canonicalizeRefInput(refInput) {
+    let inferredRef = refInput;
+    if (refInput.split("/").length < 2) {
+        inferredRef = `firebase/${inferredRef}`;
+    }
+    if (refInput.split("@").length < 2) {
+        inferredRef = `${inferredRef}@latest`;
     }
-    const ref = refs.parse(extensionName);
+    const ref = refs.parse(inferredRef);
     ref.version = await (0, planner_1.resolveVersion)(ref);
     return refs.toExtensionVersionRef(ref);
 }

package/lib/extensions/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParamType = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -15,6 +15,7 @@ var Visibility;
     Visibility["PUBLIC"] = "public";
 })(Visibility = exports.Visibility || (exports.Visibility = {}));
 exports.FUNCTIONS_RESOURCE_TYPE = "firebaseextensions.v1beta.function";
+exports.FUNCTIONS_V2_RESOURCE_TYPE = "firebaseextensions.v1beta.v2function";
 var ParamType;
 (function (ParamType) {
     ParamType["STRING"] = "STRING";

package/lib/extensions/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatTimestamp = exports.getRandomString = exports.convertOfficialExtensionsToList = exports.convertExtensionOptionToLabeledList = exports.onceWithJoin = void 0;
+exports.getResourceRuntime = exports.formatTimestamp = exports.getRandomString = exports.convertOfficialExtensionsToList = exports.convertExtensionOptionToLabeledList = exports.onceWithJoin = void 0;
 const prompt_1 = require("../prompt");
+const types_1 = require("./types");
 async function onceWithJoin(question) {
     const response = await (0, prompt_1.promptOnce)(question);
     if (Array.isArray(response)) {
@@ -48,3 +49,15 @@ function formatTimestamp(timestamp) {
     return withoutMs.replace("T", " ");
 }
 exports.formatTimestamp = formatTimestamp;
+function getResourceRuntime(resource) {
+    var _a, _b, _c;
+    switch (resource.type) {
+        case types_1.FUNCTIONS_RESOURCE_TYPE:
+            return (_a = resource.properties) === null || _a === void 0 ? void 0 : _a.runtime;
+        case types_1.FUNCTIONS_V2_RESOURCE_TYPE:
+            return (_c = (_b = resource.properties) === null || _b === void 0 ? void 0 : _b.buildConfig) === null || _c === void 0 ? void 0 : _c.runtime;
+        default:
+            return undefined;
+    }
+}
+exports.getResourceRuntime = getResourceRuntime;

package/lib/firestore/indexes-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
+exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
 var Mode;
 (function (Mode) {
     Mode["ASCENDING"] = "ASCENDING";
@@ -27,3 +27,9 @@ var State;
     State["READY"] = "READY";
     State["NEEDS_REPAIR"] = "NEEDS_REPAIR";
 })(State = exports.State || (exports.State = {}));
+var StateTtl;
+(function (StateTtl) {
+    StateTtl["CREATING"] = "CREATING";
+    StateTtl["ACTIVE"] = "ACTIVE";
+    StateTtl["NEEDS_REPAIR"] = "NEEDS_REPAIR";
+})(StateTtl = exports.StateTtl || (exports.StateTtl = {}));

package/lib/firestore/indexes-sort.js

@@ -50,6 +50,10 @@ function compareFieldOverride(a, b) {
     if (a.collectionGroup !== b.collectionGroup) {
         return a.collectionGroup.localeCompare(b.collectionGroup);
     }
+    const compareTtl = Number(!!a.ttl) - Number(!!b.ttl);
+    if (compareTtl) {
+        return compareTtl;
+    }
     if (a.fieldPath !== b.fieldPath) {
         return a.fieldPath.localeCompare(b.fieldPath);
     }