Merge branch 'master' into mc/persist

Author: morganchen12

auth-next/index.js

@@ -52,7 +52,7 @@ function authStateListener() {
   onAuthStateChanged(auth, (user) => {
     if (user) {
       // User is signed in, see docs for a list of available properties
-      // https://firebase.google.com/docs/reference/js/firebase.User
+      // https://firebase.google.com/docs/reference/js/v8/firebase.User
       const uid = user.uid;
       // ...
     } else {
@@ -72,7 +72,7 @@ function currentUser() {
 
   if (user) {
     // User is signed in, see docs for a list of available properties
-    // https://firebase.google.com/docs/reference/js/firebase.User
+    // https://firebase.google.com/docs/reference/js/v8/firebase.User
     // ...
   } else {
     // No user is signed in.

auth/index.js

@@ -43,7 +43,7 @@ function authStateListener() {
   firebase.auth().onAuthStateChanged((user) => {
     if (user) {
       // User is signed in, see docs for a list of available properties
-      // https://firebase.google.com/docs/reference/js/firebase.User
+      // https://firebase.google.com/docs/reference/js/v8/firebase.User
       var uid = user.uid;
       // ...
     } else {
@@ -60,7 +60,7 @@ function currentUser() {
 
   if (user) {
     // User is signed in, see docs for a list of available properties
-    // https://firebase.google.com/docs/reference/js/firebase.User
+    // https://firebase.google.com/docs/reference/js/v8/firebase.User
     // ...
   } else {
     // No user is signed in.

firestore-next/test.firestore.js

@@ -597,7 +597,7 @@ describe("firestore", () => {
             if (docSnap.exists()) {
               console.log("Document data:", docSnap.data());
             } else {
-              // doc.data() will be undefined in this case
+              // docSnap.data() will be undefined in this case
               console.log("No such document!");
             }
             // [END get_document]
@@ -697,6 +697,18 @@ describe("firestore", () => {
             // [END get_multiple_all]
         });
 
+        it("should get all documents from a subcollection", async () => {
+          // [START firestore_query_subcollection]
+          const { collection, getDocs } = require("firebase/firestore");
+          // Query a reference to a subcollection
+          const querySnapshot = await getDocs(collection(db, "cities", "SF", "landmarks"));
+          querySnapshot.forEach((doc) => {
+            // doc.data() is never undefined for query doc snapshots
+            console.log(doc.id, " => ", doc.data());
+          });
+          // [END firestore_query_subcollection]
+      });
+
         it("should listen on multiple documents #UNVERIFIED", (done) => {
             // [START listen_multiple]
             const { collection, query, where, onSnapshot } = require("firebase/firestore");

firestore/test.firestore.js

@@ -600,7 +600,7 @@ describe("firestore", () => {
             var docRef = db.collection("cities").doc("SF");
 
             // Valid options for source are 'server', 'cache', or
-            // 'default'. See https://firebase.google.com/docs/reference/js/firebase.firestore.GetOptions
+            // 'default'. See https://firebase.google.com/docs/reference/js/v8/firebase.firestore.GetOptions
             // for more information.
             var getOptions = {
                 source: 'cache'

firestore/test.solution-counters.js

@@ -22,7 +22,7 @@ function createCounter(ref, num_shards) {
 // [END create_counter]
 
 // [START increment_counter]
-function incrementCounter(db, ref, num_shards) {
+function incrementCounter(ref, num_shards) {
     // Select a shard of the counter at random
     const shard_id = Math.floor(Math.random() * num_shards).toString();
     const shard_ref = ref.collection('shards').doc(shard_id);
@@ -67,15 +67,15 @@ describe("firestore-solution-counters", () => {
             // Create a counter, then increment it
             const ref = db.collection('counters').doc();
             return createCounter(ref, 10).then(() => {
-                return incrementCounter(db, ref, 10);
+                return incrementCounter(ref, 10);
             });
         });
 
         it("should get the count of a counter", () => {
             // Create a counter, increment it, then get the count
             const ref = db.collection('counters').doc();
             return createCounter(ref, 10).then(() => {
-                return incrementCounter(db, ref, 10);
+                return incrementCounter(ref, 10);
             }).then(() => {
                 return getCount(ref);
             });

scripts/separate-snippets.ts

@@ -18,6 +18,15 @@ const RE_END_SNIPPET = /\[END\s+([A-Za-z_]+)\s*\]/;
 // TODO: Handle multiline imports?
 const RE_REQUIRE = /const {(.+?)} = require\((.+?)\)/;
 
+// Regex for ref docs URLs
+// eg. "https://firebase.google.com/docs/reference/js/v8/firebase.User"
+const RE_REF_DOCS = /https:\/\/firebase\.google\.com\/docs\/reference\/js\/(.*)/;
+
+// Maps v8 ref docs URLs to their v9 counterpart
+const REF_DOCS_MAPPINGS: { [key: string]: string } = {
+  "v8/firebase.User" : "auth.user"
+};
+
 type SnippetsConfig = {
   enabled: boolean;
   suffix: string;
@@ -30,6 +39,23 @@ function isBlank(line: string) {
   return line.trim().length === 0;
 }
 
+/**
+ * Replace all v8 ref doc urls with their v9 counterpart.
+ */
+function replaceRefDocsUrls(lines: string[]) {
+  const outputLines = [];
+  for (const line of lines) {
+    if (line.match(RE_REF_DOCS)) {
+      outputLines.push(line.replace(RE_REF_DOCS, (match: string, p1?: string) => {
+        return p1 ? `https://firebase.google.com/docs/reference/js/${REF_DOCS_MAPPINGS[p1]}` : match;
+      }));
+    } else {
+      outputLines.push(line);
+    }
+  }
+  return outputLines;
+}
+
 /**
  * Replace all const { foo } = require('bar') with import { foo } from 'bar';
  */
@@ -119,6 +145,7 @@ function processSnippet(
   outputLines = addSuffixToSnippetNames(outputLines, snippetSuffix);
   outputLines = adjustIndentation(outputLines);
   outputLines = removeFirstLineAfterComments(outputLines);
+  outputLines = replaceRefDocsUrls(outputLines);
 
   // Add a preamble to every snippet
   const preambleLines = [

snippets/auth-next/index/auth_current_user.js

@@ -12,7 +12,7 @@ const user = auth.currentUser;
 
 if (user) {
   // User is signed in, see docs for a list of available properties
-  // https://firebase.google.com/docs/reference/js/firebase.User
+  // https://firebase.google.com/docs/reference/js/auth.user
   // ...
 } else {
   // No user is signed in.

snippets/auth-next/index/auth_state_listener.js

@@ -11,7 +11,7 @@ const auth = getAuth();
 onAuthStateChanged(auth, (user) => {
   if (user) {
     // User is signed in, see docs for a list of available properties
-    // https://firebase.google.com/docs/reference/js/firebase.User
+    // https://firebase.google.com/docs/reference/js/auth.user
     const uid = user.uid;
     // ...
   } else {

snippets/firestore-next/test-firestore/firestore_query_subcollection.js

@@ -0,0 +1,15 @@
+// This snippet file was generated by processing the source file:
+// ./firestore-next/test.firestore.js
+//
+// To update the snippets in this file, edit the source and then run
+// 'npm run snippets'.
+
+// [START firestore_query_subcollection_modular]
+import { collection, getDocs } from "firebase/firestore";
+// Query a reference to a subcollection
+const querySnapshot = await getDocs(collection(db, "cities", "SF", "landmarks"));
+querySnapshot.forEach((doc) => {
+  // doc.data() is never undefined for query doc snapshots
+  console.log(doc.id, " => ", doc.data());
+});
+// [END firestore_query_subcollection_modular]

snippets/firestore-next/test-firestore/get_document.js

@@ -13,7 +13,7 @@ const docSnap = await getDoc(docRef);
 if (docSnap.exists()) {
   console.log("Document data:", docSnap.data());
 } else {
-  // doc.data() will be undefined in this case
+  // docSnap.data() will be undefined in this case
   console.log("No such document!");
 }
 // [END get_document_modular]