firebase-tools 15.0.0 → 15.2.0

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newUniqueId = exports.toDNSCompatibleId = exports.actuate = exports.askQuestions = exports.FDC_DEFAULT_REGION = void 0;
+exports.newUniqueId = exports.FDC_DEFAULT_REGION = void 0;
+exports.askQuestions = askQuestions;
+exports.actuate = actuate;
+exports.toDNSCompatibleId = toDNSCompatibleId;
 const path_1 = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -93,13 +96,11 @@ async function askQuestions(setup) {
     setup.featureInfo.dataconnect = info;
     await sdk.askQuestions(setup);
 }
-exports.askQuestions = askQuestions;
 async function actuate(setup, config, options) {
-    var _a, _b, _c;
     const dir = config.get("dataconnect.source", "dataconnect");
     const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
     config.set("emulators.dataconnect.dataDir", dataDir);
-    const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnect;
+    const info = setup.featureInfo?.dataconnect;
     if (!info) {
         throw new Error("Data Connect feature RequiredInfo is not provided");
     }
@@ -113,15 +114,20 @@ async function actuate(setup, config, options) {
         await sdk.actuate(setup, config);
     }
     finally {
-        const sdkInfo = (_b = setup.featureInfo) === null || _b === void 0 ? void 0 : _b.dataconnectSdk;
-        const source = ((_c = setup.featureInfo) === null || _c === void 0 ? void 0 : _c.dataconnectSource) || "init";
-        void (0, track_1.trackGA4)("dataconnect_init", Object.assign({ source, flow: info.flow.substring(1), project_status: setup.projectId
+        const sdkInfo = setup.featureInfo?.dataconnectSdk;
+        const source = setup.featureInfo?.dataconnectSource || "init";
+        void (0, track_1.trackGA4)("dataconnect_init", {
+            source,
+            flow: info.flow.substring(1),
+            project_status: setup.projectId
                 ? (await (0, cloudbilling_1.isBillingEnabled)(setup))
                     ? info.shouldProvisionCSQL
                         ? "blaze_provisioned_csql"
                         : "blaze"
                     : "spark"
-                : "missing" }, (sdkInfo ? sdk.initAppCounters(sdkInfo) : {})), Date.now() - startTime);
+                : "missing",
+            ...(sdkInfo ? sdk.initAppCounters(sdkInfo) : {}),
+        }, Date.now() - startTime);
     }
     if (info.appDescription) {
         setup.instructions.push(`You can visualize the Data Connect Schema in Firebase Console:
@@ -130,9 +136,7 @@ async function actuate(setup, config, options) {
     }
     setup.instructions.push(`Install the Data Connect VS Code Extensions. You can explore Data Connect Query on local pgLite and Cloud SQL Postgres Instance.`);
 }
-exports.actuate = actuate;
 async function actuateWithInfo(setup, config, info, options) {
-    var _a;
     const projectId = setup.projectId;
     if (!projectId) {
         info.flow += "_save_template";
@@ -146,7 +150,7 @@ async function actuateWithInfo(setup, config, info, options) {
             instanceId: info.cloudSqlInstanceId,
             databaseId: info.cloudSqlDatabase,
             requireGoogleMlIntegration: false,
-            source: ((_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnectSource) || "init",
+            source: setup.featureInfo?.dataconnectSource || "init",
         });
     }
     const serviceName = `projects/${projectId}/locations/${info.locationId}/services/${info.serviceId}`;
@@ -254,9 +258,11 @@ function schemasDeploySequence(projectId, info, schemaFiles, linkToCloudSql) {
     ];
 }
 async function writeFiles(config, info, serviceGql, options) {
-    var _a, _b;
     const dir = config.get("dataconnect.source") || "dataconnect";
-    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: serviceGql.connectors.map((c) => c.path) }), (_a = serviceGql.secondarySchemaGqls) === null || _a === void 0 ? void 0 : _a.map((sch) => ({ id: sch.id, uri: sch.uri })));
+    const subbedDataconnectYaml = subDataconnectYamlValues({
+        ...info,
+        connectorDirs: serviceGql.connectors.map((c) => c.path),
+    }, serviceGql.secondarySchemaGqls?.map((sch) => ({ id: sch.id, uri: sch.uri })));
     config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml, !!options.force, true);
     if (serviceGql.seedDataGql) {
@@ -270,7 +276,7 @@ async function writeFiles(config, info, serviceGql, options) {
     else {
         fs.ensureFileSync((0, path_1.join)(dir, "schema", "schema.gql"));
     }
-    if ((_b = serviceGql.secondarySchemaGqls) === null || _b === void 0 ? void 0 : _b.length) {
+    if (serviceGql.secondarySchemaGqls?.length) {
         for (const sch of serviceGql.secondarySchemaGqls) {
             for (const f of sch.files) {
                 await config.askWriteProjectFile((0, path_1.join)(dir, `schema_${sch.id}`, f.path), f.content, !!options.force);
@@ -353,7 +359,6 @@ async function promptForExistingServices(setup, info) {
     await downloadService(info, choice.name);
 }
 async function downloadService(info, serviceName) {
-    var _a, _b, _c, _d, _e, _f, _g;
     let schemas = [];
     try {
         schemas = await (0, client_1.listSchemas)(serviceName, [
@@ -383,12 +388,12 @@ async function downloadService(info, serviceName) {
     for (const sch of schemas) {
         if ((0, types_1.isMainSchema)(sch)) {
             const primaryDatasource = sch.datasources.find((d) => d.postgresql);
-            if ((_b = (_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance) {
+            if (primaryDatasource?.postgresql?.cloudSql?.instance) {
                 const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
                 info.cloudSqlInstanceId = instanceName.instanceId;
             }
-            info.cloudSqlDatabase = (_d = (_c = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
-            if ((_e = sch.source.files) === null || _e === void 0 ? void 0 : _e.length) {
+            info.cloudSqlDatabase = primaryDatasource?.postgresql?.database ?? "";
+            if (sch.source.files?.length) {
                 info.serviceGql.schemaGql = sch.source.files;
             }
         }
@@ -399,7 +404,7 @@ async function downloadService(info, serviceName) {
             info.serviceGql.secondarySchemaGqls.push({
                 id: sch.name.split("/").pop(),
                 files: sch.source.files || [],
-                uri: (_g = (_f = sch.datasources[0].httpGraphql) === null || _f === void 0 ? void 0 : _f.uri) !== null && _g !== void 0 ? _g : "",
+                uri: sch.datasources[0].httpGraphql?.uri ?? "",
             });
         }
     }
@@ -470,9 +475,8 @@ async function promptForCloudSQL(setup, info) {
     if (info.cloudSqlInstanceId === "") {
         const instances = await cloudsql.listInstances(setup.projectId);
         let choices = instances.map((i) => {
-            var _a;
             let display = `${i.name} (${i.region})`;
-            if (((_a = i.settings.userLabels) === null || _a === void 0 ? void 0 : _a["firebase-data-connect"]) === "ft") {
+            if (i.settings.userLabels?.["firebase-data-connect"] === "ft") {
                 display += " (no cost trial)";
             }
             return { name: display, value: i.name, location: i.region };
@@ -600,4 +604,3 @@ function toDNSCompatibleId(id) {
     }
     return id || "app";
 }
-exports.toDNSCompatibleId = toDNSCompatibleId;

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSchemaToDataConnectYaml = exports.actuate = exports.askQuestions = void 0;
+exports.askQuestions = askQuestions;
+exports.actuate = actuate;
+exports.addSchemaToDataConnectYaml = addSchemaToDataConnectYaml;
 const clc = require("colorette");
 const fs = require("fs-extra");
 const path_1 = require("path");
@@ -13,7 +15,6 @@ const experiments = require("../../../experiments");
 const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const track_1 = require("../../../track");
 async function askQuestions(setup, config) {
-    var _a;
     const resolverInfo = {
         id: "",
         uri: "",
@@ -41,7 +42,7 @@ async function askQuestions(setup, config) {
     }
     resolverInfo.id = await (0, prompt_1.input)({
         message: `What ID would you like to use for your custom resolver?`,
-        default: (0, utils_1.newUniqueId)(`resolver`, ((_a = resolverInfo.serviceInfo.dataConnectYaml.schemas) === null || _a === void 0 ? void 0 : _a.map((sch) => sch.id || "")) || []),
+        default: (0, utils_1.newUniqueId)(`resolver`, resolverInfo.serviceInfo.dataConnectYaml.schemas?.map((sch) => sch.id || "") || []),
     });
     resolverInfo.uri = `https://${resolverInfo.id}-${setup.projectNumber || "PROJECT_NUMBER"}.${resolverInfo.serviceInfo.dataConnectYaml.location}.run.app/graphql`;
     (0, utils_1.logBullet)("Setting " +
@@ -52,13 +53,11 @@ async function askQuestions(setup, config) {
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnectResolver = resolverInfo;
 }
-exports.askQuestions = askQuestions;
 async function actuate(setup, config) {
-    var _a;
     if (!experiments.isEnabled("fdcwebhooks")) {
         return;
     }
-    const resolverInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnectResolver;
+    const resolverInfo = setup.featureInfo?.dataconnectResolver;
     if (!resolverInfo) {
         throw new Error("Data Connect resolver feature ResolverRequiredInfo not provided");
     }
@@ -78,10 +77,8 @@ async function actuate(setup, config) {
         }, Date.now() - startTime);
     }
 }
-exports.actuate = actuate;
 function actuateWithInfo(config, info) {
-    var _a;
-    const dataConnectYaml = JSON.parse(JSON.stringify((_a = info.serviceInfo) === null || _a === void 0 ? void 0 : _a.dataConnectYaml));
+    const dataConnectYaml = JSON.parse(JSON.stringify(info.serviceInfo?.dataConnectYaml));
     addSchemaToDataConnectYaml(dataConnectYaml, info);
     info.serviceInfo.dataConnectYaml = dataConnectYaml;
     const dataConnectYamlContents = yaml.stringify(dataConnectYaml);
@@ -108,4 +105,3 @@ function addSchemaToDataConnectYaml(dataConnectYaml, info) {
     }
     dataConnectYaml.schemas.push(secondarySchema);
 }
-exports.addSchemaToDataConnectYaml = addSchemaToDataConnectYaml;

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

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSdkGenerateToConnectorYaml = exports.initAppCounters = exports.actuate = exports.chooseApp = exports.askQuestions = exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
+exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
+exports.askQuestions = askQuestions;
+exports.chooseApp = chooseApp;
+exports.actuate = actuate;
+exports.initAppCounters = initAppCounters;
+exports.addSdkGenerateToConnectorYaml = addSdkGenerateToConnectorYaml;
 const yaml = require("yaml");
 const clc = require("colorette");
 const path = require("path");
@@ -63,7 +68,6 @@ async function askQuestions(setup) {
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnectSdk = info;
 }
-exports.askQuestions = askQuestions;
 async function chooseApp() {
     let apps = dedupeAppsByPlatformAndDirectory(await (0, appUtils_1.detectApps)(cwd));
     if (apps.length) {
@@ -106,6 +110,12 @@ async function chooseApp() {
         const pickedApps = await (0, prompt_1.checkbox)({
             message: "Which apps do you want to set up Data Connect SDKs in?",
             choices,
+            validate: (choices) => {
+                if (choices.length === 0) {
+                    return "Please choose at least one app.";
+                }
+                return true;
+            },
         });
         if (!pickedApps || !pickedApps.length) {
             throw new error_1.FirebaseError("Command Aborted. Please choose at least one app.");
@@ -114,10 +124,8 @@ async function chooseApp() {
     }
     return apps;
 }
-exports.chooseApp = chooseApp;
 async function actuate(setup, config) {
-    var _a, _b, _c;
-    const sdkInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnectSdk;
+    const sdkInfo = setup.featureInfo?.dataconnectSdk;
     if (!sdkInfo) {
         throw new Error("Data Connect SDK feature RequiredInfo is not provided");
     }
@@ -126,20 +134,22 @@ async function actuate(setup, config) {
         await actuateWithInfo(setup, config, sdkInfo);
     }
     finally {
-        const fdcInfo = (_b = setup.featureInfo) === null || _b === void 0 ? void 0 : _b.dataconnect;
+        const fdcInfo = setup.featureInfo?.dataconnect;
         if (!fdcInfo) {
-            const source = ((_c = setup.featureInfo) === null || _c === void 0 ? void 0 : _c.dataconnectSource) || "init_sdk";
-            void (0, track_1.trackGA4)("dataconnect_init", Object.assign({ source, project_status: setup.projectId
+            const source = setup.featureInfo?.dataconnectSource || "init_sdk";
+            void (0, track_1.trackGA4)("dataconnect_init", {
+                source,
+                project_status: setup.projectId
                     ? (await (0, cloudbilling_1.isBillingEnabled)(setup))
                         ? "blaze"
                         : "spark"
-                    : "missing" }, initAppCounters(sdkInfo)), Date.now() - startTime);
+                    : "missing",
+                ...initAppCounters(sdkInfo),
+            }, Date.now() - startTime);
         }
     }
 }
-exports.actuate = actuate;
 function initAppCounters(info) {
-    var _a;
     const counts = {
         num_web_apps: 0,
         num_android_apps: 0,
@@ -147,7 +157,7 @@ function initAppCounters(info) {
         num_flutter_apps: 0,
         num_admin_node_apps: 0,
     };
-    for (const app of (_a = info.apps) !== null && _a !== void 0 ? _a : []) {
+    for (const app of info.apps ?? []) {
         switch (app.platform) {
             case appUtils_1.Platform.ADMIN_NODE:
                 counts.num_admin_node_apps++;
@@ -168,7 +178,6 @@ function initAppCounters(info) {
     }
     return counts;
 }
-exports.initAppCounters = initAppCounters;
 async function actuateWithInfo(setup, config, info) {
     if (!info.apps.length) {
         info.apps = await (0, appUtils_1.detectApps)(cwd);
@@ -199,16 +208,16 @@ async function actuateWithInfo(setup, config, info) {
         });
     }
     catch (e) {
-        (0, utils_1.logLabeledError)("dataconnect", `Failed to generate Data Connect SDKs\n${e === null || e === void 0 ? void 0 : e.message}`);
+        (0, utils_1.logLabeledError)("dataconnect", `Failed to generate Data Connect SDKs\n${e?.message}`);
     }
     (0, utils_1.logLabeledSuccess)("dataconnect", `Installed generated SDKs for ${clc.bold(apps.map((a) => (0, appUtils_1.appDescription)(a)).join(", "))}`);
     if (apps.some((a) => a.platform === appUtils_1.Platform.IOS)) {
         (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/ios-sdk#set-client"));
     }
-    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes(appUtils_1.Framework.REACT); })) {
+    if (apps.some((a) => a.frameworks?.includes(appUtils_1.Framework.REACT))) {
         (0, utils_1.logBullet)("Visit https://firebase.google.com/docs/data-connect/web-sdk#react for more information on how to set up React Generated SDKs for Firebase Data Connect");
     }
-    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes(appUtils_1.Framework.ANGULAR); })) {
+    if (apps.some((a) => a.frameworks?.includes(appUtils_1.Framework.ANGULAR))) {
         (0, utils_1.logBullet)("Run `ng add @angular/fire` to install angular sdk dependencies.\nVisit https://github.com/invertase/tanstack-query-firebase/tree/main/packages/angular for more information on how to set up Angular Generated SDKs for Firebase Data Connect");
     }
 }
@@ -256,7 +265,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
                 package: `@dataconnect/admin-generated`,
                 packageJsonDir: path.relative(connectorDir, appDir),
             };
-            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.adminNodeSdk)) {
+            if (!(0, lodash_1.isArray)(generate?.adminNodeSdk)) {
                 generate.adminNodeSdk = generate.adminNodeSdk ? [generate.adminNodeSdk] : [];
             }
             if (!generate.adminNodeSdk.some((s) => s.outputDir === adminNodeSdk.outputDir)) {
@@ -275,7 +284,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
             for (const f of app.frameworks || []) {
                 javascriptSdk[f] = true;
             }
-            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.javascriptSdk)) {
+            if (!(0, lodash_1.isArray)(generate?.javascriptSdk)) {
                 generate.javascriptSdk = generate.javascriptSdk ? [generate.javascriptSdk] : [];
             }
             if (!generate.javascriptSdk.some((s) => s.outputDir === javascriptSdk.outputDir)) {
@@ -288,7 +297,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
                 outputDir: path.relative(connectorDir, path.join(appDir, `lib/dataconnect_generated`)),
                 package: "dataconnect_generated/generated.dart",
             };
-            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.dartSdk)) {
+            if (!(0, lodash_1.isArray)(generate?.dartSdk)) {
                 generate.dartSdk = generate.dartSdk ? [generate.dartSdk] : [];
             }
             if (!generate.dartSdk.some((s) => s.outputDir === dartSdk.outputDir)) {
@@ -301,7 +310,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
                 outputDir: path.relative(connectorDir, path.join(appDir, `src/main/kotlin`)),
                 package: `com.google.firebase.dataconnect.generated`,
             };
-            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.kotlinSdk)) {
+            if (!(0, lodash_1.isArray)(generate?.kotlinSdk)) {
                 generate.kotlinSdk = generate.kotlinSdk ? [generate.kotlinSdk] : [];
             }
             if (!generate.kotlinSdk.some((s) => s.outputDir === kotlinSdk.outputDir)) {
@@ -314,7 +323,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
                 outputDir: path.relative(connectorDir, path.join(app.directory, `../FirebaseDataConnectGenerated`)),
                 package: "DataConnectGenerated",
             };
-            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.swiftSdk)) {
+            if (!(0, lodash_1.isArray)(generate?.swiftSdk)) {
                 generate.swiftSdk = generate.swiftSdk ? [generate.swiftSdk] : [];
             }
             if (!generate.swiftSdk.some((s) => s.outputDir === swiftSdk.outputDir)) {
@@ -326,9 +335,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
             throw new error_1.FirebaseError(`Unsupported platform ${app.platform} for Data Connect SDK generation. Supported platforms are: ${Object.values(appUtils_1.Platform).join(", ")}\n${JSON.stringify(app)}`);
     }
 }
