firebase-tools 13.11.2 → 13.11.4

package/lib/apphosting/githubConnections.js

@@ -86,13 +86,13 @@ async function createFullyInstalledConnection(projectId, location, connectionId,
         authorizerCredential: (_b = oauthConn.githubConfig) === null || _b === void 0 ? void 0 : _b.authorizerCredential,
     });
     while (conn.installationState.stage !== "COMPLETE") {
-        utils.logBullet("Install the Firebase GitHub app to enable access to GitHub repositories");
+        utils.logBullet("Install the Firebase App Hosting GitHub app to enable access to GitHub repositories");
         const targetUri = conn.installationState.actionUri;
         utils.logBullet(targetUri);
         await utils.openInBrowser(targetUri);
         await (0, prompt_1.promptOnce)({
             type: "input",
-            message: "Press Enter once you have installed or configured the Firebase GitHub app to access your GitHub repo.",
+            message: "Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.",
         });
         conn = await devConnect.getConnection(projectId, location, connectionId);
     }

package/lib/commands/index.js

@@ -200,17 +200,15 @@ function load(client) {
     client.setup.emulators.pubsub = loadCommand("setup-emulators-pubsub");
     client.setup.emulators.storage = loadCommand("setup-emulators-storage");
     client.setup.emulators.ui = loadCommand("setup-emulators-ui");
-    if (experiments.isEnabled("dataconnect")) {
-        client.dataconnect = {};
-        client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
-        client.dataconnect.services = {};
-        client.dataconnect.services.list = loadCommand("dataconnect-services-list");
-        client.dataconnect.sql = {};
-        client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
-        client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
-        client.dataconnect.sdk = {};
-        client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
-    }
+    client.dataconnect = {};
+    client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
+    client.dataconnect.services = {};
+    client.dataconnect.services.list = loadCommand("dataconnect-services-list");
+    client.dataconnect.sql = {};
+    client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
+    client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
+    client.dataconnect.sdk = {};
+    client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
     client.target = loadCommand("target");
     client.target.apply = loadCommand("target-apply");
     client.target.clear = loadCommand("target-clear");

package/lib/commands/init.js

@@ -76,13 +76,11 @@ if ((0, experiments_1.isEnabled)("genkit")) {
         checked: false,
     });
 }
-if ((0, experiments_1.isEnabled)("dataconnect")) {
-    choices.push({
-        value: "dataconnect",
-        name: "Data Connect: Set up a Firebase Data Connect service.",
-        checked: false,
-    });
-}
+choices.push({
+    value: "dataconnect",
+    name: "Data Connect: Set up a Firebase Data Connect service.",
+    checked: false,
+});
 const featureNames = choices.map((choice) => choice.value);
 const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 

package/lib/commands/setup-emulators-dataconnect.js

@@ -2,11 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const download_1 = require("../emulator/download");
 const types_1 = require("../emulator/types");
+const emulators_1 = require("../init/features/emulators");
+const prompt_1 = require("../prompt");
+const logger_1 = require("../logger");
+const downloadableEmulators_1 = require("../emulator/downloadableEmulators");
 const NAME = types_1.Emulators.DATACONNECT;
 exports.command = new command_1.Command(`setup:emulators:${NAME}`)
     .description(`downloads the ${NAME} emulator`)
-    .action(() => {
-    return (0, download_1.downloadEmulator)(NAME);
+    .action(async (options) => {
+    var _a, _b;
+    await (0, downloadableEmulators_1.downloadIfNecessary)(NAME);
+    if (!options.config) {
+        logger_1.logger.info("Not currently in a Firebase project directory. Run this command from a project directory to configure the Data Connect emulator.");
+        return;
+    }
+    if (!options.nonInteractive) {
+        const dataconnectEmulatorConfig = options.rc.getDataconnect();
+        const defaultConnectionString = (_b = (_a = dataconnectEmulatorConfig === null || dataconnectEmulatorConfig === void 0 ? void 0 : dataconnectEmulatorConfig.postgres) === null || _a === void 0 ? void 0 : _a.localConnectionString) !== null && _b !== void 0 ? _b : emulators_1.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,
+        });
+        options.rc.setDataconnect(localConnectionString);
+    }
+    logger_1.logger.info("Setup complete!");
 });

package/lib/crashlytics/buildToolsJarHelper.js

@@ -12,7 +12,7 @@ const rimraf = require("rimraf");
 const utils = require("../utils");
 const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
     path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
