chore(benchpress): clang-format and lint

Author: Jason Choi

gulpfile.js

@@ -11,7 +11,8 @@ const path = require('path');
 const os = require('os');
 
 const srcsToFmt =
-    ['tools/**/*.ts', 'modules/@angular/**/*.ts', '!tools/public_api_guard/**/*.d.ts'];
+    ['tools/**/*.ts', 'modules/@angular/**/*.ts', '!tools/public_api_guard/**/*.d.ts',
+    'modules/benchpress/**/*.ts'];
 
 gulp.task('format:enforce', () => {
   const format = require('gulp-clang-format');
@@ -97,7 +98,7 @@ gulp.task('lint', ['format:enforce', 'tools:build'], () => {
   // Built-in rules are at
   // https://github.com/palantir/tslint#supported-rules
   const tslintConfig = require('./tslint.json');
-  return gulp.src(['modules/@angular/**/*.ts'])
+  return gulp.src(['modules/@angular/**/*.ts', 'modules/benchpress/**/*.ts'])
     .pipe(tslint({
       tslint: require('tslint').default,
       configuration: tslintConfig,

modules/benchpress/benchpress.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 import {bind} from '@angular/core/src/di';
 import {Options} from './common';
 
@@ -22,5 +30,5 @@ function writeFile(filename, content): Promise<any> {
         resolve();
       }
     });
-  })
+  });
 }

modules/benchpress/common.ts

@@ -1,23 +1,30 @@
-export {Sampler, SampleState} from './src/sampler';
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export {Injector, OpaqueToken, ReflectiveInjector, bind, provide} from '@angular/core/src/di';
+export {Options} from './src/common_options';
+export {MeasureValues} from './src/measure_values';
 export {Metric} from './src/metric';
-export {Validator} from './src/validator';
+export {MultiMetric} from './src/metric/multi_metric';
+export {PerflogMetric} from './src/metric/perflog_metric';
+export {UserMetric} from './src/metric/user_metric';
 export {Reporter} from './src/reporter';
-export {WebDriverExtension, PerfLogFeatures} from './src/web_driver_extension';
-export {WebDriverAdapter} from './src/web_driver_adapter';
-export {SizeValidator} from './src/validator/size_validator';
-export {RegressionSlopeValidator} from './src/validator/regression_slope_validator';
 export {ConsoleReporter} from './src/reporter/console_reporter';
 export {JsonFileReporter} from './src/reporter/json_file_reporter';
+export {MultiReporter} from './src/reporter/multi_reporter';
+export {Runner} from './src/runner';
 export {SampleDescription} from './src/sample_description';
-export {PerflogMetric} from './src/metric/perflog_metric';
+export {SampleState, Sampler} from './src/sampler';
+export {Validator} from './src/validator';
+export {RegressionSlopeValidator} from './src/validator/regression_slope_validator';
+export {SizeValidator} from './src/validator/size_validator';
+export {WebDriverAdapter} from './src/web_driver_adapter';
+export {PerfLogFeatures, WebDriverExtension} from './src/web_driver_extension';
 export {ChromeDriverExtension} from './src/webdriver/chrome_driver_extension';
 export {FirefoxDriverExtension} from './src/webdriver/firefox_driver_extension';
 export {IOsDriverExtension} from './src/webdriver/ios_driver_extension';
-export {Runner} from './src/runner';
-export {Options} from './src/common_options';
-export {MeasureValues} from './src/measure_values';
-export {MultiMetric} from './src/metric/multi_metric';
-export {UserMetric} from './src/metric/user_metric';
-export {MultiReporter} from './src/reporter/multi_reporter';
-
-export {bind, provide, Injector, ReflectiveInjector, OpaqueToken} from '@angular/core/src/di';

modules/benchpress/index.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 require('reflect-metadata');
 require('es6-shim');
 module.exports = require('./benchpress.js');

modules/benchpress/src/common_options.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 import {OpaqueToken} from '@angular/core/src/di';
 import {DateWrapper} from '@angular/facade/src/lang';
 
