firebase-tools 13.19.0 → 13.20.1

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actuate = exports.doSetup = void 0;
+exports.actuate = exports.doSetup = exports.FDC_APP_FOLDER = void 0;
 const yaml = require("yaml");
 const fs = require("fs");
 const clc = require("colorette");
@@ -13,13 +13,15 @@ const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const error_1 = require("../../../error");
 const lodash_1 = require("lodash");
 const utils_1 = require("../../../utils");
+exports.FDC_APP_FOLDER = "_FDC_APP_FOLDER";
 async function doSetup(setup, config) {
     const sdkInfo = await askQuestions(setup, config);
     await actuate(sdkInfo, setup.projectId);
+    (0, utils_1.logSuccess)(`If you'd like to generate additional SDKs later, run ${clc.bold("firebase init dataconnect:sdk")}`);
 }
 exports.doSetup = doSetup;
 async function askQuestions(setup, config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(config);
     const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(setup.projectId || "", config, c.source)));
     const connectorChoices = serviceInfos
@@ -33,27 +35,22 @@ async function askQuestions(setup, config) {
     })
         .flat();
     if (!connectorChoices.length) {
-        throw new error_1.FirebaseError(`Your config has no connectors to set up SDKs for. Run ${clc.bold("firebase init dataconnect")} to set up a service and conenctors.`);
+        throw new error_1.FirebaseError(`Your config has no connectors to set up SDKs for. Run ${clc.bold("firebase init dataconnect")} to set up a service and connectors.`);
     }
-    const connectorInfo = await (0, prompt_1.promptOnce)({
-        message: "Which connector do you want set up a generated SDK for?",
-        type: "list",
-        choices: connectorChoices,
-    });
     let targetPlatform = types_1.Platform.UNDETERMINED;
