Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(name-binding): add extra props to update one time mode #741

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
25 changes: 21 additions & 4 deletions src/name-expression.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { bindingMode } from './binding-mode';

function getAU(element) {
let au = element.au;

Expand Down Expand Up @@ -43,10 +45,17 @@ export class NameExpression {
}

class NameBinder {
/**
* Name binding for reference
* @param {Expression} sourceExpression
* @param {any} target
* @param {any} lookupFunctions
*/
constructor(sourceExpression, target, lookupFunctions) {
this.sourceExpression = sourceExpression;
this.target = target;
this.lookupFunctions = lookupFunctions;
this.mode = bindingMode.oneTime;
}

bind(source) {
Expand All @@ -64,16 +73,24 @@ class NameBinder {
this.sourceExpression.assign(this.source, this.target, this.lookupFunctions);
}

call() {
if (!this.isBound) {
return;
}
this.sourceExpression.assign(this.source, this.target, this.lookupFunctions);
}

unbind() {
if (!this.isBound) {
return;
}
this.isBound = false;
if (this.sourceExpression.evaluate(this.source, this.lookupFunctions) === this.target) {
this.sourceExpression.assign(this.source, null, this.lookupFunctions);
const { source, lookupFunctions, sourceExpression } = this;
if (sourceExpression.evaluate(source, lookupFunctions) === this.target) {
sourceExpression.assign(source, null, lookupFunctions);
}
if (this.sourceExpression.unbind) {
this.sourceExpression.unbind(this, this.source);
if (sourceExpression.unbind) {
sourceExpression.unbind(this, source);
}
this.source = null;
}
Expand Down
38 changes: 38 additions & 0 deletions test/name-expression.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '../src/ast';
import {createScopeForTest} from '../src/scope';
import {NameExpression} from '../src/name-expression';
import { bindingMode } from '../src/binding-mode';

describe('NameExpression', () => {
let element;
Expand All @@ -23,6 +24,13 @@ describe('NameExpression', () => {
};
});

it('creates one time binding mode binding', () => {
let sourceExpression = new AccessScope('foo');
let expression = new NameExpression(sourceExpression, 'element');
let binding = expression.createBinding(element);
expect(binding.mode).toBe(bindingMode.oneTime);
});

it('binds element to scope', () => {
let sourceExpression = new AccessScope('foo');
let expression = new NameExpression(sourceExpression, 'element');
Expand Down Expand Up @@ -104,4 +112,34 @@ describe('NameExpression', () => {
binding.unbind();
expect(scope.bindingContext.foo).toBe('should remain');
});

it('re-assigns value when invoking call()', () => {
let sourceExpression = new AccessScope('foo');
let expression = new NameExpression(sourceExpression, 'element');
let scope = createScopeForTest({});
let binding = expression.createBinding(element);
binding.bind(scope);
expect(scope.bindingContext.foo).toBe(element);
scope.bindingContext.foo = null;
expect(binding.target).toBe(element);
binding.call();
expect(scope.bindingContext.foo).toBe(element);
});

it('does nothing when not bound + invoking call()', () => {
let sourceExpression = new AccessScope('foo');
let expression = new NameExpression(sourceExpression, 'element');
let scope = createScopeForTest({});
let binding = expression.createBinding(element);
binding.bind(scope);
expect(scope.bindingContext.foo).toBe(element);
scope.bindingContext.foo = null;
expect(binding.target).toBe(element);
binding.isBound = false;
binding.call();
expect(scope.bindingContext.foo).toBe(null);
binding.isBound = true;
binding.call();
expect(scope.bindingContext.foo).toBe(element);
});
});