expensify-common 2.0.147 → 2.0.149

package/dist/Templates.js

@@ -72,7 +72,13 @@ exports.default = (function () {
          */
         get(data = {}) {
             if (!this.compiled) {
-                this.compiled = (0, template_1.default)(this.templateValue);
+                this.compiled = (0, template_1.default)(this.templateValue, {
+                    imports: {
+                        // Here we ignore the eslint rule because _ is imported from OD which does not exist in this repo
+                        // eslint-disable-next-line no-undef, object-shorthand
+                        _: _,
+                    },
+                });
                 this.templateValue = '';
             }
             return this.compiled(data);
@@ -104,7 +110,13 @@ exports.default = (function () {
             // eslint-disable-next-line no-undef
             dataToCompile.nestedTemplate = Templates.get;
             if (!this.compiled) {
-                this.compiled = (0, template_1.default)((0, jquery_1.default)(`#${this.id}`).html());
+                this.compiled = (0, template_1.default)((0, jquery_1.default)(`#${this.id}`).html(), {
+                    imports: {
+                        // Here we ignore the eslint rule because _ is imported from OD which does not exist in this repo
+                        // eslint-disable-next-line no-undef, object-shorthand
+                        _: _,
+                    },
+                });
             }
             return this.compiled(dataToCompile);
         }

package/dist/fastMerge.d.ts

@@ -5,5 +5,5 @@
  * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
  * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
  */
-declare function fastMerge<TObject>(target: TObject, source: TObject, shouldRemoveNullObjectValues?: boolean): TObject;
+declare function fastMerge<TObject extends Record<string, unknown>>(target: TObject, source: TObject, shouldRemoveNullObjectValues?: boolean): TObject;
 export default fastMerge;

package/dist/fastMerge.js

@@ -11,13 +11,20 @@ function isMergeableObject(value) {
     return nonNullObject && Object.prototype.toString.call(value) !== '[object RegExp]' && Object.prototype.toString.call(value) !== '[object Date]' && !Array.isArray(value);
 }
 /**
- * Merges the source object into the target object.
- * @param target - The target object.
- * @param source - The source object.
- * @param shouldRemoveNestedNulls - If true, null object values will be removed.
- * @returns - The merged object.
+ * Merges two objects and removes null values if "shouldRemoveNullObjectValues" is set to true
+ *
+ * We generally want to remove null values from objects written to disk and cache, because it decreases the amount of data stored in memory and on disk.
+ * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
+ * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
  */
-function mergeObject(target, source, shouldRemoveNullObjectValues = true) {
+function fastMerge(target, source, shouldRemoveNullObjectValues = true) {
+    // We have to ignore arrays and nullish values here,
+    // otherwise "mergeObject" will throw an error,
+    // because it expects an object as "source"
+    if (Array.isArray(source) || source === null || source === undefined) {
+        return source;
+    }
+    //  Merges the source object into the target object.
     const destination = {};
     if (isMergeableObject(target)) {
         // lodash adds a small overhead so we don't use it here
@@ -59,20 +66,4 @@ function mergeObject(target, source, shouldRemoveNullObjectValues = true) {
     }
     return destination;
 }
-/**
- * Merges two objects and removes null values if "shouldRemoveNullObjectValues" is set to true
- *
- * We generally want to remove null values from objects written to disk and cache, because it decreases the amount of data stored in memory and on disk.
- * On native, when merging an existing value with new changes, SQLite will use JSON_PATCH, which removes top-level nullish values.
- * To be consistent with the behaviour for merge, we'll also want to remove null values for "set" operations.
- */
-function fastMerge(target, source, shouldRemoveNullObjectValues = true) {
-    // We have to ignore arrays and nullish values here,
-    // otherwise "mergeObject" will throw an error,
-    // because it expects an object as "source"
-    if (Array.isArray(source) || source === null || source === undefined) {
-        return source;
-    }
-    return mergeObject(target, source, shouldRemoveNullObjectValues);
-}
 exports.default = fastMerge;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.147",
+  "version": "2.0.149",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",