refactor(di): use boolean instead of bool
This commit is contained in:
parent
92b2559109
commit
b71cd9f380
|
@ -1,7 +1,7 @@
|
||||||
import {describe, it, expect} from 'test_lib/test_lib';
|
import {describe, it, expect} from 'test_lib/test_lib';
|
||||||
import {Scanner, Token} from 'change_detection/parser/scanner';
|
import {Scanner, Token} from 'change_detection/parser/scanner';
|
||||||
import {List, ListWrapper} from "facade/collection";
|
import {List, ListWrapper} from "facade/collection";
|
||||||
import {StringWrapper} from "facade/lang";
|
import {StringWrapper, int} from "facade/lang";
|
||||||
|
|
||||||
function lex(text:string):List {
|
function lex(text:string):List {
|
||||||
var scanner:Scanner = new Scanner(text);
|
var scanner:Scanner = new Scanner(text);
|
||||||
|
|
|
@ -49,7 +49,7 @@ export class ProtoElementInjector {
|
||||||
queryKeyId1:int;
|
queryKeyId1:int;
|
||||||
|
|
||||||
textNodes:List<int>;
|
textNodes:List<int>;
|
||||||
hasProperties:bool;
|
hasProperties:boolean;
|
||||||
events:Map<string, Expression>;
|
events:Map<string, Expression>;
|
||||||
|
|
||||||
elementInjector:ElementInjector;
|
elementInjector:ElementInjector;
|
||||||
|
|
|
@ -5,7 +5,7 @@ import {Record} from 'change_detection/record';
|
||||||
import {Module} from 'di/di';
|
import {Module} from 'di/di';
|
||||||
import {ProtoElementInjector, ElementInjector} from './element_injector';
|
import {ProtoElementInjector, ElementInjector} from './element_injector';
|
||||||
import {SetterFn} from 'change_detection/facade';
|
import {SetterFn} from 'change_detection/facade';
|
||||||
import {FIELD, IMPLEMENTS} from 'facade/lang';
|
import {FIELD, IMPLEMENTS, int} from 'facade/lang';
|
||||||
import {List} from 'facade/collection';
|
import {List} from 'facade/collection';
|
||||||
|
|
||||||
/***
|
/***
|
||||||
|
@ -61,7 +61,7 @@ export class ProtoView {
|
||||||
module:Module,
|
module:Module,
|
||||||
protoElementInjector:List<ProtoElementInjector>,
|
protoElementInjector:List<ProtoElementInjector>,
|
||||||
protoWatchGroup:ProtoWatchGroup,
|
protoWatchGroup:ProtoWatchGroup,
|
||||||
useRootElement:bool)
|
useRootElement:boolean)
|
||||||
{
|
{
|
||||||
this._template = template;
|
this._template = template;
|
||||||
this._module = module;
|
this._module = module;
|
||||||
|
|
|
@ -32,7 +32,7 @@ export function main() {
|
||||||
spanPI.hasProperties = true;
|
spanPI.hasProperties = true;
|
||||||
var protoElementInjector:List<ProtoElementInjector> = [sectionPI, divPI, spanPI];
|
var protoElementInjector:List<ProtoElementInjector> = [sectionPI, divPI, spanPI];
|
||||||
var protoWatchGroup:ProtoWatchGroup = null;
|
var protoWatchGroup:ProtoWatchGroup = null;
|
||||||
var hasSingleRoot:bool = false;
|
var hasSingleRoot:boolean = false;
|
||||||
var pv = new ProtoView(template, module, protoElementInjector, protoWatchGroup, hasSingleRoot);
|
var pv = new ProtoView(template, module, protoElementInjector, protoWatchGroup, hasSingleRoot);
|
||||||
var view:View = pv.instantiate();
|
var view:View = pv.instantiate();
|
||||||
var section:Element = template.content.firstChild;
|
var section:Element = template.content.firstChild;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import {FIELD, Type, bool, isBlank} from 'facade/lang';
|
import {FIELD, Type, isBlank} from 'facade/lang';
|
||||||
import {List, MapWrapper, ListWrapper} from 'facade/collection';
|
import {List, MapWrapper, ListWrapper} from 'facade/collection';
|
||||||
import {reflector} from './reflector';
|
import {reflector} from './reflector';
|
||||||
import {Key} from './key';
|
import {Key} from './key';
|
||||||
|
@ -7,7 +7,7 @@ export class Dependency {
|
||||||
@FIELD('final key:Key')
|
@FIELD('final key:Key')
|
||||||
@FIELD('final asFuture:bool')
|
@FIELD('final asFuture:bool')
|
||||||
@FIELD('final lazy:bool')
|
@FIELD('final lazy:bool')
|
||||||
constructor(key:Key, asFuture:bool, lazy:bool) {
|
constructor(key:Key, asFuture:boolean, lazy:boolean) {
|
||||||
this.key = key;
|
this.key = key;
|
||||||
this.asFuture = asFuture;
|
this.asFuture = asFuture;
|
||||||
this.lazy = lazy;
|
this.lazy = lazy;
|
||||||
|
@ -15,7 +15,7 @@ export class Dependency {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Binding {
|
export class Binding {
|
||||||
constructor(key:Key, factory:Function, dependencies:List, providedAsFuture:bool) {
|
constructor(key:Key, factory:Function, dependencies:List, providedAsFuture:boolean) {
|
||||||
this.key = key;
|
this.key = key;
|
||||||
this.factory = factory;
|
this.factory = factory;
|
||||||
this.dependencies = dependencies;
|
this.dependencies = dependencies;
|
||||||
|
|
|
@ -2,7 +2,7 @@ import {Map, List, MapWrapper, ListWrapper} from 'facade/collection';
|
||||||
import {Binding, BindingBuilder, bind} from './binding';
|
import {Binding, BindingBuilder, bind} from './binding';
|
||||||
import {ProviderError, NoProviderError, InvalidBindingError,
|
import {ProviderError, NoProviderError, InvalidBindingError,
|
||||||
AsyncBindingError, CyclicDependencyError, InstantiationError} from './exceptions';
|
AsyncBindingError, CyclicDependencyError, InstantiationError} from './exceptions';
|
||||||
import {Type, isPresent, isBlank, bool} from 'facade/lang';
|
import {Type, isPresent, isBlank} from 'facade/lang';
|
||||||
import {Future, FutureWrapper} from 'facade/async';
|
import {Future, FutureWrapper} from 'facade/async';
|
||||||
import {Key} from './key';
|
import {Key} from './key';
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ class _Waiting {
|
||||||
this.future = future;
|
this.future = future;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function _isWaiting(obj):bool {
|
function _isWaiting(obj):boolean {
|
||||||
return obj instanceof _Waiting;
|
return obj instanceof _Waiting;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ export class Injector {
|
||||||
return ListWrapper.createFixedSize(Key.numberOfKeys() + 1);
|
return ListWrapper.createFixedSize(Key.numberOfKeys() + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
_getByKey(key:Key, returnFuture:bool, returnLazy:bool) {
|
_getByKey(key:Key, returnFuture:boolean, returnLazy:boolean) {
|
||||||
if (returnLazy) {
|
if (returnLazy) {
|
||||||
return () => this._getByKey(key, returnFuture, false);
|
return () => this._getByKey(key, returnFuture, false);
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ export class Injector {
|
||||||
throw new NoProviderError(key);
|
throw new NoProviderError(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
_resolveDependencies(key:Key, binding:Binding, forceAsync:bool):List {
|
_resolveDependencies(key:Key, binding:Binding, forceAsync:boolean):List {
|
||||||
try {
|
try {
|
||||||
var getDependency = d => this._getByKey(d.key, forceAsync || d.asFuture, d.lazy);
|
var getDependency = d => this._getByKey(d.key, forceAsync || d.asFuture, d.lazy);
|
||||||
return ListWrapper.map(binding.dependencies, getDependency);
|
return ListWrapper.map(binding.dependencies, getDependency);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import {MapWrapper} from 'facade/collection';
|
import {MapWrapper} from 'facade/collection';
|
||||||
import {FIELD, int, bool} from 'facade/lang';
|
import {FIELD, int} from 'facade/lang';
|
||||||
|
|
||||||
var _allKeys = {};
|
var _allKeys = {};
|
||||||
var _id:int = 0;
|
var _id:int = 0;
|
||||||
|
|
|
@ -11,11 +11,11 @@ export class ABSTRACT {}
|
||||||
export class IMPLEMENTS {}
|
export class IMPLEMENTS {}
|
||||||
|
|
||||||
|
|
||||||
export function isPresent(obj):bool{
|
export function isPresent(obj):boolean {
|
||||||
return obj != undefined && obj != null;
|
return obj != undefined && obj != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isBlank(obj):bool{
|
export function isBlank(obj):boolean {
|
||||||
return obj == undefined || obj == null;
|
return obj == undefined || obj == null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +104,6 @@ export class NumberWrapper {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function int() {};
|
export function int() {};
|
||||||
export var bool = $traceurRuntime.type.boolean;
|
|
||||||
int.assert = function(value) {
|
int.assert = function(value) {
|
||||||
return value == null || typeof value == 'number' && value === Math.floor(value);
|
return value == null || typeof value == 'number' && value === Math.floor(value);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue