firebase-tools 13.14.2 → 13.15.1

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.actuate = exports.doSetup = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const prompt_1 = require("../../../prompt");
@@ -20,7 +20,8 @@ const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/sche
 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",
+    id: "default",
+    path: "./connector",
     files: [
         {
             path: "queries.gql",
@@ -33,6 +34,13 @@ const defaultConnector = {
     ],
 };
 async function doSetup(setup, config) {
+    const info = await askQuestions(setup, config);
+    await actuate(setup, config, info);
+    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;
+async function askQuestions(setup, config) {
     var _a, _b, _c;
     let info = {
         serviceId: "",
@@ -43,6 +51,7 @@ async function doSetup(setup, config) {
         isNewDatabase: false,
         connectors: [defaultConnector],
         schemaGql: [],
+        shouldProvisionCSQL: false,
     };
     info = await promptForService(setup, info);
     if (info.cloudSqlInstanceId === "") {
@@ -59,13 +68,17 @@ async function doSetup(setup, config) {
         default: defaultConnectionString,
     });
     setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-    await writeFiles(config, info);
-    if (setup.projectId &&
+    info.shouldProvisionCSQL = !!(setup.projectId &&
         (info.isNewInstance || info.isNewDatabase) &&
         (await (0, prompt_1.confirm)({
             message: "Would you like to provision your CloudSQL instance and database now? This will take a few minutes.",
             default: true,
-        }))) {
+        })));
+    return info;
+}
+async function actuate(setup, config, info) {
+    await writeFiles(config, info);
+    if (setup.projectId && info.shouldProvisionCSQL) {
         await (0, provisionCloudSql_1.provisionCloudSql)({
             projectId: setup.projectId,
             locationId: info.locationId,
@@ -75,13 +88,12 @@ 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;
+exports.actuate = actuate;
 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(", ") }));
+    console.log(dir);
+    const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: info.connectors.map((c) => c.path) }));
     config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
     if (info.schemaGql.length) {
@@ -100,9 +112,9 @@ async function writeFiles(config, info) {
 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);
+    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, "connector.yaml"), subbedConnectorYaml);
     for (const f of connectorInfo.files) {
-        await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.id, f.path), f.content);
+        await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, f.path), f.content);
     }
 }
 function subDataconnectYamlValues(replacementValues) {
@@ -110,12 +122,12 @@ function subDataconnectYamlValues(replacementValues) {
         serviceId: "__serviceId__",
         cloudSqlDatabase: "__cloudSqlDatabase__",
         cloudSqlInstanceId: "__cloudSqlInstanceId__",
-        connectorIds: "__connectorIds__",
+        connectorDirs: "__connectorDirs__",
         locationId: "__location__",
     };
     let replaced = DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
-        replaced = replaced.replace(replacements[k], v);
+        replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
     return replaced;
 }
@@ -125,7 +137,7 @@ function subConnectorYamlValues(replacementValues) {
     };
     let replaced = CONNECTOR_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
-        replaced = replaced.replace(replacements[k], v);
+        replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
     return replaced;
 }
@@ -170,8 +182,10 @@ async function promptForService(setup, info) {
                     const connectors = await (0, client_1.listConnectors)(choice.service.name);
                     if (connectors.length) {
                         info.connectors = connectors.map((c) => {
+                            const id = c.name.split("/").pop();
                             return {
-                                id: c.name.split("/").pop(),
+                                id,
+                                path: `./${id}`,
                                 files: c.source.files || [],
                             };
                         });

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

@@ -4,22 +4,22 @@ exports.actuate = exports.doSetup = void 0;
 const yaml = require("yaml");
 const fs = require("fs");
 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");
+const types_1 = require("../../../dataconnect/types");
 const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const error_1 = require("../../../error");
-const IOS = "ios";
-const WEB = "web";
-const ANDROID = "android";
+const lodash_1 = require("lodash");
+const utils_1 = require("../../../utils");
 async function doSetup(setup, config) {
     const sdkInfo = await askQuestions(setup, config);
     await actuate(sdkInfo, setup.projectId);
 }
 exports.doSetup = doSetup;
 async function askQuestions(setup, config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     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
@@ -40,67 +40,78 @@ async function askQuestions(setup, config) {
         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 },
-        ],
-    });
+    let targetPlatform = types_1.Platform.UNDETERMINED;
+    let appDir;
+    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
+    if (cwdPlatformGuess !== types_1.Platform.UNDETERMINED) {
+        (0, utils_1.logSuccess)(`Detected ${cwdPlatformGuess} app in current directory ${process.cwd()}`);
+        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?",
+        });
+        const platformGuess = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
+        if (platformGuess !== types_1.Platform.UNDETERMINED) {
+            (0, utils_1.logSuccess)(`Detected ${platformGuess} app in directory ${appDir}`);
+            targetPlatform = platformGuess;
+        }
+        else {
+            (0, utils_1.logBullet)("Couldn't automatically detect your app's platform.");
+            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 },
+                ],
+            });
+        }
+    }
     const newConnectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
     if (!newConnectorYaml.generate) {
         newConnectorYaml.generate = {};
     }
