replace tslint suppresion with eslint ones

Author: Feiyang1

packages/firestore/.eslintrc.json

@@ -2,5 +2,21 @@
     "extends": "../../config/.eslintrc.json",
     "parserOptions": {
         "project": "tsconfig.json"
+    },
+    "plugins": [
+        "import"
+    ],
+    "rules": {
+        "no-console":[ "error", { "allow": ["warn", "error"] }],
+        "import/no-default-export": "error"
+    },
+    "overrides": {
+        "files": [
+            "*test.ts",
+            "**/test/**/*.ts"
+        ],
+        "rules": {
+            "no-console": "off"
+        }
     }
 }

packages/firestore/package.json

@@ -7,8 +7,8 @@
     "build": "rollup -c",
     "build:console": "node tools/console.build.js",
     "dev": "rollup -c -w",
-    "lint": "eslint -c .eslintrc.json '**/*.ts' --ignore-path '../../.gitignore'",    
-    "lint:fix": "eslint --fix -c .eslintrc.json '**/*.ts' --ignore-path '../../.gitignore'",    
+    "lint": "eslint -c .eslintrc.json '**/*.ts' --ignore-path '../../.gitignore'",
+    "lint:fix": "eslint --fix -c .eslintrc.json '**/*.ts' --ignore-path '../../.gitignore'",
     "prettier": "prettier --write 'src/**/*.js' 'test/**/*.js' 'src/**/*.ts' 'test/**/*.ts'",
     "test": "run-s lint test:all",
     "test:all": "run-p test:browser test:node",
@@ -80,7 +80,8 @@
     "eslint": "5.16.0",
     "@typescript-eslint/parser": "1.9.0",
     "@typescript-eslint/eslint-plugin": "1.9.0",
-    "@typescript-eslint/eslint-plugin-tslint": "1.9.0"
+    "@typescript-eslint/eslint-plugin-tslint": "1.9.0",
+    "eslint-plugin-import": "2.17.3"
   },
   "repository": {
     "directory": "packages/firestore",
@@ -97,4 +98,4 @@
     ],
     "reportDir": "./coverage/node"
   }
-}
+}

packages/firestore/src/api/blob.ts

