Fei v9 main firestore

common/api-review/firestore-lite.api.md

@@ -5,7 +5,7 @@
 ```ts
 
 import { EmulatorMockTokenOptions } from '@firebase/util';
-import { FirebaseApp } from '@firebase/app-exp';
+import { FirebaseApp } from '@firebase/app';
 import { LogLevelString as LogLevel } from '@firebase/logger';
 
 // @public
@@ -104,6 +104,8 @@ export class DocumentSnapshot<T = DocumentData> {
     get ref(): DocumentReference<T>;
 }
 
+export { EmulatorMockTokenOptions }
+
 // @public
 export function endAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
 

common/api-review/firestore.api.md

@@ -5,7 +5,7 @@
 ```ts
 
 import { EmulatorMockTokenOptions } from '@firebase/util';
-import { FirebaseApp } from '@firebase/app-exp';
+import { FirebaseApp } from '@firebase/app';
 import { LogLevelString as LogLevel } from '@firebase/logger';
 
 // @public
@@ -125,6 +125,8 @@ export class DocumentSnapshot<T = DocumentData> {
     get ref(): DocumentReference<T>;
 }
 
+export { EmulatorMockTokenOptions }
+
 // @public
 export function enableIndexedDbPersistence(firestore: Firestore, persistenceSettings?: PersistenceSettings): Promise<void>;
 

integration/firebase/test/namespaceDefinition.json

@@ -55,9 +55,6 @@
     "removeApp": {
       "__type": "function"
     },
-    "components": {
-      "__type": "Map"
-    },
     "ErrorFactory": {
       "__type": "function"
     },
@@ -223,16 +220,10 @@
       "onMessage": {
         "__type": "function"
       },
-      "onTokenRefresh": {
-        "__type": "function"
-      },
-      "requestPermission": {
-        "__type": "function"
-      },
       "deleteToken": {
         "__type": "function"
       },
-      "setBackgroundMessageHandler": {
+      "onBackgroundMessage": {
         "__type": "function"
       }
     }

integration/firestore/firebase_export.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import firebase from '@firebase/app';
-import '@firebase/firestore';
-import '@firebase/firestore/bundle';
+import firebase from '@firebase/app-compat';
+import '@firebase/firestore-compat';
 import { FirebaseApp } from '@firebase/app-types';
 import { Settings, FirebaseFirestore } from '@firebase/firestore-types';
 

integration/firestore/gulpfile.js

