@angular/language-service 12.0.4 → 12.0.5

package/bundles/ivy.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v12.0.4
+ * @license Angular v12.0.5
  * Copyright Google LLC All Rights Reserved.
  * License: MIT
  */
@@ -10093,6 +10093,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
          * opening tag is recovered).
          */
         _popElement(fullName, endSourceSpan) {
+            let unexpectedCloseTagDetected = false;
             for (let stackIndex = this._elementStack.length - 1; stackIndex >= 0; stackIndex--) {
                 const el = this._elementStack[stackIndex];
                 if (el.name == fullName) {
@@ -10102,10 +10103,13 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
                     el.endSourceSpan = endSourceSpan;
                     el.sourceSpan.end = endSourceSpan !== null ? endSourceSpan.end : el.sourceSpan.end;
                     this._elementStack.splice(stackIndex, this._elementStack.length - stackIndex);
-                    return true;
+                    return !unexpectedCloseTagDetected;
                 }
                 if (!this.getTagDefinition(el.name).closedByParent) {
-                    return false;
+                    // Note that we encountered an unexpected close tag but continue processing the element
+                    // stack so we can assign an `endSourceSpan` if there is a corresponding start tag for this
+                    // end tag in the stack.
+                    unexpectedCloseTagDetected = true;
                 }
             }
             return false;
@@ -17918,7 +17922,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    const VERSION$1 = new Version('12.0.4');
+    const VERSION$1 = new Version('12.0.5');
 
     /**
      * @license
@@ -18557,7 +18561,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function compileDeclareClassMetadata(metadata) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         definitionMap.set('ngImport', importExpr(Identifiers.core));
         definitionMap.set('type', metadata.type);
         definitionMap.set('decorators', metadata.decorators);
@@ -18597,7 +18601,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createDirectiveDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$1));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         // e.g. `type: MyDirective`
         definitionMap.set('type', meta.internalType);
         // e.g. `selector: 'some-dir'`
@@ -18814,7 +18818,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function compileDeclareFactoryFunction(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$2));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         definitionMap.set('ngImport', importExpr(Identifiers.core));
         definitionMap.set('type', meta.internalType);
         definitionMap.set('deps', compileDependencies(meta.deps));
@@ -18856,7 +18860,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createInjectableDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$3));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         definitionMap.set('ngImport', importExpr(Identifiers.core));
         definitionMap.set('type', meta.internalType);
         // Only generate providedIn property if it has a non-null value
@@ -18935,7 +18939,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createInjectorDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$4));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         definitionMap.set('ngImport', importExpr(Identifiers.core));
         definitionMap.set('type', meta.internalType);
         definitionMap.set('providers', meta.providers);
@@ -18972,7 +18976,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createNgModuleDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$5));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         definitionMap.set('ngImport', importExpr(Identifiers.core));
         definitionMap.set('type', meta.internalType);
         // We only generate the keys in the metadata if the arrays contain values.
@@ -19030,7 +19034,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createPipeDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$6));
-        definitionMap.set('version', literal('12.0.4'));
+        definitionMap.set('version', literal('12.0.5'));
         definitionMap.set('ngImport', importExpr(Identifiers.core));
         // e.g. `type: MyPipe`
         definitionMap.set('type', meta.internalType);
@@ -19062,7 +19066,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    const VERSION$2 = new Version('12.0.4');
+    const VERSION$2 = new Version('12.0.5');
 
     /**
      * @license
@@ -24141,6 +24145,17 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
             }
             return records;
         }
+        getAnalyzedRecords() {
+            const result = new Map();
+            for (const [sf, classes] of this.fileToClasses) {
+                const records = [];
+                for (const clazz of classes) {
+                    records.push(this.classes.get(clazz));
+                }
+                result.set(sf, records);
+            }
+            return result;
+        }
         /**
          * Import a `ClassRecord` from a previous compilation.
          *
@@ -30156,7 +30171,7 @@ Either add the @Injectable() decorator to '${provider.node.name
                 versions: this.versions,
                 depGraph: this.depGraph,
                 semanticDepGraph: newGraph,
-                traitCompiler,
+                priorAnalysis: traitCompiler.getAnalyzedRecords(),
                 typeCheckResults: null,
                 emitted,
             };
@@ -30191,7 +30206,11 @@ Either add the @Injectable() decorator to '${provider.node.name
             if (this.step.logicallyChangedTsFiles.has(sfPath)) {
                 return null;
             }
-            return this.step.priorState.traitCompiler.recordsFor(sf);
+            const priorAnalysis = this.step.priorState.priorAnalysis;
+            if (!priorAnalysis.has(sf)) {
+                return null;
+            }
+            return priorAnalysis.get(sf);
         }
         priorTypeCheckingResultsFor(sf) {
             if (this.phase.kind !== PhaseKind.TypeCheckAndEmit) {
@@ -40086,7 +40105,7 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
         }
         visit(node) {
             const { start, end } = getSpanIncludingEndTag(node);
-            if (!isWithin(this.position, { start, end })) {
+            if (end !== null && !isWithin(this.position, { start, end })) {
                 return;
             }
             const last = this.path[this.path.length - 1];
@@ -40220,8 +40239,15 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
         // the end of the closing tag. Otherwise, for situation like
         // <my-component></my-comp¦onent> where the cursor is in the closing tag
         // we will not be able to return any information.
-        if ((ast instanceof Element || ast instanceof Template) && ast.endSourceSpan) {
-            result.end = ast.endSourceSpan.end.offset;
+        if (ast instanceof Element || ast instanceof Template) {
+            if (ast.endSourceSpan) {
+                result.end = ast.endSourceSpan.end.offset;
+            }
+            else if (ast.children.length > 0) {
+                // If the AST has children but no end source span, then it is an unclosed element with an end
+                // that should be the end of the last child.
+                result.end = getSpanIncludingEndTag(ast.children[ast.children.length - 1]).end;
+            }
         }
         return result;
     }
@@ -40859,6 +40885,50 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
         }
     }
 
+    /**
+     * @license
+     * Copyright Google LLC All Rights Reserved.
+     *
+     * Use of this source code is governed by an MIT-style license that can be
+     * found in the LICENSE file at https://angular.io/license
+     */
+    /**
+     * Converts a given `ts.DocumentSpan` in a shim file to its equivalent `ts.DocumentSpan` in the
+     * template.
+     *
+     * You can optionally provide a `requiredNodeText` that ensures the equivalent template node's text
+     * matches. If it does not, this function will return `null`.
+     */
+    function convertToTemplateDocumentSpan(shimDocumentSpan, templateTypeChecker, program, requiredNodeText) {
+        const sf = program.getSourceFile(shimDocumentSpan.fileName);
+        if (sf === undefined) {
+            return null;
+        }
+        const tcbNode = findTightestNode(sf, shimDocumentSpan.textSpan.start);
+        if (tcbNode === undefined ||
+            hasExpressionIdentifier(sf, tcbNode, ExpressionIdentifier.EVENT_PARAMETER)) {
+            // If the reference result is the $event parameter in the subscribe/addEventListener
+            // function in the TCB, we want to filter this result out of the references. We really only
+            // want to return references to the parameter in the template itself.
+            return null;
+        }
+        // TODO(atscott): Determine how to consistently resolve paths. i.e. with the project
+        // serverHost or LSParseConfigHost in the adapter. We should have a better defined way to
+        // normalize paths.
+        const mapping = getTemplateLocationFromShimLocation(templateTypeChecker, absoluteFrom(shimDocumentSpan.fileName), shimDocumentSpan.textSpan.start);
+        if (mapping === null) {
+            return null;
+        }
+        const { span, templateUrl } = mapping;
+        if (requiredNodeText !== undefined && span.toString() !== requiredNodeText) {
+            return null;
+        }
+        return Object.assign(Object.assign({}, shimDocumentSpan), { fileName: templateUrl, textSpan: toTextSpan(span), 
+            // Specifically clear other text span values because we do not have enough knowledge to
+            // convert these to spans in the template.
+            contextSpan: undefined, originalContextSpan: undefined, originalTextSpan: undefined });
+    }
+
     /**
      * @license
      * Copyright Google LLC All Rights Reserved.
@@ -40867,9 +40937,11 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
      * found in the LICENSE file at https://angular.io/license
      */
     class DefinitionBuilder {
-        constructor(tsLS, compiler) {
+        constructor(tsLS, compiler, driver) {
             this.tsLS = tsLS;
             this.compiler = compiler;
+            this.driver = driver;
+            this.ttc = this.compiler.getTemplateTypeChecker();
         }
         getDefinitionAndBoundSpan(fileName, position) {
             var _a;
@@ -40964,11 +41036,34 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
         }
         getDefinitionsForSymbols(...symbols) {
             return flatMap(symbols, ({ shimLocation }) => {
-                var _a;
                 const { shimPath, positionInShimFile } = shimLocation;
-                return (_a = this.tsLS.getDefinitionAtPosition(shimPath, positionInShimFile)) !== null && _a !== void 0 ? _a : [];
+                const definitionInfos = this.tsLS.getDefinitionAtPosition(shimPath, positionInShimFile);
+                if (definitionInfos === undefined) {
+                    return [];
+                }
+                return this.mapShimResultsToTemplates(definitionInfos);
             });
         }
+        /**
+         * Converts and definition info result that points to a template typecheck file to a reference to
+         * the corresponding location in the template.
+         */
+        mapShimResultsToTemplates(definitionInfos) {
+            const result = [];
+            for (const info of definitionInfos) {
+                if (this.ttc.isTrackedTypeCheckFile(absoluteFrom(info.fileName))) {
+                    const templateDefinitionInfo = convertToTemplateDocumentSpan(info, this.ttc, this.driver.getProgram());
+                    if (templateDefinitionInfo === null) {
+                        continue;
+                    }
+                    result.push(templateDefinitionInfo);
+                }
+                else {
+                    result.push(info);
+                }
+            }
+            return result;
+        }
         getTypeDefinitionsAtPosition(fileName, position) {
             const templateInfo = getTemplateInfoAtPosition(fileName, position, this.compiler);
             if (templateInfo === undefined) {
@@ -41867,7 +41962,7 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
                 if (!isInAngularContext(compiler.getCurrentProgram(), fileName, position)) {
                     return undefined;
                 }
-                return new DefinitionBuilder(this.tsLS, compiler)
+                return new DefinitionBuilder(this.tsLS, compiler, this.programDriver)
                     .getDefinitionAndBoundSpan(fileName, position);
             });
         }
@@ -41876,7 +41971,7 @@ https://v9.angular.io/guide/template-typecheck#template-type-checking`,
                 if (!isTemplateContext(compiler.getCurrentProgram(), fileName, position)) {
                     return undefined;
                 }
-                return new DefinitionBuilder(this.tsLS, compiler)
+                return new DefinitionBuilder(this.tsLS, compiler, this.programDriver)
                     .getTypeDefinitionsAtPosition(fileName, position);
             });
         }

