@medplum/core 0.4.1 → 0.5.2

package/README.md

@@ -124,4 +124,4 @@ medplum.readVersion('Patient', '123', '456');
 
 ## License
 
-Apache 2.0. Copyright © Medplum 2021
+Apache 2.0. Copyright © Medplum 2022

package/dist/cjs/index.js

@@ -644,13 +644,16 @@
      * @returns Parsed search definition.
      */
     function parseSearchDefinition(location) {
-        const resourceType = location.pathname.split('/').pop();
+        const resourceType = location.pathname
+            .replace(/(^\/)|(\/$)/g, '') // Remove leading and trailing slashes
+            .split('/')
+            .pop();
         const params = new URLSearchParams(location.search);
-        const filters = [];
-        const sortRules = [];
-        let fields;
-        let page = 0;
-        let count = 10;
+        let filters = undefined;
+        let sortRules = undefined;
+        let fields = undefined;
+        let page = undefined;
+        let count = undefined;
         let total = undefined;
         params.forEach((value, key) => {
             if (key === '_fields') {
@@ -666,9 +669,11 @@
                 total = value;
             }
             else if (key === '_sort') {
+                sortRules = sortRules || [];
                 sortRules.push(parseSortRule(value));
             }
             else {
+                filters = filters || [];
                 filters.push(parseSearchFilter(key, value));
             }
         });
@@ -747,13 +752,9 @@
             params.push('_fields=' + definition.fields.join(','));
         }
         if (definition.filters) {
-            definition.filters.forEach((filter) => {
-                const modifier = MODIFIER_OPERATORS.includes(filter.operator) ? ':' + filter.operator : '';
-                const prefix = PREFIX_OPERATORS.includes(filter.operator) ? filter.operator : '';
-                params.push(`${filter.code}${modifier}=${prefix}${encodeURIComponent(filter.value)}`);
-            });
+            definition.filters.forEach((filter) => params.push(formatFilter(filter)));
         }
-        if (definition.sortRules) {
+        if (definition.sortRules && definition.sortRules.length > 0) {
             params.push(formatSortRules(definition.sortRules));
         }
         if (definition.page && definition.page > 0) {
@@ -771,6 +772,11 @@
         params.sort();
         return '?' + params.join('&');
     }
+    function formatFilter(filter) {
+        const modifier = MODIFIER_OPERATORS.includes(filter.operator) ? ':' + filter.operator : '';
+        const prefix = PREFIX_OPERATORS.includes(filter.operator) ? filter.operator : '';
+        return `${filter.code}${modifier}=${prefix}${encodeURIComponent(filter.value)}`;
+    }
     function formatSortRules(sortRules) {
         if (!sortRules || sortRules.length === 0) {
             return '';
@@ -942,6 +948,21 @@
     function createSchema() {
         return { types: {} };
     }
+    function createTypeSchema(typeName, description) {
+        return {
+            display: typeName,
+            description,
+            properties: {},
+            searchParams: {
+                _lastUpdated: {
+                    base: [typeName],
+                    code: '_lastUpdated',
+                    type: 'date',
+                    expression: typeName + '.meta.lastUpdated',
+                },
+            },
+        };
+    }
     /**
      * Indexes a StructureDefinition for fast lookup.
      * See comments on IndexedStructureDefinition for more details.
@@ -954,11 +975,7 @@
         if (!typeName) {
             return;
         }
-        schema.types[typeName] = {
-            display: typeName,
-            description: structureDefinition.description,
-            properties: {},
-        };
+        schema.types[typeName] = createTypeSchema(typeName, structureDefinition.description);
         const elements = (_a = structureDefinition.snapshot) === null || _a === void 0 ? void 0 : _a.element;
         if (elements) {
             // Filter out any elements missing path or type
@@ -986,12 +1003,8 @@
         const parts = path.split('.');
         const typeName = buildTypeName(parts);
         if (!(typeName in schema.types)) {
-            schema.types[typeName] = {
-                display: typeName,
-                description: element.definition,
-                parentType: buildTypeName(parts.slice(0, parts.length - 1)),
-                properties: {},
-            };
+            schema.types[typeName] = createTypeSchema(typeName, element.definition);
+            schema.types[typeName].parentType = buildTypeName(parts.slice(0, parts.length - 1));
         }
     }
     /**
@@ -1039,6 +1052,10 @@
         // For example, for path "Patient.birthDate"
         // the property name is "birthDate"
         const propertyName = property.path.replaceAll('[x]', '').split('.').pop();
+        // Special case for ID
+        if (propertyName === 'id') {
+            return 'ID';
+        }
         // Split by capital letters
         // Capitalize the first letter of each word
         // Join together with spaces in between
@@ -1340,7 +1357,9 @@
       SearchParameterList(base: "${encodeURIComponent(resourceType)}") {
         base,
         code,
-        type
+        type,
+        expression,
+        target
       }
     }`.replace(/\s+/g, ' ');
                 const response = (yield this.graphql(query));
@@ -1677,6 +1696,9 @@
      */
     function getSearchParameterDetails(structureDefinitions, resourceType, searchParam) {
         var _a, _b, _c, _d;
+        if (searchParam.code === '_lastUpdated') {
+            return { columnName: 'lastUpdated', type: exports.SearchParameterType.DATETIME };
+        }
         const columnName = convertCodeToColumnName(searchParam.code);
         const expression = (_a = getExpressionForResourceType(resourceType, searchParam.expression)) === null || _a === void 0 ? void 0 : _a.split('.');
         if (!expression) {
@@ -1685,20 +1707,21 @@
             return { columnName, type: exports.SearchParameterType.TEXT };
         }
         let baseType = resourceType;
+        let elementDefinition = undefined;
         let propertyType = undefined;
         let array = false;
         for (let i = 1; i < expression.length; i++) {
             const propertyName = expression[i];
-            const propertyDef = (_c = (_b = structureDefinitions.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName];
-            if (!propertyDef) {
+            elementDefinition = (_c = (_b = structureDefinitions.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName];
+            if (!elementDefinition) {
                 // This happens on complex properties such as "collected[x]"/"collectedDateTime"/"collectedPeriod"
                 // In the future, explore returning multiple column definitions
                 return { columnName, type: exports.SearchParameterType.TEXT, array };
             }
-            if (propertyDef.max === '*') {
+            if (elementDefinition.max === '*') {
                 array = true;
             }
-            propertyType = (_d = propertyDef.type) === null || _d === void 0 ? void 0 : _d[0].code;
+            propertyType = (_d = elementDefinition.type) === null || _d === void 0 ? void 0 : _d[0].code;
             if (!propertyType) {
                 // This happens when one of parent properties uses contentReference
                 // In the future, explore following the reference
@@ -1714,7 +1737,7 @@
             }
         }
         const type = getSearchParameterType(searchParam, propertyType);
-        return { columnName, type, array };
+        return { columnName, type, elementDefinition, array };
     }
     /**
      * Converts a hyphen-delimited code to camelCase string.
@@ -1783,6 +1806,7 @@
     exports.capitalize = capitalize;
     exports.createReference = createReference;
     exports.createSchema = createSchema;
+    exports.createTypeSchema = createTypeSchema;
     exports.created = created;
     exports.deepEquals = deepEquals;
     exports.formatAddress = formatAddress;