firebase-tools 13.11.3 → 13.12.0

package/lib/emulator/dataconnectEmulator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataConnectEmulatorClient = exports.DataConnectEmulator = void 0;
+exports.checkIfDataConnectEmulatorRunningOnAddress = exports.DataConnectEmulatorClient = exports.DataConnectEmulator = exports.dataConnectEmulatorEvents = void 0;
 const childProcess = require("child_process");
 const clc = require("colorette");
 const api_1 = require("../api");
@@ -11,10 +11,17 @@ const error_1 = require("../error");
 const emulatorLogger_1 = require("./emulatorLogger");
 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");
+exports.dataConnectEmulatorEvents = new events_1.EventEmitter();
 class DataConnectEmulator {
     constructor(args) {
         this.args = args;
+        this.usingExistingEmulator = false;
         this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT);
         this.emulatorClient = new DataConnectEmulatorClient();
     }
@@ -33,17 +40,38 @@ class DataConnectEmulator {
         catch (err) {
             this.logger.log("DEBUG", `'fdc build' failed with error: ${err.message}`);
         }
-        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
-            auto_download: this.args.auto_download,
-            listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
-            config_dir: this.args.configDir,
-            service_location: this.args.locationId,
-        });
+        const alreadyRunning = await this.discoverRunningInstance();
+        if (alreadyRunning) {
+            this.logger.logLabeled("INFO", "Data Connect", "Detected an instance of the emulator already running with your service, reusing it. This emulator will not be shut down at the end of this command.");
+            this.usingExistingEmulator = true;
+            this.watchUnmanagedInstance();
+        }
+        else {
+            await (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
+                auto_download: this.args.auto_download,
+                listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
+                config_dir: this.args.configDir,
+            });
+            this.usingExistingEmulator = false;
+        }
+        if (!(0, utils_1.isVSCodeExtension)()) {
+            await this.connectToPostgres();
+        }
+        return;
     }
