Make it work with decorators

config.json

@@ -7,5 +7,9 @@
     "typeAssertionModule": "assert",
     "annotations": true,
     "sourceMaps": "file"
+  },
+  "babel": {
+    "sourceMaps": "inline",
+    "stage": 0
   }
 }

karma.conf.babel.js

@@ -0,0 +1,41 @@
+// Karma configuration
+// Generated on Fri Mar 14 2014 15:01:19 GMT-0700 (PDT)
+
+var babelOptions = require('./config').babel;
+
+module.exports = function(config) {
+
+  var files;
+
+  files = [
+      'test/**/*.js'
+  ];
+
+  config.set({
+    frameworks: ['jasmine', 'browserify', 'sourcemaps'],
+
+    files: [
+      'node_modules/karma-babel-preprocessor/node_modules/babel-core/browser-polyfill.js'
+      // The entry point that dynamically imports all the specs.
+      //{pattern: 'test-help/main.js', included: true},
+
+      // The runtime assertion library.
+      //'node_modules/rtts-assert/dist/cjs/assert.js',
+      //'node_modules/angular/angular.js',
+      //'node_modules/angular-mocks/angular-mocks.js'
+    ].concat(files),
+
+    preprocessors: {
+      'test/**/*.js': ['browserify']
+    },
+
+    browsers: ['Chrome'],
+
+    browserify: {
+      transform: [ ['babelify', babelOptions] ]
+    }
+
+  });
+
+  config.plugins.push(require('./karma_sourcemaps'));
+};

package.json

