@icure/api 5.4.2 → 5.4.4

package/icc-x-api/icc-hcparty-x-api.js

@@ -14,6 +14,8 @@ const icc_api_1 = require("../icc-api");
 const models = require("../icc-api/model/models");
 const person_util_1 = require("./utils/person-util");
 const AuthenticationProvider_1 = require("./auth/AuthenticationProvider");
+const XHR_1 = require("../icc-api/api/XHR");
+var XHRError = XHR_1.XHR.XHRError;
 // noinspection JSUnusedGlobalSymbols
 class IccHcpartyXApi extends icc_api_1.IccHcpartyApi {
     constructor(host, headers, authenticationProvider = new AuthenticationProvider_1.NoAuthenticationProvider(), fetchImpl = typeof window !== 'undefined'
@@ -132,8 +134,13 @@ class IccHcpartyXApi extends icc_api_1.IccHcpartyApi {
                     else {
                         throw new Error(`Hcp with id ${x[0]} not found`);
                     }
-                }));
-            }));
+                })).catch((e) => {
+                    if (e instanceof XHRError) {
+                        throw e;
+                    }
+                    return null;
+                });
+            })).then((result) => result.filter((it) => it != null));
         });
     }
     getCurrentHealthcareParty() {

package/icc-x-api/icc-hcparty-x-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"icc-hcparty-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-hcparty-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccHcpartyApi } from '../icc-api'\nimport { HealthcareParty } from '../icc-api/model/HealthcareParty'\nimport * as models from '../icc-api/model/models'\nimport { findName, garnishPersonWithName, hasName } from './utils/person-util'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport { ListOfIds } from '../icc-api/model/models'\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccHcpartyXApi extends IccHcpartyApi {\n  hcPartyKeysCache: { [key: string]: { [key: string]: string } } = {}\n  hcPartyCache: { [key: string]: [number, Promise<HealthcareParty>] } = {}\n\n  private CACHE_RETENTION_IN_MS = 300_000\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n  }\n\n  private getHcPartyFromCache(key: string) {\n    const hcpInCache = this.hcPartyCache[key]\n    const now = Date.now()\n    if (hcpInCache && hcpInCache[0] > now) {\n      return hcpInCache[1]\n    }\n    if (!hcpInCache) {\n      console.log(`Cache miss for key ${key} because not in cache`)\n    } else {\n      console.log(`Cache miss for key ${key} because ${hcpInCache[0]} > ${now}`)\n    }\n    return null\n  }\n\n  completeNames(hcParty?: models.HealthcareParty): models.HealthcareParty | undefined {\n    if (!hcParty) {\n      return hcParty\n    }\n\n    let finalHcParty = hcParty\n\n    if ((!!finalHcParty.lastName || !!finalHcParty.name) && !hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      finalHcParty = garnishPersonWithName(\n        finalHcParty,\n        models.PersonName.UseEnum.Official,\n        finalHcParty.lastName,\n        finalHcParty.firstName,\n        finalHcParty.name\n      )\n    }\n\n    if ((!finalHcParty.lastName || !finalHcParty.name) && !!hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      let officialName = findName(finalHcParty, models.PersonName.UseEnum.Official)\n      finalHcParty = {\n        ...finalHcParty,\n        lastName: officialName!.lastName,\n        firstName: officialName!.firstNames ? officialName!.firstNames[0] : undefined,\n        name: officialName!.text,\n      }\n    }\n\n    return finalHcParty\n  }\n\n  putHcPartyInCache(key: string, hcpPromise: Promise<HealthcareParty>): Promise<HealthcareParty> {\n    this.hcPartyCache[key] = [Date.now() + this.CACHE_RETENTION_IN_MS, hcpPromise]\n    return hcpPromise\n  }\n\n  createHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcareParty(this.completeNames(body))\n  }\n\n  createHealthcarePartyInGroup(groupId: string, body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcarePartyInGroup(groupId, this.completeNames(body))\n  }\n\n  modifyHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty | any> {\n    if (body && body.id) {\n      console.log(`Evict key ${body.id} because of modification`)\n      delete this.hcPartyCache[body.id]\n    }\n\n    return super.modifyHealthcareParty(this.completeNames(body)).then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  async getHealthcareParty(healthcarePartyId: string, bypassCache = false): Promise<HealthcareParty | any> {\n    const fromCache = bypassCache ? undefined : this.getHcPartyFromCache(healthcarePartyId)\n    if (fromCache) {\n      try {\n        return await fromCache\n      } catch {\n        if (this.hcPartyCache[healthcarePartyId][1] === fromCache) {\n          delete this.hcPartyCache[healthcarePartyId]\n        }\n        return this.getHealthcareParty(healthcarePartyId, bypassCache)\n      }\n    } else {\n      return await this.putHcPartyInCache(healthcarePartyId, super.getHealthcareParty(healthcarePartyId))\n    }\n  }\n\n  getHealthcarePartyHierarchyIds(healthcarePartyId: string, bypassCache = false): Promise<string[]> {\n    return (\n      this,\n      this.getHealthcareParty(healthcarePartyId, bypassCache).then(async (hcp: HealthcareParty) => {\n        return hcp ? (hcp.parentId ? (await this.getHealthcarePartyHierarchyIds(hcp.parentId!, bypassCache)).concat([hcp.id!]) : [hcp.id!]) : []\n      })\n    )\n  }\n\n  async getHealthcareParties(healthcarePartyIds: string): Promise<Array<HealthcareParty> | any> {\n    const ids = healthcarePartyIds.split(',').filter((x) => !!x)\n\n    const cached: Array<[string, HealthcareParty | null]> = []\n    for (const id of ids) {\n      let hcp\n      try {\n        hcp = await this.getHcPartyFromCache(id)\n      } catch {\n        hcp = null\n        delete this.hcPartyCache[id]\n      }\n      cached.push([id, hcp])\n    }\n\n    const toFetch = cached.filter((x) => !x[1]).map((x) => x[0])\n\n    if (!toFetch.length) {\n      return Promise.all(cached.map((x) => x[1]!))\n    }\n\n    const prom: Promise<HealthcareParty[]> = super.getHealthcareParties(toFetch.join(','))\n    return Promise.all(\n      cached.map(\n        (x) =>\n          x[1] ??\n          this.putHcPartyInCache(\n            x[0],\n            prom.then((hcps) => {\n              const hcp = hcps.find((h) => h.id === x[0])\n              if (!!hcp) {\n                return hcp\n              } else {\n                throw new Error(`Hcp with id ${x[0]} not found`)\n              }\n            })\n          )\n      )\n    )\n  }\n\n  getCurrentHealthcareParty(): Promise<HealthcareParty | any> {\n    return super.getCurrentHealthcareParty().then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  getHcPartyKeysForDelegate(healthcarePartyId: string, bypassCache = false): Promise<{ [key: string]: string }> {\n    const cached = bypassCache ? null : this.hcPartyKeysCache[healthcarePartyId]\n    return cached\n      ? Promise.resolve(cached)\n      : super.getHcPartyKeysForDelegate(healthcarePartyId).then((r) => (this.hcPartyKeysCache[healthcarePartyId] = r))\n  }\n\n  isValidCbe(cbe: string) {\n    cbe = cbe.replace(new RegExp('[^(0-9)]', 'g'), '')\n    cbe = cbe.length == 9 ? '0' + cbe : cbe\n\n    return 97 - (Number(cbe.substr(0, 8)) % 97) === Number(cbe.substr(8, 2))\n  }\n}\n"]}
+{"version":3,"file":"icc-hcparty-x-api.js","sourceRoot":"","sources":["../../icc-x-api/icc-hcparty-x-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { IccHcpartyApi } from '../icc-api'\nimport { HealthcareParty } from '../icc-api/model/HealthcareParty'\nimport * as models from '../icc-api/model/models'\nimport { findName, garnishPersonWithName, hasName } from './utils/person-util'\nimport { AuthenticationProvider, NoAuthenticationProvider } from './auth/AuthenticationProvider'\nimport { ListOfIds } from '../icc-api/model/models'\nimport { XHR } from '../icc-api/api/XHR'\nimport XHRError = XHR.XHRError\n\n// noinspection JSUnusedGlobalSymbols\nexport class IccHcpartyXApi extends IccHcpartyApi {\n  hcPartyKeysCache: { [key: string]: { [key: string]: string } } = {}\n  hcPartyCache: { [key: string]: [number, Promise<HealthcareParty>] } = {}\n\n  private CACHE_RETENTION_IN_MS = 300_000\n  constructor(\n    host: string,\n    headers: { [key: string]: string },\n    authenticationProvider: AuthenticationProvider = new NoAuthenticationProvider(),\n    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !== 'undefined'\n      ? window.fetch\n      : typeof self !== 'undefined'\n      ? self.fetch\n      : fetch\n  ) {\n    super(host, headers, authenticationProvider, fetchImpl)\n  }\n\n  private getHcPartyFromCache(key: string) {\n    const hcpInCache = this.hcPartyCache[key]\n    const now = Date.now()\n    if (hcpInCache && hcpInCache[0] > now) {\n      return hcpInCache[1]\n    }\n    if (!hcpInCache) {\n      console.log(`Cache miss for key ${key} because not in cache`)\n    } else {\n      console.log(`Cache miss for key ${key} because ${hcpInCache[0]} > ${now}`)\n    }\n    return null\n  }\n\n  completeNames(hcParty?: models.HealthcareParty): models.HealthcareParty | undefined {\n    if (!hcParty) {\n      return hcParty\n    }\n\n    let finalHcParty = hcParty\n\n    if ((!!finalHcParty.lastName || !!finalHcParty.name) && !hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      finalHcParty = garnishPersonWithName(\n        finalHcParty,\n        models.PersonName.UseEnum.Official,\n        finalHcParty.lastName,\n        finalHcParty.firstName,\n        finalHcParty.name\n      )\n    }\n\n    if ((!finalHcParty.lastName || !finalHcParty.name) && !!hasName(finalHcParty, models.PersonName.UseEnum.Official)) {\n      let officialName = findName(finalHcParty, models.PersonName.UseEnum.Official)\n      finalHcParty = {\n        ...finalHcParty,\n        lastName: officialName!.lastName,\n        firstName: officialName!.firstNames ? officialName!.firstNames[0] : undefined,\n        name: officialName!.text,\n      }\n    }\n\n    return finalHcParty\n  }\n\n  putHcPartyInCache(key: string, hcpPromise: Promise<HealthcareParty>): Promise<HealthcareParty> {\n    this.hcPartyCache[key] = [Date.now() + this.CACHE_RETENTION_IN_MS, hcpPromise]\n    return hcpPromise\n  }\n\n  createHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcareParty(this.completeNames(body))\n  }\n\n  createHealthcarePartyInGroup(groupId: string, body?: HealthcareParty): Promise<HealthcareParty> {\n    return super.createHealthcarePartyInGroup(groupId, this.completeNames(body))\n  }\n\n  modifyHealthcareParty(body?: HealthcareParty): Promise<HealthcareParty | any> {\n    if (body && body.id) {\n      console.log(`Evict key ${body.id} because of modification`)\n      delete this.hcPartyCache[body.id]\n    }\n\n    return super.modifyHealthcareParty(this.completeNames(body)).then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  async getHealthcareParty(healthcarePartyId: string, bypassCache = false): Promise<HealthcareParty | any> {\n    const fromCache = bypassCache ? undefined : this.getHcPartyFromCache(healthcarePartyId)\n    if (fromCache) {\n      try {\n        return await fromCache\n      } catch {\n        if (this.hcPartyCache[healthcarePartyId][1] === fromCache) {\n          delete this.hcPartyCache[healthcarePartyId]\n        }\n        return this.getHealthcareParty(healthcarePartyId, bypassCache)\n      }\n    } else {\n      return await this.putHcPartyInCache(healthcarePartyId, super.getHealthcareParty(healthcarePartyId))\n    }\n  }\n\n  getHealthcarePartyHierarchyIds(healthcarePartyId: string, bypassCache = false): Promise<string[]> {\n    return (\n      this,\n      this.getHealthcareParty(healthcarePartyId, bypassCache).then(async (hcp: HealthcareParty) => {\n        return hcp ? (hcp.parentId ? (await this.getHealthcarePartyHierarchyIds(hcp.parentId!, bypassCache)).concat([hcp.id!]) : [hcp.id!]) : []\n      })\n    )\n  }\n\n  async getHealthcareParties(healthcarePartyIds: string): Promise<Array<HealthcareParty> | any> {\n    const ids = healthcarePartyIds.split(',').filter((x) => !!x)\n\n    const cached: Array<[string, HealthcareParty | null]> = []\n    for (const id of ids) {\n      let hcp\n      try {\n        hcp = await this.getHcPartyFromCache(id)\n      } catch {\n        hcp = null\n        delete this.hcPartyCache[id]\n      }\n      cached.push([id, hcp])\n    }\n\n    const toFetch = cached.filter((x) => !x[1]).map((x) => x[0])\n\n    if (!toFetch.length) {\n      return Promise.all(cached.map((x) => x[1]!))\n    }\n\n    const prom: Promise<HealthcareParty[]> = super.getHealthcareParties(toFetch.join(','))\n    return Promise.all(\n      cached.map(\n        (x) =>\n          x[1] ??\n          this.putHcPartyInCache(\n            x[0],\n            prom.then((hcps) => {\n              const hcp = hcps.find((h) => h.id === x[0])\n              if (!!hcp) {\n                return hcp\n              } else {\n                throw new Error(`Hcp with id ${x[0]} not found`)\n              }\n            })\n          ).catch((e) => {\n            if (e instanceof XHRError) {\n              throw e\n            }\n            return null\n          })\n      )\n    ).then((result) => result.filter((it) => it != null))\n  }\n\n  getCurrentHealthcareParty(): Promise<HealthcareParty | any> {\n    return super.getCurrentHealthcareParty().then((hcp) => this.putHcPartyInCache(hcp.id!, Promise.resolve(hcp)))\n  }\n\n  getHcPartyKeysForDelegate(healthcarePartyId: string, bypassCache = false): Promise<{ [key: string]: string }> {\n    const cached = bypassCache ? null : this.hcPartyKeysCache[healthcarePartyId]\n    return cached\n      ? Promise.resolve(cached)\n      : super.getHcPartyKeysForDelegate(healthcarePartyId).then((r) => (this.hcPartyKeysCache[healthcarePartyId] = r))\n  }\n\n  isValidCbe(cbe: string) {\n    cbe = cbe.replace(new RegExp('[^(0-9)]', 'g'), '')\n    cbe = cbe.length == 9 ? '0' + cbe : cbe\n\n    return 97 - (Number(cbe.substr(0, 8)) % 97) === Number(cbe.substr(8, 2))\n  }\n}\n"]}

