firebase-tools 14.14.0 → 14.15.1

package/templates/init/dataconnect/dataconnect.yaml

@@ -8,5 +8,6 @@ schema:
       database: __cloudSqlDatabase__
       cloudSql:
         instanceId: __cloudSqlInstanceId__
-      # schemaValidation: "COMPATIBLE"
+        # schemaValidation: "STRICT"     # STRICT mode makes Postgres schema match Data Connect exactly.
+        # schemaValidation: "COMPATIBLE" # COMPATIBLE mode makes Postgres schema compatible with Data Connect.
 connectorDirs: __connectorDirs__

package/templates/init/dataconnect/mutations.gql

@@ -1,33 +1,33 @@
-# # Example mutations for a simple movie app
+# Example mutations for a simple movie app
 
-# # Create a movie based on user input
-# mutation CreateMovie($title: String!, $genre: String!, $imageUrl: String!)
-# @auth(level: USER_EMAIL_VERIFIED, insecureReason: "Any email verified users can create a new movie.") {
-#   movie_insert(data: { title: $title, genre: $genre, imageUrl: $imageUrl })
-# }
+# Create a movie based on user input
+mutation CreateMovie($title: String!, $genre: String!, $imageUrl: String!)
+@auth(level: USER_EMAIL_VERIFIED, insecureReason: "Any email verified users can create a new movie.") {
+  movie_insert(data: { title: $title, genre: $genre, imageUrl: $imageUrl })
+}
 
-# # Upsert (update or insert) a user's username based on their auth.uid
-# mutation UpsertUser($username: String!) @auth(level: USER) {
-#   # The "auth.uid" server value ensures that users can only register their own user.
-#   user_upsert(data: { id_expr: "auth.uid", username: $username })
-# }
+# Upsert (update or insert) a user's username based on their auth.uid
+mutation UpsertUser($username: String!) @auth(level: USER) {
+  # The "auth.uid" server value ensures that users can only register their own user.
+  user_upsert(data: { id_expr: "auth.uid", username: $username })
+}
 
-# # 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.
-#     }
-#   )
-# }
+# 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) {
-#   # The "auth.uid" server value ensures that users can only delete their own reviews.
-#   review_delete(key: { userId_expr: "auth.uid", movieId: $movieId })
-# }
+# Logged in user can delete their review for a movie
+mutation DeleteReview($movieId: UUID!) @auth(level: USER) {
+  # The "auth.uid" server value ensures that users can only delete their own reviews.
+  review_delete(key: { userId_expr: "auth.uid", movieId: $movieId })
+}

package/templates/init/dataconnect/queries.gql

@@ -1,78 +1,78 @@
-# # Example queries for a simple movie app.
+# Example queries for a simple movie app.
 
-# # @auth() directives control who can call each operation.
-# # Anyone should be able to list all movies, so the auth level is set to PUBLIC
-# query ListMovies @auth(level: PUBLIC, insecureReason: "Anyone can list all movies.") {
-#   movies {
-#     id
-#     title
-#     imageUrl
-#     genre
-#   }
-# }
+# @auth() directives control who can call each operation.
+# Anyone should be able to list all movies, so the auth level is set to PUBLIC
+query ListMovies @auth(level: PUBLIC, insecureReason: "Anyone can list all movies.") {
+  movies {
+    id
+    title
+    imageUrl
+    genre
+  }
+}
 
-# # List all users, only admins should be able to list all users, so we use NO_ACCESS
-# query ListUsers @auth(level: NO_ACCESS) {
-#   users {
-#     id
-#     username
-#   }
-# }
+# List all users, only admins should be able to list all users, so we use NO_ACCESS
+query ListUsers @auth(level: NO_ACCESS) {
+  users {
+    id
+    username
+  }
+}
 
-# # Logged in users can list all their reviews and movie titles associated with the review
-# # Since the query uses the uid of the current authenticated user, we set auth level 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 reviews written by the user.
-#     reviews: reviews_on_user {
-#       rating
-#       reviewDate
-#       reviewText
-#       movie {
-#         id
-#         title
-#       }
-#     }
-#   }
-# }
+# Logged in users can list all their reviews and movie titles associated with the review
+# Since the query uses the uid of the current authenticated user, we set auth level 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 reviews written by the user.
+    reviews: reviews_on_user {
+      rating
+      reviewDate
+      reviewText
+      movie {
+        id
+        title
+      }
+    }
+  }
+}
 