-exports.addSdkGenerateToConnectorYaml = addSdkGenerateToConnectorYaml;
 function dedupeAppsByPlatformAndDirectory(apps) {
-    var _a;
     const uniqueApps = new Map();
     for (const app of apps) {
         const frameworkKey = app.frameworks ? [...app.frameworks].sort().join(",") : "";
@@ -338,7 +345,7 @@ function dedupeAppsByPlatformAndDirectory(apps) {
                 platform: app.platform,
                 directory: app.directory,
             };
-            if ((_a = app.frameworks) === null || _a === void 0 ? void 0 : _a.length) {
+            if (app.frameworks?.length) {
                 minifiedApp.frameworks = [...app.frameworks];
             }
             uniqueApps.set(key, minifiedApp);

package/lib/init/features/emulators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.doSetup = doSetup;
 const clc = require("colorette");
 const utils = require("../../utils");
 const prompt_1 = require("../../prompt");
@@ -9,12 +9,11 @@ const constants_1 = require("../../emulator/constants");
 const downloadableEmulators_1 = require("../../emulator/downloadableEmulators");
 const initEmulators_1 = require("../../emulator/initEmulators");
 async function doSetup(setup, config) {
-    var _a, _b, _c;
     const choices = types_1.ALL_SERVICE_EMULATORS.map((e) => {
         return {
             value: e,
             name: constants_1.Constants.description(e),
-            checked: (config === null || config === void 0 ? void 0 : config.has(e)) || (config === null || config === void 0 ? void 0 : config.has(`emulators.${e}`)),
+            checked: config?.has(e) || config?.has(`emulators.${e}`),
         };
     });
     const selections = {};
@@ -47,7 +46,10 @@ async function doSetup(setup, config) {
         if (additionalInitFn) {
             const additionalOptions = await additionalInitFn(config);
             if (additionalOptions) {
-                emulators[selected] = Object.assign(Object.assign({}, setup.config.emulators[selected]), additionalOptions);
+                emulators[selected] = {
+                    ...setup.config.emulators[selected],
+                    ...additionalOptions,
+                };
             }
         }
     }
@@ -85,9 +87,8 @@ async function doSetup(setup, config) {
                 await (0, downloadableEmulators_1.downloadIfNecessary)(selected);
             }
         }
-        if ((_c = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.config) === null || _a === void 0 ? void 0 : _a.emulators) === null || _b === void 0 ? void 0 : _b.ui) === null || _c === void 0 ? void 0 : _c.enabled) {
+        if (setup?.config?.emulators?.ui?.enabled) {
             (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.UI);
         }
     }
 }
