Finish TypeScript Migration (#512)

Author: schmidt-sebastian

dev/conformance/runner.ts

@@ -14,25 +14,22 @@
  * limitations under the License.
  */
 
-import {expect} from 'chai';
 const duplexify = require('duplexify');
 
-import * as is from 'is';
+import {expect} from 'chai';
 import * as path from 'path';
 import * as protobufjs from 'protobufjs';
 import * as through2 from 'through2';
-
 import * as proto from '../protos/firestore_proto_api';
-import api = proto.google.firestore.v1;
 
 import * as Firestore from '../src';
-
+import {documentFromJson} from '../src/convert';
+import {DocumentChangeType} from '../src/document-change';
 import {ResourcePath} from '../src/path';
-import * as convert from '../src/convert';
-
+import {isObject} from '../src/util';
 import {createInstance as createInstanceHelper} from '../test/util/helpers';
-import {AnyDuringMigration} from '../src/types';
-import {DocumentChangeType} from '../src/document-change';
+
+import api = proto.google.firestore.v1;
 
 const REQUEST_TIME = 'REQUEST_TIME';
 
@@ -93,9 +90,9 @@ const convertInput = {
   argument: json => {
     const obj = JSON.parse(json);
     function convertValue(value) {
-      if (is.object(value)) {
+      if (isObject(value)) {
         return convertObject(value);
-      } else if (is.array(value)) {
+      } else if (Array.isArray(value)) {
         return convertArray(value);
       } else if (value === 'NaN') {
         return NaN;
@@ -175,15 +172,15 @@ const convertInput = {
 
     for (const doc of snapshot.docs) {
       const deepCopy = JSON.parse(JSON.stringify(doc));
-      deepCopy.fields = convert.documentFromJson(deepCopy.fields);
+      deepCopy.fields = documentFromJson(deepCopy.fields);
       docs.push(
           firestore.snapshot_(deepCopy, readTime, 'json') as
           Firestore.QueryDocumentSnapshot);
     }
 
     for (const change of snapshot.changes) {
       const deepCopy = JSON.parse(JSON.stringify(change.doc));
-      deepCopy.fields = convert.documentFromJson(deepCopy.fields);
+      deepCopy.fields = documentFromJson(deepCopy.fields);
       const doc = firestore.snapshot_(deepCopy, readTime, 'json');
       const type =
           (['unspecified', 'added', 'removed', 'modified'][change.kind] as
@@ -208,7 +205,7 @@ const convertProto = {
     }
     if (deepCopy.documentChange) {
       deepCopy.documentChange.document.fields =
-          convert.documentFromJson(deepCopy.documentChange.document.fields);
+          documentFromJson(deepCopy.documentChange.document.fields);
     }
     return deepCopy;
   },
@@ -351,7 +348,8 @@ function runTest(spec) {
   const setTest = spec => {
     const overrides = {commit: commitHandler(spec)};
     return createInstance(overrides).then(() => {
-      const setOption: AnyDuringMigration = {};
+      const setOption: {merge?: boolean,
+                        mergeFields?: Firestore.FieldPath[]} = {};
       if (spec.option && spec.option.all) {
         setOption.merge = true;
       } else if (spec.option && spec.option.fields) {
@@ -472,6 +470,7 @@ describe('Conformance Tests', () => {
     const binaryProtoData =
         require('fs').readFileSync(path.join(__dirname, 'test-suite.binproto'));
 
+    // We don't have type information for the conformance proto.
     // tslint:disable-next-line:no-any
     const testSuite: any = TEST_SUITE_TYPE.decode(binaryProtoData);
 

dev/src/convert.ts

@@ -15,11 +15,11 @@
  */
 
 import {google} from '../protos/firestore_proto_api';
-import api = google.firestore.v1;
-import {createValidator} from './validate';
+
 import {ProtobufJsValue} from './types';
+import {validateObject} from './validate';
 
-const validate = createValidator();
+import api = google.firestore.v1;
 
 /*!
  * @module firestore/convert
@@ -71,7 +71,7 @@ export function timestampFromJson(
       nanos: nanos || undefined,
     };
   } else if (timestampValue !== undefined) {
-    validate.isObject('timestampValue', timestampValue);
+    validateObject('timestampValue', timestampValue);
     timestampProto = {
       seconds: timestampValue.seconds || undefined,
       nanos: timestampValue.nanos || undefined,

dev/src/document-change.ts

@@ -15,6 +15,7 @@
  */
 
 import {QueryDocumentSnapshot} from './document';
+
 export type DocumentChangeType = 'added'|'removed'|'modified';
 
 /**