refactor(compiler): only produce log expressions for elements / text (#15350)

This change reduces the amount of generated code by only adding `log`
calls for elements and text nodes.

We need the `log` calls to allow users to jump to the right place
in the template via source maps. However, we only need it for element
and text nodes, but not for directives, queries, … as for them we 
first locate the corresponding element or text node.

Related to #15239

PR Close #15350

packages/core/src/view/services.ts

@@ -368,32 +368,46 @@ class DebugContext_ implements DebugContext {
                                                      renderNode(this.elView, this.elDef);
   }
   logError(console: Console, ...values: any[]) {
-    let logViewFactory: ViewDefinitionFactory;
+    let logViewDef: ViewDefinition;
     let logNodeIndex: number;
     if (this.nodeDef.flags & NodeFlags.TypeText) {
-      logViewFactory = this.view.def.factory;
+      logViewDef = this.view.def;
       logNodeIndex = this.nodeDef.index;
     } else {
-      logViewFactory = this.elView.def.factory;
+      logViewDef = this.elView.def;
       logNodeIndex = this.elDef.index;
     }
-    let currNodeIndex = -1;
+    // Note: we only generate a log function for text and element nodes
+    // to make the generated code as small as possible.
+    const renderNodeIndex = getRenderNodeIndex(logViewDef, logNodeIndex);
+    let currRenderNodeIndex = -1;
     let nodeLogger: NodeLogger = () => {
-      currNodeIndex++;
-      if (currNodeIndex === logNodeIndex) {
+      currRenderNodeIndex++;
+      if (currRenderNodeIndex === renderNodeIndex) {
         return console.error.bind(console, ...values);
       } else {
         return NOOP;
       }
     };
-    logViewFactory(nodeLogger);
-    if (currNodeIndex < logNodeIndex) {
+    logViewDef.factory(nodeLogger);
+    if (currRenderNodeIndex < renderNodeIndex) {
       console.error('Illegal state: the ViewDefinitionFactory did not call the logger!');
       (<any>console.error)(...values);
     }
   }
 }
 
+function getRenderNodeIndex(viewDef: ViewDefinition, nodeIndex: number): number {
+  let renderNodeIndex = -1;
+  for (let i = 0; i <= nodeIndex; i++) {
+    const nodeDef = viewDef.nodes[i];
+    if (nodeDef.flags & NodeFlags.CatRenderNode) {
+      renderNodeIndex++;
+    }
+  }
+  return renderNodeIndex;
+}
+
 function findHostElement(view: ViewData): ElementData {
   while (view && !isComponentView(view)) {
     view = view.parent;

packages/core/test/linker/source_map_integration_node_only_spec.ts

@@ -10,7 +10,7 @@ import {ResourceLoader} from '@angular/compiler';
 import {SourceMap} from '@angular/compiler/src/output/source_map';
 import {extractSourceMap, originalPositionFor} from '@angular/compiler/test/output/source_map_util';
 import {MockResourceLoader} from '@angular/compiler/testing/src/resource_loader_mock';
-import {Component, Directive, ɵglobal} from '@angular/core';
+import {Attribute, Component, Directive, ɵglobal} from '@angular/core';
 import {getErrorLogger} from '@angular/core/src/errors';
 import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing';
 
@@ -159,6 +159,37 @@ export function main() {
            });
          }));
 
+      it('should report di errors with multiple elements and directives', fakeAsync(() => {
+           const template = `<div someDir></div><div someDir="throw"></div>`;
+
+           @Component({...templateDecorator(template)})
+           class MyComp {
+           }
+
+           @Directive({selector: '[someDir]'})
+           class SomeDir {
+             constructor(@Attribute('someDir') someDir: string) {
+               if (someDir === 'throw') {
+                 throw new Error('Test');
+               }
+             }
+           }
+
+           TestBed.configureTestingModule({declarations: [SomeDir]});
+           let error: any;
+           try {
+             compileAndCreateComponent(MyComp);
+           } catch (e) {
+             error = e;
+           }
+           // The error should be logged from the 2nd-element
+           expect(getSourcePositionForStack(getErrorLoggerStack(error))).toEqual({
+             line: 1,
+             column: 19,
+             source: ngUrl,
+           });
+         }));
+
       it('should report source location for binding errors', fakeAsync(() => {
            const template = `<div>\n    <span   [title]="createError()"></span></div>`;
 

packages/core/test/view/services_spec.ts

@@ -83,7 +83,6 @@ export function main() {
 
         expect(debugCtx.renderNode).toBe(asElementData(compView, 0).renderElement);
       });
-
     });
   });
 }