Merge branch 'fix_geo_point' of github.com:meilisearch/firestore-meilisearch into fix_geo_point

Author: bidoubiwa

functions/__tests__/adapter.test.ts

@@ -3,7 +3,7 @@ import { mockConsoleInfo } from './__mocks__/console'
 import * as firestore from 'firebase-admin/firestore'
 import {
   adaptDocumentForMeilisearch,
-  adaptFields,
+  adaptFieldsForMeilisearch,
 } from '../src/meilisearch-adapter'
 import defaultDocument from './data/document'
 
@@ -65,14 +65,20 @@ describe('extensions process', () => {
   describe('adaptValues', () => {
     test('adaptValues an id value', () => {
       expect(
-        adaptFields({ id: defaultDocument.id } as firestore.DocumentData, 'id')
+        adaptFieldsForMeilisearch(
+          { id: defaultDocument.id } as firestore.DocumentData,
+          'id'
+        )
       ).toStrictEqual({ id: defaultDocument.id })
     })
     test('adaptValues a geo point value', () => {
       const geoPoint = new firestore.GeoPoint(48.866667, 2.333333)
 
       expect(
-        adaptFields({ _geo: geoPoint } as firestore.DocumentData, '_geo')
+        adaptFieldsForMeilisearch(
+          { _geo: geoPoint } as firestore.DocumentData,
+          '_geo'
+        )
       ).toStrictEqual({
         _geo: {
           lat: 48.866667,
@@ -87,7 +93,7 @@ describe('extensions process', () => {
       const geoPoint = new firestore.GeoPoint(48.866667, 2.333333)
 
       expect(
-        adaptFields(
+        adaptFieldsForMeilisearch(
           { wrong_geo: geoPoint } as firestore.DocumentData,
           'wrong_geo'
         )

functions/lib/adapter.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.adaptDocumentForMeilisearch = exports.adaptFields = exports.parseFieldsToIndex = exports.isAFieldToIndex = void 0;
+exports.adaptDocumentForMeilisearch = exports.adaptFieldsForMeilisearch = exports.parseFieldsToIndex = exports.isAFieldToIndex = void 0;
 const firestore = require("firebase-admin/firestore");
 const logs_1 = require("./logs");
 /**
@@ -47,7 +47,7 @@ exports.parseFieldsToIndex = parseFieldsToIndex;
  * @param {string[]} rawFieldsToIndex
  * @return {firestore.DocumentData} A properly formatted array of field and value.
  */
-function adaptFields(document, rawFieldsToIndex) {
+function adaptFieldsForMeilisearch(document, rawFieldsToIndex) {
     const fieldsToIndex = parseFieldsToIndex(rawFieldsToIndex);
     return Object.keys(document).reduce((doc, currentField) => {
         const value = document[currentField];
@@ -68,7 +68,7 @@ function adaptFields(document, rawFieldsToIndex) {
         return { ...doc, [currentField]: value };
     }, {});
 }
-exports.adaptFields = adaptFields;
+exports.adaptFieldsForMeilisearch = adaptFieldsForMeilisearch;
 /**
  * Adapts documents from the Firestore database to Meilisearch compatible documents.
  * @param {string} documentId Document id.
@@ -81,7 +81,7 @@ function adaptDocumentForMeilisearch(documentId, snapshot, rawFieldsToIndex) {
     if ('_firestore_id' in data) {
         delete data.id;
     }
-    const adaptedDoc = adaptFields(data, rawFieldsToIndex);
+    const adaptedDoc = adaptFieldsForMeilisearch(data, rawFieldsToIndex);
     return { _firestore_id: documentId, ...adaptedDoc };
 }
 exports.adaptDocumentForMeilisearch = adaptDocumentForMeilisearch;

functions/lib/import/index.js

@@ -50,4 +50,4 @@
     "typescript": "^4.4.3"
   },
   "bin": "lib/import/index.js"
-}
+}

functions/lib/meilisearch-adapter.js

@@ -71,7 +71,7 @@ export function parseFieldsToIndex(fieldsToIndex: string): string[] {
  * @param {string[]} rawFieldsToIndex
  * @return {firestore.DocumentData} A properly formatted array of field and value.
  */
-export function adaptFields(
+export function adaptFieldsForMeilisearch(
   document: firestore.DocumentData,
   rawFieldsToIndex: string
 ): firestore.DocumentData {
@@ -112,7 +112,7 @@ export function adaptDocumentForMeilisearch(
   if ('_firestore_id' in data) {
     delete data.id
   }
-  const adaptedDoc = adaptFields(data, rawFieldsToIndex)
+  const adaptedDoc = adaptFieldsForMeilisearch(data, rawFieldsToIndex)
 
   return { _firestore_id: documentId, ...adaptedDoc }
 }