[Feat]: isObject for unwrap on object tree node (#98)

plan to handle ember-data objects

src/index.ts

@@ -954,7 +954,7 @@ export class BufferedChangeset implements IChangeset {
           const subContent = this.getDeep(baseContent, remaining.join('.'));
           const subChanges = getSubObject(changes, key);
           // give back and object that can further retrieve changes and/or content
-          const tree = new ObjectTreeNode(subChanges, subContent, this.getDeep);
+          const tree = new ObjectTreeNode(subChanges, subContent, this.getDeep, this.isObject);
           return tree.proxy;
         } else if (typeof result !== 'undefined') {
           return result;
@@ -982,7 +982,7 @@ export class BufferedChangeset implements IChangeset {
       }
 
       // may still access a value on the changes or content objects
-      const tree = new ObjectTreeNode(subChanges, subContent, this.getDeep);
+      const tree = new ObjectTreeNode(subChanges, subContent, this.getDeep, this.isObject);
       return tree.proxy;
     }
 

src/utils/normalize-object.ts

@@ -22,8 +22,11 @@ import isObject from './is-object';
  * @param {Object} target
  * @return {Object}
  */
-export default function normalizeObject<T extends { [key: string]: any }>(target: T): T {
-  if (!target || !isObject(target)) {
+export default function normalizeObject<T extends { [key: string]: any }>(
+  target: T,
+  isObj: Function = isObject
+): T {
+  if (!target || !isObj(target)) {
     return target;
   }
 
@@ -35,7 +38,7 @@ export default function normalizeObject<T extends { [key: string]: any }>(target
 
   for (let key in obj) {
     const next: any = obj[key];
-    if (next && isObject(next)) {
+    if (next && isObj(next)) {
       if (Object.prototype.hasOwnProperty.call(next, 'value') && next instanceof Change) {
         obj[key] = next.value;
       } else {

src/utils/object-tree-node.ts

@@ -91,7 +91,8 @@ class ObjectTreeNode implements ProxyHandler {
   constructor(
     changes: Record<string, any> = {},
     content: Content = {},
-    public safeGet: Function = defaultSafeGet
+    public safeGet: Function = defaultSafeGet,
+    public isObject: Function = isObject
   ) {
     this.changes = changes;
     this.content = content;
@@ -111,11 +112,11 @@ class ObjectTreeNode implements ProxyHandler {
     let changes = this.changes;
 
     if (isObject(changes)) {
-      changes = normalizeObject(changes);
+      changes = normalizeObject(changes, this.isObject);
 
       const content = this.content;
       if (isObject(content)) {
-        changes = normalizeObject(changes);
+        changes = normalizeObject(changes, this.isObject);
         return { ...content, ...changes };
       }
     }

test/utils/object-tree-node.test.ts

@@ -10,6 +10,18 @@ describe('Unit | Utility | object tree node', () => {
     expect(result.content).toEqual({ name: 'c' });
   });
 
+  it('can pass custom isObject', () => {
+    function isObject() {
+      return true;
+    }
+    const result = new ObjectTreeNode({ name: 'z' }, { name: 'c' }, undefined, isObject);
+
+    expect(result.changes).toEqual({ name: 'z' });
+    expect(result.proxy.name).toBe('z');
+    expect(result.content).toEqual({ name: 'c' });
+    expect(result.unwrap()).toEqual({ name: 'z' });
+  });
+
   it('it returns nested children', () => {
     const initialVal = { details: { name: 'z' } };
     const result = new ObjectTreeNode(initialVal, { details: { name: 'c' } });