fix: compatible with Angular 4.1.3

Fix #319
mgechev · Jun 9, 2017 · b608296 · b608296
1 parent 572b0b7
commit b608296
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/angular/templates/recursiveAngularExpressionVisitor.ts b/src/angular/templates/recursiveAngularExpressionVisitor.ts
@@ -22,6 +22,11 @@ export class RecursiveAngularExpressionVisitor extends SourceMappingVisitor impl
     return null;
   }
 
+  visitNonNullAssert(ast: e.NonNullAssert, context: any) {
+    ast.visit(this);
+    return null;
+  }
+
   visitBinary(ast: e.Binary, context: any): any {
     ast.left.visit(this);
     ast.right.visit(this);

diff --git a/src/angular/templates/templateParser.ts b/src/angular/templates/templateParser.ts
@@ -66,9 +66,13 @@ export const parseTemplate = (template: string, directives: DirectiveDeclaration
       tmplParser =
         new TemplateParser(config, expressionParser, elementSchemaRegistry, htmlParser, ngConsole, []);
     })
-    .else(() => {
+    .elseIf.lt('4.1.0', () => {
       tmplParser =
         new TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, ngConsole, []);
+    }).else(() => {
+      const config = new compiler.CompilerConfig({});
+      tmplParser =
+        new TemplateParser(config, new compiler.JitReflector(), expressionParser, elementSchemaRegistry, htmlParser, ngConsole, []);
     });
 
   const interpolation = Config.interpolation;
@@ -112,13 +116,37 @@ export const parseTemplate = (template: string, directives: DirectiveDeclaration
     identifier: null
   };
   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({
@@ -143,5 +171,8 @@ export const parseTemplate = (template: string, directives: DirectiveDeclaration
       }),
       template, defaultDirectives, [], [NO_ERRORS_SCHEMA], '').templateAst;
   });
+  } catch (e) {
+    console.log(e);
+  }
   return result;
 };