Merge branch 'main' into cloud-functions-streaming

Author: MichaelVerdon

eslint.config.mjs

@@ -41,9 +41,8 @@ export default [
       '**/type-test.ts',
       'packages/**/modular/dist/**/*',
       'packages/ai/__tests__/test-utils',
+      'packages/**/dist/**/*',
       'packages/vertexai/__tests__/test-utils',
-      'packages/vertexai/dist',
-      'packages/ai/dist',
     ],
   },
   ...compat

jest.setup.ts

@@ -6,9 +6,7 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "jsx": "react-jsx",
-    "lib": [
-      "ESNext"
-    ],
+    "lib": ["ESNext"],
     "module": "ESNext",
     "target": "ESNext",
     "moduleResolution": "Bundler",
@@ -24,9 +22,20 @@
     "strict": true,
     "baseUrl": ".",
     "paths": {
-      "@react-native-firebase/app": ["../app/lib"],
+      "@react-native-firebase/app/lib/common/*": ["../app/dist/typescript/commonjs/lib/common/*"],
+      "@react-native-firebase/app/lib/common": ["../app/dist/typescript/commonjs/lib/common"],
+      "@react-native-firebase/app/lib/internal/web/*": [
+        "../app/dist/typescript/commonjs/lib/internal/web/*"
+      ],
+      "@react-native-firebase/app/lib/internal/*": [
+        "../app/dist/typescript/commonjs/lib/internal/*"
+      ],
+      "@react-native-firebase/app/lib/internal": ["../app/dist/typescript/commonjs/lib/internal"],
+      "@react-native-firebase/app": ["../app/dist/typescript/commonjs/lib"],
       "@react-native-firebase/auth": ["../auth/lib"],
-      "@react-native-firebase/app-check": ["../app-check/lib"],
+      "@react-native-firebase/app-check": ["../app-check/lib"]
     }
-  }
+  },
+  "include": ["lib/**/*"],
+  "exclude": ["node_modules", "dist", "__tests__", "**/*.test.ts"]
 }

packages/ai/tsconfig.json

@@ -14,12 +14,26 @@
  * limitations under the License.
  *
  */
-import { warnIfNotModularCall } from '@react-native-firebase/app/lib/common';
+import { warnIfNotModularCall } from './common';
 import { getAppModule } from './internal/registry/nativeModule';
+import type { ReactNativeFirebase, Utils } from './types/app';
 
