Alternative approach: push logic down into setByKeyPath function

dexie · Sep 26, 2020 · d610245 · d610245
1 parent 3eda88a
commit d610245
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/functions/utils.ts b/src/functions/utils.ts
@@ -146,6 +146,10 @@ export function setByKeyPath(obj, keyPath, value) {
     } else {
         var period = keyPath.indexOf('.');
         if (period !== -1) {
+            if (hasOwn(obj, keyPath)) {
+              obj[keyPath] = value;
+              return;
+            }
             var currentKeyPath = keyPath.substr(0, period);
             var remainingKeyPath = keyPath.substr(period + 1);
             if (remainingKeyPath === "")

diff --git a/src/hooks/hooks-middleware.ts b/src/hooks/hooks-middleware.ts
@@ -10,7 +10,7 @@ import {
   DBCoreKeyRange,
 } from "../public/types/dbcore";
 import { nop } from '../functions/chaining-functions';
-import { getObjectDiff, hasOwn, setByKeyPath } from '../functions/utils';
+import { getObjectDiff, setByKeyPath } from '../functions/utils';
 import { PSD } from '../helpers/promise';
 //import { LockableTableMiddleware } from '../dbcore/lockable-table-middleware';
 import { getEffectiveKeys, getExistingValues } from '../dbcore/get-effective-keys';
@@ -87,13 +87,7 @@ export const hooksMiddleware: Middleware<DBCore>  = {
                   if (additionalChanges) {
                     const requestedValue = req.values[i];
                     Object.keys(additionalChanges).forEach(keyPath => {
-                      if (hasOwn(requestedValue, keyPath)) {
-                        // keyPath is already present as a literal property of the object
-                        requestedValue[keyPath] = additionalChanges[keyPath];
-                      } else {
-                        // keyPath represents a new or existing path into the object
-                        setByKeyPath(requestedValue, keyPath, additionalChanges[keyPath]);
-                      }
+                      setByKeyPath(requestedValue, keyPath, additionalChanges[keyPath]);
                     });
                   }
                 }