Increase typing

samtstern · samtstern · commit 4eae121a2c43 · 2020-09-03T15:58:20.000+01:00
diff --git a/firestore/emulator-suite.js b/firestore/emulator-suite.js
@@ -1,7 +1,7 @@
-const { initializeFirestore } = require("firebase/firestore");
-
 function onDocumentReady(firebaseApp) {
   //[START fs_emulator_connect]
+  const { initializeFirestore } = require("firebase/firestore");
+
   let settings = {};
   if (location.hostname === "localhost") {
     settings = {
diff --git a/firestore/test.firestore.js b/firestore/test.firestore.js
@@ -1,5 +1,3 @@
-const { initializeApp } = require("firebase/app");
-const { getFirestore, CACHE_SIZE_UNLIMITED } = require("firebase/firestore");
 const { expect } = require('chai');
 
 // [START city_custom_object]
@@ -31,26 +29,39 @@ var cityConverter = {
 // [END city_custom_object]
 
 describe("firestore", () => {
+    const { FirebaseFirestore } = require("firebase/firestore");
+
+    /** @type {FirebaseFirestore} */
     let db;
+    let app;
+
     before(() => {
+        const { initializeApp } = require("firebase/app");
+        const { getFirestore } = require("firebase/firestore");
+
         const config = {
             apiKey: "AIzaSyCM61mMr_iZnP1DzjT1PMB5vDGxfyWNM64",
             authDomain: "firestore-snippets.firebaseapp.com",
             projectId: "firestore-snippets"
         };
-        const app = initializeApp(config);
+        app = initializeApp(config);
         db = getFirestore(app);
     });
 
     it("should be able to set the cache size", () => {
         // [START fs_setup_cache]
-        db.settings({
-            cacheSizeBytes: CACHE_SIZE_UNLIMITED
+        const { initializeFirestore, CACHE_SIZE_UNLIMITED } = require("firebase/firestore");
+
+        const firestoreDb = initializeFirestore(app, {
+          cacheSizeBytes: CACHE_SIZE_UNLIMITED
         });
         // [END fs_setup_cache]
     });
 
     it("should be initializable with persistence", () => {
+      const { initializeApp } = require("firebase/app");
+      const { getFirestore } = require("firebase/firestore");
+
       const app = initializeApp({
         apiKey: '### FIREBASE API KEY ###',
         authDomain: '### FIREBASE AUTH DOMAIN ###',
@@ -140,9 +151,9 @@ describe("firestore", () => {
 
         it("should get all users", async () => {
             // [START get_all_users]
-            const { getDocs } = require("firebase/firestore"); 
+            const { collection, getDocs } = require("firebase/firestore"); 
 
-            const querySnapshot = await getDocs(db.collection("users"));
+            const querySnapshot = await getDocs(collection(db, "users"));
             querySnapshot.forEach((doc) => {
               console.log(`${doc.id} => ${doc.data()}`);
             });
diff --git a/firestore/test.solution-aggregation.js b/firestore/test.solution-aggregation.js
@@ -7,7 +7,11 @@ const arinellDoc = {
 // [END sample_doc]
 
 describe("firestore-solution-arrays", () => {
+    const { FirebaseFirestore } = require("firebase/firestore");
+
+    /** @type {FirebaseFirestore} */
     let db;
+
     before(async () => {
       const { initializeApp } = require("firebase/app");
       const { getFirestore, collection, doc, setDoc } = require("firebase/firestore");
diff --git a/firestore/test.solution-arrays.js b/firestore/test.solution-arrays.js
@@ -41,11 +41,15 @@ const postsWithMapAdvanced = [
 ]
 
 describe("firestore-solution-arrays", () => {
+    const { FirebaseFirestore } = require("firebase/firestore");
+
+    /** @type {FirebaseFirestore} */
     let db;
+
     before(() => {
         const { initializeApp } = require("firebase/app");
         const { getFirestore } = require("firebase/firestore");
-  
+
         const config = {
             apiKey: "AIzaSyArvVh6VSdXicubcvIyuB-GZs8ua0m0DTI",
             authDomain: "firestorequickstarts.firebaseapp.com",
@@ -71,7 +75,7 @@ describe("firestore-solution-arrays", () => {
         it("should query in a category by timestamp", () => {
             function queryOne() {
                 // [START query_in_category_timestamp_invalid]
-                const { collection, query, where, orderBy } = require("@firebase/firestore");
+                const { collection, query, where, orderBy, FirebaseFirestore } = require("@firebase/firestore");
 
                 const q = query(collection(db, "posts"),
                     where("categories.cats", "==", true),
diff --git a/firestore/test.solution-counters.js b/firestore/test.solution-counters.js
@@ -1,3 +1,6 @@
+const { FirebaseFirestore } = require('firebase/firestore');
+
+/** @type {FirebaseFirestore} */
 let db;
 
 // [START create_counter]
@@ -22,7 +25,7 @@ function createCounter(ref, num_shards) {
 
 // [START increment_counter]
 function incrementCounter(db, ref, num_shards) {
-    const { collection, doc, updateDoc, increment } = require("@firebase/firestore");
+    const { collection, doc, updateDoc, increment, FirebaseFirestore } = require("@firebase/firestore");
 
     // Select a shard of the counter at random
     const shardId = Math.floor(Math.random() * num_shards).toString();
