@openneuro/search 4.23.0 → 4.24.0-alpha.0

package/dist/mappings/datasets-mapping.json

@@ -60,7 +60,8 @@
                     "properties": {
                         "Name": { "type": "text" },
                         "Authors": { "type": "text" },
-                        "SeniorAuthor": { "type": "text" }
+                        "SeniorAuthor": { "type": "text" },
+                        "DatasetType": { "type": "keyword" }
                     }
                 },
                 "readme": {

package/dist/query.d.ts

@@ -1,4 +1,4 @@
-import { ApiResponse, Client as ElasticClient, RequestParams } from "@elastic/elasticsearch";
+import { Client as ElasticClient } from "@elastic/elasticsearch";
 import { ApolloClient, NormalizedCacheObject } from "@apollo/client";
 export declare const INDEX_DATASET_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const indexDatasetQuery: import("@apollo/client").DocumentNode;
@@ -14,7 +14,16 @@ export interface DatasetQueryResult {
  * TODO: Use generated GraphQL typing
  * @param datasetObj GraphQL dataset object from searchDatasets query
  */
-export declare function extractDatasetDocument(datasetObj: DatasetQueryResult): RequestParams.Index;
+export declare function extractDatasetDocument(datasetObj: DatasetQueryResult): {
+    index: string;
+    id: string;
+    body: {
+        id: string;
+        metadata: Record<string, any>;
+        latestSnapshot: Record<string, any>;
+        __typename: string;
+    };
+};
 /**
  * Query a single dataset for indexing
  * @param datasetId Accession number
@@ -25,5 +34,5 @@ export declare function queryForIndex(apolloClient: ApolloClient<NormalizedCache
  * @param elasticClient Elastic client to submit index data
  * @param datasetObj OpenNeuro GraphQL dataset object
  */
-export declare function indexDataset(elasticClient: ElasticClient, datasetObj: DatasetQueryResult): Promise<ApiResponse>;
+export declare function indexDataset(elasticClient: ElasticClient, datasetObj: DatasetQueryResult): Promise<import("@elastic/elasticsearch/lib/api/types").WriteResponseBase>;
 //# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,MAAM,IAAI,aAAa,EAEvB,aAAa,EACd,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,YAAY,EAAO,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAGzE,eAAO,MAAM,sBAAsB,uCA0ElC,CAAA;AAED,eAAO,MAAM,iBAAiB,uCAO7B,CAAA;AAED,eAAO,MAAM,UAAU,uCAoBtB,CAAA;AAGD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACnC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,kBAAkB,GAC7B,aAAa,CAAC,KAAK,CASrB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,YAAY,EAAE,YAAY,CAAC,qBAAqB,CAAC,EACjD,SAAS,EAAE,MAAM,4DAOlB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAAC,WAAW,CAAC,CAUtB"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAO,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAGzE,eAAO,MAAM,sBAAsB,uCA2ElC,CAAA;AAED,eAAO,MAAM,iBAAiB,uCAO7B,CAAA;AAED,eAAO,MAAM,UAAU,uCAoBtB,CAAA;AAGD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACnC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,kBAAkB;;;;;;;;;EAU/B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,YAAY,EAAE,YAAY,CAAC,qBAAqB,CAAC,EACjD,SAAS,EAAE,MAAM,4DAOlB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,kBAAkB,6EAW/B"}

package/dist/query.js

@@ -38,6 +38,7 @@ exports.INDEX_DATASET_FRAGMENT = (0, client_1.gql) `
         Name
         Authors
         SeniorAuthor
+        DatasetType
       }
       summary {
         tasks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/search",
-  "version": "4.23.0",
+  "version": "4.24.0-alpha.0",
   "description": "OpenNeuro search client functions.",
   "main": "dist/index.js",
   "browser": "src/index.ts",
@@ -16,18 +16,18 @@
   },
   "dependencies": {
     "@apollo/client": "3.7.2",
-    "@elastic/elasticsearch": "7.15.0",
+    "@elastic/elasticsearch": "8.13.1",
     "graphql": "16.8.1",
     "jsonwebtoken": "^9.0.0"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "^8",
-    "@types/node": "18.11.9",
+    "@types/node": "20.12.7",
     "core-js": "^3.10.1",
-    "vitest": "0.34.4"
+    "vitest": "1.5.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e86df78635d7ac6cfa03a2add5760b8539103583"
+  "gitHead": "4e271231c20d21e4c8b5ba8851d67cb94b7f739a"
 }

package/src/mappings/datasets-mapping.json

@@ -60,7 +60,8 @@
           "properties": {
             "Name": { "type": "text" },
             "Authors": { "type": "text" },
-            "SeniorAuthor": { "type": "text" }
+            "SeniorAuthor": { "type": "text" },
+            "DatasetType": { "type": "keyword" }
           }
         },
         "readme": {

package/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"
 
@@ -43,6 +37,7 @@ export const INDEX_DATASET_FRAGMENT = gql`
         Name
         Authors
         SeniorAuthor
+        DatasetType
       }
       summary {
         tasks
@@ -130,8 +125,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 +159,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