@@ -52,14 +60,9 @@ var _REQUEST_COUNT = new OpaqueToken('Options.requestCount');
 var _CAPTURE_FRAMES = new OpaqueToken('Options.frameCapture');
 
 var _DEFAULT_PROVIDERS = [
-  {provide: _DEFAULT_DESCRIPTION, useValue: {}},
-  {provide: _SAMPLE_DESCRIPTION, useValue: {}},
-  {provide: _FORCE_GC, useValue: false},
-  {provide: _PREPARE, useValue: false},
-  {provide: _MICRO_METRICS, useValue: {}},
-  {provide: _USER_METRICS, useValue: {}},
-  {provide: _NOW, useValue: () => DateWrapper.now()},
-  {provide: _RECEIVED_DATA, useValue: false},
-  {provide: _REQUEST_COUNT, useValue: false},
-  {provide: _CAPTURE_FRAMES, useValue: false}
+  {provide: _DEFAULT_DESCRIPTION, useValue: {}}, {provide: _SAMPLE_DESCRIPTION, useValue: {}},
+  {provide: _FORCE_GC, useValue: false}, {provide: _PREPARE, useValue: false},
+  {provide: _MICRO_METRICS, useValue: {}}, {provide: _USER_METRICS, useValue: {}},
+  {provide: _NOW, useValue: () => DateWrapper.now()}, {provide: _RECEIVED_DATA, useValue: false},
+  {provide: _REQUEST_COUNT, useValue: false}, {provide: _CAPTURE_FRAMES, useValue: false}
 ];

modules/benchpress/src/firefox_extension/data/installed_script.ts

@@ -1,28 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 declare var exportFunction;
 declare var unsafeWindow;
 
 exportFunction(function() {
   var curTime = unsafeWindow.performance.now();
   (<any>self).port.emit('startProfiler', curTime);
-}, unsafeWindow, {defineAs: "startProfiler"});
+}, unsafeWindow, {defineAs: 'startProfiler'});
 
-exportFunction(function() { (<any>self).port.emit('stopProfiler'); }, unsafeWindow,
-               {defineAs: "stopProfiler"});
+exportFunction(function() {
+  (<any>self).port.emit('stopProfiler');
+}, unsafeWindow, {defineAs: 'stopProfiler'});
 
 exportFunction(function(cb) {
   (<any>self).port.once('perfProfile', cb);
   (<any>self).port.emit('getProfile');
-}, unsafeWindow, {defineAs: "getProfile"});
+}, unsafeWindow, {defineAs: 'getProfile'});
 
-exportFunction(function() { (<any>self).port.emit('forceGC'); }, unsafeWindow,
-               {defineAs: "forceGC"});
+exportFunction(function() {
+  (<any>self).port.emit('forceGC');
+}, unsafeWindow, {defineAs: 'forceGC'});
 
 exportFunction(function(name) {
   var curTime = unsafeWindow.performance.now();
   (<any>self).port.emit('markStart', name, curTime);
-}, unsafeWindow, {defineAs: "markStart"});
+}, unsafeWindow, {defineAs: 'markStart'});
 
 exportFunction(function(name) {
   var curTime = unsafeWindow.performance.now();
   (<any>self).port.emit('markEnd', name, curTime);
-}, unsafeWindow, {defineAs: "markEnd"});
+}, unsafeWindow, {defineAs: 'markEnd'});

modules/benchpress/src/firefox_extension/lib/main.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 var {Cc, Ci, Cu} = require('chrome');
 var os = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
 var ParserUtil = require('./parser_util');
@@ -25,7 +33,8 @@ class Profiler {
     return perfEvents;
   }
 