-    if (platforms.includes(IOS)) {
-        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: ((_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.outputDir) ||
-                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/swift-sdk`,
-        });
-        const swiftSdk = { outputDir };
+    let displayIOSWarning = false;
+    if (targetPlatform === types_1.Platform.IOS) {
+        const outputDir = ((_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.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 swiftSdk = { outputDir, package: pkg };
         newConnectorYaml.generate.swiftSdk = swiftSdk;
+        displayIOSWarning = true;
     }
-    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) ||
-                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/javascript-sdk`,
-        });
-        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,
-        });
+    if (targetPlatform === types_1.Platform.WEB) {
+        const outputDir = ((_d = newConnectorYaml.generate.javascriptSdk) === null || _d === void 0 ? void 0 : _d.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 javascriptSdk = {
             outputDir,
             package: pkg,
         };
-        if (packageJSONDir) {
-            javascriptSdk.packageJSONDir = packageJSONDir;
+        if ((await (0, fileUtils_1.directoryHasPackageJson)(appDir)) &&
+            (await (0, prompt_1.confirm)({
+                message: "Would you like to add a dependency on the generated SDK to your package.json?",
+            }))) {
+            javascriptSdk.packageJsonDir = path.relative(connectorInfo.directory, appDir);
         }
         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) ||
-                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/kotlin-sdk/src/main/kotlin/${newConnectorYaml.connectorId}`,
-        });
-        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}`,
-        });
+    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"]) {
+            const candidateDir = path.join(appDir, candidateSubdir);
+            if (fs.existsSync(candidateDir)) {
+                baseDir = candidateDir;
+            }
+        }
+        const outputDir = ((_g = newConnectorYaml.generate.kotlinSdk) === null || _g === void 0 ? void 0 : _g.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 kotlinSdk = {
             outputDir,
             package: pkg,
@@ -113,18 +124,23 @@ async function askQuestions(setup, config) {
             default: true,
         })));
     const connectorYamlContents = yaml.stringify(newConnectorYaml);