-const JAR_VERSION = "3.0.0";
+const JAR_VERSION = "3.0.2";
 const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
 async function fetchBuildtoolsJar() {
     if (process.env.CRASHLYTICS_LOCAL_JAR) {

package/lib/dataconnect/client.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.listLocations = void 0;
+exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.deleteSchema = exports.upsertSchema = exports.getSchema = exports.deleteServiceAndChildResources = exports.createService = exports.listAllServices = exports.getService = exports.listLocations = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const operationPoller = require("../operation-poller");
 const types = require("./types");
 const DATACONNECT_API_VERSION = "v1alpha";
+const PAGE_SIZE_MAX = 100;
 const dataconnectClient = () => new apiv2_1.Client({
     urlPrefix: (0, api_1.dataconnectOrigin)(),
     apiVersion: DATACONNECT_API_VERSION,
@@ -17,6 +18,11 @@ async function listLocations(projectId) {
     return (_c = (_b = (_a = res.body) === null || _a === void 0 ? void 0 : _a.locations) === null || _b === void 0 ? void 0 : _b.map((l) => l.locationId)) !== null && _c !== void 0 ? _c : [];
 }
 exports.listLocations = listLocations;
+async function getService(serviceName) {
+    const res = await dataconnectClient().get(serviceName);
+    return res.body;
+}
+exports.getService = getService;
 async function listAllServices(projectId) {
     var _a;
     const res = await dataconnectClient().get(`/projects/${projectId}/locations/-/services`);
@@ -39,8 +45,8 @@ async function createService(projectId, locationId, serviceId) {
     return pollRes;
 }
 exports.createService = createService;
-async function deleteService(projectId, locationId, serviceId) {
-    const op = await dataconnectClient().delete(`projects/${projectId}/locations/${locationId}/services/${serviceId}`);
+async function deleteService(serviceName) {
+    const op = await dataconnectClient().delete(serviceName);
     const pollRes = await operationPoller.pollOperation({
         apiOrigin: (0, api_1.dataconnectOrigin)(),
         apiVersion: DATACONNECT_API_VERSION,
@@ -48,7 +54,20 @@ async function deleteService(projectId, locationId, serviceId) {
     });
     return pollRes;
 }
-exports.deleteService = deleteService;
+async function deleteServiceAndChildResources(serviceName) {
+    const connectors = await listConnectors(serviceName);
+    await Promise.all(connectors.map(async (c) => deleteConnector(c.name)));
+    try {
+        await deleteSchema(serviceName);
+    }
+    catch (err) {
+        if (err.status !== 404) {
+            throw err;
+        }
+    }
+    await deleteService(serviceName);
+}
+exports.deleteServiceAndChildResources = deleteServiceAndChildResources;
 async function getSchema(serviceName) {
     try {
         const res = await dataconnectClient().get(`${serviceName}/schemas/${types.SCHEMA_ID}`);
@@ -79,20 +98,47 @@ async function upsertSchema(schema, validateOnly = false) {
     });
 }
 exports.upsertSchema = upsertSchema;
+async function deleteSchema(serviceName) {
+    const op = await dataconnectClient().delete(`${serviceName}/schemas/${types.SCHEMA_ID}`);
+    await operationPoller.pollOperation({
+        apiOrigin: (0, api_1.dataconnectOrigin)(),
+        apiVersion: DATACONNECT_API_VERSION,
+        operationResourceName: op.body.name,
+    });
+    return;
+}
+exports.deleteSchema = deleteSchema;
 async function getConnector(name) {
     const res = await dataconnectClient().get(name);
     return res.body;
 }
 exports.getConnector = getConnector;
 async function deleteConnector(name) {
-    const res = await dataconnectClient().delete(name);
-    return res.body;
+    const op = await dataconnectClient().delete(name);
+    await operationPoller.pollOperation({
+        apiOrigin: (0, api_1.dataconnectOrigin)(),
+        apiVersion: DATACONNECT_API_VERSION,
+        operationResourceName: op.body.name,
+    });
+    return;
 }
 exports.deleteConnector = deleteConnector;
 async function listConnectors(serviceName) {
-    var _a;
-    const res = await dataconnectClient().get(`${serviceName}/connectors`);
-    return ((_a = res.body) === null || _a === void 0 ? void 0 : _a.connectors) || [];
+    const connectors = [];
+    const getNextPage = async (pageToken = "") => {
+        const res = await dataconnectClient().get(`${serviceName}/connectors`, {
+            queryParams: {
+                pageSize: PAGE_SIZE_MAX,
+                pageToken,
+            },
+        });
+        connectors.push(...(res.body.connectors || []));
+        if (res.body.nextPageToken) {
+            await getNextPage(res.body.nextPageToken);
+        }
+    };
+    await getNextPage();
+    return connectors;
 }
 exports.listConnectors = listConnectors;
 async function upsertConnector(connector) {

package/lib/emulator/adminSdkConfig.test.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const adminSdkConfig_1 = require("./adminSdkConfig");
+describe("adminSdkConfig", () => {
+    describe("getProjectAdminSdkConfigOrCached", () => {
+        it("should return a fake config for a demo project id", async () => {
+            const projectId = "demo-project-1234";
+            await (0, chai_1.expect)((0, adminSdkConfig_1.getProjectAdminSdkConfigOrCached)(projectId)).to.eventually.deep.equal({
+                projectId: "demo-project-1234",
+                databaseURL: "https://demo-project-1234.firebaseio.com",
+                storageBucket: "demo-project-1234.appspot.com",
+            });
+        });
+    });
+});

package/lib/emulator/controller.js

@@ -539,9 +539,6 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             rc: options.rc,
         });
         await startEmulator(dataConnectEmulator);
-        if (!utils.isVSCodeExtension()) {
-            await dataConnectEmulator.connectToPostgres();
-        }
     }
     if (listenForEmulator.storage) {
         const storageAddr = legacyGetFirstAddr(types_1.Emulators.STORAGE);

package/lib/emulator/dataconnectEmulator.js

@@ -1,7 +1,8 @@
 "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");
 const constants_1 = require("./constants");
 const downloadableEmulators_1 = require("./downloadableEmulators");
@@ -10,10 +11,16 @@ 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 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();
     }
@@ -32,18 +39,39 @@ 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,
-            project_id: this.args.projectId,
-            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,
+                service_location: this.args.locationId,
+            });
+            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() {
@@ -62,6 +90,8 @@ class DataConnectEmulator {
     static async generate(args) {
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = [
+            "--logtostderr",
+            "-v=2",
             "generate",
             `--service_location=${args.locationId}`,
             `--config_dir=${args.configDir}`,
@@ -78,7 +108,7 @@ class DataConnectEmulator {
     static async build(args) {
         var _a;
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
-        const cmd = ["build", `--config_dir=${args.configDir}`];
+        const cmd = ["--logtostderr", "-v=2", "build", `--config_dir=${args.configDir}`];
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
         if (res.error) {
             throw new error_1.FirebaseError(`Error starting up Data Connect build: ${res.error.message}`, {
@@ -105,14 +135,58 @@ 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.locationId, 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) {
-            this.logger.log("DEBUG", "No Postgres connection string found, not connecting to Postgres");
-            return false;
+            const msg = `No Postgres connection string found in '.firebaserc'. The Data Connect emulator will not be able to execute operations.
+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;
@@ -121,6 +195,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);
         }
@@ -130,10 +205,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

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.2.0",
-            expectedSize: 23954240,
-            expectedChecksum: "0f250761959519bb5a28fed76ceab2cb",
+            version: "1.2.2",
+            expectedSize: 24007488,
+            expectedChecksum: "c1fb77895203681479ee5dd22d57249f",
         }
         : process.platform === "win32"
             ? {
-                version: "1.2.0",
-                expectedSize: 24360960,
-                expectedChecksum: "168ce32c742e1d26037c52bdbb7d871c",
+                version: "1.2.2",
+                expectedSize: 24414208,
+                expectedChecksum: "7e263c2b2bc9055ead2db8102e883534",
             }
             : {
-                version: "1.2.0",
-                expectedSize: 23970052,
-                expectedChecksum: "2ca17e4009a9ebae0f7c983bafff2ee6",
+                version: "1.2.2",
+                expectedSize: 24023300,
+                expectedChecksum: "12467418226ac9657fb64b4d719d0e1d",
             },
 };
 exports.DownloadDetails = {
@@ -139,7 +139,7 @@ exports.DownloadDetails = {
             expectedChecksum: EMULATOR_UPDATE_DETAILS.dataconnect.expectedChecksum,
             skipChecksumAndSize: false,
             namePrefix: "dataconnect-emulator",
-            auth: true,
+            auth: false,
         },
     },
 };
@@ -224,7 +224,7 @@ const Commands = {
         shell: false,
     },
     pubsub: {
-        binary: getExecPath(types_1.Emulators.PUBSUB),
+        binary: `${getExecPath(types_1.Emulators.PUBSUB)}`,
         args: [],
         optionalArgs: ["port", "host"],
         joinArgs: true,
@@ -238,16 +238,14 @@ const Commands = {
         shell: false,
     },
     dataconnect: {
-        binary: getExecPath(types_1.Emulators.DATACONNECT),
-        args: ["dev"],
+        binary: `${getExecPath(types_1.Emulators.DATACONNECT)}`,
+        args: ["--logtostderr", "-v=2", "dev"],
         optionalArgs: [
             "listen",
             "config_dir",
-            "project_id",
             "service_location",
             "disable_sdk_generation",
             "resolvers_emulator",
-            "vertex_location",
             "rpc_retry_count",
         ],
         joinArgs: true,
@@ -342,6 +340,9 @@ async function _runBinary(emulator, command, extraEnv) {
             };
             if (command.shell && utils.IS_WINDOWS) {
                 opts.shell = true;
+                if (command.binary.includes(" ")) {
+                    command.binary = `"${command.binary}"`;
+                }
             }
             emulator.instance = childProcess.spawn(command.binary, command.args, opts);
         }

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

@@ -109,7 +109,7 @@ class EmulatorRegistry {
             url.port = info.port.toString();
         }
         else {
-            console.warn(`Cannot determine host and port of ${emulator}`);
+            throw new Error(`Cannot determine host and port of ${emulator}`);
         }
         return url;
     }

package/lib/emulator/storage/apis/shared.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendFileBytes = void 0;
 const zlib_1 = require("zlib");
 const crc_1 = require("../crc");
+const rfc_1 = require("../rfc");
 function sendFileBytes(md, data, req, res) {
     let didGunzip = false;
     if (md.contentEncoding === "gzip") {
@@ -16,7 +17,7 @@ function sendFileBytes(md, data, req, res) {
     res.setHeader("Accept-Ranges", "bytes");
     res.setHeader("Content-Type", md.contentType || "application/octet-stream");
     const fileName = md.name.split("/").pop();
-    res.setHeader("Content-Disposition", `${md.contentDisposition || "attachment"}; filename=${fileName}`);
+    res.setHeader("Content-Disposition", `${md.contentDisposition || "attachment"}; filename*=${(0, rfc_1.encodeRFC5987)(fileName)}`);
     if (didGunzip) {
         res.setHeader("Transfer-Encoding", "chunked");
     }

package/lib/emulator/storage/persistence.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Persistence = void 0;
 const fs_1 = require("fs");
-const rimraf = require("rimraf");
+const rimraf_1 = require("rimraf");
 const fs = require("fs");
 const fse = require("fs-extra");
 const path = require("path");
@@ -56,18 +56,10 @@ class Persistence {
         }
         this._diskPathMap.delete(fileName);
     }
-    deleteAll() {
-        return new Promise((resolve, reject) => {
-            rimraf(this._dirPath, (err) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    this._diskPathMap = new Map();
-                    resolve();
-                }
-            });
-        });
+    async deleteAll() {
+        await (0, rimraf_1.rimraf)(this._dirPath);
+        this._diskPathMap = new Map();
+        return;
     }
     renameFile(oldName, newName) {
         const oldNameId = this.getDiskFileName(oldName);

package/lib/emulator/storage/rfc.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeRFC5987 = void 0;
+function encodeRFC5987(str) {
+    return encodeURIComponent(str)
+        .replace(/['()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`)
+        .replace(/%(7C|60|5E)/g, (str, hex) => String.fromCharCode(parseInt(hex, 16)));
+}
+exports.encodeRFC5987 = encodeRFC5987;

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/firestore/api-sort.test.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const firestore_1 = require("../gcp/firestore");
+const proto_1 = require("../gcp/proto");
+const sort = require("./api-sort");
+describe("compareApiBackup", () => {
+    it("should compare backups by location", () => {
+        const nam5Backup = {
+            name: "projects/example/locations/nam5/backups/backupid",
+        };
+        const usWest1Backup = {
+            name: "projects/example/locations/us-west1/backups/backupid",
+        };
+        (0, chai_1.expect)(sort.compareApiBackup(usWest1Backup, nam5Backup)).to.greaterThanOrEqual(1);
+        (0, chai_1.expect)(sort.compareApiBackup(nam5Backup, usWest1Backup)).to.lessThanOrEqual(-1);
+    });
+    it("should compare backups by snapshotTime (descending) if location is the same", () => {
+        const earlierBackup = {
+            name: "projects/example/locations/nam5/backups/backupid",
+            snapshotTime: "2024-01-01T00:00:00.000000Z",
+        };
+        const laterBackup = {
+            name: "projects/example/locations/nam5/backups/backupid",
+            snapshotTime: "2024-02-02T00:00:00.000000Z",
+        };
+        (0, chai_1.expect)(sort.compareApiBackup(earlierBackup, laterBackup)).to.greaterThanOrEqual(1);
+        (0, chai_1.expect)(sort.compareApiBackup(laterBackup, earlierBackup)).to.lessThanOrEqual(-1);
+    });
+    it("should compare backups by full name if location and snapshotTime are the same", () => {
+        const nam5Backup1 = {
+            name: "projects/example/locations/nam5/backups/earlier-backupid",
+            snapshotTime: "2024-01-01T00:00:00.000000Z",
+        };
+        const nam5Backup2 = {
+            name: "projects/example/locations/nam5/backups/later-backupid",
+            snapshotTime: "2024-01-01T00:00:00.000000Z",
+        };
+        (0, chai_1.expect)(sort.compareApiBackup(nam5Backup2, nam5Backup1)).to.greaterThanOrEqual(1);
+        (0, chai_1.expect)(sort.compareApiBackup(nam5Backup1, nam5Backup2)).to.lessThanOrEqual(-1);
+    });
+});
+describe("compareApiBackupSchedule", () => {
+    it("daily schedules should precede weekly ones", () => {
+        const dailySchedule = {
+            name: "projects/example/databases/mydatabase/backupSchedules/schedule",
+            dailyRecurrence: {},
+            retention: (0, proto_1.durationFromSeconds)(60 * 60 * 24),
+        };
+        const weeklySchedule = {
+            name: "projects/example/databases/mydatabase/backupSchedules/schedule",
+            weeklyRecurrence: {
+                day: firestore_1.DayOfWeek.FRIDAY,
+            },
+            retention: (0, proto_1.durationFromSeconds)(60 * 60 * 24 * 7),
+        };
+        (0, chai_1.expect)(sort.compareApiBackupSchedule(weeklySchedule, dailySchedule)).to.greaterThanOrEqual(1);
+        (0, chai_1.expect)(sort.compareApiBackup(dailySchedule, weeklySchedule)).to.lessThanOrEqual(-1);
+    });
+    it("should compare schedules with the same recurrence by name", () => {
+        const dailySchedule1 = {
+            name: "projects/example/databases/mydatabase/backupSchedules/schedule1",
+            dailyRecurrence: {},
+            retention: (0, proto_1.durationFromSeconds)(60 * 60 * 24),
+        };
+        const dailySchedule2 = {
+            name: "projects/example/databases/mydatabase/backupSchedules/schedule2",
+            dailyRecurrence: {},
+            retention: (0, proto_1.durationFromSeconds)(60 * 60 * 24),
+        };
+        (0, chai_1.expect)(sort.compareApiBackupSchedule(dailySchedule1, dailySchedule2)).to.lessThanOrEqual(-1);
+        (0, chai_1.expect)(sort.compareApiBackup(dailySchedule2, dailySchedule1)).to.greaterThanOrEqual(1);
+    });
+});

package/lib/firestore/backupUtils.test.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const backupUtils_1 = require("./backupUtils");
+describe("calculateRetention", () => {
+    it("should accept minutes", () => {
+        (0, chai_1.expect)((0, backupUtils_1.calculateRetention)("5m")).to.eq(300);
+    });
+    it("should accept hours", () => {
+        (0, chai_1.expect)((0, backupUtils_1.calculateRetention)("3h")).to.eq(10800);
+    });
+    it("should accept days", () => {
+        (0, chai_1.expect)((0, backupUtils_1.calculateRetention)("2d")).to.eq(172800);
+    });
+    it("should accept weeks", () => {
+        (0, chai_1.expect)((0, backupUtils_1.calculateRetention)("3w")).to.eq(1814400);
+    });
+});

package/lib/firestore/pretty-print.test.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const API = require("./api-types");
+const pretty_print_1 = require("./pretty-print");
+const printer = new pretty_print_1.PrettyPrint();
+describe("prettyIndexString", () => {
+    it("should correctly print an order type Index", () => {
+        (0, chai_1.expect)(printer.prettyIndexString({
+            name: "/projects/project/databases/(default)/collectionGroups/collectionB/indexes/a",
+            queryScope: API.QueryScope.COLLECTION,
+            fields: [
+                { fieldPath: "foo", order: API.Order.ASCENDING },
+                { fieldPath: "bar", order: API.Order.DESCENDING },
+            ],
+        }, false)).to.contain("(foo,ASCENDING) (bar,DESCENDING) ");
+    });
+    it("should correctly print a contains type Index", () => {
+        (0, chai_1.expect)(printer.prettyIndexString({
+            name: "/projects/project/databases/(default)/collectionGroups/collectionB/indexes/a",
+            queryScope: API.QueryScope.COLLECTION,
+            fields: [
+                { fieldPath: "foo", order: API.Order.ASCENDING },
+                { fieldPath: "baz", arrayConfig: API.ArrayConfig.CONTAINS },
+            ],
+        }, false)).to.contain("(foo,ASCENDING) (baz,CONTAINS) ");
+    });
+    it("should correctly print a vector type Index", () => {
+        (0, chai_1.expect)(printer.prettyIndexString({
+            name: "/projects/project/databases/(default)/collectionGroups/collectionB/indexes/a",
+            queryScope: API.QueryScope.COLLECTION,
+            fields: [{ fieldPath: "foo", vectorConfig: { dimension: 100, flat: {} } }],
+        }, false)).to.contain("(foo,VECTOR<100>) ");
+    });
+    it("should correctly print a vector type Index with other fields", () => {
+        (0, chai_1.expect)(printer.prettyIndexString({
+            name: "/projects/project/databases/(default)/collectionGroups/collectionB/indexes/a",
+            queryScope: API.QueryScope.COLLECTION,
+            fields: [
+                { fieldPath: "foo", order: API.Order.ASCENDING },
+                { fieldPath: "bar", vectorConfig: { dimension: 200, flat: {} } },
+            ],
+        }, false)).to.contain("(foo,ASCENDING) (bar,VECTOR<200>) ");
+    });
+});
+describe("firebaseConsoleDatabaseUrl", () => {
+    it("should provide a console link", () => {
+        (0, chai_1.expect)(printer.firebaseConsoleDatabaseUrl("example-project", "example-db")).to.equal("https://console.firebase.google.com/project/example-project/firestore/databases/example-db/data");
+    });
+    it("should convert (default) to -default-", () => {
+        (0, chai_1.expect)(printer.firebaseConsoleDatabaseUrl("example-project", "(default)")).to.equal("https://console.firebase.google.com/project/example-project/firestore/databases/-default-/data");
+    });
+});

package/lib/firestore/util.test.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const util = require("./util");
+describe("IndexNameParsing", () => {
+    it("should parse an index name correctly", () => {
+        const name = "/projects/myproject/databases/(default)/collectionGroups/collection/indexes/abc123/";
+        (0, chai_1.expect)(util.parseIndexName(name)).to.eql({
+            projectId: "myproject",
+            databaseId: "(default)",
+            collectionGroupId: "collection",
+            indexId: "abc123",
+        });
+    });
+    it("should parse a field name correctly", () => {
+        const name = "/projects/myproject/databases/(default)/collectionGroups/collection/fields/abc123/";
+        (0, chai_1.expect)(util.parseFieldName(name)).to.eql({
+            projectId: "myproject",
+            databaseId: "(default)",
+            collectionGroupId: "collection",
+            fieldPath: "abc123",
+        });
+    });
+    it("should parse an index name from a named database correctly", () => {
+        const name = "/projects/myproject/databases/named-db/collectionGroups/collection/indexes/abc123/";
+        (0, chai_1.expect)(util.parseIndexName(name)).to.eql({
+            projectId: "myproject",
+            databaseId: "named-db",
+            collectionGroupId: "collection",
+            indexId: "abc123",
+        });
+    });
+    it("should parse a field name from a named database correctly", () => {
+        const name = "/projects/myproject/databases/named-db/collectionGroups/collection/fields/abc123/";
+        (0, chai_1.expect)(util.parseFieldName(name)).to.eql({
+            projectId: "myproject",
+            databaseId: "named-db",
+            collectionGroupId: "collection",
+            fieldPath: "abc123",
+        });
+    });
+});

package/lib/frameworks/compose/discover/mockFileSystem.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockFileSystem = void 0;
+class MockFileSystem {
+    constructor(fileSys) {
+        this.fileSys = fileSys;
+        this.existsCache = {};
+        this.contentCache = {};
+    }
+    exists(path) {
+        if (!(path in this.existsCache)) {
+            this.existsCache[path] = path in this.fileSys;
+        }
+        return Promise.resolve(this.existsCache[path]);
+    }
+    read(path) {
+        if (!(path in this.contentCache)) {
+            if (!(path in this.fileSys)) {
+                const err = new Error("File path not found");
+                err.cause = "ENOENT";
+                throw err;
+            }
+            else {
+                this.contentCache[path] = this.fileSys[path];
+            }
+        }
+        return Promise.resolve(this.contentCache[path]);
+    }
+    getContentCache(path) {
+        return this.contentCache[path];
+    }
+    getExistsCache(path) {
+        return this.existsCache[path];
+    }
+}
+exports.MockFileSystem = MockFileSystem;

package/lib/frameworks/index.js

@@ -7,8 +7,8 @@ const child_process_1 = require("child_process");
 const cross_spawn_1 = require("cross-spawn");
 const promises_1 = require("fs/promises");
 const fs_extra_1 = require("fs-extra");
+const glob_1 = require("glob");
 const process = require("node:process");
-const glob = require("glob");
 const projectUtils_1 = require("../projectUtils");
 const config_1 = require("../hosting/config");
 const api_1 = require("../hosting/api");
@@ -366,11 +366,7 @@ async function prepareFrameworks(purpose, targetNames, context, options, emulato
             await (0, promises_1.writeFile)((0, path_1.join)(functionsDist, ".env"), `${dotEnvContents}
 __FIREBASE_FRAMEWORKS_ENTRY__=${frameworksEntry}
 ${firebaseDefaults ? `__FIREBASE_DEFAULTS__=${JSON.stringify(firebaseDefaults)}\n` : ""}`.trimStart());
-            const envs = await new Promise((resolve, reject) => glob(getProjectPath(".env.*"), (err, matches) => {
-                if (err)
-                    reject(err);
-                resolve(matches);
-            }));
+            const envs = await (0, glob_1.glob)(getProjectPath(".env.*"));
             await Promise.all(envs.map((path) => (0, promises_1.copyFile)(path, (0, path_1.join)(functionsDist, (0, path_1.basename)(path)))));
             (0, child_process_1.execSync)(`npm i --omit dev --no-audit`, {
                 cwd: functionsDist,

package/lib/frameworks/next/utils.js

@@ -6,7 +6,6 @@ const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
-const glob = require("glob");
 const semver_1 = require("semver");
 const utils_1 = require("../utils");
 const constants_1 = require("./constants");
@@ -226,17 +225,12 @@ function getRoutesWithServerAction(serverReferenceManifest, appPathRoutesManifes
 }
 exports.getRoutesWithServerAction = getRoutesWithServerAction;
 async function getProductionDistDirFiles(sourceDir, distDir) {
-    const productionDistDirFiles = await new Promise((resolve, reject) => glob("**", {
+    return (0, glob_1.glob)("**", {
         ignore: [(0, path_1.join)("cache", "webpack", "*-development", "**"), (0, path_1.join)("cache", "eslint", "**")],
         cwd: (0, path_1.join)(sourceDir, distDir),
         nodir: true,
         absolute: false,
-    }, (err, matches) => {
-        if (err)
-            reject(err);
-        resolve(matches);
-    }));
-    return productionDistDirFiles;
+    });
 }
 exports.getProductionDistDirFiles = getProductionDistDirFiles;
 async function whichNextConfigFile(dir) {

package/lib/listFiles.js

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

package/lib/rc.js

@@ -158,6 +158,7 @@ class RC {
     }
     setDataconnect(localConnectionString) {
         this.data.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
+        this.save();
     }
     save() {
         if (this.path) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.11.2",
+  "version": "13.11.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -54,6 +54,8 @@
       ".ts"
     ],
     "exclude": [
+      "src/**/*.spec.*",
+      "src/**/testing/**/*",
       "src/test/**/*"
     ]
   },
@@ -62,7 +64,7 @@
     "@google-cloud/pubsub": "^4.4.0",
     "abort-controller": "^3.0.0",
     "ajv": "^6.12.6",
-    "archiver": "^5.0.0",
+    "archiver": "^7.0.0",
     "async-lock": "1.3.2",
     "body-parser": "^1.19.0",
     "chokidar": "^3.0.2",
@@ -76,7 +78,7 @@
     "cross-spawn": "^7.0.3",
     "csv-parse": "^5.0.4",
     "deep-equal-in-any-order": "^2.0.6",
-    "exegesis": "^4.1.0",
+    "exegesis": "^4.1.2",
     "exegesis-express": "^4.0.0",
     "express": "^4.16.4",
     "filesize": "^6.1.0",
@@ -84,7 +86,7 @@
     "fs-extra": "^10.1.0",
     "fuzzy": "^0.1.3",
     "gaxios": "^6.1.1",
-    "glob": "^7.1.2",
+    "glob": "^10.4.1",
     "google-auth-library": "^9.7.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
@@ -106,7 +108,7 @@
     "progress": "^2.0.3",
     "proxy-agent": "^6.3.0",
     "retry": "^0.13.1",
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.0",
     "semver": "^7.5.2",
     "sql-formatter": "^15.3.0",
     "stream-chain": "^2.2.4",
@@ -115,7 +117,7 @@
     "superstatic": "^9.0.3",
     "tar": "^6.1.11",
     "tcp-port-used": "^1.0.2",
-    "tmp": "^0.2.1",
+    "tmp": "^0.2.3",
     "triple-beam": "^1.3.0",
     "universal-analytics": "^0.5.3",
     "update-notifier-cjs": "^5.1.6",

package/templates/init/dataconnect/mutations.gql

@@ -1,30 +1,35 @@
 # # Example mutations for a simple email app
 
-# mutation CreateUser($uid: String, $name: String, $address: String) @auth(level: NO_ACCESS) {
-## <type>_insert lets you create a new row in your table.
+# # Logged in user can create their own account.
+# mutation CreateUser($name: String!, $address: String!) @auth(level: USER) {
+#   # <type>_insert lets you create a new row in your table.
 #   user_insert(data: {
-#     uid: $uid,
+#     # Server values let your service populate sensitive data.
+#     # Users can only setup their own account.
+#     uid_expr: "auth.uid",
 #     name: $name,
 #     address: $address
 #   })
 # }
-# mutation CreateEmail($content: String, $subject: String, $fromUid: String) @auth(level: PUBLIC) {
+
+# # Logged in user can send emails from their account.
+# mutation CreateEmail($content: String, $subject: String) @auth(level: USER) {
 #   email_insert(data: {
-#     text: $content, # The request variable name doesn't have to match the field name.
+#     # The request variable name doesn't have to match the field name.
+#     text: $content,
 #     subject: $subject,
-#     fromUid: $fromUid,
-## Server values let your service populate data for you
-## Here, we use sent_date: { today: true } to set 'sent' to today's date.
+#     # Server values let your service populate sensitive data.
+#     # Users are only allowed to create emails sent from their account.
+#     fromUid_expr: "auth.uid",
+#     # Server values let your service populate data for you
+#     # Here, we use sent_date: { today: true } to set 'sent' to today's date.
 #     sent_date: { today: true }
 #   })
 # }
-# mutation CreateRecipient($emailId: UUID, $uid: String) @auth(level: PUBLIC) {
+
+# mutation CreateRecipient($emailId: UUID) @auth(level: USER) {
 #   recipient_insert(data: {
 #     emailId: $emailId,
-#     userUid: $uid
+#     userUid_expr: "auth.uid"
 #   })
 # }
-# mutation DeleteEmail($emailId: UUID, $uid: String) @auth(level: PUBLIC) {
-## <type>_ delete lets you delete rows from your table.
-#   recipient_delete(key: {emailId: $emailId, userUid: $uid})
-# }

package/templates/init/dataconnect/queries.gql

@@ -1,51 +1,56 @@
 # # Example queries for a simple email app.
 
-## @auth() directives control who can call each operation.
-## Only admins should be able to list all users, so we use NO_ACCESS
-# query ListUsers @auth(level: NO_ACCESS) {
-#   users { uid, name, email: address }
+# # @auth() directives control who can call each operation.
+# # Only admins should be able to list all emails, so we use NO_ACCESS
+# query ListEmails @auth(level: NO_ACCESS) {
+#   emails {
+#     id, subject, text, sent
+#     from {
+#       name
+#     }
+#   }
 # }
 
-## Everyone should be able to see their inbox though, so we use PUBLIC
-# query ListInbox(
-#   $uid: String
-# ) @auth(level: PUBLIC) {
-## where allows you to filter lists
-## Here, we use it to filter to only emails where this user is one of the recipients.
+# # Only admins should be able to list all users, so we use NO_ACCESS
+# query ListUsers @auth(level: NO_ACCESS) {
+#   users { uid, name, address }
+# }
+  
+# # Logged in users should be able to see their inbox though, so we use USER
+# query ListInbox @auth(level: USER) {
+#   # where allows you to filter lists
+#   # Here, we use it to filter to only emails that are sent to the logged in user.
 #   emails(where: {
 #     users_via_Recipient: {
-#       exist: { uid: { eq: $uid }
+#       exist: { uid: { eq_expr: "auth.uid" }
 #     }}
 #   }) {
 #     id subject sent
 #     content: text # Select the `text` field but alias it as `content` in the response.
-#     sender: from { name email: address uid }
-
-## <field>_on_<foreign_key_field> makes it easy to grab info from another table
-## Here, we use it to grab all the recipients of the email.
+#     sender: from { name address uid }
+#     # <field>_on_<foreign_key_field> makes it easy to grab info from another table
+#     # Here, we use it to grab all the recipients of the email.
 #     to: recipients_on_email {
-#       user { name email: address uid }
+#       user { name address uid }
 #     }
 #   }
 # }
 
 # query GetUidByEmail($emails: [String!]) @auth(level: PUBLIC) {
 #   users(where: { address: { in: $emails } }) {
-#     uid email: address
+#     uid address
 #   }
 # }
 
-# query ListSent(
-#   $uid: String
-# ) @auth(level: PUBLIC) {
+# query ListSent($uid: String) @auth(level: PUBLIC) {
 #   emails(where: {
-#     fromUid: { eq: $uid }
+#     from: {uid: {eq: $uid }}
 #   }) {
 #     id subject sent
 #     content: text
-#     sender: from { name email: address uid }
+#     sender: from { name address uid }
 #     to: recipients_on_email {
-#       user { name email: address uid }
+#       user { name address uid }
 #     }
 #   }
 # }

package/templates/init/dataconnect/schema.gql

@@ -1,4 +1,4 @@
-## Example schema for simple email app
+# # Example schema for simple email app
 # type User @table(key: "uid") {
 # 	uid: String!
 # 	name: String!