-export default class FirebaseApp {
-  constructor(options, appConfig, fromNative, deleteApp) {
-    const { name, automaticDataCollectionEnabled } = appConfig;
+export default class FirebaseApp implements ReactNativeFirebase.FirebaseAppBase {
+  private _name: string;
+  private _deleted: boolean;
+  private _deleteApp: () => Promise<void>;
+  private _options: ReactNativeFirebase.FirebaseAppOptions;
+  private _automaticDataCollectionEnabled: boolean;
+  _initialized: boolean;
+  _nativeInitialized: boolean;
+
+  constructor(
+    options: ReactNativeFirebase.FirebaseAppOptions,
+    appConfig: ReactNativeFirebase.FirebaseAppConfig,
+    fromNative: boolean,
+    deleteApp: () => Promise<void>,
+  ) {
+    const { name = '[DEFAULT]', automaticDataCollectionEnabled } = appConfig;
 
     this._name = name;
     this._deleted = false;
@@ -36,44 +50,49 @@ export default class FirebaseApp {
     }
   }
 
-  get name() {
+  get name(): string {
     return this._name;
   }
 
-  get options() {
+  get options(): ReactNativeFirebase.FirebaseAppOptions {
     return Object.assign({}, this._options);
   }
 
-  get automaticDataCollectionEnabled() {
+  get automaticDataCollectionEnabled(): boolean {
     return this._automaticDataCollectionEnabled;
   }
 
-  set automaticDataCollectionEnabled(enabled) {
+  set automaticDataCollectionEnabled(enabled: boolean) {
     this._checkDestroyed();
     getAppModule().setAutomaticDataCollectionEnabled(this.name, enabled);
     this._automaticDataCollectionEnabled = enabled;
   }
 
-  _checkDestroyed() {
+  private _checkDestroyed(): void {
     if (this._deleted) {
       throw new Error(`Firebase App named '${this._name}' already deleted`);
     }
   }
 
-  extendApp(extendedProps) {
+  extendApp(extendedProps: Record<string, unknown>): void {
     warnIfNotModularCall(arguments);
     this._checkDestroyed();
     Object.assign(this, extendedProps);
   }
 
-  delete() {
+  delete(): Promise<void> {
     warnIfNotModularCall(arguments, 'deleteApp()');
     this._checkDestroyed();
     return this._deleteApp();
   }
 
-  toString() {
+  toString(): string {
     warnIfNotModularCall(arguments, '.name property');
     return this.name;
   }
+
+  // For backward compatibility - utils method added by registry
+  utils(): Utils.Module {
+    throw new Error('utils() should be added by registry');
+  }
 }

packages/app/lib/FirebaseApp.js packages/app/lib/FirebaseApp.tspackages/app/lib/FirebaseApp.js renamed to packages/app/lib/FirebaseApp.ts

@@ -15,6 +15,7 @@
  *
  */
 
+// @ts-expect-error - No type declarations available
 import binaryToBase64 from 'react-native/Libraries/Utilities/binaryToBase64';
 import { promiseDefer } from './promise';
 
@@ -23,7 +24,7 @@ const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=
 /**
  * window.btoa
  */
-function btoa(input) {
+function btoa(input: string): string {
   let map;
   let i = 0;
   let block = 0;
@@ -51,11 +52,11 @@ function btoa(input) {
 /**
  * window.atob
  */
-function atob(input) {
+function atob(input: string): string {
   let i = 0;
   let bc = 0;
   let bs = 0;
-  let buffer;
+  let buffer: number | string;
   let output = '';
 
   const str = input.replace(/[=]+$/, '');
@@ -69,7 +70,7 @@ function atob(input) {
   for (
     bc = 0, bs = 0, i = 0;
     (buffer = str.charAt(i++));
-    ~buffer && ((bs = bc % 4 ? bs * 64 + buffer : buffer), bc++ % 4)
+    ~buffer && ((bs = bc % 4 ? bs * 64 + (buffer as number) : buffer), bc++ % 4)
       ? (output += String.fromCharCode(255 & (bs >> ((-2 * bc) & 6))))
       : 0
   ) {
@@ -79,23 +80,30 @@ function atob(input) {
   return output;
 }
 
+export interface Base64Result {
+  string: string | ArrayBuffer | null;
+  format: 'data_url' | 'base64';
+}
+
 /**
  * Converts a Blob, ArrayBuffer or Uint8Array to a base64 string.
  */
-function fromData(data) {
+function fromData(data: Blob | ArrayBuffer | Uint8Array): Promise<Base64Result> {
   if (data instanceof Blob) {
     const fileReader = new FileReader();
-    const { resolve, reject, promise } = promiseDefer();
+    const { resolve, reject, promise } = promiseDefer<Base64Result>();
 
     fileReader.readAsDataURL(data);
 
-    fileReader.onloadend = function onloadend() {
-      resolve({ string: fileReader.result, format: 'data_url' });
+    fileReader.onloadend = () => {
+      if (fileReader?.result) {
+        resolve?.({ string: fileReader.result, format: 'data_url' });
+      }
     };
 
-    fileReader.onerror = function onerror(event) {
-      fileReader.abort();
-      reject(event);
+    fileReader.onerror = event => {
+      fileReader?.abort();
+      reject?.(event);
     };
 
     return promise;

packages/app/lib/common/Base64.js packages/app/lib/common/Base64.tspackages/app/lib/common/Base64.js renamed to packages/app/lib/common/Base64.ts

@@ -18,7 +18,10 @@
 import { deepGet, deepSet } from './deeps';
 
 export default class MutatableParams {
-  constructor(parentInstance) {
+  _mutatableParams: Record<string, unknown>;
+  _parentInstance: MutatableParams;
+
+  constructor(parentInstance?: MutatableParams) {
     if (parentInstance) {
       this._mutatableParams = parentInstance._mutatableParams;
       this._parentInstance = parentInstance;
@@ -28,20 +31,20 @@ export default class MutatableParams {
     }
   }
 
-  set(param, value) {
+  set(param: string, value: unknown): MutatableParams {
     deepSet(this._mutatableParams, param, value);
     return this._parentInstance;
   }
 
-  get(param) {
-    return deepGet(this._mutatableParams, param, '.');
+  get<T = unknown>(param: string): T | undefined {
+    return deepGet<T>(this._mutatableParams, param, '.');
   }
 
-  toJSON() {
+  toJSON(): Record<string, unknown> {
     return Object.assign({}, this._mutatableParams);
   }
 
-  validate() {
+  validate(): void {
     // do nothing
   }
 }

…ckages/app/lib/common/MutatableParams.js …ckages/app/lib/common/MutatableParams.tspackages/app/lib/common/MutatableParams.js renamed to packages/app/lib/common/MutatableParams.ts packages/app/lib/common/MutatableParams.js renamed to packages/app/lib/common/MutatableParams.ts

@@ -16,7 +16,9 @@
  */
 
 export default class ReferenceBase {
-  constructor(_path) {
+  path: string;
+
+  constructor(_path: string) {
     let path = _path;
 
     if (path) {
@@ -37,7 +39,7 @@ export default class ReferenceBase {
    * @type {String}
    * {@link https://firebase.google.com/docs/reference/js/firebase.database.Reference#key}
    */
-  get key() {
+  get key(): string | null {
     return this.path === '/' ? null : this.path.substring(this.path.lastIndexOf('/') + 1);
   }
 }

packages/app/lib/common/ReferenceBase.js packages/app/lib/common/ReferenceBase.tspackages/app/lib/common/ReferenceBase.js renamed to packages/app/lib/common/ReferenceBase.ts

@@ -25,25 +25,29 @@ import { isArray, isObject } from './validate';
  * @param joiner
  * @returns {*}
  */
-export function deepGet(object, path, joiner = '/') {
+export function deepGet<T = unknown>(
+  object: Record<string, unknown> | unknown[],
+  path: string,
+  joiner: string = '/',
+): T | undefined {
   if (!isObject(object) && !Array.isArray(object)) {
     return undefined;
   }
   const keys = path.split(joiner);
 
   let i = 0;
-  let tmp = object;
+  let tmp: unknown = object;
   const len = keys.length;
 
   while (i < len) {
-    const key = keys[i++];
+    const key = keys[i++]!;
     if (!tmp || !Object.hasOwnProperty.call(tmp, key)) {
       return undefined;
     }
-    tmp = tmp[key];
+    tmp = (tmp as Record<string, unknown>)[key];
   }
 
-  return tmp;
+  return tmp as T;
 }
 
 /**
@@ -54,26 +58,32 @@ export function deepGet(object, path, joiner = '/') {
  * @param initPaths
  * @param joiner
  */
-export function deepSet(object, path, value, initPaths = true, joiner = '.') {
+export function deepSet(
+  object: Record<string, unknown>,
+  path: string,
+  value: unknown,
+  initPaths: boolean = true,
+  joiner: string = '.',
+): boolean {
   if (!isObject(object)) {
     return false;
   }
   const keys = path.split(joiner);
 
   let i = 0;
-  let _object = object;
+  let _object: unknown = object;
   const len = keys.length - 1;
 
   while (i < len) {
-    const key = keys[i++];
+    const key = keys[i++]!;
     if (initPaths && !Object.hasOwnProperty.call(object, key)) {
-      _object[key] = {};
+      (_object as Record<string, unknown>)[key] = {};
     }
-    _object = _object[key];
+    _object = (_object as Record<string, unknown>)[key];
   }
 
   if (isObject(_object) || (isArray(_object) && !Number.isNaN(keys[i]))) {
-    _object[keys[i]] = value;
+    (_object as Record<string, unknown>)[keys[i]!] = value;
   } else {
     return false;
   }