firebase-tools 15.1.0 → 15.2.0

package/lib/emulator/storage/files.js

@@ -1,11 +1,4 @@
 "use strict";
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageLayer = exports.StoredFile = void 0;
 const fs_1 = require("fs");
@@ -58,12 +51,11 @@ class StorageLayer {
         return [...this._buckets.values()];
     }
     async getObject(request) {
-        var _a;
         const metadata = this.getMetadata(request.bucketId, request.decodedObjectId);
-        const hasValidDownloadToken = ((metadata === null || metadata === void 0 ? void 0 : metadata.downloadTokens) || []).includes((_a = request.downloadToken) !== null && _a !== void 0 ? _a : "");
+        const hasValidDownloadToken = (metadata?.downloadTokens || []).includes(request.downloadToken ?? "");
         let authorized = hasValidDownloadToken;
         if (!authorized) {
-            authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.GET, { before: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, this._projectId, request.authorization);
+            authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.GET, { before: metadata?.asRulesResource() }, this._projectId, request.authorization);
         }
         if (!authorized) {
             throw new errors_1.ForbiddenError("Failed auth");
@@ -92,7 +84,7 @@ class StorageLayer {
     }
     async deleteObject(request) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
-        const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, this._projectId, request.authorization);
+        const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata?.asRulesResource() }, this._projectId, request.authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -124,8 +116,8 @@ class StorageLayer {
     async updateObjectMetadata(request) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
         const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.UPDATE, {
-            before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
-            after: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(request.metadata),
+            before: storedMetadata?.asRulesResource(),
+            after: storedMetadata?.asRulesResource(request.metadata),
         }, this._projectId, request.authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
@@ -160,7 +152,7 @@ class StorageLayer {
             customMetadata: getIncomingMetadata("metadata"),
         }, this._cloudFunctions, this._persistence.readBytes(upload.path, upload.size));
         const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, {
-            before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
+            before: storedMetadata?.asRulesResource(),
             after: metadata.asRulesResource(),
         }, this._projectId, upload.authorization);
         if (!authorized) {
@@ -185,9 +177,13 @@ class StorageLayer {
         const destinationFilePath = this.path(destinationBucket, destinationObject);
         this._persistence.deleteFile(destinationFilePath, true);
         this._persistence.appendBytes(destinationFilePath, sourceBytes);
-        const newMetadata = Object.assign(Object.assign(Object.assign({}, sourceMetadata), { metadata: sourceMetadata.customMetadata }), incomingMetadata);
+        const newMetadata = {
+            ...sourceMetadata,
+            metadata: sourceMetadata.customMetadata,
+            ...incomingMetadata,
+        };
         if (sourceMetadata.downloadTokens.length &&
-            !((incomingMetadata === null || incomingMetadata === void 0 ? void 0 : incomingMetadata.metadata) && Object.keys(incomingMetadata === null || incomingMetadata === void 0 ? void 0 : incomingMetadata.metadata).length)) {
+            !(incomingMetadata?.metadata && Object.keys(incomingMetadata?.metadata).length)) {
             if (!newMetadata.metadata)
                 newMetadata.metadata = {};
             newMetadata.metadata.firebaseStorageDownloadTokens = sourceMetadata.downloadTokens.join(",");
@@ -218,7 +214,6 @@ class StorageLayer {
         return file.metadata;
     }
     async listObjects(request) {
-        var _a;
         const { bucketId, prefix, delimiter, pageToken, authorization } = request;
         const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix.replace(TRAILING_SLASHES_PATTERN, "")].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, this._projectId, authorization, delimiter);
         if (!authorized) {
@@ -264,7 +259,7 @@ class StorageLayer {
                 items = items.slice(idx);
             }
         }
-        const maxResults = (_a = request.maxResults) !== null && _a !== void 0 ? _a : 1000;
+        const maxResults = request.maxResults ?? 1000;
         let nextPageToken = undefined;
         if (items.length > maxResults) {
             nextPageToken = items[maxResults].name;
@@ -305,7 +300,6 @@ class StorageLayer {
         return this._persistence.dirPath;
     }
     async export(storageExportPath, options) {
-        var _a, e_1, _b, _c;
         const bucketsList = {
             buckets: [],
         };
@@ -323,28 +317,11 @@ class StorageLayer {
         await fse.ensureDir(blobsDirPath);
         const metadataDirPath = path.join(storageExportPath, "metadata");
         await fse.ensureDir(metadataDirPath);
-        try {
-            for (var _d = true, _e = __asyncValues(this._files.entries()), _f; _f = await _e.next(), _a = _f.done, !_a;) {
-                _c = _f.value;
-                _d = false;
-                try {
-                    const [, file] = _c;
-                    const diskFileName = this._persistence.getDiskFileName(this.path(file.metadata.bucket, file.metadata.name));
-                    await fse.copy(path.join(this.dirPath, diskFileName), path.join(blobsDirPath, diskFileName));
-                    const metadataExportPath = path.join(metadataDirPath, encodeURIComponent(diskFileName)) + ".json";
-                    await fse.writeFile(metadataExportPath, metadata_1.StoredFileMetadata.toJSON(file.metadata));
-                }
-                finally {
-                    _d = true;
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
-            }
-            finally { if (e_1) throw e_1.error; }
+        for await (const [, file] of this._files.entries()) {
+            const diskFileName = this._persistence.getDiskFileName(this.path(file.metadata.bucket, file.metadata.name));
+            await fse.copy(path.join(this.dirPath, diskFileName), path.join(blobsDirPath, diskFileName));
+            const metadataExportPath = path.join(metadataDirPath, encodeURIComponent(diskFileName)) + ".json";
+            await fse.writeFile(metadataExportPath, metadata_1.StoredFileMetadata.toJSON(file.metadata));
         }
     }
     import(storageExportPath, options) {

package/lib/emulator/storage/metadata.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSerializedDate = exports.CloudStorageObjectMetadata = exports.CloudStorageObjectAccessControlMetadata = exports.CloudStorageBucketMetadata = exports.OutgoingFirebaseMetadata = exports.StoredFileMetadata = void 0;
+exports.CloudStorageObjectMetadata = exports.CloudStorageObjectAccessControlMetadata = exports.CloudStorageBucketMetadata = exports.OutgoingFirebaseMetadata = exports.StoredFileMetadata = void 0;
+exports.toSerializedDate = toSerializedDate;
 const uuid = require("uuid");
 const crypto = require("crypto");
 const registry_1 = require("../registry");
@@ -285,10 +286,16 @@ class CloudStorageObjectMetadata {
         this.etag = metadata.etag;
         this.metadata = {};
         if (Object.keys(metadata.customMetadata || {})) {
-            this.metadata = Object.assign(Object.assign({}, this.metadata), metadata.customMetadata);
+            this.metadata = {
+                ...this.metadata,
+                ...metadata.customMetadata,
+            };
         }
         if (metadata.downloadTokens.length) {
-            this.metadata = Object.assign(Object.assign({}, this.metadata), { firebaseStorageDownloadTokens: metadata.downloadTokens.join(",") });
+            this.metadata = {
+                ...this.metadata,
+                firebaseStorageDownloadTokens: metadata.downloadTokens.join(","),
+            };
         }
         if (!Object.keys(this.metadata).length) {
             delete this.metadata;
@@ -336,7 +343,6 @@ function toSerializedDate(d) {
         .padStart(3, "0")}`;
     return `${day}T${time}Z`;
 }
-exports.toSerializedDate = toSerializedDate;
 function generateMd5Hash(bytes) {
     const hash = crypto.createHash("md5");
     hash.update(bytes);

package/lib/emulator/storage/multipart.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseObjectUploadMultipartRequest = void 0;
+exports.parseObjectUploadMultipartRequest = parseObjectUploadMultipartRequest;
 const LINE_SEPARATOR = `\r\n`;
 function splitBufferByDelimiter(buffer, delimiter, maxResults = -1) {
     let offset = 0;
@@ -60,4 +60,3 @@ function parseObjectUploadMultipartRequest(contentTypeHeader, body) {
         dataRaw: Buffer.from(parsedBody[1].dataRaw),
     };
 }
-exports.parseObjectUploadMultipartRequest = parseObjectUploadMultipartRequest;

package/lib/emulator/storage/rfc.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeRFC5987 = void 0;
+exports.encodeRFC5987 = encodeRFC5987;
 function encodeRFC5987(str) {
     return encodeURIComponent(str)
         .replace(/['()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`)
         .replace(/%(7C|60|5E)/g, (str, hex) => String.fromCharCode(parseInt(hex, 16)));
 }
-exports.encodeRFC5987 = encodeRFC5987;

package/lib/emulator/storage/rules/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStorageRulesConfig = void 0;
+exports.getStorageRulesConfig = getStorageRulesConfig;
 const error_1 = require("../../../error");
 const fsutils_1 = require("../../../fsutils");
 const constants_1 = require("../../constants");
@@ -47,7 +47,6 @@ function getStorageRulesConfig(projectId, options) {
     }
     return results;
 }
-exports.getStorageRulesConfig = getStorageRulesConfig;
 function defaultStorageRules() {
     const defaultRulesPath = "emulators/default_storage.rules";
     const name = (0, templates_1.absoluteTemplateFilePath)(defaultRulesPath);

package/lib/emulator/storage/rules/manager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStorageRulesManager = void 0;
+exports.createStorageRulesManager = createStorageRulesManager;
 const chokidar = require("chokidar");
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
@@ -11,7 +11,6 @@ function createStorageRulesManager(rules, runtime) {
         ? new ResourceBasedStorageRulesManager(rules, runtime)
         : new DefaultStorageRulesManager(rules, runtime);
 }
-exports.createStorageRulesManager = createStorageRulesManager;
 class DefaultStorageRulesManager {
     constructor(_rules, _runtime) {
         this._runtime = _runtime;
@@ -51,7 +50,7 @@ class DefaultStorageRulesManager {
                 const parsedIssue = JSON.parse(issue);
                 this._logger.log("WARN", `${parsedIssue.description_.replace(/\.$/, "")} in ${parsedIssue.sourcePosition_.fileName_}:${parsedIssue.sourcePosition_.line_}`);
             }
-            catch (_a) {
+            catch {
                 this._logger.logLabeled("WARN", "storage", issue);
             }
         });
@@ -74,8 +73,7 @@ class ResourceBasedStorageRulesManager {
         return allIssues;
     }
     getRuleset(resource) {
-        var _a;
-        return (_a = this._rulesManagers.get(resource)) === null || _a === void 0 ? void 0 : _a.getRuleset();
+        return this._rulesManagers.get(resource)?.getRuleset();
     }
     async stop() {
         await Promise.all(Array.from(this._rulesManagers.values(), async (rulesManager) => await rulesManager.stop()));

package/lib/emulator/storage/rules/runtime.js

@@ -70,7 +70,6 @@ class StorageRulesRuntime {
         return this._alive;
     }
     async start(autoDownload = true) {
-        var _a, _b;
         if (this.alive) {
             return;
         }
@@ -94,9 +93,8 @@ class StorageRulesRuntime {
             stdio: ["pipe", "pipe", "pipe"],
         });
         this._childprocess.on("exit", () => {
-            var _a;
             this._alive = false;
-            (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+            this._childprocess?.removeAllListeners();
             this._childprocess = undefined;
         });
         const startPromise = new Promise((resolve) => {
@@ -111,7 +109,7 @@ class StorageRulesRuntime {
         this._childprocess.on("error", (err) => {
             void (0, downloadableEmulators_1.handleEmulatorProcessError)(types_2.Emulators.STORAGE, err);
         });
-        (_a = this._childprocess.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (buf) => {
+        this._childprocess.stderr?.on("data", (buf) => {
             const error = buf.toString();
             if (error.includes("jarfile")) {
                 emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.STORAGE).log("ERROR", error);
@@ -121,8 +119,7 @@ class StorageRulesRuntime {
                 emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.STORAGE).log("WARN", `Unexpected rules runtime error: ${buf.toString()}`);
             }
         });
-        (_b = this._childprocess.stdout) === null || _b === void 0 ? void 0 : _b.on("data", (buf) => {
-            var _a;
+        this._childprocess.stdout?.on("data", (buf) => {
             const serializedRuntimeActionResponse = buf.toString("utf-8").trim();
             if (serializedRuntimeActionResponse !== "") {
                 let rap;
@@ -133,7 +130,7 @@ class StorageRulesRuntime {
                     emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.STORAGE).log("INFO", serializedRuntimeActionResponse);
                     return;
                 }
-                const id = (_a = rap.id) !== null && _a !== void 0 ? _a : rap.server_request_id;
+                const id = rap.id ?? rap.server_request_id;
                 if (id === undefined) {
                     console.log(`Received no ID from server response ${serializedRuntimeActionResponse}`);
                     return;
@@ -157,12 +154,11 @@ class StorageRulesRuntime {
     stop() {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_2.Emulators.STORAGE).log("DEBUG", "Stopping rules runtime.");
         return new Promise((resolve) => {
-            var _a;
             if (this.alive) {
                 this._childprocess.on("exit", () => {
                     resolve();
                 });
-                (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.kill("SIGINT");
+                this._childprocess?.kill("SIGINT");
             }
             else {
                 resolve();
@@ -173,7 +169,10 @@ class StorageRulesRuntime {
         if (!this._childprocess) {
             throw new error_1.FirebaseError("Failed to send Cloud Storage rules request due to rules runtime not available.");
         }
-        const runtimeActionRequest = Object.assign(Object.assign({}, rab), { id: overrideId !== null && overrideId !== void 0 ? overrideId : this._requestCount++ });
+        const runtimeActionRequest = {
+            ...rab,
+            id: overrideId ?? this._requestCount++,
+        };
         if (overrideId !== undefined) {
             delete this._requests[overrideId];
         }
@@ -187,8 +186,7 @@ class StorageRulesRuntime {
             };
             const serializedRequest = JSON.stringify(runtimeActionRequest);
             lock.acquire(synchonizationKey, (done) => {
-                var _a, _b;
-                (_b = (_a = this._childprocess) === null || _a === void 0 ? void 0 : _a.stdin) === null || _b === void 0 ? void 0 : _b.write(serializedRequest + "\n");
+                this._childprocess?.stdin?.write(serializedRequest + "\n");
                 setTimeout(() => {
                     done();
                 }, 15);
@@ -223,7 +221,11 @@ class StorageRulesRuntime {
         if (opts.path.endsWith("/")) {
             opts.path = opts.path.slice(0, -1);
         }
-        const runtimeVariables = Object.assign({ resource: toExpressionValue(opts.file.before || null), request: createRequestExpressionValue(opts) }, runtimeVariableOverrides);
+        const runtimeVariables = {
+            resource: toExpressionValue(opts.file.before || null),
+            request: createRequestExpressionValue(opts),
+            ...runtimeVariableOverrides,
+        };
         const runtimeActionRequest = {
             action: "verify",
             context: {

package/lib/emulator/storage/rules/types.js

@@ -10,10 +10,10 @@ var RulesetOperationMethod;
     RulesetOperationMethod["CREATE"] = "create";
     RulesetOperationMethod["UPDATE"] = "update";
     RulesetOperationMethod["DELETE"] = "delete";
-})(RulesetOperationMethod = exports.RulesetOperationMethod || (exports.RulesetOperationMethod = {}));
+})(RulesetOperationMethod || (exports.RulesetOperationMethod = RulesetOperationMethod = {}));
 var DataLoadStatus;
 (function (DataLoadStatus) {
     DataLoadStatus["OK"] = "ok";
     DataLoadStatus["NOT_FOUND"] = "not_found";
     DataLoadStatus["INVALID_STATE"] = "invalid_state";
-})(DataLoadStatus = exports.DataLoadStatus || (exports.DataLoadStatus = {}));
+})(DataLoadStatus || (exports.DataLoadStatus = DataLoadStatus = {}));

package/lib/emulator/storage/rules/utils.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPermitted = exports.getAdminCredentialValidator = exports.getAdminOnlyFirebaseRulesValidator = exports.getFirebaseRulesValidator = void 0;
+exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
+exports.getAdminOnlyFirebaseRulesValidator = getAdminOnlyFirebaseRulesValidator;
+exports.getAdminCredentialValidator = getAdminCredentialValidator;
+exports.isPermitted = isPermitted;
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 function getFirebaseRulesValidator(rulesetProvider) {
@@ -18,7 +21,6 @@ function getFirebaseRulesValidator(rulesetProvider) {
         },
     };
 }
-exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
 function getAdminOnlyFirebaseRulesValidator() {
     return {
         validate: (_path, _bucketId, _method, _variableOverrides, _authorization, delimiter) => {
@@ -26,11 +28,9 @@ function getAdminOnlyFirebaseRulesValidator() {
         },
     };
 }
-exports.getAdminOnlyFirebaseRulesValidator = getAdminOnlyFirebaseRulesValidator;
 function getAdminCredentialValidator() {
     return { validate: isValidAdminCredentials };
 }
-exports.getAdminCredentialValidator = getAdminCredentialValidator;
 async function isPermitted(opts) {
     if (!opts.ruleset) {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE).log("WARN", `Can not process SDK request with no loaded ruleset`);
@@ -54,7 +54,6 @@ async function isPermitted(opts) {
     }
     return !!permitted;
 }
-exports.isPermitted = isPermitted;
 function isValidAdminCredentials(authorization) {
-    return ["Bearer owner", "Firebase owner"].includes(authorization !== null && authorization !== void 0 ? authorization : "");
+    return ["Bearer owner", "Firebase owner"].includes(authorization ?? "");
 }

package/lib/emulator/storage/server.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createApp = void 0;
+exports.createApp = createApp;
 const cors = require("cors");
 const express = require("express");
 const emulatorLogger_1 = require("../emulatorLogger");
@@ -107,7 +107,6 @@ function createApp(defaultProjectId, emulator) {
     app.use("/", (0, gcloud_1.createCloudEndpoints)(emulator));
     return Promise.resolve(app);
 }
-exports.createApp = createApp;
 function isRulesFile(file) {
     return (typeof file.name === "string" && typeof file.content === "string");
 }

package/lib/emulator/storage/upload.js

@@ -8,13 +8,13 @@ var UploadType;
     UploadType[UploadType["MEDIA"] = 0] = "MEDIA";
     UploadType[UploadType["MULTIPART"] = 1] = "MULTIPART";
     UploadType[UploadType["RESUMABLE"] = 2] = "RESUMABLE";
-})(UploadType = exports.UploadType || (exports.UploadType = {}));
+})(UploadType || (exports.UploadType = UploadType = {}));
 var UploadStatus;
 (function (UploadStatus) {
     UploadStatus["ACTIVE"] = "active";
     UploadStatus["CANCELLED"] = "cancelled";
     UploadStatus["FINISHED"] = "final";
-})(UploadStatus = exports.UploadStatus || (exports.UploadStatus = {}));
+})(UploadStatus || (exports.UploadStatus = UploadStatus = {}));
 class UploadNotActiveError extends Error {
 }
 exports.UploadNotActiveError = UploadNotActiveError;
@@ -133,8 +133,7 @@ class UploadService {
         }
     }
     getPreviousResponseCode(uploadId) {
-        var _a;
-        return ((_a = this._uploads.get(uploadId)) === null || _a === void 0 ? void 0 : _a.prevResponseCode) || 200;
+        return this._uploads.get(uploadId)?.prevResponseCode || 200;
     }
     getStagingFileName(uploadId, bucketId, objectId) {
         return encodeURIComponent(`${uploadId}_b_${bucketId}_o_${objectId}`);

package/lib/emulator/taskQueue.js

@@ -112,7 +112,7 @@ var TaskStatus;
     TaskStatus[TaskStatus["RETRY"] = 2] = "RETRY";
     TaskStatus[TaskStatus["FAILED"] = 3] = "FAILED";
     TaskStatus[TaskStatus["FINISHED"] = 4] = "FINISHED";
-})(TaskStatus = exports.TaskStatus || (exports.TaskStatus = {}));
+})(TaskStatus || (exports.TaskStatus = TaskStatus = {}));
 class TaskQueue {
     constructor(key, config) {
         this.key = key;
@@ -157,10 +157,9 @@ class TaskQueue {
         return this.dispatches;
     }
     processDispatch() {
-        var _a;
         for (let i = 0; i < this.dispatches.length; i++) {
             if (this.dispatches[i] !== null) {
-                switch ((_a = this.dispatches[i]) === null || _a === void 0 ? void 0 : _a.metadata.status) {
+                switch (this.dispatches[i]?.metadata.status) {
                     case TaskStatus.FAILED:
                         this.dispatches[i] = null;
                         this.openDispatches.push(i);
@@ -193,7 +192,15 @@ class TaskQueue {
         }
         emulatedTask.metadata.status = TaskStatus.RUNNING;
         try {
-            const headers = Object.assign({ "Content-Type": "application/json", "X-CloudTasks-QueueName": this.key, "X-CloudTasks-TaskName": emulatedTask.task.name.split("/").pop(), "X-CloudTasks-TaskRetryCount": `${emulatedTask.metadata.currentAttempt - 1}`, "X-CloudTasks-TaskExecutionCount": `${emulatedTask.metadata.executionCount}`, "X-CloudTasks-TaskETA": `${emulatedTask.task.scheduleTime || Date.now()}` }, emulatedTask.task.httpRequest.headers);
+            const headers = {
+                "Content-Type": "application/json",
+                "X-CloudTasks-QueueName": this.key,
+                "X-CloudTasks-TaskName": emulatedTask.task.name.split("/").pop(),
+                "X-CloudTasks-TaskRetryCount": `${emulatedTask.metadata.currentAttempt - 1}`,
+                "X-CloudTasks-TaskExecutionCount": `${emulatedTask.metadata.executionCount}`,
+                "X-CloudTasks-TaskETA": `${emulatedTask.task.scheduleTime || Date.now()}`,
+                ...emulatedTask.task.httpRequest.headers,
+            };
             if (emulatedTask.metadata.previousResponse) {
                 headers["X-CloudTasks-TaskPreviousResponse"] = `${emulatedTask.metadata.previousResponse}`;
             }

package/lib/emulator/tasksEmulator.js

@@ -111,7 +111,6 @@ class TasksEmulator {
         const hub = express();
         const createTaskQueueRoute = `/projects/:project_id/locations/:location_id/queues/:queue_name`;
         const createTaskQueueHandler = (req, res) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
             const projectId = req.params.project_id;
             const locationId = req.params.location_id;
             const queueName = req.params.queue_name;
@@ -127,18 +126,18 @@ class TasksEmulator {
             const body = req.body;
             const taskQueueConfig = {
                 retryConfig: {
-                    maxAttempts: (_b = (_a = body.retryConfig) === null || _a === void 0 ? void 0 : _a.maxAttempts) !== null && _b !== void 0 ? _b : RETRY_CONFIG_DEFAULTS.maxAttempts,
-                    maxRetrySeconds: (_d = (_c = body.retryConfig) === null || _c === void 0 ? void 0 : _c.maxRetrySeconds) !== null && _d !== void 0 ? _d : RETRY_CONFIG_DEFAULTS.maxRetrySeconds,
-                    maxBackoffSeconds: (_f = (_e = body.retryConfig) === null || _e === void 0 ? void 0 : _e.maxBackoffSeconds) !== null && _f !== void 0 ? _f : RETRY_CONFIG_DEFAULTS.maxBackoffSeconds,
-                    maxDoublings: (_h = (_g = body.retryConfig) === null || _g === void 0 ? void 0 : _g.maxDoublings) !== null && _h !== void 0 ? _h : RETRY_CONFIG_DEFAULTS.maxDoublings,
-                    minBackoffSeconds: (_k = (_j = body.retryConfig) === null || _j === void 0 ? void 0 : _j.minBackoffSeconds) !== null && _k !== void 0 ? _k : RETRY_CONFIG_DEFAULTS.minBackoffSeconds,
+                    maxAttempts: body.retryConfig?.maxAttempts ?? RETRY_CONFIG_DEFAULTS.maxAttempts,
+                    maxRetrySeconds: body.retryConfig?.maxRetrySeconds ?? RETRY_CONFIG_DEFAULTS.maxRetrySeconds,
+                    maxBackoffSeconds: body.retryConfig?.maxBackoffSeconds ?? RETRY_CONFIG_DEFAULTS.maxBackoffSeconds,
+                    maxDoublings: body.retryConfig?.maxDoublings ?? RETRY_CONFIG_DEFAULTS.maxDoublings,
+                    minBackoffSeconds: body.retryConfig?.minBackoffSeconds ?? RETRY_CONFIG_DEFAULTS.minBackoffSeconds,
                 },
                 rateLimits: {
-                    maxConcurrentDispatches: (_m = (_l = body.rateLimits) === null || _l === void 0 ? void 0 : _l.maxConcurrentDispatches) !== null && _m !== void 0 ? _m : RATE_LIMITS_DEFAULT.maxConcurrentDispatches,
-                    maxDispatchesPerSecond: (_p = (_o = body.rateLimits) === null || _o === void 0 ? void 0 : _o.maxDispatchesPerSecond) !== null && _p !== void 0 ? _p : RATE_LIMITS_DEFAULT.maxDispatchesPerSecond,
+                    maxConcurrentDispatches: body.rateLimits?.maxConcurrentDispatches ?? RATE_LIMITS_DEFAULT.maxConcurrentDispatches,
+                    maxDispatchesPerSecond: body.rateLimits?.maxDispatchesPerSecond ?? RATE_LIMITS_DEFAULT.maxDispatchesPerSecond,
                 },
-                timeoutSeconds: (_q = body.timeoutSeconds) !== null && _q !== void 0 ? _q : 10,
-                retry: (_r = body.retry) !== null && _r !== void 0 ? _r : false,
+                timeoutSeconds: body.timeoutSeconds ?? 10,
+                retry: body.retry ?? false,
                 defaultUri: body.defaultUri,
             };
             if (taskQueueConfig.rateLimits.maxConcurrentDispatches > 5000) {
@@ -151,7 +150,6 @@ class TasksEmulator {
         };
         const enqueueTasksRoute = `/projects/:project_id/locations/:location_id/queues/:queue_name/tasks`;
         const enqueueTasksHandler = (req, res) => {
-            var _a;
             if (!this.controller.isRunning()) {
                 this.controller.start();
             }
@@ -165,7 +163,8 @@ class TasksEmulator {
                 return;
             }
             req.body.task.name =
-                (_a = req.body.task.name) !== null && _a !== void 0 ? _a : `/projects/${projectId}/locations/${locationId}/queues/${queueName}/tasks/${Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)}`;
+                req.body.task.name ??
+                    `/projects/${projectId}/locations/${locationId}/queues/${queueName}/tasks/${Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)}`;
             req.body.task.httpRequest.body = JSON.parse(Buffer.from(req.body.task.httpRequest.body, "base64").toString("utf-8"));
             const task = req.body.task;
             try {

package/lib/emulator/types.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Severity = exports.EmulatorLog = exports.FunctionsExecutionMode = exports.isEmulator = exports.isDownloadableEmulator = exports.ALL_EMULATORS = exports.EMULATORS_SUPPORTED_BY_USE_EMULATOR = exports.EMULATORS_SUPPORTED_BY_UI = exports.EMULATORS_SUPPORTED_BY_FUNCTIONS = exports.ALL_SERVICE_EMULATORS = exports.IMPORT_EXPORT_EMULATORS = exports.DOWNLOADABLE_EMULATORS = exports.Emulators = void 0;
+exports.Severity = exports.EmulatorLog = exports.FunctionsExecutionMode = exports.ALL_EMULATORS = exports.EMULATORS_SUPPORTED_BY_USE_EMULATOR = exports.EMULATORS_SUPPORTED_BY_UI = exports.EMULATORS_SUPPORTED_BY_FUNCTIONS = exports.ALL_SERVICE_EMULATORS = exports.IMPORT_EXPORT_EMULATORS = exports.DOWNLOADABLE_EMULATORS = exports.Emulators = void 0;
+exports.isDownloadableEmulator = isDownloadableEmulator;
+exports.isEmulator = isEmulator;
 var Emulators;
 (function (Emulators) {
     Emulators["AUTH"] = "auth";
@@ -18,7 +20,7 @@ var Emulators;
     Emulators["EVENTARC"] = "eventarc";
     Emulators["DATACONNECT"] = "dataconnect";
     Emulators["TASKS"] = "tasks";
-})(Emulators = exports.Emulators || (exports.Emulators = {}));
+})(Emulators || (exports.Emulators = Emulators = {}));
 exports.DOWNLOADABLE_EMULATORS = [
     Emulators.FIRESTORE,
     Emulators.DATABASE,
@@ -80,16 +82,14 @@ exports.ALL_EMULATORS = [
 function isDownloadableEmulator(value) {
     return isEmulator(value) && exports.DOWNLOADABLE_EMULATORS.includes(value);
 }
-exports.isDownloadableEmulator = isDownloadableEmulator;
 function isEmulator(value) {
     return Object.values(Emulators).includes(value);
 }
-exports.isEmulator = isEmulator;
 var FunctionsExecutionMode;
 (function (FunctionsExecutionMode) {
     FunctionsExecutionMode["AUTO"] = "auto";
     FunctionsExecutionMode["SEQUENTIAL"] = "sequential";
-})(FunctionsExecutionMode = exports.FunctionsExecutionMode || (exports.FunctionsExecutionMode = {}));
+})(FunctionsExecutionMode || (exports.FunctionsExecutionMode = FunctionsExecutionMode = {}));
 class EmulatorLog {
     get date() {
         if (!this.timestamp) {
@@ -206,4 +206,4 @@ var Severity;
     Severity[Severity["DEPRECATION"] = 1] = "DEPRECATION";
     Severity[Severity["WARNING"] = 2] = "WARNING";
     Severity[Severity["ERROR"] = 3] = "ERROR";
-})(Severity = exports.Severity || (exports.Severity = {}));
+})(Severity || (exports.Severity = Severity = {}));

package/lib/emulator/ui.js

@@ -38,7 +38,12 @@ class EmulatorUI extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         const webDir = path.join(downloadDetails.unzipDir, "client");
         app.get("/api/config", this.jsonHandler(() => {
             const emulatorInfos = (0, functional_1.mapObject)(hub.getRunningEmulatorsMapping(), env_1.maybeUsePortForwarding);
-            const json = Object.assign({ projectId, experiments: enabledExperiments !== null && enabledExperiments !== void 0 ? enabledExperiments : [], analytics: emulatorGaSession }, emulatorInfos);
+            const json = {
+                projectId,
+                experiments: enabledExperiments ?? [],
+                analytics: emulatorGaSession,
+                ...emulatorInfos,
+            };
             return Promise.resolve(json);
         }));
         app.use(express.static(webDir));

package/lib/ensureApiEnabled.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableApiURI = exports.bestEffortEnsure = exports.ensure = exports.check = exports.POLL_SETTINGS = void 0;
+exports.POLL_SETTINGS = void 0;
+exports.check = check;
+exports.ensure = ensure;
+exports.bestEffortEnsure = bestEffortEnsure;
+exports.enableApiURI = enableApiURI;
 const colorette_1 = require("colorette");
 const track_1 = require("./track");
 const api_1 = require("./api");
@@ -35,10 +39,8 @@ async function check(projectId, apiUri, prefix, silent = false) {
     }
     return isEnabled;
 }
-exports.check = check;
 function isPermissionError(e) {
-    var _a, _b, _c;
-    return ((_c = (_b = (_a = e.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.status) === "PERMISSION_DENIED";
+    return e.context?.body?.error?.status === "PERMISSION_DENIED";
 }
 async function enable(projectId, apiName) {
     try {
@@ -114,7 +116,6 @@ async function ensure(projectId, apiUri, prefix, silent = false) {
     }
     return enableApiWithRetries(projectId, hostname, prefix, silent);
 }
-exports.ensure = ensure;
 async function bestEffortEnsure(projectId, apiUri, prefix, silent = false) {
     try {
         await ensure(projectId, apiUri, prefix, silent);
@@ -123,16 +124,13 @@ async function bestEffortEnsure(projectId, apiUri, prefix, silent = false) {
         logger_1.logger.debug(`Unable to check that ${apiUri} is enabled on ${projectId}. Calls to it will fail if it is not enabled`);
     }
 }
-exports.bestEffortEnsure = bestEffortEnsure;
 function enableApiURI(projectId, apiName) {
     return `https://console.cloud.google.com/apis/library/${apiName}?project=${projectId}`;
 }
-exports.enableApiURI = enableApiURI;
 const API_ENABLEMENT_CACHE_KEY = "apiEnablementCache";
 function checkAPIEnablementCache(projectId, apiName) {
-    var _a;
     const cache = configstore_1.configstore.get(API_ENABLEMENT_CACHE_KEY);
-    return !!((_a = cache === null || cache === void 0 ? void 0 : cache[projectId]) === null || _a === void 0 ? void 0 : _a[apiName]);
+    return !!cache?.[projectId]?.[apiName];
 }
 function cacheEnabledAPI(projectId, apiName) {
     const cache = (configstore_1.configstore.get(API_ENABLEMENT_CACHE_KEY) || {});