-exports.doSetup = doSetup;

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

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.doSetup = doSetup;
 const requirePermissions_1 = require("../../../requirePermissions");
 const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 const manifest = require("../../../extensions/manifest");
 const api_1 = require("../../../api");
 async function doSetup(setup, config, options) {
-    var _a, _b;
-    const projectId = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
+    const projectId = setup?.rcfile?.projects?.default;
     if (projectId) {
-        await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: projectId }));
+        await (0, requirePermissions_1.requirePermissions)({ ...options, project: projectId });
         await Promise.all([(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.extensionsOrigin)(), "unused", true)]);
     }
     return manifest.writeEmptyManifest(config, options);
 }
-exports.doSetup = doSetup;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actuate = exports.askQuestions = void 0;
+exports.askQuestions = askQuestions;
+exports.actuate = actuate;
 const rules = require("./rules");
 const indexes = require("./indexes");
 const error_1 = require("../../../error");
@@ -11,12 +12,12 @@ const api_2 = require("../../../api");
 async function askQuestions(setup, config) {
     const firestore = !Array.isArray(setup.config.firestore) ? setup.config.firestore : undefined;
     const info = {
-        databaseId: (firestore === null || firestore === void 0 ? void 0 : firestore.database) || "",
-        locationId: (firestore === null || firestore === void 0 ? void 0 : firestore.location) || "",
-        rulesFilename: (firestore === null || firestore === void 0 ? void 0 : firestore.rules) || "",
+        databaseId: firestore?.database || "",
+        locationId: firestore?.location || "",
+        rulesFilename: firestore?.rules || "",
         rules: "",
         writeRules: true,
-        indexesFilename: (firestore === null || firestore === void 0 ? void 0 : firestore.indexes) || "",
+        indexesFilename: firestore?.indexes || "",
         indexes: "",
         writeIndexes: true,
     };
@@ -63,10 +64,8 @@ async function askQuestions(setup, config) {
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.firestore = info;
 }
-exports.askQuestions = askQuestions;
 async function actuate(setup, config) {
-    var _a;
-    const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.firestore;
+    const info = setup.featureInfo?.firestore;
     if (!info) {
         throw new error_1.FirebaseError("Firestore featureInfo is not found");
     }
@@ -89,4 +88,3 @@ async function actuate(setup, config) {
         config.writeProjectFile(info.indexesFilename, info.indexes);
     }
 }
-exports.actuate = actuate;

package/lib/init/features/firestore/indexes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initIndexes = exports.INDEXES_TEMPLATE = exports.DEFAULT_INDEXES_FILE = void 0;
+exports.INDEXES_TEMPLATE = exports.DEFAULT_INDEXES_FILE = void 0;
+exports.initIndexes = initIndexes;
 const clc = require("colorette");
 const error_1 = require("../../../error");
 const api = require("../../../firestore/api");
@@ -34,7 +35,6 @@ async function initIndexes(setup, config, info) {
     }
     info.writeRules = await config.confirmWriteProjectFile(info.indexesFilename, info.indexes);
 }