-# # Get movie by id
-# query GetMovieById($id: UUID!) @auth(level: PUBLIC, insecureReason: "Anyone can get a movie by id.") {
-#   movie(id: $id) {
-#     id
-#     title
-#     imageUrl
-#     genre
-#     metadata: movieMetadata_on_movie {
-#       rating
-#       releaseYear
-#       description
-#     }
-#     reviews: reviews_on_movie {
-#       reviewText
-#       reviewDate
-#       rating
-#       user {
-#         id
-#         username
-#       }
-#     }
-#   }
-# }
+# Get movie by id
+query GetMovieById($id: UUID!) @auth(level: PUBLIC, insecureReason: "Anyone can get a movie by id.") {
+  movie(id: $id) {
+    id
+    title
+    imageUrl
+    genre
+    metadata: movieMetadata_on_movie {
+      rating
+      releaseYear
+      description
+    }
+    reviews: reviews_on_movie {
+      reviewText
+      reviewDate
+      rating
+      user {
+        id
+        username
+      }
+    }
+  }
+}
 
-# # Search for movies, actors, and reviews
-# query SearchMovie($titleInput: String, $genre: String) @auth(level: PUBLIC, insecureReason: "Anyone can search for movies.") {
-#   movies(
-#     where: {
-#       _and: [{ genre: { eq: $genre } }, { title: { contains: $titleInput } }]
-#     }
-#   ) {
-#     id
-#     title
-#     genre
-#     imageUrl
-#   }
-# }
+# Search for movies, actors, and reviews
+query SearchMovie($titleInput: String, $genre: String) @auth(level: PUBLIC, insecureReason: "Anyone can search for movies.") {
+  movies(
+    where: {
+      _and: [{ genre: { eq: $genre } }, { title: { contains: $titleInput } }]
+    }
+  ) {
+    id
+    title
+    genre
+    imageUrl
+  }
+}

package/templates/init/dataconnect/schema.gql

@@ -1,52 +1,52 @@
-# # Example schema for simple movie review app
+# Example schema for simple movie review app
 
-# # User table is keyed by Firebase Auth UID.
-# type User @table {
-#   # `@default(expr: "auth.uid")` sets it to Firebase Auth UID during insert and upsert.
-#   id: String! @default(expr: "auth.uid")
-#   username: String! @col(dataType: "varchar(50)")
-#   # The `user: User!` field in the Review table generates the following one-to-many query field.
-#   #  reviews_on_user: [Review!]!
-#   # The `Review` join table the following many-to-many query field.
-#   #  movies_via_Review: [Movie!]!
-# }
+# User table is keyed by Firebase Auth UID.
+type User @table {
+  # `@default(expr: "auth.uid")` sets it to Firebase Auth UID during insert and upsert.
+  id: String! @default(expr: "auth.uid")
+  username: String! @col(dataType: "varchar(50)")
+  # The `user: User!` field in the Review table generates the following one-to-many query field.
+  #  reviews_on_user: [Review!]!
+  # The `Review` join table the following many-to-many query field.
+  #  movies_via_Review: [Movie!]!
+}
 
-# # Movie is keyed by a randomly generated UUID.
-# type Movie @table {
-#   # If you do not pass a 'key' to `@table`, Data Connect automatically adds the following 'id' column.
-#   # Feel free to uncomment and customize it.
-#   #  id: UUID! @default(expr: "uuidV4()")
-#   title: String!
-#   imageUrl: String!
-#   genre: String
-# }
+# Movie is keyed by a randomly generated UUID.
+type Movie @table {
+  # If you do not pass a 'key' to `@table`, Data Connect automatically adds the following 'id' column.
+  # Feel free to uncomment and customize it.
+  #  id: UUID! @default(expr: "uuidV4()")
+  title: String!
+  imageUrl: String!
+  genre: String
+}
 
-# # MovieMetadata is a metadata attached to a Movie.
-# # Movie <-> MovieMetadata is a one-to-one relationship
-# type MovieMetadata @table {
-#   # @unique ensures each Movie can only one MovieMetadata.
-#   movie: Movie! @unique
-#   # The movie field adds the following foreign key field. Feel free to uncomment and customize it.
-#   #  movieId: UUID!
-#   rating: Float
-#   releaseYear: Int
-#   description: String
-# }
+# MovieMetadata is a metadata attached to a Movie.
+# Movie <-> MovieMetadata is a one-to-one relationship
+type MovieMetadata @table {
+  # @unique ensures each Movie can only one MovieMetadata.
+  movie: Movie! @unique
+  # The movie field adds the following foreign key field. Feel free to uncomment and customize it.
+  #  movieId: UUID!
+  rating: Float
+  releaseYear: Int
+  description: String
+}
 
