feat(ElementInjector): implement ElementInjector

Author: vsavkin

gulpfile.js

@@ -1,7 +1,9 @@
+var shell = require('gulp-shell');
 var gulp = require('gulp');
 var rename = require('gulp-rename');
 var watch = require('gulp-watch');
 var mergeStreams = require('event-stream').merge;
+var es = require('event-stream');
 var connect = require('gulp-connect');
 var clean = require('gulp-rimraf');
 var runSequence = require('run-sequence');
@@ -225,22 +227,58 @@ gulp.task('analyze/dartanalyzer', function(done) {
 
 
 // ------------------
-// BENCHMARKS
+// BENCHMARKS JS
 
-var benchmarksBuildPath = 'build/benchpress';
-var benchmarksCompiledJsPath = 'build/js/benchmarks/lib';
-
-gulp.task('benchmarks/build.benchpress', function () {
+gulp.task('benchmarks/build.benchpress.js', function () {
  benchpress.build({
- benchmarksPath: benchmarksCompiledJsPath,
- buildPath: benchmarksBuildPath
+ benchmarksPath: 'build/js/benchmarks/lib',
+ buildPath: 'build/benchpress/js'
  })
 });
 
-gulp.task('benchmarks/build', function() {
+gulp.task('benchmarks/build.js', function() {
  runSequence(
  ['jsRuntime/build', 'modules/build.prod.js'],
- 'benchmarks/build.benchpress'
+ 'benchmarks/build.benchpress.js'
+ );
+});
+
+
+// ------------------
+// BENCHMARKS DART
+
+gulp.task('benchmarks/build.dart2js.dart', function () {
+ return gulp.src([
+ "build/dart/benchmarks/lib/**/benchmark.dart"
+ ]).pipe(shell(['dart2js --package-root="build/dart/benchmarks/packages" -o "<%= file.path %>.js" <%= file.path %>']));
+});
+
+gulp.task('benchmarks/create-bpconf.dart', function () {
+ var bpConfContent = "module.exports = function(c) {c.set({scripts: [{src: 'benchmark.dart.js'}]});}";
+ var createBpConfJs = es.map(function(file, cb) {
+ var dir = path.dirname(file.path);
+ fs.writeFileSync(path.join(dir, "bp.conf.js"), bpConfContent);
+ cb();
+ });
+
+ return gulp.src([
+ "build/dart/benchmarks/lib/**/benchmark.dart"
+ ]).pipe(createBpConfJs);
+});
+
+gulp.task('benchmarks/build.benchpress.dart', function () {
+ benchpress.build({
+ benchmarksPath: 'build/dart/benchmarks/lib',
+ buildPath: 'build/benchpress/dart'
+ })
+});
+
+gulp.task('benchmarks/build.dart', function() {
+ runSequence(
+ 'modules/build.dart',
+ 'benchmarks/build.dart2js.dart',
+ 'benchmarks/create-bpconf.dart',
+ 'benchmarks/build.benchpress.dart'
  );
 });
 

modules/benchmarks/pubspec.yaml

@@ -0,0 +1,10 @@
+name: bnehcmarks
+environment:
+ sdk: '>=1.4.0'
+dependencies:
+ facade:
+ path: ../facade
+ di:
+ path: ../di
+ core:
+ path: ../core

modules/benchmarks/src/di/benchmark.dart

@@ -0,0 +1,11 @@
+library injector_get_benchmark;
+
+import './injector_instantiate_benchmark.dart' as b;
+import 'dart:js' as js;
+
+main () {
+ js.context['benchmarkSteps'].add(new js.JsObject.jsify({
+ "name": "Injector.instantiate",
+ "fn": new js.JsFunction.withThis((_) => b.run())
+ }));
+}

modules/benchmarks/src/di/injector_instantiate_benchmark.js

@@ -10,8 +10,6 @@ export function run () {
  var child = injector.createChild([E]);
  child.get(E);
  }
-
- console.log(count)
 }
 
 class A {

modules/benchmarks/src/element_injector/benchmark.dart

@@ -0,0 +1,11 @@
+library element_injector_benchmark;
+
+import './instantiate_benchmark.dart' as ib;
+import 'dart:js' as js;
+
+main () {
+ js.context['benchmarkSteps'].add(new js.JsObject.jsify({
+ "name": "ElementInjector.instantiate + instantiateDirectives",
+ "fn": new js.JsFunction.withThis((_) => ib.run())
+ }));
+}

modules/benchmarks/src/element_injector/benchmark.es5

@@ -0,0 +1,7 @@
+System.import('benchmarks/element_injector/instantiate_benchmark').then(function (bm) {
+ window.benchmarkSteps.push({name: 'ElementInjector.instantiate + instantiateDirectives', fn: bm.run});
+}, console.log.bind(console));
+
+System.import('benchmarks/element_injector/instantiate_directive_benchmark').then(function (bm) {
+ window.benchmarkSteps.push({name: 'ElementInjector.instantiateDirectives', fn: bm.run});
+}, console.log.bind(console));

modules/benchmarks/src/element_injector/bp.conf.es5

@@ -0,0 +1,11 @@
+module.exports = function(config) {
+ config.set({
+ scripts: [
+ {src: '/js/traceur-runtime.js'},
+ {src: '/js/es6-module-loader-sans-promises.src.js'},
+ {src: '/js/extension-register.js'},
+ {src: 'register_system.js'},
+ {src: 'benchmark.js'}
+ ]
+ });
+};

modules/benchmarks/src/element_injector/instantiate_benchmark.js

@@ -0,0 +1,33 @@
+import {Injector} from 'di/di';
+import {ProtoElementInjector} from 'core/compiler/element_injector';
+
+var count = 0;
+
+export function run () {
+ var appInjector = new Injector([]);
+
+ var bindings = [A, B, C];
+ var proto = new ProtoElementInjector(null, bindings, []);
+ for (var i = 0; i < 20000; ++i) {
+ var ei = proto.instantiate();
+ ei.instantiateDirectives(appInjector);
+ }
+}
+
+class A {
+ constructor() {
+ count++;
+ }
+}
+
+class B {
+ constructor() {
+ count++;
+ }
+}
+
+class C {
+ constructor(a:A, b:B) {
+ count++;
+ }
+}

modules/benchmarks/src/element_injector/instantiate_directive_benchmark.js

@@ -0,0 +1,35 @@
+import {Injector} from 'di/di';
+import {ProtoElementInjector} from 'core/compiler/element_injector';
+
+var count = 0;
+
+export function run () {
+ var appInjector = new Injector([]);
+
+ var bindings = [A, B, C];
+ var proto = new ProtoElementInjector(null, bindings, []);
+ var ei = proto.instantiate();
+
+ for (var i = 0; i < 20000; ++i) {
+ ei.clearDirectives();
+ ei.instantiateDirectives(appInjector);
+ }
+}
+
+class A {
+ constructor() {
+ count++;
+ }
+}
+
+class B {
+ constructor() {
+ count++;
+ }
+}
+
+class C {
+ constructor(a:A, b:B) {
+ count++;
+ }
+}