-exports.initIndexes = initIndexes;
 async function getIndexesFromConsole(projectId, databaseId) {
     const indexesPromise = indexes.listIndexes(projectId, databaseId);
     const fieldOverridesPromise = indexes.listFieldOverrides(projectId, databaseId);

package/lib/init/features/firestore/rules.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initRules = exports.getDefaultRules = exports.DEFAULT_RULES_FILE = void 0;
+exports.DEFAULT_RULES_FILE = void 0;
+exports.getDefaultRules = getDefaultRules;
+exports.initRules = initRules;
 const clc = require("colorette");
 const gcp = require("../../../gcp");
 const prompt_1 = require("../../../prompt");
@@ -14,7 +16,6 @@ function getDefaultRules() {
     const formattedForRules = `${date.getFullYear()}, ${date.getMonth() + 1}, ${date.getDate()}`;
     return RULES_TEMPLATE.replace(/{{IN_30_DAYS}}/g, formattedForRules);
 }
-exports.getDefaultRules = getDefaultRules;
 async function initRules(setup, config, info) {
     logger_1.logger.info();
     logger_1.logger.info("Firestore Security Rules allow you to define how and when to allow");
@@ -37,7 +38,6 @@ async function initRules(setup, config, info) {
     }
     info.writeRules = await config.confirmWriteProjectFile(info.rulesFilename, info.rules);
 }
-exports.initRules = initRules;
 async function getRulesFromConsole(projectId) {
     const name = await gcp.rules.getLatestRulesetName(projectId, "cloud.firestore");
     if (!name) {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.doSetup = doSetup;
 const clc = require("colorette");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
@@ -12,10 +12,9 @@ const api_1 = require("../../../api");
 const supported = require("../../../deploy/functions/runtimes/supported");
 const MAX_ATTEMPTS = 5;
 async function doSetup(setup, config, options) {
-    var _a, _b;
-    const projectId = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
+    const projectId = setup?.rcfile?.projects?.default;
     if (projectId) {
-        await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: projectId }));
+        await (0, requirePermissions_1.requirePermissions)({ ...options, project: projectId });
         await Promise.all([
             (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.functionsOrigin)(), "unused", true),
             (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.runtimeconfigOrigin)(), "unused", true),
@@ -46,7 +45,6 @@ async function doSetup(setup, config, options) {
     });
     return initOpt === "new" ? initNewCodebase(setup, config) : overwriteCodebase(setup, config);
 }
