@angular/language-service 13.0.2 → 13.0.3

package/bundles/language-service.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v13.0.2
+ * @license Angular v13.0.3
  * Copyright Google LLC All Rights Reserved.
  * License: MIT
  */
@@ -16869,7 +16869,8 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
          */
         _parseMetadata(meta) {
             return typeof meta === 'string' ? parseI18nMeta(meta) :
-                meta instanceof Message ? meta : {};
+                meta instanceof Message ? meta :
+                    {};
         }
         /**
          * Generate (or restore) message id if not specified already.
@@ -16894,9 +16895,9 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
                 // `packages/compiler/src/render3/view/template.ts`).
                 // In that case we want to reuse the legacy message generated in the 1st pass (see
                 // `setI18nRefs()`).
-                const previousMessage = meta instanceof Message ?
-                    meta :
-                    meta instanceof IcuPlaceholder ? meta.previousMessage : undefined;
+                const previousMessage = meta instanceof Message ? meta :
+                    meta instanceof IcuPlaceholder ? meta.previousMessage :
+                        undefined;
                 message.legacyIds = previousMessage ? previousMessage.legacyIds : [];
             }
         }
@@ -20015,7 +20016,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
      */
-    new Version('13.0.2');
+    new Version('13.0.3');
 
     /**
      * @license
@@ -20644,7 +20645,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function compileDeclareClassMetadata(metadata) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION$6));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', metadata.type);
         definitionMap.set('decorators', metadata.decorators);
@@ -20761,7 +20762,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createDirectiveDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION$5));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         // e.g. `type: MyDirective`
         definitionMap.set('type', meta.internalType);
         // e.g. `selector: 'some-dir'`
@@ -20979,7 +20980,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function compileDeclareFactoryFunction(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION$4));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         definitionMap.set('deps', compileDependencies(meta.deps));
@@ -21021,7 +21022,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createInjectableDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION$3));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         // Only generate providedIn property if it has a non-null value
@@ -21079,7 +21080,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createInjectorDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION$2));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         definitionMap.set('providers', meta.providers);
@@ -21116,7 +21117,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createNgModuleDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION$1));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         // We only generate the keys in the metadata if the arrays contain values.
@@ -21174,7 +21175,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function createPipeDefinitionMap(meta) {
         const definitionMap = new DefinitionMap();
         definitionMap.set('minVersion', literal$1(MINIMUM_PARTIAL_LINKER_VERSION));
-        definitionMap.set('version', literal$1('13.0.2'));
+        definitionMap.set('version', literal$1('13.0.3'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         // e.g. `type: MyPipe`
         definitionMap.set('type', meta.internalType);
@@ -21206,7 +21207,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
      */