@@ -18,13 +18,19 @@
     "traceur": "^0.0.86"
   },
   "devDependencies": {
+    "angular": "^1.3.15",
+    "angular-mocks": "^1.3.15",
     "assert": "angular/assert#dist",
+    "babelify": "^6.0.2",
     "gulp": "^3.8.9",
     "gulp-connect": "^2.0.6",
     "gulp-rename": "^1.2.0",
     "gulp-traceur": "vojtajina/gulp-traceur#fix-sourcemaps",
     "karma": "^0.12.24",
+    "karma-babel-preprocessor": "^5.1.0",
+    "karma-browserify": "^4.1.2",
     "karma-chrome-launcher": "^0.1.5",
+    "karma-commonjs": "0.0.13",
     "karma-firefox-launcher": "^0.1.4",
     "karma-jasmine": "^0.2.2",
     "karma-requirejs": "^0.2.2",

src/a1atscript/DirectiveObject.js

@@ -1,6 +1,8 @@
 import {ListInjector} from './injectorTypes.js';
 import {registerInjector} from './Injector.js';
+import ToAnnotation from './ToAnnotation.js';
 
+@ToAnnotation
 export class DirectiveObject {
   constructor(token, dependencies = []) {
     this.dependencies = dependencies;
@@ -10,7 +12,7 @@ export class DirectiveObject {
 
 class DirectiveObjectInjector extends ListInjector {
   get annotationClass() {
-    return DirectiveObject;
+    return DirectiveObject.originalClass || DirectiveObject;
   }
 
   _createFactoryArray(ConstructorFn) {

src/a1atscript/Injector.js

@@ -1,4 +1,4 @@
-import { Module } from './annotations.js';
+import { AsModule, Module } from './annotations.js';
 
 import {
   ConfigInjector,
@@ -100,7 +100,7 @@ export class Injector {
   }
 
   _getModuleAnnotation(dependency) {
-    return dependency.annotations.find((annotation) => annotation instanceof Module);
+    return dependency.annotations.find((annotation) => annotation instanceof Module || annotation instanceof AsModule);
   }
 
   _mergeSortedDependencies(sorted1, sorted2) {
@@ -154,7 +154,7 @@ export class Injector {
   }
 
   _moduleMetadata(moduleClass) {
-    return moduleClass.annotations.find((value) => value instanceof Module);
+    return moduleClass.annotations.find((value) => value instanceof Module || value instanceof AsModule);
   }
 
   _instantiateModuleDependencies(moduleDependencies) {

src/a1atscript/ToAnnotation.js

@@ -0,0 +1,25 @@
+export default function ToAnnotation(AnnotationClass) {
+  var decorator = function(...callParams) {
+    callParams.unshift(null);
+    return function(targetClass) {
+      var oldAnnotation = Object.getOwnPropertyDescriptor(targetClass, 'annotations');
+      if (oldAnnotation) {
+        var oldGetter = oldAnnotation.get
+        Object.defineProperty(targetClass, 'annotations', {
+          configurable: true,
+          get: function() {
+            return oldGetter().concat([new (Function.prototype.bind.apply(AnnotationClass, callParams))]);
+          }});
+      } else {
+        Object.defineProperty(targetClass, 'annotations', {
+          configurable: true,
+          get: function() {
+          return [new (Function.prototype.bind.apply(AnnotationClass, callParams))];
+          }});
+      }
+      return targetClass;
+    };
+  };
+  decorator.originalClass = AnnotationClass;
+  return decorator;
+}

src/a1atscript/annotations.js

@@ -1,3 +1,5 @@
+import ToAnnotation from './ToAnnotation.js';
+
 class NgAnnotation {
   constructor(...dependencies) {
     this.dependencies = dependencies;
@@ -11,50 +13,66 @@ class NgNamedAnnotation {
   }
 }
 
+@ToAnnotation
 export class Config extends NgAnnotation {
 
 }
 
+@ToAnnotation
 export class Run extends NgAnnotation {
 
 }
 
+@ToAnnotation
 export class Controller extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Directive extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Service extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Factory extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Provider extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Value extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Constant extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Filter extends NgNamedAnnotation {
 
 }
 
+@ToAnnotation
 export class Animation extends NgNamedAnnotation {
 
 }
 
 export class Module extends NgNamedAnnotation {
 
 }
+
+@ToAnnotation
+export class AsModule extends Module {
+
+}

src/a1atscript/injectorTypes.js

@@ -23,7 +23,7 @@ export class ListInjector {
 export class ConfigInjector extends ListInjector {
 
   get annotationClass() {
-    return Config;
+    return Config.originalClass || Config;
   }
 
   instantiateOne(module, config, metadata) {
@@ -35,7 +35,7 @@ export class ConfigInjector extends ListInjector {
 export class RunInjector extends ListInjector {
 
   get annotationClass() {
-    return Run;
+    return Run.originalClass || Run;
   }
 
   instantiateOne(module, run, metadata) {
@@ -47,7 +47,7 @@ export class RunInjector extends ListInjector {
 export class ControllerInjector extends ListInjector {
 
   get annotationClass() {
-    return Controller;
+    return Controller.originalClass || Controller;
   }
 
   instantiateOne(module, controller, metadata) {
@@ -60,7 +60,7 @@ export class ControllerInjector extends ListInjector {
 export class DirectiveInjector extends ListInjector {
 
   get annotationClass() {
-    return Directive;
+    return Directive.originalClass || Directive;
   }
 
   instantiateOne(module, directive, metadata) {
@@ -73,7 +73,7 @@ export class DirectiveInjector extends ListInjector {
 export class ServiceInjector extends ListInjector {
 
   get annotationClass() {
-    return Service;
+    return Service.originalClass || Service;
   }
 
   instantiateOne(module, service, metadata) {
@@ -86,7 +86,7 @@ export class ServiceInjector extends ListInjector {
 export class FactoryInjector extends ListInjector {
 
   get annotationClass() {
-    return Factory;
+    return Factory.originalClass || Factory;
   }
 
   instantiateOne(module, factory, metadata) {
@@ -99,7 +99,7 @@ export class FactoryInjector extends ListInjector {
 export class ProviderInjector extends ListInjector {
 
   get annotationClass() {
-    return Provider;
+    return Provider.originalClass || Provider;
   }
 
   instantiateOne(module, provider, metadata) {
@@ -112,7 +112,7 @@ export class ProviderInjector extends ListInjector {
 export class ValueInjector extends ListInjector {
 
   get annotationClass() {
-    return Value;
+    return Value.originalClass || Value;
   }
 
   instantiateOne(module, value, metadata) {
@@ -125,7 +125,7 @@ export class ValueInjector extends ListInjector {
 export class ConstantInjector extends ListInjector {
 
   get annotationClass() {
-    return Constant;
+    return Constant.originalClass || Constant;
   }
 
   instantiateOne(module, constant, metadata) {
@@ -138,7 +138,7 @@ export class ConstantInjector extends ListInjector {
 export class AnimationInjector extends ListInjector {
 
   get annotationClass() {
-    return Animation;
+    return Animation.originalClass || Animation;
   }
 
   instantiateOne(module, animation, metadata) {
@@ -151,7 +151,7 @@ export class AnimationInjector extends ListInjector {
 export class FilterInjector extends ListInjector {
 
   get annotationClass() {
-    return Filter;
+    return Filter.originalClass || Filter;
   }
 
   instantiateOne(module, filter, metadata) {

src/a1atscript/ng2Directives/Component.js

@@ -1,12 +1,15 @@
 import Ng2Directive from './Ng2Directive.js';
+import ToAnnotation from '../ToAnnotation.js';
 
+@ToAnnotation
 export class Component extends Ng2Directive {
   constructor(descriptor) {
     super(descriptor)
     this.services = descriptor.services;
   }
 }
 
+@ToAnnotation
 export class Template {
   constructor(descriptor) {
     this.url = descriptor.url;

src/a1atscript/ng2Directives/ComponentInjector.js

@@ -7,11 +7,12 @@ import BindBuilder from "./BindBuilder.js";
 
 class ComponentInjector extends ListInjector {
   get annotationClass() {
-    return Component;
+    return Component.originalClass || Component;
   }
 
   _template(component) {
-    return component.annotations.find((annotation) => annotation instanceof Template);
+    var TemplateClass = Template.originalClass || Template;
+    return component.annotations.find((annotation) => annotation instanceof TemplateClass);
   }
 
   instantiateOne(module, component, annotation) {

src/a1atscript/ng2Directives/TemplateProperties.js

@@ -1,7 +1,7 @@
 import {Template} from "./Component.js";
 
 export default class TemplateProperties {
-  constructor(template:Template) {
+  constructor(template) {
     this._template = template;
   }
 

test-help/main.js

@@ -25,12 +25,12 @@ require.config({
   paths: {
     assert: './node_modules/rtts-assert/dist/amd/assert',
     angular: './bower_components/angular/angular',
-    angularMocks: './bower_components/angular-mocks/angular-mocks'
+    'angular-mocks': './bower_components/angular-mocks/angular-mocks'
   },
 
   shim: {
     'angular': {'exports': 'angular'},
-    'angularMocks': {deps: ['angular'], 'exports': 'angular.mock'},
+    'angular-mocks': {deps: ['angular'], 'exports': 'angular.mock'},
   },
 
   // Dynamically load all test files.

test/Component_spec.js

@@ -1,5 +1,5 @@
-import angular from 'angular.js';
-import mock from 'angularMocks.js';
+import angular from 'angular';
+import 'angular-mocks';
 
 import {Component, Template} from '../src/a1atscript/ng2Directives/Component'
 import "../src/a1atscript/ng2Directives/ComponentInjector";
@@ -13,6 +13,8 @@ import {
   bootstrap
 } from '../src/a1atscript/Injector';
 
+var mock = angular.mock;
+
 @Service('ExampleService')
 class ExampleService {
   constructor() {