@medplum/core 0.9.34 → 0.9.35

package/dist/cjs/client.d.ts

@@ -511,7 +511,7 @@ export declare class MedplumClient extends EventTarget {
      * ```json
      * {
      *    "resourceType": "Bundle",
-     *    "type": "searchest",
+     *    "type": "searchset",
      *    "total": 1,
      *    "entry": [
      *       {

package/dist/cjs/index.js

@@ -6087,17 +6087,16 @@
         for (const entry of bundle.entry) {
             const resource = entry.resource;
             if (resource.resourceType === 'StructureDefinition') {
-                indexStructureDefinition(globalSchema, resource);
+                indexStructureDefinition(resource);
             }
         }
     }
     /**
      * Indexes a StructureDefinition for fast lookup.
      * See comments on IndexedStructureDefinition for more details.
-     * @param schema The output IndexedStructureDefinition.
      * @param structureDefinition The original StructureDefinition.
      */
-    function indexStructureDefinition(schema, structureDefinition) {
+    function indexStructureDefinition(structureDefinition) {
         var _a;
         const typeName = structureDefinition.name;
         if (!typeName) {
@@ -6106,9 +6105,9 @@
         const elements = (_a = structureDefinition.snapshot) === null || _a === void 0 ? void 0 : _a.element;
         if (elements) {
             // First pass, build types
-            elements.forEach((element) => indexType(schema, structureDefinition, element));
+            elements.forEach((element) => indexType(structureDefinition, element));
             // Second pass, build properties
-            elements.forEach((element) => indexProperty(schema, element));
+            elements.forEach((element) => indexProperty(element));
         }
     }
     /**
@@ -6118,7 +6117,7 @@
      * @param schema The output IndexedStructureDefinition.
      * @param element The input ElementDefinition.
      */
-    function indexType(schema, structureDefinition, elementDefinition) {
+    function indexType(structureDefinition, elementDefinition) {
         var _a, _b;
         const path = elementDefinition.path;
         const typeCode = (_b = (_a = elementDefinition.type) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.code;
@@ -6127,22 +6126,22 @@
         }
         const parts = path.split('.');
         const typeName = buildTypeName(parts);
-        schema.types[typeName] = createTypeSchema(typeName, structureDefinition, elementDefinition);
-        schema.types[typeName].parentType = buildTypeName(parts.slice(0, parts.length - 1));
+        globalSchema.types[typeName] = createTypeSchema(typeName, structureDefinition, elementDefinition);
+        globalSchema.types[typeName].parentType = buildTypeName(parts.slice(0, parts.length - 1));
     }
     /**
      * Indexes PropertySchema from an ElementDefinition.
      * @param schema The output IndexedStructureDefinition.
      * @param element The input ElementDefinition.
      */
-    function indexProperty(schema, element) {
+    function indexProperty(element) {
         const path = element.path;
         const parts = path.split('.');
         if (parts.length === 1) {
             return;
         }
         const typeName = buildTypeName(parts.slice(0, parts.length - 1));
-        const typeSchema = schema.types[typeName];
+        const typeSchema = globalSchema.types[typeName];
         if (!typeSchema) {
             return;
         }
@@ -6155,17 +6154,23 @@
      * @param schema The output IndexedStructureDefinition.
      * @param searchParam The SearchParameter resource.
      */
-    function indexSearchParameter(schema, searchParam) {
+    function indexSearchParameter(searchParam) {
         if (!searchParam.base) {
             return;
         }
         for (const resourceType of searchParam.base) {
-            const typeSchema = schema.types[resourceType];
+            const typeSchema = globalSchema.types[resourceType];
             if (!typeSchema) {
                 continue;
             }
             if (!typeSchema.searchParams) {
                 typeSchema.searchParams = {
+                    _id: {
+                        base: [resourceType],
+                        code: '_id',
+                        type: 'token',
+                        expression: resourceType + '.id',
+                    },
                     _lastUpdated: {
                         base: [resourceType],
                         code: '_lastUpdated',
@@ -6205,6 +6210,33 @@
             .replace('_', ' ')
             .replace(/\s+/g, ' ');
     }
+    /**
+     * Returns an element definition by type and property name.
+     * Handles content references.
+     * @param typeName The type name.
+     * @param propertyName The property name.
+     * @returns The element definition if found.
+     */
+    function getElementDefinition(typeName, propertyName) {
+        var _a;
+        const typeSchema = globalSchema.types[typeName];
+        if (!typeSchema) {
+            return undefined;
+        }
+        const property = (_a = typeSchema.properties[propertyName]) !== null && _a !== void 0 ? _a : typeSchema.properties[propertyName + '[x]'];
+        if (!property) {
+            return undefined;
+        }
+        if (property.contentReference) {
+            // Content references start with a "#"
+            // Remove the "#" character
+            const contentReference = property.contentReference.substring(1).split('.');
+            const referencePropertyName = contentReference.pop();
+            const referenceTypeName = buildTypeName(contentReference);
+            return getElementDefinition(referenceTypeName, referencePropertyName);
+        }
+        return property;
+    }
     /**
      * Global schema singleton.
      */
@@ -6617,7 +6649,7 @@
          * ```json
          * {
          *    "resourceType": "Bundle",
-         *    "type": "searchest",
+         *    "type": "searchset",
          *    "total": 1,
          *    "entry": [
          *       {
@@ -6860,10 +6892,10 @@
     }`.replace(/\s+/g, ' ');
                 const response = (yield this.graphql(query));
                 for (const structureDefinition of response.data.StructureDefinitionList) {
-                    indexStructureDefinition(globalSchema, structureDefinition);
+                    indexStructureDefinition(structureDefinition);
                 }
                 for (const searchParameter of response.data.SearchParameterList) {
-                    indexSearchParameter(globalSchema, searchParameter);
+                    indexSearchParameter(searchParameter);
                 }
                 return globalSchema;
             });
@@ -7531,6 +7563,7 @@
             options.headers = {};
         }
         const headers = options.headers;
+        headers['X-Medplum'] = 'extended';
         if (!headers['Content-Type']) {
             headers['Content-Type'] = FHIR_CONTENT_TYPE;
         }
@@ -7761,9 +7794,9 @@
         if (!(input === null || input === void 0 ? void 0 : input.value)) {
             return undefined;
         }
-        const typeSchema = globalSchema.types[input.type];
-        if (typeSchema) {
-            const typedResult = getTypedPropertyValueWithSchema(input, path, typeSchema);
+        const elementDefinition = getElementDefinition(input.type, path);
+        if (elementDefinition) {
+            const typedResult = getTypedPropertyValueWithSchema(input, path, elementDefinition);
             if (typedResult) {
                 return typedResult;
             }
@@ -7774,24 +7807,18 @@
      * Returns the value of the property and the property type using a type schema.
      * @param input The base context (FHIR resource or backbone element).
      * @param path The property path.
-     * @param typeSchema The input type schema.
+     * @param property The property element definition.
      * @returns The value of the property and the property type.
      */
-    function getTypedPropertyValueWithSchema(input, path, typeSchema) {
+    function getTypedPropertyValueWithSchema(input, path, property) {
         var _a;
-        const property = (_a = typeSchema.properties[path]) !== null && _a !== void 0 ? _a : typeSchema.properties[path + '[x]'];
-        if (!property) {
-            return undefined;
-        }
         const types = property.type;
         if (!types || types.length === 0) {
             return undefined;
         }
-        let propertyName = undefined;
         let resultValue = undefined;
         let resultType = 'undefined';
         if (types.length === 1) {
-            propertyName = path;
             resultValue = input.value[path];
             resultType = types[0].code;
         }
@@ -7799,7 +7826,6 @@
             for (const type of types) {
                 const path2 = path.replace('[x]', '') + capitalize(type.code);
                 if (path2 in input.value) {
-                    propertyName = path2;
                     resultValue = input.value[path2];
                     resultType = type.code;
                     break;
@@ -7809,16 +7835,22 @@
         if (isEmpty(resultValue)) {
             return undefined;
         }
-        if (resultType === 'BackboneElement') {
-            resultType = buildTypeName([input.type, propertyName]);
+        if (resultType === 'Element' || resultType === 'BackboneElement') {
+            resultType = buildTypeName((_a = property.path) === null || _a === void 0 ? void 0 : _a.split('.'));
         }
         if (Array.isArray(resultValue)) {
-            return resultValue.map((element) => ({ value: element, type: resultType }));
+            return resultValue.map((element) => toTypedValueWithType(element, resultType));
         }
         else {
-            return { value: resultValue, type: resultType };
+            return toTypedValueWithType(resultValue, resultType);
         }
     }
+    function toTypedValueWithType(value, type) {
+        if (type === 'Resource' && typeof value === 'object' && 'resourceType' in value) {
+            type = value.resourceType;
+        }
+        return { type, value };
+    }
     /**
      * Returns the value of the property and the property type using a type schema.
      * Note that because the type schema is not available, this function may be inaccurate.
@@ -10443,7 +10475,7 @@
         issue: [
             {
                 severity: 'information',
-                code: 'information',
+                code: 'informational',
                 details: {
                     text: 'All OK',
                 },
@@ -10456,7 +10488,7 @@
         issue: [
             {
                 severity: 'information',
-                code: 'information',
+                code: 'informational',
                 details: {
                     text: 'Created',
                 },
@@ -10469,7 +10501,7 @@
         issue: [
             {
                 severity: 'information',
-                code: 'information',
+                code: 'informational',
                 details: {
                     text: 'Not Modified',
                 },
@@ -10860,17 +10892,32 @@
      *   2) The "token" type includes enums and booleans.
      *   3) Arrays/multiple values are not reflected at all.
      *
-     * @param structureDefinitions Collection of StructureDefinition resources indexed by name.
      * @param resourceType The root resource type.
      * @param searchParam The search parameter.
      * @returns The search parameter type details.
      */
-    function getSearchParameterDetails(structureDefinitions, resourceType, searchParam) {
+    function getSearchParameterDetails(resourceType, searchParam) {
+        var _a, _b;
+        let result = (_b = (_a = globalSchema.types[resourceType]) === null || _a === void 0 ? void 0 : _a.searchParamsDetails) === null || _b === void 0 ? void 0 : _b[searchParam.code];
+        if (!result) {
+            result = buildSearchParamterDetails(resourceType, searchParam);
+        }
+        return result;
+    }
+    function setSearchParamterDetails(resourceType, code, details) {
+        const typeSchema = globalSchema.types[resourceType];
+        if (!typeSchema.searchParamsDetails) {
+            typeSchema.searchParamsDetails = {};
+        }
+        typeSchema.searchParamsDetails[code] = details;
+    }
+    function buildSearchParamterDetails(resourceType, searchParam) {
         var _a, _b, _c, _d, _e, _f, _g;
         if (searchParam.code === '_lastUpdated') {
             return { columnName: 'lastUpdated', type: exports.SearchParameterType.DATETIME };
         }
-        const columnName = convertCodeToColumnName(searchParam.code);
+        const code = searchParam.code;
+        const columnName = convertCodeToColumnName(code);
         const expression = (_a = getExpressionForResourceType(resourceType, searchParam.expression)) === null || _a === void 0 ? void 0 : _a.split('.');
         if (!expression) {
             // This happens on compound types
@@ -10885,7 +10932,7 @@
         for (let i = 1; i < expression.length; i++) {
             const propertyName = expression[i];
             elementDefinition =
-                (_d = (_c = (_b = structureDefinitions.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName]) !== null && _d !== void 0 ? _d : (_f = (_e = structureDefinitions.types[baseType]) === null || _e === void 0 ? void 0 : _e.properties) === null || _f === void 0 ? void 0 : _f[propertyName + '[x]'];
+                (_d = (_c = (_b = globalSchema.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName]) !== null && _d !== void 0 ? _d : (_f = (_e = globalSchema.types[baseType]) === null || _e === void 0 ? void 0 : _e.properties) === null || _f === void 0 ? void 0 : _f[propertyName + '[x]'];
             if (!elementDefinition) {
                 throw new Error(`Element definition not found for ${resourceType} ${searchParam.code}`);
             }
@@ -10908,7 +10955,9 @@
             }
         }
         const type = getSearchParameterType(searchParam, propertyType);
-        return { columnName, type, elementDefinition, array };
+        const result = { columnName, type, elementDefinition, array };
+        setSearchParamterDetails(resourceType, code, result);
+        return result;
     }
     /**
      * Converts a hyphen-delimited code to camelCase string.
@@ -11051,6 +11100,7 @@
     exports.getCodeBySystem = getCodeBySystem;
     exports.getDateProperty = getDateProperty;
     exports.getDisplayString = getDisplayString;
+    exports.getElementDefinition = getElementDefinition;
     exports.getExpressionForResourceType = getExpressionForResourceType;
     exports.getExtensionValue = getExtensionValue;
     exports.getIdentifier = getIdentifier;