Merge remote-tracking branch 'origin/fix_desugared_directive' into fix_desugared_directive

# Conflicts: #	src/noAccessMissingMemberRule.ts #	test/angularWhitespaceRule.spec.ts #	test/templatesUsePublicRule.spec.ts

Author: wKoza

package-lock.json

@@ -21,7 +21,8 @@
  },
  "contributors": [
  "Minko Gechev <mgechev@gmail.com>",
- "Preslav Semov <preslavsemov@gmail.com>"
+ "Preslav Semov <preslavsemov@gmail.com>",
+ "William Koza <william.koza@gmail.com>"
  ],
  "repository": {
  "type": "git",
@@ -46,8 +47,8 @@
  },
  "homepage": "https://github.com/mgechev/codelyzer#readme",
  "devDependencies": {
- "@angular/compiler": "^4.2.3",
- "@angular/core": "^4.2.3",
+ "@angular/compiler": "^4.3.3",
+ "@angular/core": "^4.3.3",
  "@types/chai": "^3.4.33",
  "@types/less": "0.0.31",
  "@types/mocha": "^2.2.32",

package.json

@@ -63,7 +63,7 @@ export const Config: Config = {
  },
 
  predefinedDirectives: [
- { selector: 'form', exportAs: 'ngForm' },
+ { selector: 'form:not([ngNoForm]):not([formGroup]), ngForm, [ngForm]', exportAs: 'ngForm' },
  { selector: '[routerLinkActive]', exportAs: 'routerLinkActive' },
  { selector: '[ngModel]:not([formControlName]):not([formControl])', exportAs: 'ngModel' },
  { selector: '[md-menu-item], [mat-menu-item]', exportAs: 'mdMenuItem' },

src/angular/config.ts

@@ -126,16 +126,18 @@ export class NgWalker extends Lint.RuleWalker {
  this.visitNgInjectable(<ts.ClassDeclaration>decorator.parent, decorator);
  }
 
+
+ if (name === 'Pipe') {
+ this.visitNgPipe(<ts.ClassDeclaration>decorator.parent, decorator);
+ }
+
  // Not invoked @Component or @Pipe, or @Directive
  if (!(<ts.CallExpression>decorator.expression).arguments ||
  !(<ts.CallExpression>decorator.expression).arguments.length ||
  !(<ts.ObjectLiteralExpression>(<ts.CallExpression>decorator.expression).arguments[0]).properties) {
  return;
  }
 
- if (name === 'Pipe') {
- this.visitNgPipe(<ts.ClassDeclaration>decorator.parent, decorator);
- }
  }
 
  protected visitNgComponent(metadata: ComponentMetadata) {

src/angular/ngWalker.ts

@@ -10,6 +10,7 @@ import { SourceMappingVisitor } from '../sourceMappingVisitor';
 import { NgWalker } from '../ngWalker';
 
 
+
 const getExpressionDisplacement = (binding: any) => {
  let attrLen = 0;
  let valLen = 0;

src/angular/templates/basicTemplateAstVisitor.ts

@@ -45,34 +45,53 @@ class Console {
  warn(message: string) {}
 }
 
-
 let defaultDirectives = [];
 
-export const parseTemplate = (template: string, directives: DirectiveDeclaration[] = []) => {
+export const parseTemplate = (
+ template: string,
+ directives: DirectiveDeclaration[] = []
+) => {
  defaultDirectives = directives.map(d => dummyMetadataFactory(d));
 
  const TemplateParser = <any>compiler.TemplateParser;
  const expressionParser = new compiler.Parser(new compiler.Lexer());
  const elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
  const ngConsole = new Console();
- const htmlParser =
- new compiler.I18NHtmlParser(new compiler.HtmlParser());
+ const htmlParser = new compiler.HtmlParser();
 
  let tmplParser: any;
 
- SemVerDSL
- .gte('4.0.0-beta.8', () => {
- const config = new compiler.CompilerConfig({});
- tmplParser =
- new TemplateParser(config, expressionParser, elementSchemaRegistry, htmlParser, ngConsole, []);
- })
+ SemVerDSL.gte('4.0.0-beta.8', () => {
+ const config = new compiler.CompilerConfig({});
+ tmplParser = new TemplateParser(
+ config,
+ expressionParser,
+ elementSchemaRegistry,
+ htmlParser,
+ ngConsole,
+ []
+ );
+ })
  .elseIf.lt('4.1.0', () => {
- tmplParser =
- new TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, ngConsole, []);
- }).else(() => {
+ tmplParser = new TemplateParser(
+ expressionParser,
+ elementSchemaRegistry,
+ htmlParser,
+ ngConsole,
+ []
+ );
+ })
+ .else(() => {
  const config = new compiler.CompilerConfig({});
- tmplParser =
- new TemplateParser(config, new compiler.JitReflector(), expressionParser, elementSchemaRegistry, htmlParser, ngConsole, []);
+ tmplParser = new TemplateParser(
+ config,
+ new compiler.JitReflector(),
+ expressionParser,
+ elementSchemaRegistry,
+ htmlParser,
+ ngConsole,
+ []
+ );
  });
 
  const interpolation = Config.interpolation;
@@ -117,60 +136,77 @@ export const parseTemplate = (template: string, directives: DirectiveDeclaration
  };
  let result = null;
  try {
- SemVerDSL.lt('4.1.0', () => {
- result = tmplParser.tryParse(
- (compiler.CompileDirectiveMetadata as any).create({
- type,
- template: templateMetadata
- }),
- template, defaultDirectives, [], [NO_ERRORS_SCHEMA], '').templateAst;
- }).elseIf.lt('4.1.3', () => {
- result = tmplParser.tryParse(
- compiler.CompileDirectiveMetadata.create({
- type,
- template: templateMetadata,
- isHost: true,
- isComponent: true,
- selector: '',
- exportAs: '',
- changeDetection: ChangeDetectionStrategy.Default,
- inputs: [],
- outputs: [],
- host: {},
- providers: [],
- viewProviders: [],
- queries: [],
- viewQueries: [],
- entryComponents: [],
- componentViewType: null,
- rendererType: null,
- componentFactory: null
- }),
- template, defaultDirectives, [], [NO_ERRORS_SCHEMA], '').templateAst;
- }).else(() => {
- result = tmplParser.tryParse(
- compiler.CompileDirectiveMetadata.create({
- type,
- template: templateMetadata,
- isHost: true,
- isComponent: true,
- selector: '',
- exportAs: '',
- changeDetection: ChangeDetectionStrategy.Default,
- inputs: [],
- outputs: [],
- host: {},
- providers: [],
- viewProviders: [],
- queries: [],
- viewQueries: [],
- entryComponents: [],
- componentViewType: null,
- rendererType: null,
- componentFactory: null
- }),
- template, defaultDirectives, [], [NO_ERRORS_SCHEMA], '').templateAst;
- });
+ SemVerDSL.lt('4.1.0', () => {
+ result = tmplParser.tryParse(
+ (compiler.CompileDirectiveMetadata as any).create({
+ type,
+ template: templateMetadata
+ }),
+ template,
+ defaultDirectives,
+ [],
+ [NO_ERRORS_SCHEMA],
+ ''
+ ).templateAst;
+ })
+ .elseIf.lt('4.1.3', () => {
+ result = tmplParser.tryParse(
+ compiler.CompileDirectiveMetadata.create({
+ type,
+ template: templateMetadata,
+ isHost: true,
+ isComponent: true,
+ selector: '',
+ exportAs: '',
+ changeDetection: ChangeDetectionStrategy.Default,
+ inputs: [],
+ outputs: [],
+ host: {},
+ providers: [],
+ viewProviders: [],
+ queries: [],
+ viewQueries: [],
+ entryComponents: [],
+ componentViewType: null,
+ rendererType: null,
+ componentFactory: null
+ }),
+ template,
+ defaultDirectives,
+ [],
+ [NO_ERRORS_SCHEMA],
+ ''
+ ).templateAst;
+ })
+ .else(() => {
+ result = tmplParser.tryParse(
+ compiler.CompileDirectiveMetadata.create({
+ type,
+ template: templateMetadata,
+ isHost: true,
+ isComponent: true,
+ selector: '',
+ exportAs: '',
+ changeDetection: ChangeDetectionStrategy.Default,
+ inputs: [],
+ outputs: [],
+ host: {},
+ providers: [],
+ viewProviders: [],
+ queries: [],
+ viewQueries: [],
+ entryComponents: [],
+ componentViewType: null,
+ rendererType: null,
+ componentFactory: null
+ }),
+ template,
+ defaultDirectives,
+ [],
+ [NO_ERRORS_SCHEMA],
+ ''
+ ).templateAst;
+ });
  } catch (e) {
  console.log(e);
  }

src/angular/templates/templateParser.ts

@@ -9,7 +9,7 @@ const InvalidSyntaxBoxOpen = '([';
 const InvalidSyntaxBoxClose = '])';
 const ValidSyntaxOpen = '[(';
 const ValidSyntaxClose = ')]';
-const InvalidSyntaxBoxRe = new RegExp('\\(\\[(.*?)\\]\\)(.*?)');
+const InvalidSyntaxBoxRe = new RegExp('\\[(.*?)\\]');
 
 const getReplacements = (text: ast.BoundEventAst, absolutePosition: number) => {
  const expr: string = (text.sourceSpan as any).toString();
@@ -29,15 +29,14 @@ class BananaInBoxTemplateVisitor extends BasicTemplateAstVisitor {
 
  visitEvent(prop: ast.BoundEventAst, context: any): any {
 
- if (prop.sourceSpan) {
- // Note that will not be reliable for different interpolation symbols
+ if (prop.name) {
  let error = null;
- const expr: any = (<any>prop.sourceSpan).toString();
- if (InvalidSyntaxBoxRe.test(expr)) {
+ if (InvalidSyntaxBoxRe.test(prop.name)) {
  error = 'Invalid binding syntax. Use [(expr)] instead';
  }
 
  if (error) {
+ const expr: any = (<any>prop.sourceSpan).toString();
  const internalStart = expr.indexOf(InvalidSyntaxBoxOpen) + 1;
  const start = prop.sourceSpan.start.offset + internalStart;
  const absolutePosition = this.getSourcePosition(start - 1);