@toxplanet/pegasus-sdk 1.1.3 → 1.1.4

package/lib/search.js

@@ -310,22 +310,66 @@ class SearchService {
       elasticsearchService.registerIndexRoute(pattern, {
         search: async (params) => {
           const query = params.body?.query;
-          const searchTerm = query?.match?.chemical_name || 
-                            query?.term?.chemical_name || 
-                            query?.query_string?.query || 
-                            query?.match_all ? '*' : '';
-          const limit = params.body?.size || 10;
-          
-          return await this.searchChemicals(searchTerm, { limit });
+          const from = params.body?.from || 0;
+          const size = params.body?.size || 10;
+
+          // Determine search term and type from the ES-style query
+          let rawTerm = '';
+          let searchFn = (term, limit) => this.searchChemicals(term, { limit });
+
+          if (query?.query_string?.query) {
+            const qs = query.query_string.query;
+            if (qs.endsWith('*')) {
+              rawTerm = qs.slice(0, -1);
+              searchFn = (term, limit) => this.searchStartsWith(term, limit);
+            } else {
+              rawTerm = qs;
+            }
+          } else if (query?.match_phrase_prefix) {
+            const key = Object.keys(query.match_phrase_prefix)[0];
+            const val = query.match_phrase_prefix[key];
+            rawTerm = (typeof val === 'object' ? val.query : val) || '';
+            searchFn = (term, limit) => this.searchContains(term, limit);
+          } else if (query?.match?.chemical_name) {
+            rawTerm = query.match.chemical_name;
+          } else if (query?.term?.chemical_name) {
+            rawTerm = query.term.chemical_name;
+          } else if (query?.match_all !== undefined) {
+            rawTerm = '*';
+          }
+
+          const pegasusResults = await searchFn(rawTerm, from + size);
+          const hits = pegasusResults.results.slice(from);
+
+          return {
+            body: {
+              hits: {
+                hits: hits.map(r => ({
+                  _id: r.id,
+                  _source: {
+                    chemical_name: r.name,
+                    chemical_name_sensitive: r.name,
+                    chemical_name_sort: (r.name || '').toLowerCase(),
+                    chemical_identifier: [...(r.cas || []), ...(r.identifiers || [])],
+                    chemical_set_identifier: (r.cas && r.cas[0]) || r.id || '',
+                  }
+                })),
+                total: { value: pegasusResults.results.length, relation: 'eq' }
+              },
+              timed_out: false,
+              _shards: { total: 1, successful: 1, failed: 0 }
+            }
+          };
         },
         
         count: async (params) => {
           const query = params.body?.query;
-          const searchTerm = query?.match?.chemical_name || 
-                            query?.term?.chemical_name || 
-                            query?.query_string?.query || '';
-          
-          const results = await this.searchChemicals(searchTerm, { limit: 10000 });
+          let rawTerm = query?.match?.chemical_name || 
+                        query?.term?.chemical_name || 
+                        query?.query_string?.query || '';
+          if (rawTerm.endsWith('*')) rawTerm = rawTerm.slice(0, -1);
+
+          const results = await this.searchChemicals(rawTerm, { limit: 10000 });
           return { count: results.results.length };
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toxplanet/pegasus-sdk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "SDK for migrating chemical data to Pegasus PostgreSQL + OpenSearch architecture with Elasticsearch client compatibility",
   "main": "index.js",
   "type": "commonjs",