deps(elasticsearch): TypeScript fixes for ElasticSearch 8.0 update

packages/openneuro-app/package.json

@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-cli/package.json

@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-client/package.json

@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-components/package.json

@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-indexer/package.json

@@ -34,5 +34,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-indexer/src/createIndices.ts

@@ -8,7 +8,7 @@ export const createIndices = async (elasticClient: Client): Promise<void> => {
   const exists = await elasticClient.indices.exists({
     index: DatasetsIndex.name,
   })
-  if (exists.statusCode !== 200) {
+  if (exists) {
     await elasticClient.indices.create({
       index: DatasetsIndex.name,
       body: {

packages/openneuro-indexer/src/indexDatasets.ts

@@ -1,8 +1,4 @@
-import {
-  // Interface of the generic API response
-  ApiResponse,
-  Client as ElasticClient,
-} from "@elastic/elasticsearch"
+import { Client as ElasticClient } from "@elastic/elasticsearch"
 import {
   DatasetQueryResult,
   DatasetsIndex,
@@ -14,7 +10,7 @@ import {
  */
 export const aliasDatasetsIndex = (
   elasticClient: ElasticClient,
-): Promise<ApiResponse> =>
+) =>
   elasticClient.indices.updateAliases({
     body: {
       actions: [{ add: { index: DatasetsIndex.name, alias: "datasets" } }],

packages/openneuro-search/package.json

@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-search/src/query.ts

@@ -1,10 +1,4 @@
-import {
-  // Interface of the generic API response
-  ApiResponse,
-  Client as ElasticClient,
-  // Object that contains the type definitions of every API method
-  RequestParams,
-} from "@elastic/elasticsearch"
+import { Client as ElasticClient } from "@elastic/elasticsearch"
 import { ApolloClient, gql, NormalizedCacheObject } from "@apollo/client"
 import { DatasetsIndex } from "./indexes/datasets"
 
@@ -130,8 +124,8 @@ export interface DatasetQueryResult {
  */
 export function extractDatasetDocument(
   datasetObj: DatasetQueryResult,
-): RequestParams.Index {
-  const dataset: RequestParams.Index = {
+) {
+  const dataset = {
     index: DatasetsIndex.name,
     id: datasetObj.id,
     body: {
@@ -164,10 +158,10 @@ export function queryForIndex(
 export async function indexDataset(
   elasticClient: ElasticClient,
   datasetObj: DatasetQueryResult,
-): Promise<ApiResponse> {
+) {
   try {
     console.log(`Indexing "${datasetObj.id}"`)
-    const response: ApiResponse = await elasticClient.index(
+    const response = await elasticClient.index(
       extractDatasetDocument(datasetObj),
     )
     return response

packages/openneuro-server/package.json

@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc6317d28f5ccb4e61d41d032640efc59607e7fe"
+  "gitHead": "5f7012815a4edd0be48ee30d1de2bad7d1268f63"
 }

packages/openneuro-server/src/graphql/resolvers/dataset-search.ts

@@ -102,8 +102,10 @@ export const datasetSearchConnection = async (
     index: elasticIndex,
     size: first,
     q: `${q} AND public:true`,
+    // @ts-expect-error Limitations of TypeScript definitions from @elastic/elasticsearch client
     body: requestBody,
   })
+  // @ts-expect-error Limitations of TypeScript definitions from @elastic/elasticsearch client
   return elasticRelayConnection(result, searchId, first)
 }
 
@@ -241,9 +243,11 @@ export const advancedDatasetSearchConnection = async (
   const result = await elasticClient.search({
     index: elasticIndex,
     size: first,
+    // @ts-expect-error Limitations of TypeScript definitions from @elastic/elasticsearch client
     body: requestBody,
   })
   return elasticRelayConnection(
+    // @ts-expect-error Limitations of TypeScript definitions from @elastic/elasticsearch client
     result,
     searchId,
     first,

yarn.lock

@@ -5405,8 +5405,8 @@ __metadata:
     "@emotion/react": 11.11.1
     "@emotion/styled": 11.11.0
     "@niivue/niivue": 0.34.0
-    "@openneuro/client": ^4.21.0-alpha.4
-    "@openneuro/components": ^4.21.0-alpha.4
+    "@openneuro/client": ^4.21.0-alpha.5
+    "@openneuro/components": ^4.21.0-alpha.5
     "@tanstack/react-table": ^8.9.3
     "@testing-library/jest-dom": 6.1.3
     "@testing-library/react": ^11.1.0
@@ -5457,7 +5457,7 @@ __metadata:
   resolution: "@openneuro/cli@workspace:packages/openneuro-cli"
   dependencies:
     "@apollo/client": 3.7.2
-    "@openneuro/client": ^4.21.0-alpha.4
+    "@openneuro/client": ^4.21.0-alpha.5
     "@types/mkdirp": 1.0.2
     "@types/node": 18.11.9
     bids-validator: 1.10.0
@@ -5482,14 +5482,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openneuro/client@^4.21.0-alpha.4, @openneuro/client@workspace:packages/openneuro-client":
+"@openneuro/client@^4.21.0-alpha.5, @openneuro/client@workspace:packages/openneuro-client":
   version: 0.0.0-use.local
   resolution: "@openneuro/client@workspace:packages/openneuro-client"
   dependencies:
     "@apollo/client": 3.7.2
     "@graphql-tools/mock": ^9.0.0
     "@graphql-tools/schema": ^10.0.0
-    "@openneuro/server": ^4.21.0-alpha.4
+    "@openneuro/server": ^4.21.0-alpha.5
     core-js: ^3.10.1
     crypto-hash: ^1.3.0
     graphql: 16.8.1
@@ -5501,7 +5501,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openneuro/components@^4.21.0-alpha.4, @openneuro/components@workspace:packages/openneuro-components":
+"@openneuro/components@^4.21.0-alpha.5, @openneuro/components@workspace:packages/openneuro-components":
   version: 0.0.0-use.local
   resolution: "@openneuro/components@workspace:packages/openneuro-components"
   dependencies:
@@ -5543,8 +5543,8 @@ __metadata:
   dependencies:
     "@apollo/client": 3.7.2
     "@elastic/elasticsearch": ^8.10.0
-    "@openneuro/client": ^4.21.0-alpha.4
-    "@openneuro/search": ^4.21.0-alpha.4
+    "@openneuro/client": ^4.21.0-alpha.5
+    "@openneuro/search": ^4.21.0-alpha.5
     "@types/jsonwebtoken": ^8
     "@types/node": 18.11.9
     "@types/tsc-watch": ^4
@@ -5558,7 +5558,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openneuro/search@^4.21.0-alpha.4, @openneuro/search@workspace:packages/openneuro-search":
+"@openneuro/search@^4.21.0-alpha.5, @openneuro/search@workspace:packages/openneuro-search":
   version: 0.0.0-use.local
   resolution: "@openneuro/search@workspace:packages/openneuro-search"
   dependencies:
@@ -5573,7 +5573,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openneuro/server@^4.21.0-alpha.4, @openneuro/server@workspace:packages/openneuro-server":
+"@openneuro/server@^4.21.0-alpha.5, @openneuro/server@workspace:packages/openneuro-server":
   version: 0.0.0-use.local
   resolution: "@openneuro/server@workspace:packages/openneuro-server"
   dependencies:
@@ -5583,7 +5583,7 @@ __metadata:
     "@elastic/elasticsearch": ^8.10.0
     "@graphql-tools/schema": ^10.0.0
     "@keyv/redis": ^2.7.0
-    "@openneuro/search": ^4.21.0-alpha.4
+    "@openneuro/search": ^4.21.0-alpha.5
     "@passport-next/passport-google-oauth2": ^1.0.0
     "@sentry/node": ^4.5.3
     "@types/cors": ^2