firebase-tools 13.11.4 → 13.12.0

package/lib/auth.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
-const fs = require("fs");
 const http = require("http");
 const jwt = require("jsonwebtoken");
 const opn = require("open");
-const path = require("path");
 const portfinder = require("portfinder");
 const url = require("url");
-const util = require("util");
 const apiv2 = require("./apiv2");
 const configstore_1 = require("./configstore");
 const error_1 = require("./error");
@@ -23,6 +20,7 @@ const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
 const track_1 = require("./track");
 const api_1 = require("./api");
+const templates_1 = require("./templates");
 portfinder.setBasePort(9005);
 function getGlobalDefaultAccount() {
     const user = configstore_1.configstore.get("user");
@@ -261,13 +259,12 @@ async function getGithubTokensFromAuthorizationCode(code, callbackUrl) {
     });
     return res.body.access_token;
 }
-async function respondWithFile(req, res, statusCode, filename) {
-    const response = await util.promisify(fs.readFile)(path.join(__dirname, filename));
+function respondHtml(req, res, statusCode, html) {
     res.writeHead(statusCode, {
-        "Content-Length": response.length,
+        "Content-Length": html.length,
         "Content-Type": "text/html",
     });
-    res.end(response);
+    res.end(html);
     req.socket.destroy();
 }
 function urlsafeBase64(base64string) {
@@ -319,8 +316,8 @@ async function loginRemotely() {
 async function loginWithLocalhostGoogle(port, userHint) {
     const callbackUrl = getCallbackUrl(port);
     const authUrl = getLoginUrl(callbackUrl, userHint);
-    const successTemplate = "../templates/loginSuccess.html";
-    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokensFromAuthorizationCode);
+    const successHtml = await (0, templates_1.readTemplate)("loginSuccess.html");
+    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successHtml, getTokensFromAuthorizationCode);
     void (0, track_1.trackGA4)("login", { method: "google_localhost" });
     return {
         user: jwt.decode(tokens.id_token, { json: true }),
@@ -331,30 +328,32 @@ async function loginWithLocalhostGoogle(port, userHint) {
 async function loginWithLocalhostGitHub(port) {
     const callbackUrl = getCallbackUrl(port);
     const authUrl = getGithubLoginUrl(callbackUrl);
-    const successTemplate = "../templates/loginSuccessGithub.html";
-    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getGithubTokensFromAuthorizationCode);
+    const successHtml = await (0, templates_1.readTemplate)("loginSuccessGithub.html");
+    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successHtml, getGithubTokensFromAuthorizationCode);
     void (0, track_1.trackGA4)("login", { method: "github_localhost" });
     return tokens;
 }
-async function loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokens) {
+async function loginWithLocalhost(port, callbackUrl, authUrl, successHtml, getTokens) {
     return new Promise((resolve, reject) => {
         const server = http.createServer(async (req, res) => {
             const query = url.parse(`${req.url}`, true).query || {};
             const queryState = query.state;
             const queryCode = query.code;
             if (queryState !== _nonce || typeof queryCode !== "string") {
-                await respondWithFile(req, res, 400, "../templates/loginFailure.html");
+                const html = await (0, templates_1.readTemplate)("loginFailure.html");
+                respondHtml(req, res, 400, html);
                 reject(new error_1.FirebaseError("Unexpected error while logging in"));
                 server.close();
                 return;
             }
             try {
                 const tokens = await getTokens(queryCode, callbackUrl);
-                await respondWithFile(req, res, 200, successTemplate);
+                respondHtml(req, res, 200, successHtml);
                 resolve(tokens);
             }
             catch (err) {
-                await respondWithFile(req, res, 400, "../templates/loginFailure.html");
+                const html = await (0, templates_1.readTemplate)("loginFailure.html");
+                respondHtml(req, res, 400, html);
                 reject(err);
             }
             server.close();

package/lib/commands/dataconnect-sdk-generate.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const path = require("path");
+const clc = require("colorette");
 const command_1 = require("../command");
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const projectUtils_1 = require("../projectUtils");
@@ -19,7 +20,7 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             const cwd = options.cwd || process.cwd();
             configDir = path.resolve(path.join(cwd), configDir);
         }
-        const serviceInfo = await (0, load_1.load)(projectId, service.location, configDir);
+        const serviceInfo = await (0, load_1.load)(projectId, configDir);
         const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
             var _a, _b, _c;
             return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||
@@ -28,13 +29,13 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
         });
         if (!hasGeneratables) {
             logger_1.logger.warn("No generated SDKs have been declared in connector.yaml files.");
-            logger_1.logger.warn("See https://firebase.google.com/docs/data-connect/quickstart#configure-sdk-outputs for examples of how to configure generated SDKs.");
+            logger_1.logger.warn(`Run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+            logger_1.logger.warn(`See https://firebase.google.com/docs/data-connect/gp/web-sdk for more details of how to configure generated SDKs.`);
             return;
         }
         for (const conn of serviceInfo.connectorInfo) {
             const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
                 configDir,
-                locationId: service.location,
                 connectorId: conn.connectorYaml.connectorId,
             });
             logger_1.logger.info(output);

package/lib/commands/ext-dev-init.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const fs = require("fs");
-const path = require("path");
 const marked_1 = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
@@ -12,19 +10,18 @@ const error_1 = require("../error");
 const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const npmDependencies = require("../init/features/functions/npm-dependencies");
+const templates_1 = require("../templates");
 marked_1.marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../templates/extensions/");
-const FUNCTIONS_ROOT = path.resolve(__dirname, "../../templates/init/functions/");
 function readCommonTemplates() {
     return {
-        integrationTestFirebaseJsonTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "integration-test.json"), "utf8"),
-        integrationTestEnvTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "integration-test.env"), "utf8"),
-        extSpecTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "extension.yaml"), "utf8"),
-        preinstallTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "PREINSTALL.md"), "utf8"),
-        postinstallTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "POSTINSTALL.md"), "utf8"),
-        changelogTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "CL-template.md"), "utf8"),
+        integrationTestFirebaseJsonTemplate: (0, templates_1.readTemplateSync)("extensions/integration-test.json"),
+        integrationTestEnvTemplate: (0, templates_1.readTemplateSync)("extensions/integration-test.env"),
+        extSpecTemplate: (0, templates_1.readTemplateSync)("extensions/extension.yaml"),
+        preinstallTemplate: (0, templates_1.readTemplateSync)("extensions/PREINSTALL.md"),
+        postinstallTemplate: (0, templates_1.readTemplateSync)("extensions/POSTINSTALL.md"),
+        changelogTemplate: (0, templates_1.readTemplateSync)("extensions/CL-template.md"),
     };
 }
 exports.command = new command_1.Command("ext:dev:init")
