@toxplanet/pegasus-sdk 1.2.5 → 1.2.6

package/lib/chemicals.js

@@ -734,7 +734,7 @@ class ChemicalsService {
    */
   async searchByName(searchTerm, limit = 10) {
     if (!searchTerm) {
-      return { results: [] };
+      return { results: [], total: { value: 0, relation: 'eq' } };
     }
 
     try {
@@ -771,7 +771,10 @@ class ChemicalsService {
         score: hit._score
       }));
 
-      return { results };
+      return {
+        results,
+        total: result?.hits?.total ?? { value: results.length, relation: 'eq' }
+      };
     } catch (error) {
       logError('pegasus-sdk', 'ChemicalsService', 'searchByName', error);
       throw error;
@@ -786,7 +789,7 @@ class ChemicalsService {
    */
   async searchBySynonym(synonymTerm, limit = 10) {
     if (!synonymTerm) {
-      return { results: [] };
+      return { results: [], total: { value: 0, relation: 'eq' } };
     }
 
     try {
@@ -823,7 +826,10 @@ class ChemicalsService {
         score: hit._score
       }));
 
-      return { results };
+      return {
+        results,
+        total: result?.hits?.total ?? { value: results.length, relation: 'eq' }
+      };
     } catch (error) {
       logError('pegasus-sdk', 'ChemicalsService', 'searchBySynonym', error);
       throw error;
@@ -1082,6 +1088,14 @@ class ChemicalsService {
         let searchTerm = '';
         let limit = params.body?.size || 10;
         
+        const toLegacySource = (r) => ({
+          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 || ''
+        });
+
         if (params.index === 'synonym_lookup_index') {
           const query = params.body?.query;
           searchTerm = query?.match?.chemical_name ||
@@ -1100,22 +1114,13 @@ class ChemicalsService {
                 failed: 0
               },
               hits: {
-                total: {
-                  value: searchResults.results.length,
-                  relation: 'eq'
-                },
+                total: searchResults.total ?? { value: searchResults.results.length, relation: 'eq' },
                 max_score: searchResults.results[0]?.score || 0,
                 hits: searchResults.results.map(result => ({
                   _index: params.index,
                   _id: result.id,
                   _score: result.score,
-                  _source: {
-                    postgres_id: result.id,
-                    chemical_name: result.name,
-                    cas_numbers: result.cas,
-                    identifier_values: result.identifiers,
-                    synonyms: result.synonyms
-                  }
+                  _source: toLegacySource(result)
                 }))
               }
             },
@@ -1139,22 +1144,13 @@ class ChemicalsService {
                 failed: 0
               },
               hits: {
-                total: {
-                  value: searchResults.results.length,
-                  relation: 'eq'
-                },
+                total: searchResults.total ?? { value: searchResults.results.length, relation: 'eq' },
                 max_score: searchResults.results[0]?.score || 0,
                 hits: searchResults.results.map(result => ({
                   _index: params.index,
                   _id: result.id,
                   _score: result.score,
-                  _source: {
-                    postgres_id: result.id,
-                    chemical_name: result.name,
-                    cas_numbers: result.cas,
-                    identifier_values: result.identifiers,
-                    synonyms: result.synonyms
-                  }
+                  _source: toLegacySource(result)
                 }))
               }
             },

package/lib/search.js

@@ -94,7 +94,7 @@ class SearchService {
    */
   async searchChemicals(query, options = {}) {
     if (!query) {
-      return { results: [] };
+      return { results: [], total: { value: 0, relation: 'eq' } };
     }
 
     // Extract options with defaults
@@ -165,7 +165,10 @@ class SearchService {
         score: hit._score
       }));
 
-      return { results };
+      return {
+        results,
+        total: result?.hits?.total ?? { value: results.length, relation: 'eq' }
+      };
     } catch (error) {
       logError('pegasus-sdk', 'SearchService', 'searchChemicals', error);
       throw error;
@@ -356,7 +359,7 @@ class SearchService {
                     chemical_set_identifier: (r.cas && r.cas[0]) || r.id || '',
                   }
                 })),
-                total: { value: pegasusResults.results.length, relation: 'eq' }
+                total: pegasusResults.total ?? { value: pegasusResults.results.length, relation: 'eq' }
               },
               timed_out: false,
               _shards: { total: 1, successful: 1, failed: 0 }

package/package.json

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