@medplum/core 2.0.19 → 2.0.20

package/dist/esm/search/details.mjs

@@ -51,26 +51,28 @@ function buildSearchParamterDetails(resourceType, searchParam) {
         // In the future, explore returning multiple column definitions
         return { columnName, type: SearchParameterType.TEXT };
     }
-    const defaultType = getSearchParameterType(searchParam);
     let baseType = resourceType;
     let elementDefinition = undefined;
     let propertyType = undefined;
     let array = false;
     for (let i = 1; i < expression.length; i++) {
-        const propertyName = expression[i];
+        let propertyName = expression[i];
+        let hasArrayIndex = false;
+        const arrayIndexMatch = /\[\d+\]$/.exec(propertyName);
+        if (arrayIndexMatch) {
+            propertyName = propertyName.substring(0, propertyName.length - arrayIndexMatch[0].length);
+            hasArrayIndex = true;
+        }
         elementDefinition = getElementDefinition(baseType, propertyName);
         if (!elementDefinition) {
             throw new Error(`Element definition not found for ${resourceType} ${searchParam.code}`);
         }
-        if (elementDefinition.max !== '0' && elementDefinition.max !== '1') {
+        if (elementDefinition.max !== '0' && elementDefinition.max !== '1' && !hasArrayIndex) {
             array = true;
         }
+        // "code" is only missing when using "contentReference"
+        // "contentReference" is handled above in "getElementDefinition"
         propertyType = elementDefinition.type?.[0].code;
-        if (!propertyType) {
-            // This happens when one of parent properties uses contentReference
-            // In the future, explore following the reference
-            return { columnName, type: defaultType, array };
-        }
         if (i < expression.length - 1) {
             if (isBackboneElement(propertyType)) {
                 baseType = buildTypeName(elementDefinition.path?.split('.'));
@@ -150,9 +152,6 @@ function simplifyExpression(input) {
     if (result.startsWith('(') && result.endsWith(')')) {
         result = result.substring(1, result.length - 1);
     }
-    if (result.includes('[0]')) {
-        result = result.replaceAll('[0]', '');
-    }
     const stopStrings = [' != ', ' as ', '.as(', '.exists(', '.resolve(', '.where('];
     for (const stopString of stopStrings) {
         if (result.includes(stopString)) {

package/dist/esm/search/details.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"details.mjs","sources":["../../../src/search/details.ts"],"sourcesContent":["import { ElementDefinition, SearchParameter } from '@medplum/fhirtypes';\nimport { buildTypeName, getElementDefinition, globalSchema, PropertyType } from '../types';\nimport { capitalize } from '../utils';\n\nexport enum SearchParameterType {\n  BOOLEAN = 'BOOLEAN',\n  NUMBER = 'NUMBER',\n  QUANTITY = 'QUANTITY',\n  TEXT = 'TEXT',\n  REFERENCE = 'REFERENCE',\n  CANONICAL = 'CANONICAL',\n  DATE = 'DATE',\n  DATETIME = 'DATETIME',\n  PERIOD = 'PERIOD',\n  UUID = 'UUID',\n}\n\nexport interface SearchParameterDetails {\n  readonly columnName: string;\n  readonly type: SearchParameterType;\n  readonly elementDefinition?: ElementDefinition;\n  readonly array?: boolean;\n}\n\n/**\n * Returns the type details of a SearchParameter.\n *\n * The SearchParameter resource has a \"type\" parameter, but that is missing some critical information.\n *\n * For example:\n *   1) The \"date\" type includes \"date\", \"datetime\", and \"period\".\n *   2) The \"token\" type includes enums and booleans.\n *   3) Arrays/multiple values are not reflected at all.\n *\n * @param resourceType The root resource type.\n * @param searchParam The search parameter.\n * @returns The search parameter type details.\n */\nexport function getSearchParameterDetails(resourceType: string, searchParam: SearchParameter): SearchParameterDetails {\n  let result: SearchParameterDetails | undefined =\n    globalSchema.types[resourceType]?.searchParamsDetails?.[searchParam.code as string];\n  if (!result) {\n    result = buildSearchParamterDetails(resourceType, searchParam);\n  }\n  return result;\n}\n\nfunction setSearchParamterDetails(resourceType: string, code: string, details: SearchParameterDetails): void {\n  const typeSchema = globalSchema.types[resourceType];\n  if (!typeSchema.searchParamsDetails) {\n    typeSchema.searchParamsDetails = {};\n  }\n  typeSchema.searchParamsDetails[code] = details;\n}\n\nfunction buildSearchParamterDetails(resourceType: string, searchParam: SearchParameter): SearchParameterDetails {\n  const code = searchParam.code as string;\n  const columnName = convertCodeToColumnName(code);\n  const expression = getExpressionForResourceType(resourceType, searchParam.expression as string)?.split('.');\n  if (!expression) {\n    // This happens on compound types\n    // In the future, explore returning multiple column definitions\n    return { columnName, type: SearchParameterType.TEXT };\n  }\n\n  const defaultType = getSearchParameterType(searchParam);\n  let baseType = resourceType;\n  let elementDefinition = undefined;\n  let propertyType = undefined;\n  let array = false;\n\n  for (let i = 1; i < expression.length; i++) {\n    const propertyName = expression[i];\n    elementDefinition = getElementDefinition(baseType, propertyName);\n    if (!elementDefinition) {\n      throw new Error(`Element definition not found for ${resourceType} ${searchParam.code}`);\n    }\n\n    if (elementDefinition.max !== '0' && elementDefinition.max !== '1') {\n      array = true;\n    }\n\n    propertyType = elementDefinition.type?.[0].code;\n    if (!propertyType) {\n      // This happens when one of parent properties uses contentReference\n      // In the future, explore following the reference\n      return { columnName, type: defaultType, array };\n    }\n\n    if (i < expression.length - 1) {\n      if (isBackboneElement(propertyType)) {\n        baseType = buildTypeName(elementDefinition.path?.split('.') as string[]);\n      } else {\n        baseType = propertyType;\n      }\n    }\n  }\n\n  const type = getSearchParameterType(searchParam, propertyType as PropertyType);\n  const result = { columnName, type, elementDefinition, array };\n  setSearchParamterDetails(resourceType, code, result);\n  return result;\n}\n\nfunction isBackboneElement(propertyType: string): boolean {\n  return propertyType === 'Element' || propertyType === 'BackboneElement';\n}\n\n/**\n * Converts a hyphen-delimited code to camelCase string.\n * @param code The search parameter code.\n * @returns The SQL column name.\n */\nfunction convertCodeToColumnName(code: string): string {\n  return code.split('-').reduce((result, word, index) => result + (index ? capitalize(word) : word), '');\n}\n\nfunction getSearchParameterType(searchParam: SearchParameter, propertyType?: PropertyType): SearchParameterType {\n  let type = SearchParameterType.TEXT;\n  switch (searchParam.type) {\n    case 'date':\n      if (propertyType === PropertyType.date) {\n        type = SearchParameterType.DATE;\n      } else {\n        type = SearchParameterType.DATETIME;\n      }\n      break;\n    case 'number':\n      type = SearchParameterType.NUMBER;\n      break;\n    case 'quantity':\n      type = SearchParameterType.QUANTITY;\n      break;\n    case 'reference':\n      if (propertyType === PropertyType.canonical) {\n        type = SearchParameterType.CANONICAL;\n      } else {\n        type = SearchParameterType.REFERENCE;\n      }\n      break;\n    case 'token':\n      if (propertyType === 'boolean') {\n        type = SearchParameterType.BOOLEAN;\n      }\n      break;\n  }\n  return type;\n}\n\nexport function getExpressionForResourceType(resourceType: string, expression: string): string | undefined {\n  const expressions = expression.split(' | ');\n  for (const e of expressions) {\n    if (isIgnoredExpression(e)) {\n      continue;\n    }\n    const simplified = simplifyExpression(e);\n    if (simplified.startsWith(resourceType + '.')) {\n      return simplified;\n    }\n  }\n  return undefined;\n}\n\nfunction isIgnoredExpression(input: string): boolean {\n  return input.includes(' as Period') || input.includes(' as SampledDate');\n}\n\nfunction simplifyExpression(input: string): string {\n  let result = input.trim();\n\n  if (result.startsWith('(') && result.endsWith(')')) {\n    result = result.substring(1, result.length - 1);\n  }\n\n  if (result.includes('[0]')) {\n    result = result.replaceAll('[0]', '');\n  }\n\n  const stopStrings = [' != ', ' as ', '.as(', '.exists(', '.resolve(', '.where('];\n  for (const stopString of stopStrings) {\n    if (result.includes(stopString)) {\n      result = result.substring(0, result.indexOf(stopString));\n    }\n  }\n\n  return result;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"details.mjs","sources":["../../../src/search/details.ts"],"sourcesContent":["import { ElementDefinition, SearchParameter } from '@medplum/fhirtypes';\nimport { PropertyType, buildTypeName, getElementDefinition, globalSchema } from '../types';\nimport { capitalize } from '../utils';\n\nexport enum SearchParameterType {\n  BOOLEAN = 'BOOLEAN',\n  NUMBER = 'NUMBER',\n  QUANTITY = 'QUANTITY',\n  TEXT = 'TEXT',\n  REFERENCE = 'REFERENCE',\n  CANONICAL = 'CANONICAL',\n  DATE = 'DATE',\n  DATETIME = 'DATETIME',\n  PERIOD = 'PERIOD',\n  UUID = 'UUID',\n}\n\nexport interface SearchParameterDetails {\n  readonly columnName: string;\n  readonly type: SearchParameterType;\n  readonly elementDefinition?: ElementDefinition;\n  readonly array?: boolean;\n}\n\n/**\n * Returns the type details of a SearchParameter.\n *\n * The SearchParameter resource has a \"type\" parameter, but that is missing some critical information.\n *\n * For example:\n *   1) The \"date\" type includes \"date\", \"datetime\", and \"period\".\n *   2) The \"token\" type includes enums and booleans.\n *   3) Arrays/multiple values are not reflected at all.\n *\n * @param resourceType The root resource type.\n * @param searchParam The search parameter.\n * @returns The search parameter type details.\n */\nexport function getSearchParameterDetails(resourceType: string, searchParam: SearchParameter): SearchParameterDetails {\n  let result: SearchParameterDetails | undefined =\n    globalSchema.types[resourceType]?.searchParamsDetails?.[searchParam.code as string];\n  if (!result) {\n    result = buildSearchParamterDetails(resourceType, searchParam);\n  }\n  return result;\n}\n\nfunction setSearchParamterDetails(resourceType: string, code: string, details: SearchParameterDetails): void {\n  const typeSchema = globalSchema.types[resourceType];\n  if (!typeSchema.searchParamsDetails) {\n    typeSchema.searchParamsDetails = {};\n  }\n  typeSchema.searchParamsDetails[code] = details;\n}\n\nfunction buildSearchParamterDetails(resourceType: string, searchParam: SearchParameter): SearchParameterDetails {\n  const code = searchParam.code as string;\n  const columnName = convertCodeToColumnName(code);\n  const expression = getExpressionForResourceType(resourceType, searchParam.expression as string)?.split('.');\n  if (!expression) {\n    // This happens on compound types\n    // In the future, explore returning multiple column definitions\n    return { columnName, type: SearchParameterType.TEXT };\n  }\n\n  let baseType = resourceType;\n  let elementDefinition = undefined;\n  let propertyType = undefined;\n  let array = false;\n\n  for (let i = 1; i < expression.length; i++) {\n    let propertyName = expression[i];\n    let hasArrayIndex = false;\n\n    const arrayIndexMatch = /\\[\\d+\\]$/.exec(propertyName);\n    if (arrayIndexMatch) {\n      propertyName = propertyName.substring(0, propertyName.length - arrayIndexMatch[0].length);\n      hasArrayIndex = true;\n    }\n\n    elementDefinition = getElementDefinition(baseType, propertyName);\n    if (!elementDefinition) {\n      throw new Error(`Element definition not found for ${resourceType} ${searchParam.code}`);\n    }\n\n    if (elementDefinition.max !== '0' && elementDefinition.max !== '1' && !hasArrayIndex) {\n      array = true;\n    }\n\n    // \"code\" is only missing when using \"contentReference\"\n    // \"contentReference\" is handled above in \"getElementDefinition\"\n    propertyType = elementDefinition.type?.[0].code as string;\n\n    if (i < expression.length - 1) {\n      if (isBackboneElement(propertyType)) {\n        baseType = buildTypeName(elementDefinition.path?.split('.') as string[]);\n      } else {\n        baseType = propertyType;\n      }\n    }\n  }\n\n  const type = getSearchParameterType(searchParam, propertyType as PropertyType);\n  const result = { columnName, type, elementDefinition, array };\n  setSearchParamterDetails(resourceType, code, result);\n  return result;\n}\n\nfunction isBackboneElement(propertyType: string): boolean {\n  return propertyType === 'Element' || propertyType === 'BackboneElement';\n}\n\n/**\n * Converts a hyphen-delimited code to camelCase string.\n * @param code The search parameter code.\n * @returns The SQL column name.\n */\nfunction convertCodeToColumnName(code: string): string {\n  return code.split('-').reduce((result, word, index) => result + (index ? capitalize(word) : word), '');\n}\n\nfunction getSearchParameterType(searchParam: SearchParameter, propertyType: PropertyType): SearchParameterType {\n  let type = SearchParameterType.TEXT;\n  switch (searchParam.type) {\n    case 'date':\n      if (propertyType === PropertyType.date) {\n        type = SearchParameterType.DATE;\n      } else {\n        type = SearchParameterType.DATETIME;\n      }\n      break;\n    case 'number':\n      type = SearchParameterType.NUMBER;\n      break;\n    case 'quantity':\n      type = SearchParameterType.QUANTITY;\n      break;\n    case 'reference':\n      if (propertyType === PropertyType.canonical) {\n        type = SearchParameterType.CANONICAL;\n      } else {\n        type = SearchParameterType.REFERENCE;\n      }\n      break;\n    case 'token':\n      if (propertyType === 'boolean') {\n        type = SearchParameterType.BOOLEAN;\n      }\n      break;\n  }\n  return type;\n}\n\nexport function getExpressionForResourceType(resourceType: string, expression: string): string | undefined {\n  const expressions = expression.split(' | ');\n  for (const e of expressions) {\n    if (isIgnoredExpression(e)) {\n      continue;\n    }\n    const simplified = simplifyExpression(e);\n    if (simplified.startsWith(resourceType + '.')) {\n      return simplified;\n    }\n  }\n  return undefined;\n}\n\nfunction isIgnoredExpression(input: string): boolean {\n  return input.includes(' as Period') || input.includes(' as SampledDate');\n}\n\nfunction simplifyExpression(input: string): string {\n  let result = input.trim();\n\n  if (result.startsWith('(') && result.endsWith(')')) {\n    result = result.substring(1, result.length - 1);\n  }\n\n  const stopStrings = [' != ', ' as ', '.as(', '.exists(', '.resolve(', '.where('];\n  for (const stopString of stopStrings) {\n    if (result.includes(stopString)) {\n      result = result.substring(0, result.indexOf(stopString));\n    }\n  }\n\n  return result;\n}\n"],"names":[],"mappings":"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"}

package/dist/types/client.d.ts

@@ -444,6 +444,11 @@ export declare class MedplumClient extends EventTarget {
      * @param url The URL to invalidate.
      */
     invalidateUrl(url: URL | string): void;
+    /**
+     * Invalidates all cached values and flushes the cache.
+     * @category Caching
+     */
+    invalidateAll(): void;
     /**
      * Invalidates all cached search results or cached requests for the given resourceType.
      * @category Caching

package/dist/types/config.d.ts

@@ -0,0 +1,45 @@
+export interface MedplumInfraConfig {
+    name: string;
+    stackName: string;
+    accountNumber: string;
+    region: string;
+    domainName: string;
+    vpcId: string;
+    apiPort: number;
+    apiDomainName: string;
+    apiSslCertArn: string;
+    apiInternetFacing?: boolean;
+    appDomainName: string;
+    appSslCertArn: string;
+    appApiProxy?: boolean;
+    storageBucketName: string;
+    storageDomainName: string;
+    storageSslCertArn: string;
+    storagePublicKey: string;
+    maxAzs: number;
+    rdsInstances: number;
+    rdsInstanceType: string;
+    rdsSecretsArn?: string;
+    desiredServerCount: number;
+    serverImage: string;
+    serverMemory: number;
+    serverCpu: number;
+    loadBalancerLoggingEnabled: boolean;
+    loadBalancerLoggingBucket: string;
+    loadBalancerLoggingPrefix: string;
+    clamscanEnabled: boolean;
+    clamscanLoggingBucket: string;
+    clamscanLoggingPrefix: string;
+    skipDns?: boolean;
+    additionalContainers?: {
+        name: string;
+        image: string;
+        cpu?: number;
+        memory?: number;
+        essential?: boolean;
+        command?: string[];
+        environment?: {
+            [key: string]: string;
+        };
+    }[];
+}

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 export * from './bundle';
 export * from './cache';
 export * from './client';
+export * from './config';
 export * from './fhirlexer';
 export * from './fhirmapper';
 export * from './fhirpath';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medplum/core",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Medplum TS/JS Library",
   "author": "Medplum <hello@medplum.com>",
   "license": "Apache-2.0",