@nsshunt/stsfhirpg 1.1.7 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsfhirpg",
-  "version": "1.1.7",
+  "version": "1.2.2",
   "description": "STS FHIR Postgres (pg) Persistence",
   "type": "commonjs",
   "main": "./dist/stsfhirpg.cjs",
@@ -42,14 +42,13 @@
   "homepage": "https://github.com/nsshunt/stsfhirpg#readme",
   "dependencies": {
     "@nsshunt/stsconfig": "^1.27.54",
-    "@nsshunt/stsfhirclient": "^2.0.4",
+    "@nsshunt/stsfhirclient": "^2.0.18",
     "@nsshunt/stsutils": "^1.19.90",
     "chalk": "^4.1.2",
     "jmespath": "^0.16.0",
     "luxon": "^3.7.2",
     "murmurhash3js": "^3.0.1",
     "pg": "^8.20.0",
-    "redis": "^5.11.0",
     "tiny-emitter": "^2.1.0",
     "uuid": "^13.0.0",
     "valid-url": "^1.0.9"

package/types/fhir-database/dbsearchindex.d.ts

@@ -1,4 +1,4 @@
-import { ISearchParamRecord, ISearchParams, IBaseIndexRecordEx } from './../fhir-utils/commonTypes';
+import { ISearchParamRecord, IBaseIndexRecordEx } from './../fhir-utils/commonTypes';
 import { SearchRegistry } from './dbsearchregistry';
 import { Resource } from '@nsshunt/stsfhirclient';
 import { ResourceHelper } from './../fhir-utils/resourceHelper';
@@ -9,12 +9,6 @@ export declare class DBSearchIndex {
     get resourceHelper(): ResourceHelper;
     get searchRegistry(): SearchRegistry;
     UpdateIndex: (resource: Resource, searchFieldRecord: ISearchParamRecord) => IBaseIndexRecordEx[] | undefined;
-    ResolveFhirChoiceType: (path: string) => string;
     GetSearchIndexData: (resource: Resource) => IBaseIndexRecordEx[];
-    GetSearchParamFromResourceTypeUrl: (resourceType: string, url: string) => ISearchParamRecord | undefined;
-    GetSearchParamFromResourceType: (resourceType: string, name: string) => ISearchParamRecord | undefined;
-    GetPathsFromResourceType: (resourceType: string, name: string) => string[];
-    ProcessExpressions: (resourceName: string, SP_EXPRESSION: string) => any;
-    LoadSearchParameters: () => ISearchParams;
 }
 //# sourceMappingURL=dbsearchindex.d.ts.map

package/types/fhir-database/dbsearchindex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dbsearchindex.d.ts","sourceRoot":"","sources":["../../src/fhir-database/dbsearchindex.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAClB,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAE/D,qBAAa,aAAa;;IAKtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAgB;IAMvC,MAAM,CAAC,WAAW,IAAI,aAAa;IAOnC,IAAI,cAAc,mBAEjB;IAED,IAAI,cAAc,mBAEjB;IAgBD,WAAW,GAAI,UAAU,QAAQ,EAAE,mBAAmB,kBAAkB,KAAG,kBAAkB,EAAE,GAAG,SAAS,CAiC1G;IAED,qBAAqB,GAAI,MAAM,MAAM,KAAG,MAAM,CAW7C;IAED,kBAAkB,GAAI,UAAU,QAAQ,KAAG,kBAAkB,EAAE,CA4B9D;IAED,iCAAiC,GAAI,cAAc,MAAM,EAAE,KAAK,MAAM,KAAG,kBAAkB,GAAG,SAAS,CAQtG;IAED,8BAA8B,GAAI,cAAc,MAAM,EAAE,MAAM,MAAM,KAAG,kBAAkB,GAAG,SAAS,CAQpG;IAED,wBAAwB,GAAI,cAAc,MAAM,EAAE,MAAM,MAAM,KAAG,MAAM,EAAE,CASxE;IAkCD,kBAAkB,GAAI,cAAc,MAAM,EAAE,eAAe,MAAM,KAAG,GAAG,CA8GtE;IAED,oBAAoB,QAAO,aAAa,CAqEvC;CA4EJ"}
+{"version":3,"file":"dbsearchindex.d.ts","sourceRoot":"","sources":["../../src/fhir-database/dbsearchindex.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAqC,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAEvH,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAE/D,qBAAa,aAAa;;IAKtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAgB;IAMvC,MAAM,CAAC,WAAW,IAAI,aAAa;IAOnC,IAAI,cAAc,mBAEjB;IAED,IAAI,cAAc,mBAEjB;IAgBD,WAAW,GAAI,UAAU,QAAQ,EAAE,mBAAmB,kBAAkB,KAAG,kBAAkB,EAAE,GAAG,SAAS,CAiC1G;IAED,kBAAkB,GAAI,UAAU,QAAQ,KAAG,kBAAkB,EAAE,CAoB9D;CAeJ"}

package/types/fhir-utils/resourceHelper.d.ts

@@ -1,19 +1,26 @@
 import { SearchParameter } from '@nsshunt/stsfhirclient';
+import { ISearchParamRecord, ISearchParam } from './commonTypes';
 export interface IResources {
     resources: Record<string, any>;
     types: Record<string, any>;
-    searchParameters: Record<string, SearchParameter>;
+    searchParametersByUrl: Record<string, SearchParameter>;
+    searchParametersByResourceType: Record<string, ISearchParam>;
 }
 export declare class ResourceHelper {
     #private;
     private static instance;
     private constructor();
     static getInstance(): ResourceHelper;
+    private get definitions();
     GetType: (typeName: string) => any[];
     GetResource: (resourceType: string) => any[];
     GetResourceField: (resourceType: string, fieldPath: string) => any;
     GetSearchParam: (url: string) => any;
     GetSearchParams: () => any;
     GetSearchParamsByResource: (resource: string) => SearchParameter[];
+    ProcessExpressions: (resourceName: string, SP_EXPRESSION: string) => any;
+    private _LoadSearchParameters;
+    GetSearchParamFromResourceTypeUrl: (resourceType: string, url: string) => ISearchParamRecord | undefined;
+    GetSearchParamsFromResourceType: (resourceType: string) => ISearchParamRecord[];
 }
 //# sourceMappingURL=resourceHelper.d.ts.map

package/types/fhir-utils/resourceHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resourceHelper.d.ts","sourceRoot":"","sources":["../../src/fhir-utils/resourceHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAexD,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CAClD;AAED,qBAAa,cAAc;;IAGvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IAExC,OAAO;IAEP,MAAM,CAAC,WAAW,IAAI,cAAc;IAgDpC,OAAO,GAAI,UAAU,MAAM,KAAG,GAAG,EAAE,CASlC;IAED,WAAW,GAAI,cAAc,MAAM,KAAG,GAAG,EAAE,CAQ1C;IAED,gBAAgB,GAAI,cAAc,MAAM,EAAE,WAAW,MAAM,KAAG,GAAG,CAUhE;IAED,cAAc,GAAI,KAAK,MAAM,KAAG,GAAG,CAKlC;IAED,eAAe,QAAO,GAAG,CAKxB;IAED,yBAAyB,GAAI,UAAU,MAAM,KAAG,eAAe,EAAE,CAQhE;CACJ"}
+{"version":3,"file":"resourceHelper.d.ts","sourceRoot":"","sources":["../../src/fhir-utils/resourceHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,OAAO,EAAE,kBAAkB,EACH,YAAY,EAAE,MAAM,eAAe,CAAA;AAe3D,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACtD,8BAA8B,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAC7D;AAED,qBAAa,cAAc;;IAGvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IAExC,OAAO;IAEP,MAAM,CAAC,WAAW,IAAI,cAAc;IAmDpC,OAAO,KAAK,WAAW,GAKtB;IAED,OAAO,GAAI,UAAU,MAAM,KAAG,GAAG,EAAE,CAElC;IAED,WAAW,GAAI,cAAc,MAAM,KAAG,GAAG,EAAE,CAG1C;IAED,gBAAgB,GAAI,cAAc,MAAM,EAAE,WAAW,MAAM,KAAG,GAAG,CAUhE;IAED,cAAc,GAAI,KAAK,MAAM,KAAG,GAAG,CAElC;IAED,eAAe,QAAO,GAAG,CAExB;IAED,yBAAyB,GAAI,UAAU,MAAM,KAAG,eAAe,EAAE,CAIhE;IAoCD,kBAAkB,GAAI,cAAc,MAAM,EAAE,eAAe,MAAM,KAAG,GAAG,CA8GtE;IAED,OAAO,CAAC,qBAAqB,CAiE5B;IAED,iCAAiC,GAAI,cAAc,MAAM,EAAE,KAAK,MAAM,KAAG,kBAAkB,GAAG,SAAS,CAKtG;IAmBD,+BAA+B,GAAI,cAAc,MAAM,KAAG,kBAAkB,EAAE,CAE7E;CACJ"}

package/types/index.d.ts

@@ -4,6 +4,4 @@ export * from './fhir-utils/fhirHashUtils';
 export * from './fhir-utils/resourceHelper';
 export * from './fhir-database/dbsearchindex';
 export * from './fhir-database/pg/pgfhiraccesslayer';
-export * from './redisDistributedLock';
-export * from './searchParameterManager';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sCAAsC,CAAA;AAEpD,cAAc,wBAAwB,CAAA;AACtC,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sCAAsC,CAAA"}

package/types/redisDistributedLock.d.ts

@@ -1,36 +0,0 @@
-import { createClient } from 'redis';
-export type AppRedisClient = ReturnType<typeof createClient>;
-export interface RedisDistributedLockOptions {
-    ttlMs?: number;
-    heartbeatMs?: number;
-    keyPrefix?: string;
-}
-export interface LockHandle {
-    key: string;
-    token: string;
-    ttlMs: number;
-}
-export declare class RedisDistributedLock {
-    private readonly client;
-    private readonly ttlMs;
-    private readonly heartbeatMs;
-    private readonly keyPrefix;
-    constructor(client: AppRedisClient, options?: RedisDistributedLockOptions);
-    private buildKey;
-    acquire(name: string, ttlMs?: number): Promise<LockHandle | null>;
-    release(lock: LockHandle): Promise<boolean>;
-    renew(lock: LockHandle, ttlMs?: number): Promise<boolean>;
-    isOwner(lock: LockHandle): Promise<boolean>;
-    runExclusive<T>(name: string, task: () => Promise<T>, options?: {
-        ttlMs?: number;
-        autoRenew?: boolean;
-        heartbeatMs?: number;
-        onLockNotAcquired?: () => void | Promise<void>;
-    }): Promise<{
-        acquired: true;
-        result: T;
-    } | {
-        acquired: false;
-    }>;
-}
-//# sourceMappingURL=redisDistributedLock.d.ts.map

package/types/redisDistributedLock.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"redisDistributedLock.d.ts","sourceRoot":"","sources":["../src/redisDistributedLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmB,MAAM,OAAO,CAAC;AAGtD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAkB7D,MAAM,WAAW,2BAA2B;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,oBAAoB;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAG/B,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,2BAA2B;IAoBzC,OAAO,CAAC,QAAQ;IAIH,OAAO,CAChB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAqBhB,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAS3C,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWzD,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAK3C,YAAY,CAAC,CAAC,EACvB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,OAAO,CAAC,EAAE;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,iBAAiB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAChD,GACE,OAAO,CAAC;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,CAAA;KAAE,GAAG;QAAE,QAAQ,EAAE,KAAK,CAAA;KAAE,CAAC;CAkElE"}

package/types/searchParameterManager.d.ts

@@ -1,13 +0,0 @@
-export interface ISearchParameterManagerOptions {
-    pollIntervalMs?: number;
-    lockTtlMs?: number;
-    autoRenew?: boolean;
-    heartbeatMs?: number;
-    completeTtlSeconds?: number;
-    timeoutMs?: number;
-}
-export declare class SearchParameterManager {
-    private redis?;
-    EnsureSearchParameterDataLoaded: (name: string, loadFn: () => Promise<void>, options?: ISearchParameterManagerOptions) => Promise<void>;
-}
-//# sourceMappingURL=searchParameterManager.d.ts.map

package/types/searchParameterManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"searchParameterManager.d.ts","sourceRoot":"","sources":["../src/searchParameterManager.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,8BAA8B;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,KAAK,CAAC,CAAiB;IAE/B,+BAA+B,GAAU,MAAM,MAAM,EACjD,QAAQ,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,8BAA8B,KAAG,OAAO,CAAC,IAAI,CAAC,CAiGxF;CACJ"}