From 4142db0828fa300665ae1c59c96333e3bbb2abed Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Tue, 5 Feb 2019 11:49:49 -0800 Subject: [PATCH] style: run format (#28532) PR Close #28532 --- packages/bazel/src/schematics/ng-add/index.ts | 116 +++++++++--------- packages/bazel/src/schematics/ng-new/index.ts | 8 +- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index 480b66c6f8..b29e56c28c 100755 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -8,12 +8,12 @@ * @fileoverview Schematics for ng-new project that builds with Bazel. */ -import { SchematicContext, apply, applyTemplates, chain, mergeWith, move, Rule, schematic, Tree, url, SchematicsException, UpdateRecorder, } from '@angular-devkit/schematics'; -import { parseJsonAst, JsonAstObject, strings, JsonValue } from '@angular-devkit/core'; -import { findPropertyInAstObject, insertPropertyInAstObjectInOrder } from '@schematics/angular/utility/json-utils'; -import { validateProjectName } from '@schematics/angular/utility/validation'; -import { getWorkspacePath } from '@schematics/angular/utility/config'; -import { Schema } from './schema'; +import {SchematicContext, apply, applyTemplates, chain, mergeWith, move, Rule, schematic, Tree, url, SchematicsException, UpdateRecorder,} from '@angular-devkit/schematics'; +import {parseJsonAst, JsonAstObject, strings, JsonValue} from '@angular-devkit/core'; +import {findPropertyInAstObject, insertPropertyInAstObjectInOrder} from '@schematics/angular/utility/json-utils'; +import {validateProjectName} from '@schematics/angular/utility/validation'; +import {getWorkspacePath} from '@schematics/angular/utility/config'; +import {Schema} from './schema'; /** * Packages that build under Bazel require additional dev dependencies. This @@ -40,7 +40,7 @@ function addDevDependenciesToPackageJson(options: Schema) { } const angularCoreVersion = angularCoreNode.value as string; - const devDependencies: { [ k: string ]: string } = { + const devDependencies: {[k: string]: string} = { '@angular/bazel': angularCoreVersion, // TODO(kyliau): Consider moving this to latest-versions.ts '@bazel/bazel': '^0.22.1', @@ -51,7 +51,7 @@ function addDevDependenciesToPackageJson(options: Schema) { const recorder = host.beginUpdate(packageJson); for (const packageName of Object.keys(devDependencies)) { - const version = devDependencies[ packageName ]; + const version = devDependencies[packageName]; const indent = 4; insertPropertyInAstObjectInOrder(recorder, devDeps, packageName, version, indent); } @@ -103,23 +103,23 @@ function updateGitignore() { } function replacePropertyInAstObject( - recorder: UpdateRecorder, node: JsonAstObject, propertyName: string, value: JsonValue, - indent: number) { + recorder: UpdateRecorder, node: JsonAstObject, propertyName: string, value: JsonValue, + indent: number) { const property = findPropertyInAstObject(node, propertyName); if (property === null) { throw new Error(`Property ${propertyName} does not exist in JSON object`); } - const { start, text } = property; + const {start, text} = property; recorder.remove(start.offset, text.length); const indentStr = '\n' + - ' '.repeat(indent); + ' '.repeat(indent); const content = JSON.stringify(value, null, ' ').replace(/\n/g, indentStr); recorder.insertLeft(start.offset, content); } function updateAngularJsonToUseBazelBuilder(options: Schema): Rule { return (host: Tree, context: SchematicContext) => { - const { name } = options; + const {name} = options; const workspacePath = getWorkspacePath(host); if (!workspacePath) { throw new Error('Could not find angular.json'); @@ -137,61 +137,61 @@ function updateAngularJsonToUseBazelBuilder(options: Schema): Rule { const recorder = host.beginUpdate(workspacePath); const indent = 8; const architect = - findPropertyInAstObject(project as JsonAstObject, 'architect') as JsonAstObject; + findPropertyInAstObject(project as JsonAstObject, 'architect') as JsonAstObject; replacePropertyInAstObject( - recorder, architect, 'build', { - builder: '@angular/bazel:build', - options: { - targetLabel: '//src:bundle.js', - bazelCommand: 'build', - }, - configurations: { - production: { - targetLabel: '//src:bundle', + recorder, architect, 'build', { + builder: '@angular/bazel:build', + options: { + targetLabel: '//src:bundle.js', + bazelCommand: 'build', + }, + configurations: { + production: { + targetLabel: '//src:bundle', + }, }, }, - }, - indent); + indent); replacePropertyInAstObject( - recorder, architect, 'serve', { - builder: '@angular/bazel:build', - options: { - targetLabel: '//src:devserver', - bazelCommand: 'run', - }, - configurations: { - production: { - targetLabel: '//src:prodserver', + recorder, architect, 'serve', { + builder: '@angular/bazel:build', + options: { + targetLabel: '//src:devserver', + bazelCommand: 'run', + }, + configurations: { + production: { + targetLabel: '//src:prodserver', + }, }, }, - }, - indent); + indent); replacePropertyInAstObject( - recorder, architect, 'test', { - builder: '@angular/bazel:build', - options: { 'bazelCommand': 'test', 'targetLabel': '//src/...' }, - }, - indent); + recorder, architect, 'test', { + builder: '@angular/bazel:build', + options: {'bazelCommand': 'test', 'targetLabel': '//src/...'}, + }, + indent); const e2e = `${options.name}-e2e`; const e2eNode = findPropertyInAstObject(projects as JsonAstObject, e2e); if (e2eNode) { const architect = - findPropertyInAstObject(e2eNode as JsonAstObject, 'architect') as JsonAstObject; + findPropertyInAstObject(e2eNode as JsonAstObject, 'architect') as JsonAstObject; replacePropertyInAstObject( - recorder, architect, 'e2e', { - builder: '@angular/bazel:build', - options: { - bazelCommand: 'test', - targetLabel: '//e2e:devserver_test', - }, - configurations: { - production: { - targetLabel: '//e2e:prodserver_test', + recorder, architect, 'e2e', { + builder: '@angular/bazel:build', + options: { + bazelCommand: 'test', + targetLabel: '//e2e:devserver_test', }, - } - }, - indent); + configurations: { + production: { + targetLabel: '//e2e:prodserver_test', + }, + } + }, + indent); } host.commitUpdate(recorder); @@ -210,13 +210,13 @@ function backupAngularJson(): Rule { return; } host.create( - `${workspacePath}.bak`, '// This is a backup file of the original angular.json. ' + - 'This file is needed in case you want to revert to the workflow without Bazel.\n\n' + - host.read(workspacePath)); + `${workspacePath}.bak`, '// This is a backup file of the original angular.json. ' + + 'This file is needed in case you want to revert to the workflow without Bazel.\n\n' + + host.read(workspacePath)); }; } -export default function (options: Schema): Rule { +export default function(options: Schema): Rule { return (host: Tree) => { validateProjectName(options.name); diff --git a/packages/bazel/src/schematics/ng-new/index.ts b/packages/bazel/src/schematics/ng-new/index.ts index 9f5909df25..e132ffec6f 100644 --- a/packages/bazel/src/schematics/ng-new/index.ts +++ b/packages/bazel/src/schematics/ng-new/index.ts @@ -8,11 +8,11 @@ * @fileoverview Schematics for ng-new project that builds with Bazel. */ -import { Rule, Tree, chain, externalSchematic, schematic } from '@angular-devkit/schematics'; -import { validateProjectName } from '@schematics/angular/utility/validation'; -import { Schema } from './schema'; +import {Rule, Tree, chain, externalSchematic, schematic} from '@angular-devkit/schematics'; +import {validateProjectName} from '@schematics/angular/utility/validation'; +import {Schema} from './schema'; -export default function (options: Schema): Rule { +export default function(options: Schema): Rule { return (host: Tree) => { validateProjectName(options.name);