Skip to content

Commit 5bfc15c

Browse files
mgechevmgechev
authored
style: prettier pass (#981)
1 parent cd88bd5 commit 5bfc15c

File tree

149 files changed

+1425
-1350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1425
-1350
lines changed

‎README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,7 @@ import { Component } from '@angular/core';
200200

201201
@Component({
202202
selector: 'codelyzer',
203-
template: `
204-
<h1>Hello {{ name }}!</h1>
205-
`
203+
template: ` <h1>Hello {{ name }}!</h1> `,
206204
})
207205
class Codelyzer {
208206
name: string = 'World';
@@ -355,7 +353,7 @@ import { Component } from '@angular/core';
355353
/* tslint:disable:template-use-track-by-function */
356354
@Component({
357355
selector: 'codelyzer',
358-
templateUrl: './codelyzer.component.html'
356+
templateUrl: './codelyzer.component.html',
359357
})
360358
class Codelyzer {}
361359
```
@@ -408,7 +406,7 @@ module.exports = {
408406
predefinedDirectives: [{ selector: 'form', exportAs: 'ngForm' }],
409407

410408
// None = 0b000, Error = 0b001, Info = 0b011, Debug = 0b111
411-
logLevel: 0b111
409+
logLevel: 0b111,
412410
};
413411
```
414412

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"mocha": "6.2.1",
8181
"ncp": "2.0.0",
8282
"node-sass": "4.13.0",
83-
"prettier": "1.19.1",
83+
"prettier": "2.1.2",
8484
"rimraf": "3.0.0",
8585
"rxjs": "6.5.3",
8686
"standard-version": "7.1.0",

‎src/angular/config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let BUILD_TYPE = '<%= BUILD_TYPE %>';
4343
type FileExtension = typeof CSS_FILE_EXTENSION | typeof HTML_FILE_EXTENSION | typeof SVG_FILE_EXTENSION;
4444

4545
const transform = (code: string, fileExtensions: ReadonlyArray<FileExtension>, url?: string): { code: string; url?: string } => {
46-
const parsedCode = !url || fileExtensions.some(fileExtension => url.endsWith(fileExtension)) ? code : '';
46+
const parsedCode = !url || fileExtensions.some((fileExtension) => url.endsWith(fileExtension)) ? code : '';
4747

4848
return { code: parsedCode, url };
4949
};
@@ -77,14 +77,14 @@ export const Config: Config = {
7777
{ selector: 'md-button-toggle-group:not([multiple])', exportAs: 'mdButtonToggleGroup' },
7878
{ selector: '[md-menu-trigger-for], [mdMenuTriggerFor]', exportAs: 'mdMenuTrigger' },
7979
{ selector: '[md-tooltip], [mdTooltip]', exportAs: 'mdTooltip' },
80-
{ selector: 'md-select', exportAs: 'mdSelect' }
80+
{ selector: 'md-select', exportAs: 'mdSelect' },
8181
],
8282

8383
resolveUrl: (url: string | null) => url,
8484

8585
transformStyle: (code: string, url?: string) => transform(code, [CSS_FILE_EXTENSION], url),
8686

87-
transformTemplate: (code: string, url?: string) => transform(code, [HTML_FILE_EXTENSION, SVG_FILE_EXTENSION], url)
87+
transformTemplate: (code: string, url?: string) => transform(code, [HTML_FILE_EXTENSION, SVG_FILE_EXTENSION], url),
8888
};
8989

9090
try {

‎src/angular/expressionTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@ export const ExpTypes = {
8181

8282
ASTWithSource(ast: any) {
8383
return ast.constructor.name === 'ASTWithSource';
84-
}
84+
},
8585
};

‎src/angular/metadataReader.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
ModuleMetadata,
1616
PipeMetadata,
1717
StyleMetadata,
18-
TemplateMetadata
18+
TemplateMetadata,
1919
} from './metadata';
2020
import { AbstractResolver, MetadataUrls } from './urlResolvers/abstractResolver';
2121
import { PathResolver } from './urlResolvers/pathResolver';
@@ -38,7 +38,7 @@ export class MetadataReader {
3838

3939
read(d: ts.ClassDeclaration): DirectiveMetadata | ComponentMetadata | PipeMetadata | ModuleMetadata | InjectableMetadata | undefined {
4040
const componentMetadata = unwrapFirst<ComponentMetadata | undefined>(
41-
maybeNodeArray(ts.createNodeArray(d.decorators)).map(dec => {
41+
maybeNodeArray(ts.createNodeArray(d.decorators)).map((dec) => {
4242
return Maybe.lift(dec)
4343
.bind(callExpression)
4444
.bind(withIdentifier('Component') as any)
@@ -47,7 +47,7 @@ export class MetadataReader {
4747
);
4848

4949
const directiveMetadata = unwrapFirst<DirectiveMetadata | undefined>(
50-
maybeNodeArray(ts.createNodeArray(d.decorators)).map(dec =>
50+
maybeNodeArray(ts.createNodeArray(d.decorators)).map((dec) =>
5151
Maybe.lift(dec)
5252
.bind(callExpression)
5353
.bind(withIdentifier('Directive') as any)
@@ -56,7 +56,7 @@ export class MetadataReader {
5656
);
5757

5858
const pipeMetadata = unwrapFirst<PipeMetadata | undefined>(
59-
maybeNodeArray(ts.createNodeArray(d.decorators)).map(dec =>
59+
maybeNodeArray(ts.createNodeArray(d.decorators)).map((dec) =>
6060
Maybe.lift(dec)
6161
.bind(callExpression)
6262
.bind(withIdentifier('Pipe') as any)
@@ -65,7 +65,7 @@ export class MetadataReader {
6565
);
6666

6767
const moduleMetadata = unwrapFirst<ModuleMetadata | undefined>(
68-
maybeNodeArray(ts.createNodeArray(d.decorators)).map(dec =>
68+
maybeNodeArray(ts.createNodeArray(d.decorators)).map((dec) =>
6969
Maybe.lift(dec)
7070
.bind(callExpression)
7171
.bind(withIdentifier('NgModule') as any)
@@ -74,7 +74,7 @@ export class MetadataReader {
7474
);
7575

7676
const injectableMetadata = unwrapFirst<InjectableMetadata | undefined>(
77-
maybeNodeArray(ts.createNodeArray(d.decorators)).map(dec =>
77+
maybeNodeArray(ts.createNodeArray(d.decorators)).map((dec) =>
7878
Maybe.lift(dec)
7979
.bind(callExpression)
8080
.bind(withIdentifier('Injectable') as any)
@@ -117,8 +117,8 @@ export class MetadataReader {
117117
const directiveMetadata = this.readDirectiveMetadata(d, dec);
118118
const external_M = expr.fmap(() => this.urlResolver!.resolve(dec));
119119
const animations_M = external_M.bind(() => this.readComponentAnimationsMetadata(dec));
120-
const style_M = external_M.bind(external => this.readComponentStylesMetadata(dec, external!));
121-
const template_M = external_M.bind(external => this.readComponentTemplateMetadata(dec, external!));
120+
const style_M = external_M.bind((external) => this.readComponentStylesMetadata(dec, external!));
121+
const template_M = external_M.bind((external) => this.readComponentTemplateMetadata(dec, external!));
122122

123123
return new ComponentMetadata(
124124
directiveMetadata.controller,
@@ -135,59 +135,59 @@ export class MetadataReader {
135135
}
136136

137137
protected readComponentAnimationsMetadata(dec: ts.Decorator): Maybe<(AnimationMetadata | undefined)[] | undefined> {
138-
return getAnimations(dec).fmap(inlineAnimations =>
139-
inlineAnimations!.elements.filter(isStringLiteralLike).map<AnimationMetadata>(inlineAnimation => ({
138+
return getAnimations(dec).fmap((inlineAnimations) =>
139+
inlineAnimations!.elements.filter(isStringLiteralLike).map<AnimationMetadata>((inlineAnimation) => ({
140140
animation: normalizeTransformed({ code: (inlineAnimation as ts.StringLiteral).text }),
141-
node: inlineAnimation as ts.Node
141+
node: inlineAnimation as ts.Node,
142142
}))
143143
);
144144
}
145145

146146
protected readComponentTemplateMetadata(dec: ts.Decorator, external: MetadataUrls): Maybe<TemplateMetadata | undefined> {
147147
// Resolve Inline template
148148
return getTemplate(dec)
149-
.fmap<TemplateMetadata>(inlineTemplate => ({
149+
.fmap<TemplateMetadata>((inlineTemplate) => ({
150150
node: inlineTemplate,
151151
template: normalizeTransformed(Config.transformTemplate(inlineTemplate!.text)),
152-
url: undefined
152+
url: undefined,
153153
}))
154154
.catch(() =>
155155
// If there's no valid inline template, we resolve external template
156-
Maybe.lift(external.templateUrl).bind(url =>
157-
this._resolve(url!).fmap<TemplateMetadata>(template => ({
156+
Maybe.lift(external.templateUrl).bind((url) =>
157+
this._resolve(url!).fmap<TemplateMetadata>((template) => ({
158158
node: undefined,
159159
template: normalizeTransformed(Config.transformTemplate(template!, url)),
160-
url
160+
url,
161161
}))
162162
)
163163
);
164164
}
165165

166166
protected readComponentStylesMetadata(dec: ts.Decorator, external: MetadataUrls): Maybe<(StyleMetadata | undefined)[] | undefined> {
167167
return getInlineStyle(dec)
168-
.fmap(inlineStyles =>
168+
.fmap((inlineStyles) =>
169169
// Resolve Inline styles
170-
inlineStyles!.elements.filter(isStringLiteralLike).map<StyleMetadata>(inlineStyle => ({
170+
inlineStyles!.elements.filter(isStringLiteralLike).map<StyleMetadata>((inlineStyle) => ({
171171
node: inlineStyle,
172-
style: normalizeTransformed(Config.transformStyle((inlineStyle as ts.StringLiteral).text))
172+
style: normalizeTransformed(Config.transformStyle((inlineStyle as ts.StringLiteral).text)),
173173
}))
174174
)
175175
.catch(() =>
176176
// If there's no valid inline styles, we resolve external styles
177177
Maybe.lift(external.styleUrls)
178-
.fmap(urls =>
178+
.fmap((urls) =>
179179
urls.map((
180180
url // Resolve each style URL and transform to metadata
181181
) =>
182-
this._resolve(url).fmap<StyleMetadata>(style => ({
182+
this._resolve(url).fmap<StyleMetadata>((style) => ({
183183
node: undefined,
184184
style: normalizeTransformed(Config.transformStyle(style!, url)),
185-
url
185+
url,
186186
}))
187187
)
188188
)
189189
// merge Maybe<StyleMetadata>[] to Maybe<StyleMetadata[]>
190-
.bind(url => listToMaybe(url as any) as any)
190+
.bind((url) => listToMaybe(url as any) as any)
191191
);
192192
}
193193

‎src/angular/ngWalker.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const getDecoratorStringArgs = (decorator: ts.Decorator): string[] => {
1919
const { expression } = decorator;
2020
const args = ts.isCallExpression(expression) ? expression.arguments : ts.createNodeArray();
2121

22-
return args.filter(ts.isStringLiteral).map(x => x.text);
22+
return args.filter(ts.isStringLiteral).map((x) => x.text);
2323
};
2424

2525
const getPosition = (node: ts.Node) => {
@@ -54,7 +54,7 @@ export class NgWalker extends Lint.RuleWalker {
5454
{
5555
cssVisitorCtrl: BasicCssAstVisitor,
5656
templateVisitorCtrl: BasicTemplateAstVisitor,
57-
expressionVisitorCtrl: RecursiveAngularExpressionVisitor
57+
expressionVisitorCtrl: RecursiveAngularExpressionVisitor,
5858
},
5959
this._config || {}
6060
);
@@ -132,7 +132,7 @@ export class NgWalker extends Lint.RuleWalker {
132132
this.visitNgStyleHelper(cssAst, metadata, style!, getPosition(style!.node!));
133133
} catch (e) {
134134
const {
135-
controller: { name }
135+
controller: { name },
136136
} = metadata;
137137
const text = name && ts.isIdentifier(name) ? name.text : '';
138138

@@ -148,7 +148,7 @@ export class NgWalker extends Lint.RuleWalker {
148148
this.visitNgTemplateHelper(templateAst, metadata, getPosition(template.node!));
149149
} catch (e) {
150150
const {
151-
controller: { name }
151+
controller: { name },
152152
} = metadata;
153153
const text = name && ts.isIdentifier(name) ? name.text : '';
154154

@@ -199,9 +199,9 @@ export class NgWalker extends Lint.RuleWalker {
199199
);
200200
compiler.templateVisitAll(referenceVisitor, roots, null);
201201
visitor._variables = referenceVisitor.variables;
202-
roots.forEach(r => visitor.visit(r, context.controller));
202+
roots.forEach((r) => visitor.visit(r, context.controller));
203203
// tslint:disable-next-line:deprecation
204-
visitor.getFailures().forEach(f => this.addFailure(f));
204+
visitor.getFailures().forEach((f) => this.addFailure(f));
205205
}
206206

207207
protected visitNgStyleHelper(style: CssAst, context: ComponentMetadata, styleMetadata: StyleMetadata, baseStart: number) {
@@ -213,7 +213,7 @@ export class NgWalker extends Lint.RuleWalker {
213213
const visitor = new this._config!.cssVisitorCtrl!(sourceFile, this._originalOptions, context, styleMetadata, baseStart);
214214
style.visit(visitor);
215215
// tslint:disable-next-line:deprecation
216-
visitor.getFailures().forEach(f => this.addFailure(f));
216+
visitor.getFailures().forEach((f) => this.addFailure(f));
217217
}
218218

219219
protected getContextSourceFile(path: string, content: string) {

‎src/angular/ngWalkerFactoryUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const ngWalkerFactoryUtils = {
1414
return {
1515
templateVisitorCtrl: BasicTemplateAstVisitor,
1616
expressionVisitorCtrl: RecursiveAngularExpressionVisitor,
17-
cssVisitorCtrl: BasicCssAstVisitor
17+
cssVisitorCtrl: BasicCssAstVisitor,
1818
};
1919
},
2020

@@ -24,5 +24,5 @@ export const ngWalkerFactoryUtils = {
2424

2525
normalizeConfig(config: NgWalkerConfig) {
2626
return Object.assign(this.defaultConfig(), config || {});
27-
}
27+
},
2828
};

‎src/angular/sourceMappingVisitor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function computeLineAndCharacterOfPosition(lineStarts: number[], position: numbe
5959
}
6060
return {
6161
character: position - lineStarts[lineNumber],
62-
line: lineNumber
62+
line: lineNumber,
6363
};
6464
}
6565

‎src/angular/styles/cssAst.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export enum BlockType {
2222
Page,
2323
Document,
2424
Viewport,
25-
Unsupported
25+
Unsupported,
2626
}
2727

2828
export interface CssAstVisitor {
@@ -146,7 +146,7 @@ export class CssSelectorRuleAst extends CssBlockRuleAst {
146146

147147
constructor(location: ParseSourceSpan, public selectors: CssSelectorAst[], block: CssBlockAst) {
148148
super(location, BlockType.Selector, block);
149-
this.strValue = selectors.map(selector => selector.strValue).join(',');
149+
this.strValue = selectors.map((selector) => selector.strValue).join(',');
150150
}
151151
visit(visitor: CssAstVisitor, context?: any): any {
152152
return visitor.visitCssSelectorRule(this, context);
@@ -172,7 +172,7 @@ export class CssSelectorAst extends CssSelectorPartAst {
172172
public strValue: string;
173173
constructor(location: ParseSourceSpan, public selectorParts: CssSimpleSelectorAst[]) {
174174
super(location);
175-
this.strValue = selectorParts.map(part => part.strValue).join('');
175+
this.strValue = selectorParts.map((part) => part.strValue).join('');
176176
}
177177
visit(visitor: CssAstVisitor, context?: any): any {
178178
return visitor.visitCssSelector(this, context);

0 commit comments

Comments
 (0)