added Injectable decorator

Author: 500Tech

src/components/comment-list/comments.component.ts

@@ -1,7 +1,7 @@
 /**
  * Created by voland on 4/2/16.
  */
-import {Component} from '../../decorators';
+import {Component, Injectable} from '../../decorators';
 import './comment-list.scss';
 import {IComment} from "../../interfaces";
 import {CommentComponent} from "../comment/comment.component";
@@ -24,17 +24,18 @@ import {FilterByTagsPipe} from "../../pipes/filterByTags";
             </div>
         </div>`
 })
+
+@Injectable()
 export class CommentsComponent {
     comments: IComment[];
     emptyComment: IComment;
     tags: string[];
     tagFilter: any[];
-
-    static $inject = ['CommentsService'];
-    constructor(private CommentsService) {
+    
+    constructor(private _CommentsService: CommentsService) {
         this.emptyComment = {};
         this.tagFilter = [];
-        CommentsService.getComments().then((comments) => {
+        _CommentsService.getComments().then((comments) => {
             this.comments = comments;
             this.tags = this.comments
                 .map((el) => el.tags)

src/decorators.ts

@@ -12,6 +12,7 @@ export function Component(options: {
     template?: string,
     templateUrl?: string,
     bindings?: any,
+    require?: any,
     directives?: any[]
     pipes?: any[]
     providers?: any[]
@@ -48,6 +49,8 @@ export interface PipeTransform {
 export function Pipe(options: {name: string}, moduleOrName: string | ng.IModule = `${appName}.pipes`) {
     return (Pipe: PipeTransformStatic) => {
         const filter = () => {
+            console.log(Pipe.$inject);
+            //@todo: add support for injection across all registered modules
             const $injector = angular.injector(['ng']);
             const instance:any = $injector.instantiate(Pipe);
             return instance.transform.bind(instance);
@@ -56,10 +59,18 @@ export function Pipe(options: {name: string}, moduleOrName: string | ng.IModule
     }
 }
 
-export function Bootstrap(appName: string, appClass: any) {
+
+export function Injectable() {
+    return (Class: any) => {
+        const $injector = angular.injector(['ng']);
+        Class.$inject = $injector.annotate(Class).map((member) => member.replace(/^_/, ''));
+    }
+}
+
+export function bootstrap(appName: string, appClass: any) {
     return (anything: any) => {
         if (!appClass) {
-            console.error(`Please provide main component class as a second argument to @Bootstrap decorator`);
+            console.error(`Please provide main component class as a second argument to @bootstrap decorator`);
         }
         angular.element(document).ready(() => {
             angular.bootstrap(document, [appName]);

src/main.ts

@@ -10,7 +10,7 @@ import components from './components/components.module';
 import pipes from './pipes/pipes.module';
 import {appConfig, appName} from "./app.config";
 import {AppComponent} from "./components/app.component";
-import {Bootstrap} from "./decorators";
+import {bootstrap} from "./decorators";
 
 // configure
 angular
@@ -25,5 +25,5 @@ angular
     .config(appConfig);
 
 // bootstrap
-@Bootstrap(appName, AppComponent)
+@bootstrap(appName, AppComponent)
 class App {}

src/pipes/filterByTags.ts

@@ -2,18 +2,20 @@
  * Created by voland on 4/2/16.
  */
 
-import {PipeTransform, Pipe} from '../decorators';
-// import {CommentsService} from "../services/comments.service";
+import {PipeTransform, Pipe, Injectable} from '../decorators';
+import {CommentsService} from "../services/comments.service";
 
+@Injectable()
 @Pipe({name: 'filterByTags'})
 export class FilterByTagsPipe implements PipeTransform {
-    static $inject = ['$q'];
+    // static $inject = ['$q'];
+    // constructor(private _$q: ng.IQService, private _Comments_Service: CommentsService) {
     constructor(private _$q: ng.IQService) {
     }
 
     transform(comments: any, tags: any) {
         let deferred = this._$q.defer;
-        // console.log(this._comments.getComments);
+        // console.log(this._Comments_Service.getComments);
         if (!tags.length) return comments;
         function check(comment) {
             let filterArray = tags.map((tag: any) => tag.text);