@medplum/core 2.0.25 → 2.0.26

package/dist/types/client.d.ts

@@ -142,7 +142,7 @@ export interface MedplumClientOptions {
      *   fonts?: TFontDictionary
      * ): Promise<Buffer> {
      *   return new Promise((resolve, reject) => {
-     *     const printer = new PdfPrinter(fonts || {});
+     *     const printer = new PdfPrinter(fonts ?? {});
      *     const pdfDoc = printer.createPdfKitDocument(docDefinition, { tableLayouts });
      *     const chunks: Uint8Array[] = [];
      *     pdfDoc.on('data', (chunk: Uint8Array) => chunks.push(chunk));
@@ -177,6 +177,14 @@ export interface FetchLike {
  * See: https://github.com/microsoft/TypeScript/issues/32951
  */
 export type QueryTypes = URLSearchParams | string[][] | Record<string, any> | string | undefined;
+/**
+ * ResourceArray is an array of resources with a bundle property.
+ * The bundle property is a FHIR Bundle containing the search results.
+ * This is useful for retrieving bundle metadata such as total, offset, and next link.
+ */
+export type ResourceArray<T extends Resource = Resource> = T[] & {
+    bundle: Bundle<T>;
+};
 export interface CreatePdfFunction {
     (docDefinition: TDocumentDefinitions, tableLayouts?: Record<string, CustomTableLayout> | undefined, fonts?: TFontDictionary | undefined): Promise<any>;
 }
@@ -207,6 +215,7 @@ export interface NewUserRequest {
     readonly recaptchaSiteKey?: string;
     readonly remember?: boolean;
     readonly projectId?: string;
+    readonly clientId?: string;
 }
 export interface NewProjectRequest {
     readonly login: string;
@@ -285,6 +294,10 @@ export interface MailAddress {
     readonly name: string;
     readonly address: string;
 }
+/**
+ * Email destination definition.
+ */
+export type MailDestination = string | MailAddress | string[] | MailAddress[];
 /**
  * Email attachment definition.
  * Compatible with nodemailer Mail.Options.
@@ -309,11 +322,11 @@ export interface MailOptions {
     /** An e-mail address that will appear on the Sender: field */
     readonly sender?: string | MailAddress;
     /** Comma separated list or an array of recipients e-mail addresses that will appear on the To: field */
-    readonly to?: string | MailAddress | string[] | MailAddress[];
+    readonly to?: MailDestination;
     /** Comma separated list or an array of recipients e-mail addresses that will appear on the Cc: field */
-    readonly cc?: string | MailAddress | string[] | MailAddress[];
+    readonly cc?: MailDestination;
     /** Comma separated list or an array of recipients e-mail addresses that will appear on the Bcc: field */
-    readonly bcc?: string | MailAddress | string[] | MailAddress[];
+    readonly bcc?: MailDestination;
     /** An e-mail address that will appear on the Reply-To: field */
     readonly replyTo?: string | MailAddress;
     /** The subject of the e-mail */
@@ -327,13 +340,15 @@ export interface MailOptions {
 }
 /**
  * OAuth 2.0 Grant Type Identifiers
- * Standard identifiers defined here: https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-07#name-grant-types
- * Token exchange extension defined here: https://datatracker.ietf.org/doc/html/rfc8693
+ * Standard identifiers: https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-07#name-grant-types
+ * JWT bearer extension: https://datatracker.ietf.org/doc/html/rfc7523
+ * Token exchange extension: https://datatracker.ietf.org/doc/html/rfc8693
  */
 export declare enum OAuthGrantType {
     ClientCredentials = "client_credentials",
     AuthorizationCode = "authorization_code",
     RefreshToken = "refresh_token",
+    JwtBearer = "urn:ietf:params:oauth:grant-type:jwt-bearer",
     TokenExchange = "urn:ietf:params:oauth:grant-type:token-exchange"
 }
 /**
@@ -417,6 +432,7 @@ export declare class MedplumClient extends EventTarget {
     private readonly onUnauthenticated?;
     private readonly autoBatchTime;
     private readonly autoBatchQueue;
+    private medplumServer?;
     private clientId?;
     private clientSecret?;
     private autoBatchTimerId?;
@@ -750,7 +766,7 @@ export declare class MedplumClient extends EventTarget {
      * @param options Optional fetch options.
      * @returns Promise to the array of search results.
      */
-    searchResources<K extends ResourceType>(resourceType: K, query?: QueryTypes, options?: RequestInit): ReadablePromise<ExtractResource<K>[]>;
+    searchResources<K extends ResourceType>(resourceType: K, query?: QueryTypes, options?: RequestInit): ReadablePromise<ResourceArray<ExtractResource<K>>>;
     /**
      * Creates an
      * [async generator](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/AsyncGenerator)
@@ -771,7 +787,7 @@ export declare class MedplumClient extends EventTarget {
      * @param options Optional fetch options.
      * @yields An async generator, where each result is an array of resources for each page.
      */
-    searchResourcePages<K extends ResourceType>(resourceType: K, query?: QueryTypes, options?: RequestInit): AsyncGenerator<ExtractResource<K>[]>;
+    searchResourcePages<K extends ResourceType>(resourceType: K, query?: QueryTypes, options?: RequestInit): AsyncGenerator<ResourceArray<ExtractResource<K>>>;
     /**
      * Searches a ValueSet resource using the "expand" operation.
      * See: https://www.hl7.org/fhir/operation-valueset-expand.html
@@ -1299,9 +1315,10 @@ export declare class MedplumClient extends EventTarget {
     /**
      * Sets the current access token.
      * @param accessToken The new access token.
+     * @param refreshToken Optional refresh token.
      * @category Authentication
      */
-    setAccessToken(accessToken: string): void;
+    setAccessToken(accessToken: string, refreshToken?: string): void;
     /**
      * Returns the list of available logins.
      * @returns The list of available logins.
@@ -1509,7 +1526,6 @@ export declare class MedplumClient extends EventTarget {
      * await medplum.searchResources('Patient')
      * ```
      *
-     *
      * See: https://datatracker.ietf.org/doc/html/rfc6749#section-4.4
      * @category Authentication
      * @param clientId The client ID.
@@ -1517,6 +1533,22 @@ export declare class MedplumClient extends EventTarget {
      * @returns Promise that resolves to the client profile.
      */
     startClientLogin(clientId: string, clientSecret: string): Promise<ProfileResource>;
+    /**
+     * Starts a new OAuth2 JWT bearer flow.
+     *
+     * ```typescript
+     * await medplum.startJwtBearerLogin(process.env.MEDPLUM_CLIENT_ID, process.env.MEDPLUM_JWT_BEARER_ASSERTION, 'openid profile');
+     * // Example Search
+     * await medplum.searchResources('Patient')
+     * ```
+     *
+     * See: https://datatracker.ietf.org/doc/html/rfc7523#section-2.1
+     * @param clientId The client ID.
+     * @param assertion The JWT assertion.
+     * @param scope The OAuth scope.
+     * @returns Promise that resolves to the client profile.
+     */
+    startJwtBearerLogin(clientId: string, assertion: string, scope: string): Promise<ProfileResource>;
     /**
      * Sets the client ID and secret for basic auth.
      *

package/dist/types/fhirpath/atoms.d.ts

@@ -34,7 +34,10 @@ export declare class AsAtom extends InfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class ArithemticOperatorAtom extends InfixOperatorAtom {
+export declare abstract class BooleanInfixOperatorAtom extends InfixOperatorAtom {
+    abstract eval(context: AtomContext, input: TypedValue[]): TypedValue[];
+}
+export declare class ArithemticOperatorAtom extends BooleanInfixOperatorAtom {
     readonly impl: (x: number, y: number) => number | boolean;
     constructor(operator: string, left: Atom, right: Atom, impl: (x: number, y: number) => number | boolean);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
@@ -43,11 +46,11 @@ export declare class ConcatAtom extends InfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class ContainsAtom extends InfixOperatorAtom {
+export declare class ContainsAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class InAtom extends InfixOperatorAtom {
+export declare class InAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
@@ -60,23 +63,23 @@ export declare class UnionAtom extends InfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class EqualsAtom extends InfixOperatorAtom {
+export declare class EqualsAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class NotEqualsAtom extends InfixOperatorAtom {
+export declare class NotEqualsAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class EquivalentAtom extends InfixOperatorAtom {
+export declare class EquivalentAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class NotEquivalentAtom extends InfixOperatorAtom {
+export declare class NotEquivalentAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class IsAtom extends InfixOperatorAtom {
+export declare class IsAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
@@ -86,11 +89,11 @@ export declare class IsAtom extends InfixOperatorAtom {
  * false if either operand evaluates to false,
  * and the empty collection otherwise.
  */
-export declare class AndAtom extends InfixOperatorAtom {
+export declare class AndAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
-export declare class OrAtom extends InfixOperatorAtom {
+export declare class OrAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
 }
@@ -100,9 +103,20 @@ export declare class OrAtom extends InfixOperatorAtom {
  * false if either both operands evaluate to true or both operands evaluate to false,
  * and the empty collection otherwise.
  */
-export declare class XorAtom extends InfixOperatorAtom {
+export declare class XorAtom extends BooleanInfixOperatorAtom {
+    constructor(left: Atom, right: Atom);
+    eval(context: AtomContext, input: TypedValue[]): TypedValue[];
+}
+/**
+ * 6.5.5. implies
+ * Returns true if left is true and right is true,
+ * true left is false and right true, false or empty
+ * true left is empty
+ */
+export declare class ImpliesAtom extends BooleanInfixOperatorAtom {
     constructor(left: Atom, right: Atom);
     eval(context: AtomContext, input: TypedValue[]): TypedValue[];
+    private isValidCollectionLength;
 }
 export declare class FunctionAtom implements Atom {
     readonly name: string;

package/dist/types/fhirpath/parse.d.ts

@@ -5,39 +5,39 @@ import { FhirPathAtom } from './atoms';
  * Operator precedence
  * See: https://hl7.org/fhirpath/#operator-precedence
  */
-export declare const enum OperatorPrecedence {
-    FunctionCall = 0,
-    Dot = 1,
-    Indexer = 2,
-    UnaryAdd = 3,
-    UnarySubtract = 3,
-    Multiply = 4,
-    Divide = 4,
-    IntegerDivide = 4,
-    Modulo = 4,
-    Add = 5,
-    Subtract = 5,
-    Ampersand = 5,
-    Is = 6,
-    As = 6,
-    Union = 7,
-    GreaterThan = 8,
-    GreaterThanOrEquals = 8,
-    LessThan = 8,
-    LessThanOrEquals = 8,
-    Equals = 9,
-    Equivalent = 9,
-    NotEquals = 9,
-    NotEquivalent = 9,
-    In = 10,
-    Contains = 10,
-    And = 11,
-    Xor = 12,
-    Or = 12,
-    Implies = 13,
-    Arrow = 100,
-    Semicolon = 200
-}
+export declare const OperatorPrecedence: {
+    FunctionCall: number;
+    Dot: number;
+    Indexer: number;
+    UnaryAdd: number;
+    UnarySubtract: number;
+    Multiply: number;
+    Divide: number;
+    IntegerDivide: number;
+    Modulo: number;
+    Add: number;
+    Subtract: number;
+    Ampersand: number;
+    Is: number;
+    As: number;
+    Union: number;
+    GreaterThan: number;
+    GreaterThanOrEquals: number;
+    LessThan: number;
+    LessThanOrEquals: number;
+    Equals: number;
+    Equivalent: number;
+    NotEquals: number;
+    NotEquivalent: number;
+    In: number;
+    Contains: number;
+    And: number;
+    Xor: number;
+    Or: number;
+    Implies: number;
+    Arrow: number;
+    Semicolon: number;
+};
 export declare function initFhirPathParserBuilder(): ParserBuilder;
 /**
  * Parses a FHIRPath expression into an AST.

package/dist/types/index.d.ts

@@ -22,4 +22,4 @@ export * from './storage';
 export * from './types';
 export * from './utils';
 export { loadDataTypes } from './typeschema/types';
-export { validateResource as experimentalValidateResource } from './typeschema/validation';
+export { validate } from './typeschema/validation';

package/dist/types/jwt.d.ts

@@ -4,3 +4,9 @@
  * @returns Collection of key value claims in the JWT payload.
  */
 export declare function parseJWTPayload(token: string): Record<string, number | string>;
+/**
+ * Returns true if the access token was issued by a Medplum server.
+ * @param accessToken An access token of unknown origin.
+ * @returns True if the access token was issued by a Medplum server.
+ */
+export declare function isMedplumAccessToken(accessToken: string): boolean;

package/dist/types/schema.d.ts

@@ -95,6 +95,7 @@ export declare function validateResourceType(resourceType: string): void;
  * await medplum.requestSchema('Patient');
  * ```
  * @param resource The candidate resource.
+ * @deprecated use validate() instead
  */
 export declare function validateResource<T extends Resource>(resource: T): void;
 export declare class FhirSchemaValidator<T extends Resource> {

package/dist/types/search/details.d.ts

@@ -1,4 +1,5 @@
 import { ElementDefinition, SearchParameter } from '@medplum/fhirtypes';
+import { Atom } from '../fhirlexer';
 export declare enum SearchParameterType {
     BOOLEAN = "BOOLEAN",
     NUMBER = "NUMBER",
@@ -14,7 +15,7 @@ export declare enum SearchParameterType {
 export interface SearchParameterDetails {
     readonly columnName: string;
     readonly type: SearchParameterType;
-    readonly elementDefinition?: ElementDefinition;
+    readonly elementDefinitions?: ElementDefinition[];
     readonly array?: boolean;
 }
 /**
@@ -31,4 +32,5 @@ export interface SearchParameterDetails {
  * @returns The search parameter type details.
  */
 export declare function getSearchParameterDetails(resourceType: string, searchParam: SearchParameter): SearchParameterDetails;
+export declare function getExpressionsForResourceType(resourceType: string, expression: string): Atom[];
 export declare function getExpressionForResourceType(resourceType: string, expression: string): string | undefined;

package/dist/types/types.d.ts

@@ -199,13 +199,13 @@ export declare function getElementDefinition(typeName: string, propertyName: str
  * @param value The object to check
  * @returns True if the input is of type 'object' and contains property 'resourceType'
  */
-export declare function isResource<T extends Resource = Resource>(value: T | Reference<T> | string | undefined | null): value is T;
+export declare function isResource(value: unknown): value is Resource;
 /**
  * Typeguard to validate that an object is a FHIR resource
  * @param value The object to check
  * @returns True if the input is of type 'object' and contains property 'reference'
  */
-export declare function isReference<T extends Resource>(value: T | Reference<T> | string | undefined | null): value is Reference<T> & {
+export declare function isReference(value: unknown): value is Reference & {
     reference: string;
 };
 /**

package/dist/types/typeschema/validation.d.ts

@@ -1,2 +1,2 @@
 import { Resource, StructureDefinition } from '@medplum/fhirtypes';
-export declare function validateResource(resource: Resource, profile?: StructureDefinition): void;
+export declare function validate(resource: Resource, profile?: StructureDefinition): void;

package/dist/types/utils.d.ts

@@ -280,6 +280,7 @@ export declare function preciseGreaterThanOrEquals(a: number, b: number, precisi
  * @returns The first resource in the input array that matches the specified code and system, or undefined if no such resource is found.
  */
 export declare function findResourceByCode(resources: ResourceWithCode[], code: CodeableConcept | string, system: string): ResourceWithCode | undefined;
+export declare function arrayify<T>(value: T | T[] | undefined): T[] | undefined;
 /**
  * Sleeps for the specified number of milliseconds.
  * @param ms Time delay in milliseconds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/core",
-  "version": "2.0.25",
+  "version": "2.0.26",
   "description": "Medplum TS/JS Library",
   "author": "Medplum <hello@medplum.com>",
   "license": "Apache-2.0",
@@ -10,6 +10,9 @@
     "url": "https://github.com/medplum/medplum.git",
     "directory": "packages/core"
   },
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "scripts": {
     "clean": "rimraf dist",
     "build": "npm run clean && tsc --project tsconfig.build.json && node esbuild.mjs",