Update DI

examples/app.js

@@ -1,13 +1,14 @@
-import {Provide} from 'di';
+import {Provide, Inject} from 'di';
 import {ChangeEventConfig} from 'templating';
 import {XTagsEventConfig} from './xtags_event_config';
 
 // config for DI
+@Inject
 @Provide(ChangeEventConfig)
 export function AppChangeEventConfig() {
   var res = [];
-  res.push(...ChangeEventConfig());
-  res.push(...XTagsEventConfig());
+  res.push(...ChangeEventConfig);
+  res.push(...XTagsEventConfig);
   return res;
 }
 

examples/xtags_event_config.js

@@ -1,5 +1,3 @@
-export function XTagsEventConfig() {
-  return [{
-    nodeName: 'x-toggle', events: ['change'], properties: ()=>['checked']
-  }];
-}
+export var XTagsEventConfig = [{
+  nodeName: 'x-toggle', events: ['change'], properties: ()=>['checked']
+}];

src/compiler/selector_config.js

@@ -1,9 +1,5 @@
-import {Inject} from 'di'
-
-export function SelectorConfig() {
-  return {
-    interpolationRegex: /{{(.*?)}}/g,
-    bindAttrRegex: /bind-(.+)/,
-    eventAttrRegex: /on-(.+)/,
-  };
-}
+export var SelectorConfig = {
+  interpolationRegex: /{{(.*?)}}/g,
+  bindAttrRegex: /bind-(.+)/,
+  eventAttrRegex: /on-(.+)/,
+};

src/event_handler.js

@@ -1,13 +1,11 @@
 import {Inject} from 'di';
 
-export function ChangeEventConfig() {
-  return [
-    {nodeName: 'input', events: ['input', 'keypress', 'change'], properties: ()=>['value', 'valueAsDate', 'valueAsNumber']},
-    {nodeName: 'textarea', events: ['input', 'keypress', 'change'], properties: ()=>['value']},
-    {nodeName: 'select', events: ['change'], properties: ()=>['value']},
-    {nodeName: '*', events: ['propchange'], properties: (event) => event.properties}
-  ];
-}
+export var ChangeEventConfig = [
+  {nodeName: 'input', events: ['input', 'keypress', 'change'], properties: ()=>['value', 'valueAsDate', 'valueAsNumber']},
+  {nodeName: 'textarea', events: ['input', 'keypress', 'change'], properties: ()=>['value']},
+  {nodeName: 'select', events: ['change'], properties: ()=>['value']},
+  {nodeName: '*', events: ['propchange'], properties: (event) => event.properties}
+];
 
 export class EventHandler {
   @Inject(ChangeEventConfig)

src/global.js

@@ -1,3 +1,6 @@
+import {Inject} from 'di';
+
+@Inject
 export function Global() {
   return window;
 }

src/loader/document_loader.js

@@ -1,3 +1,6 @@
+import {Inject} from 'di';
+
+@Inject
 export function DocumentLoader() {
   throw new Error('Abstract function');
 }

src/util/annotation_provider.js

@@ -1,12 +1,10 @@
-export function AnnotationProvider() {
-  return function(clazz:Function, annotationType:Function) {
-    var annotations = clazz.annotations || [];
-    var res;
-    annotations.forEach(function(annotation) {
-      if (annotation instanceof annotationType) {
-        res = annotation;
-      }
-    });
-    return res;
-  }
+export function AnnotationProvider(clazz:Function, annotationType:Function) {
+  var annotations = clazz.annotations || [];
+  var res;
+  annotations.forEach(function(annotation) {
+    if (annotation instanceof annotationType) {
+      res = annotation;
+    }
+  });
+  return res;
 }

src/view.js

@@ -1,6 +1,6 @@
 import {NodeContainer} from './types';
 import {LinkedList, LinkedListItem} from './util/linked_list';
-import {Injector} from 'di';
+import {Injector, Inject} from 'di';
 
 import {WatchParser, Parser} from 'expressionist';
 import {Parser} from 'expressionist';
@@ -14,6 +14,7 @@ import { NgNode, ArrayOfNgNode } from './ng_node';
  * Views are added to the ViewPort by the template directives
  * such as ng-if and ng-repeat.
  */
+@Inject
 export class View extends LinkedListItem {
   constructor(parentView:View, container:NodeContainer, injector:Injector, executionContext:Object = {}) {
     super();