-    let appDir;
-    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
+    let appDir = process.env[exports.FDC_APP_FOLDER] || process.cwd();
+    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
     if (cwdPlatformGuess !== types_1.Platform.UNDETERMINED) {
-        (0, utils_1.logSuccess)(`Detected ${cwdPlatformGuess} app in current directory ${process.cwd()}`);
+        (0, utils_1.logSuccess)(`Detected ${cwdPlatformGuess} app in directory ${appDir}`);
         targetPlatform = cwdPlatformGuess;
-        appDir = process.cwd();
     }
     else {
         (0, utils_1.logBullet)(`Couldn't automatically detect your app directory.`);
-        appDir = await (0, prompt_1.promptForDirectory)({
-            config,
-            message: "Where is your app directory?",
-        });
+        appDir =
+            (_a = process.env[exports.FDC_APP_FOLDER]) !== null && _a !== void 0 ? _a : (await (0, prompt_1.promptForDirectory)({
+                config,
+                message: "Where is your app directory? Leave blank to set up a generated SDK in your current directory.",
+            }));
         const platformGuess = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
         if (platformGuess !== types_1.Platform.UNDETERMINED) {
             (0, utils_1.logSuccess)(`Detected ${platformGuess} app in directory ${appDir}`);
@@ -61,34 +58,40 @@ async function askQuestions(setup, config) {
         }
         else {
             (0, utils_1.logBullet)("Couldn't automatically detect your app's platform.");
+            const platforms = [
+                { name: "iOS (Swift)", value: types_1.Platform.IOS },
+                { name: "Web (JavaScript)", value: types_1.Platform.WEB },
+                { name: "Android (Kotlin)", value: types_1.Platform.ANDROID },
+            ];
             targetPlatform = await (0, prompt_1.promptOnce)({
                 message: "Which platform do you want to set up a generated SDK for?",
                 type: "list",
-                choices: [
-                    { name: "iOS (Swift)", value: types_1.Platform.IOS },
-                    { name: "Web (JavaScript)", value: types_1.Platform.WEB },
-                    { name: "Android (Kotlin)", value: types_1.Platform.ANDROID },
-                ],
+                choices: platforms,
             });
         }
     }
+    const connectorInfo = await (0, prompt_1.promptOnce)({
+        message: "Which connector do you want set up a generated SDK for?",
+        type: "list",
+        choices: connectorChoices,
+    });
     const newConnectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
     if (!newConnectorYaml.generate) {
         newConnectorYaml.generate = {};
     }
     let displayIOSWarning = false;
     if (targetPlatform === types_1.Platform.IOS) {
-        const outputDir = ((_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.outputDir) ||
+        const outputDir = ((_b = newConnectorYaml.generate.swiftSdk) === null || _b === void 0 ? void 0 : _b.outputDir) ||
             path.relative(connectorInfo.directory, path.join(appDir, `generated/swift`));
-        const pkg = (_c = (_b = newConnectorYaml.generate.swiftSdk) === null || _b === void 0 ? void 0 : _b.package) !== null && _c !== void 0 ? _c : (0, lodash_1.upperFirst)((0, lodash_1.camelCase)(newConnectorYaml.connectorId));
+        const pkg = (_d = (_c = newConnectorYaml.generate.swiftSdk) === null || _c === void 0 ? void 0 : _c.package) !== null && _d !== void 0 ? _d : (0, lodash_1.upperFirst)((0, lodash_1.camelCase)(newConnectorYaml.connectorId));
         const swiftSdk = { outputDir, package: pkg };
         newConnectorYaml.generate.swiftSdk = swiftSdk;
         displayIOSWarning = true;
     }
     if (targetPlatform === types_1.Platform.WEB) {
-        const outputDir = ((_d = newConnectorYaml.generate.javascriptSdk) === null || _d === void 0 ? void 0 : _d.outputDir) ||
+        const outputDir = ((_e = newConnectorYaml.generate.javascriptSdk) === null || _e === void 0 ? void 0 : _e.outputDir) ||
             path.relative(connectorInfo.directory, path.join(appDir, `generated/javascript/${newConnectorYaml.connectorId}`));
-        const pkg = (_f = (_e = newConnectorYaml.generate.javascriptSdk) === null || _e === void 0 ? void 0 : _e.package) !== null && _f !== void 0 ? _f : `@firebasegen/${connectorInfo.connectorYaml.connectorId}`;
+        const pkg = (_g = (_f = newConnectorYaml.generate.javascriptSdk) === null || _f === void 0 ? void 0 : _f.package) !== null && _g !== void 0 ? _g : `@firebasegen/${connectorInfo.connectorYaml.connectorId}`;
         const javascriptSdk = {
             outputDir,
             package: pkg,
@@ -101,6 +104,16 @@ async function askQuestions(setup, config) {
         }
         newConnectorYaml.generate.javascriptSdk = javascriptSdk;
     }
+    if (targetPlatform === types_1.Platform.DART) {
+        const outputDir = ((_h = newConnectorYaml.generate.dartSdk) === null || _h === void 0 ? void 0 : _h.outputDir) ||
+            path.relative(connectorInfo.directory, path.join(appDir, `generated/dart/${newConnectorYaml.connectorId}`));
+        const pkg = (_k = (_j = newConnectorYaml.generate.dartSdk) === null || _j === void 0 ? void 0 : _j.package) !== null && _k !== void 0 ? _k : newConnectorYaml.connectorId;
+        const dartSdk = {
+            outputDir,
+            package: pkg,
+        };
+        newConnectorYaml.generate.dartSdk = dartSdk;
+    }
     if (targetPlatform === types_1.Platform.ANDROID) {
         let baseDir = path.join(appDir, `generated/kotlin`);
         for (const candidateSubdir of ["app/src/main/java", "app/src/main/kotlin"]) {
@@ -109,9 +122,9 @@ async function askQuestions(setup, config) {
                 baseDir = candidateDir;
             }
         }
-        const outputDir = ((_g = newConnectorYaml.generate.kotlinSdk) === null || _g === void 0 ? void 0 : _g.outputDir) ||
+        const outputDir = ((_l = newConnectorYaml.generate.kotlinSdk) === null || _l === void 0 ? void 0 : _l.outputDir) ||
             path.relative(connectorInfo.directory, baseDir);
-        const pkg = (_j = (_h = newConnectorYaml.generate.kotlinSdk) === null || _h === void 0 ? void 0 : _h.package) !== null && _j !== void 0 ? _j : `connectors.${(0, lodash_1.snakeCase)(connectorInfo.connectorYaml.connectorId)}`;
+        const pkg = (_o = (_m = newConnectorYaml.generate.kotlinSdk) === null || _m === void 0 ? void 0 : _m.package) !== null && _o !== void 0 ? _o : `connectors.${(0, lodash_1.snakeCase)(connectorInfo.connectorYaml.connectorId)}`;
         const kotlinSdk = {
             outputDir,
             package: pkg,

package/lib/init/features/emulators.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = exports.DEFAULT_POSTGRES_CONNECTION = void 0;
+exports.doSetup = void 0;
 const clc = require("colorette");
-const _ = require("lodash");
 const utils = require("../../utils");
 const prompt_1 = require("../../prompt");
 const types_1 = require("../../emulator/types");
 const constants_1 = require("../../emulator/constants");
 const downloadableEmulators_1 = require("../../emulator/downloadableEmulators");
-exports.DEFAULT_POSTGRES_CONNECTION = "postgresql://localhost:5432?sslmode=disable";
 async function doSetup(setup, config) {
     var _a, _b, _c;
     const choices = types_1.ALL_SERVICE_EMULATORS.map((e) => {
@@ -78,16 +76,6 @@ async function doSetup(setup, config) {
                 ui.port = isNaN(portNum) ? undefined : portNum;
             }
         }
-        if (selections.emulators.includes(types_1.Emulators.DATACONNECT)) {
-            const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : exports.DEFAULT_POSTGRES_CONNECTION;
-            const localConnectionString = await (0, prompt_1.promptOnce)({
-                type: "input",
-                name: "localConnectionString",
-                message: `What is the connection string of the local Postgres instance you would like to use with the Data Connect emulator?`,
-                default: defaultConnectionString,
-            });
-            setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-        }
         await (0, prompt_1.prompt)(selections, [
             {
                 name: "download",
@@ -106,7 +94,7 @@ async function doSetup(setup, config) {
                 await (0, downloadableEmulators_1.downloadIfNecessary)(selected);
             }
         }
-        if (_.get(setup, "config.emulators.ui.enabled")) {
+        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) {
             (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.UI);
         }
     }

package/lib/prompt.js

@@ -55,7 +55,7 @@ async function promptForDirectory(args) {
     let dir = "";
     while (!dir) {
         const target = args.config.path(await promptOnce({
-            message: "Where is your app directory?",
+            message: args.message,
         }));
         if ((0, fsutils_1.fileExistsSync)(target)) {
             logger_1.logger.error(`Expected a directory, but ${target} is a file. Please provide a path to a directory.`);

package/lib/rc.js

@@ -37,7 +37,7 @@ class RC {
     }
     constructor(rcpath, data) {
         this.path = rcpath;
-        this.data = Object.assign({ projects: {}, targets: {}, etags: {}, dataconnectEmulatorConfig: {} }, data);
+        this.data = Object.assign({ projects: {}, targets: {}, etags: {} }, data);
     }
     set(key, value) {
         _.set(this.data, key, value);
@@ -152,14 +152,6 @@ class RC {
         this.data.etags[projectId][resourceType] = etagData;
         this.save();
     }
-    getDataconnect() {
-        var _a;
-        return (_a = this.data.dataconnectEmulatorConfig) !== null && _a !== void 0 ? _a : {};
-    }
-    setDataconnect(localConnectionString) {
-        this.data.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-        this.save();
-    }
     save() {
         if (this.path) {
             fs.writeFileSync(this.path, JSON.stringify(this.data, null, 2), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.19.0",
+  "version": "13.20.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -60,6 +60,7 @@
     ]
   },
   "dependencies": {
+    "@electric-sql/pglite": "^0.2.0",
     "@google-cloud/cloud-sql-connector": "^1.3.3",
     "@google-cloud/pubsub": "^4.5.0",
     "abort-controller": "^3.0.0",
@@ -94,6 +95,7 @@
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",
     "lodash": "^4.17.21",
+    "lsofi": "1.0.0",
     "marked": "^13.0.2",
     "marked-terminal": "^7.0.0",
     "mime": "^2.5.2",

package/schema/connector-yaml.json

@@ -20,6 +20,20 @@
         }
       }
     },
+    "dartSdk": {
+      "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."
+        }
+      }
+    },
     "kotlinSdk": {
       "additionalProperties": true,
       "type": "object",

package/schema/firebase-config.json

@@ -401,6 +401,12 @@
                         },
                         "port": {
                             "type": "number"
+                        },
+                        "postgresHost": {
+                            "type": "string"
+                        },
+                        "postgresPort": {
+                            "type": "number"
                         }
                     },
                     "type": "object"

package/templates/init/dataconnect/queries.gql

@@ -44,8 +44,7 @@
 #     title
 #     imageUrl
 #     genre
-#     metadata: movieMetadatas_on_movie {
-#       director
+#     metadata: movieMetadata_on_movie {
 #       rating
 #       releaseYear
 #       description