-    new Version('13.0.2');
+    new Version('13.0.3');
 
     /**
      * @license
@@ -24834,6 +24835,28 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
             return result;
         }
     }
+    class StringConcatBuiltinFn extends KnownFn {
+        constructor(lhs) {
+            super();
+            this.lhs = lhs;
+        }
+        evaluate(node, args) {
+            let result = this.lhs;
+            for (const arg of args) {
+                const resolved = arg instanceof EnumValue ? arg.resolved : arg;
+                if (typeof resolved === 'string' || typeof resolved === 'number' ||
+                    typeof resolved === 'boolean' || resolved == null) {
+                    // Cast to `any`, because `concat` will convert
+                    // anything to a string, but TS only allows strings.
+                    result = result.concat(resolved);
+                }
+                else {
+                    return DynamicValue.fromUnknown(node);
+                }
+            }
+            return result;
+        }
+    }
     class ObjectAssignBuiltinFn extends KnownFn {
         evaluate(node, args) {
             if (args.length === 0) {
@@ -25339,6 +25362,9 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
                 }
                 return lhs[rhs];
             }
+            else if (typeof lhs === 'string' && rhs === 'concat') {
+                return new StringConcatBuiltinFn(lhs);
+            }
             else if (lhs instanceof Reference) {
                 const ref = lhs.node;
                 if (this.host.isClass(ref)) {
@@ -34334,120 +34360,6 @@ Either add the @Injectable() decorator to '${provider.node.name
         }
     }
 
-    /**
-     * @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
-     */
-    const IVY_SWITCH_PRE_SUFFIX = '__PRE_R3__';
-    const IVY_SWITCH_POST_SUFFIX = '__POST_R3__';
-    function ivySwitchTransform(_) {
-        return flipIvySwitchInFile;
-    }
-    function flipIvySwitchInFile(sf) {
-        // To replace the statements array, it must be copied. This only needs to happen if a statement
-        // must actually be replaced within the array, so the newStatements array is lazily initialized.
-        let newStatements = undefined;
-        // Iterate over the statements in the file.
-        for (let i = 0; i < sf.statements.length; i++) {
-            const statement = sf.statements[i];
-            // Skip over everything that isn't a variable statement.
-            if (!ts__default["default"].isVariableStatement(statement) || !hasIvySwitches(statement)) {
-                continue;
-            }
-            // This statement needs to be replaced. Check if the newStatements array needs to be lazily
-            // initialized to a copy of the original statements.
-            if (newStatements === undefined) {
-                newStatements = [...sf.statements];
-            }
-            // Flip any switches in the VariableStatement. If there were any, a new statement will be
-            // returned; otherwise the old statement will be.
-            newStatements[i] = flipIvySwitchesInVariableStatement(statement, sf.statements);
-        }
-        // Only update the statements in the SourceFile if any have changed.
-        if (newStatements !== undefined) {
-            return ts__default["default"].updateSourceFileNode(sf, newStatements);
-        }
-        return sf;
-    }
-    /**
-     * Look for the ts.Identifier of a ts.Declaration with this name.
-     *
-     * The real identifier is needed (rather than fabricating one) as TypeScript decides how to
-     * reference this identifier based on information stored against its node in the AST, which a
-     * synthetic node would not have. In particular, since the post-switch variable is often exported,
-     * TypeScript needs to know this so it can write `exports.VAR` instead of just `VAR` when emitting
-     * code.
-     *
-     * Only variable, function, and class declarations are currently searched.
-     */
-    function findPostSwitchIdentifier(statements, name) {
-        for (const stmt of statements) {
-            if (ts__default["default"].isVariableStatement(stmt)) {
-                const decl = stmt.declarationList.declarations.find(decl => ts__default["default"].isIdentifier(decl.name) && decl.name.text === name);
-                if (decl !== undefined) {
-                    return decl.name;
-                }
-            }
-            else if (ts__default["default"].isFunctionDeclaration(stmt) || ts__default["default"].isClassDeclaration(stmt)) {
-                if (stmt.name !== undefined && ts__default["default"].isIdentifier(stmt.name) && stmt.name.text === name) {
-                    return stmt.name;
-                }
-            }
-        }
-        return null;
-    }
-    /**
-     * Flip any Ivy switches which are discovered in the given ts.VariableStatement.
-     */
-    function flipIvySwitchesInVariableStatement(stmt, statements) {
-        // Build a new list of variable declarations. Specific declarations that are initialized to a
-        // pre-switch identifier will be replaced with a declaration initialized to the post-switch
-        // identifier.
-        const newDeclarations = [...stmt.declarationList.declarations];
-        for (let i = 0; i < newDeclarations.length; i++) {
-            const decl = newDeclarations[i];
-            // Skip declarations that aren't initialized to an identifier.
-            if (decl.initializer === undefined || !ts__default["default"].isIdentifier(decl.initializer)) {
-                continue;
-            }
-            // Skip declarations that aren't Ivy switches.
-            if (!decl.initializer.text.endsWith(IVY_SWITCH_PRE_SUFFIX)) {
-                continue;
-            }
-            // Determine the name of the post-switch variable.
-            const postSwitchName = decl.initializer.text.replace(IVY_SWITCH_PRE_SUFFIX, IVY_SWITCH_POST_SUFFIX);
-            // Find the post-switch variable identifier. If one can't be found, it's an error. This is
-            // reported as a thrown error and not a diagnostic as transformers cannot output diagnostics.
-            const newIdentifier = findPostSwitchIdentifier(statements, postSwitchName);
-            if (newIdentifier === null) {
-                throw new Error(`Unable to find identifier ${postSwitchName} in ${stmt.getSourceFile().fileName} for the Ivy switch.`);
-            }
-            newDeclarations[i] = ts__default["default"].updateVariableDeclaration(
-            /* node */ decl, 
-            /* name */ decl.name, 
-            /* type */ decl.type, 
-            /* initializer */ newIdentifier);
-        }
-        const newDeclList = ts__default["default"].updateVariableDeclarationList(
-        /* declarationList */ stmt.declarationList, 
-        /* declarations */ newDeclarations);
-        const newStmt = ts__default["default"].updateVariableStatement(
-        /* statement */ stmt, 
-        /* modifiers */ stmt.modifiers, 
-        /* declarationList */ newDeclList);
-        return newStmt;
-    }
-    /**
-     * Check whether the given VariableStatement has any Ivy switch variables.
-     */
-    function hasIvySwitches(stmt) {
-        return stmt.declarationList.declarations.some(decl => decl.initializer !== undefined && ts__default["default"].isIdentifier(decl.initializer) &&
-            decl.initializer.text.endsWith(IVY_SWITCH_PRE_SUFFIX));
-    }
-
     /**
      * @license
      * Copyright Google LLC All Rights Reserved.
@@ -40661,7 +40573,6 @@ Either add the @Injectable() decorator to '${provider.node.name
             if (this.adapter.factoryTracker !== null) {
                 before.push(generatedFactoryTransform(this.adapter.factoryTracker.sourceInfo, importRewriter));
             }
-            before.push(ivySwitchTransform);
             return { transformers: { before, afterDeclarations } };
         }
         /**
@@ -41657,15 +41568,20 @@ https://angular.io/guide/ivy for more information.
         return undefined;
     }
     /**
-     * Given an attribute node, converts it to string form.
+     * Given an attribute node, converts it to string form for use as a CSS selector.
      */
