Skip to content

should fail when we have two ngFor and the second trackBy function is… #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgechev merged 1 commit into from
Oct 26, 2018
Merged

should fail when we have two ngFor and the second trackBy function is… #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/trackByFunctionRule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { SourceFile } from 'typescript/lib/typescript';
import { NgWalker } from './angular/ngWalker';
import { BasicTemplateAstVisitor } from './angular/templates/basicTemplateAstVisitor';

//current offSet into the template
export let curOffSet = 0;

export class Rule extends Rules.AbstractRule {
static readonly metadata: IRuleMetadata = {
description: 'Ensures a trackBy function is used.',
Expand All @@ -18,6 +21,7 @@ export class Rule extends Rules.AbstractRule {
static readonly FAILURE_STRING = 'Missing trackBy function in ngFor directive';

apply(sourceFile: SourceFile): RuleFailure[] {
curOffSet = 0;
return this.applyWithWalker(new NgWalker(sourceFile, this.getOptions(), { templateVisitorCtrl: TrackByTemplateVisitor }));
}
}
Expand All @@ -39,9 +43,10 @@ class TrackByFunctionTemplateVisitor extends BasicTemplateAstVisitor {
return;
}

const pattern = /trackBy\s*:|\[ngForTrackBy\]\s*=\s*['"].*['"]/;
const pattern = /\s*ngFor.*\s*trackBy\s*:|\[ngForTrackBy\]\s*=\s*['"].*['"]/;

if (pattern.test(context.codeWithMap.source!)) {
if (pattern.test(context.codeWithMap.source!.substr(curOffSet))) {
curOffSet = prop.sourceSpan.end.offset;
return;
}

Expand All @@ -51,6 +56,7 @@ class TrackByFunctionTemplateVisitor extends BasicTemplateAstVisitor {
start: { offset: startOffset }
}
} = prop;

context.addFailureFromStartToEnd(startOffset, endOffset, getFailureMessage());
}
}
Expand Down
20 changes: 20 additions & 0 deletions test/trackByFunctionRule.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,26 @@ describe(ruleName, () => {
assertAnnotated({ message: getFailureMessage(), ruleName, source });
});

it('should fail when we have two ngFor and the second trackBy function is not present', () => {
const source = `
@Component({
template: \`
<div *ngFor="let item of [1, 2, 3]; trackBy: trackByFn">
{{ item }}
</div>
<ul>
<li *ngFor="let item of [1, 2, 3];">
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{{ item }}
</li>
</ul>
\`
})
class Bar {}
`;
assertAnnotated({ message: getFailureMessage(), ruleName, source });
});

it('should fail when trackBy function is missing in multiple *ngFor', () => {
const source = `
@Component({
Expand Down