Merge pull request #822 from lrowe/onmissing-nre

Fix onMissing null reference error
Netflix · Nov 30, 2016 · ce46c18 · ce46c18
2 parents ca841a9 + 5c80bab
commit ce46c18
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/lib/get/onMissing.js b/lib/get/onMissing.js
@@ -43,8 +43,7 @@ function concatAndInsertMissing(model, remainingPath, depth, requestedPath,
 }
 
 function isEmptyAtom(atom) {
-    var type = typeof atom;
-    if (type !== "object") {
+    if (atom === null || typeof atom !== "object") {
         return false;
     }
 

diff --git a/test/falcor/get/get.dataSource-only.spec.js b/test/falcor/get/get.dataSource-only.spec.js
@@ -85,6 +85,30 @@ describe('DataSource Only', function() {
                 }).
                 subscribe(noOp, done, done);
         });
+        it('should get a directly referenced value from falcor.', function(done) {
+            var cache = {
+                reference: {
+                    $type: "ref",
+                    value: ["foo", "bar"]
+                },
+                foo: {
+                    bar: {
+                        $type: "atom",
+                        value: "value"
+                    }
+                }
+            };
+            var model = new Model({source: new LocalDataSource(cache)});
+            var onNext = sinon.spy();
+            toObservable(model.
+                get(['reference', null])).
+                doAction(onNext, noOp, function() {
+                    expect(strip(onNext.getCall(0).args[0])).to.deep.equals({
+                        json: {reference: "value"}
+                    });
+                }).
+                subscribe(noOp, done, done);
+        });
     });
     describe('_toJSONG', function() {
         it('should get a value from falcor.', function(done) {

diff --git a/test/get-core/missing.spec.js b/test/get-core/missing.spec.js
@@ -94,6 +94,15 @@ describe('Missing', function() {
             }
         });
     });
+    it('should report a missing path ending with null', function() {
+        getCoreRunner({
+            input: [['refMissing', null]],
+            output: { },
+            requestedMissingPaths: [['refMissing', null]],
+            optimizedMissingPaths: [['refMissing', null]],
+            cache: { }
+        });
+    });
 
 });