@@ -34,6 +31,7 @@ exports.command = new command_1.Command("ext:dev:init")
     const cwd = options.cwd || process.cwd();
     const config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
     try {
+        let welcome;
         const lang = await (0, prompt_1.promptOnce)({
             type: "list",
             name: "language",
@@ -53,10 +51,12 @@ exports.command = new command_1.Command("ext:dev:init")
         switch (lang) {
             case "javascript": {
                 await javascriptSelected(config);
+                welcome = (0, templates_1.readTemplateSync)("extensions/javascript/WELCOME.md");
                 break;
             }
             case "typescript": {
                 await typescriptSelected(config);
+                welcome = (0, templates_1.readTemplateSync)("extensions/typescript/WELCOME.md");
                 break;
             }
             default: {
@@ -64,7 +64,6 @@ exports.command = new command_1.Command("ext:dev:init")
             }
         }
         await npmDependencies.askInstallDependencies({ source: "functions" }, config);
-        const welcome = fs.readFileSync(path.join(TEMPLATE_ROOT, lang, "WELCOME.md"), "utf8");
         return logger_1.logger.info("\n" + (0, marked_1.marked)(welcome));
     }
     catch (err) {
@@ -77,15 +76,15 @@ exports.command = new command_1.Command("ext:dev:init")
     }
 });
 async function typescriptSelected(config) {
-    const packageLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "package.lint.json"), "utf8");
-    const packageNoLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "package.nolint.json"), "utf8");
-    const tsconfigTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "tsconfig.json"), "utf8");
-    const tsconfigDevTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "tsconfig.dev.json"), "utf8");
-    const indexTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "index.ts"), "utf8");
-    const integrationTestTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "integration-test.ts"), "utf8");
-    const gitignoreTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "_gitignore"), "utf8");
-    const mocharcTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "_mocharc"), "utf8");
-    const eslintTemplate = fs.readFileSync(path.join(FUNCTIONS_ROOT, "typescript", "_eslintrc"), "utf8");
+    const packageLintingTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/package.lint.json");
+    const packageNoLintingTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/package.nolint.json");
+    const tsconfigTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/tsconfig.json");
+    const tsconfigDevTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/tsconfig.dev.json");
+    const indexTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/index.ts");
+    const integrationTestTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/integration-test.ts");
+    const gitignoreTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/_gitignore");
+    const mocharcTemplate = (0, templates_1.readTemplateSync)("extensions/typescript/_mocharc");
+    const eslintTemplate = (0, templates_1.readTemplateSync)("init/functions/typescript/_eslintrc");
     const lint = await (0, prompt_1.promptOnce)({
         name: "lint",
         type: "confirm",
@@ -116,12 +115,12 @@ async function typescriptSelected(config) {
     await config.askWriteProjectFile("functions/.gitignore", gitignoreTemplate);
 }
 async function javascriptSelected(config) {
-    const indexTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "index.js"), "utf8");
-    const integrationTestTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "integration-test.js"), "utf8");
-    const packageLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "package.lint.json"), "utf8");
-    const packageNoLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "package.nolint.json"), "utf8");
-    const gitignoreTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "javascript", "_gitignore"), "utf8");
-    const eslintTemplate = fs.readFileSync(path.join(FUNCTIONS_ROOT, "javascript", "_eslintrc"), "utf8");
+    const indexTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/index.js");
+    const integrationTestTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/integration-test.js");
+    const packageLintingTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/package.lint.json");
+    const packageNoLintingTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/package.nolint.json");
+    const gitignoreTemplate = (0, templates_1.readTemplateSync)("extensions/javascript/_gitignore");
+    const eslintTemplate = (0, templates_1.readTemplateSync)("init/functions/javascript/_eslintrc");
     const lint = await (0, prompt_1.promptOnce)({
         name: "lint",
         type: "confirm",

package/lib/commands/init.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAction = exports.command = void 0;
 const clc = require("colorette");
-const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const command_1 = require("../command");
@@ -15,10 +14,10 @@ const requireAuth_1 = require("../requireAuth");
 const fsutils = require("../fsutils");
 const utils = require("../utils");
 const experiments_1 = require("../experiments");
+const templates_1 = require("../templates");
 const homeDir = os.homedir();
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../templates/");
-const BANNER_TEXT = fs.readFileSync(path.join(TEMPLATE_ROOT, "banner.txt"), "utf8");
-const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+const BANNER_TEXT = (0, templates_1.readTemplateSync)("banner.txt");
+const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
 function isOutside(from, to) {
     return !!/^\.\./.exec(path.relative(from, to));
 }
@@ -78,7 +77,12 @@ if ((0, experiments_1.isEnabled)("genkit")) {
 }
 choices.push({
     value: "dataconnect",
-    name: "Data Connect: Set up a Firebase Data Connect service.",
+    name: "Data Connect: Set up a Firebase Data Connect service",
+    checked: false,
+});
+choices.push({
+    value: "dataconnect:sdk",
+    name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
     checked: false,
 });
 const featureNames = choices.map((choice) => choice.value);

package/lib/config.js

@@ -18,7 +18,7 @@ const loadCJSON_1 = require("./loadCJSON");
 const parseBoltRules = require("./parseBoltRules");
 class Config {
     constructor(src, options = {}) {
-        var _a;
+        var _a, _b;
         this.data = {};
         this.defaults = {};
         this.notes = {};
@@ -54,6 +54,11 @@ class Config {
                 }
             }
         }
+        if (((_b = this._src.dataconnect) === null || _b === void 0 ? void 0 : _b.location) ||
+            (Array.isArray(this._src.dataconnect) && this._src.dataconnect.some((c) => c === null || c === void 0 ? void 0 : c.location))) {
+            utils.logLabeledWarning("dataconnect", "'location' has been moved from 'firebase.json' to 'dataconnect.yaml'. " +
+                "Please remove 'dataconnect.location' from 'firebase.json' and add it as top level field to 'dataconnect.yaml' instead ");
+        }
     }
     materialize(target) {
         const val = _.get(this._src, target);

package/lib/dataconnect/fileUtils.js

@@ -11,12 +11,11 @@ function readFirebaseJson(config) {
         return [];
     }
     const validator = (cfg) => {
-        if (!cfg["source"] && !cfg["location"]) {
-            throw new error_1.FirebaseError("Invalid firebase.json: DataConnect requires `source` and `location`");
+        if (!cfg["source"]) {
+            throw new error_1.FirebaseError("Invalid firebase.json: DataConnect requires `source`");
         }
         return {
             source: cfg["source"],
-            location: cfg["location"],
         };
     };
     const configs = config.get("dataconnect");
@@ -27,7 +26,7 @@ function readFirebaseJson(config) {
         return configs.map(validator);
     }
     else {
-        throw new error_1.FirebaseError("Invalid firebase.json: dataconnect should be of the form { source: string, location: string }");
+        throw new error_1.FirebaseError("Invalid firebase.json: dataconnect should be of the form { source: string }");
     }
 }
 exports.readFirebaseJson = readFirebaseJson;
@@ -38,6 +37,9 @@ async function readDataConnectYaml(sourceDirectory) {
 }
 exports.readDataConnectYaml = readDataConnectYaml;
 function validateDataConnectYaml(unvalidated) {
+    if (!unvalidated["location"]) {
+        throw new error_1.FirebaseError("Missing required field 'location' in dataconnect.yaml");
+    }
     return unvalidated;
 }
 async function readConnectorYaml(sourceDirectory) {
@@ -74,13 +76,13 @@ async function pickService(projectId, config, serviceId) {
         throw new error_1.FirebaseError("No Data Connect services found in firebase.json.");
     }
     else if (serviceCfgs.length === 1) {
-        serviceInfo = await (0, load_1.load)(projectId, serviceCfgs[0].location, serviceCfgs[0].source);
+        serviceInfo = await (0, load_1.load)(projectId, serviceCfgs[0].source);
     }
     else {
         if (!serviceId) {
             throw new error_1.FirebaseError("Multiple Data Connect services found in firebase.json. Please specify a service ID to use.");
         }
-        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.location, c.source)));
+        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.source)));
         const maybe = infos.find((i) => i.dataConnectYaml.serviceId === serviceId);
         if (!maybe) {
             throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json.`);

package/lib/dataconnect/load.js

@@ -4,9 +4,9 @@ exports.load = void 0;
 const path = require("path");
 const fileUtils = require("./fileUtils");
 const types_1 = require("./types");
-async function load(projectId, locationId, sourceDirectory) {
+async function load(projectId, sourceDirectory) {
     const dataConnectYaml = await fileUtils.readDataConnectYaml(sourceDirectory);
-    const serviceName = `projects/${projectId}/locations/${locationId}/services/${dataConnectYaml.serviceId}`;
+    const serviceName = `projects/${projectId}/locations/${dataConnectYaml.location}/services/${dataConnectYaml.serviceId}`;
     const schemaDir = path.join(sourceDirectory, dataConnectYaml.schema.source);
     const schemaGQLs = await fileUtils.readGQLFiles(schemaDir);
     const connectorInfo = await Promise.all(dataConnectYaml.connectorDirs.map(async (dir) => {
@@ -14,6 +14,7 @@ async function load(projectId, locationId, sourceDirectory) {
         const connectorYaml = await fileUtils.readConnectorYaml(connectorDir);
         const connectorGqls = await fileUtils.readGQLFiles(connectorDir);
         return {
+            directory: connectorDir,
             connectorYaml,
             connector: {
                 name: `${serviceName}/connectors/${connectorYaml.connectorId}`,
@@ -28,7 +29,7 @@ async function load(projectId, locationId, sourceDirectory) {
         sourceDirectory,
         schema: {
             name: `${serviceName}/schemas/${types_1.SCHEMA_ID}`,
-            primaryDatasource: (0, types_1.toDatasource)(projectId, locationId, dataConnectYaml.schema.datasource),
+            primaryDatasource: (0, types_1.toDatasource)(projectId, dataConnectYaml.location, dataConnectYaml.schema.datasource),
             source: {
                 files: schemaGQLs,
             },

package/lib/deploy/dataconnect/prepare.js

@@ -18,7 +18,7 @@ async function default_1(context, options) {
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(options.config);
     utils.logLabeledBullet("dataconnect", `Preparing to deploy`);
     const filters = (0, filters_1.getResourceFilters)(options);
-    const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.location, path.join(options.cwd || process.cwd(), c.source))));
+    const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, path.join(options.cwd || process.cwd(), c.source))));
     for (const si of serviceInfos) {
         si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory);
     }

package/lib/emulator/controller.js

@@ -535,7 +535,6 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             projectId,
             auto_download: true,
             configDir,
-            locationId: config[0].location,
             rc: options.rc,
         });
         await startEmulator(dataConnectEmulator);

package/lib/emulator/dataconnectEmulator.js

@@ -13,6 +13,7 @@ const types_2 = require("../dataconnect/types");
 const portUtils_1 = require("./portUtils");
 const apiv2_1 = require("../apiv2");
 const registry_1 = require("./registry");
+const logger_1 = require("../logger");
 const load_1 = require("../dataconnect/load");
 const utils_1 = require("../utils");
 const events_1 = require("events");
@@ -50,7 +51,6 @@ class DataConnectEmulator {
                 auto_download: this.args.auto_download,
                 listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
                 config_dir: this.args.configDir,
-                service_location: this.args.locationId,
             });
             this.usingExistingEmulator = false;
         }
@@ -93,16 +93,19 @@ class DataConnectEmulator {
             "--logtostderr",
             "-v=2",
             "generate",
-            `--service_location=${args.locationId}`,
             `--config_dir=${args.configDir}`,
             `--connector_id=${args.connectorId}`,
         ];
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
+        logger_1.logger.info(res.stderr);
         if (res.error) {
             throw new error_1.FirebaseError(`Error starting up Data Connect generate: ${res.error.message}`, {
                 original: res.error,
             });
         }
+        if (res.status !== 0) {
+            throw new error_1.FirebaseError(`Unable to generate your Data Connect SDKs (exit code ${res.status}): ${res.stderr}`);
+        }
         return res.stdout;
     }
     static async build(args) {
@@ -140,7 +143,7 @@ class DataConnectEmulator {
         if (!emuInfo) {
             return false;
         }
-        const serviceInfo = await (0, load_1.load)(this.args.projectId, this.args.locationId, this.args.configDir);
+        const serviceInfo = await (0, load_1.load)(this.args.projectId, this.args.configDir);
         const sameService = emuInfo.services.find((s) => serviceInfo.dataConnectYaml.serviceId === s.serviceId);
         if (!sameService) {
             throw new error_1.FirebaseError(`There is a Data Connect emulator already running on ${this.args.listen[0].address}:${this.args.listen[0].port}, but it is emulating a different service. Please stop that instance of the Data Connect emulator, or specify a different port in 'firebase.json'`);

package/lib/emulator/downloadableEmulators.js

@@ -243,7 +243,6 @@ const Commands = {
         optionalArgs: [
             "listen",
             "config_dir",
-            "service_location",
             "disable_sdk_generation",
             "resolvers_emulator",
             "rpc_retry_count",

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

@@ -6,6 +6,7 @@ const fsutils_1 = require("../../../fsutils");
 const constants_1 = require("../../constants");
 const types_1 = require("../../types");
 const emulatorLogger_1 = require("../../emulatorLogger");
+const templates_1 = require("../../../templates");
 function getSourceFile(rules, options) {
     const path = options.config.path(rules);
     return { name: path, content: (0, fsutils_1.readFile)(path) };
@@ -48,6 +49,7 @@ function getStorageRulesConfig(projectId, options) {
 }
 exports.getStorageRulesConfig = getStorageRulesConfig;
 function defaultStorageRules() {
-    const path = __dirname + "/../../../../templates/emulators/default_storage.rules";
-    return { name: path, content: (0, fsutils_1.readFile)(path) };
+    const defaultRulesPath = "emulators/default_storage.rules";
+    const name = (0, templates_1.absoluteTemplateFilePath)(defaultRulesPath);
+    return { name, content: (0, fsutils_1.readFile)(name) };
 }

package/lib/hosting/implicitInit.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.implicitInit = void 0;
 const _ = require("lodash");
 const clc = require("colorette");
-const fs = require("fs");
 const fetchWebSetup_1 = require("../fetchWebSetup");
 const utils = require("../utils");
 const logger_1 = require("../logger");
 const registry_1 = require("../emulator/registry");
 const types_1 = require("../emulator/types");
-const INIT_TEMPLATE = fs.readFileSync(__dirname + "/../../templates/hosting/init.js", "utf8");
+const templates_1 = require("../templates");
+const INIT_TEMPLATE = (0, templates_1.readTemplateSync)("hosting/init.js");
 async function implicitInit(options) {
     let config;
     try {

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const path_1 = require("path");
+const clc = require("colorette");
 const prompt_1 = require("../../../prompt");
-const fs_1 = require("fs");
 const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
 const freeTrial_1 = require("../../../dataconnect/freeTrial");
 const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
@@ -12,12 +12,13 @@ const client_1 = require("../../../dataconnect/client");
 const emulators_1 = require("../emulators");
 const names_1 = require("../../../dataconnect/names");
 const logger_1 = require("../../../logger");
-const TEMPLATE_ROOT = (0, path_1.resolve)(__dirname, "../../../../templates/init/dataconnect/");
-const DATACONNECT_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "dataconnect.yaml"), "utf8");
-const CONNECTOR_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "connector.yaml"), "utf8");
-const SCHEMA_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "schema.gql"), "utf8");
-const QUERIES_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "queries.gql"), "utf8");
-const MUTATIONS_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "mutations.gql"), "utf8");
+const templates_1 = require("../../../templates");
+const utils_1 = require("../../../utils");
+const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
+const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
+const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
+const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
+const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
 async function doSetup(setup, config) {
     var _a, _b, _c;
     let info = {
@@ -47,10 +48,7 @@ async function doSetup(setup, config) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     const subbedDataconnectYaml = subValues(DATACONNECT_YAML_TEMPLATE, info);
     const subbedConnectorYaml = subValues(CONNECTOR_YAML_TEMPLATE, info);
-    if (!config.has("dataconnect")) {
-        config.set("dataconnect.source", dir);
-        config.set("dataconnect.location", info.locationId);
-    }
+    config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
     await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
     await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "connector.yaml"), subbedConnectorYaml);
@@ -71,6 +69,8 @@ async function doSetup(setup, config) {
             waitForCreation: false,
         });
     }
+    logger_1.logger.info("");
+    (0, utils_1.logSuccess)(`If you'd like to generate an SDK for your new connector, run ${clc.bold("firebase init dataconnect:sdk")}`);
 }
 exports.doSetup = doSetup;
 function subValues(template, replacementValues) {
@@ -79,6 +79,7 @@ function subValues(template, replacementValues) {
         cloudSqlDatabase: "__cloudSqlDatabase__",
         cloudSqlInstanceId: "__cloudSqlInstanceId__",
         connectorId: "__connectorId__",
+        locationId: "__location__",
     };
     let replaced = template;
     for (const [k, v] of Object.entries(replacementValues)) {

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

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doSetup = void 0;
+const yaml = require("yaml");
+const fs = require("fs-extra");
+const prompt_1 = require("../../../prompt");
+const clc = require("colorette");
+const path = require("path");
+const fileUtils_1 = require("../../../dataconnect/fileUtils");
+const load_1 = require("../../../dataconnect/load");
+const logger_1 = require("../../../logger");
+const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
+const IOS = "ios";
+const WEB = "web";
+const ANDROID = "android";
+async function doSetup(setup, config) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(config);
+    const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(setup.projectId || "", path.join(process.cwd(), c.source))));
+    const connectorChoices = serviceInfos
+        .map((si) => {
+        return si.connectorInfo.map((ci) => {
+            return {
+                name: `${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
+                value: ci,
+            };
+        });
+    })
+        .flat();
+    if (!connectorChoices.length) {
+        logger_1.logger.info(`Your config has no connectors to set up SDKs for. Run ${clc.bold("firebase init dataconnect")} to set up a service and conenctors.`);
+        return;
+    }
+    const connectorInfo = await (0, prompt_1.promptOnce)({
+        message: "Which connector do you want set up a generated SDK for?",
+        type: "list",
+        choices: connectorChoices,
+    });
+    const platforms = await (0, prompt_1.promptOnce)({
+        message: "Which platforms do you want to set up a generated SDK for?",
+        type: "checkbox",
+        choices: [
+            { name: "iOS (Swift)", value: IOS },
+            { name: "Web (JavaScript)", value: WEB },
+            { name: "Androd (Kotlin)", value: ANDROID },
+        ],
+    });
+    const newConnectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
+    if (!newConnectorYaml.generate) {
+        newConnectorYaml.generate = {};
+    }
+    if (platforms.includes(IOS)) {
+        const defaultOutputDir = (_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.outputDir;
+        const outputDir = await (0, prompt_1.promptOnce)({
+            message: `What directory do you want to write your Swift SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
+            type: "input",
+            default: defaultOutputDir,
+        });
+        const swiftSdk = { outputDir };
+        newConnectorYaml.generate.swiftSdk = swiftSdk;
+    }
+    if (platforms.includes(WEB)) {
+        const outputDir = await (0, prompt_1.promptOnce)({
+            message: `What directory do you want to write your JavaScript SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
+            type: "input",
+            default: (_b = newConnectorYaml.generate.javascriptSdk) === null || _b === void 0 ? void 0 : _b.outputDir,
+        });
+        const pkg = await (0, prompt_1.promptOnce)({
+            message: "What package name do you want to use for your JavaScript SDK?",
+            type: "input",
+            default: (_d = (_c = newConnectorYaml.generate.javascriptSdk) === null || _c === void 0 ? void 0 : _c.package) !== null && _d !== void 0 ? _d : `@firebasegen/${connectorInfo.connectorYaml.connectorId}`,
+        });
+        const packageJSONDir = await (0, prompt_1.promptOnce)({
+            message: "Which directory contains the package.json that you would like to add the JavaScript SDK dependency to? (Leave blank to skip)",
+            type: "input",
+            default: (_e = newConnectorYaml.generate.javascriptSdk) === null || _e === void 0 ? void 0 : _e.packageJSONDir,
+        });
+        const javascriptSdk = {
+            outputDir,
+            package: pkg,
+        };
+        if (packageJSONDir) {
+            javascriptSdk.packageJSONDir = packageJSONDir;
+        }
+        newConnectorYaml.generate.javascriptSdk = javascriptSdk;
+    }
+    if (platforms.includes(ANDROID)) {
+        const outputDir = await (0, prompt_1.promptOnce)({
+            message: `What directory do you want to write your Kotlin SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
+            type: "input",
+            default: (_f = newConnectorYaml.generate.kotlinSdk) === null || _f === void 0 ? void 0 : _f.outputDir,
+        });
+        const pkg = await (0, prompt_1.promptOnce)({
+            message: "What package name do you want to use for your Kotlin SDK?",
+            type: "input",
+            default: (_h = (_g = newConnectorYaml.generate.kotlinSdk) === null || _g === void 0 ? void 0 : _g.package) !== null && _h !== void 0 ? _h : `com.google.firebase.dataconnect.connectors.${connectorInfo.connectorYaml.connectorId}`,
+        });
+        const kotlinSdk = {
+            outputDir,
+            package: pkg,
+        };
+        newConnectorYaml.generate.kotlinSdk = kotlinSdk;
+    }
+    const connectorYamlContents = yaml.stringify(newConnectorYaml);
+    const connectorYamlPath = `${connectorInfo.directory}/connector.yaml`;
+    fs.writeFileSync(connectorYamlPath, connectorYamlContents, "utf8");
+    logger_1.logger.info(`Wrote new config to ${connectorYamlPath}`);
+    if (setup.projectId &&
+        (await (0, prompt_1.confirm)({
+            message: "Would you like to generate SDK code now?",
+            default: true,
+        }))) {
+        await dataconnectEmulator_1.DataConnectEmulator.generate({
+            configDir: connectorInfo.directory,
+            connectorId: connectorInfo.connectorYaml.connectorId,
+        });
+        logger_1.logger.info(`Generated SDK code for ${connectorInfo.connectorYaml.connectorId}`);
+    }
+}
+exports.doSetup = doSetup;

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initIndexes = void 0;
 const clc = require("colorette");
-const fs = require("fs");
 const error_1 = require("../../../error");
 const api = require("../../../firestore/api");
 const fsutils = require("../../../fsutils");
 const prompt_1 = require("../../../prompt");
 const logger_1 = require("../../../logger");
+const templates_1 = require("../../../templates");
 const indexes = new api.FirestoreApi();
-const INDEXES_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/firestore/firestore.indexes.json", "utf8");
+const INDEXES_TEMPLATE = (0, templates_1.readTemplateSync)("init/firestore/firestore.indexes.json");
 function initIndexes(setup, config) {
     logger_1.logger.info();
     logger_1.logger.info("Firestore indexes allow you to perform complex queries while");

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initRules = void 0;
 const clc = require("colorette");
-const fs = require("fs");
 const gcp = require("../../../gcp");
 const fsutils = require("../../../fsutils");
 const prompt_1 = require("../../../prompt");
 const logger_1 = require("../../../logger");
 const utils = require("../../../utils");
+const templates_1 = require("../../../templates");
 const DEFAULT_RULES_FILE = "firestore.rules";
-const RULES_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/firestore/firestore.rules", "utf8");
+const RULES_TEMPLATE = (0, templates_1.readTemplateSync)("init/firestore/firestore.rules");
 function initRules(setup, config) {
     logger_1.logger.info();
     logger_1.logger.info("Firestore Security Rules allow you to define how and when to allow");

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

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setup = void 0;
-const fs = require("fs");
-const path = require("path");
 const npm_dependencies_1 = require("./npm-dependencies");
 const prompt_1 = require("../../../prompt");
 const projectConfig_1 = require("../../../functions/projectConfig");
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/javascript/");
-const INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.js"), "utf8");
-const PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
-const PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
-const ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
-const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+const templates_1 = require("../../../templates");
+const INDEX_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/index.js");
+const PACKAGE_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/package.lint.json");
+const PACKAGE_NO_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/package.nolint.json");
+const ESLINT_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/_eslintrc");
+const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/_gitignore");
 function setup(setup, config) {
     return (0, prompt_1.prompt)(setup.functions, [
         {

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

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setup = void 0;
-const fs = require("fs");
 const spawn = require("cross-spawn");
-const path = require("path");
 const python_1 = require("../../../deploy/functions/runtimes/python");
 const python_2 = require("../../../functions/python");
 const prompt_1 = require("../../../prompt");
 const supported_1 = require("../../../deploy/functions/runtimes/supported");
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/python");
-const MAIN_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "main.py"), "utf8");
-const REQUIREMENTS_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "requirements.txt"), "utf8");
-const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+const templates_1 = require("../../../templates");
+const MAIN_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/python/main.py");
+const REQUIREMENTS_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/python/requirements.txt");
+const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/python/_gitignore");
 async function setup(setup, config) {
     await config.askWriteProjectFile(`${setup.functions.source}/requirements.txt`, REQUIREMENTS_TEMPLATE);
     await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);

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

@@ -1,19 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setup = void 0;
-const fs = require("fs");
-const path = require("path");
 const npm_dependencies_1 = require("./npm-dependencies");
 const prompt_1 = require("../../../prompt");
 const projectConfig_1 = require("../../../functions/projectConfig");
-const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/typescript/");
-const PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
-const PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
-const ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
-const TSCONFIG_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.json"), "utf8");
-const TSCONFIG_DEV_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.dev.json"), "utf8");
-const INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.ts"), "utf8");
-const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+const templates_1 = require("../../../templates");
+const PACKAGE_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/package.lint.json");
+const PACKAGE_NO_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/package.nolint.json");
+const ESLINT_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/_eslintrc");
+const TSCONFIG_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/tsconfig.json");
+const TSCONFIG_DEV_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/tsconfig.dev.json");
+const INDEX_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/index.ts");
+const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/_gitignore");
 function setup(setup, config) {
     return (0, prompt_1.prompt)(setup.functions, [
         {

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const clc = require("colorette");
-const fs = require("fs");
 const rimraf_1 = require("rimraf");
 const path_1 = require("path");
 const apiv2_1 = require("../../../apiv2");
@@ -15,8 +14,9 @@ const experiments = require("../../../experiments");
 const getDefaultHostingSite_1 = require("../../../getDefaultHostingSite");
 const utils_1 = require("../../../utils");
 const interactive_1 = require("../../../hosting/interactive");
-const INDEX_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/index.html", "utf8");
-const MISSING_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/404.html", "utf8");
+const templates_1 = require("../../../templates");
+const INDEX_TEMPLATE = (0, templates_1.readTemplateSync)("init/hosting/index.html");
+const MISSING_TEMPLATE = (0, templates_1.readTemplateSync)("init/hosting/404.html");
 const DEFAULT_IGNORES = ["firebase.json", "**/.*", "**/node_modules/**"];
 async function doSetup(setup, config, options) {
     var _a;

package/lib/init/features/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genkit = exports.apphosting = exports.dataconnect = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storage = exports.hosting = exports.functions = exports.firestore = exports.database = exports.account = void 0;
+exports.genkit = exports.apphosting = exports.dataconnectSdk = exports.dataconnect = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storage = exports.hosting = exports.functions = exports.firestore = exports.database = exports.account = void 0;
 var account_1 = require("./account");
 Object.defineProperty(exports, "account", { enumerable: true, get: function () { return account_1.doSetup; } });
 var database_1 = require("./database");
@@ -25,6 +25,8 @@ var github_1 = require("./hosting/github");
 Object.defineProperty(exports, "hostingGithub", { enumerable: true, get: function () { return github_1.initGitHub; } });
 var dataconnect_1 = require("./dataconnect");
 Object.defineProperty(exports, "dataconnect", { enumerable: true, get: function () { return dataconnect_1.doSetup; } });
+var sdk_1 = require("./dataconnect/sdk");
+Object.defineProperty(exports, "dataconnectSdk", { enumerable: true, get: function () { return sdk_1.doSetup; } });
 var apphosting_1 = require("../../apphosting");
 Object.defineProperty(exports, "apphosting", { enumerable: true, get: function () { return apphosting_1.doSetup; } });
 var genkit_1 = require("./genkit");

package/lib/init/features/storage.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const clc = require("colorette");
-const fs = require("fs");
 const logger_1 = require("../../logger");
 const prompt_1 = require("../../prompt");
 const ensureCloudResourceLocation_1 = require("../../ensureCloudResourceLocation");
-const RULES_TEMPLATE = fs.readFileSync(__dirname + "/../../../templates/init/storage/storage.rules", "utf8");
+const templates_1 = require("../../templates");
+const RULES_TEMPLATE = (0, templates_1.readTemplateSync)("init/storage/storage.rules");
 async function doSetup(setup, config) {
     setup.config.storage = {};
     (0, ensureCloudResourceLocation_1.ensureLocationSet)(setup.projectLocation, "Cloud Storage");

package/lib/init/index.js

@@ -11,6 +11,7 @@ const featureFns = new Map([
     ["database", features.database],
     ["firestore", features.firestore],
     ["dataconnect", features.dataconnect],
+    ["dataconnect:sdk", features.dataconnectSdk],
     ["functions", features.functions],
     ["hosting", features.hosting],
     ["storage", features.storage],

package/lib/listFiles.js

@@ -9,6 +9,7 @@ function listFiles(cwd, ignore = []) {
         follow: true,
         ignore: ["**/firebase-debug.log", "**/firebase-debug.*.log", ".firebase/*"].concat(ignore),
         nodir: true,
+        posix: true,
     });
 }
 exports.listFiles = listFiles;

package/lib/management/apps.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteAppAndroidSha = exports.createAppAndroidSha = exports.listAppAndroidSha = exports.getAppConfig = exports.getAppConfigFile = exports.listFirebaseApps = exports.createWebApp = exports.createAndroidApp = exports.createIosApp = exports.getAppPlatform = exports.ShaCertificateType = exports.AppPlatform = exports.APP_LIST_PAGE_SIZE = void 0;
-const fs = require("fs");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const operation_poller_1 = require("../operation-poller");
+const templates_1 = require("../templates");
 const TIMEOUT_MILLIS = 30000;
 exports.APP_LIST_PAGE_SIZE = 100;
 const CREATE_APP_API_REQUEST_TIMEOUT_MILLIS = 15000;
@@ -182,7 +182,7 @@ function getAppConfigResourceString(appId, platform) {
 }
 function parseConfigFromResponse(responseBody, platform) {
     if (platform === AppPlatform.WEB) {
-        const JS_TEMPLATE = fs.readFileSync(__dirname + "/../../templates/setup/web.js", "utf8");
+        const JS_TEMPLATE = (0, templates_1.readTemplateSync)("setup/web.js");
         return {
             fileName: WEB_CONFIG_FILE_NAME,
             fileContents: JS_TEMPLATE.replace("{/*--CONFIG--*/}", JSON.stringify(responseBody, null, 2)),

package/lib/templates.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readTemplate = exports.readTemplateSync = exports.absoluteTemplateFilePath = void 0;
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const utils_1 = require("./utils");
+const TEMPLATE_ENCODING = "utf8";
+function absoluteTemplateFilePath(relPath) {
+    if ((0, utils_1.isVSCodeExtension)()) {
+        return (0, path_1.resolve)(__dirname, "templates", relPath);
+    }
+    return (0, path_1.resolve)(__dirname, "../templates", relPath);
+}
+exports.absoluteTemplateFilePath = absoluteTemplateFilePath;
+function readTemplateSync(relPath) {
+    return (0, fs_1.readFileSync)(absoluteTemplateFilePath(relPath), TEMPLATE_ENCODING);
+}
+exports.readTemplateSync = readTemplateSync;
+function readTemplate(relPath) {
+    return (0, promises_1.readFile)(absoluteTemplateFilePath(relPath), TEMPLATE_ENCODING);
+}
+exports.readTemplate = readTemplate;

package/lib/utils.js

@@ -23,6 +23,7 @@ const configstore_1 = require("./configstore");
 const error_1 = require("./error");
 const logger_1 = require("./logger");
 const prompt_1 = require("./prompt");
+const templates_1 = require("./templates");
 exports.IS_WINDOWS = process.platform === "win32";
 const SUCCESS_CHAR = exports.IS_WINDOWS ? "+" : "✔";
 const WARNING_CHAR = exports.IS_WINDOWS ? "!" : "⚠";
@@ -504,8 +505,7 @@ async function openInBrowser(url) {
 }
 exports.openInBrowser = openInBrowser;
 async function openInBrowserPopup(url, buttonText) {
-    const popupPage = fs
-        .readFileSync(path.join(__dirname, "../templates/popup.html"), { encoding: "utf-8" })
+    const popupPage = (0, templates_1.readTemplateSync)("popup.html")
         .replace("${url}", url)
         .replace("${buttonText}", buttonText);
     const port = await (0, portfinder_1.getPortPromise)();

package/package.json

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

package/schema/connector-yaml.json

@@ -2,7 +2,39 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "additionalProperties": false,
   "definitions": {
-    "generatable": {
+    "javascriptSdk": {
+      "additionalProperties": true,
+      "type": "object",
+      "properties": {
+        "outputDir": {
+          "type": "string",
+          "description": "Path to the directory where generated files should be written to."
+        },
+        "package": {
+          "type": "string",
+          "description": "The package name to use for the generated code."
+        },
+        "packageJSONDir": {
+          "type": "string",
+          "description": "The directory containining the package.json to install the generated package in."
+        }
+      }
+    },
+    "kotlinSdk": {
+      "additionalProperties": true,
+      "type": "object",
+      "properties": {
+        "outputDir": {
+          "type": "string",
+          "description": "Path to the directory where generated files should be written to."
+        },
+        "package": {
+          "type": "string",
+          "description": "The package name to use for the generated code."
+        }
+      }
+    },
+    "swiftSdk": {
       "additionalProperties": true,
       "type": "object",
       "properties": {
@@ -30,21 +62,21 @@
         "javascriptSdk": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/generatable"
+            "$ref": "#/definitions/javascriptSdk"
           },
           "description": "Configuration for a generated Javascript SDK"
         },
         "kotlinSdk": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/generatable"
+            "$ref": "#/definitions/kotlinSdk"
           },
           "description": "Configuration for a generated Kotlin SDK"
         },
         "swiftSdk": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/generatable"
+            "$ref": "#/definitions/swiftSdk"
           },
           "description": "Configuration for a generated Swift SDK"
         }

package/schema/dataconnect-yaml.json

@@ -58,6 +58,10 @@
       "type": "string",
       "description": "The ID of the Firebase Data Connect service."
     },
+    "location": {
+      "type": "string",
+      "description": "The region of the Firebase Data Connect service."
+    },
     "connectorDirs": {
       "type": "array",
       "items": {

package/schema/firebase-config.json

@@ -276,9 +276,6 @@
                 {
                     "additionalProperties": false,
                     "properties": {
-                        "location": {
-                            "type": "string"
-                        },
                         "postdeploy": {
                             "anyOf": [
                                 {
@@ -310,7 +307,6 @@
                         }
                     },
                     "required": [
-                        "location",
                         "source"
                     ],
                     "type": "object"
@@ -319,9 +315,6 @@
                     "items": {
                         "additionalProperties": false,
                         "properties": {
-                            "location": {
-                                "type": "string"
-                            },
                             "postdeploy": {
                                 "anyOf": [
                                     {
@@ -353,7 +346,6 @@
                             }
                         },
                         "required": [
-                            "location",
                             "source"
                         ],
                         "type": "object"

package/templates/_gitignore

@@ -64,3 +64,6 @@ node_modules/
 
 # dotenv environment variables file
 .env
+
+# dataconnect generated files
+.dataconnect

package/templates/init/dataconnect/connector.yaml

@@ -1,2 +1,13 @@
 connectorId: "__connectorId__"
 authMode: "PUBLIC" 
+## ## Here's an example of how to add generated SDKs.
+## ## You'll need to replace the outputDirs with ones pointing to where you want the generated code in your app.
+# generate:
+#   javascriptSdk:
+#     outputDir: <Path where you want the generated SDK to be written to, relative to this file>
+#     package: "@firebasegen/my-connector"
+#     packageJSONDir: < Optional. Path to your Javascript app's package.json>
+#   swiftSdk:
+#     outputDir: <Path where you want the generated SDK to be written to, relative to this file>
+#   kotlinSdk:
+#     outputDir: <Path where you want the generated SDK to be written to, relative to this file>

package/templates/init/dataconnect/dataconnect.yaml

@@ -1,5 +1,6 @@
 specVersion: "v1alpha"
 serviceId: "__serviceId__"
+location: "__location__"
 schema:
   source: "./schema"
   datasource: