firebase-tools 13.13.2 → 13.14.0

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

@@ -19,6 +19,19 @@ const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconn
 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");
+const defaultConnector = {
+    id: "default-connector",
+    files: [
+        {
+            path: "queries.gql",
+            content: QUERIES_TEMPLATE,
+        },
+        {
+            path: "mutations.gql",
+            content: MUTATIONS_TEMPLATE,
+        },
+    ],
+};
 async function doSetup(setup, config) {
     var _a, _b, _c;
     let info = {
@@ -28,7 +41,8 @@ async function doSetup(setup, config) {
         isNewInstance: false,
         cloudSqlDatabase: "",
         isNewDatabase: false,
-        connectorId: "default-connector",
+        connectors: [defaultConnector],
+        schemaGql: [],
     };
     info = await promptForService(setup, info);
     if (info.cloudSqlInstanceId === "") {
@@ -45,15 +59,7 @@ async function doSetup(setup, config) {
         default: defaultConnectionString,
     });
     setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-    const dir = config.get("dataconnect.source") || "dataconnect";
-    const subbedDataconnectYaml = subValues(DATACONNECT_YAML_TEMPLATE, info);
-    const subbedConnectorYaml = subValues(CONNECTOR_YAML_TEMPLATE, info);
-    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);
-    await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "queries.gql"), QUERIES_TEMPLATE);
-    await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "mutations.gql"), MUTATIONS_TEMPLATE);
+    await writeFiles(config, info);
     if (setup.projectId &&
         (info.isNewInstance || info.isNewDatabase) &&
         (await (0, prompt_1.confirm)({
@@ -73,15 +79,51 @@ async function doSetup(setup, config) {
     (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) {
+async function writeFiles(config, info) {
+    const dir = config.get("dataconnect.source") || "dataconnect";
+    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorIds: info.connectors.map((c) => `"./${c.id}"`).join(", ") }));
+    config.set("dataconnect", { source: dir });
+    await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
+    if (info.schemaGql.length) {
+        (0, utils_1.logSuccess)("The service you chose already has GQL files deployed. We'll use those instead of the default templates.");
+        for (const f of info.schemaGql) {
+            await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content);
+        }
+    }
+    else {
+        await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
+    }
+    for (const c of info.connectors) {
+        await writeConnectorFiles(config, c);
+    }
+}
+async function writeConnectorFiles(config, connectorInfo) {
+    const subbedConnectorYaml = subConnectorYamlValues({ connectorId: connectorInfo.id });
+    const dir = config.get("dataconnect.source") || "dataconnect";
+    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.id, "connector.yaml"), subbedConnectorYaml);
+    for (const f of connectorInfo.files) {
+        await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.id, f.path), f.content);
+    }
+}
+function subDataconnectYamlValues(replacementValues) {
     const replacements = {
         serviceId: "__serviceId__",
         cloudSqlDatabase: "__cloudSqlDatabase__",
         cloudSqlInstanceId: "__cloudSqlInstanceId__",
-        connectorId: "__connectorId__",
+        connectorIds: "__connectorIds__",
         locationId: "__location__",
     };
-    let replaced = template;
+    let replaced = DATACONNECT_YAML_TEMPLATE;
+    for (const [k, v] of Object.entries(replacementValues)) {
+        replaced = replaced.replace(replacements[k], v);
+    }
+    return replaced;
+}
+function subConnectorYamlValues(replacementValues) {
+    const replacements = {
+        connectorId: "__connectorId__",
+    };
+    let replaced = CONNECTOR_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
         replaced = replaced.replace(replacements[k], v);
     }
@@ -98,12 +140,8 @@ async function promptForService(setup, info) {
                 schema: await (0, client_1.getSchema)(s.name),
             };
         }));
-        const existingFreshServicesAndSchemas = existingServicesAndSchemas.filter((s) => {
-            var _a, _b;
-            return !((_b = (_a = s.schema) === null || _a === void 0 ? void 0 : _a.source.files) === null || _b === void 0 ? void 0 : _b.length);
-        });
-        if (existingFreshServicesAndSchemas.length) {
-            const choices = existingFreshServicesAndSchemas.map((s) => {
+        if (existingServicesAndSchemas.length) {
+            const choices = existingServicesAndSchemas.map((s) => {
                 const serviceName = (0, names_1.parseServiceName)(s.service.name);
                 return {
                     name: `${serviceName.location}/${serviceName.serviceId}`,
@@ -125,7 +163,19 @@ async function promptForService(setup, info) {
                         const instanceName = (0, names_1.parseCloudSQLInstanceName)((_b = choice.schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance);
                         info.cloudSqlInstanceId = instanceName.instanceId;
                     }
+                    if (choice.schema.source.files) {
+                        info.schemaGql = choice.schema.source.files;
+                    }
                     info.cloudSqlDatabase = (_d = (_c = choice.schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
+                    const connectors = await (0, client_1.listConnectors)(choice.service.name);
+                    if (connectors.length) {
+                        info.connectors = connectors.map((c) => {
+                            return {
+                                id: c.name.split("/").pop(),
+                                files: c.source.files || [],
+                            };
+                        });
+                    }
                 }
             }
         }

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

@@ -3,9 +3,8 @@ 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 prompt_1 = require("../../../prompt");
 const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const load_1 = require("../../../dataconnect/load");
 const logger_1 = require("../../../logger");
@@ -16,7 +15,7 @@ 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 serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(setup.projectId || "", config, c.source)));
     const connectorChoices = serviceInfos
         .map((si) => {
         return si.connectorInfo.map((ci) => {

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

@@ -29,6 +29,7 @@ const HOSTING_GITHUB_ACTION_NAME = "FirebaseExtended/action-hosting-deploy@v0";
 const SERVICE_ACCOUNT_MAX_KEY_NUMBER = 10;
 const githubApiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.githubApiOrigin)(), auth: false });
 async function initGitHub(setup) {
+    var _a, _b, _c, _d, _e;
     if (!setup.projectId) {
         return (0, utils_1.reject)("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
     }
@@ -69,7 +70,7 @@ async function initGitHub(setup) {
     if (setup.config.hosting.predeploy) {
         (0, utils_1.logBullet)(`You have a predeploy script configured in firebase.json.`);
     }
-    const { script } = await promptForBuildScript();
+    const { script } = await promptForBuildScript((_a = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _a === void 0 ? void 0 : _a.useWebFrameworks);
     const ymlDeployDoc = loadYMLDeploy();
     let shouldWriteYMLHostingFile = true;
     let shouldWriteYMLDeployFile = false;
@@ -80,7 +81,7 @@ async function initGitHub(setup) {
         shouldWriteYMLHostingFile = overwrite;
     }
     if (shouldWriteYMLHostingFile) {
-        writeChannelActionYMLFile(YML_FULL_PATH_PULL_REQUEST, githubSecretName, setup.projectId, script);
+        writeChannelActionYMLFile(YML_FULL_PATH_PULL_REQUEST, githubSecretName, setup.projectId, script, (_b = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _b === void 0 ? void 0 : _b.useWebFrameworks, (_c = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _c === void 0 ? void 0 : _c.source);
         logger_1.logger.info();
         (0, utils_1.logSuccess)(`Created workflow file ${(0, colorette_1.bold)(YML_FULL_PATH_PULL_REQUEST)}`);
     }
@@ -101,7 +102,7 @@ async function initGitHub(setup) {
             shouldWriteYMLDeployFile = true;
         }
         if (shouldWriteYMLDeployFile) {
-            writeDeployToProdActionYMLFile(YML_FULL_PATH_MERGE, branch, githubSecretName, setup.projectId, script);
+            writeDeployToProdActionYMLFile(YML_FULL_PATH_MERGE, branch, githubSecretName, setup.projectId, script, (_d = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _d === void 0 ? void 0 : _d.useWebFrameworks, (_e = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _e === void 0 ? void 0 : _e.source);
             logger_1.logger.info();
             (0, utils_1.logSuccess)(`Created workflow file ${(0, colorette_1.bold)(YML_FULL_PATH_MERGE)}`);
         }
@@ -155,7 +156,7 @@ function mkdirNotExists(dir) {
         fs.mkdirSync(dir);
     }
 }
-function writeChannelActionYMLFile(ymlPath, secretName, projectId, script) {
+function writeChannelActionYMLFile(ymlPath, secretName, projectId, script, useWebFrameworks, hostingSource) {
     const workflowConfig = {
         name: "Deploy to Firebase Hosting on PR",
         on: "pull_request",
@@ -172,19 +173,31 @@ function writeChannelActionYMLFile(ymlPath, secretName, projectId, script) {
             },
         },
     };
-    if (script) {
-        workflowConfig.jobs.build_and_preview.steps.push({
-            run: script,
-        });
-    }
-    workflowConfig.jobs.build_and_preview.steps.push({
+    const buildAndPreviewParams = {
         uses: HOSTING_GITHUB_ACTION_NAME,
         with: {
             repoToken: "${{ secrets.GITHUB_TOKEN }}",
             firebaseServiceAccount: `\${{ secrets.${secretName} }}`,
             projectId: projectId,
         },
-    });
+    };
+    if (useWebFrameworks) {
+        workflowConfig.jobs.build_and_preview.steps.push({ run: "npm ci" });
+        buildAndPreviewParams.env = {
+            FIREBASE_CLI_EXPERIMENTS: "webframeworks",
+        };
+        if (hostingSource && hostingSource !== ".") {
+            workflowConfig.jobs.build_and_preview.defaults = {
+                run: { "working-directory": hostingSource },
+            };
+        }
+    }
+    if (script) {
+        workflowConfig.jobs.build_and_preview.steps.push({
+            run: script,
+        });
+    }
+    workflowConfig.jobs.build_and_preview.steps.push(buildAndPreviewParams);
     const ymlContents = `# This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
@@ -193,7 +206,7 @@ ${yaml.stringify(workflowConfig)}`;
     mkdirNotExists(WORKFLOW_DIR);
     fs.writeFileSync(ymlPath, ymlContents, "utf8");
 }
-function writeDeployToProdActionYMLFile(ymlPath, branch, secretName, projectId, script) {
+function writeDeployToProdActionYMLFile(ymlPath, branch, secretName, projectId, script, useWebFrameworks, hostingSource) {
     const workflowConfig = {
         name: "Deploy to Firebase Hosting on merge",
         on: { push: { branches: [branch || "master"] } },
@@ -204,12 +217,7 @@ function writeDeployToProdActionYMLFile(ymlPath, branch, secretName, projectId,
             },
         },
     };
-    if (script) {
-        workflowConfig.jobs.build_and_deploy.steps.push({
-            run: script,
-        });
-    }
-    workflowConfig.jobs.build_and_deploy.steps.push({
+    const buildAndDeployParams = {
         uses: HOSTING_GITHUB_ACTION_NAME,
         with: {
             repoToken: "${{ secrets.GITHUB_TOKEN }}",
@@ -217,7 +225,22 @@ function writeDeployToProdActionYMLFile(ymlPath, branch, secretName, projectId,
             channelId: "live",
             projectId: projectId,
         },
-    });
+    };
+    if (useWebFrameworks) {
+        workflowConfig.jobs.build_and_deploy.steps.push({ run: "npm ci" });
+        buildAndDeployParams.env = {
+            FIREBASE_CLI_EXPERIMENTS: "webframeworks",
+        };
+        if (hostingSource && hostingSource !== ".") {
+            workflowConfig.jobs.build_and_deploy.defaults = {
+                run: { "working-directory": hostingSource },
+            };
+        }
+    }
+    if (script) {
+        workflowConfig.jobs.build_and_deploy.steps.push({ run: script });
+    }
+    workflowConfig.jobs.build_and_deploy.steps.push(buildAndDeployParams);
     const ymlContents = `# This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
@@ -270,7 +293,7 @@ async function promptForRepo(options, ghAccessToken) {
     ]);
     return { repo, key, keyId };
 }
-async function promptForBuildScript() {
+async function promptForBuildScript(useWebFrameworks) {
     const { shouldSetupScript } = await (0, prompt_1.prompt)({}, [
         {
             type: "confirm",
@@ -286,7 +309,7 @@ async function promptForBuildScript() {
         {
             type: "input",
             name: "script",
-            default: "npm ci && npm run build",
+            default: useWebFrameworks ? undefined : "npm ci && npm run build",
             message: "What script should be run before every deploy?",
         },
     ]);

package/lib/requireAuth.js

@@ -32,7 +32,7 @@ async function autoAuth(options, authScopes) {
         logger_1.logger.debug(`Error getting account credentials.`);
     }
     if (process.env.MONOSPACE_ENV && token && clientEmail) {
-        await (0, auth_1.setActiveAccount)(options, {
+        (0, auth_1.setActiveAccount)(options, {
             user: { email: clientEmail },
             tokens: { access_token: token },
         });
@@ -76,7 +76,7 @@ async function requireAuth(options) {
     if (!user || !tokens) {
         throw new error_1.FirebaseError(AUTH_ERROR_MESSAGE);
     }
-    await (0, auth_1.setActiveAccount)(options, { user, tokens });
+    (0, auth_1.setActiveAccount)(options, { user, tokens });
     return user.email;
 }
 exports.requireAuth = requireAuth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.13.2",
+  "version": "13.14.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -60,14 +60,14 @@
     ]
   },
   "dependencies": {
-    "@google-cloud/cloud-sql-connector": "^1.2.3",
-    "@google-cloud/pubsub": "^4.4.0",
+    "@google-cloud/cloud-sql-connector": "^1.3.3",
+    "@google-cloud/pubsub": "^4.5.0",
     "abort-controller": "^3.0.0",
     "ajv": "^6.12.6",
     "archiver": "^7.0.0",
-    "async-lock": "1.3.2",
+    "async-lock": "1.4.1",
     "body-parser": "^1.19.0",
-    "chokidar": "^3.0.2",
+    "chokidar": "^3.6.0",
     "cjson": "^0.3.1",
     "cli-table": "0.3.11",
     "colorette": "^2.0.19",
@@ -78,16 +78,16 @@
     "cross-spawn": "^7.0.3",
     "csv-parse": "^5.0.4",
     "deep-equal-in-any-order": "^2.0.6",
-    "exegesis": "^4.1.2",
+    "exegesis": "^4.2.0",
     "exegesis-express": "^4.0.0",
     "express": "^4.16.4",
     "filesize": "^6.1.0",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
     "fuzzy": "^0.1.3",
-    "gaxios": "^6.1.1",
+    "gaxios": "^6.7.0",
     "glob": "^10.4.1",
-    "google-auth-library": "^9.7.0",
+    "google-auth-library": "^9.11.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
     "jsonwebtoken": "^9.0.0",

package/templates/init/dataconnect/dataconnect.yaml

@@ -8,4 +8,4 @@ schema:
       database: "__cloudSqlDatabase__"
       cloudSql:
         instanceId: "__cloudSqlInstanceId__"
-connectorDirs: ["./__connectorId__"]
+connectorDirs: [__connectorIds__]