@@ -63,10 +63,7 @@ function copyTests() {
          */
         /import\s+\* as firebaseExport\s+from\s+('|")[^\1]+firebase_export\1;?/,
         `import * as firebaseExport from '${resolve(
-          __dirname,
-          isPersistenceEnabled()
-            ? './firebase_export'
-            : './firebase_export_memory'
+          __dirname, './firebase_export'
         )}';
 
          if (typeof process === 'undefined') {

integration/firestore/package.json

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@firebase/app": "0.6.30",
-    "@firebase/firestore": "2.4.0",
+    "@firebase/firestore-compat": "0.0.900",
     "@types/mocha": "8.2.3",
     "gulp": "4.0.2",
     "gulp-filter": "7.0.0",

package.json

@@ -22,15 +22,15 @@
   ],
   "scripts": {
     "dev": "lerna run --parallel --scope @firebase/* --scope firebase dev",
-    "build": "lerna run --scope @firebase/* --scope firebase --ignore @firebase/rules-unit-testing --ignore @firebase/firestore build",
+    "build": "lerna run --scope @firebase/* --scope firebase --ignore @firebase/rules-unit-testing build",
     "build:changed": "ts-node-script scripts/ci-test/build_changed.ts",
     "release:prepare": "lerna run --scope @firebase/* add-compat-overloads && lerna run --scope @firebase/* typings:public",
     "link:packages": "lerna exec --scope @firebase/* --scope firebase -- yarn link",
     "stage:packages": "./scripts/prepublish.sh",
     "repl": "node tools/repl.js",
     "release": "ts-node-script scripts/release/cli.ts",
     "pretest": "node tools/pretest.js",
-    "test": "lerna run --ignore firebase-repo-scripts-prune-dts --ignore @firebase/rules-unit-testing --ignore @firebase/auth --ignore @firebase/firestore --ignore @firebase/database-compat --ignore firebase-firestore-integration-test --ignore firebase-messaging-integration-test --ignore firebase-namespace-integration-test --concurrency 4 --stream test",
+    "test": "lerna run --ignore firebase-repo-scripts-prune-dts --ignore @firebase/rules-unit-testing --ignore @firebase/database-compat --ignore firebase-messaging-integration-test --concurrency 4 --stream test",
     "test:ci": "lerna run --concurrency 4 test:ci",
     "pretest:coverage": "mkdirp coverage",
     "ci:coverage": "lcov-result-merger 'packages/**/lcov.info' 'lcov-all.info'",

packages/auth-compat/index.ts

@@ -24,11 +24,11 @@ import {
   ComponentType,
   InstantiationMode
 } from '@firebase/component';
+import { FirebaseError } from '@firebase/util';
 
 import * as types from '@firebase/auth-types';
 import { name, version } from './package.json';
 import { Auth } from './src/auth';
-import { Persistence } from './src/persistence';
 import { PhoneAuthProvider as CompatAuthProvider } from './src/phone_auth_provider';
 import { RecaptchaVerifier as CompatRecaptchaVerifier } from './src/recaptcha_verifier';
 
@@ -106,11 +106,9 @@ function registerAuthCompat(instance: _FirebaseNamespace): void {
         PhoneMultiFactorGenerator: impl.PhoneMultiFactorGenerator,
         RecaptchaVerifier: CompatRecaptchaVerifier,
         TwitterAuthProvider: impl.TwitterAuthProvider,
-        Auth: {
-          Persistence
-        },
-        AuthCredential: impl.AuthCredential
-        //   'Error': fireauth.AuthError
+        Auth,
+        AuthCredential: impl.AuthCredential,
+        Error: FirebaseError
       })
       .setInstantiationMode(InstantiationMode.LAZY)
       .setMultipleInstances(false)

packages/auth-compat/src/auth.ts

@@ -41,6 +41,7 @@ const _assert: typeof exp._assert = exp._assert;
 export class Auth
   implements compat.FirebaseAuth, Wrapper<exp.Auth>, _FirebaseService
 {
+  static Persistence = Persistence;
   readonly _delegate: exp.AuthImpl;
 
   constructor(readonly app: FirebaseApp, provider: Provider<'auth'>) {

packages/auth/index.doc.ts

@@ -1,3 +1,9 @@
+/**
+ * Firebase Authentication
+ *
+ * @packageDocumentation
+ */
+
 /**
  * @license
  * Copyright 2021 Google LLC

packages/firebase/package.json

@@ -226,6 +226,7 @@
     "@firebase/database": "0.11.0",
     "@firebase/database-compat": "0.0.900",
     "@firebase/firestore": "2.4.0",
+    "@firebase/firestore-compat": "0.0.900",
     "@firebase/functions": "0.6.15",
     "@firebase/functions-compat": "0.0.900",
     "@firebase/installations": "0.4.32",

packages/firestore-compat/.eslintrc.js

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright 2021 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.
+ */
+
+module.exports = {
+  extends: '../../config/.eslintrc.js',
+  parserOptions: {
+    project: 'tsconfig.json',
+    // to make vscode-eslint work with monorepo
+    // https://github.com/typescript-eslint/typescript-eslint/issues/251#issuecomment-463943250
+    tsconfigRootDir: __dirname
+  },
+  plugins: ['import'],
+  rules: {
+    'no-console': ['error', { allow: ['warn', 'error'] }],
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {
+        varsIgnorePattern: '^_',
+        args: 'none'
+      }
+    ],
+    'import/order': [
+      'error',
+      {
+        'groups': [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index'
+        ],
+        'newlines-between': 'always',
+        'alphabetize': { 'order': 'asc', 'caseInsensitive': true }
+      }
+    ]
+  },
+  overrides: [
+    {
+      files: ['**/*.d.ts'],
+      rules: {
+        'camelcase': 'off',
+        'import/no-duplicates': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-unused-vars': 'off'
+      }
+    },
+    {
+      files: ['**/*.test.ts', '**/test/**/*.ts'],
+      rules: {
+        '@typescript-eslint/no-explicit-any': 'error'
+      }
+    },
+    {
+      files: ['scripts/*.ts'],
+      rules: {
+        'import/no-extraneous-dependencies': 'off',
+        '@typescript-eslint/no-require-imports': 'off'
+      }
+    }
+  ]
+};

packages/firestore-compat/README.md

@@ -0,0 +1,24 @@
+# @firebase/firestore-compat
+
+This is the [Cloud Firestore](https://firebase.google.com/docs/firestore/) component of the
+[Firebase JS SDK](https://www.npmjs.com/package/firebase).
+
+**This package is not intended for direct usage, and should only be used via the officially
+supported [firebase](https://www.npmjs.com/package/firebase) package.**
+
+If you are developing a Node.js application that requires administrative access to Cloud Firestore,
+use the [`@google-cloud/firestore`](https://www.npmjs.com/package/@google-cloud/firestore) Server
+SDK with your developer credentials.
+
+## Documentation
+
+For comprehensive documentation please see the [Firebase Reference
+Docs][reference-docs].
+
+[reference-docs]: https://firebase.google.com/docs/reference/js/
+
+## Contributing
+See [Contributing to the Firebase SDK](../../CONTRIBUTING.md) for general
+information about contributing to the firebase-js-sdk repo and
+[Contributing to the Cloud Firestore Component](./CONTRIBUTING.md) for
+details specific to the Cloud Firestore code and tests.