package/bundles/language-service.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v12.0.4
+ * @license Angular v12.0.5
  * Copyright Google LLC All Rights Reserved.
  * License: MIT
  */
@@ -10148,6 +10148,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
          * opening tag is recovered).
          */
         _popElement(fullName, endSourceSpan) {
+            let unexpectedCloseTagDetected = false;
             for (let stackIndex = this._elementStack.length - 1; stackIndex >= 0; stackIndex--) {
                 const el = this._elementStack[stackIndex];
                 if (el.name == fullName) {
@@ -10157,10 +10158,13 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                     el.endSourceSpan = endSourceSpan;
                     el.sourceSpan.end = endSourceSpan !== null ? endSourceSpan.end : el.sourceSpan.end;
                     this._elementStack.splice(stackIndex, this._elementStack.length - stackIndex);
-                    return true;
+                    return !unexpectedCloseTagDetected;
                 }
                 if (!this.getTagDefinition(el.name).closedByParent) {
-                    return false;
+                    // Note that we encountered an unexpected close tag but continue processing the element
+                    // stack so we can assign an `endSourceSpan` if there is a corresponding start tag for this
+                    // end tag in the stack.
+                    unexpectedCloseTagDetected = true;
                 }
             }
             return false;
@@ -19459,7 +19463,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    const VERSION$1 = new Version('12.0.4');
+    const VERSION$1 = new Version('12.0.5');
 
     /**
      * @license
@@ -35530,7 +35534,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
     /**
      * @publicApi
      */
-    const VERSION$2 = new Version$1('12.0.4');
+    const VERSION$2 = new Version$1('12.0.5');
 
     /**
      * @license

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/language-service",
-  "version": "12.0.4",
+  "version": "12.0.5",
   "description": "Angular - language services",
   "main": "./index.js",
   "typings": "./index.d.ts",