-    function toAttributeString(attribute) {
+    function toAttributeCssSelector(attribute) {
+        let selector;
         if (attribute instanceof BoundEvent || attribute instanceof BoundAttribute) {
-            return `[${attribute.name}]`;
+            selector = `[${attribute.name}]`;
         }
         else {
-            return `[${attribute.name}=${attribute.valueSpan?.toString() ?? ''}]`;
+            selector = `[${attribute.name}=${attribute.valueSpan?.toString() ?? ''}]`;
         }
+        // Any dollar signs that appear in the attribute name and/or value need to be escaped because they
+        // need to be taken as literal characters rather than special selector behavior of dollar signs in
+        // CSS.
+        return selector.replace('$', '\\$');
     }
     function getNodeName(node) {
         return node instanceof Template ? node.tagName : node.name;
@@ -41706,14 +41622,14 @@ https://angular.io/guide/ivy for more information.
     // TODO(atscott): Add unit tests for this and the one for attributes
     function getDirectiveMatchesForElementTag(element, directives) {
         const attributes = getAttributes(element);
-        const allAttrs = attributes.map(toAttributeString);
+        const allAttrs = attributes.map(toAttributeCssSelector);
         const allDirectiveMatches = getDirectiveMatchesForSelector(directives, getNodeName(element) + allAttrs.join(''));
         const matchesWithoutElement = getDirectiveMatchesForSelector(directives, allAttrs.join(''));
         return difference(allDirectiveMatches, matchesWithoutElement);
     }
     function makeElementSelector(element) {
         const attributes = getAttributes(element);
-        const allAttrs = attributes.map(toAttributeString);
+        const allAttrs = attributes.map(toAttributeCssSelector);
         return getNodeName(element) + allAttrs.join('');
     }
     /**
@@ -41729,9 +41645,9 @@ https://angular.io/guide/ivy for more information.
      */
     function getDirectiveMatchesForAttribute(name, hostNode, directives) {
         const attributes = getAttributes(hostNode);
-        const allAttrs = attributes.map(toAttributeString);
+        const allAttrs = attributes.map(toAttributeCssSelector);
         const allDirectiveMatches = getDirectiveMatchesForSelector(directives, getNodeName(hostNode) + allAttrs.join(''));
-        const attrsExcludingName = attributes.filter(a => a.name !== name).map(toAttributeString);
+        const attrsExcludingName = attributes.filter(a => a.name !== name).map(toAttributeCssSelector);
         const matchesWithoutAttr = getDirectiveMatchesForSelector(directives, getNodeName(hostNode) + attrsExcludingName.join(''));
         return difference(allDirectiveMatches, matchesWithoutAttr);
     }
@@ -41740,18 +41656,25 @@ https://angular.io/guide/ivy for more information.
      * for the selector.
      */
     function getDirectiveMatchesForSelector(directives, selector) {
-        const selectors = CssSelector.parse(selector);
-        if (selectors.length === 0) {
+        try {
+            const selectors = CssSelector.parse(selector);
+            if (selectors.length === 0) {
+                return new Set();
+            }
+            return new Set(directives.filter((dir) => {
+                if (dir.selector === null) {
+                    return false;
+                }
+                const matcher = new SelectorMatcher();
+                matcher.addSelectables(CssSelector.parse(dir.selector));
+                return selectors.some(selector => matcher.match(selector, null));
+            }));
+        }
+        catch {
+            // An invalid selector may throw an error. There would be no directive matches for an invalid
+            // selector.
             return new Set();
         }
-        return new Set(directives.filter((dir) => {
-            if (dir.selector === null) {
-                return false;
-            }
-            const matcher = new SelectorMatcher();
-            matcher.addSelectables(CssSelector.parse(dir.selector));
-            return selectors.some(selector => matcher.match(selector, null));
-        }));
     }
     /**
      * Returns a new `ts.SymbolDisplayPart` array which has the alias imports from the tcb filtered

package/package.json

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