@nsshunt/stsfhirpg 1.2.4 → 1.2.6

package/dist/stsfhirpg.mjs

@@ -7254,28 +7254,19 @@ class ResourceHelper {
       }
     }
   };
-  GetSearchParamFromResourceTypeUrl = (resourceType, url) => {
+  GetSearchParamFromResourceTypeUrl = async (resourceType, url) => {
     const filterByNameAndUrl = this.definitions.searchParametersByResourceType[resourceType].params.filter((rt) => rt.SP_URL.localeCompare(url) === 0);
     if (filterByNameAndUrl.length > 0) {
       return filterByNameAndUrl[0];
     }
   };
-  GetSearchParamFromResourceType = (resourceType, name) => {
+  GetSearchParamFromResourceType = async (resourceType, name) => {
     const filterByName = this.definitions.searchParametersByResourceType[resourceType].params.filter((rt) => rt.SP_NAME.localeCompare(name) === 0);
     if (filterByName.length > 0) {
       return filterByName[0];
     }
   };
-  /*
-  GetPathsFromResourceType = (resourceType: string, name: string): string[] => {
-      const filterByName = this.definitions.searchParametersByResourceType[resourceType].params.filter(rt => rt.SP_NAME.localeCompare(name) === 0);
-      if (filterByName.length > 0) {
-          return filterByName[0].expressions.map(e => e.path)
-      }
-      return [ ];
-  }
-  */
-  GetSearchParamsFromResourceType = (resourceType) => {
+  GetSearchParamsFromResourceType = async (resourceType) => {
     return this.definitions.searchParametersByResourceType[resourceType].params;
   };
 }
@@ -10710,7 +10701,7 @@ class DBSearchIndexToken extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     let retVal = [];
     searchFieldRecord.expressions.forEach((expression) => {
       let tokens = this.GetValueFromPath(resource, expression.path, searchFieldRecord, expression);
@@ -10746,15 +10737,15 @@ class DBSearchIndexComposite extends DBSearchIndexBase {
   // /                root level code and quantity, i.e.  Observation.code                +   Observation.value[x]Quantity
   // /component_0     component level at index 0          Observation.component[0].code   +   Observation.component[0].value[x]Quantity
   // /component_1     component level at index 1          Observation.component[1].code   +   Observation.component[1].value[x]Quantity
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     let comboNonUniqueRecords = [];
     const searchIndex = DBSearchIndex.getInstance();
     let index = 0;
     let components = [];
-    searchFieldRecord.component.forEach((searchParamComponentRecord) => {
+    for (const searchParamComponentRecord of searchFieldRecord.component) {
       components.push([]);
       const url = searchParamComponentRecord.definition;
-      const sp = searchIndex.resourceHelper.GetSearchParamFromResourceTypeUrl(resource.resourceType, url);
+      const sp = await searchIndex.resourceHelper.GetSearchParamFromResourceTypeUrl(resource.resourceType, url);
       if (this.IsDefined(sp)) {
         const tir2 = {
           PID: v4(),
@@ -10770,7 +10761,7 @@ class DBSearchIndexComposite extends DBSearchIndexBase {
           COMPOSITE: null,
           COMPOSITE_HASH_EXACT: null
         };
-        const retVal = SearchRegistry.getInstance().searchIndexBaseRegistry[sp.SP_TYPE].OutputIndexRecord(resource, tir2, sp);
+        const retVal = await SearchRegistry.getInstance().searchIndexBaseRegistry[sp.SP_TYPE].OutputIndexRecord(resource, tir2, sp);
         retVal.forEach((rv) => {
           if (!(rv.SP_MISSING && rv.SP_MISSING === true)) {
             if (rv.SP_STR && rv.SP_STR !== void 0) {
@@ -10780,7 +10771,7 @@ class DBSearchIndexComposite extends DBSearchIndexBase {
         });
         index++;
       }
-    });
+    }
     for (let i = 0; i < components[0].length; i++) {
       for (let j = 0; j < components[1].length; j++) {
         const idxString = `${components[0][i].SP_STR}|${components[1][j].SP_STR}`;
@@ -10893,7 +10884,7 @@ class DBSearchIndexDates extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     let retVal = [];
     searchFieldRecord.expressions.forEach((expression) => {
       let referenceVal = this.GetValueFromPath(resource, expression.path, searchFieldRecord, expression);
@@ -10981,7 +10972,7 @@ class DBSearchIndexQuantity extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     const retVal = [];
     searchFieldRecord.expressions.forEach((expression) => {
       let quantityVal = this.GetValueFromPath(resource, expression.path, searchFieldRecord, expression);
@@ -11088,7 +11079,7 @@ class DBSearchIndexReference extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     let retVal = [];
     searchFieldRecord.expressions.forEach((expression) => {
       const referenceVal = this.GetValueFromPath(resource, expression.path, searchFieldRecord, expression);
@@ -11204,7 +11195,7 @@ class DBSearchIndexString extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchParamRecord) => {
+  OutputIndexRecord = async (resource, tir, searchParamRecord) => {
     const retVal = [];
     searchParamRecord.expressions.forEach((expression) => {
       let stringVal = this.GetValueFromPath(resource, expression.path, searchParamRecord, expression);
@@ -11258,7 +11249,7 @@ class DBSearchIndexNumber extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     const retVal = [];
     searchFieldRecord.expressions.forEach((expression) => {
       let numberVal = this.GetValueFromPath(resource, expression.path, searchFieldRecord, expression);
@@ -11318,7 +11309,7 @@ class DBSearchIndexURI extends DBSearchIndexBase {
     }
     return retVal;
   };
-  OutputIndexRecord = (resource, tir, searchFieldRecord) => {
+  OutputIndexRecord = async (resource, tir, searchFieldRecord) => {
     const retVal = [];
     searchFieldRecord.expressions.forEach((expression) => {
       let uriVal = this.GetValueFromPath(resource, expression.path, searchFieldRecord, expression);
@@ -11377,7 +11368,7 @@ class DBSearchIndex {
     this.#debug("------------------");
     this.#debug(`resource: [${hl(resourceName)}]      resourceId: [${hl(resourceId)}]      SP_NAME: [${hl(searchFieldRecord.SP_NAME)}]      SP_TYPE: [${hl(searchFieldRecord.SP_TYPE)}]      SP_BASE: [${hl(searchFieldRecord.SP_BASE)}]      path: [${hl(searchFieldRecord.path)}]      RESOURCE_DATATYPE: [${hl(searchFieldRecord.RESOURCE_DATATYPE)}]      subFieldDataType: [${hl(searchFieldRecord.subFieldDataType)}]      stringIndexFields: [${hl(searchFieldRecord.stringIndexFields)}]`);
   };
-  UpdateIndex = (resource, searchFieldRecord) => {
+  UpdateIndex = async (resource, searchFieldRecord) => {
     try {
       const tir = {
         PID: v4(),
@@ -11396,7 +11387,7 @@ class DBSearchIndex {
       let saveRecord;
       const searchIndexBaseProcessor = this.searchRegistry.searchIndexBaseRegistry[searchFieldRecord.SP_TYPE];
       if (searchIndexBaseProcessor) {
-        saveRecord = searchIndexBaseProcessor.OutputIndexRecord(resource, tir, searchFieldRecord);
+        saveRecord = await searchIndexBaseProcessor.OutputIndexRecord(resource, tir, searchFieldRecord);
       } else if (searchFieldRecord.SP_TYPE.localeCompare("special") === 0) {
       } else {
         const message = `DBSearchIndex:UpdateIndex(): Error: Search field paramater type: [${searchFieldRecord.SP_TYPE}] unknown.`;
@@ -11409,14 +11400,14 @@ class DBSearchIndex {
       return [];
     }
   };
-  GetSearchIndexData = (resource) => {
+  GetSearchIndexData = async (resource) => {
     try {
-      const searchParamRecords = this.resourceHelper.GetSearchParamsFromResourceType(resource.resourceType);
+      const searchParamRecords = await this.resourceHelper.GetSearchParamsFromResourceType(resource.resourceType);
       const searchIndexData = [];
       for (let i = 0; i < searchParamRecords.length; i++) {
         const searchRecord = searchParamRecords[i];
         try {
-          const retVal = this.UpdateIndex(resource, searchRecord);
+          const retVal = await this.UpdateIndex(resource, searchRecord);
           if (retVal && retVal.length > 0) {
             searchIndexData.push(...retVal);
           }
@@ -11430,17 +11421,12 @@ class DBSearchIndex {
       return [];
     }
   };
-  GetSearchParamFromResourceType = (resourceType, name) => {
+  GetSearchParamFromResourceType = async (resourceType, name) => {
     return this.resourceHelper.GetSearchParamFromResourceType(resourceType, name);
   };
-  GetSearchParamFromResourceTypeUrl = (resourceType, url) => {
+  GetSearchParamFromResourceTypeUrl = async (resourceType, url) => {
     return this.resourceHelper.GetSearchParamFromResourceTypeUrl(resourceType, url);
   };
-  /*
-  GetPathsFromResourceType = (resourceType: string, name: string): string[] => {
-      return this.resourceHelper.GetPathsFromResourceType(resourceType, name);
-  }
-  */
 }
 var lib$1 = { exports: {} };
 var defaults = { exports: {} };
@@ -18216,7 +18202,7 @@ class PGFhirAccessLayer extends tinyEmitterExports.TinyEmitter {
   UpdateIndexes = async (client2, resource) => {
     let start = performance.now();
     const oa = start;
-    const searchIndexData = this.#dbSearchIndex.GetSearchIndexData(resource);
+    const searchIndexData = await this.#dbSearchIndex.GetSearchIndexData(resource);
     const lap1 = performance.now() - start;
     start = performance.now();
     const InsertResourceLinkRecord = async (client22, resourceLinkIndexRecord) => {