Merge branch 'master' (early part) into bc/set-override

Author: Brian Chen

package.json

@@ -33,6 +33,7 @@
     "pretest": "node tools/pretest.js",
     "test": "lerna run --concurrency 4 --stream test",
     "test:ci": "lerna run --concurrency 4 --stream test:ci",
+    "test:release": "lerna run --concurrency 4 --ignore @firebase/*-exp --ignore firebase-exp --stream test:ci",
     "test:exp": "lerna run --concurrency 4 --stream --scope @firebase/*-exp --scope firebase-exp test",
     "pretest:coverage": "mkdirp coverage",
     "ci:coverage": "lcov-result-merger 'packages/**/lcov.info' 'lcov-all.info'",

packages-exp/functions-types-exp/package.json

@@ -2,6 +2,7 @@
   "name": "@firebase/functions-types-exp",
   "version": "0.0.800",
   "description": "@firebase/functions Types",
+  "private": true,
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
   "scripts": {

packages/firestore/exp/index.node.ts

@@ -15,4 +15,21 @@
  * limitations under the License.
  */
 
-// TODO(firestorexp): Export API
+export { FieldPath, documentId } from '../lite/src/api/field_path';
+
+export {
+  FieldValue,
+  deleteField,
+  increment,
+  arrayRemove,
+  arrayUnion,
+  serverTimestamp
+} from '../lite/src/api/field_value';
+
+export { setLogLevel } from '../src/util/log';
+
+export { Blob } from '../src/api/blob';
+
+export { GeoPoint } from '../src/api/geo_point';
+
+export { Timestamp } from '../src/api/timestamp';

packages/firestore/exp/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@firebase/firestore/exp",
+  "description": "A tree-shakeable version of the Firestore SDK",
+  "main": "../dist/exp/index.node.esm2017.js",
+  "private": true
+}

packages/firestore/exp/src/api/foobar.ts

@@ -322,7 +322,7 @@ export function collectionGroup(
 
   return new Query(
     firestoreClient,
-    new InternalQuery(ResourcePath.EMPTY_PATH, collectionId),
+    new InternalQuery(ResourcePath.emptyPath(), collectionId),
     /* converter= */ null
   );
 }
@@ -462,7 +462,12 @@ export function setDoc<T>(
     'setDoc'
   );
   const dataReader = newUserDataReader(ref.firestore);
-  const parsed = dataReader.parseSetData('setDoc', convertedValue, options);
+  const parsed = dataReader.parseSetData(
+    'setDoc',
+    ref._key,
+    convertedValue,
+    options
+  );
 
   return ref.firestore
     ._getDatastore()
@@ -500,12 +505,17 @@ export function updateDoc(
   ) {
     parsed = dataReader.parseUpdateVarargs(
       'updateDoc',
+      ref._key,
       fieldOrUpdateData,
       value,
       moreFieldsAndValues
     );
   } else {
-    parsed = dataReader.parseUpdateData('updateDoc', fieldOrUpdateData);
+    parsed = dataReader.parseUpdateData(
+      'updateDoc',
+      ref._key,
+      fieldOrUpdateData
+    );
   }
 
   return ref.firestore
@@ -545,7 +555,7 @@ export function addDoc<T>(
   );
 
   const dataReader = newUserDataReader(collRef.firestore);
-  const parsed = dataReader.parseSetData('addDoc', convertedValue);
+  const parsed = dataReader.parseSetData('addDoc', docRef._key, convertedValue);
 
   return collRef.firestore
     ._getDatastore()

packages/firestore/lite/src/api/reference.ts

@@ -102,6 +102,7 @@ export class Transaction implements firestore.Transaction {
     );
     const parsed = this._dataReader.parseSetData(
       'Transaction.set',
+      ref._key,
       convertedValue,
       options
     );
@@ -134,13 +135,15 @@ export class Transaction implements firestore.Transaction {
     ) {
       parsed = this._dataReader.parseUpdateVarargs(
         'Transaction.update',
+        ref._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
       );
     } else {
       parsed = this._dataReader.parseUpdateData(
         'Transaction.update',
+        ref._key,
         fieldOrUpdateData
       );
     }

packages/firestore/lite/src/api/transaction.ts

@@ -67,6 +67,7 @@ export class WriteBatch implements firestore.WriteBatch {
 
     const parsed = this._dataReader.parseSetData(
       'WriteBatch.set',
+      ref._key,
       convertedValue,
       options
     );
@@ -103,13 +104,15 @@ export class WriteBatch implements firestore.WriteBatch {
     ) {
       parsed = this._dataReader.parseUpdateVarargs(
         'WriteBatch.update',
+        ref._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
       );
     } else {
       parsed = this._dataReader.parseUpdateData(
         'WriteBatch.update',
+        ref._key,
         fieldOrUpdateData
       );
     }