Update dependencies (#578)

* update to v6.0.13 * update to v7.15.0 * update imported ES types
mongoosastic · Mar 16, 2022 · bf686b2 · bf686b2
1 parent cb7148d
commit bf686b2
Show file tree

Hide file tree

Showing 35 changed files with 462 additions and 897 deletions.
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,4 +1,5 @@
 module.exports = {
+  testTimeout: 10000,
   clearMocks: true,
   roots: [
     '<rootDir>/test'

diff --git a/lib/hooks.ts b/lib/hooks.ts
@@ -1,6 +1,6 @@
 import { MongoosasticDocument } from './types'
 
-export function postSave(doc: MongoosasticDocument): void {
+export async function postSave(doc: MongoosasticDocument): Promise<void> {
   if (!doc) {
     return
   }
@@ -20,15 +20,11 @@ export function postSave(doc: MongoosasticDocument): void {
   const populate = options && options.populate
   if (doc) {
     if (populate && populate.length) {
-      populate.forEach((populateOpts) => {
-        doc.populate(populateOpts)
-      })
-      doc.execPopulate().then((popDoc) => {
-        popDoc
-          .index()
-          .then((res) => onIndex(null, res))
-          .catch((err) => onIndex(err, null))
-      })
+      const popDoc = await doc.populate(populate)
+      popDoc
+        .index()
+        .then((res) => onIndex(null, res))
+        .catch((err) => onIndex(err, null))
     } else {
       doc
         .index()

diff --git a/lib/search.ts b/lib/search.ts
@@ -1,12 +1,12 @@
 import { ApiResponse } from '@elastic/elasticsearch'
 import { Search } from '@elastic/elasticsearch/api/requestParams'
-import { QueryContainer, SearchRequest, SearchResponse } from '@elastic/elasticsearch/api/types'
+import { QueryDslQueryContainer, SearchRequest, SearchResponse } from '@elastic/elasticsearch/api/types'
 import { EsSearchOptions, HydratedSearchResults, MongoosasticDocument, MongoosasticModel } from './types'
 import { getIndexName, hydrate, isString, isStringArray, reformatESTotalNumber } from './utils'
 
 export async function search(
   this: MongoosasticModel<MongoosasticDocument>,
-  query: QueryContainer,
+  query: QueryDslQueryContainer,
   opts: EsSearchOptions = {}
 ): Promise<ApiResponse<SearchResponse, unknown> | ApiResponse<HydratedSearchResults>> {
   const fullQuery = {

diff --git a/lib/statics.ts b/lib/statics.ts
@@ -1,5 +1,5 @@
 import { Search } from '@elastic/elasticsearch/api/requestParams'
-import { Property, PropertyName, QueryContainer, SearchResponse } from '@elastic/elasticsearch/api/types'
+import { MappingProperty, PropertyName, QueryDslQueryContainer, SearchResponse } from '@elastic/elasticsearch/api/types'
 import { ApiResponse, RequestBody } from '@elastic/elasticsearch/lib/Transport'
 import { EventEmitter } from 'events'
 import { FilterQuery } from 'mongoose'
@@ -12,7 +12,7 @@ import { filterMappingFromMixed, getIndexName, reformatESTotalNumber } from './u
 export async function createMapping(
   this: MongoosasticModel<MongoosasticDocument>,
   body: RequestBody
-): Promise<Record<PropertyName, Property>> {
+): Promise<Record<PropertyName, MappingProperty>> {
   const options = this.esOptions()
   const client = this.esClient()
 
@@ -184,7 +184,7 @@ export async function refresh(this: MongoosasticModel<MongoosasticDocument>): Pr
 
 export async function esCount(
   this: MongoosasticModel<MongoosasticDocument>,
-  query: QueryContainer
+  query: QueryDslQueryContainer
 ): Promise<ApiResponse> {
   if (query === undefined) {
     query = {

diff --git a/lib/types/index.ts b/lib/types/index.ts
@@ -3,16 +3,16 @@
 import { ApiResponse, Client, ClientOptions } from '@elastic/elasticsearch'
 import {
   CountResponse,
-  Highlight,
-  Hit,
-  HitsMetadata,
-  Property,
+  IndicesRefreshResponse,
+  MappingProperty,
+  MappingTypeMapping,
   PropertyName,
-  QueryContainer,
-  RefreshResponse,
+  QueryDslQueryContainer,
+  SearchHighlight,
+  SearchHit,
+  SearchHitsMetadata,
   SearchRequest,
   SearchResponse,
-  TypeMapping,
 } from '@elastic/elasticsearch/api/types'
 import { RequestBody } from '@elastic/elasticsearch/lib/Transport'
 import { EventEmitter } from 'events'
@@ -30,15 +30,15 @@ declare interface RoutingFn {
   (doc: Document): any;
 }
 
-declare interface GeneratedMapping extends TypeMapping {
+declare interface GeneratedMapping extends MappingTypeMapping {
   cast?(doc: any): any;
 }
 
 declare interface HydratedSearchResults<TDocument = unknown> extends SearchResponse<TDocument> {
   hits: HydratedSearchHits<TDocument>;
 }
 
-declare interface HydratedSearchHits<TDocument> extends HitsMetadata<TDocument> {
+declare interface HydratedSearchHits<TDocument> extends SearchHitsMetadata<TDocument> {
   hydrated: Array<TDocument>;
 }
 
@@ -117,7 +117,7 @@ declare type Options = {
 
 declare type EsSearchOptions = {
   aggs?: any;
-  highlight?: Highlight;
+  highlight?: SearchHighlight;
   hydrate?: boolean;
   hydrateOptions?: QueryOptions;
   hydrateWithESResults?: any;
@@ -130,7 +130,7 @@ declare type EsSearchOptions = {
 
 declare interface MongoosasticDocument<TDocument = any> extends Document<TDocument>, EventEmitter {
   _highlight?: Record<string, string[]> | undefined;
-  _esResult?: Hit<TDocument>;
+  _esResult?: SearchHit<TDocument>;
 
   esClient(): Client;
 
@@ -144,11 +144,11 @@ declare interface MongoosasticDocument<TDocument = any> extends Document<TDocume
 interface MongoosasticModel<T> extends Model<T> {
   bulkError(): EventEmitter;
 
-  createMapping(body?: RequestBody): Promise<Record<PropertyName, Property>>;
+  createMapping(body?: RequestBody): Promise<Record<PropertyName, MappingProperty>>;
 
   esClient(): Client;
 
-  esCount(query?: QueryContainer): Promise<ApiResponse<CountResponse>>;
+  esCount(query?: QueryDslQueryContainer): Promise<ApiResponse<CountResponse>>;
 
   esOptions(): Options;
 
@@ -162,9 +162,9 @@ interface MongoosasticModel<T> extends Model<T> {
 
   getMapping(): Record<string, any>;
 
-  refresh(): Promise<ApiResponse<RefreshResponse>>;
+  refresh(): Promise<ApiResponse<IndicesRefreshResponse>>;
 
-  search(query: QueryContainer, options?: EsSearchOptions): Promise<ApiResponse<HydratedSearchResults<T>>>;
+  search(query: QueryDslQueryContainer, options?: EsSearchOptions): Promise<ApiResponse<HydratedSearchResults<T>>>;
 
   synchronize(query?: any, options?: SynchronizeOptions): EventEmitter;
 }

diff --git a/lib/utils.ts b/lib/utils.ts
@@ -1,5 +1,5 @@
 import { ApiResponse } from '@elastic/elasticsearch'
-import { Property, PropertyName, SearchResponse, TotalHits } from '@elastic/elasticsearch/api/types'
+import { MappingProperty, PropertyName, SearchResponse, SearchTotalHits } from '@elastic/elasticsearch/api/types'
 import { isEmpty } from 'lodash'
 import {
   DeleteByIdOptions,
@@ -28,8 +28,8 @@ export function getIndexName(doc: MongoosasticDocument | MongoosasticModel<Mongo
   }
 }
 
-export function filterMappingFromMixed(props: Record<PropertyName, Property>): Record<PropertyName, Property> {
-  const filteredMapping: Record<PropertyName, Property> = {}
+export function filterMappingFromMixed(props: Record<PropertyName, MappingProperty>): Record<PropertyName, MappingProperty> {
+  const filteredMapping: Record<PropertyName, MappingProperty> = {}
   Object.keys(props).map((key) => {
     const field = props[key]
     if (field.type !== 'mixed') {
@@ -103,7 +103,7 @@ export function reformatESTotalNumber<T = unknown>(
   res: ApiResponse<SearchResponse<T>>
 ): ApiResponse<SearchResponse<T>> {
   Object.assign(res.body.hits, {
-    total: (res.body.hits.total as TotalHits).value,
+    total: (res.body.hits.total as SearchTotalHits).value,
     extTotal: res.body.hits.total,
   })
   return res