-# # Reviews is a join table between User and Movie.
-# # It has a composite primary keys `userUid` and `movieId`.
-# # A user can leave reviews for many movies. A movie can have reviews from many users.
-# # User  <-> Review is a one-to-many relationship
-# # Movie <-> Review is a one-to-many relationship
-# # Movie <-> User is a many-to-many relationship
-# type Review @table(name: "Reviews", key: ["movie", "user"]) {
-#   user: User!
-#   # The user field adds the following foreign key field. Feel free to uncomment and customize it.
-#   #  userUid: String!
-#   movie: Movie!
-#   # The movie field adds the following foreign key field. Feel free to uncomment and customize it.
-#   #  movieId: UUID!
-#   rating: Int
-#   reviewText: String
-#   reviewDate: Date! @default(expr: "request.time")
-# }
+# Reviews is a join table between User and Movie.
+# It has a composite primary keys `userUid` and `movieId`.
+# A user can leave reviews for many movies. A movie can have reviews from many users.
+# User  <-> Review is a one-to-many relationship
+# Movie <-> Review is a one-to-many relationship
+# Movie <-> User is a many-to-many relationship
+type Review @table(name: "Reviews", key: ["movie", "user"]) {
+  user: User!
+  # The user field adds the following foreign key field. Feel free to uncomment and customize it.
+  #  userUid: String!
+  movie: Movie!
+  # The movie field adds the following foreign key field. Feel free to uncomment and customize it.
+  #  movieId: UUID!
+  rating: Int
+  reviewText: String
+  reviewDate: Date! @default(expr: "request.time")
+}

package/lib/dataconnect/fileUtils.js