-exports.doSetup = doSetup;
 async function initNewCodebase(setup, config) {
     logger_1.logger.info("Let's create a new codebase for your functions.");
     logger_1.logger.info("A directory corresponding to the codebase will be created in your project");

package/lib/init/features/functions/javascript.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setup = void 0;
+exports.setup = setup;
 const npm_dependencies_1 = require("./npm-dependencies");
 const prompt_1 = require("../../../prompt");
 const projectConfig_1 = require("../../../functions/projectConfig");
@@ -28,4 +28,3 @@ async function setup(setup, config) {
     await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
     await (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
 }
-exports.setup = setup;

package/lib/init/features/functions/npm-dependencies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askInstallDependencies = void 0;
+exports.askInstallDependencies = askInstallDependencies;
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const spawn_1 = require("../../spawn");
@@ -19,4 +19,3 @@ async function askInstallDependencies(setup, config) {
         }
     }
 }
-exports.askInstallDependencies = askInstallDependencies;

package/lib/init/features/functions/python.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setup = void 0;
+exports.setup = setup;
 const spawn = require("cross-spawn");
 const python_1 = require("../../../deploy/functions/runtimes/python");
 const python_2 = require("../../../functions/python");
@@ -42,4 +42,3 @@ async function setup(setup, config) {
         });
     }
 }
-exports.setup = setup;

package/lib/init/features/functions/typescript.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setup = void 0;
+exports.setup = setup;
 const npm_dependencies_1 = require("./npm-dependencies");
 const prompt_1 = require("../../../prompt");
 const projectConfig_1 = require("../../../functions/projectConfig");
@@ -38,4 +38,3 @@ async function setup(setup, config) {
     await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
     await (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
 }
-exports.setup = setup;