Exp build works

Author: schmidt-sebastian

packages/firestore/exp/api-extractor.json

@@ -1,6 +1,6 @@
 {
   "extends": "../../../config/api-extractor.json",
-  "mainEntryPointFilePath": "../dist/exp/firestore/exp/index.d.ts",
+  "mainEntryPointFilePath": "../dist/firestore/exp/index.d.ts",
   "dtsRollup": {
     "enabled": true,
     "publicTrimmedFilePath": "../dist/exp/private.d.ts"

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

@@ -16,7 +16,7 @@
  */
 
 import { _getProvider, _removeServiceInstance } from '@firebase/app-exp';
-import { _FirebaseService, FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import { Provider } from '@firebase/component';
 
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
@@ -72,8 +72,7 @@ export interface Settings extends LiteSettings {
  * Do not call this constructor directly. Instead, use {@link getFirestore()}.
  */
 export class FirebaseFirestore
-  extends LiteFirestore
-  implements _FirebaseService {
+  extends LiteFirestore {
   readonly _queue = new AsyncQueue();
   readonly _persistenceKey: string;
 

packages/firestore/src/core/bundle.ts

@@ -23,9 +23,15 @@ import {
   fromVersion,
   JsonProtoSerializer
 } from '../remote/serializer';
-import * as bundleProto from '../protos/firestore_bundle_proto';
-import { BundleMetadata } from '../protos/firestore_bundle_proto';
-import * as api from '../protos/firestore_proto_api';
+import {
+  Document as ProtoDocument,
+  Timestamp as ProtoTimestamp
+} from '../protos/firestore_proto_api';
+import {
+  BundledDocumentMetadata as ProtoBundledDocumentMetadata,
+  BundleMetadata as ProtoBundleMetadata,
+  NamedQuery as ProtoNamedQuery
+} from '../protos/firestore_bundle_proto';
 import { DocumentKey } from '../model/document_key';
 import { MaybeDocument, NoDocument } from '../model/document';
 import { debugAssert } from '../util/assert';
@@ -70,8 +76,8 @@ export interface NamedQuery {
  * itself, if it exists.
  */
 interface BundledDocument {
-  metadata: bundleProto.BundledDocumentMetadata;
-  document?: api.Document;
+  metadata: ProtoBundledDocumentMetadata;
+  document?: ProtoDocument;
 }
 
 /**
@@ -107,7 +113,7 @@ export class BundleConverter {
     }
   }
 
-  toSnapshotVersion(time: api.Timestamp): SnapshotVersion {
+  toSnapshotVersion(time: ProtoTimestamp): SnapshotVersion {
     return fromVersion(time);
   }
 }
@@ -117,7 +123,7 @@ export class BundleConverter {
  * loading a bundle.
  */
 export function bundleInitialProgress(
-  metadata: BundleMetadata
+  metadata: ProtoBundleMetadata
 ): ApiLoadBundleTaskProgress {
   return {
     taskState: 'Running',
@@ -133,7 +139,7 @@ export function bundleInitialProgress(
  * has succeeded.
  */
 export function bundleSuccessProgress(
-  metadata: BundleMetadata
+  metadata: ProtoBundleMetadata
 ): ApiLoadBundleTaskProgress {
   return {
     taskState: 'Success',
@@ -159,12 +165,12 @@ export class BundleLoader {
   /** The current progress of loading */
   private progress: ApiLoadBundleTaskProgress;
   /** Batched queries to be saved into storage */
-  private queries: bundleProto.NamedQuery[] = [];
+  private queries: ProtoNamedQuery[] = [];
   /** Batched documents to be saved into storage */
   private documents: BundledDocuments = [];
 
   constructor(
-    private bundleMetadata: bundleProto.BundleMetadata,
+    private bundleMetadata: ProtoBundleMetadata,
     private localStore: LocalStore,
     private serializer: JsonProtoSerializer
   ) {

packages/firestore/src/local/bundle_cache.ts

@@ -17,7 +17,7 @@
 
 import { PersistenceTransaction } from './persistence';
 import { PersistencePromise } from './persistence_promise';
-import * as bundleProto from '../protos/firestore_bundle_proto';
+import { BundleMetadata as ProtoBundleMetadata, NamedQuery as ProtoNamedQuery} from '../protos/firestore_bundle_proto';
 import { Bundle, NamedQuery } from '../core/bundle';
 
 /**
@@ -39,7 +39,7 @@ export interface BundleCache {
    */
   saveBundleMetadata(
     transaction: PersistenceTransaction,
-    metadata: bundleProto.BundleMetadata
+    metadata: ProtoBundleMetadata
   ): PersistencePromise<void>;
 
   /**
@@ -56,6 +56,6 @@ export interface BundleCache {
    */
   saveNamedQuery(
     transaction: PersistenceTransaction,
-    query: bundleProto.NamedQuery
+    query: ProtoNamedQuery
   ): PersistencePromise<void>;
 }

packages/firestore/src/protos/firestore_bundle_proto.ts

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-import * as api from './firestore_proto_api';
+import {StructuredQuery, Timestamp, Document} from './firestore_proto_api';
 
 /** Properties of a BundledQuery. */
 export interface BundledQuery {
   /** BundledQuery parent */
   parent?: string | null;
 
   /** BundledQuery structuredQuery */
-  structuredQuery?: api.StructuredQuery | null;
+  structuredQuery?: StructuredQuery | null;
 
   /** BundledQuery limitType */
   limitType?: LimitType | null;
@@ -41,7 +41,7 @@ export interface NamedQuery {
   bundledQuery?: BundledQuery | null;
 
   /** NamedQuery readTime */
-  readTime?: api.Timestamp | null;
+  readTime?: Timestamp | null;
 }
 
 /** Properties of a BundledDocumentMetadata. */
@@ -50,7 +50,7 @@ export interface BundledDocumentMetadata {
   name?: string | null;
 
   /** BundledDocumentMetadata readTime */
-  readTime?: api.Timestamp | null;
+  readTime?: Timestamp | null;
 
   /** BundledDocumentMetadata exists */
   exists?: boolean | null;
@@ -65,7 +65,7 @@ export interface BundleMetadata {
   id?: string | null;
 
   /** BundleMetadata createTime */
-  createTime?: api.Timestamp | null;
+  createTime?: Timestamp | null;
 
   /** BundleMetadata version */
   version?: number | null;
@@ -89,5 +89,5 @@ export interface BundleElement {
   documentMetadata?: BundledDocumentMetadata | null;
 
   /** BundleElement document */
-  document?: api.Document | null;
+  document?: Document | null;
 }

scripts/prune-dts/prune-dts.test.ts

@@ -22,7 +22,7 @@ import { format, resolveConfig } from 'prettier';
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { pruneDts } from './prune-dts';
+import {pruneDts, removeUnusedImports} from './prune-dts';
 
 const testCasesDir = path.resolve(__dirname, 'tests');
 const tmpDir = os.tmpdir();
@@ -32,7 +32,7 @@ const testCaseFilterRe = /.*/;
 
 async function runScript(inputFile: string): Promise<string> {
   const outputFile = path.resolve(tmpDir, 'output.d.ts');
-  await pruneDts(inputFile, outputFile);
+  pruneDts(inputFile, outputFile);
   return outputFile;
 }
 

scripts/prune-dts/prune-dts.ts

@@ -18,6 +18,7 @@
 import * as yargs from 'yargs';
 import * as ts from 'typescript';
 import * as fs from 'fs';
+import * as path from 'path';
 import { ESLint } from 'eslint';
 
 /**
@@ -33,10 +34,10 @@ import { ESLint } from 'eslint';
  * @param inputLocation The file path to the .d.ts produced by API explorer.
  * @param outputLocation The output location for the pruned .d.ts file.
  */
-export async function pruneDts(
+export function pruneDts(
   inputLocation: string,
   outputLocation: string
-): Promise<void> {
+): void {
   const compilerOptions = {};
   const host = ts.createCompilerHost(compilerOptions);
   const program = ts.createProgram([inputLocation], compilerOptions, host);
@@ -49,24 +50,24 @@ export async function pruneDts(
 
   const content = printer.printFile(transformedSourceFile);
   fs.writeFileSync(outputLocation, content);
-
-  await removeUnusedImports(outputLocation);
 }
 
-async function removeUnusedImports(outputLocation: string): Promise<void> {
+export async function removeUnusedImports(outputLocation: string): Promise<void> {
   const eslint = new ESLint({
     fix: true,
-    baseConfig: {
-      'parserOptions': {
-        'ecmaVersion': 2017,
-        sourceType: 'module'
+    overrideConfig: {
+      parserOptions: {
+        ecmaVersion: 2017,
+        sourceType: 'module',
+        tsconfigRootDir: __dirname,
+        project: ["./tsconfig.eslint.json"],
       },
-      'env': {
-        'es6': true
+      env: {
+        es6: true
       },
-      'plugins': ['unused-imports', '@typescript-eslint'],
-      'parser': '@typescript-eslint/parser',
-      'rules': {
+      plugins: ['unused-imports', '@typescript-eslint'],
+      parser: '@typescript-eslint/parser',
+      rules: {
         'unused-imports/no-unused-imports-ts': ['error']
       }
     }
@@ -432,5 +433,8 @@ const argv = yargs.options({
 }).argv;
 
 if (argv.input && argv.output) {
+  console.log("Removing private exports...");
   pruneDts(argv.input, argv.output);
+  console.log("Removing unused imports...");
+  removeUnusedImports(argv.output).then(() => console.log("Done."));
 }

scripts/prune-dts/tests/firestore.output.d.ts

@@ -14,8 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { DocumentData as DocumentData_2 } from '@firebase/firestore-types';
 import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
+import { _FirebaseService } from '@firebase/app-types';
 import { LogLevel } from '@firebase/logger';
+import { Provider } from '@firebase/component';
+import { SetOptions as SetOptions_2 } from '@firebase/firestore-types';
+import { SnapshotMetadata as SnapshotMetadata_2 } from '@firebase/firestore-types';
 export declare function addDoc<T>(
   reference: CollectionReference<T>,
   data: T

scripts/prune-dts/tsconfig.eslint.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../config/tsconfig.base.json",
+  "include": ["../../**/*.ts"]
+}