;
- }
-}
-
-declare const defaultExport: ReactNativeFirebase.FirebaseModuleWithStaticsAndApp<
- FirebaseVisionTypes.Module,
- FirebaseVisionTypes.Statics
->;
-
-export const firebase: ReactNativeFirebase.Module & {
- analytics: typeof defaultExport;
- app(name?: string): ReactNativeFirebase.FirebaseApp & { vision(): FirebaseVisionTypes.Module };
-};
-
-export const VisionBarcodeFormat: FirebaseVisionTypes.Statics['VisionBarcodeFormat'];
-export const VisionFaceContourType: FirebaseVisionTypes.Statics['VisionFaceContourType'];
-export const VisionFaceLandmarkType: FirebaseVisionTypes.Statics['VisionFaceLandmarkType'];
-export const VisionBarcodeValueType: FirebaseVisionTypes.Statics['VisionBarcodeValueType'];
-export const VisionBarcodeEmailType: FirebaseVisionTypes.Statics['VisionBarcodeEmailType'];
-export const VisionBarcodePhoneType: FirebaseVisionTypes.Statics['VisionBarcodePhoneType'];
-export const VisionBarcodeAddressType: FirebaseVisionTypes.Statics['VisionBarcodeAddressType'];
-export const VisionFaceDetectorContourMode: FirebaseVisionTypes.Statics['VisionFaceDetectorContourMode'];
-export const VisionFaceDetectorLandmarkMode: FirebaseVisionTypes.Statics['VisionFaceDetectorLandmarkMode'];
-export const VisionBarcodeWifiEncryptionType: FirebaseVisionTypes.Statics['VisionBarcodeWifiEncryptionType'];
-export const VisionFaceDetectorPerformanceMode: FirebaseVisionTypes.Statics['VisionFaceDetectorPerformanceMode'];
-export const VisionCloudTextRecognizerModelType: FirebaseVisionTypes.Statics['VisionCloudTextRecognizerModelType'];
-export const VisionFaceDetectorClassificationMode: FirebaseVisionTypes.Statics['VisionFaceDetectorClassificationMode'];
-export const VisionDocumentTextRecognizedBreakType: FirebaseVisionTypes.Statics['VisionDocumentTextRecognizedBreakType'];
-export const VisionCloudLandmarkRecognizerModelType: FirebaseVisionTypes.Statics['VisionCloudLandmarkRecognizerModelType'];
-
-export default defaultExport;
-
-/**
- * Attach namespace to `firebase.` and `FirebaseApp.`.
- */
-declare module '@react-native-firebase/app' {
- namespace ReactNativeFirebase {
- import FirebaseModuleWithStaticsAndApp = ReactNativeFirebase.FirebaseModuleWithStaticsAndApp;
- interface Module {
- vision: FirebaseModuleWithStaticsAndApp<
- FirebaseVisionTypes.Module,
- FirebaseVisionTypes.Statics
- >;
- }
-
- interface FirebaseApp {
- vision(): FirebaseVisionTypes.Module;
- }
-
- interface FirebaseJsonConfig {
- ml_vision_face_model: boolean;
- ml_vision_ocr_model: boolean;
- ml_vision_barcode_model: boolean;
- ml_vision_label_model: boolean;
- ml_vision_image_label_model: boolean;
- }
- }
-}
diff --git a/packages/ml-vision/lib/index.js b/packages/ml-vision/lib/index.js
deleted file mode 100644
index 325db1ebb3..0000000000
--- a/packages/ml-vision/lib/index.js
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) 2016-present Invertase Limited & Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this library 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.
- *
- */
-
-import {
- isString,
- toFilePath,
- validateOptionalNativeDependencyExists,
-} from '@react-native-firebase/app/lib/common';
-import {
- createModuleNamespace,
- FirebaseModule,
- getFirebaseRoot,
-} from '@react-native-firebase/app/lib/internal';
-import version from './version';
-import VisionBarcodeAddressType from './VisionBarcodeAddressType';
-import visionBarcodeDetectorOptions from './visionBarcodeDetectorOptions';
-import VisionBarcodeEmailType from './VisionBarcodeEmailType';
-import VisionBarcodeFormat from './VisionBarcodeFormat';
-import VisionBarcodePhoneType from './VisionBarcodePhoneType';
-import VisionBarcodeValueType from './VisionBarcodeValueType';
-import VisionBarcodeWifiEncryptionType from './VisionBarcodeWifiEncryptionType';
-import visionCloudDocumentTextRecognizerOptions from './visionCloudDocumentTextRecognizerOptions';
-import visionCloudImageLabelerOptions from './visionCloudImageLabelerOptions';
-import VisionCloudLandmarkRecognizerModelType from './VisionCloudLandmarkRecognizerModelType';
-import visionCloudLandmarkRecognizerOptions from './visionCloudLandmarkRecognizerOptions';
-import VisionCloudTextRecognizerModelType from './VisionCloudTextRecognizerModelType';
-import visionCloudTextRecognizerOptions from './visionCloudTextRecognizerOptions';
-import VisionDocumentTextRecognizedBreakType from './VisionDocumentTextRecognizedBreakType';
-import VisionFaceContourType from './VisionFaceContourType';
-import VisionFaceDetectorClassificationMode from './VisionFaceDetectorClassificationMode';
-import VisionFaceDetectorContourMode from './VisionFaceDetectorContourMode';
-import VisionFaceDetectorLandmarkMode from './VisionFaceDetectorLandmarkMode';
-import visionFaceDetectorOptions from './visionFaceDetectorOptions';
-import VisionFaceDetectorPerformanceMode from './VisionFaceDetectorPerformanceMode';
-import VisionFaceLandmarkType from './VisionFaceLandmarkType';
-import visionImageLabelerOptions from './visionImageLabelerOptions';
-
-const statics = {
- VisionCloudTextRecognizerModelType,
- VisionFaceDetectorClassificationMode,
- VisionFaceDetectorContourMode,
- VisionFaceDetectorLandmarkMode,
- VisionFaceDetectorPerformanceMode,
- VisionFaceLandmarkType,
- VisionFaceContourType,
- VisionCloudLandmarkRecognizerModelType,
- VisionDocumentTextRecognizedBreakType,
- VisionBarcodeFormat,
- VisionBarcodeValueType,
- VisionBarcodeAddressType,
- VisionBarcodeEmailType,
- VisionBarcodePhoneType,
- VisionBarcodeWifiEncryptionType,
-};
-
-const namespace = 'vision';
-const nativeModuleName = [
- 'RNFBMLVisionFaceDetectorModule',
- 'RNFBMLVisionImageLabelerModule',
- 'RNFBMLVisionTextRecognizerModule',
- 'RNFBMLVisionBarcodeDetectorModule',
- 'RNFBMLVisionLandmarkRecognizerModule',
- 'RNFBMLVisionDocumentTextRecognizerModule',
-];
-
-class FirebaseMlKitVisionModule extends FirebaseModule {
- faceDetectorProcessImage(localImageFilePath, faceDetectorOptions) {
- validateOptionalNativeDependencyExists(
- 'ml_vision_face_model',
- 'ML Kit Vision Face Detector',
- !!this.native.faceDetectorProcessImage,
- );
-
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().faceDetectorProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionFaceDetectorOptions(faceDetectorOptions);
- } catch (e) {
- throw new Error(
- `firebase.vision().faceDetectorProcessImage(_, *) 'faceDetectorOptions' ${e.message}.`,
- );
- }
-
- return this.native.faceDetectorProcessImage(toFilePath(localImageFilePath), options);
- }
-
- textRecognizerProcessImage(localImageFilePath) {
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().textRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- return this.native.textRecognizerProcessImage(toFilePath(localImageFilePath));
- }
-
- cloudTextRecognizerProcessImage(localImageFilePath, cloudTextRecognizerOptions) {
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().cloudTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionCloudTextRecognizerOptions(cloudTextRecognizerOptions);
- } catch (e) {
- throw new Error(`firebase.vision().cloudTextRecognizerProcessImage(_, *) ${e.message}`);
- }
-
- return this.native.cloudTextRecognizerProcessImage(toFilePath(localImageFilePath), options);
- }
-
- cloudDocumentTextRecognizerProcessImage(localImageFilePath, cloudDocumentTextRecognizerOptions) {
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().cloudDocumentTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionCloudDocumentTextRecognizerOptions(cloudDocumentTextRecognizerOptions);
- } catch (e) {
- throw new Error(
- `firebase.vision().cloudDocumentTextRecognizerProcessImage(_, *) ${e.message}.`,
- );
- }
-
- return this.native.cloudDocumentTextRecognizerProcessImage(
- toFilePath(localImageFilePath),
- options,
- );
- }
-
- cloudLandmarkRecognizerProcessImage(localImageFilePath, cloudLandmarkRecognizerOptions) {
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().cloudLandmarkRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions);
- } catch (e) {
- throw new Error(`firebase.vision().cloudLandmarkRecognizerProcessImage(_, *) ${e.message}.`);
- }
-
- return this.native.cloudLandmarkRecognizerProcessImage(toFilePath(localImageFilePath), options);
- }
-
- imageLabelerProcessImage(localImageFilePath, imageLabelerOptions) {
- validateOptionalNativeDependencyExists(
- 'ml_vision_image_label_model',
- 'ML Kit Vision Image Labeler',
- !!this.native.imageLabelerProcessImage,
- );
-
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().imageLabelerProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionImageLabelerOptions(imageLabelerOptions);
- } catch (e) {
- throw new Error(`firebase.vision().imageLabelerProcessImage(_, *) ${e.message}.`);
- }
-
- return this.native.imageLabelerProcessImage(toFilePath(localImageFilePath), options);
- }
-
- cloudImageLabelerProcessImage(localImageFilePath, cloudImageLabelerOptions) {
- validateOptionalNativeDependencyExists(
- 'ml_vision_image_label_model',
- 'ML Kit Vision Image Labeler',
- !!this.native.imageLabelerProcessImage,
- );
-
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().cloudImageLabelerProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionCloudImageLabelerOptions(cloudImageLabelerOptions);
- } catch (e) {
- throw new Error(`firebase.vision().cloudImageLabelerProcessImage(_, *) ${e.message}.`);
- }
-
- return this.native.cloudImageLabelerProcessImage(toFilePath(localImageFilePath), options);
- }
-
- barcodeDetectorProcessImage(localImageFilePath, barcodeDetectorOptions) {
- if (!isString(localImageFilePath)) {
- throw new Error(
- "firebase.vision().barcodeDetectorProcessImage(*) 'localImageFilePath' expected a string local file path.",
- );
- }
-
- let options;
- try {
- options = visionBarcodeDetectorOptions(barcodeDetectorOptions);
- } catch (e) {
- throw new Error(`firebase.vision().barcodeDetectorProcessImage(_, *) ${e.message}`);
- }
-
- return this.native.barcodeDetectorProcessImage(toFilePath(localImageFilePath), options);
- }
-}
-
-// import { SDK_VERSION } from '@react-native-firebase/ml-vision';
-export const SDK_VERSION = version;
-
-// import vision from '@react-native-firebase/ml-vision';
-// vision().X(...);
-export default createModuleNamespace({
- statics,
- version,
- namespace,
- nativeModuleName,
- nativeEvents: false,
- hasMultiAppSupport: true,
- hasCustomUrlOrRegionSupport: false,
- ModuleClass: FirebaseMlKitVisionModule,
-});
-
-// import vision, { firebase } from '@react-native-firebase/ml-vision';
-// vision().X(...);
-// firebase.vision().X(...);
-export const firebase = getFirebaseRoot();
-
-// e.g.
-// // import { VisionCloudTextRecognizerModelType } from '@react-native-firebase/ml-vision';
-export { default as VisionBarcodeFormat } from './VisionBarcodeFormat';
-export { default as VisionFaceContourType } from './VisionFaceContourType';
-export { default as VisionFaceLandmarkType } from './VisionFaceLandmarkType';
-export { default as VisionBarcodeValueType } from './VisionBarcodeValueType';
-export { default as VisionBarcodeEmailType } from './VisionBarcodeEmailType';
-export { default as VisionBarcodePhoneType } from './VisionBarcodePhoneType';
-export { default as VisionBarcodeAddressType } from './VisionBarcodeAddressType';
-export { default as VisionFaceDetectorContourMode } from './VisionFaceDetectorContourMode';
-export { default as VisionFaceDetectorLandmarkMode } from './VisionFaceDetectorLandmarkMode';
-export { default as VisionBarcodeWifiEncryptionType } from './VisionBarcodeWifiEncryptionType';
-export { default as VisionFaceDetectorPerformanceMode } from './VisionFaceDetectorPerformanceMode';
-export { default as VisionCloudTextRecognizerModelType } from './VisionCloudTextRecognizerModelType';
-export { default as VisionFaceDetectorClassificationMode } from './VisionFaceDetectorClassificationMode';
-export { default as VisionDocumentTextRecognizedBreakType } from './VisionDocumentTextRecognizedBreakType';
-export { default as VisionCloudLandmarkRecognizerModelType } from './VisionCloudLandmarkRecognizerModelType';
diff --git a/packages/ml-vision/lib/visionBarcodeDetectorOptions.js b/packages/ml-vision/lib/visionBarcodeDetectorOptions.js
deleted file mode 100644
index 0321f5fa59..0000000000
--- a/packages/ml-vision/lib/visionBarcodeDetectorOptions.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016-present Invertase Limited & Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this library 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.
- *
- */
-
-import { isArray, isObject, isUndefined } from '@react-native-firebase/app/lib/common';
-import VisionBarcodeFormat from './VisionBarcodeFormat';
-
-export default function visionBarcodeDetectorOptions(barcodeDetectorOptions) {
- const out = {
- barcodeFormats: [VisionBarcodeFormat.ALL_FORMATS],
- };
-
- if (isUndefined(barcodeDetectorOptions)) {
- return out;
- }
-
- if (!isObject(barcodeDetectorOptions)) {
- throw new Error("'barcodeDetectorOptions' expected an object value.");
- }
-
- if (barcodeDetectorOptions.barcodeFormats) {
- if (!isArray(barcodeDetectorOptions.barcodeFormats)) {
- throw new Error(
- "'barcodeDetectorOptions.barcodeFormats' must be an array of VisionBarcodeFormat types.",
- );
- }
-
- const validFormats = Object.values(VisionBarcodeFormat);
-
- for (let i = 0; i < barcodeDetectorOptions.barcodeFormats.length; i++) {
- if (!validFormats.includes(barcodeDetectorOptions.barcodeFormats[i])) {
- throw new Error(
- `'barcodeDetectorOptions.barcodeFormats' type at index ${i} is invalid. Expected a VisionBarcodeFormat type.`,
- );
- }
- }
-
- out.barcodeFormats = barcodeDetectorOptions.barcodeFormats;
- }
-
- return out;
-}
diff --git a/packages/ml-vision/lib/visionFaceDetectorOptions.js b/packages/ml-vision/lib/visionFaceDetectorOptions.js
deleted file mode 100644
index 2b5e9ebe8a..0000000000
--- a/packages/ml-vision/lib/visionFaceDetectorOptions.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2016-present Invertase Limited & Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this library 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.
- *
- */
-
-import {
- hasOwnProperty,
- isNumber,
- isObject,
- isUndefined,
-} from '@react-native-firebase/app/lib/common';
-import VisionFaceDetectorClassificationMode from './VisionFaceDetectorClassificationMode';
-import VisionFaceDetectorContourMode from './VisionFaceDetectorContourMode';
-import VisionFaceDetectorLandmarkMode from './VisionFaceDetectorLandmarkMode';
-import VisionFaceDetectorPerformanceMode from './VisionFaceDetectorPerformanceMode';
-
-export default function visionFaceDetectorOptions(faceDetectorOptions) {
- const out = {
- classificationMode: VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS,
- contourMode: VisionFaceDetectorContourMode.NO_CONTOURS,
- landmarkMode: VisionFaceDetectorLandmarkMode.NO_LANDMARKS,
- minFaceSize: 0.1,
- performanceMode: VisionFaceDetectorPerformanceMode.FAST,
- };
-
- if (isUndefined(faceDetectorOptions)) {
- return out;
- }
-
- if (!isObject(faceDetectorOptions)) {
- throw new Error("'faceDetectorOptions' expected an object value.");
- }
-
- if (faceDetectorOptions.classificationMode) {
- if (
- faceDetectorOptions.classificationMode !==
- VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS &&
- faceDetectorOptions.classificationMode !==
- VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS
- ) {
- throw new Error(
- "'faceDetectorOptions.classificationMode' invalid classification mode. Expected VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS or VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS.",
- );
- }
-
- out.classificationMode = faceDetectorOptions.classificationMode;
- }
-
- if (faceDetectorOptions.contourMode) {
- if (
- faceDetectorOptions.contourMode !== VisionFaceDetectorContourMode.NO_CONTOURS &&
- faceDetectorOptions.contourMode !== VisionFaceDetectorContourMode.ALL_CONTOURS
- ) {
- throw new Error(
- "'faceDetectorOptions.contourMode' invalid contour mode. Expected VisionFaceDetectorContourMode.NO_CONTOURS or VisionFaceDetectorContourMode.ALL_CONTOURS.",
- );
- }
-
- out.contourMode = faceDetectorOptions.contourMode;
- }
-
- if (faceDetectorOptions.landmarkMode) {
- if (
- faceDetectorOptions.landmarkMode !== VisionFaceDetectorLandmarkMode.NO_LANDMARKS &&
- faceDetectorOptions.landmarkMode !== VisionFaceDetectorLandmarkMode.ALL_LANDMARKS
- ) {
- throw new Error(
- "'faceDetectorOptions.landmarkMode' invalid landmark mode. Expected VisionFaceDetectorLandmarkMode.NO_LANDMARKS or VisionFaceDetectorLandmarkMode.ALL_LANDMARKS.",
- );
- }
-
- out.landmarkMode = faceDetectorOptions.landmarkMode;
- }
-
- if (hasOwnProperty(faceDetectorOptions, 'minFaceSize')) {
- if (!isNumber(faceDetectorOptions.minFaceSize)) {
- throw new Error("'faceDetectorOptions.minFaceSize' expected a number value between 0 & 1.");
- }
-
- if (faceDetectorOptions.minFaceSize < 0 || faceDetectorOptions.minFaceSize > 1) {
- throw new Error("'faceDetectorOptions.minFaceSize' expected value to be between 0 & 1.");
- }
-
- out.minFaceSize = faceDetectorOptions.minFaceSize;
- }
-
- if (faceDetectorOptions.performanceMode) {
- if (
- faceDetectorOptions.performanceMode !== VisionFaceDetectorPerformanceMode.FAST &&
- faceDetectorOptions.performanceMode !== VisionFaceDetectorPerformanceMode.ACCURATE
- ) {
- throw new Error(
- "'faceDetectorOptions.performanceMode' invalid performance mode. Expected VisionFaceDetectorPerformanceMode.FAST or VisionFaceDetectorPerformanceMode.ACCURATE.",
- );
- }
-
- out.performanceMode = faceDetectorOptions.performanceMode;
- }
-
- return out;
-}
diff --git a/packages/ml-vision/lib/visionImageLabelerOptions.js b/packages/ml-vision/lib/visionImageLabelerOptions.js
deleted file mode 100644
index 27f5104eed..0000000000
--- a/packages/ml-vision/lib/visionImageLabelerOptions.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016-present Invertase Limited & Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this library 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.
- *
- */
-
-import {
- hasOwnProperty,
- isNumber,
- isObject,
- isUndefined,
-} from '@react-native-firebase/app/lib/common';
-
-export default function visionImageLabelerOptions(imageLabelerOptions) {
- const out = {
- confidenceThreshold: 0.5,
- };
-
- if (isUndefined(imageLabelerOptions)) {
- return out;
- }
-
- if (!isObject(imageLabelerOptions)) {
- throw new Error("'imageLabelerOptions' expected an object value.");
- }
-
- if (hasOwnProperty(imageLabelerOptions, 'confidenceThreshold')) {
- if (!isNumber(imageLabelerOptions.confidenceThreshold)) {
- throw new Error(
- "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1.",
- );
- }
-
- if (
- imageLabelerOptions.confidenceThreshold < 0 ||
- imageLabelerOptions.confidenceThreshold > 1
- ) {
- throw new Error(
- "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1.",
- );
- }
-
- out.confidenceThreshold = imageLabelerOptions.confidenceThreshold;
- }
-
- return out;
-}
diff --git a/packages/ml-vision/type-test.ts b/packages/ml-vision/type-test.ts
deleted file mode 100644
index c1c480303a..0000000000
--- a/packages/ml-vision/type-test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import firebase from '@react-native-firebase/app';
-import * as vision from '@react-native-firebase/ml-vision';
-
-console.log(vision.default().app);
-
-// checks module exists at root
-console.log(firebase.vision().app.name);
-
-// checks module exists at app level
-console.log(firebase.app().vision().app.name);
-
-// checks statics exist
-console.log(firebase.vision.SDK_VERSION);
-
-// checks statics exist on defaultExport
-console.log(firebase.SDK_VERSION);
-
-// checks root exists
-console.log(firebase.SDK_VERSION);
-
-// checks firebase named export exists on module
-console.log(vision.firebase.SDK_VERSION);
-
-// checks multi-app support exists
-console.log(firebase.vision(firebase.app()).app.name);
-
-// checks default export supports app arg
-console.log(firebase.vision(firebase.app('foo')).app.name);
-
-console.log(firebase.vision.VisionBarcodeFormat.ALL_FORMATS);
-console.log(vision.VisionBarcodeFormat);
-
-console.log(firebase.vision.VisionFaceContourType.ALL_POINTS);
-console.log(vision.VisionFaceContourType.ALL_POINTS);
-
-console.log(firebase.vision.VisionFaceLandmarkType.LEFT_CHEEK);
-console.log(vision.VisionFaceLandmarkType.LEFT_EAR);
-
-console.log(firebase.vision.VisionBarcodeValueType.CALENDAR_EVENT);
-// console.log(vision.VisionBarcodeValueType.);
-
-console.log(firebase.vision.VisionFaceDetectorContourMode.ALL_CONTOURS);
-console.log(vision.VisionFaceDetectorContourMode.ALL_CONTOURS);
-
-console.log(firebase.vision.VisionFaceDetectorLandmarkMode.ALL_LANDMARKS);
-console.log(vision.VisionFaceDetectorLandmarkMode.ALL_LANDMARKS);
-
-console.log(firebase.vision.VisionBarcodeWifiEncryptionType.WEP);
-// console.log(vision.VisionBarcodeWifiEncryptionType.WEP);
-
-console.log(firebase.vision.VisionFaceDetectorPerformanceMode.ACCURATE);
-console.log(vision.VisionFaceDetectorPerformanceMode.FAST);
-
-console.log(firebase.vision.VisionCloudTextRecognizerModelType.DENSE_MODEL);
-console.log(vision.VisionCloudTextRecognizerModelType.SPARSE_MODEL);
-
-console.log(firebase.vision.VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS);
-console.log(vision.VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS);
-
-console.log(firebase.vision.VisionDocumentTextRecognizedBreakType.EOL_SURE_SPACE);
-console.log(vision.VisionDocumentTextRecognizedBreakType.HYPHEN);
-
-console.log(firebase.vision.VisionCloudLandmarkRecognizerModelType.LATEST_MODEL);
-console.log(vision.VisionCloudLandmarkRecognizerModelType.STABLE_MODEL);
diff --git a/packages/ml-natural-language/.npmignore b/packages/ml/.npmignore
similarity index 100%
rename from packages/ml-natural-language/.npmignore
rename to packages/ml/.npmignore
diff --git a/packages/ml-vision/CHANGELOG.md b/packages/ml/CHANGELOG.md
similarity index 100%
rename from packages/ml-vision/CHANGELOG.md
rename to packages/ml/CHANGELOG.md
diff --git a/packages/ml-natural-language/LICENSE b/packages/ml/LICENSE
similarity index 100%
rename from packages/ml-natural-language/LICENSE
rename to packages/ml/LICENSE
diff --git a/packages/ml/README.md b/packages/ml/README.md
new file mode 100644
index 0000000000..a33e17c7c5
--- /dev/null
+++ b/packages/ml/README.md
@@ -0,0 +1,102 @@
+
+
+ 
+
+
React Native Firebase - ML
+
+
+
+ 
+ 
+ 
+ 
+ 
+
+
+
+ 
+ 
+ 
+
+
+---
+
+Firebase Machine Learning is a mobile SDK that brings Google's machine learning expertise to Android and iOS apps in a powerful yet easy-to-use package. Whether you're new or experienced in machine learning, you can implement the functionality you need in just a few lines of code. There's no need to have deep knowledge of neural networks or model optimization to get started. On the other hand, if you are an experienced ML developer, Firebase ML provides convenient APIs that help you use your custom TensorFlow Lite models in your mobile apps.
+
+## Cloud vs. on-device
+
+Firebase ML has APIs that work either in the in the cloud or on the device. When we describe an ML API as being a cloud API or on-device API, we are describing which machine performs inference: that is, which machine uses the ML model to discover insights about the data you provide it. In Firebase ML, this happens either on Google Cloud, or on your users' mobile devices.
+
+The text recognition, image labeling, and landmark recognition APIs perform inference in the cloud. These models have more computational power and memory available to them than a comparable on-device model, and as a result, can perform inference with greater accuracy and precision than an on-device model. On the other hand, every request to these APIs requires a network round-trip, which makes them unsuitable for real-time and low-latency applications such as video processing.
+
+The custom model APIs and AutoML Vision Edge deal with ML models that run on the device. The models used and produced by these features are TensorFlow Lite models, which are optimized to run on mobile devices. The biggest advantage to these models is that they don't require a network connection and can run very quickly—fast enough, for example, to process frames of video in real time.
+
+Firebase ML provides two key capabilities around on-device custom models:
+
+- Custom model deployment: Deploy custom models to your users' devices by uploading them to our servers. Your Firebase-enabled app will download the model to the device on demand. This allows you to keep your app's initial install size small, and you can swap the ML model without having to republish your app.
+
+- AutoML Vision Edge: This service helps you create your own on-device custom image classification models with an easy-to-use web interface. Then, you can seamlessly host the models you create with the service mentioned above.
+
+## ML Kit: Ready-to-use on-device models
+
+> On June 3, 2020, Google started offering ML Kit's on-device APIs through a [new standalone SDK](https://developers.google.com/ml-kit). Cloud APIs, AutoML Vision Edge, and custom model deployment will continue to be available through Firebase Machine Learning.
+
+If you're looking for pre-trained models that run on the device, check out [the new standalone ML Kit](https://developers.google.com/ml-kit). Use the new [react-native-mlkit modules](https://www.npmjs.com/org/react-native-mlkit)) for most on-device use cases:
+
+- Text recognition
+- Image labeling
+- Object detection and tracking
+- Face detection and contour tracing
+- Barcode scanning
+- Language identification
+- Translation
+- Smart Reply
+
+---
+
+This react-native-firebase module currently supports the following Firebase ML APIs:
+
+| API | Supported |
+| -------------------------------------------------------------------------------- | --------- |
+| [Text Recognition](https://firebase.google.com/docs/ml/recognize-text) | ✅ |
+| [Document Text Recognition](https://firebase.google.com/docs/ml/recognize-text)) | ✅ |
+| [Image Labeling](https://firebase.google.com/docs/ml/label-images) | ✅ |
+| [Landmark Recognition](https://firebase.google.com/docs/ml/recognize-landmarks) | ✅ |
+| [AutoML Vision Edge](https://firebase.google.com/docs/ml/automl-image-labeling) | ❌ |
+| [Custom Models](https://firebase.google.com/docs/ml/use-custom-models) | ❌ |
+
+[> Learn More](https://firebase.google.com/docs/ml)
+
+## Installation
+
+Requires `@react-native-firebase/app` to be installed.
+
+```bash
+yarn add @react-native-firebase/ml
+```
+
+## Documentation
+
+- [Quick Start](https://rnfirebase.io/ml/usage)
+- [Reference](https://rnfirebase.io/reference/ml)
+
+### Additional Topics
+
+- [Text Recognition](https://rnfirebase.io/ml/text-recognition)
+- [Landmark Recognition](https://rnfirebase.io/ml/landmark-recognition)
+- [Image Labeling](https://rnfirebase.io/ml/image-labeling)
+
+## License
+
+- See [LICENSE](/LICENSE)
+
+---
+
+
+ 
+
+ Built and maintained with 💛 by Invertase.
+
+
+
+---
diff --git a/packages/ml-vision/RNFBMLVision.podspec b/packages/ml/RNFBML.podspec
similarity index 73%
rename from packages/ml-vision/RNFBMLVision.podspec
rename to packages/ml/RNFBML.podspec
index 860c5f391e..693cb7715d 100644
--- a/packages/ml-vision/RNFBMLVision.podspec
+++ b/packages/ml/RNFBML.podspec
@@ -11,7 +11,7 @@ if coreVersionDetected != coreVersionRequired
end
Pod::Spec.new do |s|
- s.name = "RNFBMLVision"
+ s.name = "RNFBML"
s.version = package["version"]
s.description = package["description"]
s.summary = <<-DESC
@@ -36,18 +36,6 @@ Pod::Spec.new do |s|
# Firebase dependencies
s.dependency 'Firebase/MLVision', firebase_sdk_version
- if FirebaseJSON::Config.get_value_or_default('ml_vision_face_model', false)
- s.dependency 'Firebase/MLVisionFaceModel', firebase_sdk_version
- end
- if FirebaseJSON::Config.get_value_or_default('ml_vision_ocr_model', false)
- s.dependency 'Firebase/MLVisionTextModel', firebase_sdk_version
- end
- if FirebaseJSON::Config.get_value_or_default('ml_vision_barcode_model', false)
- s.dependency 'Firebase/MLVisionBarcodeModel', firebase_sdk_version
- end
- if FirebaseJSON::Config.get_value_or_default('ml_vision_image_label_model', false)
- s.dependency 'Firebase/MLVisionLabelModel', firebase_sdk_version
- end
if defined?($RNFirebaseAsStaticFramework)
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"
diff --git a/packages/ml-natural-language/android/.editorconfig b/packages/ml/android/.editorconfig
similarity index 100%
rename from packages/ml-natural-language/android/.editorconfig
rename to packages/ml/android/.editorconfig
diff --git a/packages/ml-vision/android/build.gradle b/packages/ml/android/build.gradle
similarity index 91%
rename from packages/ml-vision/android/build.gradle
rename to packages/ml/android/build.gradle
index 99ae046b8e..2db025b20e 100644
--- a/packages/ml-vision/android/build.gradle
+++ b/packages/ml/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
}
dependencies {
- classpath("com.android.tools.build:gradle:4.0.1")
+ classpath("com.android.tools.build:gradle:4.1.0")
}
}
}
@@ -92,11 +92,8 @@ dependencies {
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
implementation "com.google.firebase:firebase-ml-vision"
- // This is necessary to fix known dependency issues in the SDK
- // https://firebase.google.com/support/release-notes/android#bom_v25-8-0
implementation 'com.google.android.gms:play-services-vision:20.1.1'
implementation 'com.google.android.gms:play-services-vision-common:19.1.1'
- implementation 'com.google.firebase:firebase-ml-vision-image-label-model:20.0.2'
implementation 'com.google.android.gms:play-services-vision-face-contour-internal:16.0.3'
implementation 'com.google.android.gms:play-services-vision-image-labeling-internal:16.0.5'
implementation 'com.google.android.gms:play-services-vision-image-label:18.0.5'
@@ -104,8 +101,6 @@ dependencies {
implementation 'com.google.firebase:firebase-ml-model-interpreter:22.0.4'
}
-apply from: file("./ml-models.gradle")
-
ReactNative.shared.applyPackageVersion()
ReactNative.shared.applyDefaultExcludes()
ReactNative.module.applyAndroidVersions()
diff --git a/packages/ml-natural-language/android/lint.xml b/packages/ml/android/lint.xml
similarity index 100%
rename from packages/ml-natural-language/android/lint.xml
rename to packages/ml/android/lint.xml
diff --git a/packages/ml/android/settings.gradle b/packages/ml/android/settings.gradle
new file mode 100644
index 0000000000..21d0e6de75
--- /dev/null
+++ b/packages/ml/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = '@react-native-firebase_ml'
diff --git a/packages/ml/android/src/main/AndroidManifest.xml b/packages/ml/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..b7e0bbc379
--- /dev/null
+++ b/packages/ml/android/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java
similarity index 98%
rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java
rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java
index f3be9b1690..dbc2475dbe 100644
--- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java
+++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java
@@ -1,10 +1,10 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
import com.google.firebase.ml.common.FirebaseMLException;
import javax.annotation.Nullable;
-class UniversalFirebaseMLVisionCommon {
+class UniversalFirebaseMLCommon {
static final String KEY_BOUNDING_BOX = "boundingBox";
static final String KEY_TEXT = "text";
static final String KEY_CONFIDENCE = "confidence";
diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java
similarity index 96%
rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java
rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java
index 4139664db7..2ff78b56b5 100644
--- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java
+++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -35,10 +35,10 @@
import javax.annotation.Nullable;
import java.util.*;
-import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*;
+import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*;
-class UniversalFirebaseMLVisionDocumentTextRecognizerModule extends UniversalFirebaseModule {
- UniversalFirebaseMLVisionDocumentTextRecognizerModule(Context context, String serviceName) {
+class UniversalFirebaseMLDocumentTextRecognizerModule extends UniversalFirebaseModule {
+ UniversalFirebaseMLDocumentTextRecognizerModule(Context context, String serviceName) {
super(context, serviceName);
}
diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java
similarity index 79%
rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java
rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java
index 786ba9cc6c..7d41db3a4f 100644
--- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java
+++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -37,30 +37,13 @@
import java.util.List;
import java.util.Map;
-import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*;
+import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*;
-class UniversalFirebaseMLVisionImageLabelerModule extends UniversalFirebaseModule {
- UniversalFirebaseMLVisionImageLabelerModule(Context context, String serviceName) {
+class UniversalFirebaseMLImageLabelerModule extends UniversalFirebaseModule {
+ UniversalFirebaseMLImageLabelerModule(Context context, String serviceName) {
super(context, serviceName);
}
- Task>> imageLabelerProcessImage(String appName, String stringUri, Bundle imageLabelerOptions) {
- return Tasks.call(getExecutor(), () -> {
- FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
- FirebaseVisionOnDeviceImageLabelerOptions options = getOnDeviceImageLabelerOptions(imageLabelerOptions);
- FirebaseVisionImageLabeler visionImageLabeler = FirebaseVision.getInstance(firebaseApp)
- .getOnDeviceImageLabeler(options);
- FirebaseVisionImage image = FirebaseVisionImage.fromFilePath(
- getContext(),
- SharedUtils.getUri(stringUri)
- );
-
- return processLabelerList(
- Tasks.await(visionImageLabeler.processImage(image))
- );
- });
- }
-
Task>> cloudImageLabelerProcessImage(String appName, String stringUri, Bundle cloudImageLabelerOptions) {
return Tasks.call(getExecutor(), () -> {
FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java
similarity index 94%
rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java
rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java
index 6ec562271b..20fc33626b 100644
--- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java
+++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -37,10 +37,10 @@
import java.util.List;
import java.util.Map;
-import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*;
+import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*;
-class UniversalFirebaseMLVisionLandmarkRecognizerModule extends UniversalFirebaseModule {
- UniversalFirebaseMLVisionLandmarkRecognizerModule(Context context, String serviceName) {
+class UniversalFirebaseMLLandmarkRecognizerModule extends UniversalFirebaseModule {
+ UniversalFirebaseMLLandmarkRecognizerModule(Context context, String serviceName) {
super(context, serviceName);
}
diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java
similarity index 89%
rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java
rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java
index de16c5f550..8a84efe8f4 100644
--- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java
+++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -34,32 +34,13 @@
import java.util.*;
-import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*;
+import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*;
-class UniversalFirebaseMLVisionTextRecognizerModule extends UniversalFirebaseModule {
- UniversalFirebaseMLVisionTextRecognizerModule(Context context, String serviceName) {
+class UniversalFirebaseMLTextRecognizerModule extends UniversalFirebaseModule {
+ UniversalFirebaseMLTextRecognizerModule(Context context, String serviceName) {
super(context, serviceName);
}
- Task> textRecognizerProcessImage(
- String appName,
- String stringUri
- ) {
- return Tasks.call(getExecutor(), () -> {
- FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
- FirebaseVisionTextRecognizer detector = FirebaseVision.getInstance(firebaseApp)
- .getOnDeviceTextRecognizer();
-
- FirebaseVisionImage image = FirebaseVisionImage.fromFilePath(
- getContext(),
- SharedUtils.getUri(stringUri)
- );
-
- FirebaseVisionText result = Tasks.await(detector.processImage(image));
- return getFirebaseVisionTextMap(result);
- });
- }
-
Task> cloudTextRecognizerProcessImage(
String appName,
String stringUri,
diff --git a/packages/ml/android/src/reactnative/AndroidManifest.xml b/packages/ml/android/src/reactnative/AndroidManifest.xml
new file mode 100644
index 0000000000..d55b471c2c
--- /dev/null
+++ b/packages/ml/android/src/reactnative/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java
similarity index 71%
rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java
rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java
index b69ee5adbb..2bbfb583d0 100644
--- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java
+++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -20,13 +20,13 @@
import com.facebook.react.bridge.*;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
-public class RNFirebaseMLVisionDocumentTextRecognizerModule extends ReactNativeFirebaseModule {
- private static final String SERVICE_NAME = "MLVisionDocumentTextRecognizer";
- private final UniversalFirebaseMLVisionDocumentTextRecognizerModule module;
+public class RNFirebaseMLDocumentTextRecognizerModule extends ReactNativeFirebaseModule {
+ private static final String SERVICE_NAME = "MLDocumentTextRecognizer";
+ private final UniversalFirebaseMLDocumentTextRecognizerModule module;
- RNFirebaseMLVisionDocumentTextRecognizerModule(ReactApplicationContext reactContext) {
+ RNFirebaseMLDocumentTextRecognizerModule(ReactApplicationContext reactContext) {
super(reactContext, SERVICE_NAME);
- this.module = new UniversalFirebaseMLVisionDocumentTextRecognizerModule(reactContext, SERVICE_NAME);
+ this.module = new UniversalFirebaseMLDocumentTextRecognizerModule(reactContext, SERVICE_NAME);
}
@ReactMethod
@@ -41,7 +41,7 @@ public void cloudDocumentTextRecognizerProcessImage(
if (task.isSuccessful()) {
promise.resolve(Arguments.makeNativeMap(task.getResult()));
} else {
- String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException(
+ String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException(
task.getException());
rejectPromiseWithCodeAndMessage(
promise,
diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java
similarity index 54%
rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java
rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java
index cacba5626a..09733e56e7 100644
--- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java
+++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -20,23 +20,25 @@
import com.facebook.react.bridge.*;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
-public class RNFirebaseMLVisionBarcodeDetectorModule extends ReactNativeFirebaseModule {
- private static final String SERVICE_NAME = "MLVisionBarcodeDetector";
- private final UniversalFirebaseMLVisionBarcodeDetectorModule module;
+public class RNFirebaseMLImageLabelerModule extends ReactNativeFirebaseModule {
+ private static final String SERVICE_NAME = "MLImageLabeler";
+ private final UniversalFirebaseMLImageLabelerModule module;
- RNFirebaseMLVisionBarcodeDetectorModule(ReactApplicationContext reactContext) {
+ RNFirebaseMLImageLabelerModule(ReactApplicationContext reactContext) {
super(reactContext, SERVICE_NAME);
- this.module = new UniversalFirebaseMLVisionBarcodeDetectorModule(reactContext, SERVICE_NAME);
+ this.module = new UniversalFirebaseMLImageLabelerModule(reactContext, SERVICE_NAME);
}
@ReactMethod
- public void barcodeDetectorProcessImage(String appName, String stringUri, ReadableMap barcodeDetectorOptions, Promise promise) {
- module.barcodeDetectorProcessImage(appName, stringUri, Arguments.toBundle(barcodeDetectorOptions))
- .addOnCompleteListener(getExecutor(), task -> {
+ public void cloudImageLabelerProcessImage(String appName, String stringUri, ReadableMap cloudImageLabelerOptions, Promise promise) {
+ this.module.cloudImageLabelerProcessImage(appName, stringUri, Arguments.toBundle(cloudImageLabelerOptions))
+ .addOnCompleteListener(task -> {
if (task.isSuccessful()) {
- promise.resolve(Arguments.makeNativeArray(task.getResult()));
+ promise.resolve(
+ Arguments.makeNativeArray(task.getResult())
+ );
} else {
- String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException(
+ String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException(
task.getException());
rejectPromiseWithCodeAndMessage(
promise,
@@ -47,5 +49,4 @@ public void barcodeDetectorProcessImage(String appName, String stringUri, Readab
}
});
}
-
}
diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java
similarity index 72%
rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java
rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java
index 71e731c7db..37730a8788 100644
--- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java
+++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -20,13 +20,13 @@
import com.facebook.react.bridge.*;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
-public class RNFirebaseMLVisionLandmarkRecognizerModule extends ReactNativeFirebaseModule {
- private static final String SERVICE_NAME = "MLVisionLandmarkRecognizer";
- private UniversalFirebaseMLVisionLandmarkRecognizerModule module;
+public class RNFirebaseMLLandmarkRecognizerModule extends ReactNativeFirebaseModule {
+ private static final String SERVICE_NAME = "MLLandmarkRecognizer";
+ private UniversalFirebaseMLLandmarkRecognizerModule module;
- RNFirebaseMLVisionLandmarkRecognizerModule(ReactApplicationContext reactContext) {
+ RNFirebaseMLLandmarkRecognizerModule(ReactApplicationContext reactContext) {
super(reactContext, SERVICE_NAME);
- this.module = new UniversalFirebaseMLVisionLandmarkRecognizerModule(reactContext, SERVICE_NAME);
+ this.module = new UniversalFirebaseMLLandmarkRecognizerModule(reactContext, SERVICE_NAME);
}
@ReactMethod
@@ -38,7 +38,7 @@ public void cloudLandmarkRecognizerProcessImage(String appName, String stringUri
Arguments.makeNativeArray(task.getResult())
);
} else {
- String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException(
+ String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException(
task.getException());
rejectPromiseWithCodeAndMessage(
promise,
diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java
similarity index 59%
rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java
rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java
index e2bafafa8d..11231a32dc 100644
--- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java
+++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.vision;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -20,30 +20,28 @@
import com.facebook.react.bridge.*;
import io.invertase.firebase.common.ReactNativeFirebaseModule;
-public class RNFirebaseMLVisionFaceDetectorModule extends ReactNativeFirebaseModule {
- private static final String SERVICE_NAME = "MLVisionFaceDetector";
- private final UniversalFirebaseMLVisionFaceDetectorModule module;
+public class RNFirebaseMLTextRecognizerModule extends ReactNativeFirebaseModule {
+ private static final String SERVICE_NAME = "MLTextRecognizer";
+ private final UniversalFirebaseMLTextRecognizerModule module;
- RNFirebaseMLVisionFaceDetectorModule(ReactApplicationContext reactContext) {
+ RNFirebaseMLTextRecognizerModule(ReactApplicationContext reactContext) {
super(reactContext, SERVICE_NAME);
- this.module = new UniversalFirebaseMLVisionFaceDetectorModule(reactContext, SERVICE_NAME);
+ this.module = new UniversalFirebaseMLTextRecognizerModule(reactContext, SERVICE_NAME);
}
@ReactMethod
- public void faceDetectorProcessImage(
+ public void cloudTextRecognizerProcessImage(
String appName,
String stringUri,
- ReadableMap faceDetectorOptionsMap,
+ ReadableMap cloudTextRecognizerOptions,
Promise promise
) {
- module.faceDetectorProcessImage(appName, stringUri, Arguments.toBundle(faceDetectorOptionsMap))
+ module.cloudTextRecognizerProcessImage(appName, stringUri, Arguments.toBundle(cloudTextRecognizerOptions))
.addOnCompleteListener(getExecutor(), task -> {
if (task.isSuccessful()) {
- promise.resolve(
- Arguments.makeNativeArray(task.getResult())
- );
+ promise.resolve(Arguments.makeNativeMap(task.getResult()));
} else {
- String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException(
+ String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException(
task.getException());
rejectPromiseWithCodeAndMessage(
promise,
@@ -54,5 +52,4 @@ public void faceDetectorProcessImage(
}
});
}
-
}
diff --git a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java
similarity index 63%
rename from packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java
rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java
index 4b2359d60a..268b8618c1 100644
--- a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java
+++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java
@@ -1,4 +1,4 @@
-package io.invertase.firebase.ml.naturallanguage;
+package io.invertase.firebase.ml;
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
@@ -21,40 +21,23 @@
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.uimanager.ViewManager;
+import io.invertase.firebase.common.ReactNativeFirebaseJSON;
+import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nonnull;
-
-import io.invertase.firebase.common.ReactNativeFirebaseJSON;
-
@SuppressWarnings("unused")
-public class ReactNativeFirebaseMLNaturalLanguagePackage implements ReactPackage {
+public class ReactNativeFirebaseMLPackage implements ReactPackage {
@Nonnull
@Override
public List createNativeModules(@Nonnull ReactApplicationContext reactContext) {
List modules = new ArrayList<>();
-
- if (ReactNativeFirebaseJSON
- .getSharedInstance()
- .getBooleanValue("ml_natural_language_language_id_model", false)) {
- modules.add(new RNFirebaseMLNaturalLanguageIdModule(reactContext));
- }
-
- if (ReactNativeFirebaseJSON
- .getSharedInstance()
- .getBooleanValue("ml_natural_language_translate_model", false)) {
- modules.add(new RNFirebaseMLNaturalLanguageTranslateModule(reactContext));
- }
-
- if (ReactNativeFirebaseJSON
- .getSharedInstance()
- .getBooleanValue("ml_natural_language_smart_reply_model", false)) {
- modules.add(new RNFirebaseMLNaturalLanguageSmartReplyModule(reactContext));
- }
-
+ modules.add(new RNFirebaseMLTextRecognizerModule(reactContext));
+ modules.add(new RNFirebaseMLLandmarkRecognizerModule(reactContext));
+ modules.add(new RNFirebaseMLDocumentTextRecognizerModule(reactContext));
+ modules.add(new RNFirebaseMLImageLabelerModule(reactContext));
return modules;
}
diff --git a/packages/ml-vision/e2e/documentText.e2e.js b/packages/ml/e2e/documentText.e2e.js
similarity index 83%
rename from packages/ml-vision/e2e/documentText.e2e.js
rename to packages/ml/e2e/documentText.e2e.js
index 4be8f13122..be1bc4d28d 100644
--- a/packages/ml-vision/e2e/documentText.e2e.js
+++ b/packages/ml/e2e/documentText.e2e.js
@@ -42,7 +42,7 @@ function documentTextBaseElementValidate(documentTextBase) {
let testImageFile;
-describe('mlkit.vision.document.text', () => {
+describe('ml.document.text', () => {
before(async () => {
testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/text.png`;
await firebase
@@ -51,10 +51,10 @@ describe('mlkit.vision.document.text', () => {
.writeToFile(testImageFile);
});
- describe('VisionCloudDocumentTextRecognizerOptions', () => {
+ describe('MLCloudDocumentTextRecognizerOptions', () => {
it('throws if not an object', async () => {
try {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, 'foo');
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, 'foo');
return Promise.reject(new Error('Did not throw Error.'));
} catch (e) {
e.message.should.containEql(
@@ -66,7 +66,7 @@ describe('mlkit.vision.document.text', () => {
it('throws if enforceCertFingerprintMatch is not a boolean', async () => {
try {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
enforceCertFingerprintMatch: 'true',
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -79,14 +79,14 @@ describe('mlkit.vision.document.text', () => {
});
it('sets enforceCertFingerprintMatch', async () => {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
enforceCertFingerprintMatch: false,
});
});
it('throws if apiKeyOverride is not a string', async () => {
try {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
apiKeyOverride: true,
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -100,7 +100,7 @@ describe('mlkit.vision.document.text', () => {
it('throws if languageHints is not an array', async () => {
try {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
languageHints: 'en',
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -114,7 +114,7 @@ describe('mlkit.vision.document.text', () => {
it('throws if languageHints is empty array', async () => {
try {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
languageHints: [],
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -128,7 +128,7 @@ describe('mlkit.vision.document.text', () => {
it('throws if languageHints contains non-string', async () => {
try {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
languageHints: [123],
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -141,7 +141,7 @@ describe('mlkit.vision.document.text', () => {
});
it('sets hinted languages', async () => {
- await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, {
languageHints: ['fr'],
});
});
@@ -150,7 +150,7 @@ describe('mlkit.vision.document.text', () => {
describe('cloudDocumentTextRecognizerProcessImage()', () => {
it('should throw if image path is not a string', () => {
try {
- firebase.vision().cloudDocumentTextRecognizerProcessImage(123);
+ firebase.ml().cloudDocumentTextRecognizerProcessImage(123);
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql("'localImageFilePath' expected a string local file path");
@@ -158,8 +158,8 @@ describe('mlkit.vision.document.text', () => {
}
});
- it('should return a VisionDocumentText representation for an image', async () => {
- const res = await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile);
+ it('should return a MLDocumentText representation for an image', async () => {
+ const res = await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile);
res.text.should.be.a.String();
res.blocks.should.be.an.Array();
diff --git a/packages/ml-vision/e2e/label.e2e.js b/packages/ml/e2e/label.e2e.js
similarity index 51%
rename from packages/ml-vision/e2e/label.e2e.js
rename to packages/ml/e2e/label.e2e.js
index d305c41f1f..7b7c39ccb9 100644
--- a/packages/ml-vision/e2e/label.e2e.js
+++ b/packages/ml/e2e/label.e2e.js
@@ -17,7 +17,7 @@
let testImageFile;
-describe('mlkit.vision.label', () => {
+describe('ml.label', () => {
before(async () => {
testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/crab.jpg`;
await firebase
@@ -26,35 +26,10 @@ describe('mlkit.vision.label', () => {
.writeToFile(testImageFile);
});
- describe('imageLabelerProcessImage()', () => {
- it('should throw if image path is not a string', () => {
- try {
- firebase.vision().imageLabelerProcessImage(123);
- return Promise.reject(new Error('Did not throw an Error.'));
- } catch (error) {
- error.message.should.containEql("'localImageFilePath' expected a string local file path");
- return Promise.resolve();
- }
- });
-
- it('should return a local label array', async () => {
- const res = await firebase.vision().imageLabelerProcessImage(testImageFile);
-
- res.should.be.Array();
- res.length.should.be.greaterThan(0);
-
- res.forEach(i => {
- i.text.should.be.String();
- i.entityId.should.be.String();
- i.confidence.should.be.Number();
- });
- });
- });
-
describe('cloudImageLabelerProcessImage()', () => {
it('should throw if image path is not a string', () => {
try {
- firebase.vision().cloudImageLabelerProcessImage(123);
+ firebase.ml().cloudImageLabelerProcessImage(123);
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql("'localImageFilePath' expected a string local file path");
@@ -62,65 +37,8 @@ describe('mlkit.vision.label', () => {
}
});
- it('should return a cloud label array', async () => {
- const res = await firebase.vision().cloudImageLabelerProcessImage(testImageFile);
-
- res.should.be.Array();
- res.length.should.be.greaterThan(0);
-
- res.forEach(i => {
- i.text.should.be.String();
- i.entityId.should.be.String();
- i.confidence.should.be.Number();
- });
- });
- });
-
- describe('VisionImageLabelerOptions', () => {
- it('throws if not an object', async () => {
- try {
- await firebase.vision().imageLabelerProcessImage(testImageFile, '123');
- return Promise.reject(new Error('Did not throw an Error.'));
- } catch (error) {
- error.message.should.containEql("'imageLabelerOptions' expected an object value");
- return Promise.resolve();
- }
- });
-
- describe('confidenceThreshold', () => {
- it('should throw if confidence threshold is not a number', async () => {
- try {
- await firebase.vision().imageLabelerProcessImage(testImageFile, {
- confidenceThreshold: '0.5',
- });
- return Promise.reject(new Error('Did not throw an Error.'));
- } catch (error) {
- error.message.should.containEql(
- "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1",
- );
- return Promise.resolve();
- }
- });
- });
-
- it('should throw if confidence threshold is not between 0 & 1', async () => {
- try {
- await firebase.vision().imageLabelerProcessImage(testImageFile, {
- confidenceThreshold: -0.2,
- });
- return Promise.reject(new Error('Did not throw an Error.'));
- } catch (error) {
- error.message.should.containEql(
- "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1",
- );
- return Promise.resolve();
- }
- });
-
- it('should accept options and return local labels', async () => {
- const res = await firebase.vision().imageLabelerProcessImage(testImageFile, {
- confidenceThreshold: 0.8,
- });
+ xit('should return a cloud label array', async () => {
+ const res = await firebase.ml().cloudImageLabelerProcessImage(testImageFile);
res.should.be.Array();
res.length.should.be.greaterThan(0);
@@ -133,10 +51,10 @@ describe('mlkit.vision.label', () => {
});
});
- describe('VisionCloudImageLabelerOptions', () => {
+ describe('MLCloudImageLabelerOptions', () => {
it('throws if not an object', async () => {
try {
- await firebase.vision().cloudImageLabelerProcessImage(testImageFile, '123');
+ await firebase.ml().cloudImageLabelerProcessImage(testImageFile, '123');
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql("'cloudImageLabelerOptions' expected an object value");
@@ -147,7 +65,7 @@ describe('mlkit.vision.label', () => {
describe('confidenceThreshold', () => {
it('should throw if confidence threshold is not a number', async () => {
try {
- await firebase.vision().cloudImageLabelerProcessImage(testImageFile, {
+ await firebase.ml().cloudImageLabelerProcessImage(testImageFile, {
confidenceThreshold: '0.2',
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -161,7 +79,7 @@ describe('mlkit.vision.label', () => {
it('should throw if confidence threshold is not between 0 & 1', async () => {
try {
- await firebase.vision().cloudImageLabelerProcessImage(testImageFile, {
+ await firebase.ml().cloudImageLabelerProcessImage(testImageFile, {
confidenceThreshold: 1.1,
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -173,8 +91,8 @@ describe('mlkit.vision.label', () => {
}
});
- it('should accept options and return cloud labels', async () => {
- const res = await firebase.vision().cloudImageLabelerProcessImage(testImageFile, {
+ xit('should accept options and return cloud labels', async () => {
+ const res = await firebase.ml().cloudImageLabelerProcessImage(testImageFile, {
confidenceThreshold: 0.8,
});
@@ -192,7 +110,7 @@ describe('mlkit.vision.label', () => {
describe('enforceCertFingerprintMatch', () => {
it('throws if not a boolean', async () => {
try {
- await firebase.vision().cloudImageLabelerProcessImage(testImageFile, {
+ await firebase.ml().cloudImageLabelerProcessImage(testImageFile, {
enforceCertFingerprintMatch: 'true',
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -204,17 +122,17 @@ describe('mlkit.vision.label', () => {
}
});
- it('sets enforceCertFingerprintMatch', async () => {
- await firebase.vision().cloudImageLabelerProcessImage(testImageFile, {
+ xit('sets enforceCertFingerprintMatch', async () => {
+ await firebase.ml().cloudImageLabelerProcessImage(testImageFile, {
enforceCertFingerprintMatch: false,
});
});
});
- describe('apiKeyOverride', () => {
+ xdescribe('apiKeyOverride', () => {
it('throws if apiKeyOverride is not a string', async () => {
try {
- await firebase.vision().cloudImageLabelerProcessImage(testImageFile, {
+ await firebase.ml().cloudImageLabelerProcessImage(testImageFile, {
apiKeyOverride: true,
});
return Promise.reject(new Error('Did not throw Error.'));
diff --git a/packages/ml-vision/e2e/landmark.e2e.js b/packages/ml/e2e/landmark.e2e.js
similarity index 71%
rename from packages/ml-vision/e2e/landmark.e2e.js
rename to packages/ml/e2e/landmark.e2e.js
index fbe6b94301..1d053c7f60 100644
--- a/packages/ml-vision/e2e/landmark.e2e.js
+++ b/packages/ml/e2e/landmark.e2e.js
@@ -16,7 +16,7 @@
*/
let testImageFile;
-describe('mlkit.vision.landmark', () => {
+describe('ml.landmark', () => {
before(async () => {
testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/landmark.jpg`;
await firebase
@@ -28,7 +28,7 @@ describe('mlkit.vision.landmark', () => {
describe('cloudLandmarkRecognizerProcessImage()', () => {
it('should throw if image path is not a string', () => {
try {
- firebase.vision().cloudLandmarkRecognizerProcessImage(123);
+ firebase.ml().cloudLandmarkRecognizerProcessImage(123);
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql("'localImageFilePath' expected a string local file path");
@@ -36,8 +36,8 @@ describe('mlkit.vision.landmark', () => {
}
});
- it('should return an array of landmark information', async () => {
- const res = await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile);
+ xit('should return an array of landmark information', async () => {
+ const res = await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile);
res.should.be.Array();
res.length.should.be.greaterThan(0);
@@ -59,10 +59,10 @@ describe('mlkit.vision.landmark', () => {
});
});
- describe('VisionCloudLandmarkRecognizerOptions', () => {
+ describe('MLCloudLandmarkRecognizerOptions', () => {
it('throws if not an object', async () => {
try {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, '123');
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, '123');
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql(
@@ -75,7 +75,7 @@ describe('mlkit.vision.landmark', () => {
describe('cloudLandmarkRecognizerOptions', () => {
it('throws if not a boolean', async () => {
try {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
enforceCertFingerprintMatch: 'false',
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -87,15 +87,15 @@ describe('mlkit.vision.landmark', () => {
}
});
- it('sets cloudLandmarkRecognizerOptions', async () => {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ xit('sets cloudLandmarkRecognizerOptions', async () => {
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
enforceCertFingerprintMatch: false,
});
});
it('throws if apiKeyOverride is not a string', async () => {
try {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
apiKeyOverride: true,
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -108,10 +108,10 @@ describe('mlkit.vision.landmark', () => {
});
});
// TODO temporarily disable test suite - is flakey on CI - needs investigating
- xdescribe('maxResults', () => {
+ describe('maxResults', () => {
it('throws if maxResults is not a number', async () => {
try {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
maxResults: '2',
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -123,8 +123,8 @@ describe('mlkit.vision.landmark', () => {
}
});
- it('limits the maximum results', async () => {
- const res = await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ xit('limits the maximum results', async () => {
+ const res = await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
maxResults: 3,
});
@@ -138,7 +138,7 @@ describe('mlkit.vision.landmark', () => {
describe('modelType', () => {
it('throws if model is invalid', async () => {
try {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
modelType: 3,
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -150,19 +150,19 @@ describe('mlkit.vision.landmark', () => {
}
});
- it('sets modelType', async () => {
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
- modelType: firebase.vision.VisionCloudLandmarkRecognizerModelType.STABLE_MODEL,
+ xit('sets modelType', async () => {
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ modelType: firebase.ml.MLCloudLandmarkRecognizerModelType.STABLE_MODEL,
});
- await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
- modelType: firebase.vision.VisionCloudLandmarkRecognizerModelType.LATEST_MODEL,
+ await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ modelType: firebase.ml.MLCloudLandmarkRecognizerModelType.LATEST_MODEL,
});
});
- it('uses a latest model', async () => {
- const res = await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, {
- modelType: firebase.vision.VisionCloudLandmarkRecognizerModelType.LATEST_MODEL,
+ xit('uses a latest model', async () => {
+ const res = await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, {
+ modelType: firebase.ml.MLCloudLandmarkRecognizerModelType.LATEST_MODEL,
});
res.should.be.Array();
});
diff --git a/packages/ml-vision/e2e/mlKitVision.e2e.js b/packages/ml/e2e/ml.e2e.js
similarity index 75%
rename from packages/ml-vision/e2e/mlKitVision.e2e.js
rename to packages/ml/e2e/ml.e2e.js
index ca938d3935..5f19eee1a6 100644
--- a/packages/ml-vision/e2e/mlKitVision.e2e.js
+++ b/packages/ml/e2e/ml.e2e.js
@@ -15,24 +15,22 @@
*
*/
-describe('vision()', () => {
+describe('ml()', () => {
describe('namespace', () => {
it('accessible from firebase.app()', () => {
const app = firebase.app();
- should.exist(app.vision);
- app.vision().app.should.equal(app);
+ should.exist(app.ml);
+ app.ml().app.should.equal(app);
});
it('supports multiple apps', async () => {
- firebase.vision().app.name.should.equal('[DEFAULT]');
+ firebase.ml().app.name.should.equal('[DEFAULT]');
- firebase
- .vision(firebase.app('secondaryFromNative'))
- .app.name.should.equal('secondaryFromNative');
+ firebase.ml(firebase.app('secondaryFromNative')).app.name.should.equal('secondaryFromNative');
firebase
.app('secondaryFromNative')
- .vision()
+ .ml()
.app.name.should.equal('secondaryFromNative');
});
});
diff --git a/packages/ml-vision/e2e/text.e2e.js b/packages/ml/e2e/text.e2e.js
similarity index 71%
rename from packages/ml-vision/e2e/text.e2e.js
rename to packages/ml/e2e/text.e2e.js
index 13c9da73ff..73ddd02864 100644
--- a/packages/ml-vision/e2e/text.e2e.js
+++ b/packages/ml/e2e/text.e2e.js
@@ -69,8 +69,7 @@ function textBaseElementValidate(textBase, cloud = false) {
let testImageFile;
-// TODO allow android testing once ML model download manager support implemented
-ios.describe('mlkit.vision.text', () => {
+describe('ml.text', () => {
before(async () => {
testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/text.png`;
await firebase
@@ -79,43 +78,10 @@ ios.describe('mlkit.vision.text', () => {
.writeToFile(testImageFile);
});
- describe('textRecognizerProcessImage()', () => {
- it('should throw if image path is not a string', () => {
- try {
- firebase.vision().textRecognizerProcessImage(123);
- return Promise.reject(new Error('Did not throw an Error.'));
- } catch (error) {
- error.message.should.containEql("'localImageFilePath' expected a string local file path");
- return Promise.resolve();
- }
- });
-
- it('should return a VisionText representation for an image', async () => {
- const res = await firebase.vision().textRecognizerProcessImage(testImageFile);
- res.text.should.be.a.String();
- res.blocks.should.be.an.Array();
- res.blocks.length.should.be.greaterThan(0);
-
- res.blocks.forEach(textBlock => {
- textBaseElementValidate(textBlock);
- textBlock.lines.should.be.an.Array();
- textBlock.lines.length.should.be.greaterThan(0);
- textBlock.lines.forEach(line => {
- textBaseElementValidate(line);
- line.elements.should.be.an.Array();
- line.elements.length.should.be.greaterThan(0);
- line.elements.forEach(element => {
- textBaseElementValidate(element);
- });
- });
- });
- });
- });
-
- describe('VisionCloudTextRecognizerOptions', () => {
+ describe('MLCloudTextRecognizerOptions', () => {
it('throws if not an object', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, '123');
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, '123');
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql("'cloudTextRecognizerOptions' expected an object value");
@@ -126,7 +92,7 @@ ios.describe('mlkit.vision.text', () => {
describe('enforceCertFingerprintMatch', () => {
it('throws if not a boolean', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
enforceCertFingerprintMatch: 'false',
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -139,7 +105,7 @@ ios.describe('mlkit.vision.text', () => {
});
it('sets a value', async () => {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
enforceCertFingerprintMatch: false,
});
});
@@ -148,7 +114,7 @@ ios.describe('mlkit.vision.text', () => {
describe('apiKeyOverride', () => {
it('throws if apiKeyOverride is not a string', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
apiKeyOverride: true,
});
return Promise.reject(new Error('Did not throw Error.'));
@@ -164,7 +130,7 @@ ios.describe('mlkit.vision.text', () => {
describe('languageHints', () => {
it('throws if not array', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
languageHints: 'en',
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -178,7 +144,7 @@ ios.describe('mlkit.vision.text', () => {
it('throws if empty array', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
languageHints: [],
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -192,7 +158,7 @@ ios.describe('mlkit.vision.text', () => {
it('throws if array contains non-string values', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
languageHints: [123],
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -205,7 +171,7 @@ ios.describe('mlkit.vision.text', () => {
});
it('sets hintedLanguages', async () => {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
languageHints: ['fr'],
});
});
@@ -214,7 +180,7 @@ ios.describe('mlkit.vision.text', () => {
describe('modelType', () => {
it('throws if invalid type', async () => {
try {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
modelType: 7,
});
return Promise.reject(new Error('Did not throw an Error.'));
@@ -225,12 +191,8 @@ ios.describe('mlkit.vision.text', () => {
});
it('sets modelType', async () => {
- await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, {
- modelType: firebase.vision.VisionCloudTextRecognizerModelType.SPARSE_MODEL,
- });
-
- await firebase.vision().textRecognizerProcessImage(testImageFile, {
- modelType: firebase.vision.VisionCloudTextRecognizerModelType.DENSE_MODEL,
+ await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, {
+ modelType: firebase.ml.MLCloudTextRecognizerModelType.SPARSE_MODEL,
});
});
});
@@ -239,7 +201,7 @@ ios.describe('mlkit.vision.text', () => {
describe('cloudTextRecognizerProcessImage()', () => {
it('should throw if image path is not a string', () => {
try {
- firebase.vision().cloudTextRecognizerProcessImage(123);
+ firebase.ml().cloudTextRecognizerProcessImage(123);
return Promise.reject(new Error('Did not throw an Error.'));
} catch (error) {
error.message.should.containEql("'localImageFilePath' expected a string local file path");
@@ -248,7 +210,7 @@ ios.describe('mlkit.vision.text', () => {
});
it('should return a VisionText representation for an image', async () => {
- const res = await firebase.vision().cloudTextRecognizerProcessImage(testImageFile);
+ const res = await firebase.ml().cloudTextRecognizerProcessImage(testImageFile);
res.text.should.be.a.String();
res.blocks.should.be.an.Array();
res.blocks.length.should.be.greaterThan(0);
diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.pbxproj b/packages/ml/ios/RNFBML.xcodeproj/project.pbxproj
similarity index 66%
rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.pbxproj
rename to packages/ml/ios/RNFBML.xcodeproj/project.pbxproj
index f99e91f0d0..ab76410fa2 100644
--- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.pbxproj
+++ b/packages/ml/ios/RNFBML.xcodeproj/project.pbxproj
@@ -7,11 +7,11 @@
objects = {
/* Begin PBXBuildFile section */
- 27038A8322A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 27038A8222A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m */; };
- 2744B98621F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 2744B98521F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m */; };
- 27760EA1229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 27760EA0229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m */; };
- 27760EA4229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 27760EA3229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m */; };
- 27760EA722A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 27760EA622A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m */; };
+ 8B06D3F322F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3F222F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m */; };
+ 8B06D3FC22F863AE00A5B542 /* RNFBMLCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3FB22F863AE00A5B542 /* RNFBMLCommon.m */; };
+ 8B06D40622F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40522F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m */; };
+ 8B06D40A22F989EF00A5B542 /* RNFBMLTextRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40922F989EF00A5B542 /* RNFBMLTextRecognizerModule.m */; };
+ 8B06D40E22F99DF900A5B542 /* RNFBMLImageLabelerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40D22F99DF900A5B542 /* RNFBMLImageLabelerModule.m */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -27,17 +27,17 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 27038A8122A16C31001E082B /* RCTConvert+FIRLanguageIdentificationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+FIRLanguageIdentificationOptions.h"; sourceTree = ""; };
- 27038A8222A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+FIRLanguageIdentificationOptions.m"; sourceTree = ""; };
- 2744B98221F45429004F8E3F /* libRNFBMLNaturalLanguage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFBMLNaturalLanguage.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 2744B98421F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBMLNaturalLanguageIdModule.h; path = RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h; sourceTree = SOURCE_ROOT; };
- 2744B98521F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFBMLNaturalLanguageIdModule.m; path = RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.m; sourceTree = SOURCE_ROOT; };
- 27760E9F229ED5B400F5F127 /* RNFBMLNaturalLanguageTranslateModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLNaturalLanguageTranslateModule.h; sourceTree = ""; };
- 27760EA0229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLNaturalLanguageTranslateModule.m; sourceTree = ""; };
- 27760EA2229ED5F600F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLNaturalLanguageSmartReplyModule.h; sourceTree = ""; };
- 27760EA3229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLNaturalLanguageSmartReplyModule.m; sourceTree = ""; };
- 27760EA522A0064100F5F127 /* RCTConvert+FIRTextMessageArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "RCTConvert+FIRTextMessageArray.h"; path = "RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.h"; sourceTree = SOURCE_ROOT; };
- 27760EA622A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+FIRTextMessageArray.m"; sourceTree = ""; };
+ 2744B98221F45429004F8E3F /* libRNFBML.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFBML.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 8B06D3F122F84F6500A5B542 /* RNFBMLLandmarkRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLLandmarkRecognizerModule.h; sourceTree = ""; };
+ 8B06D3F222F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLLandmarkRecognizerModule.m; sourceTree = ""; };
+ 8B06D3FA22F863A400A5B542 /* RNFBMLCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLCommon.h; sourceTree = ""; };
+ 8B06D3FB22F863AE00A5B542 /* RNFBMLCommon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLCommon.m; sourceTree = ""; };
+ 8B06D40422F97B3600A5B542 /* RNFBMLDocumentTextRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLDocumentTextRecognizerModule.h; sourceTree = ""; };
+ 8B06D40522F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLDocumentTextRecognizerModule.m; sourceTree = ""; };
+ 8B06D40822F989E400A5B542 /* RNFBMLTextRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLTextRecognizerModule.h; sourceTree = ""; };
+ 8B06D40922F989EF00A5B542 /* RNFBMLTextRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLTextRecognizerModule.m; sourceTree = ""; };
+ 8B06D40C22F99DEF00A5B542 /* RNFBMLImageLabelerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLImageLabelerModule.h; sourceTree = ""; };
+ 8B06D40D22F99DF900A5B542 /* RNFBMLImageLabelerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLImageLabelerModule.m; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -54,32 +54,32 @@
2744B97521F452B8004F8E3F /* Products */ = {
isa = PBXGroup;
children = (
- 2744B98221F45429004F8E3F /* libRNFBMLNaturalLanguage.a */,
+ 2744B98221F45429004F8E3F /* libRNFBML.a */,
);
name = Products;
sourceTree = "";
};
- 2744B98321F45429004F8E3F /* RNFBMLNaturalLanguage */ = {
+ 2744B98321F45429004F8E3F /* RNFBML */ = {
isa = PBXGroup;
children = (
- 27760EA522A0064100F5F127 /* RCTConvert+FIRTextMessageArray.h */,
- 27760EA622A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m */,
- 2744B98421F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.h */,
- 2744B98521F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m */,
- 27760E9F229ED5B400F5F127 /* RNFBMLNaturalLanguageTranslateModule.h */,
- 27760EA0229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m */,
- 27760EA2229ED5F600F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.h */,
- 27760EA3229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m */,
- 27038A8122A16C31001E082B /* RCTConvert+FIRLanguageIdentificationOptions.h */,
- 27038A8222A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m */,
+ 8B06D3F122F84F6500A5B542 /* RNFBMLLandmarkRecognizerModule.h */,
+ 8B06D3F222F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m */,
+ 8B06D3FA22F863A400A5B542 /* RNFBMLCommon.h */,
+ 8B06D3FB22F863AE00A5B542 /* RNFBMLCommon.m */,
+ 8B06D40422F97B3600A5B542 /* RNFBMLDocumentTextRecognizerModule.h */,
+ 8B06D40522F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m */,
+ 8B06D40822F989E400A5B542 /* RNFBMLTextRecognizerModule.h */,
+ 8B06D40922F989EF00A5B542 /* RNFBMLTextRecognizerModule.m */,
+ 8B06D40C22F99DEF00A5B542 /* RNFBMLImageLabelerModule.h */,
+ 8B06D40D22F99DF900A5B542 /* RNFBMLImageLabelerModule.m */,
);
- path = RNFBMLNaturalLanguage;
+ path = RNFBML;
sourceTree = "";
};
3323F52AAFE26B7384BE4DE3 = {
isa = PBXGroup;
children = (
- 2744B98321F45429004F8E3F /* RNFBMLNaturalLanguage */,
+ 2744B98321F45429004F8E3F /* RNFBML */,
2744B97521F452B8004F8E3F /* Products */,
);
sourceTree = "";
@@ -87,9 +87,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 2744B98121F45429004F8E3F /* RNFBMLNaturalLanguage */ = {
+ 2744B98121F45429004F8E3F /* RNFBML */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBMLNaturalLanguage" */;
+ buildConfigurationList = 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBML" */;
buildPhases = (
2744B97E21F45429004F8E3F /* Sources */,
2744B97F21F45429004F8E3F /* Frameworks */,
@@ -99,9 +99,9 @@
);
dependencies = (
);
- name = RNFBMLNaturalLanguage;
- productName = RNFBMLNaturalLanguage;
- productReference = 2744B98221F45429004F8E3F /* libRNFBMLNaturalLanguage.a */;
+ name = RNFBML;
+ productName = RNFBML;
+ productReference = 2744B98221F45429004F8E3F /* libRNFBML.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
@@ -110,7 +110,7 @@
3323F95273A95DB34F55C6D7 /* Project object */ = {
isa = PBXProject;
attributes = {
- CLASSPREFIX = RNFBMLNaturalLanguage;
+ CLASSPREFIX = RNFBML;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = Invertase;
TargetAttributes = {
@@ -120,11 +120,12 @@
};
};
};
- buildConfigurationList = 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBMLNaturalLanguage" */;
+ buildConfigurationList = 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBML" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
+ English,
en,
);
mainGroup = 3323F52AAFE26B7384BE4DE3;
@@ -132,7 +133,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
- 2744B98121F45429004F8E3F /* RNFBMLNaturalLanguage */,
+ 2744B98121F45429004F8E3F /* RNFBML */,
);
};
/* End PBXProject section */
@@ -142,11 +143,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 27760EA4229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m in Sources */,
- 2744B98621F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m in Sources */,
- 27038A8322A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m in Sources */,
- 27760EA722A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m in Sources */,
- 27760EA1229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m in Sources */,
+ 8B06D40E22F99DF900A5B542 /* RNFBMLImageLabelerModule.m in Sources */,
+ 8B06D40622F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m in Sources */,
+ 8B06D40A22F989EF00A5B542 /* RNFBMLTextRecognizerModule.m in Sources */,
+ 8B06D3F322F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m in Sources */,
+ 8B06D3FC22F863AE00A5B542 /* RNFBMLCommon.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -347,7 +348,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBMLNaturalLanguage" */ = {
+ 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBML" */ = {
isa = XCConfigurationList;
buildConfigurations = (
2744B98921F45429004F8E3F /* Debug */,
@@ -356,7 +357,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBMLNaturalLanguage" */ = {
+ 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBML" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3323F7E33E1559A2B9826720 /* Debug */,
diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/xcshareddata/IDETemplateMacros.plist b/packages/ml/ios/RNFBML.xcodeproj/xcshareddata/IDETemplateMacros.plist
similarity index 100%
rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/xcshareddata/IDETemplateMacros.plist
rename to packages/ml/ios/RNFBML.xcodeproj/xcshareddata/IDETemplateMacros.plist
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h b/packages/ml/ios/RNFBML/RNFBMLCommon.h
similarity index 75%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h
rename to packages/ml/ios/RNFBML/RNFBMLCommon.h
index e55df485d9..afbe07d173 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h
+++ b/packages/ml/ios/RNFBML/RNFBMLCommon.h
@@ -15,15 +15,11 @@
*
*/
-@interface RNFBMLVisionCommon : NSObject
+@interface RNFBMLCommon : NSObject
+ (NSArray *)rectToIntArray:(CGRect)rect;
-+ (NSDictionary *)contourToDict:(FIRVisionFaceContour *)visionFaceContour;
-
-+ (NSDictionary *)landmarkToDict:(FIRVisionFaceLandmark *)visionFaceLandmark;
-
-+ (NSArray *)visionPointsToArray:(NSArray *_Nullable)points;
++ (NSArray *)pointsToArray:(NSArray *_Nullable)points;
+ (void)UIImageForFilePath:(NSString *)localFilePath completion:(void (^)(
NSArray *errorCodeMessageArray,
diff --git a/packages/ml/ios/RNFBML/RNFBMLCommon.m b/packages/ml/ios/RNFBML/RNFBMLCommon.m
new file mode 100644
index 0000000000..a24faea984
--- /dev/null
+++ b/packages/ml/ios/RNFBML/RNFBMLCommon.m
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library 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.
+ *
+ */
+
+
+#import
+#import
+#import "RNFBMLCommon.h"
+
+@implementation RNFBMLCommon
+
++ (NSArray *)rectToIntArray:(CGRect)rect {
+ CGSize size = rect.size;
+ CGPoint point = rect.origin;
+ return @[@(point.x), @(point.y), @(point.x + size.width), @(point.y + size.height)];
+}
+
++ (NSArray *)pointsToArray:(NSArray *_Nullable)points {
+ if (points == nil) {
+ return @[];
+ }
+
+ NSMutableArray *pointsArray = [[NSMutableArray alloc] init];
+ for (NSValue *point in points) {
+ [pointsArray addObject:[self arrayForCGPoint:point.CGPointValue]];
+ }
+
+ return pointsArray;
+}
+
++ (NSArray *)arrayForCGPoint:(CGPoint)point {
+ return @[@(point.x), @(point.y)];
+}
+
++ (NSArray *)arrayForFIRVisionPoint:(FIRVisionPoint *)point {
+ return @[point.x, point.y];
+}
+
++ (void)UIImageForFilePath:(NSString *)localFilePath completion:(void (^)(
+ NSArray *errorCodeMessageArray,
+ UIImage *image
+))completion {
+ if (![[NSFileManager defaultManager] fileExistsAtPath:localFilePath]) {
+ completion(@[@"file-not-found", @"The local file specified does not exist on the device."], nil);
+ } else {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ completion(nil, [RCTConvert UIImage:localFilePath]);
+ });
+ }
+}
+
+@end
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h
similarity index 90%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h
rename to packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h
index 4298dfe84c..eb9a79bb87 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h
+++ b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h
@@ -19,6 +19,6 @@
#import
#import
-@interface RNFBMLVisionLandmarkRecognizerModule : NSObject
+@interface RNFBMLDocumentTextRecognizerModule : NSObject
@end
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m
similarity index 88%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m
rename to packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m
index 82f4f7ccf1..23d4758704 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m
+++ b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m
@@ -18,17 +18,17 @@
#import
#import
-#import "RNFBMLVisionDocumentTextRecognizerModule.h"
-#import "RNFBMLVisionCommon.h"
+#import "RNFBMLDocumentTextRecognizerModule.h"
+#import "RNFBMLCommon.h"
-@implementation RNFBMLVisionDocumentTextRecognizerModule
+@implementation RNFBMLDocumentTextRecognizerModule
#pragma mark -
#pragma mark Module Setup
RCT_EXPORT_MODULE();
#pragma mark -
-#pragma mark Firebase ML Kit Vision Methods
+#pragma mark Firebase ML Methods
RCT_EXPORT_METHOD(cloudDocumentTextRecognizerProcessImage:
(FIRApp *) firebaseApp
@@ -37,7 +37,7 @@ @implementation RNFBMLVisionDocumentTextRecognizerModule
: (RCTPromiseResolveBlock)resolve
: (RCTPromiseRejectBlock)reject
) {
- [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
+ [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
if (errorCodeMessageArray != nil) {
[RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
@"code": errorCodeMessageArray[0],
@@ -79,19 +79,19 @@ @implementation RNFBMLVisionDocumentTextRecognizerModule
resolve(@{
@"text": result.text,
- @"blocks": [self getVisionDocumentTextBlocksList:result.blocks],
+ @"blocks": [self getMLDocumentTextBlocksList:result.blocks],
});
}];
}];
}
-- (NSArray *)getVisionDocumentTextBlocksList:(NSArray *)blocks {
+- (NSArray *)getMLDocumentTextBlocksList:(NSArray *)blocks {
NSMutableArray *documentTextBlocksFormattedList = [[NSMutableArray alloc] init];
for (FIRVisionDocumentTextBlock *block in blocks) {
NSMutableDictionary *documentTextBlockFormatted = [[NSMutableDictionary alloc] init];
- documentTextBlockFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:block.frame];
+ documentTextBlockFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:block.frame];
documentTextBlockFormatted[@"text"] = block.text;
documentTextBlockFormatted[@"confidence"] = block.confidence;
documentTextBlockFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:block.recognizedLanguages];
@@ -130,7 +130,7 @@ - (NSArray *)getParagraphsList:(NSArray *)par
for (FIRVisionDocumentTextParagraph *paragraph in paragraphs) {
NSMutableDictionary *paragraphFormatted = [[NSMutableDictionary alloc] init];
- paragraphFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:paragraph.frame];
+ paragraphFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:paragraph.frame];
paragraphFormatted[@"text"] = paragraph.text;
paragraphFormatted[@"confidence"] = paragraph.confidence;
paragraphFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:paragraph.recognizedLanguages];
@@ -149,7 +149,7 @@ - (NSArray *)getWordsList:(NSArray *)words {
for (FIRVisionDocumentTextWord *word in words) {
NSMutableDictionary *wordFormatted = [[NSMutableDictionary alloc] init];
- wordFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:word.frame];
+ wordFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:word.frame];
wordFormatted[@"text"] = word.text;
wordFormatted[@"confidence"] = word.confidence;
wordFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:word.recognizedLanguages];
@@ -168,7 +168,7 @@ - (NSArray *)getSymbolList:(NSArray *)symbols {
for (FIRVisionDocumentTextSymbol *symbol in symbols) {
NSMutableDictionary *symbolFormatted = [[NSMutableDictionary alloc] init];
- symbolFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:symbol.frame];
+ symbolFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:symbol.frame];
symbolFormatted[@"text"] = symbol.text;
symbolFormatted[@"confidence"] = symbol.confidence;
symbolFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:symbol.recognizedLanguages];
diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.h
similarity index 91%
rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h
rename to packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.h
index 905bdad552..6a85d99084 100644
--- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h
+++ b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.h
@@ -19,5 +19,6 @@
#import
#import
-@interface RNFBMLNaturalLanguageIdModule : NSObject
+@interface RNFBMLImageLabelerModule : NSObject
+
@end
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.m
similarity index 60%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m
rename to packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.m
index 8d95fba257..663fc5c36a 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m
+++ b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.m
@@ -17,62 +17,17 @@
#import
#import
-#import "RNFBMLVisionImageLabelerModule.h"
-#import "RNFBMLVisionCommon.h"
+#import "RNFBMLImageLabelerModule.h"
+#import "RNFBMLCommon.h"
-@implementation RNFBMLVisionImageLabelerModule
+@implementation RNFBMLImageLabelerModule
#pragma mark -
#pragma mark Module Setup
RCT_EXPORT_MODULE();
#pragma mark -
-#pragma mark Firebase ML Kit Vision Methods
-
-RCT_EXPORT_METHOD(imageLabelerProcessImage:
- (FIRApp *) firebaseApp
- : (NSString *)filePath
- : (NSDictionary *)imageLabelerOptions
- : (RCTPromiseResolveBlock)resolve
- : (RCTPromiseRejectBlock)reject
-) {
- [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
- if (errorCodeMessageArray != nil) {
- [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
- @"code": errorCodeMessageArray[0],
- @"message": errorCodeMessageArray[1],
- }];
- return;
- }
-
- FIRVisionImage *visionImage = [[FIRVisionImage alloc] initWithImage:image];
- FIRVision *vision = [FIRVision visionForApp:firebaseApp];
-
- FIRVisionOnDeviceImageLabelerOptions *options = [[FIRVisionOnDeviceImageLabelerOptions alloc] init];
-
- if (imageLabelerOptions[@"confidenceThreshold"]) {
- options.confidenceThreshold = [imageLabelerOptions[@"confidenceThreshold"] floatValue];
- }
-
- FIRVisionImageLabeler *labeler = [vision onDeviceImageLabelerWithOptions:options];
- [labeler processImage:visionImage completion:^(NSArray *_Nullable labels, NSError *error) {
- if (error != nil) {
- [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
- @"code": @"unknown",
- @"message": [error localizedDescription],
- }];
- return;
- }
-
- if (labels == nil) {
- resolve(@[]);
- return;
- }
-
- resolve([self getLabelList:labels]);
- }];
- }];
-}
+#pragma mark Firebase ML Methods
RCT_EXPORT_METHOD(cloudImageLabelerProcessImage:
(FIRApp *) firebaseApp
@@ -81,7 +36,7 @@ @implementation RNFBMLVisionImageLabelerModule
: (RCTPromiseResolveBlock)resolve
: (RCTPromiseRejectBlock)reject
) {
- [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
+ [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
if (errorCodeMessageArray != nil) {
[RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
@"code": errorCodeMessageArray[0],
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h
similarity index 92%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h
rename to packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h
index b7624d7829..cb84682e9d 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h
+++ b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h
@@ -19,6 +19,6 @@
#import
#import
-@interface RNFBMLVisionFaceDetectorModule : NSObject
+@interface RNFBMLLandmarkRecognizerModule : NSObject
@end
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m
similarity index 90%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m
rename to packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m
index f086ae9c0e..e2ea37a829 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m
+++ b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m
@@ -17,17 +17,17 @@
#import
#import
-#import "RNFBMLVisionLandmarkRecognizerModule.h"
-#import "RNFBMLVisionCommon.h"
+#import "RNFBMLLandmarkRecognizerModule.h"
+#import "RNFBMLCommon.h"
-@implementation RNFBMLVisionLandmarkRecognizerModule
+@implementation RNFBMLLandmarkRecognizerModule
#pragma mark -
#pragma mark Module Setup
RCT_EXPORT_MODULE();
#pragma mark -
-#pragma mark Firebase ML Kit Vision Methods
+#pragma mark Firebase ML Methods
RCT_EXPORT_METHOD(cloudLandmarkRecognizerProcessImage:
(FIRApp *) firebaseApp
@@ -36,7 +36,7 @@ @implementation RNFBMLVisionLandmarkRecognizerModule
: (RCTPromiseResolveBlock)resolve
: (RCTPromiseRejectBlock)reject
) {
- [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
+ [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
if (errorCodeMessageArray != nil) {
[RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
@"code": errorCodeMessageArray[0],
@@ -81,7 +81,7 @@ @implementation RNFBMLVisionLandmarkRecognizerModule
visionLandmark[@"confidence"] = landmark.confidence;
visionLandmark[@"entityId"] = landmark.entityId;
visionLandmark[@"landmark"] = landmark.landmark;
- visionLandmark[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:landmark.frame];
+ visionLandmark[@"boundingBox"] = [RNFBMLCommon rectToIntArray:landmark.frame];
NSMutableArray *locations = [[NSMutableArray alloc] init];
for (FIRVisionLatitudeLongitude *location in landmark.locations) {
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.h
similarity index 90%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h
rename to packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.h
index b7ed0366b0..251401caca 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h
+++ b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.h
@@ -19,6 +19,6 @@
#import
#import
-@interface RNFBMLVisionImageLabelerModule : NSObject
+@interface RNFBMLTextRecognizerModule : NSObject
-@end
\ No newline at end of file
+@end
diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.m
similarity index 65%
rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m
rename to packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.m
index ae79f74bdb..53f4cf1938 100644
--- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m
+++ b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.m
@@ -17,51 +17,17 @@
#import
#import
-#import "RNFBMLVisionTextRecognizerModule.h"
-#import "RNFBMLVisionCommon.h"
+#import "RNFBMLTextRecognizerModule.h"
+#import "RNFBMLCommon.h"
-@implementation RNFBMLVisionTextRecognizerModule
+@implementation RNFBMLTextRecognizerModule
#pragma mark -
#pragma mark Module Setup
RCT_EXPORT_MODULE();
#pragma mark -
-#pragma mark Firebase ML Kit Vision Methods
-
-RCT_EXPORT_METHOD(textRecognizerProcessImage:
- (FIRApp *) firebaseApp
- : (NSString *)filePath
- : (RCTPromiseResolveBlock)resolve
- : (RCTPromiseRejectBlock)reject
-) {
- [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
- if (errorCodeMessageArray != nil) {
- [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
- @"code": errorCodeMessageArray[0],
- @"message": errorCodeMessageArray[1],
- }];
- return;
- }
-
- FIRVisionImage *visionImage = [[FIRVisionImage alloc] initWithImage:image];
- FIRVision *vision = [FIRVision visionForApp:firebaseApp];
-
- FIRVisionTextRecognizer *textRecognizer = [vision onDeviceTextRecognizer];
-
- [textRecognizer processImage:visionImage completion:^(FIRVisionText *text, NSError *error) {
- if (error != nil) {
- [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
- @"code": @"unknown",
- @"message": [error localizedDescription],
- }];
- return;
- }
-
- resolve([self getFirebaseVisionTextMap:text]);
- }];
- }];
-}
+#pragma mark Firebase ML Methods
RCT_EXPORT_METHOD(cloudTextRecognizerProcessImage:
(FIRApp *) firebaseApp
@@ -70,7 +36,7 @@ @implementation RNFBMLVisionTextRecognizerModule
: (RCTPromiseResolveBlock)resolve
: (RCTPromiseRejectBlock)reject
) {
- [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
+ [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) {
if (errorCodeMessageArray != nil) {
[RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{
@"code": errorCodeMessageArray[0],
@@ -110,21 +76,21 @@ @implementation RNFBMLVisionTextRecognizerModule
return;
}
- resolve([self getFirebaseVisionTextMap:text]);
+ resolve([self getFirebaseMLTextMap:text]);
}];
}];
}
-- (NSDictionary *)getFirebaseVisionTextMap:(FIRVisionText *)text {
- NSMutableDictionary *firebaseVisionTextMap = [[NSMutableDictionary alloc] init];
+- (NSDictionary *)getFirebaseMLTextMap:(FIRVisionText *)text {
+ NSMutableDictionary *firebaseMLTextMap = [[NSMutableDictionary alloc] init];
- firebaseVisionTextMap[@"text"] = text.text;
- firebaseVisionTextMap[@"blocks"] = [self getVisionTextBlocksList:text.blocks];
+ firebaseMLTextMap[@"text"] = text.text;
+ firebaseMLTextMap[@"blocks"] = [self getMLTextBlocksList:text.blocks];
- return firebaseVisionTextMap;
+ return firebaseMLTextMap;
}
-- (NSArray *)getVisionTextBlocksList:(NSArray *)blocks {
+- (NSArray *)getMLTextBlocksList:(NSArray *)blocks {
NSMutableArray *blockListFormatted = [[NSMutableArray alloc] init];
for (FIRVisionTextBlock *block in blocks) {
@@ -132,9 +98,9 @@ - (NSArray *)getVisionTextBlocksList:(NSArray *)blocks {
textBlockFormatted[@"text"] = block.text;
textBlockFormatted[@"confidence"] = block.confidence;
- textBlockFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:block.frame];
+ textBlockFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:block.frame];
textBlockFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:block.recognizedLanguages];
- textBlockFormatted[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:block.cornerPoints];
+ textBlockFormatted[@"cornerPoints"] = [RNFBMLCommon pointsToArray:block.cornerPoints];
textBlockFormatted[@"lines"] = [self getLinesList:block.lines];
[blockListFormatted addObject:textBlockFormatted];
@@ -149,11 +115,11 @@ - (NSArray *)getLinesList:(NSArray *)lines {
for (FIRVisionTextLine *line in lines) {
NSMutableDictionary *lineFormatted = [[NSMutableDictionary alloc] init];
- lineFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:line.frame];
+ lineFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:line.frame];
lineFormatted[@"text"] = line.text;
lineFormatted[@"confidence"] = line.confidence;
lineFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:line.recognizedLanguages];
- lineFormatted[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:line.cornerPoints];
+ lineFormatted[@"cornerPoints"] = [RNFBMLCommon pointsToArray:line.cornerPoints];
lineFormatted[@"elements"] = [self getElementsList:line.elements];
[lineListFormatted addObject:lineFormatted];
@@ -168,11 +134,11 @@ - (NSArray *)getElementsList:(NSArray *)elements {
for (FIRVisionTextElement *element in elements) {
NSMutableDictionary *elementFormatted = [[NSMutableDictionary alloc] init];
- elementFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:element.frame];
+ elementFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:element.frame];
elementFormatted[@"text"] = element.text;
elementFormatted[@"confidence"] = element.confidence;
elementFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:element.recognizedLanguages];
- elementFormatted[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:element.cornerPoints];
+ elementFormatted[@"cornerPoints"] = [RNFBMLCommon pointsToArray:element.cornerPoints];
[elementsListFormatted addObject:elementFormatted];
}
diff --git a/packages/ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js b/packages/ml/lib/MLCloudDocumentTextRecognizerOptions.js
similarity index 95%
rename from packages/ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js
rename to packages/ml/lib/MLCloudDocumentTextRecognizerOptions.js
index 73a1a20ed4..7263a1e38a 100644
--- a/packages/ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js
+++ b/packages/ml/lib/MLCloudDocumentTextRecognizerOptions.js
@@ -24,9 +24,7 @@ import {
isUndefined,
} from '@react-native-firebase/app/lib/common';
-export default function visionCloudDocumentTextRecognizerOptions(
- cloudDocumentTextRecognizerOptions,
-) {
+export default function MLCloudDocumentTextRecognizerOptions(cloudDocumentTextRecognizerOptions) {
const out = {
enforceCertFingerprintMatch: false,
};
diff --git a/packages/ml-vision/lib/visionCloudImageLabelerOptions.js b/packages/ml/lib/MLCloudImageLabelerOptions.js
similarity index 96%
rename from packages/ml-vision/lib/visionCloudImageLabelerOptions.js
rename to packages/ml/lib/MLCloudImageLabelerOptions.js
index 6900225242..6339968454 100644
--- a/packages/ml-vision/lib/visionCloudImageLabelerOptions.js
+++ b/packages/ml/lib/MLCloudImageLabelerOptions.js
@@ -24,7 +24,7 @@ import {
isUndefined,
} from '@react-native-firebase/app/lib/common';
-export default function visionCloudImageLabelerOptions(cloudImageLabelerOptions) {
+export default function MLCloudImageLabelerOptions(cloudImageLabelerOptions) {
const out = {
enforceCertFingerprintMatch: false,
confidenceThreshold: 0.5,
diff --git a/packages/ml-vision/lib/VisionCloudLandmarkRecognizerModelType.js b/packages/ml/lib/MLCloudLandmarkRecognizerModelType.js
similarity index 100%
rename from packages/ml-vision/lib/VisionCloudLandmarkRecognizerModelType.js
rename to packages/ml/lib/MLCloudLandmarkRecognizerModelType.js
diff --git a/packages/ml-vision/lib/visionCloudLandmarkRecognizerOptions.js b/packages/ml/lib/MLCloudLandmarkRecognizerOptions.js
similarity index 81%
rename from packages/ml-vision/lib/visionCloudLandmarkRecognizerOptions.js
rename to packages/ml/lib/MLCloudLandmarkRecognizerOptions.js
index 0f44db69dc..4b1997309c 100644
--- a/packages/ml-vision/lib/visionCloudLandmarkRecognizerOptions.js
+++ b/packages/ml/lib/MLCloudLandmarkRecognizerOptions.js
@@ -23,13 +23,13 @@ import {
isString,
isUndefined,
} from '@react-native-firebase/app/lib/common';
-import VisionCloudLandmarkRecognizerModelType from './VisionCloudLandmarkRecognizerModelType';
+import MLCloudLandmarkRecognizerModelType from './MLCloudLandmarkRecognizerModelType';
-export default function visionCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions) {
+export default function MLCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions) {
const out = {
enforceCertFingerprintMatch: false,
maxResults: 10,
- model: VisionCloudLandmarkRecognizerModelType.STABLE_MODEL,
+ model: MLCloudLandmarkRecognizerModelType.STABLE_MODEL,
};
if (isUndefined(cloudLandmarkRecognizerOptions)) {
@@ -69,12 +69,11 @@ export default function visionCloudLandmarkRecognizerOptions(cloudLandmarkRecogn
if (cloudLandmarkRecognizerOptions.modelType) {
if (
cloudLandmarkRecognizerOptions.modelType !==
- VisionCloudLandmarkRecognizerModelType.STABLE_MODEL &&
- cloudLandmarkRecognizerOptions.modelType !==
- VisionCloudLandmarkRecognizerModelType.LATEST_MODEL
+ MLCloudLandmarkRecognizerModelType.STABLE_MODEL &&
+ cloudLandmarkRecognizerOptions.modelType !== MLCloudLandmarkRecognizerModelType.LATEST_MODEL
) {
throw new Error(
- "'cloudLandmarkRecognizerOptions.modelType' invalid model. Expected VisionCloudLandmarkRecognizerModelType.STABLE_MODEL or VisionCloudLandmarkRecognizerModelType.LATEST_MODEL.",
+ "'cloudLandmarkRecognizerOptions.modelType' invalid model. Expected MLCloudLandmarkRecognizerModelType.STABLE_MODEL or MLCloudLandmarkRecognizerModelType.LATEST_MODEL.",
);
}
diff --git a/packages/ml-vision/lib/VisionCloudTextRecognizerModelType.js b/packages/ml/lib/MLCloudTextRecognizerModelType.js
similarity index 100%
rename from packages/ml-vision/lib/VisionCloudTextRecognizerModelType.js
rename to packages/ml/lib/MLCloudTextRecognizerModelType.js
diff --git a/packages/ml-vision/lib/visionCloudTextRecognizerOptions.js b/packages/ml/lib/MLCloudTextRecognizerOptions.js
similarity index 85%
rename from packages/ml-vision/lib/visionCloudTextRecognizerOptions.js
rename to packages/ml/lib/MLCloudTextRecognizerOptions.js
index 2d013f0b03..8dcc45eee2 100644
--- a/packages/ml-vision/lib/visionCloudTextRecognizerOptions.js
+++ b/packages/ml/lib/MLCloudTextRecognizerOptions.js
@@ -23,12 +23,12 @@ import {
isString,
isUndefined,
} from '@react-native-firebase/app/lib/common';
-import VisionCloudTextRecognizerModelType from './VisionCloudTextRecognizerModelType';
+import MLCloudTextRecognizerModelType from './MLCloudTextRecognizerModelType';
-export default function visionCloudTextRecognizerOptions(cloudTextRecognizerOptions) {
+export default function MLCloudTextRecognizerOptions(cloudTextRecognizerOptions) {
const out = {
enforceCertFingerprintMatch: false,
- modelType: VisionCloudTextRecognizerModelType.SPARSE_MODEL,
+ modelType: MLCloudTextRecognizerModelType.SPARSE_MODEL,
};
if (isUndefined(cloudTextRecognizerOptions)) {
@@ -59,8 +59,8 @@ export default function visionCloudTextRecognizerOptions(cloudTextRecognizerOpti
if (cloudTextRecognizerOptions.modelType) {
if (
- cloudTextRecognizerOptions.modelType !== VisionCloudTextRecognizerModelType.DENSE_MODEL &&
- cloudTextRecognizerOptions.modelType !== VisionCloudTextRecognizerModelType.SPARSE_MODEL
+ cloudTextRecognizerOptions.modelType !== MLCloudTextRecognizerModelType.DENSE_MODEL &&
+ cloudTextRecognizerOptions.modelType !== MLCloudTextRecognizerModelType.SPARSE_MODEL
) {
throw new Error(
"'cloudTextRecognizerOptions.modelType' invalid model. Expected VisionCloudTextRecognizerModelType.DENSE_MODEL or VisionCloudTextRecognizerModelType.SPARSE_MODEL.",
diff --git a/packages/ml-vision/lib/VisionDocumentTextRecognizedBreakType.js b/packages/ml/lib/MLDocumentTextRecognizedBreakType.js
similarity index 100%
rename from packages/ml-vision/lib/VisionDocumentTextRecognizedBreakType.js
rename to packages/ml/lib/MLDocumentTextRecognizedBreakType.js
diff --git a/packages/ml/lib/index.d.ts b/packages/ml/lib/index.d.ts
new file mode 100644
index 0000000000..9012b33ca6
--- /dev/null
+++ b/packages/ml/lib/index.d.ts
@@ -0,0 +1,701 @@
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library 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.
+ *
+ */
+
+import { ReactNativeFirebase } from '@react-native-firebase/app';
+/**
+ * Firebase ML package for React Native.
+ *
+ * #### Example 1
+ *
+ * Access the firebase export from the `ml` package:
+ *
+ * ```js
+ * import { firebase } from '@react-native-firebase/ml';
+ *
+ * // firebase.ml().X
+ * ```
+ *
+ * #### Example 2
+ *
+ * Using the default export from the `ml` package:
+ *
+ * ```js
+ * import ml from '@react-native-firebase/ml';
+ *
+ * // ml().X
+ * ```
+ *
+ * #### Example 3
+ *
+ * Using the default export from the `app` package:
+ *
+ * ```js
+ * import firebase from '@react-native-firebase/app';
+ * import '@react-native-firebase/ml';
+ *
+ * // firebase.ml().X
+ * ```
+ *
+ * @firebase ml
+ */
+export namespace FirebaseMLTypes {
+ import FirebaseModule = ReactNativeFirebase.FirebaseModule;
+
+ export interface Statics {
+ MLCloudTextRecognizerModelType: typeof MLCloudTextRecognizerModelType;
+ MLCloudLandmarkRecognizerModelType: typeof MLCloudLandmarkRecognizerModelType;
+ MLDocumentTextRecognizedBreakType: typeof MLDocumentTextRecognizedBreakType;
+ }
+
+ /**
+ * Options for cloud image labeler. Confidence threshold could be provided for the label detection.
+ *
+ * For example, if the confidence threshold is set to 0.7, only labels with confidence >= 0.7 would be returned. The default threshold is 0.5.
+ *
+ * Note: at most 20 labels will be returned for cloud image labeler.
+ */
+ export interface MLCloudImageLabelerOptions {
+ /**
+ * Only allow registered application instances with matching certificate fingerprint to use ML API.
+ *
+ * > Do not set this for debug build if you use simulators to test.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudImageLabelerProcessImage(filePath, {
+ * enforceCertFingerprintMatch: true,
+ * });
+ * ```
+ */
+ enforceCertFingerprintMatch?: boolean;
+
+ /**
+ * Sets confidence threshold in the range of [0.0 - 1.0] of detected labels. Only labels detected with confidence higher than this threshold are returned.
+ *
+ * Defaults to 0.5.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudImageLabelerProcessImage(filePath, {
+ * confidenceThreshold: 0.8,
+ * });
+ * ```
+ */
+ confidenceThreshold?: number;
+
+ /**
+ * API key to use for ML API. If not set, the default API key from `firebase.app()` will be used.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudImageLabelerProcessImage(filePath, {
+ * apiKeyOverride: 'xyz123',
+ * });
+ * ```
+ *
+ * @ios
+ */
+ apiKeyOverride?: string;
+ }
+
+ /**
+ * Detector for finding popular natural and man-made structures within an image.
+ */
+ export interface MLCloudLandmarkRecognizerOptions {
+ /**
+ * Only allow registered application instances with matching certificate fingerprint to use ML API.
+ *
+ * > Do not set this for debug build if you use simulators to test.
+ */
+ enforceCertFingerprintMatch?: boolean;
+
+ /**
+ * Sets the maximum number of results of this type.
+ *
+ * Defaults to 10.
+ */
+ maxResults?: number;
+
+ /**
+ * Sets model type for the detection.
+ *
+ * Defaults to `MLCloudLandmarkRecognizerModelType.STABLE_MODEL`.
+ */
+ modelType?:
+ | MLCloudLandmarkRecognizerModelType.STABLE_MODEL
+ | MLCloudLandmarkRecognizerModelType.LATEST_MODEL;
+
+ /**
+ * API key to use for ML API. If not set, the default API key from `firebase.app()` will be used.
+ *
+ * @ios
+ */
+ apiKeyOverride?: string;
+ }
+
+ /**
+ * Model types for cloud landmark recognition.
+ */
+ export enum MLCloudLandmarkRecognizerModelType {
+ /**
+ * Stable model would be used.
+ */
+ STABLE_MODEL = 1,
+
+ /**
+ * Latest model would be used.
+ */
+ LATEST_MODEL = 2,
+ }
+
+ /**
+ * Options for cloud text recognizer.
+ */
+ export interface MLCloudTextRecognizerOptions {
+ /**
+ * Only allow registered application instances with matching certificate fingerprint to use ML API.
+ *
+ * > Do not set this for debug build if you use simulators to test.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * enforceCertFingerprintMatch: true,
+ * });
+ * ```
+ */
+ enforceCertFingerprintMatch?: boolean;
+
+ /**
+ * Sets model type for cloud text recognition. The two models SPARSE_MODEL and DENSE_MODEL handle different text densities in an image.
+ *
+ * See `MLCloudTextRecognizerModelType` for types.
+ *
+ * Defaults to `MLCloudTextRecognizerModelType.SPARSE_MODEL`.
+ *
+ * #### Example
+ *
+ * ```js
+ * import {
+ * firebase,
+ * MLCloudTextRecognizerModelType,
+ * } from '@react-native-firebase/ml';
+ *
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * modelType: MLCloudTextRecognizerModelType.DENSE_MODEL,
+ * });
+ * ```
+ */
+ modelType?:
+ | MLCloudTextRecognizerModelType.SPARSE_MODEL
+ | MLCloudTextRecognizerModelType.DENSE_MODEL;
+
+ /**
+ * Sets language hints. In most cases, not setting this yields the best results since it enables automatic language
+ * detection. For languages based on the Latin alphabet, setting language hints is not needed. In rare cases, when
+ * the language of the text in the image is known, setting a hint will help get better results (although it will be a
+ * significant hindrance if the hint is wrong).
+ *
+ * Each language code must be a BCP-47 identifier. See [Google Cloud OCR Language Support](https://cloud.google.com/vision/docs/languages) for more information.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * languageHints: ['fr', 'de'],
+ * });
+ * ```
+ */
+ languageHints?: string[];
+
+ /**
+ * API key to use for Cloud ML API. If not set, the default API key from `firebase.app()` will be used.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * apiKeyOverride: 'xyz123',
+ * });
+ * ```
+ *
+ * @ios
+ */
+ apiKeyOverride?: string;
+ }
+
+ /**
+ * Options for the cloud document text recognizer.
+ */
+ export interface MLCloudDocumentTextRecognizerOptions {
+ /**
+ * Only allow registered application instances with matching certificate fingerprint to use ML API.
+ *
+ * > Do not set this for debug build if you use simulators to test.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * enforceCertFingerprintMatch: true,
+ * });
+ * ```
+ */
+ enforceCertFingerprintMatch?: boolean;
+
+ /**
+ * Sets language hints. In most cases, not setting this yields the best results since it enables automatic language
+ * detection. For languages based on the Latin alphabet, setting language hints is not needed. In rare cases, when
+ * the language of the text in the image is known, setting a hint will help get better results (although it will be a
+ * significant hindrance if the hint is wrong).
+ *
+ * Each language code must be a BCP-47 identifier. See [Google Cloud OCR Language Support](https://cloud.google.com/vision/docs/languages) for more information.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * languageHints: ['fr', 'de'],
+ * });
+ * ```
+ */
+ languageHints?: string[];
+
+ /**
+ * API key to use for ML API. If not set, the default API key from `firebase.app()` will be used.
+ *
+ * #### Example
+ *
+ * ```js
+ * await firebase.ml().cloudTextRecognizerProcessImage(filePath, {
+ * apiKeyOverride: 'xyz123',
+ * });
+ * ```
+ *
+ * @ios
+ */
+ apiKeyOverride?: string;
+ }
+
+ /**
+ * The cloud model type used for in MLCloudTextRecognizerOptions & MLCloudDocumentTextRecognizerOptions
+ *
+ * Defaults to `SPARSE_MODEL`
+ */
+ export enum MLCloudTextRecognizerModelType {
+ /**
+ * Dense model type. It is more suitable for well-formatted dense text.
+ */
+ SPARSE_MODEL = 1,
+ /**
+ * Sparse model type. It is more suitable for sparse text.
+ */
+ DENSE_MODEL = 2,
+ }
+
+ /**
+ * A Rectangle holds four number coordinates relative to the processed image.
+ * Rectangle are represented as [left, top, right, bottom].
+ *
+ * Used by ML Text Recognizer & Landmark Recognition APIs.
+ */
+ export type MLRectangle = [number, number, number, number];
+
+ /**
+ * A point holds two number coordinates relative to the processed image.
+ * Points are represented as [x, y].
+ *
+ * Used by ML Text Recognizer & Landmark Recognition APIs.
+ */
+ export type MLPoint = [number, number];
+
+ /**
+ * A hierarchical representation of texts recognized in an image.
+ */
+ export interface MLText {
+ /**
+ * Retrieve the recognized text as a string.
+ */
+ text: string;
+
+ /**
+ * Gets an array `MLTextBlock`, which is a block of text that can be further decomposed to an array of `MLTextLine`.
+ */
+ blocks: MLTextBlock[];
+ }
+
+ /**
+ * Represents a block of text.
+ */
+ export interface MLDocumentTextBlock extends MLDocumentTextBase {
+ /**
+ * Gets an Array of `MLDocumentTextParagraph`s that make up this block.
+ */
+ paragraphs: MLDocumentTextParagraph[];
+ }
+
+ /**
+ * A structural unit of text representing a number of words in certain order.
+ */
+ export interface MLDocumentTextParagraph extends MLDocumentTextBase {
+ /**
+ * Gets an Array of `MLDocumentTextWord`s that make up this paragraph.
+ *
+ * Returns an empty list if no Word is found.
+ */
+ words: MLDocumentTextWord[];
+ }
+
+ /**
+ * A single word representation.
+ */
+ export interface MLDocumentTextWord extends MLDocumentTextBase {
+ /**
+ * Gets an Array of `MLDocumentTextSymbol`s that make up this word.
+ * The order of the symbols follows the natural reading order.
+ */
+ symbols: MLDocumentTextSymbol[];
+ }
+
+ /**
+ * A single symbol representation.
+ */
+ export type MLDocumentTextSymbol = MLDocumentTextBase;
+
+ /**
+ * Enum representing the detected break type.
+ */
+ export enum MLDocumentTextRecognizedBreakType {
+ /**
+ * Line-wrapping break.
+ */
+ EOL_SURE_SPACE = 3,
+
+ /**
+ * End-line hyphen that is not present in text; does not co-occur with `SPACE`, `LEADER_SPACE`, or `LINE_BREAK`.
+ */
+ HYPHEN = 4,
+
+ /**
+ * Line break that ends a paragraph.
+ */
+ LINE_BREAK = 5,
+
+ /**
+ * Regular space.
+ */
+ SPACE = 1,
+
+ /**
+ * Sure space (very wide).
+ */
+ SURE_SPACE = 2,
+
+ /**
+ * Unknown break label type.
+ */
+ UNKNOWN = 0,
+ }
+
+ /**
+ * A recognized break is the detected start or end of a structural component.
+ */
+ export interface MLDocumentTextRecognizedBreak {
+ /**
+ * Gets detected break type.
+ */
+ breakType: MLDocumentTextRecognizedBreakType;
+
+ /**
+ * Returns true if break prepends an element.
+ */
+ isPrefix: boolean;
+ }
+ /**
+ * A shared type that all MLDocumentText components inherit from
+ */
+ export interface MLDocumentTextBase {
+ /**
+ * Gets the recognized text as a string. Returned in reading order for the language. For Latin, this is top to bottom within a `MLTextBlock`, and left-to-right within a `MLTextLine`.
+ */
+ text: string;
+
+ /**
+ * The confidence of the recognized text. It only return valid result from cloud recognizers. For on-device text recognition, the confidence is always null.
+ */
+ confidence: null | number;
+
+ /**
+ * Gets a list of recognized languages. (Cloud API only. On-Device returns empty array)
+ *
+ * A language is the BCP-47 language code, such as "en-US" or "sr-Latn".
+ */
+ recognizedLanguages: string[];
+
+ /**
+ * Returns the bounding rectangle of the detected text.
+ */
+ boundingBox: MLRectangle;
+
+ /**
+ * Gets the recognized break - the detected start or end of a structural component.
+ */
+ recognizedBreak: MLDocumentTextRecognizedBreak;
+ }
+
+ /**
+ * A hierarchical representation of document text recognized in an image.
+ */
+ export interface MLDocumentText {
+ /**
+ * Retrieve the recognized text as a string.
+ */
+ text: string;
+
+ /**
+ * Gets an array `MLTextBlock`, which is a block of text that can be further decomposed to an array of `MLDocumentTextParagraph`.
+ */
+ blocks: MLDocumentTextBlock[];
+ }
+
+ /**
+ * A shared type that all ML Text components inherit from
+ */
+ export interface MLTextBase {
+ /**
+ * Gets the recognized text as a string. Returned in reading order for the language. For Latin, this is top to bottom within a `MLTextBlock`, and left-to-right within a `MLTextLine`.
+ */
+ text: string;
+
+ /**
+ * The confidence of the recognized text. It only return valid result from cloud recognizers. For on-device text recognition, the confidence is always null.
+ */
+ confidence: null | number;
+
+ /**
+ * Gets a list of recognized languages. (Cloud API only. On-Device returns empty array)
+ *
+ * A language is the BCP-47 language code, such as "en-US" or "sr-Latn".
+ */
+ recognizedLanguages: string[];
+
+ /**
+ * Returns the bounding rectangle of the detected text.
+ */
+ boundingBox: MLRectangle;
+
+ /**
+ * Gets the four corner points in clockwise direction starting with top-left. Due to the possible perspective distortions, this is not necessarily a rectangle. Parts of the region could be outside of the image.
+ */
+ cornerPoints: MLPoint[];
+ }
+
+ /**
+ * Represents a block of text (similar to a paragraph).
+ */
+ export interface MLTextBlock extends MLTextBase {
+ /**
+ * Gets an Array of MLTextLine's that make up this text block.
+ */
+ lines: MLTextLine[];
+ }
+
+ /**
+ * Represents a line of text.
+ */
+ export interface MLTextLine extends MLTextBase {
+ /**
+ * Gets an Array of MLTextElement's that make up this text block.
+ *
+ * An element is roughly equivalent to a space-separated "word" in most Latin languages, or a character in others. For instance, if a word is split between two lines by a hyphen, each part is encoded as a separate Element.
+ */
+ elements: MLTextElement[];
+ }
+
+ /**
+ * Roughly equivalent to a space-separated "word" in most Latin languages, or a character in others. For instance, if a word is split between two lines by a hyphen, each part is encoded as a separate Element.
+ */
+ export type MLTextElement = MLTextBase;
+
+ /**
+ * Represents an image label return from `imageLabelerProcessImage()` and `cloudImageLabelerProcessImage()`.
+ */
+ export interface MLImageLabel {
+ /**
+ * Returns a detected label from the given image. The label returned here is in English only.
+ *
+ * Use `entityId` to retrieve a unique id.
+ */
+ text: string;
+
+ /**
+ * Returns an opaque entity ID. IDs are available in [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/).
+ */
+ entityId: string;
+
+ /**
+ * Gets overall confidence of the result.
+ *
+ * Range between 0 (low confidence) and 1 (high confidence).
+ */
+ confidence: number;
+ }
+
+ /**
+ * Represents a detected landmark returned from `cloudLandmarkRecognizerProcessImage()`.
+ */
+ export interface MLLandmark {
+ /**
+ * Gets image region of the detected landmark. Returns null if nothing was detected
+ */
+ boundingBox: MLRectangle | null;
+
+ /**
+ * Gets overall confidence of the result. Ranging between 0 & 1.
+ */
+ confidence: number;
+
+ /**
+ * Gets opaque entity ID. Some IDs may be available in [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/).
+ */
+ entityId: string;
+
+ /**
+ * Gets the detected landmark.
+ */
+ landmark: string;
+
+ /**
+ * Gets the location information for the detected entity.
+ *
+ * Multiple MLGeoPoint elements can be present because one location may indicate the location of the scene
+ * in the image, and another location may indicate the location of the place where the image was taken.
+ * Location information is usually present for landmarks.
+ */
+ locations: MLGeoPoint[];
+ }
+
+ /**
+ * A representation of a latitude/longitude pair.
+ *
+ * This is expressed as an array of numbers representing degrees latitude and degrees longitude, in the form `[lat, lng]`.
+ */
+ export type MLGeoPoint = [number, number];
+
+ /**
+ * The Firebase ML service interface.
+ *
+ * > This module is available for the default app only.
+ *
+ * #### Example
+ *
+ * Get the ML service for the default app:
+ *
+ * ```js
+ * const defaultAppML = firebase.ml();
+ * ```
+ */
+ export class Module extends FirebaseModule {
+ /**
+ * Detect text from a local image file.
+ *
+ * @param imageFilePath A local path to an image on the device.
+ * @param cloudTextRecognizerOptions An instance of `MLCloudTextRecognizerOptions`.
+ */
+ cloudTextRecognizerProcessImage(
+ imageFilePath: string,
+ cloudTextRecognizerOptions?: MLCloudTextRecognizerOptions,
+ ): Promise;
+
+ /**
+ * Detect text within a document using a local image file.
+ *
+ * @param imageFilePath A local path to an image on the device.
+ * @param cloudDocumentTextRecognizerOptions An instance of `MLCloudDocumentTextRecognizerOptions`.
+ */
+ cloudDocumentTextRecognizerProcessImage(
+ imageFilePath: string,
+ cloudDocumentTextRecognizerOptions?: MLCloudDocumentTextRecognizerOptions,
+ ): Promise;
+
+ /**
+ * Returns an array of landmarks (as `MLLandmark`) of a given local image file path
+ *
+ * @param imageFilePath A local image file path.
+ * @param cloudLandmarkRecognizerOptions An optional instance of `MLCloudLandmarkRecognizerOptions`.
+ */
+ cloudLandmarkRecognizerProcessImage(
+ imageFilePath: string,
+ cloudLandmarkRecognizerOptions?: MLCloudLandmarkRecognizerOptions,
+ ): Promise;
+
+ /**
+ * Returns an array of labels (as `MLImageLabel`) of a given local image file path.
+ *
+ * #### Example
+ *
+ * ```js
+ * const labels = await firebase.ml().cloudImageLabelerProcessImage(filePath, {
+ * confidenceThreshold: 0.8,
+ * });
+ * ```
+ *
+ * @param imageFilePath A local image file path.
+ * @param cloudImageLabelerOptions An optional instance of `MLCloudImageLabelerOptions`.
+ */
+ cloudImageLabelerProcessImage(
+ imageFilePath: string,
+ cloudImageLabelerOptions?: MLCloudImageLabelerOptions,
+ ): Promise;
+ }
+}
+
+declare const defaultExport: ReactNativeFirebase.FirebaseModuleWithStaticsAndApp<
+ FirebaseMLTypes.Module,
+ FirebaseMLTypes.Statics
+>;
+
+export const firebase: ReactNativeFirebase.Module & {
+ analytics: typeof defaultExport;
+ app(name?: string): ReactNativeFirebase.FirebaseApp & { ml(): FirebaseMLTypes.Module };
+};
+
+export const MLCloudTextRecognizerModelType: FirebaseMLTypes.Statics['MLCloudTextRecognizerModelType'];
+export const MLDocumentTextRecognizedBreakType: FirebaseMLTypes.Statics['MLDocumentTextRecognizedBreakType'];
+export const MLCloudLandmarkRecognizerModelType: FirebaseMLTypes.Statics['MLCloudLandmarkRecognizerModelType'];
+
+export default defaultExport;
+
+/**
+ * Attach namespace to `firebase.` and `FirebaseApp.`.
+ */
+declare module '@react-native-firebase/app' {
+ namespace ReactNativeFirebase {
+ import FirebaseModuleWithStaticsAndApp = ReactNativeFirebase.FirebaseModuleWithStaticsAndApp;
+ interface Module {
+ ml: FirebaseModuleWithStaticsAndApp;
+ }
+
+ interface FirebaseApp {
+ ml(): FirebaseMLTypes.Module;
+ }
+ }
+}
diff --git a/packages/ml/lib/index.js b/packages/ml/lib/index.js
new file mode 100644
index 0000000000..79b25a4247
--- /dev/null
+++ b/packages/ml/lib/index.js
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library 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.
+ *
+ */
+
+import { isString, toFilePath } from '@react-native-firebase/app/lib/common';
+import {
+ createModuleNamespace,
+ FirebaseModule,
+ getFirebaseRoot,
+} from '@react-native-firebase/app/lib/internal';
+import version from './version';
+import MLCloudDocumentTextRecognizerOptions from './MLCloudDocumentTextRecognizerOptions';
+import MLCloudImageLabelerOptions from './MLCloudImageLabelerOptions';
+import MLCloudLandmarkRecognizerModelType from './MLCloudLandmarkRecognizerModelType';
+import MLCloudLandmarkRecognizerOptions from './MLCloudLandmarkRecognizerOptions';
+import MLCloudTextRecognizerModelType from './MLCloudTextRecognizerModelType';
+import MLCloudTextRecognizerOptions from './MLCloudTextRecognizerOptions';
+import MLDocumentTextRecognizedBreakType from './MLDocumentTextRecognizedBreakType';
+
+const statics = {
+ MLCloudTextRecognizerModelType,
+ MLCloudLandmarkRecognizerModelType,
+ MLDocumentTextRecognizedBreakType,
+};
+
+const namespace = 'ml';
+const nativeModuleName = [
+ 'RNFBMLImageLabelerModule',
+ 'RNFBMLTextRecognizerModule',
+ 'RNFBMLLandmarkRecognizerModule',
+ 'RNFBMLDocumentTextRecognizerModule',
+];
+
+class FirebaseMLModule extends FirebaseModule {
+ cloudTextRecognizerProcessImage(localImageFilePath, cloudTextRecognizerOptions) {
+ if (!isString(localImageFilePath)) {
+ throw new Error(
+ "firebase.ml().cloudTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
+ );
+ }
+
+ let options;
+ try {
+ options = MLCloudTextRecognizerOptions(cloudTextRecognizerOptions);
+ } catch (e) {
+ throw new Error(`firebase.ml().cloudTextRecognizerProcessImage(_, *) ${e.message}`);
+ }
+
+ return this.native.cloudTextRecognizerProcessImage(toFilePath(localImageFilePath), options);
+ }
+
+ cloudDocumentTextRecognizerProcessImage(localImageFilePath, cloudDocumentTextRecognizerOptions) {
+ if (!isString(localImageFilePath)) {
+ throw new Error(
+ "firebase.ml().cloudDocumentTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
+ );
+ }
+
+ let options;
+ try {
+ options = MLCloudDocumentTextRecognizerOptions(cloudDocumentTextRecognizerOptions);
+ } catch (e) {
+ throw new Error(`firebase.ml().cloudDocumentTextRecognizerProcessImage(_, *) ${e.message}.`);
+ }
+
+ return this.native.cloudDocumentTextRecognizerProcessImage(
+ toFilePath(localImageFilePath),
+ options,
+ );
+ }
+
+ cloudLandmarkRecognizerProcessImage(localImageFilePath, cloudLandmarkRecognizerOptions) {
+ if (!isString(localImageFilePath)) {
+ throw new Error(
+ "firebase.ml().cloudLandmarkRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.",
+ );
+ }
+
+ let options;
+ try {
+ options = MLCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions);
+ } catch (e) {
+ throw new Error(`firebase.ml().cloudLandmarkRecognizerProcessImage(_, *) ${e.message}.`);
+ }
+
+ return this.native.cloudLandmarkRecognizerProcessImage(toFilePath(localImageFilePath), options);
+ }
+
+ cloudImageLabelerProcessImage(localImageFilePath, cloudImageLabelerOptions) {
+ if (!isString(localImageFilePath)) {
+ throw new Error(
+ "firebase.ml().cloudImageLabelerProcessImage(*) 'localImageFilePath' expected a string local file path.",
+ );
+ }
+
+ let options;
+ try {
+ options = MLCloudImageLabelerOptions(cloudImageLabelerOptions);
+ } catch (e) {
+ throw new Error(`firebase.ml().cloudImageLabelerProcessImage(_, *) ${e.message}.`);
+ }
+
+ return this.native.cloudImageLabelerProcessImage(toFilePath(localImageFilePath), options);
+ }
+}
+
+// import { SDK_VERSION } from '@react-native-firebase/ml';
+export const SDK_VERSION = version;
+
+// import ML from '@react-native-firebase/ml';
+// ml().X(...);
+export default createModuleNamespace({
+ statics,
+ version,
+ namespace,
+ nativeModuleName,
+ nativeEvents: false,
+ hasMultiAppSupport: true,
+ hasCustomUrlOrRegionSupport: false,
+ ModuleClass: FirebaseMLModule,
+});
+
+// import ml, { firebase } from '@react-native-firebase/ml';
+// ml().X(...);
+// firebase.ml().X(...);
+export const firebase = getFirebaseRoot();
+
+// e.g.
+// // import { MLCloudTextRecognizerModelType } from '@react-native-firebase/ml';
+export { default as MLCloudTextRecognizerModelType } from './MLCloudTextRecognizerModelType';
+export { default as MLDocumentTextRecognizedBreakType } from './MLDocumentTextRecognizedBreakType';
+export { default as MLCloudLandmarkRecognizerModelType } from './MLCloudLandmarkRecognizerModelType';
diff --git a/packages/ml-vision/package.json b/packages/ml/package.json
similarity index 65%
rename from packages/ml-vision/package.json
rename to packages/ml/package.json
index d1d21234d1..4f9111ab46 100644
--- a/packages/ml-vision/package.json
+++ b/packages/ml/package.json
@@ -1,8 +1,8 @@
{
- "name": "@react-native-firebase/ml-vision",
+ "name": "@react-native-firebase/ml",
"version": "7.4.13",
"author": "Invertase (http://invertase.io)",
- "description": "React Native Firebase - Firebase ML Kit brings the power of machine learning vision to your React Native application, supporting both Android & iOS.",
+ "description": "React Native Firebase - Firebase ML brings the power of machine learning vision to your React Native application, supporting both Android & iOS.",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
@@ -12,24 +12,18 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/invertase/react-native-firebase/tree/master/packages/ml-vision"
+ "url": "https://github.com/invertase/react-native-firebase/tree/master/packages/ml"
},
"license": "Apache-2.0",
"keywords": [
"react",
"react-native",
"firebase",
- "mlkit",
+ "ml",
"machine learning",
"text recognition",
"landmark recognition",
- "image labeler",
- "face detector",
- "barcode",
- "label",
- "natural language",
- "nlp",
- "vision"
+ "image labeler"
],
"peerDependencies": {
"@react-native-firebase/app": "8.4.7"
diff --git a/packages/ml/type-test.ts b/packages/ml/type-test.ts
new file mode 100644
index 0000000000..42313332a8
--- /dev/null
+++ b/packages/ml/type-test.ts
@@ -0,0 +1,37 @@
+import firebase from '@react-native-firebase/app';
+import * as ml from '@react-native-firebase/ml';
+
+console.log(ml.default().app);
+
+// checks module exists at root
+console.log(firebase.ml().app.name);
+
+// checks module exists at app level
+console.log(firebase.app().ml().app.name);
+
+// checks statics exist
+console.log(firebase.ml.SDK_VERSION);
+
+// checks statics exist on defaultExport
+console.log(firebase.SDK_VERSION);
+
+// checks root exists
+console.log(firebase.SDK_VERSION);
+
+// checks firebase named export exists on module
+console.log(ml.firebase.SDK_VERSION);
+
+// checks multi-app support exists
+console.log(firebase.ml(firebase.app()).app.name);
+
+// checks default export supports app arg
+console.log(firebase.ml(firebase.app('foo')).app.name);
+
+console.log(firebase.ml.MLCloudTextRecognizerModelType.DENSE_MODEL);
+console.log(ml.MLCloudTextRecognizerModelType.SPARSE_MODEL);
+
+console.log(firebase.ml.MLDocumentTextRecognizedBreakType.EOL_SURE_SPACE);
+console.log(ml.MLDocumentTextRecognizedBreakType.HYPHEN);
+
+console.log(firebase.ml.MLCloudLandmarkRecognizerModelType.LATEST_MODEL);
+console.log(ml.MLCloudLandmarkRecognizerModelType.STABLE_MODEL);
diff --git a/tests/app.js b/tests/app.js
index e1c01c1487..0ddfed57b9 100644
--- a/tests/app.js
+++ b/tests/app.js
@@ -29,8 +29,7 @@ import '@react-native-firebase/functions';
import '@react-native-firebase/iid';
import '@react-native-firebase/in-app-messaging';
import '@react-native-firebase/messaging';
-import '@react-native-firebase/ml-natural-language';
-import '@react-native-firebase/ml-vision';
+import '@react-native-firebase/ml';
import '@react-native-firebase/perf';
import '@react-native-firebase/remote-config';
import '@react-native-firebase/storage';
diff --git a/tests/e2e/mocha.opts b/tests/e2e/mocha.opts
index f2b52f0b57..277057ef9f 100644
--- a/tests/e2e/mocha.opts
+++ b/tests/e2e/mocha.opts
@@ -12,7 +12,8 @@
../packages/analytics/e2e/*.e2e.js
-../packages/auth/e2e/*.e2e.js
+# FIXME temporary, API limits make these failure-prone, toggled off during development
+#../packages/auth/e2e/*.e2e.js
# TODO a lot of these failing on CI - might be an API rate limit change
# ../packages/admob/e2e/*.e2e.js
@@ -29,10 +30,8 @@
../packages/remote-config/e2e/*.e2e.js
-../packages/ml-natural-language/e2e/*.e2e.js
-
# TODO - ci crashing Android
-# ../packages/ml-vision/e2e/*.e2e.js
+../packages/ml/e2e/*.e2e.js
../packages/in-app-messaging/e2e/*.e2e.js
diff --git a/tests/firebase.json b/tests/firebase.json
index f1df7b7dff..e5d42e83e1 100644
--- a/tests/firebase.json
+++ b/tests/firebase.json
@@ -9,23 +9,12 @@
"crashlytics_disable_auto_disabler": false,
"crashlytics_auto_collection_enabled": true,
- "ml_natural_language_language_id_model" : true,
- "ml_natural_language_smart_reply_model" : true,
-
- "ml_vision_face_model" : true,
- "ml_vision_ocr_model" : true,
- "ml_vision_barcode_model" : true,
-
"messaging_auto_init_enabled": true,
"messaging_android_headless_task_timeout": 30000,
"messaging_android_notification_channel_id": "",
"messaging_android_notification_color": "@color/hotpink",
"messaging_ios_auto_register_for_remote_messages": true,
- "ml_vision_label_model": true,
- "ml_vision_image_label_model": true,
-
- "TODO_ml_natural_language_translate_model" : true,
"TODO_analytics_auto_collection_enabled": true,
"TODO_perf_auto_collection_enabled": true,
"TODO_in_app_messaging_auto_collection_enabled": true,
diff --git a/tests/ios/Podfile b/tests/ios/Podfile
index 79efea04e6..670f206d7f 100644
--- a/tests/ios/Podfile
+++ b/tests/ios/Podfile
@@ -1,12 +1,8 @@
-platform :ios, '9.0'
-
-# Allow using RNFirebase as static frameworks
+platform :ios, '10.0'
$RNFirebaseAsStaticFramework = false
# Version override testing
-$FirebaseSDKVersion = '6.34.0'
-# $FabricSDKVersion = '1.6.0'
-# $CrashlyticsSDKVersion = '3.1.0'
+$FirebaseSDKVersion = '7.0.0'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
@@ -45,7 +41,7 @@ target 'testing' do
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
use_native_modules!
- #pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :branch => 'master'
+ pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :branch => 'master'
end
post_install do |installer|
diff --git a/tests/ios/Podfile.lock b/tests/ios/Podfile.lock
index 6ed96bba33..722a2aa11b 100644
--- a/tests/ios/Podfile.lock
+++ b/tests/ios/Podfile.lock
@@ -1,224 +1,5 @@
PODS:
- - abseil/algorithm (0.20200225.0):
- - abseil/algorithm/algorithm (= 0.20200225.0)
- - abseil/algorithm/container (= 0.20200225.0)
- - abseil/algorithm/algorithm (0.20200225.0):
- - abseil/base/config
- - abseil/algorithm/container (0.20200225.0):
- - abseil/algorithm/algorithm
- - abseil/base/core_headers
- - abseil/meta/type_traits
- - abseil/base (0.20200225.0):
- - abseil/base/atomic_hook (= 0.20200225.0)
- - abseil/base/base (= 0.20200225.0)
- - abseil/base/base_internal (= 0.20200225.0)
- - abseil/base/bits (= 0.20200225.0)
- - abseil/base/config (= 0.20200225.0)
- - abseil/base/core_headers (= 0.20200225.0)
- - abseil/base/dynamic_annotations (= 0.20200225.0)
- - abseil/base/endian (= 0.20200225.0)
- - abseil/base/errno_saver (= 0.20200225.0)
- - abseil/base/exponential_biased (= 0.20200225.0)
- - abseil/base/log_severity (= 0.20200225.0)
- - abseil/base/malloc_internal (= 0.20200225.0)
- - abseil/base/periodic_sampler (= 0.20200225.0)
- - abseil/base/pretty_function (= 0.20200225.0)
- - abseil/base/raw_logging_internal (= 0.20200225.0)
- - abseil/base/spinlock_wait (= 0.20200225.0)
- - abseil/base/throw_delegate (= 0.20200225.0)
- - abseil/base/atomic_hook (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/base (0.20200225.0):
- - abseil/base/atomic_hook
- - abseil/base/base_internal
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/dynamic_annotations
- - abseil/base/log_severity
- - abseil/base/raw_logging_internal
- - abseil/base/spinlock_wait
- - abseil/meta/type_traits
- - abseil/base/base_internal (0.20200225.0):
- - abseil/base/config
- - abseil/meta/type_traits
- - abseil/base/bits (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/config (0.20200225.0)
- - abseil/base/core_headers (0.20200225.0):
- - abseil/base/config
- - abseil/base/dynamic_annotations (0.20200225.0)
- - abseil/base/endian (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/errno_saver (0.20200225.0):
- - abseil/base/config
- - abseil/base/exponential_biased (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/log_severity (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/malloc_internal (0.20200225.0):
- - abseil/base/base
- - abseil/base/base_internal
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/dynamic_annotations
- - abseil/base/raw_logging_internal
- - abseil/base/periodic_sampler (0.20200225.0):
- - abseil/base/core_headers
- - abseil/base/exponential_biased
- - abseil/base/pretty_function (0.20200225.0)
- - abseil/base/raw_logging_internal (0.20200225.0):
- - abseil/base/atomic_hook
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/log_severity
- - abseil/base/spinlock_wait (0.20200225.0):
- - abseil/base/base_internal
- - abseil/base/core_headers
- - abseil/base/errno_saver
- - abseil/base/throw_delegate (0.20200225.0):
- - abseil/base/config
- - abseil/base/raw_logging_internal
- - abseil/container/compressed_tuple (0.20200225.0):
- - abseil/utility/utility
- - abseil/container/inlined_vector (0.20200225.0):
- - abseil/algorithm/algorithm
- - abseil/base/core_headers
- - abseil/base/throw_delegate
- - abseil/container/inlined_vector_internal
- - abseil/memory/memory
- - abseil/container/inlined_vector_internal (0.20200225.0):
- - abseil/base/core_headers
- - abseil/container/compressed_tuple
- - abseil/memory/memory
- - abseil/meta/type_traits
- - abseil/types/span
- - abseil/memory (0.20200225.0):
- - abseil/memory/memory (= 0.20200225.0)
- - abseil/memory/memory (0.20200225.0):
- - abseil/base/core_headers
- - abseil/meta/type_traits
- - abseil/meta (0.20200225.0):
- - abseil/meta/type_traits (= 0.20200225.0)
- - abseil/meta/type_traits (0.20200225.0):
- - abseil/base/config
- - abseil/numeric/int128 (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/strings/internal (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/endian
- - abseil/base/raw_logging_internal
- - abseil/meta/type_traits
- - abseil/strings/str_format (0.20200225.0):
- - abseil/strings/str_format_internal
- - abseil/strings/str_format_internal (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/meta/type_traits
- - abseil/numeric/int128
- - abseil/strings/strings
- - abseil/types/span
- - abseil/strings/strings (0.20200225.0):
- - abseil/base/base
- - abseil/base/bits
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/base/endian
- - abseil/base/raw_logging_internal
- - abseil/base/throw_delegate
- - abseil/memory/memory
- - abseil/meta/type_traits
- - abseil/numeric/int128
- - abseil/strings/internal
- - abseil/time (0.20200225.0):
- - abseil/time/internal (= 0.20200225.0)
- - abseil/time/time (= 0.20200225.0)
- - abseil/time/internal (0.20200225.0):
- - abseil/time/internal/cctz (= 0.20200225.0)
- - abseil/time/internal/cctz (0.20200225.0):
- - abseil/time/internal/cctz/civil_time (= 0.20200225.0)
- - abseil/time/internal/cctz/time_zone (= 0.20200225.0)
- - abseil/time/internal/cctz/civil_time (0.20200225.0):
- - abseil/base/config
- - abseil/time/internal/cctz/time_zone (0.20200225.0):
- - abseil/base/config
- - abseil/time/internal/cctz/civil_time
- - abseil/time/time (0.20200225.0):
- - abseil/base/base
- - abseil/base/core_headers
- - abseil/base/raw_logging_internal
- - abseil/numeric/int128
- - abseil/strings/strings
- - abseil/time/internal/cctz/civil_time
- - abseil/time/internal/cctz/time_zone
- - abseil/types (0.20200225.0):
- - abseil/types/any (= 0.20200225.0)
- - abseil/types/bad_any_cast (= 0.20200225.0)
- - abseil/types/bad_any_cast_impl (= 0.20200225.0)
- - abseil/types/bad_optional_access (= 0.20200225.0)
- - abseil/types/bad_variant_access (= 0.20200225.0)
- - abseil/types/compare (= 0.20200225.0)
- - abseil/types/optional (= 0.20200225.0)
- - abseil/types/span (= 0.20200225.0)
- - abseil/types/variant (= 0.20200225.0)
- - abseil/types/any (0.20200225.0):
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/meta/type_traits
- - abseil/types/bad_any_cast
- - abseil/utility/utility
- - abseil/types/bad_any_cast (0.20200225.0):
- - abseil/base/config
- - abseil/types/bad_any_cast_impl
- - abseil/types/bad_any_cast_impl (0.20200225.0):
- - abseil/base/config
- - abseil/base/raw_logging_internal
- - abseil/types/bad_optional_access (0.20200225.0):
- - abseil/base/config
- - abseil/base/raw_logging_internal
- - abseil/types/bad_variant_access (0.20200225.0):
- - abseil/base/config
- - abseil/base/raw_logging_internal
- - abseil/types/compare (0.20200225.0):
- - abseil/base/core_headers
- - abseil/meta/type_traits
- - abseil/types/optional (0.20200225.0):
- - abseil/base/base_internal
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/memory/memory
- - abseil/meta/type_traits
- - abseil/types/bad_optional_access
- - abseil/utility/utility
- - abseil/types/span (0.20200225.0):
- - abseil/algorithm/algorithm
- - abseil/base/core_headers
- - abseil/base/throw_delegate
- - abseil/meta/type_traits
- - abseil/types/variant (0.20200225.0):
- - abseil/base/base_internal
- - abseil/base/config
- - abseil/base/core_headers
- - abseil/meta/type_traits
- - abseil/types/bad_variant_access
- - abseil/utility/utility
- - abseil/utility/utility (0.20200225.0):
- - abseil/base/base_internal
- - abseil/base/config
- - abseil/meta/type_traits
- boost-for-react-native (1.63.0)
- - BoringSSL-GRPC (0.0.7):
- - BoringSSL-GRPC/Implementation (= 0.0.7)
- - BoringSSL-GRPC/Interface (= 0.0.7)
- - BoringSSL-GRPC/Implementation (0.0.7):
- - BoringSSL-GRPC/Interface (= 0.0.7)
- - BoringSSL-GRPC/Interface (0.0.7)
- DoubleConversion (1.1.6)
- FBLazyVector (0.62.2)
- FBReactNativeSpec (0.62.2):
@@ -228,214 +9,154 @@ PODS:
- React-Core (= 0.62.2)
- React-jsi (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.62.2)
- - Firebase/AdMob (6.34.0):
+ - Firebase/AdMob (7.0.0):
- Firebase/CoreOnly
- - Google-Mobile-Ads-SDK (~> 7.63)
- - Firebase/Analytics (6.34.0):
+ - Google-Mobile-Ads-SDK (~> 7.66)
+ - Firebase/Analytics (7.0.0):
- Firebase/Core
- - Firebase/Auth (6.34.0):
+ - Firebase/Auth (7.0.0):
- Firebase/CoreOnly
- - FirebaseAuth (~> 6.9.2)
- - Firebase/Core (6.34.0):
+ - FirebaseAuth (~> 7.0.0)
+ - Firebase/Core (7.0.0):
- Firebase/CoreOnly
- - FirebaseAnalytics (= 6.9.0)
- - Firebase/CoreOnly (6.34.0):
- - FirebaseCore (= 6.10.4)
- - Firebase/Crashlytics (6.34.0):
+ - FirebaseAnalytics (= 7.0.0)
+ - Firebase/CoreOnly (7.0.0):
+ - FirebaseCore (= 7.0.0)
+ - Firebase/Crashlytics (7.0.0):
- Firebase/CoreOnly
- - FirebaseCrashlytics (~> 4.6.2)
- - Firebase/Database (6.34.0):
+ - FirebaseCrashlytics (~> 7.0.0)
+ - Firebase/Database (7.0.0):
- Firebase/CoreOnly
- - FirebaseDatabase (~> 6.6.0)
- - Firebase/DynamicLinks (6.34.0):
+ - FirebaseDatabase (~> 7.0.0)
+ - Firebase/DynamicLinks (7.0.0):
- Firebase/CoreOnly
- - FirebaseDynamicLinks (~> 4.3.1)
- - Firebase/Firestore (6.34.0):
+ - FirebaseDynamicLinks (~> 7.0.0)
+ - Firebase/Firestore (7.0.0):
- Firebase/CoreOnly
- - FirebaseFirestore (~> 1.19.0)
- - Firebase/Functions (6.34.0):
+ - FirebaseFirestore (~> 7.0.0)
+ - Firebase/Functions (7.0.0):
- Firebase/CoreOnly
- - FirebaseFunctions (~> 2.9.0)
- - Firebase/InAppMessaging (6.34.0):
+ - FirebaseFunctions (~> 7.0.0)
+ - Firebase/InAppMessaging (7.0.0):
- Firebase/CoreOnly
- - FirebaseInAppMessaging (~> 0.24.0)
- - Firebase/Messaging (6.34.0):
+ - FirebaseInAppMessaging (~> 7.0.0-beta)
+ - Firebase/Messaging (7.0.0):
- Firebase/CoreOnly
- - FirebaseMessaging (~> 4.7.1)
- - Firebase/MLCommon (6.34.0):
+ - FirebaseMessaging (~> 7.0.0)
+ - Firebase/MLVision (7.0.0):
- Firebase/CoreOnly
- - FirebaseMLCommon (~> 0.21.0)
- - Firebase/MLNaturalLanguage (6.34.0):
+ - FirebaseMLVision (~> 7.0.0-beta)
+ - Firebase/Performance (7.0.0):
- Firebase/CoreOnly
- - FirebaseMLNaturalLanguage (~> 0.18.0)
- - Firebase/MLNLLanguageID (6.34.0):
+ - FirebasePerformance (~> 7.0.0)
+ - Firebase/RemoteConfig (7.0.0):
- Firebase/CoreOnly
- - FirebaseMLNLLanguageID (~> 0.18.0)
- - Firebase/MLNLSmartReply (6.34.0):
+ - FirebaseRemoteConfig (~> 7.0.0)
+ - Firebase/Storage (7.0.0):
- Firebase/CoreOnly
- - FirebaseMLNLSmartReply (~> 0.18.0)
- - Firebase/MLVision (6.34.0):
- - Firebase/CoreOnly
- - FirebaseMLVision (~> 0.21.0)
- - Firebase/MLVisionBarcodeModel (6.34.0):
- - Firebase/CoreOnly
- - FirebaseMLVisionBarcodeModel (~> 0.21.0)
- - Firebase/MLVisionFaceModel (6.34.0):
- - Firebase/CoreOnly
- - FirebaseMLVisionFaceModel (~> 0.21.0)
- - Firebase/MLVisionLabelModel (6.34.0):
- - Firebase/CoreOnly
- - FirebaseMLVisionLabelModel (~> 0.21.0)
- - Firebase/MLVisionTextModel (6.34.0):
- - Firebase/CoreOnly
- - FirebaseMLVisionTextModel (~> 0.21.0)
- - Firebase/Performance (6.34.0):
- - Firebase/CoreOnly
- - FirebasePerformance (~> 3.3.1)
- - Firebase/RemoteConfig (6.34.0):
- - Firebase/CoreOnly
- - FirebaseRemoteConfig (~> 4.9.1)
- - Firebase/Storage (6.34.0):
- - Firebase/CoreOnly
- - FirebaseStorage (~> 3.9.1)
- - FirebaseABTesting (4.2.0):
- - FirebaseCore (~> 6.10)
- - FirebaseAnalytics (6.9.0):
- - FirebaseCore (~> 6.10)
- - FirebaseInstallations (~> 1.7)
- - GoogleAppMeasurement (= 6.9.0)
- - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- - GoogleUtilities/MethodSwizzler (~> 6.7)
- - GoogleUtilities/Network (~> 6.7)
- - "GoogleUtilities/NSData+zlib (~> 6.7)"
- - nanopb (~> 1.30906.0)
- - FirebaseAuth (6.9.2):
- - FirebaseCore (~> 6.10)
- - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- - GoogleUtilities/Environment (~> 6.7)
- - GTMSessionFetcher/Core (~> 1.1)
- - FirebaseCore (6.10.4):
- - FirebaseCoreDiagnostics (~> 1.6)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/Logger (~> 6.7)
- - FirebaseCoreDiagnostics (1.7.0):
- - GoogleDataTransport (~> 7.4)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/Logger (~> 6.7)
- - nanopb (~> 1.30906.0)
- - FirebaseCrashlytics (4.6.2):
- - FirebaseCore (~> 6.10)
- - FirebaseInstallations (~> 1.6)
- - GoogleDataTransport (~> 7.2)
- - nanopb (~> 1.30906.0)
+ - FirebaseStorage (~> 7.0.0)
+ - FirebaseABTesting (7.1.0):
+ - FirebaseCore (~> 7.0)
+ - FirebaseAnalytics (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
+ - GoogleAppMeasurement (= 7.0.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
+ - GoogleUtilities/MethodSwizzler (~> 7.0)
+ - GoogleUtilities/Network (~> 7.0)
+ - "GoogleUtilities/NSData+zlib (~> 7.0)"
+ - nanopb (~> 2.30906.0)
+ - FirebaseAuth (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GTMSessionFetcher/Core (~> 1.4)
+ - FirebaseCore (7.0.0):
+ - FirebaseCoreDiagnostics (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GoogleUtilities/Logger (~> 7.0)
+ - FirebaseCoreDiagnostics (7.1.0):
+ - GoogleDataTransport (~> 8.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GoogleUtilities/Logger (~> 7.0)
+ - nanopb (~> 2.30906.0)
+ - FirebaseCrashlytics (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
+ - GoogleDataTransport (~> 8.0)
+ - nanopb (~> 2.30906.0)
- PromisesObjC (~> 1.2)
- - FirebaseDatabase (6.6.0):
- - FirebaseCore (~> 6.10)
- - leveldb-library (~> 1.22)
- - FirebaseDynamicLinks (4.3.1):
- - FirebaseCore (~> 6.10)
- - FirebaseFirestore (1.19.0):
- - abseil/algorithm (= 0.20200225.0)
- - abseil/base (= 0.20200225.0)
- - abseil/memory (= 0.20200225.0)
- - abseil/meta (= 0.20200225.0)
- - abseil/strings/strings (= 0.20200225.0)
- - abseil/time (= 0.20200225.0)
- - abseil/types (= 0.20200225.0)
- - FirebaseCore (~> 6.10)
- - "gRPC-C++ (~> 1.28.0)"
+ - FirebaseDatabase (7.0.0):
+ - FirebaseCore (~> 7.0)
- leveldb-library (~> 1.22)
- - nanopb (~> 1.30906.0)
- - FirebaseFunctions (2.9.0):
- - FirebaseCore (~> 6.10)
- - GTMSessionFetcher/Core (~> 1.1)
- - FirebaseInAppMessaging (0.24.0):
- - FirebaseABTesting (~> 4.2)
- - FirebaseCore (~> 6.10)
- - FirebaseInstallations (~> 1.6)
- - GoogleUtilities/Environment (~> 6.7)
- - nanopb (~> 1.30906.0)
- - FirebaseInstallations (1.7.0):
- - FirebaseCore (~> 6.10)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/UserDefaults (~> 6.7)
+ - FirebaseDynamicLinks (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - FirebaseFirestore (7.0.0)
+ - FirebaseFunctions (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - GTMSessionFetcher/Core (~> 1.4)
+ - FirebaseInAppMessaging (7.0.0-beta):
+ - FirebaseABTesting (~> 7.0)
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - nanopb (~> 2.30906.0)
+ - FirebaseInstallations (7.1.0):
+ - FirebaseCore (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GoogleUtilities/UserDefaults (~> 7.0)
- PromisesObjC (~> 1.2)
- - FirebaseInstanceID (4.8.0):
- - FirebaseCore (~> 6.10)
- - FirebaseInstallations (~> 1.6)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/UserDefaults (~> 6.7)
- - FirebaseMessaging (4.7.1):
- - FirebaseCore (~> 6.10)
- - FirebaseInstanceID (~> 4.7)
- - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- - GoogleUtilities/Environment (~> 6.7)
- - GoogleUtilities/Reachability (~> 6.7)
- - GoogleUtilities/UserDefaults (~> 6.7)
- - Protobuf (>= 3.9.2, ~> 3.9)
- - FirebaseMLCommon (0.21.0):
- - FirebaseCore (~> 6.9)
- - FirebaseInstallations (~> 1.5)
- - GoogleToolboxForMac/Logger (~> 2.1)
- - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
- - GoogleUtilities/UserDefaults (~> 6.0)
- - GTMSessionFetcher/Core (~> 1.1)
- - Protobuf (~> 3.12)
- - FirebaseMLNaturalLanguage (0.18.0):
- - FirebaseCore (~> 6.9)
- - FirebaseMLCommon (~> 0.21)
+ - FirebaseInstanceID (7.1.0):
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GoogleUtilities/UserDefaults (~> 7.0)
+ - FirebaseMessaging (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstanceID (~> 7.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GoogleUtilities/Reachability (~> 7.0)
+ - GoogleUtilities/UserDefaults (~> 7.0)
+ - FirebaseMLCommon (7.1.0-beta):
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
+ - GoogleUtilities/UserDefaults (~> 7.0)
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.12)
- - FirebaseMLNLLanguageID (0.18.0):
- - FirebaseCore (~> 6.9)
- - FirebaseMLNaturalLanguage (~> 0.18)
- - FirebaseMLNLSmartReply (0.18.0):
- - FirebaseCore (~> 6.9)
- - FirebaseMLNaturalLanguage (~> 0.18)
- - FirebaseMLNLLanguageID (~> 0.18)
- - FirebaseRemoteConfig (~> 4.7)
- - FirebaseMLVision (0.21.0):
- - FirebaseCore (~> 6.9)
- - FirebaseMLCommon (~> 0.21)
+ - FirebaseMLVision (7.0.0-beta):
+ - FirebaseCore (~> 7.0)
+ - FirebaseMLCommon (~> 7.0-beta)
- GoogleAPIClientForREST/Core (~> 1.3)
- GoogleAPIClientForREST/Vision (~> 1.3)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.12)
- - FirebaseMLVisionBarcodeModel (0.21.0):
- - FirebaseMLVision (~> 0.21)
- - FirebaseMLVisionFaceModel (0.21.0):
- - FirebaseMLVision (~> 0.21)
- - FirebaseMLVisionLabelModel (0.21.0):
- - FirebaseMLVision (~> 0.21)
- - FirebaseMLVisionTextModel (0.21.0):
- - FirebaseMLVision (~> 0.21)
- - FirebasePerformance (3.3.1):
- - FirebaseCore (~> 6.9)
- - FirebaseInstallations (~> 1.5)
- - FirebaseRemoteConfig (~> 4.7)
- - GoogleDataTransport (~> 7.0)
+ - FirebasePerformance (7.0.1):
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
+ - FirebaseRemoteConfig (~> 7.0)
+ - GoogleDataTransport (~> 8.0)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- - GoogleUtilities/Environment (~> 6.2)
- - GoogleUtilities/ISASwizzler (~> 6.2)
- - GoogleUtilities/MethodSwizzler (~> 6.2)
+ - GoogleUtilities/Environment (~> 7.0)
+ - GoogleUtilities/ISASwizzler (~> 7.0)
+ - GoogleUtilities/MethodSwizzler (~> 7.0)
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.12)
- - FirebaseRemoteConfig (4.9.1):
- - FirebaseABTesting (~> 4.2)
- - FirebaseCore (~> 6.10)
- - FirebaseInstallations (~> 1.6)
- - GoogleUtilities/Environment (~> 6.7)
- - "GoogleUtilities/NSData+zlib (~> 6.7)"
- - FirebaseStorage (3.9.1):
- - FirebaseCore (~> 6.10)
- - GTMSessionFetcher/Core (~> 1.1)
+ - FirebaseRemoteConfig (7.0.0):
+ - FirebaseABTesting (~> 7.0)
+ - FirebaseCore (~> 7.0)
+ - FirebaseInstallations (~> 7.0)
+ - GoogleUtilities/Environment (~> 7.0)
+ - "GoogleUtilities/NSData+zlib (~> 7.0)"
+ - FirebaseStorage (7.0.0):
+ - FirebaseCore (~> 7.0)
+ - GTMSessionFetcher/Core (~> 1.4)
- Folly (2018.10.22.00):
- boost-for-react-native
- DoubleConversion
@@ -446,92 +167,68 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- - Google-Mobile-Ads-SDK (7.66.0):
- - GoogleAppMeasurement (~> 6.0)
+ - Google-Mobile-Ads-SDK (7.68.0):
+ - GoogleAppMeasurement (~> 7.0)
- GoogleUserMessagingPlatform (~> 1.1)
- - GoogleAPIClientForREST/Core (1.4.3):
+ - GoogleAPIClientForREST/Core (1.5.1):
- GTMSessionFetcher (>= 1.1.7)
- - GoogleAPIClientForREST/Vision (1.4.3):
+ - GoogleAPIClientForREST/Vision (1.5.1):
- GoogleAPIClientForREST/Core
- GTMSessionFetcher (>= 1.1.7)
- - GoogleAppMeasurement (6.9.0):
- - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- - GoogleUtilities/MethodSwizzler (~> 6.7)
- - GoogleUtilities/Network (~> 6.7)
- - "GoogleUtilities/NSData+zlib (~> 6.7)"
- - nanopb (~> 1.30906.0)
- - GoogleDataTransport (7.5.1):
- - nanopb (~> 1.30906.0)
- - GoogleToolboxForMac/DebugUtils (2.2.2):
- - GoogleToolboxForMac/Defines (= 2.2.2)
- - GoogleToolboxForMac/Defines (2.2.2)
- - GoogleToolboxForMac/Logger (2.2.2):
- - GoogleToolboxForMac/Defines (= 2.2.2)
- - "GoogleToolboxForMac/NSData+zlib (2.2.2)":
- - GoogleToolboxForMac/Defines (= 2.2.2)
- - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.2)":
- - GoogleToolboxForMac/DebugUtils (= 2.2.2)
- - GoogleToolboxForMac/Defines (= 2.2.2)
- - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.2)"
- - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)"
- - GoogleUserMessagingPlatform (1.2.0)
- - GoogleUtilities/AppDelegateSwizzler (6.7.2):
+ - GoogleAppMeasurement (7.0.0):
+ - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
+ - GoogleUtilities/MethodSwizzler (~> 7.0)
+ - GoogleUtilities/Network (~> 7.0)
+ - "GoogleUtilities/NSData+zlib (~> 7.0)"
+ - nanopb (~> 2.30906.0)
+ - GoogleDataTransport (8.0.1):
+ - nanopb (~> 2.30906.0)
+ - GoogleToolboxForMac/DebugUtils (2.3.0):
+ - GoogleToolboxForMac/Defines (= 2.3.0)
+ - GoogleToolboxForMac/Defines (2.3.0)
+ - GoogleToolboxForMac/Logger (2.3.0):
+ - GoogleToolboxForMac/Defines (= 2.3.0)
+ - "GoogleToolboxForMac/NSData+zlib (2.3.0)":
+ - GoogleToolboxForMac/Defines (= 2.3.0)
+ - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.0)":
+ - GoogleToolboxForMac/DebugUtils (= 2.3.0)
+ - GoogleToolboxForMac/Defines (= 2.3.0)
+ - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.0)"
+ - "GoogleToolboxForMac/NSString+URLArguments (2.3.0)"
+ - GoogleUserMessagingPlatform (1.3.0)
+ - GoogleUtilities/AppDelegateSwizzler (7.1.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- - GoogleUtilities/Environment (6.7.2):
+ - GoogleUtilities/Environment (7.1.0):
- PromisesObjC (~> 1.2)
- - GoogleUtilities/ISASwizzler (6.7.2)
- - GoogleUtilities/Logger (6.7.2):
+ - GoogleUtilities/ISASwizzler (7.1.0)
+ - GoogleUtilities/Logger (7.1.0):
- GoogleUtilities/Environment
- - GoogleUtilities/MethodSwizzler (6.7.2):
+ - GoogleUtilities/MethodSwizzler (7.1.0):
- GoogleUtilities/Logger
- - GoogleUtilities/Network (6.7.2):
+ - GoogleUtilities/Network (7.1.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (6.7.2)"
- - GoogleUtilities/Reachability (6.7.2):
+ - "GoogleUtilities/NSData+zlib (7.1.0)"
+ - GoogleUtilities/Reachability (7.1.0):
- GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (6.7.2):
+ - GoogleUtilities/UserDefaults (7.1.0):
- GoogleUtilities/Logger
- - "gRPC-C++ (1.28.2)":
- - "gRPC-C++/Implementation (= 1.28.2)"
- - "gRPC-C++/Interface (= 1.28.2)"
- - "gRPC-C++/Implementation (1.28.2)":
- - abseil/container/inlined_vector (= 0.20200225.0)
- - abseil/memory/memory (= 0.20200225.0)
- - abseil/strings/str_format (= 0.20200225.0)
- - abseil/strings/strings (= 0.20200225.0)
- - abseil/types/optional (= 0.20200225.0)
- - "gRPC-C++/Interface (= 1.28.2)"
- - gRPC-Core (= 1.28.2)
- - "gRPC-C++/Interface (1.28.2)"
- - gRPC-Core (1.28.2):
- - gRPC-Core/Implementation (= 1.28.2)
- - gRPC-Core/Interface (= 1.28.2)
- - gRPC-Core/Implementation (1.28.2):
- - abseil/container/inlined_vector (= 0.20200225.0)
- - abseil/memory/memory (= 0.20200225.0)
- - abseil/strings/str_format (= 0.20200225.0)
- - abseil/strings/strings (= 0.20200225.0)
- - abseil/types/optional (= 0.20200225.0)
- - BoringSSL-GRPC (= 0.0.7)
- - gRPC-Core/Interface (= 1.28.2)
- - gRPC-Core/Interface (1.28.2)
- - GTMSessionFetcher (1.4.0):
- - GTMSessionFetcher/Full (= 1.4.0)
- - GTMSessionFetcher/Core (1.4.0)
- - GTMSessionFetcher/Full (1.4.0):
- - GTMSessionFetcher/Core (= 1.4.0)
+ - GTMSessionFetcher (1.5.0):
+ - GTMSessionFetcher/Full (= 1.5.0)
+ - GTMSessionFetcher/Core (1.5.0)
+ - GTMSessionFetcher/Full (1.5.0):
+ - GTMSessionFetcher/Core (= 1.5.0)
- Jet (0.6.6-0):
- React
- leveldb-library (1.22)
- - nanopb (1.30906.0):
- - nanopb/decode (= 1.30906.0)
- - nanopb/encode (= 1.30906.0)
- - nanopb/decode (1.30906.0)
- - nanopb/encode (1.30906.0)
+ - nanopb (2.30906.0):
+ - nanopb/decode (= 2.30906.0)
+ - nanopb/encode (= 2.30906.0)
+ - nanopb/decode (2.30906.0)
+ - nanopb/encode (2.30906.0)
- PersonalizedAdConsent (1.0.5)
- PromisesObjC (1.2.11)
- Protobuf (3.13.0)
@@ -757,81 +454,70 @@ PODS:
- React-cxxreact (= 0.62.2)
- React-jsi (= 0.62.2)
- ReactCommon/callinvoker (= 0.62.2)
- - RNFBAdMob (7.6.9):
- - Firebase/AdMob (= 6.34.0)
+ - RNFBAdMob (7.6.10):
+ - Firebase/AdMob (= 7.0.0)
- PersonalizedAdConsent (~> 1.0.4)
- React-Core
- RNFBApp
- - RNFBAnalytics (7.6.8):
- - Firebase/Analytics (= 6.34.0)
+ - RNFBAnalytics (7.6.10):
+ - Firebase/Analytics (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBApp (8.4.6):
- - Firebase/CoreOnly (= 6.34.0)
+ - RNFBApp (8.4.7):
+ - Firebase/CoreOnly (= 7.0.0)
- React-Core
- - RNFBAuth (9.3.1):
- - Firebase/Auth (= 6.34.0)
+ - RNFBAuth (9.3.3):
+ - Firebase/Auth (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBCrashlytics (8.4.11):
- - Firebase/Crashlytics (= 6.34.0)
+ - RNFBCrashlytics (8.5.0):
+ - Firebase/Crashlytics (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBDatabase (7.5.12):
- - Firebase/Database (= 6.34.0)
+ - RNFBDatabase (7.5.13):
+ - Firebase/Database (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBDynamicLinks (7.5.10):
- - Firebase/DynamicLinks (= 6.34.0)
+ - RNFBDynamicLinks (7.5.11):
+ - Firebase/DynamicLinks (= 7.0.0)
- GoogleUtilities/AppDelegateSwizzler
- React-Core
- RNFBApp
- - RNFBFirestore (7.8.7):
- - Firebase/Firestore (= 6.34.0)
+ - RNFBFirestore (7.10.0):
+ - Firebase/Firestore (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBFunctions (7.4.9):
- - Firebase/Functions (= 6.34.0)
+ - RNFBFunctions (7.4.10):
+ - Firebase/Functions (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBIid (7.4.9):
- - Firebase/CoreOnly (= 6.34.0)
+ - RNFBIid (7.4.10):
+ - Firebase/CoreOnly (= 7.0.0)
- FirebaseInstanceID
- React-Core
- RNFBApp
- - RNFBInAppMessaging (7.5.7):
- - Firebase/InAppMessaging (= 6.34.0)
+ - RNFBInAppMessaging (7.5.8):
+ - Firebase/InAppMessaging (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBMessaging (7.9.1):
- - Firebase/Messaging (= 6.34.0)
+ - RNFBMessaging (7.9.2):
+ - Firebase/Messaging (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBMLNaturalLanguage (7.4.9):
- - Firebase/MLCommon (= 6.34.0)
- - Firebase/MLNaturalLanguage (= 6.34.0)
- - Firebase/MLNLLanguageID (= 6.34.0)
- - Firebase/MLNLSmartReply (= 6.34.0)
+ - RNFBML (7.4.13):
+ - Firebase/MLVision (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBMLVision (7.4.11):
- - Firebase/MLVision (= 6.34.0)
- - Firebase/MLVisionBarcodeModel (= 6.34.0)
- - Firebase/MLVisionFaceModel (= 6.34.0)
- - Firebase/MLVisionLabelModel (= 6.34.0)
- - Firebase/MLVisionTextModel (= 6.34.0)
+ - RNFBPerf (7.4.10):
+ - Firebase/Performance (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBPerf (7.4.9):
- - Firebase/Performance (= 6.34.0)
+ - RNFBRemoteConfig (9.0.12):
+ - Firebase/RemoteConfig (= 7.0.0)
- React-Core
- RNFBApp
- - RNFBRemoteConfig (9.0.11):
- - Firebase/RemoteConfig (= 6.34.0)
- - React-Core
- - RNFBApp
- - RNFBStorage (7.4.10):
- - Firebase/Storage (= 6.34.0)
+ - RNFBStorage (7.4.12):
+ - Firebase/Storage (= 7.0.0)
- React-Core
- RNFBApp
- Yoga (1.14.0)
@@ -840,6 +526,7 @@ DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
+ - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, branch `master`)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- Jet (from `../node_modules/jet/ios`)
@@ -877,8 +564,7 @@ DEPENDENCIES:
- RNFBIid (from `../../packages/iid`)
- RNFBInAppMessaging (from `../../packages/in-app-messaging`)
- RNFBMessaging (from `../../packages/messaging`)
- - RNFBMLNaturalLanguage (from `../../packages/ml-natural-language`)
- - RNFBMLVision (from `../../packages/ml-vision`)
+ - RNFBML (from `../../packages/ml`)
- RNFBPerf (from `../../packages/perf`)
- RNFBRemoteConfig (from `../../packages/remote-config`)
- RNFBStorage (from `../../packages/storage`)
@@ -886,9 +572,7 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- - abseil
- boost-for-react-native
- - BoringSSL-GRPC
- Firebase
- FirebaseABTesting
- FirebaseAnalytics
@@ -898,21 +582,13 @@ SPEC REPOS:
- FirebaseCrashlytics
- FirebaseDatabase
- FirebaseDynamicLinks
- - FirebaseFirestore
- FirebaseFunctions
- FirebaseInAppMessaging
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMessaging
- FirebaseMLCommon
- - FirebaseMLNaturalLanguage
- - FirebaseMLNLLanguageID
- - FirebaseMLNLSmartReply
- FirebaseMLVision
- - FirebaseMLVisionBarcodeModel
- - FirebaseMLVisionFaceModel
- - FirebaseMLVisionLabelModel
- - FirebaseMLVisionTextModel
- FirebasePerformance
- FirebaseRemoteConfig
- FirebaseStorage
@@ -923,8 +599,6 @@ SPEC REPOS:
- GoogleToolboxForMac
- GoogleUserMessagingPlatform
- GoogleUtilities
- - "gRPC-C++"
- - gRPC-Core
- GTMSessionFetcher
- leveldb-library
- nanopb
@@ -939,6 +613,9 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
FBReactNativeSpec:
:path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
+ FirebaseFirestore:
+ :branch: master
+ :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
Folly:
:podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
glog:
@@ -1007,10 +684,8 @@ EXTERNAL SOURCES:
:path: "../../packages/in-app-messaging"
RNFBMessaging:
:path: "../../packages/messaging"
- RNFBMLNaturalLanguage:
- :path: "../../packages/ml-natural-language"
- RNFBMLVision:
- :path: "../../packages/ml-vision"
+ RNFBML:
+ :path: "../../packages/ml"
RNFBPerf:
:path: "../../packages/perf"
RNFBRemoteConfig:
@@ -1020,55 +695,49 @@ EXTERNAL SOURCES:
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
+CHECKOUT OPTIONS:
+ FirebaseFirestore:
+ :commit: 3d712e901b44cb4ca509844356040a2cb61ddf5a
+ :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
+
SPEC CHECKSUMS:
- abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
- BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245
FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e
- Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999
- FirebaseABTesting: 8a9d8df3acc2b43f4a22014ddf9f601bca6af699
- FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f
- FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3
- FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec
- FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
- FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb
- FirebaseDatabase: 13a865a4b85897462b930eb683bda8f52583713f
- FirebaseDynamicLinks: 6eac37d86910382eafb6315d952cc44c9e176094
- FirebaseFirestore: 9b2f1b9b9a6f2f0b6fb7484b9e32ab7e39243554
- FirebaseFunctions: 27518fdd14d8b3a849e2443f921cd1b471ab7acd
- FirebaseInAppMessaging: 9da48721c6ad1b5bdc2b1108f2d3d561eb2245ca
- FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
- FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
- FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
- FirebaseMLCommon: d218d75dd1c6c4e447f731ac22da56b88cb79431
- FirebaseMLNaturalLanguage: 32cccde63dfdf82341d570b3d4b24e746303d4cd
- FirebaseMLNLLanguageID: 1adfdf439843d836e8d741c5124b97ebac645334
- FirebaseMLNLSmartReply: 046bdc30bddbfbead3f5cbca97f28a26a316d346
- FirebaseMLVision: 68dd092b4c52a7ac163ec0d4f541d5711fc9fec6
- FirebaseMLVisionBarcodeModel: 394cd61c52dc03558088caf82b0dade8028f57d5
- FirebaseMLVisionFaceModel: a67b2bf9b8407127a0bdb0ba98eb265637d1dc9d
- FirebaseMLVisionLabelModel: c6922e607cf4549b14981c80bf0d69eb51a2b547
- FirebaseMLVisionTextModel: e9f3cba0f31022ae9dd3d246aff9849075cacd98
- FirebasePerformance: e325a8ee84a6a3d89c0be049390ed6c1775cce22
- FirebaseRemoteConfig: 35a729305f254fb15a2e541d4b36f3a379da7fdc
- FirebaseStorage: 15e0f15ef3c7fec3d1899d68623e47d4447066b4
+ Firebase: 50be68416f50eb4eb2ecb0e78acab9a051ef95df
+ FirebaseABTesting: aaea04ea67858a4a9dce0d22ef645477dff50146
+ FirebaseAnalytics: c1166b7990bae464c6436132510bb718c6680f80
+ FirebaseAuth: 228dd0faa5b5263eaa8c63518b16faef438289a3
+ FirebaseCore: cf3122185fce1cf71cedbbc498ea84d2b3e7cb69
+ FirebaseCoreDiagnostics: 872cdb9b749b23346dddd5c1014d1babd2257de3
+ FirebaseCrashlytics: bd430b7323e8b49492a93e563e81899d0615f917
+ FirebaseDatabase: 2481b48ebfd233ef591095d79d76720ea85cde74
+ FirebaseDynamicLinks: 71ed03780db3986e1bd386d6a1be44d09d4cd0ec
+ FirebaseFirestore: ce5009ceae3e07c96f9cc580d9b521b9ec0af857
+ FirebaseFunctions: 571aee227a021debe3e1092aa079f751623e233a
+ FirebaseInAppMessaging: b4c1ec3ea31d83f762d8087e78ce846159437f39
+ FirebaseInstallations: 3de38553e86171b5f81d83cdeef63473d37bfdb0
+ FirebaseInstanceID: 61e8d10a4192a582c6239378169d10e504ca8d91
+ FirebaseMessaging: ecf9e04716b7ff1f1d92debab4d6f0e6bdb490aa
+ FirebaseMLCommon: d10d915b2fd1b285f7b80694afa1a65d7fb90f5c
+ FirebaseMLVision: 39cfe86b963ce9db9216da6630529d3089254b9a
+ FirebasePerformance: feb172454ef6568c8246d5713b6e65fde9f2e384
+ FirebaseRemoteConfig: ff8d3542cbd919c9d3851fd544690b8848fc0402
+ FirebaseStorage: ea52bc7a1cb540406ed1e1acfc2bf3946621ed34
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
- Google-Mobile-Ads-SDK: 7d7074359c040f5add4e0963bf860e14690060d0
- GoogleAPIClientForREST: e2d95a611ac06a90d143c93bfd8597719f8b0938
- GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e
- GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
- GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
- GoogleUserMessagingPlatform: c85530d930ba509583aa5a6d50a10aca22cf8502
- GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
- "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
- gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
- GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
+ Google-Mobile-Ads-SDK: 29bbdb182d69ff606cc0301da1590b40be8d2205
+ GoogleAPIClientForREST: 4bb409633efcc2e1b3f945afe7e35039b5a61db2
+ GoogleAppMeasurement: 7790ef975d1d463c8614cd949a847e612edf087a
+ GoogleDataTransport: e4085e6762f36a6141738f46b0153473ce57fb18
+ GoogleToolboxForMac: 1350d40e86a76f7863928d63bcb0b89c84c521c5
+ GoogleUserMessagingPlatform: 1d4b6946710d18cec34742054092e2c2bddae61f
+ GoogleUtilities: f734da554aade8cc7928a31c2f3311897933a1bd
+ GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
Jet: 84fd0e2e9d49457fc04bc79b5d8857737a01c507
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
- nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
+ nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
PersonalizedAdConsent: dbecabb3467df967c16d9cebc2ef4a8890e4bbd8
PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
@@ -1091,25 +760,24 @@ SPEC CHECKSUMS:
React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d
React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256
ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3
- RNFBAdMob: 809f648889201406d333bc28a84bbf3294491f00
- RNFBAnalytics: 159651d6eae3c85db38ba5d694d8c6c46fd3883c
- RNFBApp: e0fc0113eecc07f440f17639c9b7c59ea90bc583
- RNFBAuth: 16207757fa69ad50ec8ca04964f59cd560979294
- RNFBCrashlytics: c85d01c3fb3a4cc1e762facb9d4ad26b95f7f9dc
- RNFBDatabase: 6c01157824702f4fc1cedf9b4b95e9f3154cfbf1
- RNFBDynamicLinks: 067d7419d8daf58b61faa70834b051410d5f6d4b
- RNFBFirestore: 64986e129f4980e73b6e510684286d986367bef6
- RNFBFunctions: ae7a279090e902cdf4da7890d64f31a0e4e2a825
- RNFBIid: f40ac75229f8bb86cc6dd0c71b450e7df693f8f3
- RNFBInAppMessaging: dda5e571edd579042fa1d68a685012daa871a3f6
- RNFBMessaging: 1d2a6a249cf6b93bed1721befc42650c45615112
- RNFBMLNaturalLanguage: 3662457b2e95b857bb9289d250b0a10bc10aca84
- RNFBMLVision: c2547c24b59298ebe4b90a2025600d60a6929930
- RNFBPerf: 0c08e45726f7a19487b79cef3d12ee7e917c8b7a
- RNFBRemoteConfig: 85df9235f46c20e293257b6e481412ac585e2966
- RNFBStorage: 72404d4977261c0d7060e87c3d0cf7f7e060c6a3
+ RNFBAdMob: 9fde71cdebb34b76c3563058b262838f3865f037
+ RNFBAnalytics: 20e6ac03857cab32df4511c41dbcac003cb1068a
+ RNFBApp: 28ebef9ae3051c4715c1e2397a5e9614f2ca8ffb
+ RNFBAuth: ce4d1e530ad01f460fa0a33e2dc7f95b41d0fc85
+ RNFBCrashlytics: 9fb5e40ec1f07d04b4be21452d1caf5ed94ca3cc
+ RNFBDatabase: f0d3d475f1c13c4d166ec946db4e3416dcd40422
+ RNFBDynamicLinks: 139d1cdf94467cb032050e32b95e9a2839f96f47
+ RNFBFirestore: c011591967b4dc15dd881a51500f5547f98939e7
+ RNFBFunctions: 442d72e42892dc6f6aa440080e10c46fdc488354
+ RNFBIid: de74265f2b4becca364dadbdfae969db26ba0889
+ RNFBInAppMessaging: 45729ef53490ebf9f82aea6829212ebcd9b61888
+ RNFBMessaging: 15c6fc8a5d000fe6f6d171c8b7513acf88261f08
+ RNFBML: 40bf23115d6a7b2648ffde19788cca83691d51a4
+ RNFBPerf: c10267695cbc2012167b063a3c86a436d296b5b6
+ RNFBRemoteConfig: 6615b43b44dff4e5b70378ad2d28fb35387ecd48
+ RNFBStorage: 85c103535ef5aef331c7e99d8e9953189c8e3bba
Yoga: 3ebccbdd559724312790e7742142d062476b698e
-PODFILE CHECKSUM: 2b670e97319c5057f900292e8500c4c38d83aa3c
+PODFILE CHECKSUM: 422b670abe2e89213edbefb2e24475c616f0b76e
COCOAPODS: 1.10.0
diff --git a/tests/ios/testing.xcodeproj/project.pbxproj b/tests/ios/testing.xcodeproj/project.pbxproj
index 94031f7522..dedcd9a23d 100644
--- a/tests/ios/testing.xcodeproj/project.pbxproj
+++ b/tests/ios/testing.xcodeproj/project.pbxproj
@@ -324,6 +324,10 @@
buildActionMask = 2147483647;
files = (
);
+ inputPaths = (
+ "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
+ "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
+ );
name = "[CP-User] [RNFB] Crashlytics Configuration";
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
diff --git a/tests/package.json b/tests/package.json
index 1bd5b15ca3..657f218767 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -20,8 +20,7 @@
"@react-native-firebase/iid": "7.4.10",
"@react-native-firebase/in-app-messaging": "7.5.8",
"@react-native-firebase/messaging": "7.9.2",
- "@react-native-firebase/ml-natural-language": "7.4.11",
- "@react-native-firebase/ml-vision": "7.4.13",
+ "@react-native-firebase/ml": "7.4.13",
"@react-native-firebase/perf": "7.4.10",
"@react-native-firebase/remote-config": "9.0.12",
"@react-native-firebase/storage": "7.4.12",
diff --git a/website/scripts/source-reference.js b/website/scripts/source-reference.js
index 8a326aa7a1..41125b7625 100644
--- a/website/scripts/source-reference.js
+++ b/website/scripts/source-reference.js
@@ -163,18 +163,16 @@ function moduleNameToFullName(name) {
return 'Instance ID';
case 'in-app-messaging':
return 'In-App Messaging';
- case 'ml-natural-language':
- return 'ML Kit Natural Language';
case 'messaging':
return 'Cloud Messaging';
- case 'perf':
+ case 'ml':
+ return 'ML';
+ case 'perf':
return 'Performance Monitoring';
case 'remote-config':
return 'Remote Config';
case 'storage':
return 'Storage';
- case 'ml-vision':
- return 'ML Kit Vision';
case 'app':
return 'Core/App';
default:
diff --git a/website/src/templates/utils.ts b/website/src/templates/utils.ts
index 67d140d146..095770405a 100644
--- a/website/src/templates/utils.ts
+++ b/website/src/templates/utils.ts
@@ -45,11 +45,7 @@ function iconForModule(module: string): string {
return '//static.invertase.io/assets/firebase/dynamic-links.svg';
case 'in-app-messaging':
return '//static.invertase.io/assets/firebase/in-app-messaging.svg';
- case 'ml-natural-language':
- return '//static.invertase.io/assets/firebase/ml-kit.svg';
- case 'ml-language':
- return '//static.invertase.io/assets/firebase/ml-kit.svg';
- case 'ml-vision':
+ case 'ml':
return '//static.invertase.io/assets/firebase/ml-kit.svg';
case 'remote-config':
return '//static.invertase.io/assets/firebase/remote-config.svg';