@medplum/core 0.9.1 → 0.9.2

package/dist/esm/index.js

@@ -395,33 +395,59 @@ function isEmpty(v) {
 /**
  * Resource equality.
  * Ignores meta.versionId and meta.lastUpdated.
- * See: https://dmitripavlutin.com/how-to-compare-objects-in-javascript/#4-deep-equality
  * @param object1 The first object.
  * @param object2 The second object.
  * @returns True if the objects are equal.
  */
 function deepEquals(object1, object2, path) {
-    let keys1 = Object.keys(object1);
-    let keys2 = Object.keys(object2);
-    if (path === 'meta') {
-        keys1 = keys1.filter((k) => k !== 'versionId' && k !== 'lastUpdated' && k !== 'author');
-        keys2 = keys2.filter((k) => k !== 'versionId' && k !== 'lastUpdated' && k !== 'author');
+    if (object1 === object2) {
+        return true;
+    }
+    if (isEmpty(object1) && isEmpty(object2)) {
+        return true;
+    }
+    if (isEmpty(object1) || isEmpty(object2)) {
+        return false;
     }
-    if (keys1.length !== keys2.length) {
+    if (Array.isArray(object1) && Array.isArray(object2)) {
+        return deepEqualsArray(object1, object2);
+    }
+    if (Array.isArray(object1) || Array.isArray(object2)) {
+        return false;
+    }
+    if (isObject(object1) && isObject(object2)) {
+        return deepEqualsObject(object1, object2, path);
+    }
+    if (isObject(object1) || isObject(object2)) {
         return false;
     }
-    for (const key of keys1) {
+    return false;
+}
+function deepEqualsArray(array1, array2) {
+    if (array1.length !== array2.length) {
+        return false;
+    }
+    for (let i = 0; i < array1.length; i++) {
+        if (!deepEquals(array1[i], array2[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+function deepEqualsObject(object1, object2, path) {
+    const keySet = new Set();
+    Object.keys(object1).forEach((k) => keySet.add(k));
+    Object.keys(object2).forEach((k) => keySet.add(k));
+    if (path === 'meta') {
+        keySet.delete('versionId');
+        keySet.delete('lastUpdated');
+        keySet.delete('author');
+    }
+    for (const key of keySet) {
         const val1 = object1[key];
         const val2 = object2[key];
-        if (isObject(val1) && isObject(val2)) {
-            if (!deepEquals(val1, val2, key)) {
-                return false;
-            }
-        }
-        else {
-            if (val1 !== val2) {
-                return false;
-            }
+        if (!deepEquals(val1, val2, key)) {
+            return false;
         }
     }
     return true;
@@ -719,6 +745,7 @@ class OperationOutcomeError extends Error {
     }
 }
 
+const DEFAULT_SEARCH_COUNT = 20;
 /**
  * Search operators.
  * These operators represent "modifiers" and "prefixes" in FHIR search.
@@ -786,15 +813,15 @@ function parseSearchDefinition(url) {
     let filters = undefined;
     let sortRules = undefined;
     let fields = undefined;
-    let page = undefined;
+    let offset = undefined;
     let count = undefined;
     let total = undefined;
     params.forEach((value, key) => {
         if (key === '_fields') {
             fields = value.split(',');
         }
-        else if (key === '_page') {
-            page = parseInt(value);
+        else if (key === '_offset') {
+            offset = parseInt(value);
         }
         else if (key === '_count') {
             count = parseInt(value);
@@ -815,7 +842,7 @@ function parseSearchDefinition(url) {
         resourceType,
         filters,
         fields,
-        page,
+        offset,
         count,
         total,
         sortRules,
@@ -891,13 +918,13 @@ function formatSearchQuery(definition) {
     if (definition.sortRules && definition.sortRules.length > 0) {
         params.push(formatSortRules(definition.sortRules));
     }
-    if (definition.page && definition.page > 0) {
-        params.push('_page=' + definition.page);
+    if (definition.offset !== undefined) {
+        params.push('_offset=' + definition.offset);
     }
-    if (definition.count && definition.count > 0) {
+    if (definition.count !== undefined) {
         params.push('_count=' + definition.count);
     }
-    if (definition.total) {
+    if (definition.total !== undefined) {
         params.push('_total=' + encodeURIComponent(definition.total));
     }
     if (params.length === 0) {
@@ -2114,7 +2141,7 @@ _MedplumClient_fetch = new WeakMap(), _MedplumClient_storage = new WeakMap(), _M
             return undefined;
         }
         const obj = yield response.json();
-        if (obj.resourceType === 'OperationOutcome' && !isOk(obj)) {
+        if ((obj === null || obj === void 0 ? void 0 : obj.resourceType) === 'OperationOutcome' && !isOk(obj)) {
             return Promise.reject(obj);
         }
         return obj;
@@ -2705,5 +2732,5 @@ function simplifyExpression(input) {
     return result;
 }
 
-export { COMPONENT_SEPARATOR, FIELD_SEPARATOR, Hl7Field, Hl7Message, Hl7Segment, LegacyRepositoryClient, MedplumClient, OperationOutcomeError, Operator, PropertyType, SEGMENT_SEPARATOR, SearchParameterType, accessDenied, allOk, arrayBufferToBase64, arrayBufferToHex, assertOk, badRequest, buildTypeName, calculateAge, calculateAgeString, capitalize, createReference, createSchema, createTypeSchema, created, deepEquals, formatAddress, formatFamilyName, formatGivenName, formatHumanName, formatSearchQuery, getDateProperty, getDisplayString, getExpressionForResourceType, getExtensionValue, getImageSrc, getPropertyDisplayName, getQuestionnaireAnswers, getReferenceString, getSearchParameterDetails, getStatus, gone, indexSearchParameter, indexStructureDefinition, isGone, isLowerCase, isNotFound, isObject, isOk, isProfileResource, isStringArray, notFound, notModified, parseSearchDefinition, resolveId, stringify };
+export { COMPONENT_SEPARATOR, DEFAULT_SEARCH_COUNT, FIELD_SEPARATOR, Hl7Field, Hl7Message, Hl7Segment, LegacyRepositoryClient, MedplumClient, OperationOutcomeError, Operator, PropertyType, SEGMENT_SEPARATOR, SearchParameterType, accessDenied, allOk, arrayBufferToBase64, arrayBufferToHex, assertOk, badRequest, buildTypeName, calculateAge, calculateAgeString, capitalize, createReference, createSchema, createTypeSchema, created, deepEquals, formatAddress, formatFamilyName, formatGivenName, formatHumanName, formatSearchQuery, getDateProperty, getDisplayString, getExpressionForResourceType, getExtensionValue, getImageSrc, getPropertyDisplayName, getQuestionnaireAnswers, getReferenceString, getSearchParameterDetails, getStatus, gone, indexSearchParameter, indexStructureDefinition, isGone, isLowerCase, isNotFound, isObject, isOk, isProfileResource, isStringArray, notFound, notModified, parseSearchDefinition, resolveId, stringify };
 //# sourceMappingURL=index.js.map