@@ -1,168 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFrameworksFromPackageJson = exports.frameworksMap = exports.SUPPORTED_FRAMEWORKS = exports.resolvePackageJson = exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
-const fs = require("fs-extra");
-const path = require("path");
-const clc = require("colorette");
-const glob_1 = require("glob");
-const error_1 = require("../error");
-const types_1 = require("./types");
-const utils_1 = require("../utils");
-const load_1 = require("./load");
-function readFirebaseJson(config) {
-    if (!(config === null || config === void 0 ? void 0 : config.has("dataconnect"))) {
-        return [];
-    }
-    const validator = (cfg) => {
-        if (!cfg["source"]) {
-            throw new error_1.FirebaseError("Invalid firebase.json: DataConnect requires `source`");
-        }
-        return {
-            source: cfg["source"],
-        };
-    };
-    const configs = config.get("dataconnect");
-    if (typeof configs === "object" && !Array.isArray(configs)) {
-        return [validator(configs)];
-    }
-    else if (Array.isArray(configs)) {
-        return configs.map(validator);
-    }
-    else {
-        throw new error_1.FirebaseError("Invalid firebase.json: dataconnect should be of the form { source: string }");
-    }
-}
-exports.readFirebaseJson = readFirebaseJson;
-async function readDataConnectYaml(sourceDirectory) {
-    const file = await (0, utils_1.readFileFromDirectory)(sourceDirectory, "dataconnect.yaml");
-    const dataconnectYaml = await (0, utils_1.wrappedSafeLoad)(file.source);
-    return validateDataConnectYaml(dataconnectYaml);
-}
-exports.readDataConnectYaml = readDataConnectYaml;
-function validateDataConnectYaml(unvalidated) {
-    if (!unvalidated["location"]) {
-        throw new error_1.FirebaseError("Missing required field 'location' in dataconnect.yaml");
-    }
-    return unvalidated;
-}
-async function readConnectorYaml(sourceDirectory) {
-    const file = await (0, utils_1.readFileFromDirectory)(sourceDirectory, "connector.yaml");
-    const connectorYaml = await (0, utils_1.wrappedSafeLoad)(file.source);
-    return validateConnectorYaml(connectorYaml);
-}
-exports.readConnectorYaml = readConnectorYaml;
-function validateConnectorYaml(unvalidated) {
-    return unvalidated;
-}
-async function readGQLFiles(sourceDir) {
-    if (!fs.existsSync(sourceDir)) {
-        return [];
-    }
-    const files = await (0, glob_1.glob)("**/*.{gql,graphql}", { cwd: sourceDir, absolute: true, nodir: true });
-    return files.map((f) => toFile(sourceDir, f));
-}
-exports.readGQLFiles = readGQLFiles;
-function toFile(sourceDir, fullPath) {
-    const relPath = path.relative(sourceDir, fullPath);
-    if (!fs.existsSync(fullPath)) {
-        throw new error_1.FirebaseError(`file ${fullPath} not found`);
-    }
-    const content = fs.readFileSync(fullPath).toString();
-    return {
-        path: relPath,
-        content,
-    };
-}
-async function pickService(projectId, config, serviceId) {
-    const serviceCfgs = readFirebaseJson(config);
-    let serviceInfo;
-    if (serviceCfgs.length === 0) {
-        throw new error_1.FirebaseError("No Data Connect services found in firebase.json." +
-            `\nYou can run ${clc.bold("firebase init dataconnect")} to add a Data Connect service.`);
-    }
-    else if (serviceCfgs.length === 1) {
-        serviceInfo = await (0, load_1.load)(projectId, config, serviceCfgs[0].source);
-        if (serviceId && serviceId !== serviceInfo.dataConnectYaml.serviceId) {
-            throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json. Found ${serviceInfo.dataConnectYaml.serviceId}.` +
-                `\nYou can run ${clc.bold("firebase init dataconnect")} to add this Data Connect service.`);
-        }
-        return serviceInfo;
-    }
-    else {
-        if (!serviceId) {
-            throw new error_1.FirebaseError("Multiple Data Connect services found in firebase.json. Please specify a service ID to use.");
-        }
-        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, config, c.source)));
-        const maybe = infos.find((i) => i.dataConnectYaml.serviceId === serviceId);
-        if (!maybe) {
-            throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json. Found ${infos.map((i) => i.dataConnectYaml.serviceId).join(", ")}.` +
-                `\nYou can run ${clc.bold("firebase init dataconnect")} to add this Data Connect service.`);
-        }
-        return maybe;
-    }
-}
-exports.pickService = pickService;
-const WEB_INDICATORS = ["package.json", "package-lock.json", "node_modules"];
-const IOS_INDICATORS = ["info.plist", "podfile", "package.swift", ".xcodeproj"];
-const ANDROID_INDICATORS = ["androidmanifest.xml", "build.gradle", "build.gradle.kts"];
-const DART_INDICATORS = ["pubspec.yaml", "pubspec.lock"];
-const IOS_POSTFIX_INDICATORS = [".xcworkspace", ".xcodeproj"];
-async function getPlatformFromFolder(dirPath) {
-    const fileNames = await fs.readdir(dirPath);
-    let hasWeb = false;
-    let hasAndroid = false;
-    let hasIOS = false;
-    let hasDart = false;
-    for (const fileName of fileNames) {
-        const cleanedFileName = fileName.toLowerCase();
-        hasWeb || (hasWeb = WEB_INDICATORS.some((indicator) => indicator === cleanedFileName));
-        hasAndroid || (hasAndroid = ANDROID_INDICATORS.some((indicator) => indicator === cleanedFileName));
-        hasIOS || (hasIOS = IOS_INDICATORS.some((indicator) => indicator === cleanedFileName) ||
-            IOS_POSTFIX_INDICATORS.some((indicator) => cleanedFileName.endsWith(indicator)));
-        hasDart || (hasDart = DART_INDICATORS.some((indicator) => indicator === cleanedFileName));
-    }
-    if (!hasWeb && !hasAndroid && !hasIOS && !hasDart) {
-        return types_1.Platform.NONE;
-    }
-    else if (hasWeb && !hasAndroid && !hasIOS && !hasDart) {
-        return types_1.Platform.WEB;
-    }
-    else if (hasAndroid && !hasWeb && !hasIOS && !hasDart) {
-        return types_1.Platform.ANDROID;
-    }
-    else if (hasIOS && !hasWeb && !hasAndroid && !hasDart) {
-        return types_1.Platform.IOS;
-    }
-    else if (hasDart && !hasWeb && !hasIOS && !hasAndroid) {
-        return types_1.Platform.FLUTTER;
-    }
-    return types_1.Platform.MULTIPLE;
-}
-exports.getPlatformFromFolder = getPlatformFromFolder;
-async function resolvePackageJson(packageJsonPath) {
-    let validPackageJsonPath = packageJsonPath;
-    if (!packageJsonPath.endsWith("package.json")) {
-        validPackageJsonPath = path.join(packageJsonPath, "package.json");
-    }
-    validPackageJsonPath = path.resolve(validPackageJsonPath);
-    try {
-        return JSON.parse((await fs.readFile(validPackageJsonPath)).toString());
-    }
-    catch (_a) {
-        return undefined;
-    }
-}
-exports.resolvePackageJson = resolvePackageJson;
-exports.SUPPORTED_FRAMEWORKS = ["react", "angular"];
-exports.frameworksMap = {
-    react: ["react", "next"],
-    angular: ["@angular/core"],
-};
-function getFrameworksFromPackageJson(packageJson) {
-    var _a, _b;
-    const devDependencies = Object.keys((_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {});
-    const dependencies = Object.keys((_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : {});
-    const allDeps = Array.from(new Set([...devDependencies, ...dependencies]));
-    return exports.SUPPORTED_FRAMEWORKS.filter((framework) => exports.frameworksMap[framework].find((dep) => allDeps.includes(dep)));
-}
-exports.getFrameworksFromPackageJson = getFrameworksFromPackageJson;