firebase-tools 10.4.0 → 10.5.0

package/lib/init/index.js

@@ -1,22 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
-const _ = require("lodash");
+const lodash_1 = require("lodash");
 const clc = require("cli-color");
+const error_1 = require("../error");
 const logger_1 = require("../logger");
-const _features = require("./features");
-const utils = require("../utils");
-const features = _features;
+const features = require("./features");
+const featureFns = new Map([
+    ["account", features.account],
+    ["database", features.database],
+    ["firestore", features.firestore],
+    ["functions", features.functions],
+    ["hosting", features.hosting],
+    ["storage", features.storage],
+    ["emulators", features.emulators],
+    ["project", features.project],
+    ["remoteconfig", features.remoteconfig],
+    ["hosting:github", features.hostingGithub],
+]);
 async function init(setup, config, options) {
-    const nextFeature = setup.features ? setup.features.shift() : undefined;
+    var _a;
+    const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();
     if (nextFeature) {
-        if (!features[nextFeature]) {
-            return utils.reject(clc.bold(nextFeature) +
-                " is not a valid feature. Must be one of " +
-                _.without(_.keys(features), "project").join(", "));
+        if (!featureFns.has(nextFeature)) {
+            const availableFeatures = Object.keys(features)
+                .filter((f) => f !== "project")
+                .join(", ");
+            throw new error_1.FirebaseError(`${clc.bold(nextFeature)} is not a valid feature. Must be one of ${availableFeatures}`);
         }
-        logger_1.logger.info(clc.bold("\n" + clc.white("=== ") + _.capitalize(nextFeature) + " Setup"));
-        await Promise.resolve(features[nextFeature](setup, config, options));
+        logger_1.logger.info(clc.bold(`\n${clc.white("===")} ${(0, lodash_1.capitalize)(nextFeature)} Setup`));
+        const fn = featureFns.get(nextFeature);
+        if (!fn) {
+            throw new error_1.FirebaseError(`We've lost the function to init ${nextFeature}`, { exit: 2 });
+        }
+        await fn(setup, config, options);
         return init(setup, config, options);
     }
 }

package/lib/requirePermissions.js

@@ -9,7 +9,10 @@ const error_1 = require("./error");
 const iam_1 = require("./gcp/iam");
 const BASE_PERMISSIONS = ["firebase.projects.get"];
 async function requirePermissions(options, permissions = []) {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectId = (0, projectUtils_1.getProjectId)(options);
+    if (!projectId) {
+        return;
+    }
     const requiredPermissions = BASE_PERMISSIONS.concat(permissions).sort();
     await (0, requireAuth_1.requireAuth)(options);
     logger_1.logger.debug(`[iam] checking project ${projectId} for permissions ${JSON.stringify(requiredPermissions)}`);

package/lib/serve/functions.js

@@ -7,6 +7,7 @@ const emulatorServer_1 = require("../emulator/emulatorServer");
 const functionsEmulatorUtils_1 = require("../emulator/functionsEmulatorUtils");
 const projectUtils_1 = require("../projectUtils");
 const auth_1 = require("../auth");
+const projectConfig = require("../functions/projectConfig");
 const utils = require("../utils");
 class FunctionsServer {
     constructor() {
@@ -20,11 +21,10 @@ class FunctionsServer {
     }
     async start(options, partialArgs) {
         const projectId = (0, projectUtils_1.needProjectId)(options);
-        utils.assertDefined(options.config.src.functions);
-        utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
-        const functionsDir = path.join(options.config.projectDir, options.config.src.functions.source);
+        const config = projectConfig.normalizeAndValidate(options.config.src.functions)[0];
+        const functionsDir = path.join(options.config.projectDir, config.source);
         const account = (0, auth_1.getProjectDefaultAccount)(options.config.projectDir);
-        const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(options.config.get("functions.runtime"));
+        const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(config.runtime);
         this.backend = {
             functionsDir,
             nodeMajorVersion,
@@ -40,7 +40,7 @@ class FunctionsServer {
             utils.assertIsNumber(options.port);
             const targets = options.targets;
             const port = options.port;
-            const hostingRunning = targets && targets.indexOf("hosting") >= 0;
+            const hostingRunning = targets && targets.includes("hosting");
             if (hostingRunning) {
                 args.port = port + 1;
             }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.4.0",
+  "version": "10.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.4.0",
+      "version": "10.5.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",

package/package.json

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

package/schema/firebase-config.json

@@ -326,54 +326,111 @@
             "type": "object"
         },
         "functions": {
-            "additionalProperties": false,
-            "properties": {
-                "ignore": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "postdeploy": {
-                    "anyOf": [
-                        {
+            "anyOf": [
+                {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ignore": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        {
+                        "postdeploy": {
+                            "anyOf": [
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "predeploy": {
+                            "anyOf": [
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "runtime": {
+                            "enum": [
+                                "nodejs10",
+                                "nodejs12",
+                                "nodejs14",
+                                "nodejs16"
+                            ],
+                            "type": "string"
+                        },
+                        "source": {
                             "type": "string"
                         }
-                    ]
+                    },
+                    "type": "object"
                 },
-                "predeploy": {
-                    "anyOf": [
-                        {
-                            "items": {
+                {
+                    "items": {
+                        "additionalProperties": false,
+                        "properties": {
+                            "ignore": {
+                                "items": {
+                                    "type": "string"
+                                },
+                                "type": "array"
+                            },
+                            "postdeploy": {
+                                "anyOf": [
+                                    {
+                                        "items": {
+                                            "type": "string"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "type": "string"
+                                    }
+                                ]
+                            },
+                            "predeploy": {
+                                "anyOf": [
+                                    {
+                                        "items": {
+                                            "type": "string"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "type": "string"
+                                    }
+                                ]
+                            },
+                            "runtime": {
+                                "enum": [
+                                    "nodejs10",
+                                    "nodejs12",
+                                    "nodejs14",
+                                    "nodejs16"
+                                ],
                                 "type": "string"
                             },
-                            "type": "array"
+                            "source": {
+                                "type": "string"
+                            }
                         },
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "runtime": {
-                    "enum": [
-                        "nodejs10",
-                        "nodejs12",
-                        "nodejs14",
-                        "nodejs16"
-                    ],
-                    "type": "string"
-                },
-                "source": {
-                    "type": "string"
+                        "type": "object"
+                    },
+                    "type": "array"
                 }
-            },
-            "type": "object"
+            ]
         },
         "hosting": {
             "anyOf": [

package/lib/emulator/storage/list.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListResponse = exports.ListItem = void 0;
-class ListItem {
-    constructor(name, bucket) {
-        this.name = name;
-        this.bucket = bucket;
-    }
-}
-exports.ListItem = ListItem;
-class ListResponse {
-    constructor(prefixes, items, nextPageToken) {
-        this.prefixes = prefixes;
-        this.items = items;
-        this.nextPageToken = nextPageToken;
-    }
-}
-exports.ListResponse = ListResponse;