faster setIfDifferent

xaviergonz · Mar 25, 2024 · 7b4e440 · 7b4e440
1 parent 251d686
commit 7b4e440
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/lib/src/model/newModel.ts b/packages/lib/src/model/newModel.ts
@@ -6,17 +6,17 @@ import { modelInfoByClass } from "../modelShared/modelInfo"
 import { getInternalModelClassPropsInfo } from "../modelShared/modelPropsInfo"
 import { applyModelInitializers } from "../modelShared/newModel"
 import { getModelPropDefaultValue, noDefaultValue } from "../modelShared/prop"
+import { Patch } from "../patch/Patch"
+import { createPatchForObjectValueChange, emitPatches } from "../patch/emitPatch"
 import { tweakModel } from "../tweaker/tweakModel"
 import { tweakPlainObject } from "../tweaker/tweakPlainObject"
 import { failure, inDevMode, makePropReadonly } from "../utils"
+import { setIfDifferentWithReturn } from "../utils/setIfDifferent"
 import type { AnyModel } from "./BaseModel"
 import type { ModelConstructorOptions } from "./ModelConstructorOptions"
 import { getModelIdPropertyName, getModelMetadata } from "./getModelMetadata"
 import { modelTypeKey } from "./metadata"
 import { assertIsModelClass } from "./utils"
-import { setIfDifferent } from "../utils/setIfDifferent"
-import { Patch } from "../patch/Patch"
-import { emitPatches, createPatchForObjectValueChange } from "../patch/emitPatch"
 
 /**
  * @internal
@@ -131,7 +131,7 @@ export const internalNewModel = action(
 
     if (modelIdPropertyName) {
       const initialValue = initialData![modelIdPropertyName]
-      const valueChanged = setIfDifferent(initialData, modelIdPropertyName, id)
+      const valueChanged = setIfDifferentWithReturn(initialData, modelIdPropertyName, id)
 
       if (valueChanged && mode === "fromSnapshot") {
         const modelIdPath = [modelIdPropertyName]

diff --git a/packages/lib/src/utils/setIfDifferent.ts b/packages/lib/src/utils/setIfDifferent.ts
@@ -1,9 +1,13 @@
 import { set } from "mobx"
 
-export function setIfDifferent(target: any, key: PropertyKey, value: any): boolean {
-  const oldValue = target[key]
+export function setIfDifferent(target: any, key: PropertyKey, value: unknown): void {
+  if (target[key] !== value || !(key in target)) {
+    set(target, key, value)
+  }
+}
 
-  if (oldValue !== value || (value === undefined && !(key in target))) {
+export function setIfDifferentWithReturn(target: any, key: PropertyKey, value: unknown): boolean {
+  if (target[key] !== value || !(key in target)) {
     set(target, key, value)
     return true
   }