Only call split() once and avoid a join() for setPath()

emberjs · Jan 2, 2019 · a51c182 · a51c182
1 parent 5cf6543
commit a51c182
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -133,9 +133,9 @@ export function get(obj: object, keyName: string): any {
   return value;
 }
 
-export function _getPath<T extends object>(root: T, path: string): any {
+export function _getPath<T extends object>(root: T, path: string | string[]): any {
   let obj: any = root;
-  let parts = path.split('.');
+  let parts = typeof path === 'string' ? path.split('.') : path;
 
   for (let i = 0; i < parts.length; i++) {
     if (obj === undefined || obj === null || (obj as MaybeHasIsDestroyed).isDestroyed) {

diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -136,17 +136,16 @@ if (DEBUG) {
 
 function setPath(root: object, path: string, value: any, tolerant?: boolean): any {
   let parts = path.split('.');
-  let keyName = parts.pop() as string;
+  let keyName = parts.pop()!;
 
-  assert('Property set failed: You passed an empty path', keyName!.trim().length > 0);
+  assert('Property set failed: You passed an empty path', keyName.trim().length > 0);
 
-  let newPath = parts.join('.');
-  let newRoot = getPath(root, newPath);
+  let newRoot = getPath(root, parts);
 
   if (newRoot !== null && newRoot !== undefined) {
     return set(newRoot, keyName, value);
   } else if (!tolerant) {
-    throw new EmberError(`Property set failed: object in path "${newPath}" could not be found.`);
+    throw new EmberError(`Property set failed: object in path "${parts.join('.')}" could not be found.`);
   }
 }