Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/amd/aurelia-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ define(['exports', 'aurelia-logging', 'aurelia-pal', 'aurelia-task-queue', 'aure

AccessMember.prototype.evaluate = function evaluate(scope, lookupFunctions) {
var instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
};

AccessMember.prototype.assign = function assign(scope, value) {
Expand Down
2 changes: 1 addition & 1 deletion dist/aurelia-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,7 @@ export class AccessMember extends Expression {

evaluate(scope, lookupFunctions) {
let instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
}

assign(scope, value) {
Expand Down
2 changes: 1 addition & 1 deletion dist/commonjs/aurelia-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ var AccessMember = exports.AccessMember = function (_Expression7) {

AccessMember.prototype.evaluate = function evaluate(scope, lookupFunctions) {
var instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
};

AccessMember.prototype.assign = function assign(scope, value) {
Expand Down
2 changes: 1 addition & 1 deletion dist/es2015/aurelia-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ export let AccessMember = class AccessMember extends Expression {

evaluate(scope, lookupFunctions) {
let instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
}

assign(scope, value) {
Expand Down
2 changes: 1 addition & 1 deletion dist/native-modules/aurelia-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ export var AccessMember = function (_Expression7) {

AccessMember.prototype.evaluate = function evaluate(scope, lookupFunctions) {
var instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
};

AccessMember.prototype.assign = function assign(scope, value) {
Expand Down
2 changes: 1 addition & 1 deletion dist/system/aurelia-binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -1859,7 +1859,7 @@ System.register(['aurelia-logging', 'aurelia-pal', 'aurelia-task-queue', 'aureli

AccessMember.prototype.evaluate = function evaluate(scope, lookupFunctions) {
var instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
};

AccessMember.prototype.assign = function assign(scope, value) {
Expand Down
2 changes: 1 addition & 1 deletion src/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export class AccessMember extends Expression {

evaluate(scope, lookupFunctions) {
let instance = this.object.evaluate(scope, lookupFunctions);
return instance === null || instance === undefined ? instance : instance[this.name];
return instance === null || instance === undefined ? undefined : instance[this.name];
}

assign(scope, value) {
Expand Down
20 changes: 18 additions & 2 deletions test/ast/access-member.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,35 @@ describe('AccessMember', () => {

it('assigns member on bindingContext', () => {
let scope = createScopeForTest({ foo: { bar: 'baz' } });
expression.assign(scope, 'bang')
expression.assign(scope, 'bang');
expect(scope.bindingContext.foo.bar).toBe('bang');
});

it('assigns member on overrideContext', () => {
let scope = createScopeForTest({});
scope.overrideContext.foo = { bar: 'baz' };
expression.assign(scope, 'bang')
expression.assign(scope, 'bang');
expect(scope.overrideContext.foo.bar).toBe('bang');
});

it('returns the assigned value', () => {
let scope = createScopeForTest({ foo: { bar: 'baz' } });
expect(expression.assign(scope, 'bang')).toBe('bang');
});

it('returns `undefined` for a non-existing member of `null` object', () => {
let scope = createScopeForTest({ foo: null });
expect(expression.evaluate(scope, null)).toBeUndefined();
});

it('returns `undefined` for a non-existing member of `undefined` object', () => {
let scope = createScopeForTest({ foo: undefined });
expect(expression.evaluate(scope, null)).toBeUndefined();
});

it('returns `undefined` for a non-existing member of non-existing object', () => {
let scope = createScopeForTest({});
expect(expression.evaluate(scope, null)).toBeUndefined();
});

});