-    return { connectorYamlContents, connectorInfo, shouldGenerate };
+    connectorInfo.connectorYaml = newConnectorYaml;
+    return { connectorYamlContents, connectorInfo, shouldGenerate, displayIOSWarning };
 }
 async function actuate(sdkInfo, projectId) {
+    var _a;
     const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
     fs.writeFileSync(connectorYamlPath, sdkInfo.connectorYamlContents, "utf8");
-    logger_1.logger.info(`Wrote new config to ${connectorYamlPath}`);
+    (0, utils_1.logBullet)(`Wrote new config to ${connectorYamlPath}`);
     if (projectId && sdkInfo.shouldGenerate) {
         await dataconnectEmulator_1.DataConnectEmulator.generate({
             configDir: sdkInfo.connectorInfo.directory,
             connectorId: sdkInfo.connectorInfo.connectorYaml.connectorId,
         });
-        logger_1.logger.info(`Generated SDK code for ${sdkInfo.connectorInfo.connectorYaml.connectorId}`);
+        (0, utils_1.logBullet)(`Generated SDK code for ${sdkInfo.connectorInfo.connectorYaml.connectorId}`);
+    }
+    if (((_a = sdkInfo.connectorInfo.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.swiftSdk) && sdkInfo.displayIOSWarning) {
+        (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/gp/ios-sdk#set-client"));
     }
 }
 exports.actuate = actuate;

package/lib/prompt.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.promptOnce = exports.prompt = void 0;
+exports.promptForDirectory = exports.confirm = exports.promptOnce = exports.prompt = void 0;
 const inquirer = require("inquirer");
+const fsutils_1 = require("./fsutils");
 const error_1 = require("./error");
+const logger_1 = require("./logger");
 inquirer.registerPrompt("autocomplete", require("inquirer-autocomplete-prompt"));
 async function prompt(options, questions) {
     const prompts = [];
@@ -49,3 +51,22 @@ async function confirm(args) {
     }
 }
 exports.confirm = confirm;
+async function promptForDirectory(args) {
+    let dir = "";
+    while (!dir) {
+        const target = args.config.path(await promptOnce({
+            message: "Where is your app directory?",
+        }));
+        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.`);
+        }
+        else if (!(0, fsutils_1.dirExistsSync)(target)) {
+            logger_1.logger.error(`Directory ${target} not found. Please provide a path to a directory`);
+        }
+        else {
+            dir = target;
+        }
+    }
+    return dir;
+}
+exports.promptForDirectory = promptForDirectory;

package/lib/rulesDeploy.js

@@ -71,12 +71,13 @@ class RulesDeploy {
             if (await (0, resourceManager_1.serviceAccountHasRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true)) {
                 return;
             }
-            const addRole = await (0, prompt_1.promptOnce)({
-                type: "confirm",
-                name: "rulesRole",
-                message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
-                default: true,
-            }, this.options);
+            const addRole = this.options.force ||
+                (await (0, prompt_1.promptOnce)({
+                    type: "confirm",
+                    name: "rulesRole",
+                    message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
+                    default: true,
+                }, this.options));
             if (addRole) {
                 await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
                 utils.logLabeledBullet(RulesetType[this.type], "updated service account for cross-service rules...");
@@ -118,12 +119,13 @@ class RulesDeploy {
             utils.logLabeledBullet(RulesetType[this.type], "quota exceeded error while uploading rules");
             const history = await gcp.rules.listAllRulesets(this.options.project);
             if (history.length > RULESET_COUNT_LIMIT) {
-                const confirm = await (0, prompt_1.promptOnce)({
-                    type: "confirm",
-                    name: "force",
-                    message: `You have ${history.length} rules, do you want to delete the oldest ${RULESETS_TO_GC} to free up space?`,
-                    default: false,
-                }, this.options);
+                const confirm = this.options.force ||
+                    (await (0, prompt_1.promptOnce)({
+                        type: "confirm",
+                        name: "force",
+                        message: `You have ${history.length} rules, do you want to delete the oldest ${RULESETS_TO_GC} to free up space?`,
+                        default: false,
+                    }, this.options));
                 if (confirm) {
                     const releases = await gcp.rules.listAllReleases(this.options.project);
                     const unreleased = history.filter((ruleset) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.14.2",
+  "version": "13.15.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -94,8 +94,8 @@
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",
     "lodash": "^4.17.21",
-    "marked": "^4.0.14",
-    "marked-terminal": "^5.1.1",
+    "marked": "^13.0.2",
+    "marked-terminal": "^7.0.0",
     "mime": "^2.5.2",
     "minimatch": "^3.0.4",
     "morgan": "^1.10.0",

package/templates/init/dataconnect/connector.yaml

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

package/templates/init/dataconnect/dataconnect.yaml

@@ -1,11 +1,11 @@
 specVersion: "v1alpha"
-serviceId: "__serviceId__"
-location: "__location__"
+serviceId: __serviceId__
+location: __location__
 schema:
   source: "./schema"
   datasource:
     postgresql:
-      database: "__cloudSqlDatabase__"
+      database: __cloudSqlDatabase__
       cloudSql:
-        instanceId: "__cloudSqlInstanceId__"
-connectorDirs: [__connectorIds__]
+        instanceId: __cloudSqlInstanceId__
+connectorDirs: __connectorDirs__

package/templates/init/dataconnect/mutations.gql

@@ -1,35 +1,50 @@
-# # Example mutations for a simple email app
+# # Example mutations for a simple movie app
 
-# # 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: {
-#     # Server values let your service populate sensitive data.
-#     # Users can only setup their own account.
-#     uid_expr: "auth.uid",
-#     name: $name,
-#     address: $address
-#   })
+# # Create a movie based on user input
+# mutation CreateMovie(
+#   $title: String!
+#   $genre: String!
+#   $imageUrl: String!
+# ) @auth(level: USER_EMAIL_VERIFIED) {
+#   movie_insert(
+#     data: {
+#       title: $title
+#       genre: $genre
+#       imageUrl: $imageUrl
+#     }
+#   )
 # }
 
-# # Logged in user can send emails from their account.
-# mutation CreateEmail($content: String, $subject: String) @auth(level: USER) {
-#   email_insert(data: {
-#     # The request variable name doesn't have to match the field name.
-#     text: $content,
-#     subject: $subject,
-#     # 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 }
-#   })
+# # Upsert (update or insert) a user's username based on their auth.uid
+# mutation UpsertUser($username: String!) @auth(level: USER) {
+#   user_upsert(
+#     data: {
+#       id_expr: "auth.uid"
+#       username: $username
+#     }
+#   )
 # }
 
-# mutation CreateRecipient($emailId: UUID) @auth(level: USER) {
-#   recipient_insert(data: {
-#     emailId: $emailId,
-#     userUid_expr: "auth.uid"
-#   })
+# # Add a review for a movie
+# mutation AddReview(
+#   $movieId: UUID!
+#   $rating: Int!
+#   $reviewText: String!
+# ) @auth(level: USER) {
+#   review_upsert(
+#     data: {
+#       userId_expr: "auth.uid"
+#       movieId: $movieId
+#       rating: $rating
+#       reviewText: $reviewText
+#       # reviewDate defaults to today in the schema. No need to set it manually.
+#     }
+#   )
+# }
+
+# # Logged in user can delete their review for a movie
+# mutation DeleteReview(
+#   $movieId: UUID!
+# ) @auth(level: USER) {
+#   review_delete(key: { userId_expr: "auth.uid", movieId: $movieId })
 # }

package/templates/init/dataconnect/queries.gql

@@ -1,56 +1,84 @@
-# # Example queries for a simple email app.
+# # Example queries for a simple movie app.
 
 # # @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
-#     }
+# # Anyone should be able to list all movies, so the auth level is set to PUBLIC
+# query ListMovies @auth(level: PUBLIC) {
+#   movies {
+#     id
+#     title
+#     imageUrl
+#     genre
 #   }
 # }
 
-# # Only admins should be able to list all users, so we use NO_ACCESS
+# # List all users, only admins should be able to list all users, so we use NO_ACCESS
 # query ListUsers @auth(level: NO_ACCESS) {
-#   users { uid, name, address }
+#   users { id, username }
 # }
-  
-# # 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_expr: "auth.uid" }
-#     }}
-#   }) {
-#     id subject sent
-#     content: text # Select the `text` field but alias it as `content` in the response.
-#     sender: from { name address uid }
+
+# # Logged in user can list all their reviews and movie titles associated with the review 
+# # Since the query requires the uid of the current authenticated user, the auth level is set to USER
+# query ListUserReviews @auth(level: USER) {
+#   user(key: {id_expr: "auth.uid"}) {
+#     id
+#     username
 #     # <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 address uid }
+#     # Here, we use it to grab all the reviews written by the user.
+#     reviews: reviews_on_user {
+#       id
+#       rating
+#       reviewDate
+#       reviewText
+#       movie {
+#         id
+#         title
+#       }
 #     }
 #   }
 # }
 
-# query GetUidByEmail($emails: [String!]) @auth(level: PUBLIC) {
-#   users(where: { address: { in: $emails } }) {
-#     uid address
+# # Get movie by id
+# query GetMovieById($id: UUID!) @auth(level: PUBLIC) {
+#   movie(id: $id) {
+#     id
+#     title
+#     imageUrl
+#     genre
+#     metadata: movieMetadatas_on_movie {
+#       director
+#       rating
+#       releaseYear
+#       description
+#     }
+#     reviews: reviews_on_movie {
+#       id
+#       reviewText
+#       reviewDate
+#       rating
+#       user {
+#         id
+#         username
+#       }
+#     }
 #   }
 # }
 
-# query ListSent($uid: String) @auth(level: PUBLIC) {
-#   emails(where: {
-#     from: {uid: {eq: $uid }}
-#   }) {
-#     id subject sent
-#     content: text
-#     sender: from { name address uid }
-#     to: recipients_on_email {
-#       user { name address uid }
+# # Search for movies, actors, and reviews
+# query SearchMovie(
+#   $titleInput: String
+#   $genre: String
+# ) @auth(level: PUBLIC) {
+#   movies(
+#     where: {
+#       _and: [
+#         { genre: { eq: $genre } }
+#         { title: { contains: $titleInput } }
+#       ]
 #     }
+#   ) {
+#     id
+#     title
+#     genre
+#     imageUrl
 #   }
 # }