fix($parse): handle null targets at assign

When assigning to a sub property of a property that its value is `null` then write an empty object to the property that will contain the sub-property
angular · Feb 3, 2015 · 2e5a7e5 · 2e5a7e5
1 parent 5dfa630
commit 2e5a7e5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/ng/parse.js b/src/ng/parse.js
@@ -926,7 +926,7 @@ ASTCompiler.prototype = {
           self.if(self.stage === 'inputs' || 's', function() {
             if (create && create !== 1) {
               self.if(
-                self.not(self.getHasOwnProperty('s', ast.name)),
+                self.not(self.nonComputedMember('s', ast.name)),
                 self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
             }
             self.assign(intoId, self.nonComputedMember('s', ast.name));
@@ -948,7 +948,7 @@ ASTCompiler.prototype = {
             self.recurse(ast.property, right);
             self.addEnsureSafeMemberName(right);
             if (create && create !== 1) {
-              self.if(self.not(right + ' in ' + left), self.lazyAssign(self.computedMember(left, right), '{}'));
+              self.if(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
             }
             expression = self.ensureSafeObject(self.computedMember(left, right));
             self.assign(intoId, expression);
@@ -959,7 +959,7 @@ ASTCompiler.prototype = {
           } else {
             ensureSafeMemberName(ast.property.name);
             if (create && create !== 1) {
-              self.if(self.not(self.escape(ast.property.name) + ' in ' + left), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+              self.if(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
             }
             expression = self.nonComputedMember(left, ast.property.name);
             if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.property.name)) {
@@ -1515,7 +1515,7 @@ ASTInterpreter.prototype = {
   identifier: function(name, expensiveChecks, context, create, expression) {
     return function(scope, locals, assign, inputs) {
       var base = locals && (name in locals) ? locals : scope;
-      if (create && create !== 1 && base && !(name in base)) {
+      if (create && create !== 1 && base && !(base[name])) {
         base[name] = {};
       }
       var value = base ? base[name] : undefined;
@@ -1537,7 +1537,7 @@ ASTInterpreter.prototype = {
       if (lhs != null) {
         rhs = right(scope, locals, assign, inputs);
         ensureSafeMemberName(rhs, expression);
-        if (create && create !== 1 && lhs && !(rhs in lhs)) {
+        if (create && create !== 1 && lhs && !(lhs[rhs])) {
           lhs[rhs] = {};
         }
         value = lhs[rhs];
@@ -1553,7 +1553,7 @@ ASTInterpreter.prototype = {
   nonComputedMember: function(left, right, expensiveChecks, context, create, expression) {
     return function(scope, locals, assign, inputs) {
       var lhs = left(scope, locals, assign, inputs);
-      if (create && create !== 1 && lhs && !(right in lhs)) {
+      if (create && create !== 1 && lhs && !(lhs[right])) {
         lhs[right] = {};
       }
       var value = lhs != null ? lhs[right] : undefined;

diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js
@@ -2784,6 +2784,27 @@ describe('parser', function() {
           fn.assign(scope, 123);
           expect(scope.a.b.c).toEqual(123);
         }));
+
+        it('should create objects when finding a null', inject(function($parse) {
+          var fn = $parse('foo.bar');
+          var scope = {foo: null};
+          fn.assign(scope, 123);
+          expect(scope.foo.bar).toEqual(123);
+        }));
+
+        it('should create objects when finding a null', inject(function($parse) {
+          var fn = $parse('foo["bar"]');
+          var scope = {foo: null};
+          fn.assign(scope, 123);
+          expect(scope.foo.bar).toEqual(123);
+        }));
+
+        it('should create objects when finding a null', inject(function($parse) {
+          var fn = $parse('foo.bar.baz');
+          var scope = {foo: null};
+          fn.assign(scope, 123);
+          expect(scope.foo.bar.baz).toEqual(123);
+        }));
       });
 
       describe('one-time binding', function() {