Merge branch 'master' of https://github.com/firebase/firebase-js-sdk into issue-2393

Author: XuechunHou

packages/firestore/exp/index.d.ts

@@ -52,7 +52,13 @@ export interface SnapshotMetadata {
   isEqual(other: SnapshotMetadata): boolean;
 }
 
-export type LogLevel = 'debug' | 'error' | 'silent';
+export type LogLevel =
+  | 'debug'
+  | 'error'
+  | 'silent'
+  | 'warn'
+  | 'info'
+  | 'verbose';
 
 export function setLogLevel(logLevel: LogLevel): void;
 
@@ -169,10 +175,7 @@ export class Transaction {
 
   get<T>(documentRef: DocumentReference<T>): Promise<DocumentSnapshot<T>>;
 
-  set<T>(
-    documentRef: DocumentReference<T>,
-    data: T,
-  ): Transaction;
+  set<T>(documentRef: DocumentReference<T>, data: T): Transaction;
   set<T>(
     documentRef: DocumentReference<T>,
     data: Partial<T>,
@@ -193,10 +196,7 @@ export class Transaction {
 export class WriteBatch {
   private constructor();
 
-  set<T>(
-    documentRef: DocumentReference<T>,
-    data: T,
-  ): WriteBatch;
+  set<T>(documentRef: DocumentReference<T>, data: T): WriteBatch;
   set<T>(
     documentRef: DocumentReference<T>,
     data: Partial<T>,

packages/firestore/lite/index.d.ts

@@ -33,7 +33,13 @@ export interface Settings {
   ignoreUndefinedProperties?: boolean;
 }
 
-export type LogLevel = 'debug' | 'error' | 'silent';
+export type LogLevel =
+  | 'debug'
+  | 'error'
+  | 'silent'
+  | 'warn'
+  | 'info'
+  | 'verbose';
 
 export function setLogLevel(logLevel: LogLevel): void;
 

packages/firestore/lite/index.node.ts

@@ -28,6 +28,8 @@ export {
   getFirestore
 } from './src/api/database';
 
+export { DocumentReference } from './src/api/reference';
+
 // TOOD(firestorelite): Add tests when setDoc() is available
 export {
   FieldValue,
@@ -38,6 +40,8 @@ export {
   serverTimestamp
 } from './src/api/field_value';
 
+export { setLogLevel } from '../src/util/log';
+
 export function registerFirestore(): void {
   _registerComponent(
     new Component(

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

@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as firestore from '../../index';
+
+import { DocumentKey } from '../../../src/model/document_key';
+import { Firestore } from './database';
+import { DocumentKeyReference } from '../../../src/api/user_data_reader';
+
+/**
+ * A reference to a particular document in a collection in the database.
+ */
+export class DocumentReference<T = firestore.DocumentData>
+  extends DocumentKeyReference<T>
+  implements firestore.DocumentReference<T> {
+  constructor(
+    readonly firestore: Firestore,
+    key: DocumentKey,
+    readonly _converter?: firestore.FirestoreDataConverter<T>
+  ) {
+    super(firestore._databaseId, key, _converter);
+  }
+
+  get id(): string {
+    return this._key.path.lastSegment();
+  }
+
+  get path(): string {
+    return this._key.path.canonicalString();
+  }
+
+  withConverter<U>(
+    converter: firestore.FirestoreDataConverter<U>
+  ): firestore.DocumentReference<U> {
+    return new DocumentReference<U>(this.firestore, this._key, converter);
+  }
+}

packages/firestore/package.json

@@ -8,7 +8,9 @@
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
     "prebuild": "tsc -m es2015 --moduleResolution node scripts/*.ts ",
+    "prebuild:release": "yarn prebuild",
     "build": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js && yarn build:lite",
+    "build:release":  "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js",
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
     "build:console": "node tools/console.build.js",
     "build:exp": "rollup -c rollup.config.exp.js",
@@ -35,7 +37,7 @@
     "test:minified": "(cd ../../integration/firestore ; yarn test)",
     "pretest:lite": "yarn build:lite",
     "test:lite":  "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'lite/test/**/*.test.ts' --file lite/index.node.ts --config ../../config/mocharc.node.js",
-    "prepare": "yarn build"
+    "prepare": "yarn build:release"
   },
   "main": "dist/index.node.cjs.js",
   "main-esm2017": "dist/index.node.esm2017.js",

packages/firestore/src/api/user_data_reader.ts

@@ -49,6 +49,15 @@ import { PlatformSupport } from '../platform/platform';
 
 const RESERVED_FIELD_REGEX = /^__.*__$/;
 
+/**
+ * An untyped Firestore Data Converter interface that is shared between the
+ * lite, full and legacy SDK.
+ */
+export interface UntypedFirestoreDataConverter<T> {
+  toFirestore(modelObject: T): firestore.DocumentData;
+  fromFirestore(snapshot: unknown, options?: unknown): T;
+}
+
 /**
  * A reference to a document in a Firebase project.
  *
@@ -59,7 +68,7 @@ export class DocumentKeyReference<T> {
   constructor(
     public readonly _databaseId: DatabaseId,
     public readonly _key: DocumentKey,
-    public readonly _converter?: firestore.FirestoreDataConverter<T>
+    public readonly _converter?: UntypedFirestoreDataConverter<T>
   ) {}
 }