-    connect() {
+    async connect() {
+        const emuInfo = await this.emulatorClient.getInfo();
+        if (!emuInfo) {
+            this.logger.logLabeled("ERROR", "Data Connect", "Could not connect to Data Connect emulator. Check dataconnect-debug.log for more details.");
+            return Promise.reject();
+        }
         return Promise.resolve();
     }
-    stop() {
+    async stop() {
+        if (this.usingExistingEmulator) {
+            this.logger.logLabeled("INFO", "Data Connect", "Skipping cleanup of Data Connect emulator, as it was not started by this process.");
+            return;
+        }
         return (0, downloadableEmulators_1.stop)(types_1.Emulators.DATACONNECT);
     }
     getInfo() {
@@ -65,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) {
@@ -107,6 +138,35 @@ class DataConnectEmulator {
         }
         return (_b = (_a = this.args.rc.getDataconnect()) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString;
     }
+    async discoverRunningInstance() {
+        const emuInfo = await this.emulatorClient.getInfo();
+        if (!emuInfo) {
+            return false;
+        }
+        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'`);
+        }
+        if (sameService.connectionString &&
+            sameService.connectionString !== this.getLocalConectionString()) {
+            throw new error_1.FirebaseError(`There is a Data Connect emulator already running, but it is using a different Postgres connection string. Please stop that instance of the Data Connect emulator, or specify a different port in 'firebase.json'`);
+        }
+        return true;
+    }
+    watchUnmanagedInstance() {
+        return setInterval(async () => {
+            if (!this.usingExistingEmulator) {
+                return;
+            }
+            const emuInfo = await this.emulatorClient.getInfo();
+            if (!emuInfo) {
+                this.logger.logLabeled("INFO", "Data Connect", "The already running emulator seems to have shut down. Starting a new instance of the Data Connect emulator...");
+                await this.start();
+                exports.dataConnectEmulatorEvents.emit("restart");
+            }
+        }, 5000);
+    }
     async connectToPostgres(localConnectionString, database, serviceId) {
         const connectionString = localConnectionString !== null && localConnectionString !== void 0 ? localConnectionString : this.getLocalConectionString();
         if (!connectionString) {
@@ -114,8 +174,22 @@ class DataConnectEmulator {
 Run ${clc.bold("firebase setup:emulators:dataconnect")} to set up a Postgres connection.`;
             throw new error_1.FirebaseError(msg);
         }
-        await this.emulatorClient.configureEmulator({ connectionString, database, serviceId });
-        return true;
+        const MAX_RETRIES = 3;
+        for (let i = 1; i <= MAX_RETRIES; i++) {
+            try {
+                this.logger.logLabeled("DEBUG", "Data Connect", `Connecting to ${connectionString}}`);
+                await this.emulatorClient.configureEmulator({ connectionString, database, serviceId });
+                return true;
+            }
+            catch (err) {
+                if (i === MAX_RETRIES) {
+                    throw err;
+                }
+                this.logger.logLabeled("DEBUG", "Data Connect", `Retrying connectToPostgress call (${i} of ${MAX_RETRIES} attempts): ${err}`);
+                await new Promise((resolve) => setTimeout(resolve, 800));
+            }
+        }
+        return false;
     }
 }
 exports.DataConnectEmulator = DataConnectEmulator;
@@ -124,6 +198,7 @@ class DataConnectEmulatorClient {
         this.client = undefined;
     }
     async configureEmulator(body) {
+        var _a, _b;
         if (!this.client) {
             this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
         }
@@ -133,10 +208,33 @@ class DataConnectEmulatorClient {
         }
         catch (err) {
             if (err.status === 500) {
-                throw new error_1.FirebaseError(`Data Connect emulator: ${err.context.body.message}`);
+                throw new error_1.FirebaseError(`Data Connect emulator: ${(_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.message}`);
             }
             throw err;
         }
     }
+    async getInfo() {
+        if (!this.client) {
+            this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
+        }
+        return getInfo(this.client);
+    }
 }
 exports.DataConnectEmulatorClient = DataConnectEmulatorClient;
+async function checkIfDataConnectEmulatorRunningOnAddress(l) {
+    const client = new apiv2_1.Client({
+        urlPrefix: `http:/${l.family === "IPv6" ? `[${l.address}]` : l.address}:${l.port}`,
+        auth: false,
+    });
+    return getInfo(client);
+}
+exports.checkIfDataConnectEmulatorRunningOnAddress = checkIfDataConnectEmulatorRunningOnAddress;
+async function getInfo(client) {
+    try {
+        const res = await client.get("emulator/info");
+        return res.body;
+    }
+    catch (err) {
+        return;
+    }
+}

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/hub.js

@@ -149,7 +149,7 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         const locatorPath = EmulatorHub.getLocatorFilePath(this.args.projectId);
         return new Promise((resolve, reject) => {
             fs.unlink(locatorPath, (e) => {
-                if (e) {
+                if (e && e.code !== "ENOENT") {
                     reject(e);
                 }
                 else {

package/lib/emulator/portUtils.js

@@ -11,6 +11,7 @@ const types_1 = require("./types");
 const constants_1 = require("./constants");
 const emulatorLogger_1 = require("./emulatorLogger");
 const node_child_process_1 = require("node:child_process");
+const dataconnectEmulator_1 = require("./dataconnectEmulator");
 const RESTRICTED_PORTS = new Set([
     1,
     7,
@@ -219,6 +220,14 @@ async function resolveHostAndAssignPorts(listenConfig) {
                         available.push(listen);
                     }
                     else {
+                        if (/^dataconnect/i.exec(name)) {
+                            const alreadyRunning = await (0, dataconnectEmulator_1.checkIfDataConnectEmulatorRunningOnAddress)(listen);
+                            if (alreadyRunning) {
+                                emuLogger.logLabeled("DEBUG", "dataconnect", `Detected already running emulator on ${listen.address}:${listen.port}. Will attempt to reuse it.`);
+                            }
+                            available.push(listen);
+                            continue;
+                        }
                         if (!portFixed) {
                             if (i > 0) {
                                 emuLogger.logLabeled("DEBUG", name, `Port ${p} taken on secondary address ${addr.address}, will keep searching to find a better port.`);

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/experiments.js

@@ -92,8 +92,8 @@ exports.ALL_EXPERIMENTS = experiments({
         public: false,
     },
     dataconnect: {
-        shortDescription: "Enable Data Connect related features.",
-        fullDescription: "Enable Data Connect related features.",
+        shortDescription: "Deprecated. Previosuly, enabled Data Connect related features.",
+        fullDescription: "Deprecated. Previously, enabled Data Connect related features.",
         public: false,
     },
     genkit: {

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");