-  _mergeMarkerEvents(perfEvents: any[]): any[] {
+  /** @internal */
+  private _mergeMarkerEvents(perfEvents: any[]): any[] {
     this._markerEvents.forEach(function(markerEvent) { perfEvents.push(markerEvent); });
     return perfEvents;
   }
@@ -51,12 +60,13 @@ mod.PageMod({
   include: ['*'],
   contentScriptFile: data.url('installed_script.js'),
   onAttach: worker => {
-    worker.port.on('startProfiler',
-                   (timeStarted) => profiler.start(/* = profiler memory */ 3000000, 0.1,
-                                                   ['leaf', 'js', 'stackwalk', 'gc'], timeStarted));
+    worker.port.on(
+        'startProfiler',
+        (timeStarted) => profiler.start(
+            /* = profiler memory */ 3000000, 0.1, ['leaf', 'js', 'stackwalk', 'gc'], timeStarted));
     worker.port.on('stopProfiler', () => profiler.stop());
-    worker.port.on('getProfile',
-                   () => worker.port.emit('perfProfile', profiler.getProfilePerfEvents()));
+    worker.port.on(
+        'getProfile', () => worker.port.emit('perfProfile', profiler.getProfilePerfEvents()));
     worker.port.on('forceGC', forceGC);
     worker.port.on('markStart', (name, timeStarted) => profiler.addStartEvent(name, timeStarted));
     worker.port.on('markEnd', (name, timeEnded) => profiler.addEndEvent(name, timeEnded));

modules/benchpress/src/firefox_extension/lib/parser_util.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 /**
  * @param {Object} perfProfile The perf profile JSON object.
  * @return {Object[]} An array of recognized events that are captured

modules/benchpress/src/firefox_extension/lib/test_helper.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 var q = require('q');
 var FirefoxProfile = require('firefox-profile');
 var jpm = require('jpm/lib/xpi');
@@ -36,9 +44,8 @@ exports.getFirefoxProfileWithExtension = function() {
   var savedCwd = process.cwd();
   process.chdir(absPackageJsonDir);
 
-  return jpm(packageJson)
-      .then(xpiPath => {
-        process.chdir(savedCwd);
-        return exports.getFirefoxProfile(xpiPath);
-      });
+  return jpm(packageJson).then(xpiPath => {
+    process.chdir(savedCwd);
+    return exports.getFirefoxProfile(xpiPath);
+  });
 };

modules/benchpress/src/measure_values.ts

@@ -1,9 +1,17 @@
-import {Date, DateWrapper} from '@angular/facade/src/lang';
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 import {Map} from '@angular/facade/src/collection';
+import {Date, DateWrapper} from '@angular/facade/src/lang';
 
 export class MeasureValues {
-  constructor(public runIndex: number, public timeStamp: Date,
-              public values: {[key: string]: any}) {}
+  constructor(
+      public runIndex: number, public timeStamp: Date, public values: {[key: string]: any}) {}
 
   toJson() {
     return {

modules/benchpress/src/metric.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 import {BaseException, WrappedException} from '@angular/facade/src/exceptions';
 
 /**

modules/benchpress/src/metric/multi_metric.ts

@@ -1,6 +1,14 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 import {Injector, OpaqueToken} from '@angular/core/src/di';
-import {StringMapWrapper} from '@angular/facade/src/collection';
 import {PromiseWrapper} from '@angular/facade/src/async';
+import {StringMapWrapper} from '@angular/facade/src/collection';
 
 import {Metric} from '../metric';
 
@@ -9,14 +17,10 @@ export class MultiMetric extends Metric {
     return [
       {
         provide: _CHILDREN,
-        useFactory:(injector: Injector) => childTokens.map(token => injector.get(token)),
+        useFactory: (injector: Injector) => childTokens.map(token => injector.get(token)),
         deps: [Injector]
       },
-      {
-        provide: MultiMetric,
-        useFactory: children => new MultiMetric(children),
-        deps: [_CHILDREN]
-      }
+      {provide: MultiMetric, useFactory: children => new MultiMetric(children), deps: [_CHILDREN]}
     ];
   }
 
@@ -48,7 +52,7 @@ export class MultiMetric extends Metric {
   }
 }
 
-function mergeStringMaps(maps: { [key: string]: string }[]): Object {
+function mergeStringMaps(maps: {[key: string]: string}[]): Object {
   var result = {};
   maps.forEach(
       map => { StringMapWrapper.forEach(map, (value, prop) => { result[prop] = value; }); });