@@ -136,7 +136,6 @@ export class Blob {
 // instanceof checks.
 // For our internal TypeScript code PublicBlob doesn't exist as a type, and so
 // we need to use Blob as type and export it too.
-// tslint:disable-next-line:variable-name We're treating this as a class name.
 export const PublicBlob = makeConstructorPrivate(
   Blob,
   'Use Blob.fromUint8Array() or Blob.fromBase64String() instead.'

packages/firestore/src/api/database.ts

@@ -106,7 +106,6 @@ import {
 // The objects that are a part of this API are exposed to third-parties as
 // compiled javascript so we want to flag our private members with a leading
 // underscore to discourage their use.
-// tslint:disable:strip-private-property-underscore
 
 // settings() defaults:
 const DEFAULT_HOST = 'firestore.googleapis.com';
@@ -2353,7 +2352,6 @@ function resultChangeType(type: ChangeType): firestore.DocumentChangeType {
 
 // We're treating the variables as class names, so disable checking for lower
 // case variable names.
-// tslint:disable:variable-name
 export const PublicFirestore = makeConstructorPrivate(
   Firestore,
   'Use firebase.firestore() instead.'
@@ -2380,4 +2378,3 @@ export const PublicCollectionReference = makeConstructorPrivate(
   CollectionReference,
   'Use firebase.firestore().collection() instead.'
 );
-// tslint:enable:variable-name

packages/firestore/src/api/field_path.ts

@@ -28,7 +28,6 @@ import {
 // The objects that are a part of this API are exposed to third-parties as
 // compiled javascript so we want to flag our private members with a leading
 // underscore to discourage their use.
-// tslint:disable:strip-private-property-underscore
 
 /**
  * A FieldPath refers to a field in a document. The path may consist of a single

packages/firestore/src/api/field_value.ts

@@ -29,7 +29,7 @@ import {
  * An opaque base class for FieldValue sentinel objects in our public API,
  * with public static methods for creating said sentinel objects.
  */
-// tslint:disable-next-line:class-as-namespace  We use this as a base class.
+// We use this as a base class.
 export abstract class FieldValueImpl implements firestore.FieldValue {
   protected constructor(readonly _methodName: string) {}
 
@@ -109,7 +109,6 @@ export class NumericIncrementFieldValueImpl extends FieldValueImpl {
 // PublicFieldValue can be used interchangeably in instanceof checks.
 // For our internal TypeScript code PublicFieldValue doesn't exist as a type,
 // and so we need to use FieldValueImpl as type and export it too.
-// tslint:disable-next-line:variable-name  We treat this as a class name.
 export const PublicFieldValue = makeConstructorPrivate(
   FieldValueImpl,
   'Use FieldValue.<field>() instead.'

packages/firestore/src/core/firestore_client.ts

@@ -252,7 +252,6 @@ export class FirestoreClient {
           if (!this.canFallback(error)) {
             throw error;
           }
-
           console.warn(
             'Error enabling offline persistence. Falling back to' +
               ' persistence disabled: ' +

packages/firestore/src/core/sync_engine.ts

@@ -248,7 +248,7 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
         .then(remoteKeys => {
           const view = new View(query, remoteKeys);
           const viewDocChanges = view.computeDocChanges(docs);
-          // tslint:disable-next-line:max-line-length Prettier formats this exceed 100 characters.
+          // Prettier formats this exceed 100 characters.
           const synthesizedTargetChange = TargetChange.createSynthesizedTargetChangeForCurrentChange(
             queryData.targetId,
             current && this.onlineState !== OnlineState.Offline
@@ -975,7 +975,6 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
           return this.localStore.getNewDocumentChanges().then(
             async changes => {
               // tslint and prettier disagree about their preferred line length.
-              // tslint:disable-next-line:max-line-length
               const synthesizedRemoteEvent = RemoteEvent.createSynthesizedRemoteEventForCurrentChange(
                 targetId,
                 state === 'current'

packages/firestore/src/local/indexeddb_schema.ts

@@ -784,7 +784,6 @@ export class DbTargetDocument {
   ) {
     assert(
       (targetId === 0) === (sequenceNumber !== undefined),
-      // tslint:disable-next-line:max-line-length
       'A target-document row must either have targetId == 0 and a defined sequence number, or a non-zero targetId and no sequence number'
     );
   }

packages/firestore/src/util/api.ts

@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 
-// We are doing some heavy reflective stuff, lots of any casting necessary
-/* tslint:disable:no-any */
-
 import { Code, FirestoreError } from './error';
 
 /**

packages/firestore/src/util/error.ts

@@ -24,7 +24,7 @@ import * as firestore from '@firebase/firestore-types';
 export type Code = firestore.FirestoreErrorCode;
 
 // TODO(mcg): Change to a string enum once we've upgraded to typescript 2.4.
-//  tslint:disable-next-line:variable-name Intended to look like a TS 2.4 enum
+// Intended to look like a TS 2.4 enum
 export const Code = {
   // Causes are copied from:
   // https://github.com/grpc/grpc/blob/bceec94ea4fc5f0085d81235d8e1c06798dc341a/include/grpc%2B%2B/impl/codegen/status_code_enum.h

packages/firestore/src/util/log.ts

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-/* tslint:disable:no-console */
-
 import { Logger, LogLevel as FirebaseLogLevel } from '@firebase/logger';
 import { SDK_VERSION } from '../core/version';
 import { PlatformSupport } from '../platform/platform';

packages/firestore/src/util/misc.ts

@@ -19,7 +19,6 @@ import { assert } from './assert';
 
 export type EventHandler<E> = (value: E) => void;
 
-// tslint:disable-next-line:class-as-namespace
 export class AutoId {
   static newId(): string {
     // Alphanumeric characters

packages/firestore/test/integration/bootstrap.ts

@@ -25,7 +25,6 @@ import '../../index';
  */
 
 // 'context()' definition requires additional dependency on webpack-env package.
-// tslint:disable-next-line:no-any
 const testsContext = (require as any).context('.', true, /.test$/);
 const browserTests = testsContext
   .keys()

packages/firestore/test/integration/util/firebase_export.ts

@@ -22,5 +22,5 @@
 
 import firebase from '@firebase/app';
 
-// tslint:disable-next-line:no-default-export
+// eslint-disable-next-line import/no-default-export
 export default firebase;

packages/firestore/test/integration/util/helpers.ts

@@ -24,7 +24,7 @@ import firebase from './firebase_export';
  * dependencies on src/ files.
  */
 
-// tslint:disable-next-line:no-any __karma__ is an untyped global
+// __karma__ is an untyped global
 declare const __karma__: any;
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -46,7 +46,6 @@ const PROD_FIRESTORE_SETTING = {
 
 export const DEFAULT_SETTINGS = getDefaultSettings();
 
-// tslint:disable-next-line:no-console
 console.log(`Default Settings: ${JSON.stringify(DEFAULT_SETTINGS)}`);
 
 function getDefaultSettings(): firestore.Settings {

packages/firestore/test/unit/bootstrap.ts

@@ -25,7 +25,6 @@ import '../../src/platform_browser/browser_init';
  */
 
 // 'context()' definition requires additional dependency on webpack-env package.
-// tslint:disable-next-line:no-any
 const testsContext = (require as any).context('.', true, /.test$/);
 const browserTests = testsContext
   .keys()

packages/firestore/test/unit/specs/describe_spec.ts

@@ -176,7 +176,6 @@ export function specTest(
         await spec.runAsTest(fullName, usePersistence);
         const end = Date.now();
         if (tags.indexOf(BENCHMARK_TAG) >= 0) {
-          // tslint:disable-next-line:no-console
           console.log(`Runtime: ${end - start} ms.`);
         }
       });

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -258,7 +258,7 @@ class MockConnection implements Connection {
         }
       });
       this.writeStream = writeStream;
-      // tslint:disable-next-line:no-any Replace 'any' with conditional types.
+      // Replace 'any' with conditional types.
       return writeStream as any;
     } else {
       assert(rpcName === 'Listen', 'Unexpected rpc name: ' + rpcName);
@@ -292,7 +292,7 @@ class MockConnection implements Connection {
         }
       });
       this.watchStream = watchStream;
-      // tslint:disable-next-line:no-any Replace 'any' with conditional types.
+      // Replace 'any' with conditional types.
       return this.watchStream as any;
     }
   }
@@ -1240,7 +1240,6 @@ export async function runSpec(
   config: SpecConfig,
   steps: SpecStep[]
 ): Promise<void> {
-  // tslint:disable-next-line:no-console
   console.log('Running spec: ' + name);
 
   const sharedMockStorage = new SharedFakeWebStorage();

packages/firestore/test/util/helpers.ts

@@ -549,7 +549,7 @@ export class DocComparator {
 /**
  * Two helper functions to simplify testing isEqual() method.
  */
-// tslint:disable-next-line:no-any so we can dynamically call .isEqual().
+// use any type so we can dynamically call .isEqual().
 export function expectEqual(left: any, right: any, message?: string): void {
   message = message || '';
   if (typeof left.isEqual !== 'function') {
@@ -566,7 +566,7 @@ export function expectEqual(left: any, right: any, message?: string): void {
   expect(right.isEqual(left)).to.equal(true, message);
 }
 
-// tslint:disable-next-line:no-any so we can dynamically call .isEqual().
+// use any so we can dynamically call .isEqual().
 export function expectNotEqual(left: any, right: any, message?: string): void {
   expect(left.isEqual(right)).to.equal(false, message || '');
   expect(right.isEqual(left)).to.equal(false, message || '');

packages/firestore/test/util/node_persistence.ts

@@ -29,7 +29,7 @@ import { FakeWindow, SharedFakeWebStorage } from './test_platform';
 // To use this code to run persistence-based tests in Node, include this module
 // and set the environment variable `USE_MOCK_PERSISTENCE` to `YES`.
 
-const globalAny = global as any; // tslint:disable-line:no-any
+const globalAny = global as any;
 
 const dbDir = fs.mkdtempSync(os.tmpdir() + '/firestore_tests');
 

packages/firestore/test/util/test_platform.ts

@@ -199,7 +199,7 @@ export class SharedFakeWebStorage {
         oldValue,
         newValue,
         storageArea: client.storageArea
-      } as any); // tslint:disable-line:no-any Not mocking entire Event type.
+      } as any); // Not mocking entire Event type.
     });
   }
 }
@@ -220,12 +220,12 @@ export class TestPlatform implements Platform {
   }
 
   get document(): Document | null {
-    // tslint:disable-next-line:no-any FakeWindow doesn't support full Document interface.
+    // FakeWindow doesn't support full Document interface.
     return this.mockDocument as any;
   }
 
   get window(): Window | null {
-    // tslint:disable-next-line:no-any FakeWindow doesn't support full Window interface.
+    // FakeWindow doesn't support full Window interface.
     return this.mockWindow as any;
   }