package/icc-x-api/utils/asn1-packer.d.ts

@@ -1,3 +1,3 @@
 export declare function packOther(...args: string[]): string;
-export declare type Asn1Item = number | string | Asn1Item[];
+export type Asn1Item = number | string | Asn1Item[];
 export declare function pack(arr: Asn1Item[]): string;

package/icc-x-api/utils/asn1-parser.d.ts

@@ -1,4 +1,4 @@
-export declare type Asn1 = {
+export type Asn1 = {
     type: number;
     lengthSize: number;
     length: number;

package/icc-x-api/utils/net-utils.d.ts

@@ -1,5 +1,5 @@
-export declare type PaginatorFunction<X> = (key: any, docId: string | null, limit: number | undefined) => Promise<PaginatorResponse<X>>;
-export declare type PaginatorExecutor<X> = (latestPaginatorFunctionResult: PaginatorResponse<X>, acc: any[], limit: number | undefined) => Promise<PaginatorResponse<X>>;
+export type PaginatorFunction<X> = (key: any, docId: string | null, limit: number | undefined) => Promise<PaginatorResponse<X>>;
+export type PaginatorExecutor<X> = (latestPaginatorFunctionResult: PaginatorResponse<X>, acc: any[], limit: number | undefined) => Promise<PaginatorResponse<X>>;
 export interface PaginatorResponse<X> {
     rows: Array<X>;
     nextKey: any | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icure/api",
-  "version": "5.4.2",
+  "version": "5.4.4",
   "description": "Typescript version of iCure standalone API client",
   "main": "index.js",
   "types": "index.d.ts",