@angular/language-service 13.0.0 → 13.0.1

package/bundles/language-service.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v13.0.0
+ * @license Angular v13.0.1
  * Copyright Google LLC All Rights Reserved.
  * License: MIT
  */
@@ -2690,229 +2690,146 @@ 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
      */
-    /**
-     * This is an R3 `Node`-like wrapper for a raw `html.Comment` node. We do not currently
-     * require the implementation of a visitor for Comments as they are only collected at
-     * the top-level of the R3 AST, and only if `Render3ParseOptions['collectCommentNodes']`
-     * is true.
-     */
-    class Comment$1 {
-        constructor(value, sourceSpan) {
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-        }
-        visit(_visitor) {
-            throw new Error('visit() not implemented for Comment');
-        }
-    }
-    class Text$2 {
-        constructor(value, sourceSpan) {
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-        }
-        visit(visitor) {
-            return visitor.visitText(this);
-        }
-    }
-    class BoundText {
-        constructor(value, sourceSpan, i18n) {
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-            this.i18n = i18n;
-        }
-        visit(visitor) {
-            return visitor.visitBoundText(this);
-        }
-    }
-    /**
-     * Represents a text attribute in the template.
-     *
-     * `valueSpan` may not be present in cases where there is no value `<div a></div>`.
-     * `keySpan` may also not be present for synthetic attributes from ICU expansions.
-     */
-    class TextAttribute {
-        constructor(name, value, sourceSpan, keySpan, valueSpan, i18n) {
-            this.name = name;
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-            this.keySpan = keySpan;
-            this.valueSpan = valueSpan;
-            this.i18n = i18n;
-        }
-        visit(visitor) {
-            return visitor.visitTextAttribute(this);
-        }
-    }
-    class BoundAttribute {
-        constructor(name, type, securityContext, value, unit, sourceSpan, keySpan, valueSpan, i18n) {
-            this.name = name;
-            this.type = type;
-            this.securityContext = securityContext;
-            this.value = value;
-            this.unit = unit;
-            this.sourceSpan = sourceSpan;
-            this.keySpan = keySpan;
-            this.valueSpan = valueSpan;
-            this.i18n = i18n;
+    // https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit
+    const VERSION = 3;
+    const JS_B64_PREFIX = '# sourceMappingURL=data:application/json;base64,';
+    class SourceMapGenerator {
+        constructor(file = null) {
+            this.file = file;
+            this.sourcesContent = new Map();
+            this.lines = [];
+            this.lastCol0 = 0;
+            this.hasMappings = false;
         }
-        static fromBoundElementProperty(prop, i18n) {
-            if (prop.keySpan === undefined) {
-                throw new Error(`Unexpected state: keySpan must be defined for bound attributes but was not for ${prop.name}: ${prop.sourceSpan}`);
+        // The content is `null` when the content is expected to be loaded using the URL
+        addSource(url, content = null) {
+            if (!this.sourcesContent.has(url)) {
+                this.sourcesContent.set(url, content);
             }
-            return new BoundAttribute(prop.name, prop.type, prop.securityContext, prop.value, prop.unit, prop.sourceSpan, prop.keySpan, prop.valueSpan, i18n);
-        }
-        visit(visitor) {
-            return visitor.visitBoundAttribute(this);
+            return this;
         }
-    }
-    class BoundEvent {
-        constructor(name, type, handler, target, phase, sourceSpan, handlerSpan, keySpan) {
-            this.name = name;
-            this.type = type;
-            this.handler = handler;
-            this.target = target;
-            this.phase = phase;
-            this.sourceSpan = sourceSpan;
-            this.handlerSpan = handlerSpan;
-            this.keySpan = keySpan;
+        addLine() {
+            this.lines.push([]);
+            this.lastCol0 = 0;
+            return this;
         }
-        static fromParsedEvent(event) {
-            const target = event.type === 0 /* Regular */ ? event.targetOrPhase : null;
-            const phase = event.type === 1 /* Animation */ ? event.targetOrPhase : null;
-            if (event.keySpan === undefined) {
-                throw new Error(`Unexpected state: keySpan must be defined for bound event but was not for ${event.name}: ${event.sourceSpan}`);
+        addMapping(col0, sourceUrl, sourceLine0, sourceCol0) {
+            if (!this.currentLine) {
+                throw new Error(`A line must be added before mappings can be added`);
             }
-            return new BoundEvent(event.name, event.type, event.handler, target, phase, event.sourceSpan, event.handlerSpan, event.keySpan);
-        }
-        visit(visitor) {
-            return visitor.visitBoundEvent(this);
-        }
-    }
-    class Element$1 {
-        constructor(name, attributes, inputs, outputs, children, references, sourceSpan, startSourceSpan, endSourceSpan, i18n) {
-            this.name = name;
-            this.attributes = attributes;
-            this.inputs = inputs;
-            this.outputs = outputs;
-            this.children = children;
-            this.references = references;
-            this.sourceSpan = sourceSpan;
-            this.startSourceSpan = startSourceSpan;
-            this.endSourceSpan = endSourceSpan;
-            this.i18n = i18n;
-        }
-        visit(visitor) {
-            return visitor.visitElement(this);
-        }
-    }
-    class Template {
-        constructor(tagName, attributes, inputs, outputs, templateAttrs, children, references, variables, sourceSpan, startSourceSpan, endSourceSpan, i18n) {
-            this.tagName = tagName;
-            this.attributes = attributes;
-            this.inputs = inputs;
-            this.outputs = outputs;
-            this.templateAttrs = templateAttrs;
-            this.children = children;
-            this.references = references;
-            this.variables = variables;
-            this.sourceSpan = sourceSpan;
-            this.startSourceSpan = startSourceSpan;
-            this.endSourceSpan = endSourceSpan;
-            this.i18n = i18n;
-        }
-        visit(visitor) {
-            return visitor.visitTemplate(this);
-        }
-    }
-    class Content {
-        constructor(selector, attributes, sourceSpan, i18n) {
-            this.selector = selector;
-            this.attributes = attributes;
-            this.sourceSpan = sourceSpan;
-            this.i18n = i18n;
-            this.name = 'ng-content';
-        }
-        visit(visitor) {
-            return visitor.visitContent(this);
-        }
-    }
-    class Variable {
-        constructor(name, value, sourceSpan, keySpan, valueSpan) {
-            this.name = name;
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-            this.keySpan = keySpan;
-            this.valueSpan = valueSpan;
-        }
-        visit(visitor) {
-            return visitor.visitVariable(this);
-        }
-    }
-    class Reference$1 {
-        constructor(name, value, sourceSpan, keySpan, valueSpan) {
-            this.name = name;
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-            this.keySpan = keySpan;
-            this.valueSpan = valueSpan;
+            if (sourceUrl != null && !this.sourcesContent.has(sourceUrl)) {
+                throw new Error(`Unknown source file "${sourceUrl}"`);
+            }
+            if (col0 == null) {
+                throw new Error(`The column in the generated code must be provided`);
+            }
+            if (col0 < this.lastCol0) {
+                throw new Error(`Mapping should be added in output order`);
+            }
+            if (sourceUrl && (sourceLine0 == null || sourceCol0 == null)) {
+                throw new Error(`The source location must be provided when a source url is provided`);
+            }
+            this.hasMappings = true;
+            this.lastCol0 = col0;
+            this.currentLine.push({ col0, sourceUrl, sourceLine0, sourceCol0 });
+            return this;
         }
-        visit(visitor) {
-            return visitor.visitReference(this);
+        /**
+         * @internal strip this from published d.ts files due to
+         * https://github.com/microsoft/TypeScript/issues/36216
+         */
+        get currentLine() {
+            return this.lines.slice(-1)[0];
         }
-    }
-    class Icu$1 {
-        constructor(vars, placeholders, sourceSpan, i18n) {
-            this.vars = vars;
-            this.placeholders = placeholders;
-            this.sourceSpan = sourceSpan;
-            this.i18n = i18n;
+        toJSON() {
+            if (!this.hasMappings) {
+                return null;
+            }
+            const sourcesIndex = new Map();
+            const sources = [];
+            const sourcesContent = [];
+            Array.from(this.sourcesContent.keys()).forEach((url, i) => {
+                sourcesIndex.set(url, i);
+                sources.push(url);
+                sourcesContent.push(this.sourcesContent.get(url) || null);
+            });
+            let mappings = '';
+            let lastCol0 = 0;
+            let lastSourceIndex = 0;
+            let lastSourceLine0 = 0;
+            let lastSourceCol0 = 0;
+            this.lines.forEach(segments => {
+                lastCol0 = 0;
+                mappings += segments
+                    .map(segment => {
+                    // zero-based starting column of the line in the generated code
+                    let segAsStr = toBase64VLQ(segment.col0 - lastCol0);
+                    lastCol0 = segment.col0;
+                    if (segment.sourceUrl != null) {
+                        // zero-based index into the “sources” list
+                        segAsStr +=
+                            toBase64VLQ(sourcesIndex.get(segment.sourceUrl) - lastSourceIndex);
+                        lastSourceIndex = sourcesIndex.get(segment.sourceUrl);
+                        // the zero-based starting line in the original source
+                        segAsStr += toBase64VLQ(segment.sourceLine0 - lastSourceLine0);
+                        lastSourceLine0 = segment.sourceLine0;
+                        // the zero-based starting column in the original source
+                        segAsStr += toBase64VLQ(segment.sourceCol0 - lastSourceCol0);
+                        lastSourceCol0 = segment.sourceCol0;
+                    }
+                    return segAsStr;
+                })
+                    .join(',');
+                mappings += ';';
+            });
+            mappings = mappings.slice(0, -1);
+            return {
+                'file': this.file || '',
+                'version': VERSION,
+                'sourceRoot': '',
+                'sources': sources,
+                'sourcesContent': sourcesContent,
+                'mappings': mappings,
+            };
         }
-        visit(visitor) {
-            return visitor.visitIcu(this);
+        toJsComment() {
+            return this.hasMappings ? '//' + JS_B64_PREFIX + toBase64String(JSON.stringify(this, null, 0)) :
+                '';
         }
     }
-    class RecursiveVisitor {
-        visitElement(element) {
-            visitAll$1(this, element.attributes);
-            visitAll$1(this, element.inputs);
-            visitAll$1(this, element.outputs);
-            visitAll$1(this, element.children);
-            visitAll$1(this, element.references);
-        }
-        visitTemplate(template) {
-            visitAll$1(this, template.attributes);
-            visitAll$1(this, template.inputs);
-            visitAll$1(this, template.outputs);
-            visitAll$1(this, template.children);
-            visitAll$1(this, template.references);
-            visitAll$1(this, template.variables);
+    function toBase64String(value) {
+        let b64 = '';
+        const encoded = utf8Encode(value);
+        for (let i = 0; i < encoded.length;) {
+            const i1 = encoded[i++];
+            const i2 = i < encoded.length ? encoded[i++] : null;
+            const i3 = i < encoded.length ? encoded[i++] : null;
+            b64 += toBase64Digit(i1 >> 2);
+            b64 += toBase64Digit(((i1 & 3) << 4) | (i2 === null ? 0 : i2 >> 4));
+            b64 += i2 === null ? '=' : toBase64Digit(((i2 & 15) << 2) | (i3 === null ? 0 : i3 >> 6));
+            b64 += i2 === null || i3 === null ? '=' : toBase64Digit(i3 & 63);
         }
-        visitContent(content) { }
-        visitVariable(variable) { }
-        visitReference(reference) { }
-        visitTextAttribute(attribute) { }
-        visitBoundAttribute(attribute) { }
-        visitBoundEvent(attribute) { }
-        visitText(text) { }
-        visitBoundText(text) { }
-        visitIcu(icu) { }
+        return b64;
     }
-    function visitAll$1(visitor, nodes) {
-        const result = [];
-        if (visitor.visit) {
-            for (const node of nodes) {
-                visitor.visit(node) || node.visit(visitor);
-            }
-        }
-        else {
-            for (const node of nodes) {
-                const newNode = node.visit(visitor);
-                if (newNode) {
-                    result.push(newNode);
-                }
+    function toBase64VLQ(value) {
+        value = value < 0 ? ((-value) << 1) + 1 : value << 1;
+        let out = '';
+        do {
+            let digit = value & 31;
+            value = value >> 5;
+            if (value > 0) {
+                digit = digit | 32;
             }
+            out += toBase64Digit(digit);
+        } while (value > 0);
+        return out;
+    }
+    const B64_DIGITS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+    function toBase64Digit(value) {
+        if (value < 0 || value >= 64) {
+            throw new Error(`Can only encode value in the range [0, 63]`);
         }
-        return result;
+        return B64_DIGITS[value];
     }
 
     /**
@@ -2922,614 +2839,551 @@ 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
      */
-    class Message {
-        /**
-         * @param nodes message AST
-         * @param placeholders maps placeholder names to static content and their source spans
-         * @param placeholderToMessage maps placeholder names to messages (used for nested ICU messages)
-         * @param meaning
-         * @param description
-         * @param customId
-         */
-        constructor(nodes, placeholders, placeholderToMessage, meaning, description, customId) {
-            this.nodes = nodes;
-            this.placeholders = placeholders;
-            this.placeholderToMessage = placeholderToMessage;
-            this.meaning = meaning;
-            this.description = description;
-            this.customId = customId;
-            this.id = this.customId;
-            /** The ids to use if there are no custom id and if `i18nLegacyMessageIdFormat` is not empty */
-            this.legacyIds = [];
-            if (nodes.length) {
-                this.sources = [{
-                        filePath: nodes[0].sourceSpan.start.file.url,
-                        startLine: nodes[0].sourceSpan.start.line + 1,
-                        startCol: nodes[0].sourceSpan.start.col + 1,
-                        endLine: nodes[nodes.length - 1].sourceSpan.end.line + 1,
-                        endCol: nodes[0].sourceSpan.start.col + 1
-                    }];
-            }
-            else {
-                this.sources = [];
-            }
+    const _SINGLE_QUOTE_ESCAPE_STRING_RE = /'|\\|\n|\r|\$/g;
+    const _LEGAL_IDENTIFIER_RE = /^[$A-Z_][0-9A-Z_$]*$/i;
+    const _INDENT_WITH = '  ';
+    const CATCH_ERROR_VAR = variable('error', null, null);
+    const CATCH_STACK_VAR = variable('stack', null, null);
+    class _EmittedLine {
+        constructor(indent) {
+            this.indent = indent;
+            this.partsLength = 0;
+            this.parts = [];
+            this.srcSpans = [];
         }
     }
-    class Text$1 {
-        constructor(value, sourceSpan) {
-            this.value = value;
-            this.sourceSpan = sourceSpan;
-        }
-        visit(visitor, context) {
-            return visitor.visitText(this, context);
+    class EmitterVisitorContext {
+        constructor(_indent) {
+            this._indent = _indent;
+            this._classes = [];
+            this._preambleLineCount = 0;
+            this._lines = [new _EmittedLine(_indent)];
         }
-    }
-    // TODO(vicb): do we really need this node (vs an array) ?
-    class Container {
-        constructor(children, sourceSpan) {
-            this.children = children;
-            this.sourceSpan = sourceSpan;
+        static createRoot() {
+            return new EmitterVisitorContext(0);
         }
-        visit(visitor, context) {
-            return visitor.visitContainer(this, context);
+        /**
+         * @internal strip this from published d.ts files due to
+         * https://github.com/microsoft/TypeScript/issues/36216
+         */
+        get _currentLine() {
+            return this._lines[this._lines.length - 1];
         }
-    }
-    class Icu {
-        constructor(expression, type, cases, sourceSpan) {
-            this.expression = expression;
-            this.type = type;
-            this.cases = cases;
-            this.sourceSpan = sourceSpan;
+        println(from, lastPart = '') {
+            this.print(from || null, lastPart, true);
         }
-        visit(visitor, context) {
-            return visitor.visitIcu(this, context);
+        lineIsEmpty() {
+            return this._currentLine.parts.length === 0;
         }
-    }
-    class TagPlaceholder {
-        constructor(tag, attrs, startName, closeName, children, isVoid, 
-        // TODO sourceSpan should cover all (we need a startSourceSpan and endSourceSpan)
-        sourceSpan, startSourceSpan, endSourceSpan) {
-            this.tag = tag;
-            this.attrs = attrs;
-            this.startName = startName;
-            this.closeName = closeName;
-            this.children = children;
-            this.isVoid = isVoid;
-            this.sourceSpan = sourceSpan;
-            this.startSourceSpan = startSourceSpan;
-            this.endSourceSpan = endSourceSpan;
+        lineLength() {
+            return this._currentLine.indent * _INDENT_WITH.length + this._currentLine.partsLength;
         }
-        visit(visitor, context) {
-            return visitor.visitTagPlaceholder(this, context);
+        print(from, part, newLine = false) {
+            if (part.length > 0) {
+                this._currentLine.parts.push(part);
+                this._currentLine.partsLength += part.length;
+                this._currentLine.srcSpans.push(from && from.sourceSpan || null);
+            }
+            if (newLine) {
+                this._lines.push(new _EmittedLine(this._indent));
+            }
         }
-    }
-    class Placeholder {
-        constructor(value, name, sourceSpan) {
-            this.value = value;
-            this.name = name;
-            this.sourceSpan = sourceSpan;
+        removeEmptyLastLine() {
+            if (this.lineIsEmpty()) {
+                this._lines.pop();
+            }
         }
-        visit(visitor, context) {
-            return visitor.visitPlaceholder(this, context);
+        incIndent() {
+            this._indent++;
+            if (this.lineIsEmpty()) {
+                this._currentLine.indent = this._indent;
+            }
         }
-    }
-    class IcuPlaceholder {
-        constructor(value, name, sourceSpan) {
-            this.value = value;
-            this.name = name;
-            this.sourceSpan = sourceSpan;
+        decIndent() {
+            this._indent--;
+            if (this.lineIsEmpty()) {
+                this._currentLine.indent = this._indent;
+            }
         }
-        visit(visitor, context) {
-            return visitor.visitIcuPlaceholder(this, context);
+        pushClass(clazz) {
+            this._classes.push(clazz);
         }
-    }
-
-    /**
-     * @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
-     */
-    /**
-     * Represents a big integer using a buffer of its individual digits, with the least significant
-     * digit stored at the beginning of the array (little endian).
-     *
-     * For performance reasons, each instance is mutable. The addition operation can be done in-place
-     * to reduce memory pressure of allocation for the digits array.
-     */
-    class BigInteger {
-        /**
-         * Creates a big integer using its individual digits in little endian storage.
-         */
-        constructor(digits) {
-            this.digits = digits;
+        popClass() {
+            return this._classes.pop();
         }
-        static zero() {
-            return new BigInteger([0]);
+        get currentClass() {
+            return this._classes.length > 0 ? this._classes[this._classes.length - 1] : null;
         }
-        static one() {
-            return new BigInteger([1]);
+        toSource() {
+            return this.sourceLines
+                .map(l => l.parts.length > 0 ? _createIndent(l.indent) + l.parts.join('') : '')
+                .join('\n');
         }
-        /**
-         * Creates a clone of this instance.
-         */
-        clone() {
-            return new BigInteger(this.digits.slice());
-        }
-        /**
-         * Returns a new big integer with the sum of `this` and `other` as its value. This does not mutate
-         * `this` but instead returns a new instance, unlike `addToSelf`.
-         */
-        add(other) {
-            const result = this.clone();
-            result.addToSelf(other);
-            return result;
-        }
-        /**
-         * Adds `other` to the instance itself, thereby mutating its value.
-         */
-        addToSelf(other) {
-            const maxNrOfDigits = Math.max(this.digits.length, other.digits.length);
-            let carry = 0;
-            for (let i = 0; i < maxNrOfDigits; i++) {
-                let digitSum = carry;
-                if (i < this.digits.length) {
-                    digitSum += this.digits[i];
+        toSourceMapGenerator(genFilePath, startsAtLine = 0) {
+            const map = new SourceMapGenerator(genFilePath);
+            let firstOffsetMapped = false;
+            const mapFirstOffsetIfNeeded = () => {
+                if (!firstOffsetMapped) {
+                    // Add a single space so that tools won't try to load the file from disk.
+                    // Note: We are using virtual urls like `ng:///`, so we have to
+                    // provide a content here.
+                    map.addSource(genFilePath, ' ').addMapping(0, genFilePath, 0, 0);
+                    firstOffsetMapped = true;
                 }
-                if (i < other.digits.length) {
-                    digitSum += other.digits[i];
+            };
+            for (let i = 0; i < startsAtLine; i++) {
+                map.addLine();
+                mapFirstOffsetIfNeeded();
+            }
+            this.sourceLines.forEach((line, lineIdx) => {
+                map.addLine();
+                const spans = line.srcSpans;
+                const parts = line.parts;
+                let col0 = line.indent * _INDENT_WITH.length;
+                let spanIdx = 0;
+                // skip leading parts without source spans
+                while (spanIdx < spans.length && !spans[spanIdx]) {
+                    col0 += parts[spanIdx].length;
+                    spanIdx++;
                 }
-                if (digitSum >= 10) {
-                    this.digits[i] = digitSum - 10;
-                    carry = 1;
+                if (spanIdx < spans.length && lineIdx === 0 && col0 === 0) {
+                    firstOffsetMapped = true;
                 }
                 else {
-                    this.digits[i] = digitSum;
-                    carry = 0;
+                    mapFirstOffsetIfNeeded();
+                }
+                while (spanIdx < spans.length) {
+                    const span = spans[spanIdx];
+                    const source = span.start.file;
+                    const sourceLine = span.start.line;
+                    const sourceCol = span.start.col;
+                    map.addSource(source.url, source.content)
+                        .addMapping(col0, source.url, sourceLine, sourceCol);
+                    col0 += parts[spanIdx].length;
+                    spanIdx++;
+                    // assign parts without span or the same span to the previous segment
+                    while (spanIdx < spans.length && (span === spans[spanIdx] || !spans[spanIdx])) {
+                        col0 += parts[spanIdx].length;
+                        spanIdx++;
+                    }
+                }
+            });
+            return map;
+        }
+        setPreambleLineCount(count) {
+            return this._preambleLineCount = count;
+        }
+        spanOf(line, column) {
+            const emittedLine = this._lines[line - this._preambleLineCount];
+            if (emittedLine) {
+                let columnsLeft = column - _createIndent(emittedLine.indent).length;
+                for (let partIndex = 0; partIndex < emittedLine.parts.length; partIndex++) {
+                    const part = emittedLine.parts[partIndex];
+                    if (part.length > columnsLeft) {
+                        return emittedLine.srcSpans[partIndex];
+                    }
+                    columnsLeft -= part.length;
                 }
             }
-            // Apply a remaining carry if needed.
-            if (carry > 0) {
-                this.digits[maxNrOfDigits] = 1;
-            }
+            return null;
         }
         /**
-         * Builds the decimal string representation of the big integer. As this is stored in
-         * little endian, the digits are concatenated in reverse order.
+         * @internal strip this from published d.ts files due to
+         * https://github.com/microsoft/TypeScript/issues/36216
          */
-        toString() {
-            let res = '';
-            for (let i = this.digits.length - 1; i >= 0; i--) {
-                res += this.digits[i];
+        get sourceLines() {
+            if (this._lines.length && this._lines[this._lines.length - 1].parts.length === 0) {
+                return this._lines.slice(0, -1);
             }
-            return res;
+            return this._lines;
         }
     }
-    /**
-     * Represents a big integer which is optimized for multiplication operations, as its power-of-twos
-     * are memoized. See `multiplyBy()` for details on the multiplication algorithm.
-     */
-    class BigIntForMultiplication {
-        constructor(value) {
-            this.powerOfTwos = [value];
+    class AbstractEmitterVisitor {
+        constructor(_escapeDollarInStrings) {
+            this._escapeDollarInStrings = _escapeDollarInStrings;
         }
-        /**
-         * Returns the big integer itself.
-         */
-        getValue() {
-            return this.powerOfTwos[0];
+        printLeadingComments(stmt, ctx) {
+            if (stmt.leadingComments === undefined) {
+                return;
+            }
+            for (const comment of stmt.leadingComments) {
+                if (comment instanceof JSDocComment) {
+                    ctx.print(stmt, `/*${comment.toString()}*/`, comment.trailingNewline);
+                }
+                else {
+                    if (comment.multiline) {
+                        ctx.print(stmt, `/* ${comment.text} */`, comment.trailingNewline);
+                    }
+                    else {
+                        comment.text.split('\n').forEach((line) => {
+                            ctx.println(stmt, `// ${line}`);
+                        });
+                    }
+                }
+            }
         }
-        /**
-         * Computes the value for `num * b`, where `num` is a JS number and `b` is a big integer. The
-         * value for `b` is represented by a storage model that is optimized for this computation.
-         *
-         * This operation is implemented in N(log2(num)) by continuous halving of the number, where the
-         * least-significant bit (LSB) is tested in each iteration. If the bit is set, the bit's index is
-         * used as exponent into the power-of-two multiplication of `b`.
-         *
-         * As an example, consider the multiplication num=42, b=1337. In binary 42 is 0b00101010 and the
-         * algorithm unrolls into the following iterations:
-         *
-         *  Iteration | num        | LSB  | b * 2^iter | Add? | product
-         * -----------|------------|------|------------|------|--------
-         *  0         | 0b00101010 | 0    | 1337       | No   | 0
-         *  1         | 0b00010101 | 1    | 2674       | Yes  | 2674
-         *  2         | 0b00001010 | 0    | 5348       | No   | 2674
-         *  3         | 0b00000101 | 1    | 10696      | Yes  | 13370
-         *  4         | 0b00000010 | 0    | 21392      | No   | 13370
-         *  5         | 0b00000001 | 1    | 42784      | Yes  | 56154
-         *  6         | 0b00000000 | 0    | 85568      | No   | 56154
-         *
-         * The computed product of 56154 is indeed the correct result.
-         *
-         * The `BigIntForMultiplication` representation for a big integer provides memoized access to the
-         * power-of-two values to reduce the workload in computing those values.
-         */
-        multiplyBy(num) {
-            const product = BigInteger.zero();
-            this.multiplyByAndAddTo(num, product);
-            return product;
+        visitExpressionStmt(stmt, ctx) {
+            this.printLeadingComments(stmt, ctx);
+            stmt.expr.visitExpression(this, ctx);
+            ctx.println(stmt, ';');
+            return null;
         }
-        /**
-         * See `multiplyBy()` for details. This function allows for the computed product to be added
-         * directly to the provided result big integer.
-         */
-        multiplyByAndAddTo(num, result) {
-            for (let exponent = 0; num !== 0; num = num >>> 1, exponent++) {
-                if (num & 1) {
-                    const value = this.getMultipliedByPowerOfTwo(exponent);
-                    result.addToSelf(value);
+        visitReturnStmt(stmt, ctx) {
+            this.printLeadingComments(stmt, ctx);
+            ctx.print(stmt, `return `);
+            stmt.value.visitExpression(this, ctx);
+            ctx.println(stmt, ';');
+            return null;
+        }
+        visitIfStmt(stmt, ctx) {
+            this.printLeadingComments(stmt, ctx);
+            ctx.print(stmt, `if (`);
+            stmt.condition.visitExpression(this, ctx);
+            ctx.print(stmt, `) {`);
+            const hasElseCase = stmt.falseCase != null && stmt.falseCase.length > 0;
+            if (stmt.trueCase.length <= 1 && !hasElseCase) {
+                ctx.print(stmt, ` `);
+                this.visitAllStatements(stmt.trueCase, ctx);
+                ctx.removeEmptyLastLine();
+                ctx.print(stmt, ` `);
+            }
+            else {
+                ctx.println();
+                ctx.incIndent();
+                this.visitAllStatements(stmt.trueCase, ctx);
+                ctx.decIndent();
+                if (hasElseCase) {
+                    ctx.println(stmt, `} else {`);
+                    ctx.incIndent();
+                    this.visitAllStatements(stmt.falseCase, ctx);
+                    ctx.decIndent();
                 }
             }
+            ctx.println(stmt, `}`);
+            return null;
         }
-        /**
-         * Computes and memoizes the big integer value for `this.number * 2^exponent`.
-         */
-        getMultipliedByPowerOfTwo(exponent) {
-            // Compute the powers up until the requested exponent, where each value is computed from its
-            // predecessor. This is simple as `this.number * 2^(exponent - 1)` only has to be doubled (i.e.
-            // added to itself) to reach `this.number * 2^exponent`.
-            for (let i = this.powerOfTwos.length; i <= exponent; i++) {
-                const previousPower = this.powerOfTwos[i - 1];
-                this.powerOfTwos[i] = previousPower.add(previousPower);
+        visitThrowStmt(stmt, ctx) {
+            this.printLeadingComments(stmt, ctx);
+            ctx.print(stmt, `throw `);
+            stmt.error.visitExpression(this, ctx);
+            ctx.println(stmt, `;`);
+            return null;
+        }
+        visitWriteVarExpr(expr, ctx) {
+            const lineWasEmpty = ctx.lineIsEmpty();
+            if (!lineWasEmpty) {
+                ctx.print(expr, '(');
             }
-            return this.powerOfTwos[exponent];
+            ctx.print(expr, `${expr.name} = `);
+            expr.value.visitExpression(this, ctx);
+            if (!lineWasEmpty) {
+                ctx.print(expr, ')');
+            }
+            return null;
         }
-    }
-    /**
-     * Represents an exponentiation operation for the provided base, of which exponents are computed and
-     * memoized. The results are represented by a `BigIntForMultiplication` which is tailored for
-     * multiplication operations by memoizing the power-of-twos. This effectively results in a matrix
-     * representation that is lazily computed upon request.
-     */
-    class BigIntExponentiation {
-        constructor(base) {
-            this.base = base;
-            this.exponents = [new BigIntForMultiplication(BigInteger.one())];
+        visitWriteKeyExpr(expr, ctx) {
+            const lineWasEmpty = ctx.lineIsEmpty();
+            if (!lineWasEmpty) {
+                ctx.print(expr, '(');
+            }
+            expr.receiver.visitExpression(this, ctx);
+            ctx.print(expr, `[`);
+            expr.index.visitExpression(this, ctx);
+            ctx.print(expr, `] = `);
+            expr.value.visitExpression(this, ctx);
+            if (!lineWasEmpty) {
+                ctx.print(expr, ')');
+            }
+            return null;
         }
-        /**
-         * Compute the value for `this.base^exponent`, resulting in a big integer that is optimized for
-         * further multiplication operations.
-         */
-        toThePowerOf(exponent) {
-            // Compute the results up until the requested exponent, where every value is computed from its
-            // predecessor. This is because `this.base^(exponent - 1)` only has to be multiplied by `base`
-            // to reach `this.base^exponent`.
-            for (let i = this.exponents.length; i <= exponent; i++) {
-                const value = this.exponents[i - 1].multiplyBy(this.base);
-                this.exponents[i] = new BigIntForMultiplication(value);
+        visitWritePropExpr(expr, ctx) {
+            const lineWasEmpty = ctx.lineIsEmpty();
+            if (!lineWasEmpty) {
+                ctx.print(expr, '(');
             }
-            return this.exponents[exponent];
+            expr.receiver.visitExpression(this, ctx);
+            ctx.print(expr, `.${expr.name} = `);
+            expr.value.visitExpression(this, ctx);
+            if (!lineWasEmpty) {
+                ctx.print(expr, ')');
+            }
+            return null;
         }
-    }
-
-    /**
-     * @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
-     */
-    /**
-     * Compute the message id using the XLIFF1 digest.
-     */
-    function computeDigest(message) {
-        return sha1(serializeNodes(message.nodes).join('') + `[${message.meaning}]`);
-    }
-    /**
-     * Return the message id or compute it using the XLIFF2/XMB/$localize digest.
-     */
-    function decimalDigest(message) {
-        return message.id || computeDecimalDigest(message);
-    }
-    /**
-     * Compute the message id using the XLIFF2/XMB/$localize digest.
-     */
-    function computeDecimalDigest(message) {
-        const visitor = new _SerializerIgnoreIcuExpVisitor();
-        const parts = message.nodes.map(a => a.visit(visitor, null));
-        return computeMsgId(parts.join(''), message.meaning);
-    }
-    /**
-     * Serialize the i18n ast to something xml-like in order to generate an UID.
-     *
-     * The visitor is also used in the i18n parser tests
-     *
-     * @internal
-     */
-    class _SerializerVisitor {
-        visitText(text, context) {
-            return text.value;
+        visitInvokeFunctionExpr(expr, ctx) {
+            expr.fn.visitExpression(this, ctx);
+            ctx.print(expr, `(`);
+            this.visitAllExpressions(expr.args, ctx, ',');
+            ctx.print(expr, `)`);
+            return null;
         }
-        visitContainer(container, context) {
-            return `[${container.children.map(child => child.visit(this)).join(', ')}]`;
+        visitTaggedTemplateExpr(expr, ctx) {
+            expr.tag.visitExpression(this, ctx);
+            ctx.print(expr, '`' + expr.template.elements[0].rawText);
+            for (let i = 1; i < expr.template.elements.length; i++) {
+                ctx.print(expr, '${');
+                expr.template.expressions[i - 1].visitExpression(this, ctx);
+                ctx.print(expr, `}${expr.template.elements[i].rawText}`);
+            }
+            ctx.print(expr, '`');
+            return null;
         }
-        visitIcu(icu, context) {
-            const strCases = Object.keys(icu.cases).map((k) => `${k} {${icu.cases[k].visit(this)}}`);
-            return `{${icu.expression}, ${icu.type}, ${strCases.join(', ')}}`;
+        visitWrappedNodeExpr(ast, ctx) {
+            throw new Error('Abstract emitter cannot visit WrappedNodeExpr.');
         }
-        visitTagPlaceholder(ph, context) {
-            return ph.isVoid ?
-                `<ph tag name="${ph.startName}"/>` :
-                `<ph tag name="${ph.startName}">${ph.children.map(child => child.visit(this)).join(', ')}</ph name="${ph.closeName}">`;
+        visitTypeofExpr(expr, ctx) {
+            ctx.print(expr, 'typeof ');
+            expr.expr.visitExpression(this, ctx);
         }
-        visitPlaceholder(ph, context) {
-            return ph.value ? `<ph name="${ph.name}">${ph.value}</ph>` : `<ph name="${ph.name}"/>`;
+        visitReadVarExpr(ast, ctx) {
+            let varName = ast.name;
+            if (ast.builtin != null) {
+                switch (ast.builtin) {
+                    case BuiltinVar.Super:
+                        varName = 'super';
+                        break;
+                    case BuiltinVar.This:
+                        varName = 'this';
+                        break;
+                    case BuiltinVar.CatchError:
+                        varName = CATCH_ERROR_VAR.name;
+                        break;
+                    case BuiltinVar.CatchStack:
+                        varName = CATCH_STACK_VAR.name;
+                        break;
+                    default:
+                        throw new Error(`Unknown builtin variable ${ast.builtin}`);
+                }
+            }
+            ctx.print(ast, varName);
+            return null;
         }
-        visitIcuPlaceholder(ph, context) {
-            return `<ph icu name="${ph.name}">${ph.value.visit(this)}</ph>`;
+        visitInstantiateExpr(ast, ctx) {
+            ctx.print(ast, `new `);
+            ast.classExpr.visitExpression(this, ctx);
+            ctx.print(ast, `(`);
+            this.visitAllExpressions(ast.args, ctx, ',');
+            ctx.print(ast, `)`);
+            return null;
         }
-    }
-    const serializerVisitor$2 = new _SerializerVisitor();
-    function serializeNodes(nodes) {
-        return nodes.map(a => a.visit(serializerVisitor$2, null));
-    }
-    /**
-     * Serialize the i18n ast to something xml-like in order to generate an UID.
-     *
-     * Ignore the ICU expressions so that message IDs stays identical if only the expression changes.
-     *
-     * @internal
-     */
-    class _SerializerIgnoreIcuExpVisitor extends _SerializerVisitor {
-        visitIcu(icu, context) {
-            let strCases = Object.keys(icu.cases).map((k) => `${k} {${icu.cases[k].visit(this)}}`);
-            // Do not take the expression into account
-            return `{${icu.type}, ${strCases.join(', ')}}`;
+        visitLiteralExpr(ast, ctx) {
+            const value = ast.value;
+            if (typeof value === 'string') {
+                ctx.print(ast, escapeIdentifier(value, this._escapeDollarInStrings));
+            }
+            else {
+                ctx.print(ast, `${value}`);
+            }
+            return null;
         }
-    }
-    /**
-     * Compute the SHA1 of the given string
-     *
-     * see https://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf
-     *
-     * WARNING: this function has not been designed not tested with security in mind.
-     *          DO NOT USE IT IN A SECURITY SENSITIVE CONTEXT.
-     */
-    function sha1(str) {
-        const utf8 = utf8Encode(str);
-        const words32 = bytesToWords32(utf8, Endian.Big);
-        const len = utf8.length * 8;
-        const w = newArray(80);
-        let a = 0x67452301, b = 0xefcdab89, c = 0x98badcfe, d = 0x10325476, e = 0xc3d2e1f0;
-        words32[len >> 5] |= 0x80 << (24 - len % 32);
-        words32[((len + 64 >> 9) << 4) + 15] = len;
-        for (let i = 0; i < words32.length; i += 16) {
-            const h0 = a, h1 = b, h2 = c, h3 = d, h4 = e;
-            for (let j = 0; j < 80; j++) {
-                if (j < 16) {
-                    w[j] = words32[i + j];
-                }
-                else {
-                    w[j] = rol32(w[j - 3] ^ w[j - 8] ^ w[j - 14] ^ w[j - 16], 1);
-                }
-                const fkVal = fk(j, b, c, d);
-                const f = fkVal[0];
-                const k = fkVal[1];
-                const temp = [rol32(a, 5), f, e, k, w[j]].reduce(add32);
-                e = d;
-                d = c;
-                c = rol32(b, 30);
-                b = a;
-                a = temp;
+        visitLocalizedString(ast, ctx) {
+            const head = ast.serializeI18nHead();
+            ctx.print(ast, '$localize `' + head.raw);
+            for (let i = 1; i < ast.messageParts.length; i++) {
+                ctx.print(ast, '${');
+                ast.expressions[i - 1].visitExpression(this, ctx);
+                ctx.print(ast, `}${ast.serializeI18nTemplatePart(i).raw}`);
             }
-            a = add32(a, h0);
-            b = add32(b, h1);
-            c = add32(c, h2);
-            d = add32(d, h3);
-            e = add32(e, h4);
+            ctx.print(ast, '`');
+            return null;
         }
-        return bytesToHexString(words32ToByteString([a, b, c, d, e]));
-    }
-    function fk(index, b, c, d) {
-        if (index < 20) {
-            return [(b & c) | (~b & d), 0x5a827999];
+        visitConditionalExpr(ast, ctx) {
+            ctx.print(ast, `(`);
+            ast.condition.visitExpression(this, ctx);
+            ctx.print(ast, '? ');
+            ast.trueCase.visitExpression(this, ctx);
+            ctx.print(ast, ': ');
+            ast.falseCase.visitExpression(this, ctx);
+            ctx.print(ast, `)`);
+            return null;
         }
-        if (index < 40) {
-            return [b ^ c ^ d, 0x6ed9eba1];
+        visitNotExpr(ast, ctx) {
+            ctx.print(ast, '!');
+            ast.condition.visitExpression(this, ctx);
+            return null;
         }
-        if (index < 60) {
-            return [(b & c) | (b & d) | (c & d), 0x8f1bbcdc];
+        visitAssertNotNullExpr(ast, ctx) {
+            ast.condition.visitExpression(this, ctx);
+            return null;
         }
-        return [b ^ c ^ d, 0xca62c1d6];
-    }
-    /**
-     * Compute the fingerprint of the given string
-     *
-     * The output is 64 bit number encoded as a decimal string
-     *
-     * based on:
-     * https://github.com/google/closure-compiler/blob/master/src/com/google/javascript/jscomp/GoogleJsMessageIdGenerator.java
-     */
-    function fingerprint(str) {
-        const utf8 = utf8Encode(str);
-        let hi = hash32(utf8, 0);
-        let lo = hash32(utf8, 102072);
-        if (hi == 0 && (lo == 0 || lo == 1)) {
-            hi = hi ^ 0x130f9bef;
-            lo = lo ^ -0x6b5f56d8;
+        visitUnaryOperatorExpr(ast, ctx) {
+            let opStr;
+            switch (ast.operator) {
+                case UnaryOperator.Plus:
+                    opStr = '+';
+                    break;
+                case UnaryOperator.Minus:
+                    opStr = '-';
+                    break;
+                default:
+                    throw new Error(`Unknown operator ${ast.operator}`);
+            }
+            if (ast.parens)
+                ctx.print(ast, `(`);
+            ctx.print(ast, opStr);
+            ast.expr.visitExpression(this, ctx);
+            if (ast.parens)
+                ctx.print(ast, `)`);
+            return null;
         }
-        return [hi, lo];
-    }
-    function computeMsgId(msg, meaning = '') {
-        let msgFingerprint = fingerprint(msg);
-        if (meaning) {
-            const meaningFingerprint = fingerprint(meaning);
-            msgFingerprint = add64(rol64(msgFingerprint, 1), meaningFingerprint);
+        visitBinaryOperatorExpr(ast, ctx) {
+            let opStr;
+            switch (ast.operator) {
+                case BinaryOperator.Equals:
+                    opStr = '==';
+                    break;
+                case BinaryOperator.Identical:
+                    opStr = '===';
+                    break;
+                case BinaryOperator.NotEquals:
+                    opStr = '!=';
+                    break;
+                case BinaryOperator.NotIdentical:
+                    opStr = '!==';
+                    break;
+                case BinaryOperator.And:
+                    opStr = '&&';
+                    break;
+                case BinaryOperator.BitwiseAnd:
+                    opStr = '&';
+                    break;
+                case BinaryOperator.Or:
+                    opStr = '||';
+                    break;
+                case BinaryOperator.Plus:
+                    opStr = '+';
+                    break;
+                case BinaryOperator.Minus:
+                    opStr = '-';
+                    break;
+                case BinaryOperator.Divide:
+                    opStr = '/';
+                    break;
+                case BinaryOperator.Multiply:
+                    opStr = '*';
+                    break;
+                case BinaryOperator.Modulo:
+                    opStr = '%';
+                    break;
+                case BinaryOperator.Lower:
+                    opStr = '<';
+                    break;
+                case BinaryOperator.LowerEquals:
+                    opStr = '<=';
+                    break;
+                case BinaryOperator.Bigger:
+                    opStr = '>';
+                    break;
+                case BinaryOperator.BiggerEquals:
+                    opStr = '>=';
+                    break;
+                case BinaryOperator.NullishCoalesce:
+                    opStr = '??';
+                    break;
+                default:
+                    throw new Error(`Unknown operator ${ast.operator}`);
+            }
+            if (ast.parens)
+                ctx.print(ast, `(`);
+            ast.lhs.visitExpression(this, ctx);
+            ctx.print(ast, ` ${opStr} `);
+            ast.rhs.visitExpression(this, ctx);
+            if (ast.parens)
+                ctx.print(ast, `)`);
+            return null;
         }
-        const hi = msgFingerprint[0];
-        const lo = msgFingerprint[1];
-        return wordsToDecimalString(hi & 0x7fffffff, lo);
-    }
-    function hash32(bytes, c) {
-        let a = 0x9e3779b9, b = 0x9e3779b9;
-        let i;
-        const len = bytes.length;
-        for (i = 0; i + 12 <= len; i += 12) {
-            a = add32(a, wordAt(bytes, i, Endian.Little));
-            b = add32(b, wordAt(bytes, i + 4, Endian.Little));
-            c = add32(c, wordAt(bytes, i + 8, Endian.Little));
-            const res = mix(a, b, c);
-            a = res[0], b = res[1], c = res[2];
+        visitReadPropExpr(ast, ctx) {
+            ast.receiver.visitExpression(this, ctx);
+            ctx.print(ast, `.`);
+            ctx.print(ast, ast.name);
+            return null;
         }
-        a = add32(a, wordAt(bytes, i, Endian.Little));
-        b = add32(b, wordAt(bytes, i + 4, Endian.Little));
-        // the first byte of c is reserved for the length
-        c = add32(c, len);
-        c = add32(c, wordAt(bytes, i + 8, Endian.Little) << 8);
-        return mix(a, b, c)[2];
-    }
-    // clang-format off
-    function mix(a, b, c) {
-        a = sub32(a, b);
-        a = sub32(a, c);
-        a ^= c >>> 13;
-        b = sub32(b, c);
-        b = sub32(b, a);
-        b ^= a << 8;
-        c = sub32(c, a);
-        c = sub32(c, b);
-        c ^= b >>> 13;
-        a = sub32(a, b);
-        a = sub32(a, c);
-        a ^= c >>> 12;
-        b = sub32(b, c);
-        b = sub32(b, a);
-        b ^= a << 16;
-        c = sub32(c, a);
-        c = sub32(c, b);
-        c ^= b >>> 5;
-        a = sub32(a, b);
-        a = sub32(a, c);
-        a ^= c >>> 3;
-        b = sub32(b, c);
-        b = sub32(b, a);
-        b ^= a << 10;
-        c = sub32(c, a);
-        c = sub32(c, b);
-        c ^= b >>> 15;
-        return [a, b, c];
-    }
-    // clang-format on
-    // Utils
-    var Endian;
-    (function (Endian) {
-        Endian[Endian["Little"] = 0] = "Little";
-        Endian[Endian["Big"] = 1] = "Big";
-    })(Endian || (Endian = {}));
-    function add32(a, b) {
-        return add32to64(a, b)[1];
-    }
-    function add32to64(a, b) {
-        const low = (a & 0xffff) + (b & 0xffff);
-        const high = (a >>> 16) + (b >>> 16) + (low >>> 16);
-        return [high >>> 16, (high << 16) | (low & 0xffff)];
-    }
-    function add64(a, b) {
-        const ah = a[0], al = a[1];
-        const bh = b[0], bl = b[1];
-        const result = add32to64(al, bl);
-        const carry = result[0];
-        const l = result[1];
-        const h = add32(add32(ah, bh), carry);
-        return [h, l];
-    }
-    function sub32(a, b) {
-        const low = (a & 0xffff) - (b & 0xffff);
-        const high = (a >> 16) - (b >> 16) + (low >> 16);
-        return (high << 16) | (low & 0xffff);
-    }
-    // Rotate a 32b number left `count` position
-    function rol32(a, count) {
-        return (a << count) | (a >>> (32 - count));
-    }
-    // Rotate a 64b number left `count` position
-    function rol64(num, count) {
-        const hi = num[0], lo = num[1];
-        const h = (hi << count) | (lo >>> (32 - count));
-        const l = (lo << count) | (hi >>> (32 - count));
-        return [h, l];
-    }
-    function bytesToWords32(bytes, endian) {
-        const size = (bytes.length + 3) >>> 2;
-        const words32 = [];
-        for (let i = 0; i < size; i++) {
-            words32[i] = wordAt(bytes, i * 4, endian);
+        visitReadKeyExpr(ast, ctx) {
+            ast.receiver.visitExpression(this, ctx);
+            ctx.print(ast, `[`);
+            ast.index.visitExpression(this, ctx);
+            ctx.print(ast, `]`);
+            return null;
         }
-        return words32;
-    }
-    function byteAt(bytes, index) {
-        return index >= bytes.length ? 0 : bytes[index];
-    }
-    function wordAt(bytes, index, endian) {
-        let word = 0;
-        if (endian === Endian.Big) {
-            for (let i = 0; i < 4; i++) {
-                word += byteAt(bytes, index + i) << (24 - 8 * i);
-            }
+        visitLiteralArrayExpr(ast, ctx) {
+            ctx.print(ast, `[`);
+            this.visitAllExpressions(ast.entries, ctx, ',');
+            ctx.print(ast, `]`);
+            return null;
         }
-        else {
-            for (let i = 0; i < 4; i++) {
-                word += byteAt(bytes, index + i) << 8 * i;
+        visitLiteralMapExpr(ast, ctx) {
+            ctx.print(ast, `{`);
+            this.visitAllObjects(entry => {
+                ctx.print(ast, `${escapeIdentifier(entry.key, this._escapeDollarInStrings, entry.quoted)}:`);
+                entry.value.visitExpression(this, ctx);
+            }, ast.entries, ctx, ',');
+            ctx.print(ast, `}`);
+            return null;
+        }
+        visitCommaExpr(ast, ctx) {
+            ctx.print(ast, '(');
+            this.visitAllExpressions(ast.parts, ctx, ',');
+            ctx.print(ast, ')');
+            return null;
+        }
+        visitAllExpressions(expressions, ctx, separator) {
+            this.visitAllObjects(expr => expr.visitExpression(this, ctx), expressions, ctx, separator);
+        }
+        visitAllObjects(handler, expressions, ctx, separator) {
+            let incrementedIndent = false;
+            for (let i = 0; i < expressions.length; i++) {
+                if (i > 0) {
+                    if (ctx.lineLength() > 80) {
+                        ctx.print(null, separator, true);
+                        if (!incrementedIndent) {
+                            // continuation are marked with double indent.
+                            ctx.incIndent();
+                            ctx.incIndent();
+                            incrementedIndent = true;
+                        }
+                    }
+                    else {
+                        ctx.print(null, separator, false);
+                    }
+                }
+                handler(expressions[i]);
+            }
+            if (incrementedIndent) {
+                // continuation are marked with double indent.
+                ctx.decIndent();
+                ctx.decIndent();
             }
         }
-        return word;
-    }
-    function words32ToByteString(words32) {
-        return words32.reduce((bytes, word) => bytes.concat(word32ToByteString(word)), []);
-    }
-    function word32ToByteString(word) {
-        let bytes = [];
-        for (let i = 0; i < 4; i++) {
-            bytes.push((word >>> 8 * (3 - i)) & 0xff);
+        visitAllStatements(statements, ctx) {
+            statements.forEach((stmt) => stmt.visitStatement(this, ctx));
         }
-        return bytes;
     }
-    function bytesToHexString(bytes) {
-        let hex = '';
-        for (let i = 0; i < bytes.length; i++) {
-            const b = byteAt(bytes, i);
-            hex += (b >>> 4).toString(16) + (b & 0x0f).toString(16);
+    function escapeIdentifier(input, escapeDollar, alwaysQuote = true) {
+        if (input == null) {
+            return null;
         }
-        return hex.toLowerCase();
-    }
-    /**
-     * Create a shared exponentiation pool for base-256 computations. This shared pool provides memoized
-     * power-of-256 results with memoized power-of-two computations for efficient multiplication.
-     *
-     * For our purposes, this can be safely stored as a global without memory concerns. The reason is
-     * that we encode two words, so only need the 0th (for the low word) and 4th (for the high word)
-     * exponent.
-     */
-    const base256 = new BigIntExponentiation(256);
-    /**
-     * Represents two 32-bit words as a single decimal number. This requires a big integer storage
-     * model as JS numbers are not accurate enough to represent the 64-bit number.
-     *
-     * Based on https://www.danvk.org/hex2dec.html
-     */
-    function wordsToDecimalString(hi, lo) {
-        // Encode the four bytes in lo in the lower digits of the decimal number.
-        // Note: the multiplication results in lo itself but represented by a big integer using its
-        // decimal digits.
-        const decimal = base256.toThePowerOf(0).multiplyBy(lo);
-        // Encode the four bytes in hi above the four lo bytes. lo is a maximum of (2^8)^4, which is why
-        // this multiplication factor is applied.
-        base256.toThePowerOf(4).multiplyByAndAddTo(hi, decimal);
-        return decimal.toString();
+        const body = input.replace(_SINGLE_QUOTE_ESCAPE_STRING_RE, (...match) => {
+            if (match[0] == '$') {
+                return escapeDollar ? '\\$' : '$';
+            }
+            else if (match[0] == '\n') {
+                return '\\n';
+            }
+            else if (match[0] == '\r') {
+                return '\\r';
+            }
+            else {
+                return `\\${match[0]}`;
+            }
+        });
+        const requiresQuotes = alwaysQuote || !_LEGAL_IDENTIFIER_RE.test(body);
+        return requiresQuotes ? `'${body}'` : body;
     }
-
-    /**
-     * @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
-     */
-    // XMB/XTB placeholders can only contain A-Z, 0-9 and _
-    function toPublicName(internalName) {
-        return internalName.toUpperCase().replace(/[^A-Z0-9_]/g, '_');
+    function _createIndent(count) {
+        let res = '';
+        for (let i = 0; i < count; i++) {
+            res += _INDENT_WITH;
+        }
+        return res;
     }
 
     /**
@@ -3539,349 +3393,275 @@ 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
      */
-    /* Closure variables holding messages must be named `MSG_[A-Z0-9]+` */
-    const CLOSURE_TRANSLATION_VAR_PREFIX = 'MSG_';
-    /**
-     * Prefix for non-`goog.getMsg` i18n-related vars.
-     * Note: the prefix uses lowercase characters intentionally due to a Closure behavior that
-     * considers variables like `I18N_0` as constants and throws an error when their value changes.
-     */
-    const TRANSLATION_VAR_PREFIX = 'i18n_';
-    /** Name of the i18n attributes **/
-    const I18N_ATTR = 'i18n';
-    const I18N_ATTR_PREFIX = 'i18n-';
-    /** Prefix of var expressions used in ICUs */
-    const I18N_ICU_VAR_PREFIX = 'VAR_';
-    /** Prefix of ICU expressions for post processing */
-    const I18N_ICU_MAPPING_PREFIX = 'I18N_EXP_';
-    /** Placeholder wrapper for i18n expressions **/
-    const I18N_PLACEHOLDER_SYMBOL = '�';
-    function isI18nAttribute(name) {
-        return name === I18N_ATTR || name.startsWith(I18N_ATTR_PREFIX);
-    }
-    function isI18nRootNode(meta) {
-        return meta instanceof Message;
+    function typeWithParameters(type, numParams) {
+        if (numParams === 0) {
+            return expressionType(type);
+        }
+        const params = [];
+        for (let i = 0; i < numParams; i++) {
+            params.push(DYNAMIC_TYPE);
+        }
+        return expressionType(type, undefined, params);
     }
-    function isSingleI18nIcu(meta) {
-        return isI18nRootNode(meta) && meta.nodes.length === 1 && meta.nodes[0] instanceof Icu;
+    const ANIMATE_SYMBOL_PREFIX = '@';
+    function prepareSyntheticPropertyName(name) {
+        return `${ANIMATE_SYMBOL_PREFIX}${name}`;
     }
-    function hasI18nMeta(node) {
-        return !!node.i18n;
+    function prepareSyntheticListenerName(name, phase) {
+        return `${ANIMATE_SYMBOL_PREFIX}${name}.${phase}`;
     }
-    function hasI18nAttrs(element) {
-        return element.attrs.some((attr) => isI18nAttribute(attr.name));
+    function getSafePropertyAccessString(accessor, name) {
+        const escapedName = escapeIdentifier(name, false, false);
+        return escapedName !== name ? `${accessor}[${escapedName}]` : `${accessor}.${name}`;
     }
-    function icuFromI18nMessage(message) {
-        return message.nodes[0];
+    function prepareSyntheticListenerFunctionName(name, phase) {
+        return `animation_${name}_${phase}`;
     }
-    function wrapI18nPlaceholder(content, contextId = 0) {
-        const blockId = contextId > 0 ? `:${contextId}` : '';
-        return `${I18N_PLACEHOLDER_SYMBOL}${content}${blockId}${I18N_PLACEHOLDER_SYMBOL}`;
+    function jitOnlyGuardedExpression(expr) {
+        return guardedExpression('ngJitMode', expr);
     }
-    function assembleI18nBoundString(strings, bindingStartIndex = 0, contextId = 0) {
-        if (!strings.length)
-            return '';
-        let acc = '';
-        const lastIdx = strings.length - 1;
-        for (let i = 0; i < lastIdx; i++) {
-            acc += `${strings[i]}${wrapI18nPlaceholder(bindingStartIndex + i, contextId)}`;
-        }
-        acc += strings[lastIdx];
-        return acc;
+    function devOnlyGuardedExpression(expr) {
+        return guardedExpression('ngDevMode', expr);
     }
-    function getSeqNumberGenerator(startsAt = 0) {
-        let current = startsAt;
-        return () => current++;
+    function guardedExpression(guard, expr) {
+        const guardExpr = new ExternalExpr({ name: guard, moduleName: null });
+        const guardNotDefined = new BinaryOperatorExpr(BinaryOperator.Identical, new TypeofExpr(guardExpr), literal$1('undefined'));
+        const guardUndefinedOrTrue = new BinaryOperatorExpr(BinaryOperator.Or, guardNotDefined, guardExpr, /* type */ undefined, 
+        /* sourceSpan */ undefined, true);
+        return new BinaryOperatorExpr(BinaryOperator.And, guardUndefinedOrTrue, expr);
     }
-    function placeholdersToParams(placeholders) {
-        const params = {};
-        placeholders.forEach((values, key) => {
-            params[key] = literal$1(values.length > 1 ? `[${values.join('|')}]` : values[0]);
-        });
-        return params;
+    function wrapReference(value) {
+        const wrapped = new WrappedNodeExpr(value);
+        return { value: wrapped, type: wrapped };
     }
-    function updatePlaceholderMap(map, name, ...values) {
-        const current = map.get(name) || [];
-        current.push(...values);
-        map.set(name, current);
+    function refsToArray(refs, shouldForwardDeclare) {
+        const values = literalArr(refs.map(ref => ref.value));
+        return shouldForwardDeclare ? fn([], [new ReturnStatement(values)]) : values;
     }
-    function assembleBoundTextPlaceholders(meta, bindingStartIndex = 0, contextId = 0) {
-        const startIdx = bindingStartIndex;
-        const placeholders = new Map();
-        const node = meta instanceof Message ? meta.nodes.find(node => node instanceof Container) : meta;
-        if (node) {
-            node
-                .children
-                .filter((child) => child instanceof Placeholder)
-                .forEach((child, idx) => {
-                const content = wrapI18nPlaceholder(startIdx + idx, contextId);
-                updatePlaceholderMap(placeholders, child.name, content);
-            });
-        }
-        return placeholders;
+    function createMayBeForwardRefExpression(expression, forwardRef) {
+        return { expression, forwardRef };
     }
     /**
-     * Format the placeholder names in a map of placeholders to expressions.
+     * Convert a `MaybeForwardRefExpression` to an `Expression`, possibly wrapping its expression in a
+     * `forwardRef()` call.
      *
-     * The placeholder names are converted from "internal" format (e.g. `START_TAG_DIV_1`) to "external"
-     * format (e.g. `startTagDiv_1`).
+     * If `MaybeForwardRefExpression.forwardRef` is `ForwardRefHandling.Unwrapped` then the expression
+     * was originally wrapped in a `forwardRef()` call to prevent the value from being eagerly evaluated
+     * in the code.
      *
-     * @param params A map of placeholder names to expressions.
-     * @param useCamelCase whether to camelCase the placeholder name when formatting.
-     * @returns A new map of formatted placeholder names to expressions.
+     * See `packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts` and
+     * `packages/compiler/src/jit_compiler_facade.ts` for more information.
      */
-    function i18nFormatPlaceholderNames(params = {}, useCamelCase) {
-        const _params = {};
-        if (params && Object.keys(params).length) {
-            Object.keys(params).forEach(key => _params[formatI18nPlaceholderName(key, useCamelCase)] = params[key]);
+    function convertFromMaybeForwardRefExpression({ expression, forwardRef }) {
+        switch (forwardRef) {
+            case 0 /* None */:
+            case 1 /* Wrapped */:
+                return expression;
+            case 2 /* Unwrapped */:
+                return generateForwardRef(expression);
         }
-        return _params;
     }
     /**
-     * Converts internal placeholder names to public-facing format
-     * (for example to use in goog.getMsg call).
-     * Example: `START_TAG_DIV_1` is converted to `startTagDiv_1`.
+     * Generate an expression that has the given `expr` wrapped in the following form:
      *
-     * @param name The placeholder name that should be formatted
-     * @returns Formatted placeholder name
+     * ```
+     * forwardRef(() => expr)
+     * ```
      */
-    function formatI18nPlaceholderName(name, useCamelCase = true) {
-        const publicName = toPublicName(name);
-        if (!useCamelCase) {
-            return publicName;
-        }
-        const chunks = publicName.split('_');
-        if (chunks.length === 1) {
-            // if no "_" found - just lowercase the value
-            return name.toLowerCase();
-        }
-        let postfix;
-        // eject last element if it's a number
-        if (/^\d+$/.test(chunks[chunks.length - 1])) {
-            postfix = chunks.pop();
-        }
-        let raw = chunks.shift().toLowerCase();
-        if (chunks.length) {
-            raw += chunks.map(c => c.charAt(0).toUpperCase() + c.slice(1).toLowerCase()).join('');
-        }
-        return postfix ? `${raw}_${postfix}` : raw;
+    function generateForwardRef(expr) {
+        return importExpr(Identifiers$1.forwardRef).callFn([fn([], [new ReturnStatement(expr)])]);
     }
+
+    var R3FactoryDelegateType;
+    (function (R3FactoryDelegateType) {
+        R3FactoryDelegateType[R3FactoryDelegateType["Class"] = 0] = "Class";
+        R3FactoryDelegateType[R3FactoryDelegateType["Function"] = 1] = "Function";
+    })(R3FactoryDelegateType || (R3FactoryDelegateType = {}));
+    var FactoryTarget$1;
+    (function (FactoryTarget) {
+        FactoryTarget[FactoryTarget["Directive"] = 0] = "Directive";
+        FactoryTarget[FactoryTarget["Component"] = 1] = "Component";
+        FactoryTarget[FactoryTarget["Injectable"] = 2] = "Injectable";
+        FactoryTarget[FactoryTarget["Pipe"] = 3] = "Pipe";
+        FactoryTarget[FactoryTarget["NgModule"] = 4] = "NgModule";
+    })(FactoryTarget$1 || (FactoryTarget$1 = {}));
     /**
-     * Generates a prefix for translation const name.
-     *
-     * @param extra Additional local prefix that should be injected into translation var name
-     * @returns Complete translation const prefix
+     * Construct a factory function expression for the given `R3FactoryMetadata`.
      */
-    function getTranslationConstPrefix(extra) {
-        return `${CLOSURE_TRANSLATION_VAR_PREFIX}${extra}`.toUpperCase();
-    }
-    /**
-     * Generate AST to declare a variable. E.g. `var I18N_1;`.
-     * @param variable the name of the variable to declare.
-     */
-    function declareI18nVariable(variable) {
-        return new DeclareVarStmt(variable.name, undefined, INFERRED_TYPE, undefined, variable.sourceSpan);
-    }
-
-    /**
-     * @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
-     */
-    /**
-     * Checks whether an object key contains potentially unsafe chars, thus the key should be wrapped in
-     * quotes. Note: we do not wrap all keys into quotes, as it may have impact on minification and may
-     * bot work in some cases when object keys are mangled by minifier.
-     *
-     * TODO(FW-1136): this is a temporary solution, we need to come up with a better way of working with
-     * inputs that contain potentially unsafe chars.
-     */
-    const UNSAFE_OBJECT_KEY_NAME_REGEXP = /[-.]/;
-    /** Name of the temporary to use during data binding */
-    const TEMPORARY_NAME = '_t';
-    /** Name of the context parameter passed into a template function */
-    const CONTEXT_NAME = 'ctx';
-    /** Name of the RenderFlag passed into a template function */
-    const RENDER_FLAGS = 'rf';
-    /** The prefix reference variables */
-    const REFERENCE_PREFIX = '_r';
-    /** The name of the implicit context reference */
-    const IMPLICIT_REFERENCE = '$implicit';
-    /** Non bindable attribute name **/
-    const NON_BINDABLE_ATTR = 'ngNonBindable';
-    /** Name for the variable keeping track of the context returned by `ɵɵrestoreView`. */
-    const RESTORED_VIEW_CONTEXT_NAME = 'restoredCtx';
-    /**
-     * Creates an allocator for a temporary variable.
-     *
-     * A variable declaration is added to the statements the first time the allocator is invoked.
-     */
-    function temporaryAllocator(statements, name) {
-        let temp = null;
-        return () => {
-            if (!temp) {
-                statements.push(new DeclareVarStmt(TEMPORARY_NAME, undefined, DYNAMIC_TYPE));
-                temp = variable(name);
+    function compileFactoryFunction(meta) {
+        const t = variable('t');
+        let baseFactoryVar = null;
+        // The type to instantiate via constructor invocation. If there is no delegated factory, meaning
+        // this type is always created by constructor invocation, then this is the type-to-create
+        // parameter provided by the user (t) if specified, or the current type if not. If there is a
+        // delegated factory (which is used to create the current type) then this is only the type-to-
+        // create parameter (t).
+        const typeForCtor = !isDelegatedFactoryMetadata(meta) ?
+            new BinaryOperatorExpr(BinaryOperator.Or, t, meta.internalType) :
+            t;
+        let ctorExpr = null;
+        if (meta.deps !== null) {
+            // There is a constructor (either explicitly or implicitly defined).
+            if (meta.deps !== 'invalid') {
+                ctorExpr = new InstantiateExpr(typeForCtor, injectDependencies(meta.deps, meta.target));
             }
-            return temp;
-        };
-    }
-    function unsupported(feature) {
-        if (this) {
-            throw new Error(`Builder ${this.constructor.name} doesn't support ${feature} yet`);
         }
-        throw new Error(`Feature ${feature} is not supported yet`);
-    }
-    function invalid(arg) {
-        throw new Error(`Invalid state: Visitor ${this.constructor.name} doesn't handle ${arg.constructor.name}`);
-    }
-    function asLiteral(value) {
-        if (Array.isArray(value)) {
-            return literalArr(value.map(asLiteral));
+        else {
+            // There is no constructor, use the base class' factory to construct typeForCtor.
+            baseFactoryVar = variable(`ɵ${meta.name}_BaseFactory`);
+            ctorExpr = baseFactoryVar.callFn([typeForCtor]);
         }
-        return literal$1(value, INFERRED_TYPE);
-    }
-    function conditionallyCreateMapObjectLiteral(keys, keepDeclared) {
-        if (Object.getOwnPropertyNames(keys).length > 0) {
-            return mapToExpression(keys, keepDeclared);
+        const body = [];
+        let retExpr = null;
+        function makeConditionalFactory(nonCtorExpr) {
+            const r = variable('r');
+            body.push(r.set(NULL_EXPR).toDeclStmt());
+            const ctorStmt = ctorExpr !== null ? r.set(ctorExpr).toStmt() :
+                importExpr(Identifiers$1.invalidFactory).callFn([]).toStmt();
+            body.push(ifStmt(t, [ctorStmt], [r.set(nonCtorExpr).toStmt()]));
+            return r;
         }
-        return null;
-    }
-    function mapToExpression(map, keepDeclared) {
-        return literalMap(Object.getOwnPropertyNames(map).map(key => {
-            // canonical syntax: `dirProp: publicProp`
-            // if there is no `:`, use dirProp = elProp
-            const value = map[key];
-            let declaredName;
-            let publicName;
-            let minifiedName;
-            let needsDeclaredName;
-            if (Array.isArray(value)) {
-                [publicName, declaredName] = value;
-                minifiedName = key;
-                needsDeclaredName = publicName !== declaredName;
-            }
-            else {
-                [declaredName, publicName] = splitAtColon(key, [key, value]);
-                minifiedName = declaredName;
-                // Only include the declared name if extracted from the key, i.e. the key contains a colon.
-                // Otherwise the declared name should be omitted even if it is different from the public name,
-                // as it may have already been minified.
-                needsDeclaredName = publicName !== declaredName && key.includes(':');
-            }
-            return {
-                key: minifiedName,
-                // put quotes around keys that contain potentially unsafe characters
-                quoted: UNSAFE_OBJECT_KEY_NAME_REGEXP.test(minifiedName),
-                value: (keepDeclared && needsDeclaredName) ?
-                    literalArr([asLiteral(publicName), asLiteral(declaredName)]) :
-                    asLiteral(publicName)
-            };
-        }));
-    }
-    /**
-     *  Remove trailing null nodes as they are implied.
-     */
-    function trimTrailingNulls(parameters) {
-        while (isNull(parameters[parameters.length - 1])) {
-            parameters.pop();
+        if (isDelegatedFactoryMetadata(meta)) {
+            // This type is created with a delegated factory. If a type parameter is not specified, call
+            // the factory instead.
+            const delegateArgs = injectDependencies(meta.delegateDeps, meta.target);
+            // Either call `new delegate(...)` or `delegate(...)` depending on meta.delegateType.
+            const factoryExpr = new (meta.delegateType === R3FactoryDelegateType.Class ?
+                InstantiateExpr :
+                InvokeFunctionExpr)(meta.delegate, delegateArgs);
+            retExpr = makeConditionalFactory(factoryExpr);
         }
-        return parameters;
-    }
-    function getQueryPredicate(query, constantPool) {
-        if (Array.isArray(query.predicate)) {
-            let predicate = [];
-            query.predicate.forEach((selector) => {
-                // Each item in predicates array may contain strings with comma-separated refs
-                // (for ex. 'ref, ref1, ..., refN'), thus we extract individual refs and store them
-                // as separate array entities
-                const selectors = selector.split(',').map(token => literal$1(token.trim()));
-                predicate.push(...selectors);
-            });
-            return constantPool.getConstLiteral(literalArr(predicate), true);
+        else if (isExpressionFactoryMetadata(meta)) {
+            // TODO(alxhub): decide whether to lower the value here or in the caller
+            retExpr = makeConditionalFactory(meta.expression);
         }
         else {
-            return query.predicate;
+            retExpr = ctorExpr;
         }
-    }
-    /**
-     * A representation for an object literal used during codegen of definition objects. The generic
-     * type `T` allows to reference a documented type of the generated structure, such that the
-     * property names that are set can be resolved to their documented declaration.
-     */
-    class DefinitionMap {
-        constructor() {
-            this.values = [];
+        if (retExpr === null) {
+            // The expression cannot be formed so render an `ɵɵinvalidFactory()` call.
+            body.push(importExpr(Identifiers$1.invalidFactory).callFn([]).toStmt());
         }
-        set(key, value) {
-            if (value) {
-                this.values.push({ key: key, value, quoted: false });
-            }
+        else if (baseFactoryVar !== null) {
+            // This factory uses a base factory, so call `ɵɵgetInheritedFactory()` to compute it.
+            const getInheritedFactoryCall = importExpr(Identifiers$1.getInheritedFactory).callFn([meta.internalType]);
+            // Memoize the base factoryFn: `baseFactory || (baseFactory = ɵɵgetInheritedFactory(...))`
+            const baseFactory = new BinaryOperatorExpr(BinaryOperator.Or, baseFactoryVar, baseFactoryVar.set(getInheritedFactoryCall));
+            body.push(new ReturnStatement(baseFactory.callFn([typeForCtor])));
         }
-        toLiteralMap() {
-            return literalMap(this.values);
+        else {
+            // This is straightforward factory, just return it.
+            body.push(new ReturnStatement(retExpr));
+        }
+        let factoryFn = fn([new FnParam('t', DYNAMIC_TYPE)], body, INFERRED_TYPE, undefined, `${meta.name}_Factory`);
+        if (baseFactoryVar !== null) {
+            // There is a base factory variable so wrap its declaration along with the factory function into
+            // an IIFE.
+            factoryFn = fn([], [
+                new DeclareVarStmt(baseFactoryVar.name), new ReturnStatement(factoryFn)
+            ]).callFn([], /* sourceSpan */ undefined, /* pure */ true);
         }
+        return {
+            expression: factoryFn,
+            statements: [],
+            type: createFactoryType(meta),
+        };
     }
-    /**
-     * Extract a map of properties to values for a given element or template node, which can be used
-     * by the directive matching machinery.
-     *
-     * @param elOrTpl the element or template in question
-     * @return an object set up for directive matching. For attributes on the element/template, this
-     * object maps a property name to its (static) value. For any bindings, this map simply maps the
-     * property name to an empty string.
-     */
-    function getAttrsForDirectiveMatching(elOrTpl) {
-        const attributesMap = {};
-        if (elOrTpl instanceof Template && elOrTpl.tagName !== 'ng-template') {
-            elOrTpl.templateAttrs.forEach(a => attributesMap[a.name] = '');
+    function createFactoryType(meta) {
+        const ctorDepsType = meta.deps !== null && meta.deps !== 'invalid' ? createCtorDepsType(meta.deps) : NONE_TYPE;
+        return expressionType(importExpr(Identifiers$1.FactoryDeclaration, [typeWithParameters(meta.type.type, meta.typeArgumentCount), ctorDepsType]));
+    }
+    function injectDependencies(deps, target) {
+        return deps.map((dep, index) => compileInjectDependency(dep, target, index));
+    }
+    function compileInjectDependency(dep, target, index) {
+        // Interpret the dependency according to its resolved type.
+        if (dep.token === null) {
+            return importExpr(Identifiers$1.invalidFactoryDep).callFn([literal$1(index)]);
+        }
+        else if (dep.attributeNameType === null) {
+            // Build up the injection flags according to the metadata.
+            const flags = 0 /* Default */ | (dep.self ? 2 /* Self */ : 0) |
+                (dep.skipSelf ? 4 /* SkipSelf */ : 0) | (dep.host ? 1 /* Host */ : 0) |
+                (dep.optional ? 8 /* Optional */ : 0) |
+                (target === FactoryTarget$1.Pipe ? 16 /* ForPipe */ : 0);
+            // If this dependency is optional or otherwise has non-default flags, then additional
+            // parameters describing how to inject the dependency must be passed to the inject function
+            // that's being used.
+            let flagsParam = (flags !== 0 /* Default */ || dep.optional) ? literal$1(flags) : null;
+            // Build up the arguments to the injectFn call.
+            const injectArgs = [dep.token];
+            if (flagsParam) {
+                injectArgs.push(flagsParam);
+            }
+            const injectFn = getInjectFn(target);
+            return importExpr(injectFn).callFn(injectArgs);
         }
         else {
-            elOrTpl.attributes.forEach(a => {
-                if (!isI18nAttribute(a.name)) {
-                    attributesMap[a.name] = a.value;
-                }
-            });
-            elOrTpl.inputs.forEach(i => {
-                attributesMap[i.name] = '';
-            });
-            elOrTpl.outputs.forEach(o => {
-                attributesMap[o.name] = '';
-            });
+            // The `dep.attributeTypeName` value is defined, which indicates that this is an `@Attribute()`
+            // type dependency. For the generated JS we still want to use the `dep.token` value in case the
+            // name given for the attribute is not a string literal. For example given `@Attribute(foo())`,
+            // we want to generate `ɵɵinjectAttribute(foo())`.
+            //
+            // The `dep.attributeTypeName` is only actually used (in `createCtorDepType()`) to generate
+            // typings.
+            return importExpr(Identifiers$1.injectAttribute).callFn([dep.token]);
         }
-        return attributesMap;
     }
-    /** Returns a call expression to a chained instruction, e.g. `property(params[0])(params[1])`. */
-    function chainedInstruction(reference, calls, span) {
-        let expression = importExpr(reference, null, span);
-        if (calls.length > 0) {
-            for (let i = 0; i < calls.length; i++) {
-                expression = expression.callFn(calls[i], span);
+    function createCtorDepsType(deps) {
+        let hasTypes = false;
+        const attributeTypes = deps.map(dep => {
+            const type = createCtorDepType(dep);
+            if (type !== null) {
+                hasTypes = true;
+                return type;
+            }
+            else {
+                return literal$1(null);
             }
+        });
+        if (hasTypes) {
+            return expressionType(literalArr(attributeTypes));
         }
         else {
-            // Add a blank invocation, in case the `calls` array is empty.
-            expression = expression.callFn([], span);
+            return NONE_TYPE;
         }
-        return expression;
     }
-    /**
-     * Gets the number of arguments expected to be passed to a generated instruction in the case of
-     * interpolation instructions.
-     * @param interpolation An interpolation ast
-     */
-    function getInterpolationArgsLength(interpolation) {
-        const { expressions, strings } = interpolation;
-        if (expressions.length === 1 && strings.length === 2 && strings[0] === '' && strings[1] === '') {
-            // If the interpolation has one interpolated value, but the prefix and suffix are both empty
-            // strings, we only pass one argument, to a special instruction like `propertyInterpolate` or
-            // `textInterpolate`.
-            return 1;
+    function createCtorDepType(dep) {
+        const entries = [];
+        if (dep.attributeNameType !== null) {
+            entries.push({ key: 'attribute', value: dep.attributeNameType, quoted: false });
         }
-        else {
-            return expressions.length + strings.length;
+        if (dep.optional) {
+            entries.push({ key: 'optional', value: literal$1(true), quoted: false });
+        }
+        if (dep.host) {
+            entries.push({ key: 'host', value: literal$1(true), quoted: false });
+        }
+        if (dep.self) {
+            entries.push({ key: 'self', value: literal$1(true), quoted: false });
+        }
+        if (dep.skipSelf) {
+            entries.push({ key: 'skipSelf', value: literal$1(true), quoted: false });
+        }
+        return entries.length > 0 ? literalMap(entries) : null;
+    }
+    function isDelegatedFactoryMetadata(meta) {
+        return meta.delegateType !== undefined;
+    }
+    function isExpressionFactoryMetadata(meta) {
+        return meta.expression !== undefined;
+    }
+    function getInjectFn(target) {
+        switch (target) {
+            case FactoryTarget$1.Component:
+            case FactoryTarget$1.Directive:
+            case FactoryTarget$1.Pipe:
+                return Identifiers$1.directiveInject;
+            case FactoryTarget$1.NgModule:
+            case FactoryTarget$1.Injectable:
+            default:
+                return Identifiers$1.inject;
         }
     }
 
@@ -3893,232 +3673,228 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
      * found in the LICENSE file at https://angular.io/license
      */
     /**
-     * Creates an array literal expression from the given array, mapping all values to an expression
-     * using the provided mapping function. If the array is empty or null, then null is returned.
-     *
-     * @param values The array to transfer into literal array expression.
-     * @param mapper The logic to use for creating an expression for the array's values.
-     * @returns An array literal expression representing `values`, or null if `values` is empty or
-     * is itself null.
+     * This is an R3 `Node`-like wrapper for a raw `html.Comment` node. We do not currently
+     * require the implementation of a visitor for Comments as they are only collected at
+     * the top-level of the R3 AST, and only if `Render3ParseOptions['collectCommentNodes']`
+     * is true.
      */
-    function toOptionalLiteralArray(values, mapper) {
-        if (values === null || values.length === 0) {
-            return null;
+    class Comment$1 {
+        constructor(value, sourceSpan) {
+            this.value = value;
+            this.sourceSpan = sourceSpan;
+        }
+        visit(_visitor) {
+            throw new Error('visit() not implemented for Comment');
+        }
+    }
+    class Text$2 {
+        constructor(value, sourceSpan) {
+            this.value = value;
+            this.sourceSpan = sourceSpan;
+        }
+        visit(visitor) {
+            return visitor.visitText(this);
+        }
+    }
+    class BoundText {
+        constructor(value, sourceSpan, i18n) {
+            this.value = value;
+            this.sourceSpan = sourceSpan;
+            this.i18n = i18n;
+        }
+        visit(visitor) {
+            return visitor.visitBoundText(this);
         }
-        return literalArr(values.map(value => mapper(value)));
     }
     /**
-     * Creates an object literal expression from the given object, mapping all values to an expression
-     * using the provided mapping function. If the object has no keys, then null is returned.
+     * Represents a text attribute in the template.
      *
-     * @param object The object to transfer into an object literal expression.
-     * @param mapper The logic to use for creating an expression for the object's values.
-     * @returns An object literal expression representing `object`, or null if `object` does not have
-     * any keys.
+     * `valueSpan` may not be present in cases where there is no value `<div a></div>`.
+     * `keySpan` may also not be present for synthetic attributes from ICU expansions.
      */
-    function toOptionalLiteralMap(object, mapper) {
-        const entries = Object.keys(object).map(key => {
-            const value = object[key];
-            return { key, value: mapper(value), quoted: true };
-        });
-        if (entries.length > 0) {
-            return literalMap(entries);
+    class TextAttribute {
+        constructor(name, value, sourceSpan, keySpan, valueSpan, i18n) {
+            this.name = name;
+            this.value = value;
+            this.sourceSpan = sourceSpan;
+            this.keySpan = keySpan;
+            this.valueSpan = valueSpan;
+            this.i18n = i18n;
         }
-        else {
-            return null;
+        visit(visitor) {
+            return visitor.visitTextAttribute(this);
         }
     }
-    function compileDependencies(deps) {
-        if (deps === 'invalid') {
-            // The `deps` can be set to the string "invalid"  by the `unwrapConstructorDependencies()`
-            // function, which tries to convert `ConstructorDeps` into `R3DependencyMetadata[]`.
-            return literal$1('invalid');
+    class BoundAttribute {
+        constructor(name, type, securityContext, value, unit, sourceSpan, keySpan, valueSpan, i18n) {
+            this.name = name;
+            this.type = type;
+            this.securityContext = securityContext;
+            this.value = value;
+            this.unit = unit;
+            this.sourceSpan = sourceSpan;
+            this.keySpan = keySpan;
+            this.valueSpan = valueSpan;
+            this.i18n = i18n;
         }
-        else if (deps === null) {
-            return literal$1(null);
+        static fromBoundElementProperty(prop, i18n) {
+            if (prop.keySpan === undefined) {
+                throw new Error(`Unexpected state: keySpan must be defined for bound attributes but was not for ${prop.name}: ${prop.sourceSpan}`);
+            }
+            return new BoundAttribute(prop.name, prop.type, prop.securityContext, prop.value, prop.unit, prop.sourceSpan, prop.keySpan, prop.valueSpan, i18n);
         }
-        else {
-            return literalArr(deps.map(compileDependency));
+        visit(visitor) {
+            return visitor.visitBoundAttribute(this);
         }
     }
-    function compileDependency(dep) {
-        const depMeta = new DefinitionMap();
-        depMeta.set('token', dep.token);
-        if (dep.attributeNameType !== null) {
-            depMeta.set('attribute', literal$1(true));
+    class BoundEvent {
+        constructor(name, type, handler, target, phase, sourceSpan, handlerSpan, keySpan) {
+            this.name = name;
+            this.type = type;
+            this.handler = handler;
+            this.target = target;
+            this.phase = phase;
+            this.sourceSpan = sourceSpan;
+            this.handlerSpan = handlerSpan;
+            this.keySpan = keySpan;
         }
-        if (dep.host) {
-            depMeta.set('host', literal$1(true));
+        static fromParsedEvent(event) {
+            const target = event.type === 0 /* Regular */ ? event.targetOrPhase : null;
+            const phase = event.type === 1 /* Animation */ ? event.targetOrPhase : null;
+            if (event.keySpan === undefined) {
+                throw new Error(`Unexpected state: keySpan must be defined for bound event but was not for ${event.name}: ${event.sourceSpan}`);
+            }
+            return new BoundEvent(event.name, event.type, event.handler, target, phase, event.sourceSpan, event.handlerSpan, event.keySpan);
         }
-        if (dep.optional) {
-            depMeta.set('optional', literal$1(true));
+        visit(visitor) {
+            return visitor.visitBoundEvent(this);
         }
-        if (dep.self) {
-            depMeta.set('self', literal$1(true));
+    }
+    class Element$1 {
+        constructor(name, attributes, inputs, outputs, children, references, sourceSpan, startSourceSpan, endSourceSpan, i18n) {
+            this.name = name;
+            this.attributes = attributes;
+            this.inputs = inputs;
+            this.outputs = outputs;
+            this.children = children;
+            this.references = references;
+            this.sourceSpan = sourceSpan;
+            this.startSourceSpan = startSourceSpan;
+            this.endSourceSpan = endSourceSpan;
+            this.i18n = i18n;
         }
-        if (dep.skipSelf) {
-            depMeta.set('skipSelf', literal$1(true));
+        visit(visitor) {
+            return visitor.visitElement(this);
         }
-        return depMeta.toLiteralMap();
     }
-    /**
-     * Generate an expression that has the given `expr` wrapped in the following form:
-     *
-     * ```
-     * forwardRef(() => expr)
-     * ```
-     */
-    function generateForwardRef(expr) {
-        return importExpr(Identifiers$1.forwardRef).callFn([fn([], [new ReturnStatement(expr)])]);
+    class Template {
+        constructor(tagName, attributes, inputs, outputs, templateAttrs, children, references, variables, sourceSpan, startSourceSpan, endSourceSpan, i18n) {
+            this.tagName = tagName;
+            this.attributes = attributes;
+            this.inputs = inputs;
+            this.outputs = outputs;
+            this.templateAttrs = templateAttrs;
+            this.children = children;
+            this.references = references;
+            this.variables = variables;
+            this.sourceSpan = sourceSpan;
+            this.startSourceSpan = startSourceSpan;
+            this.endSourceSpan = endSourceSpan;
+            this.i18n = i18n;
+        }
+        visit(visitor) {
+            return visitor.visitTemplate(this);
+        }
     }
-
-    /**
-     * @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
-     */
-    // https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit
-    const VERSION = 3;
-    const JS_B64_PREFIX = '# sourceMappingURL=data:application/json;base64,';
-    class SourceMapGenerator {
-        constructor(file = null) {
-            this.file = file;
-            this.sourcesContent = new Map();
-            this.lines = [];
-            this.lastCol0 = 0;
-            this.hasMappings = false;
+    class Content {
+        constructor(selector, attributes, sourceSpan, i18n) {
+            this.selector = selector;
+            this.attributes = attributes;
+            this.sourceSpan = sourceSpan;
+            this.i18n = i18n;
+            this.name = 'ng-content';
         }
-        // The content is `null` when the content is expected to be loaded using the URL
-        addSource(url, content = null) {
-            if (!this.sourcesContent.has(url)) {
-                this.sourcesContent.set(url, content);
-            }
-            return this;
+        visit(visitor) {
+            return visitor.visitContent(this);
         }
-        addLine() {
-            this.lines.push([]);
-            this.lastCol0 = 0;
-            return this;
+    }
+    class Variable {
+        constructor(name, value, sourceSpan, keySpan, valueSpan) {
+            this.name = name;
+            this.value = value;
+            this.sourceSpan = sourceSpan;
+            this.keySpan = keySpan;
+            this.valueSpan = valueSpan;
         }
-        addMapping(col0, sourceUrl, sourceLine0, sourceCol0) {
-            if (!this.currentLine) {
-                throw new Error(`A line must be added before mappings can be added`);
-            }
-            if (sourceUrl != null && !this.sourcesContent.has(sourceUrl)) {
-                throw new Error(`Unknown source file "${sourceUrl}"`);
-            }
-            if (col0 == null) {
-                throw new Error(`The column in the generated code must be provided`);
-            }
-            if (col0 < this.lastCol0) {
-                throw new Error(`Mapping should be added in output order`);
-            }
-            if (sourceUrl && (sourceLine0 == null || sourceCol0 == null)) {
-                throw new Error(`The source location must be provided when a source url is provided`);
-            }
-            this.hasMappings = true;
-            this.lastCol0 = col0;
-            this.currentLine.push({ col0, sourceUrl, sourceLine0, sourceCol0 });
-            return this;
+        visit(visitor) {
+            return visitor.visitVariable(this);
         }
-        /**
-         * @internal strip this from published d.ts files due to
-         * https://github.com/microsoft/TypeScript/issues/36216
-         */
-        get currentLine() {
-            return this.lines.slice(-1)[0];
+    }
+    class Reference$1 {
+        constructor(name, value, sourceSpan, keySpan, valueSpan) {
+            this.name = name;
+            this.value = value;
+            this.sourceSpan = sourceSpan;
+            this.keySpan = keySpan;
+            this.valueSpan = valueSpan;
         }
-        toJSON() {
-            if (!this.hasMappings) {
-                return null;
-            }
-            const sourcesIndex = new Map();
-            const sources = [];
-            const sourcesContent = [];
-            Array.from(this.sourcesContent.keys()).forEach((url, i) => {
-                sourcesIndex.set(url, i);
-                sources.push(url);
-                sourcesContent.push(this.sourcesContent.get(url) || null);
-            });
-            let mappings = '';
-            let lastCol0 = 0;
-            let lastSourceIndex = 0;
-            let lastSourceLine0 = 0;
-            let lastSourceCol0 = 0;
-            this.lines.forEach(segments => {
-                lastCol0 = 0;
-                mappings += segments
-                    .map(segment => {
-                    // zero-based starting column of the line in the generated code
-                    let segAsStr = toBase64VLQ(segment.col0 - lastCol0);
-                    lastCol0 = segment.col0;
-                    if (segment.sourceUrl != null) {
-                        // zero-based index into the “sources” list
-                        segAsStr +=
-                            toBase64VLQ(sourcesIndex.get(segment.sourceUrl) - lastSourceIndex);
-                        lastSourceIndex = sourcesIndex.get(segment.sourceUrl);
-                        // the zero-based starting line in the original source
-                        segAsStr += toBase64VLQ(segment.sourceLine0 - lastSourceLine0);
-                        lastSourceLine0 = segment.sourceLine0;
-                        // the zero-based starting column in the original source
-                        segAsStr += toBase64VLQ(segment.sourceCol0 - lastSourceCol0);
-                        lastSourceCol0 = segment.sourceCol0;
-                    }
-                    return segAsStr;
-                })
-                    .join(',');
-                mappings += ';';
-            });
-            mappings = mappings.slice(0, -1);
-            return {
-                'file': this.file || '',
-                'version': VERSION,
-                'sourceRoot': '',
-                'sources': sources,
-                'sourcesContent': sourcesContent,
-                'mappings': mappings,
-            };
+        visit(visitor) {
+            return visitor.visitReference(this);
         }
-        toJsComment() {
-            return this.hasMappings ? '//' + JS_B64_PREFIX + toBase64String(JSON.stringify(this, null, 0)) :
-                '';
+    }
+    class Icu$1 {
+        constructor(vars, placeholders, sourceSpan, i18n) {
+            this.vars = vars;
+            this.placeholders = placeholders;
+            this.sourceSpan = sourceSpan;
+            this.i18n = i18n;
+        }
+        visit(visitor) {
+            return visitor.visitIcu(this);
         }
     }
-    function toBase64String(value) {
-        let b64 = '';
-        const encoded = utf8Encode(value);
-        for (let i = 0; i < encoded.length;) {
-            const i1 = encoded[i++];
-            const i2 = i < encoded.length ? encoded[i++] : null;
-            const i3 = i < encoded.length ? encoded[i++] : null;
-            b64 += toBase64Digit(i1 >> 2);
-            b64 += toBase64Digit(((i1 & 3) << 4) | (i2 === null ? 0 : i2 >> 4));
-            b64 += i2 === null ? '=' : toBase64Digit(((i2 & 15) << 2) | (i3 === null ? 0 : i3 >> 6));
-            b64 += i2 === null || i3 === null ? '=' : toBase64Digit(i3 & 63);
+    class RecursiveVisitor {
+        visitElement(element) {
+            visitAll$1(this, element.attributes);
+            visitAll$1(this, element.inputs);
+            visitAll$1(this, element.outputs);
+            visitAll$1(this, element.children);
+            visitAll$1(this, element.references);
         }
-        return b64;
+        visitTemplate(template) {
+            visitAll$1(this, template.attributes);
+            visitAll$1(this, template.inputs);
+            visitAll$1(this, template.outputs);
+            visitAll$1(this, template.children);
+            visitAll$1(this, template.references);
+            visitAll$1(this, template.variables);
+        }
+        visitContent(content) { }
+        visitVariable(variable) { }
+        visitReference(reference) { }
+        visitTextAttribute(attribute) { }
+        visitBoundAttribute(attribute) { }
+        visitBoundEvent(attribute) { }
+        visitText(text) { }
+        visitBoundText(text) { }
+        visitIcu(icu) { }
     }
-    function toBase64VLQ(value) {
-        value = value < 0 ? ((-value) << 1) + 1 : value << 1;
-        let out = '';
-        do {
-            let digit = value & 31;
-            value = value >> 5;
-            if (value > 0) {
-                digit = digit | 32;
+    function visitAll$1(visitor, nodes) {
+        const result = [];
+        if (visitor.visit) {
+            for (const node of nodes) {
+                visitor.visit(node) || node.visit(visitor);
             }
-            out += toBase64Digit(digit);
-        } while (value > 0);
-        return out;
-    }
-    const B64_DIGITS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-    function toBase64Digit(value) {
-        if (value < 0 || value >= 64) {
-            throw new Error(`Can only encode value in the range [0, 63]`);
         }
-        return B64_DIGITS[value];
+        else {
+            for (const node of nodes) {
+                const newNode = node.visit(visitor);
+                if (newNode) {
+                    result.push(newNode);
+                }
+            }
+        }
+        return result;
     }
 
     /**
@@ -4128,551 +3904,765 @@ 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 _SINGLE_QUOTE_ESCAPE_STRING_RE = /'|\\|\n|\r|\$/g;
-    const _LEGAL_IDENTIFIER_RE = /^[$A-Z_][0-9A-Z_$]*$/i;
-    const _INDENT_WITH = '  ';
-    const CATCH_ERROR_VAR = variable('error', null, null);
-    const CATCH_STACK_VAR = variable('stack', null, null);
-    class _EmittedLine {
-        constructor(indent) {
-            this.indent = indent;
-            this.partsLength = 0;
-            this.parts = [];
-            this.srcSpans = [];
+    class Message {
+        /**
+         * @param nodes message AST
+         * @param placeholders maps placeholder names to static content and their source spans
+         * @param placeholderToMessage maps placeholder names to messages (used for nested ICU messages)
+         * @param meaning
+         * @param description
+         * @param customId
+         */
+        constructor(nodes, placeholders, placeholderToMessage, meaning, description, customId) {
+            this.nodes = nodes;
+            this.placeholders = placeholders;
+            this.placeholderToMessage = placeholderToMessage;
+            this.meaning = meaning;
+            this.description = description;
+            this.customId = customId;
+            this.id = this.customId;
+            /** The ids to use if there are no custom id and if `i18nLegacyMessageIdFormat` is not empty */
+            this.legacyIds = [];
+            if (nodes.length) {
+                this.sources = [{
+                        filePath: nodes[0].sourceSpan.start.file.url,
+                        startLine: nodes[0].sourceSpan.start.line + 1,
+                        startCol: nodes[0].sourceSpan.start.col + 1,
+                        endLine: nodes[nodes.length - 1].sourceSpan.end.line + 1,
+                        endCol: nodes[0].sourceSpan.start.col + 1
+                    }];
+            }
+            else {
+                this.sources = [];
+            }
         }
     }
-    class EmitterVisitorContext {
-        constructor(_indent) {
-            this._indent = _indent;
-            this._classes = [];
-            this._preambleLineCount = 0;
-            this._lines = [new _EmittedLine(_indent)];
+    class Text$1 {
+        constructor(value, sourceSpan) {
+            this.value = value;
+            this.sourceSpan = sourceSpan;
         }
-        static createRoot() {
-            return new EmitterVisitorContext(0);
+        visit(visitor, context) {
+            return visitor.visitText(this, context);
         }
-        /**
-         * @internal strip this from published d.ts files due to
-         * https://github.com/microsoft/TypeScript/issues/36216
-         */
-        get _currentLine() {
-            return this._lines[this._lines.length - 1];
+    }
+    // TODO(vicb): do we really need this node (vs an array) ?
+    class Container {
+        constructor(children, sourceSpan) {
+            this.children = children;
+            this.sourceSpan = sourceSpan;
         }
-        println(from, lastPart = '') {
-            this.print(from || null, lastPart, true);
+        visit(visitor, context) {
+            return visitor.visitContainer(this, context);
         }
-        lineIsEmpty() {
-            return this._currentLine.parts.length === 0;
+    }
+    class Icu {
+        constructor(expression, type, cases, sourceSpan) {
+            this.expression = expression;
+            this.type = type;
+            this.cases = cases;
+            this.sourceSpan = sourceSpan;
         }
-        lineLength() {
-            return this._currentLine.indent * _INDENT_WITH.length + this._currentLine.partsLength;
+        visit(visitor, context) {
+            return visitor.visitIcu(this, context);
         }
-        print(from, part, newLine = false) {
-            if (part.length > 0) {
-                this._currentLine.parts.push(part);
-                this._currentLine.partsLength += part.length;
-                this._currentLine.srcSpans.push(from && from.sourceSpan || null);
-            }
-            if (newLine) {
-                this._lines.push(new _EmittedLine(this._indent));
-            }
+    }
+    class TagPlaceholder {
+        constructor(tag, attrs, startName, closeName, children, isVoid, 
+        // TODO sourceSpan should cover all (we need a startSourceSpan and endSourceSpan)
+        sourceSpan, startSourceSpan, endSourceSpan) {
+            this.tag = tag;
+            this.attrs = attrs;
+            this.startName = startName;
+            this.closeName = closeName;
+            this.children = children;
+            this.isVoid = isVoid;
+            this.sourceSpan = sourceSpan;
+            this.startSourceSpan = startSourceSpan;
+            this.endSourceSpan = endSourceSpan;
         }
-        removeEmptyLastLine() {
-            if (this.lineIsEmpty()) {
-                this._lines.pop();
-            }
+        visit(visitor, context) {
+            return visitor.visitTagPlaceholder(this, context);
         }
-        incIndent() {
-            this._indent++;
-            if (this.lineIsEmpty()) {
-                this._currentLine.indent = this._indent;
-            }
+    }
+    class Placeholder {
+        constructor(value, name, sourceSpan) {
+            this.value = value;
+            this.name = name;
+            this.sourceSpan = sourceSpan;
         }
-        decIndent() {
-            this._indent--;
-            if (this.lineIsEmpty()) {
-                this._currentLine.indent = this._indent;
-            }
+        visit(visitor, context) {
+            return visitor.visitPlaceholder(this, context);
         }
-        pushClass(clazz) {
-            this._classes.push(clazz);
+    }
+    class IcuPlaceholder {
+        constructor(value, name, sourceSpan) {
+            this.value = value;
+            this.name = name;
+            this.sourceSpan = sourceSpan;
         }
-        popClass() {
-            return this._classes.pop();
+        visit(visitor, context) {
+            return visitor.visitIcuPlaceholder(this, context);
         }
-        get currentClass() {
-            return this._classes.length > 0 ? this._classes[this._classes.length - 1] : null;
+    }
+
+    /**
+     * @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
+     */
+    /**
+     * Represents a big integer using a buffer of its individual digits, with the least significant
+     * digit stored at the beginning of the array (little endian).
+     *
+     * For performance reasons, each instance is mutable. The addition operation can be done in-place
+     * to reduce memory pressure of allocation for the digits array.
+     */
+    class BigInteger {
+        /**
+         * Creates a big integer using its individual digits in little endian storage.
+         */
+        constructor(digits) {
+            this.digits = digits;
         }
-        toSource() {
-            return this.sourceLines
-                .map(l => l.parts.length > 0 ? _createIndent(l.indent) + l.parts.join('') : '')
-                .join('\n');
+        static zero() {
+            return new BigInteger([0]);
         }
-        toSourceMapGenerator(genFilePath, startsAtLine = 0) {
-            const map = new SourceMapGenerator(genFilePath);
-            let firstOffsetMapped = false;
-            const mapFirstOffsetIfNeeded = () => {
-                if (!firstOffsetMapped) {
-                    // Add a single space so that tools won't try to load the file from disk.
-                    // Note: We are using virtual urls like `ng:///`, so we have to
-                    // provide a content here.
-                    map.addSource(genFilePath, ' ').addMapping(0, genFilePath, 0, 0);
-                    firstOffsetMapped = true;
+        static one() {
+            return new BigInteger([1]);
+        }
+        /**
+         * Creates a clone of this instance.
+         */
+        clone() {
+            return new BigInteger(this.digits.slice());
+        }
+        /**
+         * Returns a new big integer with the sum of `this` and `other` as its value. This does not mutate
+         * `this` but instead returns a new instance, unlike `addToSelf`.
+         */
+        add(other) {
+            const result = this.clone();
+            result.addToSelf(other);
+            return result;
+        }
+        /**
+         * Adds `other` to the instance itself, thereby mutating its value.
+         */
+        addToSelf(other) {
+            const maxNrOfDigits = Math.max(this.digits.length, other.digits.length);
+            let carry = 0;
+            for (let i = 0; i < maxNrOfDigits; i++) {
+                let digitSum = carry;
+                if (i < this.digits.length) {
+                    digitSum += this.digits[i];
                 }
-            };
-            for (let i = 0; i < startsAtLine; i++) {
-                map.addLine();
-                mapFirstOffsetIfNeeded();
-            }
-            this.sourceLines.forEach((line, lineIdx) => {
-                map.addLine();
-                const spans = line.srcSpans;
-                const parts = line.parts;
-                let col0 = line.indent * _INDENT_WITH.length;
-                let spanIdx = 0;
-                // skip leading parts without source spans
-                while (spanIdx < spans.length && !spans[spanIdx]) {
-                    col0 += parts[spanIdx].length;
-                    spanIdx++;
+                if (i < other.digits.length) {
+                    digitSum += other.digits[i];
                 }
-                if (spanIdx < spans.length && lineIdx === 0 && col0 === 0) {
-                    firstOffsetMapped = true;
+                if (digitSum >= 10) {
+                    this.digits[i] = digitSum - 10;
+                    carry = 1;
                 }
                 else {
-                    mapFirstOffsetIfNeeded();
-                }
-                while (spanIdx < spans.length) {
-                    const span = spans[spanIdx];
-                    const source = span.start.file;
-                    const sourceLine = span.start.line;
-                    const sourceCol = span.start.col;
-                    map.addSource(source.url, source.content)
-                        .addMapping(col0, source.url, sourceLine, sourceCol);
-                    col0 += parts[spanIdx].length;
-                    spanIdx++;
-                    // assign parts without span or the same span to the previous segment
-                    while (spanIdx < spans.length && (span === spans[spanIdx] || !spans[spanIdx])) {
-                        col0 += parts[spanIdx].length;
-                        spanIdx++;
-                    }
-                }
-            });
-            return map;
-        }
-        setPreambleLineCount(count) {
-            return this._preambleLineCount = count;
-        }
-        spanOf(line, column) {
-            const emittedLine = this._lines[line - this._preambleLineCount];
-            if (emittedLine) {
-                let columnsLeft = column - _createIndent(emittedLine.indent).length;
-                for (let partIndex = 0; partIndex < emittedLine.parts.length; partIndex++) {
-                    const part = emittedLine.parts[partIndex];
-                    if (part.length > columnsLeft) {
-                        return emittedLine.srcSpans[partIndex];
-                    }
-                    columnsLeft -= part.length;
+                    this.digits[i] = digitSum;
+                    carry = 0;
                 }
             }
-            return null;
+            // Apply a remaining carry if needed.
+            if (carry > 0) {
+                this.digits[maxNrOfDigits] = 1;
+            }
         }
         /**
-         * @internal strip this from published d.ts files due to
-         * https://github.com/microsoft/TypeScript/issues/36216
+         * Builds the decimal string representation of the big integer. As this is stored in
+         * little endian, the digits are concatenated in reverse order.
          */
-        get sourceLines() {
-            if (this._lines.length && this._lines[this._lines.length - 1].parts.length === 0) {
-                return this._lines.slice(0, -1);
+        toString() {
+            let res = '';
+            for (let i = this.digits.length - 1; i >= 0; i--) {
+                res += this.digits[i];
             }
-            return this._lines;
+            return res;
         }
     }
-    class AbstractEmitterVisitor {
-        constructor(_escapeDollarInStrings) {
-            this._escapeDollarInStrings = _escapeDollarInStrings;
+    /**
+     * Represents a big integer which is optimized for multiplication operations, as its power-of-twos
+     * are memoized. See `multiplyBy()` for details on the multiplication algorithm.
+     */
+    class BigIntForMultiplication {
+        constructor(value) {
+            this.powerOfTwos = [value];
         }
-        printLeadingComments(stmt, ctx) {
-            if (stmt.leadingComments === undefined) {
-                return;
-            }
-            for (const comment of stmt.leadingComments) {
-                if (comment instanceof JSDocComment) {
-                    ctx.print(stmt, `/*${comment.toString()}*/`, comment.trailingNewline);
-                }
-                else {
-                    if (comment.multiline) {
-                        ctx.print(stmt, `/* ${comment.text} */`, comment.trailingNewline);
-                    }
-                    else {
-                        comment.text.split('\n').forEach((line) => {
-                            ctx.println(stmt, `// ${line}`);
-                        });
-                    }
-                }
-            }
-        }
-        visitExpressionStmt(stmt, ctx) {
-            this.printLeadingComments(stmt, ctx);
-            stmt.expr.visitExpression(this, ctx);
-            ctx.println(stmt, ';');
-            return null;
+        /**
+         * Returns the big integer itself.
+         */
+        getValue() {
+            return this.powerOfTwos[0];
         }
-        visitReturnStmt(stmt, ctx) {
-            this.printLeadingComments(stmt, ctx);
-            ctx.print(stmt, `return `);
-            stmt.value.visitExpression(this, ctx);
-            ctx.println(stmt, ';');
-            return null;
+        /**
+         * Computes the value for `num * b`, where `num` is a JS number and `b` is a big integer. The
+         * value for `b` is represented by a storage model that is optimized for this computation.
+         *
+         * This operation is implemented in N(log2(num)) by continuous halving of the number, where the
+         * least-significant bit (LSB) is tested in each iteration. If the bit is set, the bit's index is
+         * used as exponent into the power-of-two multiplication of `b`.
+         *
+         * As an example, consider the multiplication num=42, b=1337. In binary 42 is 0b00101010 and the
+         * algorithm unrolls into the following iterations:
+         *
+         *  Iteration | num        | LSB  | b * 2^iter | Add? | product
+         * -----------|------------|------|------------|------|--------
+         *  0         | 0b00101010 | 0    | 1337       | No   | 0
+         *  1         | 0b00010101 | 1    | 2674       | Yes  | 2674
+         *  2         | 0b00001010 | 0    | 5348       | No   | 2674
+         *  3         | 0b00000101 | 1    | 10696      | Yes  | 13370
+         *  4         | 0b00000010 | 0    | 21392      | No   | 13370
+         *  5         | 0b00000001 | 1    | 42784      | Yes  | 56154
+         *  6         | 0b00000000 | 0    | 85568      | No   | 56154
+         *
+         * The computed product of 56154 is indeed the correct result.
+         *
+         * The `BigIntForMultiplication` representation for a big integer provides memoized access to the
+         * power-of-two values to reduce the workload in computing those values.
+         */
+        multiplyBy(num) {
+            const product = BigInteger.zero();
+            this.multiplyByAndAddTo(num, product);
+            return product;
         }
-        visitIfStmt(stmt, ctx) {
-            this.printLeadingComments(stmt, ctx);
-            ctx.print(stmt, `if (`);
-            stmt.condition.visitExpression(this, ctx);
-            ctx.print(stmt, `) {`);
-            const hasElseCase = stmt.falseCase != null && stmt.falseCase.length > 0;
-            if (stmt.trueCase.length <= 1 && !hasElseCase) {
-                ctx.print(stmt, ` `);
-                this.visitAllStatements(stmt.trueCase, ctx);
-                ctx.removeEmptyLastLine();
-                ctx.print(stmt, ` `);
-            }
-            else {
-                ctx.println();
-                ctx.incIndent();
-                this.visitAllStatements(stmt.trueCase, ctx);
-                ctx.decIndent();
-                if (hasElseCase) {
-                    ctx.println(stmt, `} else {`);
-                    ctx.incIndent();
-                    this.visitAllStatements(stmt.falseCase, ctx);
-                    ctx.decIndent();
+        /**
+         * See `multiplyBy()` for details. This function allows for the computed product to be added
+         * directly to the provided result big integer.
+         */
+        multiplyByAndAddTo(num, result) {
+            for (let exponent = 0; num !== 0; num = num >>> 1, exponent++) {
+                if (num & 1) {
+                    const value = this.getMultipliedByPowerOfTwo(exponent);
+                    result.addToSelf(value);
                 }
             }
-            ctx.println(stmt, `}`);
-            return null;
-        }
-        visitThrowStmt(stmt, ctx) {
-            this.printLeadingComments(stmt, ctx);
-            ctx.print(stmt, `throw `);
-            stmt.error.visitExpression(this, ctx);
-            ctx.println(stmt, `;`);
-            return null;
         }
-        visitWriteVarExpr(expr, ctx) {
-            const lineWasEmpty = ctx.lineIsEmpty();
-            if (!lineWasEmpty) {
-                ctx.print(expr, '(');
-            }
-            ctx.print(expr, `${expr.name} = `);
-            expr.value.visitExpression(this, ctx);
-            if (!lineWasEmpty) {
-                ctx.print(expr, ')');
+        /**
+         * Computes and memoizes the big integer value for `this.number * 2^exponent`.
+         */
+        getMultipliedByPowerOfTwo(exponent) {
+            // Compute the powers up until the requested exponent, where each value is computed from its
+            // predecessor. This is simple as `this.number * 2^(exponent - 1)` only has to be doubled (i.e.
+            // added to itself) to reach `this.number * 2^exponent`.
+            for (let i = this.powerOfTwos.length; i <= exponent; i++) {
+                const previousPower = this.powerOfTwos[i - 1];
+                this.powerOfTwos[i] = previousPower.add(previousPower);
             }
-            return null;
+            return this.powerOfTwos[exponent];
         }
-        visitWriteKeyExpr(expr, ctx) {
-            const lineWasEmpty = ctx.lineIsEmpty();
-            if (!lineWasEmpty) {
-                ctx.print(expr, '(');
-            }
-            expr.receiver.visitExpression(this, ctx);
-            ctx.print(expr, `[`);
-            expr.index.visitExpression(this, ctx);
-            ctx.print(expr, `] = `);
-            expr.value.visitExpression(this, ctx);
-            if (!lineWasEmpty) {
-                ctx.print(expr, ')');
-            }
-            return null;
+    }
+    /**
+     * Represents an exponentiation operation for the provided base, of which exponents are computed and
+     * memoized. The results are represented by a `BigIntForMultiplication` which is tailored for
+     * multiplication operations by memoizing the power-of-twos. This effectively results in a matrix
+     * representation that is lazily computed upon request.
+     */
+    class BigIntExponentiation {
+        constructor(base) {
+            this.base = base;
+            this.exponents = [new BigIntForMultiplication(BigInteger.one())];
         }
-        visitWritePropExpr(expr, ctx) {
-            const lineWasEmpty = ctx.lineIsEmpty();
-            if (!lineWasEmpty) {
-                ctx.print(expr, '(');
-            }
-            expr.receiver.visitExpression(this, ctx);
-            ctx.print(expr, `.${expr.name} = `);
-            expr.value.visitExpression(this, ctx);
-            if (!lineWasEmpty) {
-                ctx.print(expr, ')');
+        /**
+         * Compute the value for `this.base^exponent`, resulting in a big integer that is optimized for
+         * further multiplication operations.
+         */
+        toThePowerOf(exponent) {
+            // Compute the results up until the requested exponent, where every value is computed from its
+            // predecessor. This is because `this.base^(exponent - 1)` only has to be multiplied by `base`
+            // to reach `this.base^exponent`.
+            for (let i = this.exponents.length; i <= exponent; i++) {
+                const value = this.exponents[i - 1].multiplyBy(this.base);
+                this.exponents[i] = new BigIntForMultiplication(value);
             }
-            return null;
+            return this.exponents[exponent];
         }
-        visitInvokeFunctionExpr(expr, ctx) {
-            expr.fn.visitExpression(this, ctx);
-            ctx.print(expr, `(`);
-            this.visitAllExpressions(expr.args, ctx, ',');
-            ctx.print(expr, `)`);
-            return null;
+    }
+
+    /**
+     * @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
+     */
+    /**
+     * Compute the message id using the XLIFF1 digest.
+     */
+    function computeDigest(message) {
+        return sha1(serializeNodes(message.nodes).join('') + `[${message.meaning}]`);
+    }
+    /**
+     * Return the message id or compute it using the XLIFF2/XMB/$localize digest.
+     */
+    function decimalDigest(message) {
+        return message.id || computeDecimalDigest(message);
+    }
+    /**
+     * Compute the message id using the XLIFF2/XMB/$localize digest.
+     */
+    function computeDecimalDigest(message) {
+        const visitor = new _SerializerIgnoreIcuExpVisitor();
+        const parts = message.nodes.map(a => a.visit(visitor, null));
+        return computeMsgId(parts.join(''), message.meaning);
+    }
+    /**
+     * Serialize the i18n ast to something xml-like in order to generate an UID.
+     *
+     * The visitor is also used in the i18n parser tests
+     *
+     * @internal
+     */
+    class _SerializerVisitor {
+        visitText(text, context) {
+            return text.value;
         }
-        visitTaggedTemplateExpr(expr, ctx) {
-            expr.tag.visitExpression(this, ctx);
-            ctx.print(expr, '`' + expr.template.elements[0].rawText);
-            for (let i = 1; i < expr.template.elements.length; i++) {
-                ctx.print(expr, '${');
-                expr.template.expressions[i - 1].visitExpression(this, ctx);
-                ctx.print(expr, `}${expr.template.elements[i].rawText}`);
-            }
-            ctx.print(expr, '`');
-            return null;
+        visitContainer(container, context) {
+            return `[${container.children.map(child => child.visit(this)).join(', ')}]`;
         }
-        visitWrappedNodeExpr(ast, ctx) {
-            throw new Error('Abstract emitter cannot visit WrappedNodeExpr.');
+        visitIcu(icu, context) {
+            const strCases = Object.keys(icu.cases).map((k) => `${k} {${icu.cases[k].visit(this)}}`);
+            return `{${icu.expression}, ${icu.type}, ${strCases.join(', ')}}`;
         }
-        visitTypeofExpr(expr, ctx) {
-            ctx.print(expr, 'typeof ');
-            expr.expr.visitExpression(this, ctx);
+        visitTagPlaceholder(ph, context) {
+            return ph.isVoid ?
+                `<ph tag name="${ph.startName}"/>` :
+                `<ph tag name="${ph.startName}">${ph.children.map(child => child.visit(this)).join(', ')}</ph name="${ph.closeName}">`;
         }
-        visitReadVarExpr(ast, ctx) {
-            let varName = ast.name;
-            if (ast.builtin != null) {
-                switch (ast.builtin) {
-                    case BuiltinVar.Super:
-                        varName = 'super';
-                        break;
-                    case BuiltinVar.This:
-                        varName = 'this';
-                        break;
-                    case BuiltinVar.CatchError:
-                        varName = CATCH_ERROR_VAR.name;
-                        break;
-                    case BuiltinVar.CatchStack:
-                        varName = CATCH_STACK_VAR.name;
-                        break;
-                    default:
-                        throw new Error(`Unknown builtin variable ${ast.builtin}`);
-                }
-            }
-            ctx.print(ast, varName);
-            return null;
+        visitPlaceholder(ph, context) {
+            return ph.value ? `<ph name="${ph.name}">${ph.value}</ph>` : `<ph name="${ph.name}"/>`;
         }
-        visitInstantiateExpr(ast, ctx) {
-            ctx.print(ast, `new `);
-            ast.classExpr.visitExpression(this, ctx);
-            ctx.print(ast, `(`);
-            this.visitAllExpressions(ast.args, ctx, ',');
-            ctx.print(ast, `)`);
-            return null;
+        visitIcuPlaceholder(ph, context) {
+            return `<ph icu name="${ph.name}">${ph.value.visit(this)}</ph>`;
         }
-        visitLiteralExpr(ast, ctx) {
-            const value = ast.value;
-            if (typeof value === 'string') {
-                ctx.print(ast, escapeIdentifier(value, this._escapeDollarInStrings));
-            }
-            else {
-                ctx.print(ast, `${value}`);
-            }
-            return null;
+    }
+    const serializerVisitor$2 = new _SerializerVisitor();
+    function serializeNodes(nodes) {
+        return nodes.map(a => a.visit(serializerVisitor$2, null));
+    }
+    /**
+     * Serialize the i18n ast to something xml-like in order to generate an UID.
+     *
+     * Ignore the ICU expressions so that message IDs stays identical if only the expression changes.
+     *
+     * @internal
+     */
+    class _SerializerIgnoreIcuExpVisitor extends _SerializerVisitor {
+        visitIcu(icu, context) {
+            let strCases = Object.keys(icu.cases).map((k) => `${k} {${icu.cases[k].visit(this)}}`);
+            // Do not take the expression into account
+            return `{${icu.type}, ${strCases.join(', ')}}`;
         }
-        visitLocalizedString(ast, ctx) {
-            const head = ast.serializeI18nHead();
-            ctx.print(ast, '$localize `' + head.raw);
-            for (let i = 1; i < ast.messageParts.length; i++) {
-                ctx.print(ast, '${');
-                ast.expressions[i - 1].visitExpression(this, ctx);
-                ctx.print(ast, `}${ast.serializeI18nTemplatePart(i).raw}`);
+    }
+    /**
+     * Compute the SHA1 of the given string
+     *
+     * see https://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf
+     *
+     * WARNING: this function has not been designed not tested with security in mind.
+     *          DO NOT USE IT IN A SECURITY SENSITIVE CONTEXT.
+     */
+    function sha1(str) {
+        const utf8 = utf8Encode(str);
+        const words32 = bytesToWords32(utf8, Endian.Big);
+        const len = utf8.length * 8;
+        const w = newArray(80);
+        let a = 0x67452301, b = 0xefcdab89, c = 0x98badcfe, d = 0x10325476, e = 0xc3d2e1f0;
+        words32[len >> 5] |= 0x80 << (24 - len % 32);
+        words32[((len + 64 >> 9) << 4) + 15] = len;
+        for (let i = 0; i < words32.length; i += 16) {
+            const h0 = a, h1 = b, h2 = c, h3 = d, h4 = e;
+            for (let j = 0; j < 80; j++) {
+                if (j < 16) {
+                    w[j] = words32[i + j];
+                }
+                else {
+                    w[j] = rol32(w[j - 3] ^ w[j - 8] ^ w[j - 14] ^ w[j - 16], 1);
+                }
+                const fkVal = fk(j, b, c, d);
+                const f = fkVal[0];
+                const k = fkVal[1];
+                const temp = [rol32(a, 5), f, e, k, w[j]].reduce(add32);
+                e = d;
+                d = c;
+                c = rol32(b, 30);
+                b = a;
+                a = temp;
             }
-            ctx.print(ast, '`');
-            return null;
+            a = add32(a, h0);
+            b = add32(b, h1);
+            c = add32(c, h2);
+            d = add32(d, h3);
+            e = add32(e, h4);
         }
-        visitConditionalExpr(ast, ctx) {
-            ctx.print(ast, `(`);
-            ast.condition.visitExpression(this, ctx);
-            ctx.print(ast, '? ');
-            ast.trueCase.visitExpression(this, ctx);
-            ctx.print(ast, ': ');
-            ast.falseCase.visitExpression(this, ctx);
-            ctx.print(ast, `)`);
-            return null;
+        return bytesToHexString(words32ToByteString([a, b, c, d, e]));
+    }
+    function fk(index, b, c, d) {
+        if (index < 20) {
+            return [(b & c) | (~b & d), 0x5a827999];
         }
-        visitNotExpr(ast, ctx) {
-            ctx.print(ast, '!');
-            ast.condition.visitExpression(this, ctx);
-            return null;
+        if (index < 40) {
+            return [b ^ c ^ d, 0x6ed9eba1];
         }
-        visitAssertNotNullExpr(ast, ctx) {
-            ast.condition.visitExpression(this, ctx);
-            return null;
+        if (index < 60) {
+            return [(b & c) | (b & d) | (c & d), 0x8f1bbcdc];
         }
-        visitUnaryOperatorExpr(ast, ctx) {
-            let opStr;
-            switch (ast.operator) {
-                case UnaryOperator.Plus:
-                    opStr = '+';
-                    break;
-                case UnaryOperator.Minus:
-                    opStr = '-';
-                    break;
-                default:
-                    throw new Error(`Unknown operator ${ast.operator}`);
-            }
-            if (ast.parens)
-                ctx.print(ast, `(`);
-            ctx.print(ast, opStr);
-            ast.expr.visitExpression(this, ctx);
-            if (ast.parens)
-                ctx.print(ast, `)`);
-            return null;
+        return [b ^ c ^ d, 0xca62c1d6];
+    }
+    /**
+     * Compute the fingerprint of the given string
+     *
+     * The output is 64 bit number encoded as a decimal string
+     *
+     * based on:
+     * https://github.com/google/closure-compiler/blob/master/src/com/google/javascript/jscomp/GoogleJsMessageIdGenerator.java
+     */
+    function fingerprint(str) {
+        const utf8 = utf8Encode(str);
+        let hi = hash32(utf8, 0);
+        let lo = hash32(utf8, 102072);
+        if (hi == 0 && (lo == 0 || lo == 1)) {
+            hi = hi ^ 0x130f9bef;
+            lo = lo ^ -0x6b5f56d8;
         }
-        visitBinaryOperatorExpr(ast, ctx) {
-            let opStr;
-            switch (ast.operator) {
-                case BinaryOperator.Equals:
-                    opStr = '==';
-                    break;
-                case BinaryOperator.Identical:
-                    opStr = '===';
-                    break;
-                case BinaryOperator.NotEquals:
-                    opStr = '!=';
-                    break;
-                case BinaryOperator.NotIdentical:
-                    opStr = '!==';
-                    break;
-                case BinaryOperator.And:
-                    opStr = '&&';
-                    break;
-                case BinaryOperator.BitwiseAnd:
-                    opStr = '&';
-                    break;
-                case BinaryOperator.Or:
-                    opStr = '||';
-                    break;
-                case BinaryOperator.Plus:
-                    opStr = '+';
-                    break;
-                case BinaryOperator.Minus:
-                    opStr = '-';
-                    break;
-                case BinaryOperator.Divide:
-                    opStr = '/';
-                    break;
-                case BinaryOperator.Multiply:
-                    opStr = '*';
-                    break;
-                case BinaryOperator.Modulo:
-                    opStr = '%';
-                    break;
-                case BinaryOperator.Lower:
-                    opStr = '<';
-                    break;
-                case BinaryOperator.LowerEquals:
-                    opStr = '<=';
-                    break;
-                case BinaryOperator.Bigger:
-                    opStr = '>';
-                    break;
-                case BinaryOperator.BiggerEquals:
-                    opStr = '>=';
-                    break;
-                case BinaryOperator.NullishCoalesce:
-                    opStr = '??';
-                    break;
-                default:
-                    throw new Error(`Unknown operator ${ast.operator}`);
-            }
-            if (ast.parens)
-                ctx.print(ast, `(`);
-            ast.lhs.visitExpression(this, ctx);
-            ctx.print(ast, ` ${opStr} `);
-            ast.rhs.visitExpression(this, ctx);
-            if (ast.parens)
-                ctx.print(ast, `)`);
-            return null;
+        return [hi, lo];
+    }
+    function computeMsgId(msg, meaning = '') {
+        let msgFingerprint = fingerprint(msg);
+        if (meaning) {
+            const meaningFingerprint = fingerprint(meaning);
+            msgFingerprint = add64(rol64(msgFingerprint, 1), meaningFingerprint);
         }
-        visitReadPropExpr(ast, ctx) {
-            ast.receiver.visitExpression(this, ctx);
-            ctx.print(ast, `.`);
-            ctx.print(ast, ast.name);
-            return null;
+        const hi = msgFingerprint[0];
+        const lo = msgFingerprint[1];
+        return wordsToDecimalString(hi & 0x7fffffff, lo);
+    }
+    function hash32(bytes, c) {
+        let a = 0x9e3779b9, b = 0x9e3779b9;
+        let i;
+        const len = bytes.length;
+        for (i = 0; i + 12 <= len; i += 12) {
+            a = add32(a, wordAt(bytes, i, Endian.Little));
+            b = add32(b, wordAt(bytes, i + 4, Endian.Little));
+            c = add32(c, wordAt(bytes, i + 8, Endian.Little));
+            const res = mix(a, b, c);
+            a = res[0], b = res[1], c = res[2];
         }
-        visitReadKeyExpr(ast, ctx) {
-            ast.receiver.visitExpression(this, ctx);
-            ctx.print(ast, `[`);
-            ast.index.visitExpression(this, ctx);
-            ctx.print(ast, `]`);
-            return null;
+        a = add32(a, wordAt(bytes, i, Endian.Little));
+        b = add32(b, wordAt(bytes, i + 4, Endian.Little));
+        // the first byte of c is reserved for the length
+        c = add32(c, len);
+        c = add32(c, wordAt(bytes, i + 8, Endian.Little) << 8);
+        return mix(a, b, c)[2];
+    }
+    // clang-format off
+    function mix(a, b, c) {
+        a = sub32(a, b);
+        a = sub32(a, c);
+        a ^= c >>> 13;
+        b = sub32(b, c);
+        b = sub32(b, a);
+        b ^= a << 8;
+        c = sub32(c, a);
+        c = sub32(c, b);
+        c ^= b >>> 13;
+        a = sub32(a, b);
+        a = sub32(a, c);
+        a ^= c >>> 12;
+        b = sub32(b, c);
+        b = sub32(b, a);
+        b ^= a << 16;
+        c = sub32(c, a);
+        c = sub32(c, b);
+        c ^= b >>> 5;
+        a = sub32(a, b);
+        a = sub32(a, c);
+        a ^= c >>> 3;
+        b = sub32(b, c);
+        b = sub32(b, a);
+        b ^= a << 10;
+        c = sub32(c, a);
+        c = sub32(c, b);
+        c ^= b >>> 15;
+        return [a, b, c];
+    }
+    // clang-format on
+    // Utils
+    var Endian;
+    (function (Endian) {
+        Endian[Endian["Little"] = 0] = "Little";
+        Endian[Endian["Big"] = 1] = "Big";
+    })(Endian || (Endian = {}));
+    function add32(a, b) {
+        return add32to64(a, b)[1];
+    }
+    function add32to64(a, b) {
+        const low = (a & 0xffff) + (b & 0xffff);
+        const high = (a >>> 16) + (b >>> 16) + (low >>> 16);
+        return [high >>> 16, (high << 16) | (low & 0xffff)];
+    }
+    function add64(a, b) {
+        const ah = a[0], al = a[1];
+        const bh = b[0], bl = b[1];
+        const result = add32to64(al, bl);
+        const carry = result[0];
+        const l = result[1];
+        const h = add32(add32(ah, bh), carry);
+        return [h, l];
+    }
+    function sub32(a, b) {
+        const low = (a & 0xffff) - (b & 0xffff);
+        const high = (a >> 16) - (b >> 16) + (low >> 16);
+        return (high << 16) | (low & 0xffff);
+    }
+    // Rotate a 32b number left `count` position
+    function rol32(a, count) {
+        return (a << count) | (a >>> (32 - count));
+    }
+    // Rotate a 64b number left `count` position
+    function rol64(num, count) {
+        const hi = num[0], lo = num[1];
+        const h = (hi << count) | (lo >>> (32 - count));
+        const l = (lo << count) | (hi >>> (32 - count));
+        return [h, l];
+    }
+    function bytesToWords32(bytes, endian) {
+        const size = (bytes.length + 3) >>> 2;
+        const words32 = [];
+        for (let i = 0; i < size; i++) {
+            words32[i] = wordAt(bytes, i * 4, endian);
         }
-        visitLiteralArrayExpr(ast, ctx) {
-            ctx.print(ast, `[`);
-            this.visitAllExpressions(ast.entries, ctx, ',');
-            ctx.print(ast, `]`);
-            return null;
+        return words32;
+    }
+    function byteAt(bytes, index) {
+        return index >= bytes.length ? 0 : bytes[index];
+    }
+    function wordAt(bytes, index, endian) {
+        let word = 0;
+        if (endian === Endian.Big) {
+            for (let i = 0; i < 4; i++) {
+                word += byteAt(bytes, index + i) << (24 - 8 * i);
+            }
         }
-        visitLiteralMapExpr(ast, ctx) {
-            ctx.print(ast, `{`);
-            this.visitAllObjects(entry => {
-                ctx.print(ast, `${escapeIdentifier(entry.key, this._escapeDollarInStrings, entry.quoted)}:`);
-                entry.value.visitExpression(this, ctx);
-            }, ast.entries, ctx, ',');
-            ctx.print(ast, `}`);
-            return null;
+        else {
+            for (let i = 0; i < 4; i++) {
+                word += byteAt(bytes, index + i) << 8 * i;
+            }
         }
-        visitCommaExpr(ast, ctx) {
-            ctx.print(ast, '(');
-            this.visitAllExpressions(ast.parts, ctx, ',');
-            ctx.print(ast, ')');
-            return null;
+        return word;
+    }
+    function words32ToByteString(words32) {
+        return words32.reduce((bytes, word) => bytes.concat(word32ToByteString(word)), []);
+    }
+    function word32ToByteString(word) {
+        let bytes = [];
+        for (let i = 0; i < 4; i++) {
+            bytes.push((word >>> 8 * (3 - i)) & 0xff);
         }
-        visitAllExpressions(expressions, ctx, separator) {
-            this.visitAllObjects(expr => expr.visitExpression(this, ctx), expressions, ctx, separator);
+        return bytes;
+    }
+    function bytesToHexString(bytes) {
+        let hex = '';
+        for (let i = 0; i < bytes.length; i++) {
+            const b = byteAt(bytes, i);
+            hex += (b >>> 4).toString(16) + (b & 0x0f).toString(16);
         }
-        visitAllObjects(handler, expressions, ctx, separator) {
-            let incrementedIndent = false;
-            for (let i = 0; i < expressions.length; i++) {
-                if (i > 0) {
-                    if (ctx.lineLength() > 80) {
-                        ctx.print(null, separator, true);
-                        if (!incrementedIndent) {
-                            // continuation are marked with double indent.
-                            ctx.incIndent();
-                            ctx.incIndent();
-                            incrementedIndent = true;
-                        }
-                    }
-                    else {
-                        ctx.print(null, separator, false);
-                    }
-                }
-                handler(expressions[i]);
-            }
-            if (incrementedIndent) {
-                // continuation are marked with double indent.
-                ctx.decIndent();
-                ctx.decIndent();
-            }
+        return hex.toLowerCase();
+    }
+    /**
+     * Create a shared exponentiation pool for base-256 computations. This shared pool provides memoized
+     * power-of-256 results with memoized power-of-two computations for efficient multiplication.
+     *
+     * For our purposes, this can be safely stored as a global without memory concerns. The reason is
+     * that we encode two words, so only need the 0th (for the low word) and 4th (for the high word)
+     * exponent.
+     */
+    const base256 = new BigIntExponentiation(256);
+    /**
+     * Represents two 32-bit words as a single decimal number. This requires a big integer storage
+     * model as JS numbers are not accurate enough to represent the 64-bit number.
+     *
+     * Based on https://www.danvk.org/hex2dec.html
+     */
+    function wordsToDecimalString(hi, lo) {
+        // Encode the four bytes in lo in the lower digits of the decimal number.
+        // Note: the multiplication results in lo itself but represented by a big integer using its
+        // decimal digits.
+        const decimal = base256.toThePowerOf(0).multiplyBy(lo);
+        // Encode the four bytes in hi above the four lo bytes. lo is a maximum of (2^8)^4, which is why
+        // this multiplication factor is applied.
+        base256.toThePowerOf(4).multiplyByAndAddTo(hi, decimal);
+        return decimal.toString();
+    }
+
+    /**
+     * @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
+     */
+    // XMB/XTB placeholders can only contain A-Z, 0-9 and _
+    function toPublicName(internalName) {
+        return internalName.toUpperCase().replace(/[^A-Z0-9_]/g, '_');
+    }
+
+    /**
+     * @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
+     */
+    /* Closure variables holding messages must be named `MSG_[A-Z0-9]+` */
+    const CLOSURE_TRANSLATION_VAR_PREFIX = 'MSG_';
+    /**
+     * Prefix for non-`goog.getMsg` i18n-related vars.
+     * Note: the prefix uses lowercase characters intentionally due to a Closure behavior that
+     * considers variables like `I18N_0` as constants and throws an error when their value changes.
+     */
+    const TRANSLATION_VAR_PREFIX = 'i18n_';
+    /** Name of the i18n attributes **/
+    const I18N_ATTR = 'i18n';
+    const I18N_ATTR_PREFIX = 'i18n-';
+    /** Prefix of var expressions used in ICUs */
+    const I18N_ICU_VAR_PREFIX = 'VAR_';
+    /** Prefix of ICU expressions for post processing */
+    const I18N_ICU_MAPPING_PREFIX = 'I18N_EXP_';
+    /** Placeholder wrapper for i18n expressions **/
+    const I18N_PLACEHOLDER_SYMBOL = '�';
+    function isI18nAttribute(name) {
+        return name === I18N_ATTR || name.startsWith(I18N_ATTR_PREFIX);
+    }
+    function isI18nRootNode(meta) {
+        return meta instanceof Message;
+    }
+    function isSingleI18nIcu(meta) {
+        return isI18nRootNode(meta) && meta.nodes.length === 1 && meta.nodes[0] instanceof Icu;
+    }
+    function hasI18nMeta(node) {
+        return !!node.i18n;
+    }
+    function hasI18nAttrs(element) {
+        return element.attrs.some((attr) => isI18nAttribute(attr.name));
+    }
+    function icuFromI18nMessage(message) {
+        return message.nodes[0];
+    }
+    function wrapI18nPlaceholder(content, contextId = 0) {
+        const blockId = contextId > 0 ? `:${contextId}` : '';
+        return `${I18N_PLACEHOLDER_SYMBOL}${content}${blockId}${I18N_PLACEHOLDER_SYMBOL}`;
+    }
+    function assembleI18nBoundString(strings, bindingStartIndex = 0, contextId = 0) {
+        if (!strings.length)
+            return '';
+        let acc = '';
+        const lastIdx = strings.length - 1;
+        for (let i = 0; i < lastIdx; i++) {
+            acc += `${strings[i]}${wrapI18nPlaceholder(bindingStartIndex + i, contextId)}`;
         }
-        visitAllStatements(statements, ctx) {
-            statements.forEach((stmt) => stmt.visitStatement(this, ctx));
+        acc += strings[lastIdx];
+        return acc;
+    }
+    function getSeqNumberGenerator(startsAt = 0) {
+        let current = startsAt;
+        return () => current++;
+    }
+    function placeholdersToParams(placeholders) {
+        const params = {};
+        placeholders.forEach((values, key) => {
+            params[key] = literal$1(values.length > 1 ? `[${values.join('|')}]` : values[0]);
+        });
+        return params;
+    }
+    function updatePlaceholderMap(map, name, ...values) {
+        const current = map.get(name) || [];
+        current.push(...values);
+        map.set(name, current);
+    }
+    function assembleBoundTextPlaceholders(meta, bindingStartIndex = 0, contextId = 0) {
+        const startIdx = bindingStartIndex;
+        const placeholders = new Map();
+        const node = meta instanceof Message ? meta.nodes.find(node => node instanceof Container) : meta;
+        if (node) {
+            node
+                .children
+                .filter((child) => child instanceof Placeholder)
+                .forEach((child, idx) => {
+                const content = wrapI18nPlaceholder(startIdx + idx, contextId);
+                updatePlaceholderMap(placeholders, child.name, content);
+            });
         }
+        return placeholders;
     }
-    function escapeIdentifier(input, escapeDollar, alwaysQuote = true) {
-        if (input == null) {
-            return null;
+    /**
+     * Format the placeholder names in a map of placeholders to expressions.
+     *
+     * The placeholder names are converted from "internal" format (e.g. `START_TAG_DIV_1`) to "external"
+     * format (e.g. `startTagDiv_1`).
+     *
+     * @param params A map of placeholder names to expressions.
+     * @param useCamelCase whether to camelCase the placeholder name when formatting.
+     * @returns A new map of formatted placeholder names to expressions.
+     */
+    function i18nFormatPlaceholderNames(params = {}, useCamelCase) {
+        const _params = {};
+        if (params && Object.keys(params).length) {
+            Object.keys(params).forEach(key => _params[formatI18nPlaceholderName(key, useCamelCase)] = params[key]);
         }
-        const body = input.replace(_SINGLE_QUOTE_ESCAPE_STRING_RE, (...match) => {
-            if (match[0] == '$') {
-                return escapeDollar ? '\\$' : '$';
-            }
-            else if (match[0] == '\n') {
-                return '\\n';
-            }
-            else if (match[0] == '\r') {
-                return '\\r';
-            }
-            else {
-                return `\\${match[0]}`;
-            }
-        });
-        const requiresQuotes = alwaysQuote || !_LEGAL_IDENTIFIER_RE.test(body);
-        return requiresQuotes ? `'${body}'` : body;
+        return _params;
     }
-    function _createIndent(count) {
-        let res = '';
-        for (let i = 0; i < count; i++) {
-            res += _INDENT_WITH;
+    /**
+     * Converts internal placeholder names to public-facing format
+     * (for example to use in goog.getMsg call).
+     * Example: `START_TAG_DIV_1` is converted to `startTagDiv_1`.
+     *
+     * @param name The placeholder name that should be formatted
+     * @returns Formatted placeholder name
+     */
+    function formatI18nPlaceholderName(name, useCamelCase = true) {
+        const publicName = toPublicName(name);
+        if (!useCamelCase) {
+            return publicName;
+        }
+        const chunks = publicName.split('_');
+        if (chunks.length === 1) {
+            // if no "_" found - just lowercase the value
+            return name.toLowerCase();
+        }
+        let postfix;
+        // eject last element if it's a number
+        if (/^\d+$/.test(chunks[chunks.length - 1])) {
+            postfix = chunks.pop();
         }
-        return res;
+        let raw = chunks.shift().toLowerCase();
+        if (chunks.length) {
+            raw += chunks.map(c => c.charAt(0).toUpperCase() + c.slice(1).toLowerCase()).join('');
+        }
+        return postfix ? `${raw}_${postfix}` : raw;
+    }
+    /**
+     * Generates a prefix for translation const name.
+     *
+     * @param extra Additional local prefix that should be injected into translation var name
+     * @returns Complete translation const prefix
+     */
+    function getTranslationConstPrefix(extra) {
+        return `${CLOSURE_TRANSLATION_VAR_PREFIX}${extra}`.toUpperCase();
+    }
+    /**
+     * Generate AST to declare a variable. E.g. `var I18N_1;`.
+     * @param variable the name of the variable to declare.
+     */
+    function declareI18nVariable(variable) {
+        return new DeclareVarStmt(variable.name, undefined, INFERRED_TYPE, undefined, variable.sourceSpan);
     }
 
     /**
@@ -4682,242 +4672,205 @@ 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
      */
-    function typeWithParameters(type, numParams) {
-        if (numParams === 0) {
-            return expressionType(type);
-        }
-        const params = [];
-        for (let i = 0; i < numParams; i++) {
-            params.push(DYNAMIC_TYPE);
-        }
-        return expressionType(type, undefined, params);
-    }
-    const ANIMATE_SYMBOL_PREFIX = '@';
-    function prepareSyntheticPropertyName(name) {
-        return `${ANIMATE_SYMBOL_PREFIX}${name}`;
-    }
-    function prepareSyntheticListenerName(name, phase) {
-        return `${ANIMATE_SYMBOL_PREFIX}${name}.${phase}`;
-    }
-    function getSafePropertyAccessString(accessor, name) {
-        const escapedName = escapeIdentifier(name, false, false);
-        return escapedName !== name ? `${accessor}[${escapedName}]` : `${accessor}.${name}`;
-    }
-    function prepareSyntheticListenerFunctionName(name, phase) {
-        return `animation_${name}_${phase}`;
+    /**
+     * Checks whether an object key contains potentially unsafe chars, thus the key should be wrapped in
+     * quotes. Note: we do not wrap all keys into quotes, as it may have impact on minification and may
+     * bot work in some cases when object keys are mangled by minifier.
+     *
+     * TODO(FW-1136): this is a temporary solution, we need to come up with a better way of working with
+     * inputs that contain potentially unsafe chars.
+     */
+    const UNSAFE_OBJECT_KEY_NAME_REGEXP = /[-.]/;
+    /** Name of the temporary to use during data binding */
+    const TEMPORARY_NAME = '_t';
+    /** Name of the context parameter passed into a template function */
+    const CONTEXT_NAME = 'ctx';
+    /** Name of the RenderFlag passed into a template function */
+    const RENDER_FLAGS = 'rf';
+    /** The prefix reference variables */
+    const REFERENCE_PREFIX = '_r';
+    /** The name of the implicit context reference */
+    const IMPLICIT_REFERENCE = '$implicit';
+    /** Non bindable attribute name **/
+    const NON_BINDABLE_ATTR = 'ngNonBindable';
+    /** Name for the variable keeping track of the context returned by `ɵɵrestoreView`. */
+    const RESTORED_VIEW_CONTEXT_NAME = 'restoredCtx';
+    /**
+     * Creates an allocator for a temporary variable.
+     *
+     * A variable declaration is added to the statements the first time the allocator is invoked.
+     */
+    function temporaryAllocator(statements, name) {
+        let temp = null;
+        return () => {
+            if (!temp) {
+                statements.push(new DeclareVarStmt(TEMPORARY_NAME, undefined, DYNAMIC_TYPE));
+                temp = variable(name);
+            }
+            return temp;
+        };
     }
-    function jitOnlyGuardedExpression(expr) {
-        return guardedExpression('ngJitMode', expr);
+    function unsupported(feature) {
+        if (this) {
+            throw new Error(`Builder ${this.constructor.name} doesn't support ${feature} yet`);
+        }
+        throw new Error(`Feature ${feature} is not supported yet`);
     }
-    function devOnlyGuardedExpression(expr) {
-        return guardedExpression('ngDevMode', expr);
+    function invalid(arg) {
+        throw new Error(`Invalid state: Visitor ${this.constructor.name} doesn't handle ${arg.constructor.name}`);
     }
-    function guardedExpression(guard, expr) {
-        const guardExpr = new ExternalExpr({ name: guard, moduleName: null });
-        const guardNotDefined = new BinaryOperatorExpr(BinaryOperator.Identical, new TypeofExpr(guardExpr), literal$1('undefined'));
-        const guardUndefinedOrTrue = new BinaryOperatorExpr(BinaryOperator.Or, guardNotDefined, guardExpr, /* type */ undefined, 
-        /* sourceSpan */ undefined, true);
-        return new BinaryOperatorExpr(BinaryOperator.And, guardUndefinedOrTrue, expr);
+    function asLiteral(value) {
+        if (Array.isArray(value)) {
+            return literalArr(value.map(asLiteral));
+        }
+        return literal$1(value, INFERRED_TYPE);
     }
-    function wrapReference(value) {
-        const wrapped = new WrappedNodeExpr(value);
-        return { value: wrapped, type: wrapped };
+    function conditionallyCreateMapObjectLiteral(keys, keepDeclared) {
+        if (Object.getOwnPropertyNames(keys).length > 0) {
+            return mapToExpression(keys, keepDeclared);
+        }
+        return null;
     }
-    function refsToArray(refs, shouldForwardDeclare) {
-        const values = literalArr(refs.map(ref => ref.value));
-        return shouldForwardDeclare ? fn([], [new ReturnStatement(values)]) : values;
+    function mapToExpression(map, keepDeclared) {
+        return literalMap(Object.getOwnPropertyNames(map).map(key => {
+            // canonical syntax: `dirProp: publicProp`
+            // if there is no `:`, use dirProp = elProp
+            const value = map[key];
+            let declaredName;
+            let publicName;
+            let minifiedName;
+            let needsDeclaredName;
+            if (Array.isArray(value)) {
+                [publicName, declaredName] = value;
+                minifiedName = key;
+                needsDeclaredName = publicName !== declaredName;
+            }
+            else {
+                [declaredName, publicName] = splitAtColon(key, [key, value]);
+                minifiedName = declaredName;
+                // Only include the declared name if extracted from the key, i.e. the key contains a colon.
+                // Otherwise the declared name should be omitted even if it is different from the public name,
+                // as it may have already been minified.
+                needsDeclaredName = publicName !== declaredName && key.includes(':');
+            }
+            return {
+                key: minifiedName,
+                // put quotes around keys that contain potentially unsafe characters
+                quoted: UNSAFE_OBJECT_KEY_NAME_REGEXP.test(minifiedName),
+                value: (keepDeclared && needsDeclaredName) ?
+                    literalArr([asLiteral(publicName), asLiteral(declaredName)]) :
+                    asLiteral(publicName)
+            };
+        }));
     }
-
-    var R3FactoryDelegateType;
-    (function (R3FactoryDelegateType) {
-        R3FactoryDelegateType[R3FactoryDelegateType["Class"] = 0] = "Class";
-        R3FactoryDelegateType[R3FactoryDelegateType["Function"] = 1] = "Function";
-    })(R3FactoryDelegateType || (R3FactoryDelegateType = {}));
-    var FactoryTarget$1;
-    (function (FactoryTarget) {
-        FactoryTarget[FactoryTarget["Directive"] = 0] = "Directive";
-        FactoryTarget[FactoryTarget["Component"] = 1] = "Component";
-        FactoryTarget[FactoryTarget["Injectable"] = 2] = "Injectable";
-        FactoryTarget[FactoryTarget["Pipe"] = 3] = "Pipe";
-        FactoryTarget[FactoryTarget["NgModule"] = 4] = "NgModule";
-    })(FactoryTarget$1 || (FactoryTarget$1 = {}));
     /**
-     * Construct a factory function expression for the given `R3FactoryMetadata`.
+     *  Remove trailing null nodes as they are implied.
      */
-    function compileFactoryFunction(meta) {
-        const t = variable('t');
-        let baseFactoryVar = null;
-        // The type to instantiate via constructor invocation. If there is no delegated factory, meaning
-        // this type is always created by constructor invocation, then this is the type-to-create
-        // parameter provided by the user (t) if specified, or the current type if not. If there is a
-        // delegated factory (which is used to create the current type) then this is only the type-to-
-        // create parameter (t).
-        const typeForCtor = !isDelegatedFactoryMetadata(meta) ?
-            new BinaryOperatorExpr(BinaryOperator.Or, t, meta.internalType) :
-            t;
-        let ctorExpr = null;
-        if (meta.deps !== null) {
-            // There is a constructor (either explicitly or implicitly defined).
-            if (meta.deps !== 'invalid') {
-                ctorExpr = new InstantiateExpr(typeForCtor, injectDependencies(meta.deps, meta.target));
-            }
-        }
-        else {
-            // There is no constructor, use the base class' factory to construct typeForCtor.
-            baseFactoryVar = variable(`ɵ${meta.name}_BaseFactory`);
-            ctorExpr = baseFactoryVar.callFn([typeForCtor]);
-        }
-        const body = [];
-        let retExpr = null;
-        function makeConditionalFactory(nonCtorExpr) {
-            const r = variable('r');
-            body.push(r.set(NULL_EXPR).toDeclStmt());
-            const ctorStmt = ctorExpr !== null ? r.set(ctorExpr).toStmt() :
-                importExpr(Identifiers$1.invalidFactory).callFn([]).toStmt();
-            body.push(ifStmt(t, [ctorStmt], [r.set(nonCtorExpr).toStmt()]));
-            return r;
-        }
-        if (isDelegatedFactoryMetadata(meta)) {
-            // This type is created with a delegated factory. If a type parameter is not specified, call
-            // the factory instead.
-            const delegateArgs = injectDependencies(meta.delegateDeps, meta.target);
-            // Either call `new delegate(...)` or `delegate(...)` depending on meta.delegateType.
-            const factoryExpr = new (meta.delegateType === R3FactoryDelegateType.Class ?
-                InstantiateExpr :
-                InvokeFunctionExpr)(meta.delegate, delegateArgs);
-            retExpr = makeConditionalFactory(factoryExpr);
+    function trimTrailingNulls(parameters) {
+        while (isNull(parameters[parameters.length - 1])) {
+            parameters.pop();
         }
-        else if (isExpressionFactoryMetadata(meta)) {
-            // TODO(alxhub): decide whether to lower the value here or in the caller
-            retExpr = makeConditionalFactory(meta.expression);
+        return parameters;
+    }
+    function getQueryPredicate(query, constantPool) {
+        if (Array.isArray(query.predicate)) {
+            let predicate = [];
+            query.predicate.forEach((selector) => {
+                // Each item in predicates array may contain strings with comma-separated refs
+                // (for ex. 'ref, ref1, ..., refN'), thus we extract individual refs and store them
+                // as separate array entities
+                const selectors = selector.split(',').map(token => literal$1(token.trim()));
+                predicate.push(...selectors);
+            });
+            return constantPool.getConstLiteral(literalArr(predicate), true);
         }
         else {
-            retExpr = ctorExpr;
-        }
-        if (retExpr === null) {
-            // The expression cannot be formed so render an `ɵɵinvalidFactory()` call.
-            body.push(importExpr(Identifiers$1.invalidFactory).callFn([]).toStmt());
+            // The original predicate may have been wrapped in a `forwardRef()` call.
+            switch (query.predicate.forwardRef) {
+                case 0 /* None */:
+                case 2 /* Unwrapped */:
+                    return query.predicate.expression;
+                case 1 /* Wrapped */:
+                    return importExpr(Identifiers$1.resolveForwardRef).callFn([query.predicate.expression]);
+            }
         }
-        else if (baseFactoryVar !== null) {
-            // This factory uses a base factory, so call `ɵɵgetInheritedFactory()` to compute it.
-            const getInheritedFactoryCall = importExpr(Identifiers$1.getInheritedFactory).callFn([meta.internalType]);
-            // Memoize the base factoryFn: `baseFactory || (baseFactory = ɵɵgetInheritedFactory(...))`
-            const baseFactory = new BinaryOperatorExpr(BinaryOperator.Or, baseFactoryVar, baseFactoryVar.set(getInheritedFactoryCall));
-            body.push(new ReturnStatement(baseFactory.callFn([typeForCtor])));
+    }
+    /**
+     * A representation for an object literal used during codegen of definition objects. The generic
+     * type `T` allows to reference a documented type of the generated structure, such that the
+     * property names that are set can be resolved to their documented declaration.
+     */
+    class DefinitionMap {
+        constructor() {
+            this.values = [];
         }
-        else {
-            // This is straightforward factory, just return it.
-            body.push(new ReturnStatement(retExpr));
+        set(key, value) {
+            if (value) {
+                this.values.push({ key: key, value, quoted: false });
+            }
         }
-        let factoryFn = fn([new FnParam('t', DYNAMIC_TYPE)], body, INFERRED_TYPE, undefined, `${meta.name}_Factory`);
-        if (baseFactoryVar !== null) {
-            // There is a base factory variable so wrap its declaration along with the factory function into
-            // an IIFE.
-            factoryFn = fn([], [
-                new DeclareVarStmt(baseFactoryVar.name), new ReturnStatement(factoryFn)
-            ]).callFn([], /* sourceSpan */ undefined, /* pure */ true);
+        toLiteralMap() {
+            return literalMap(this.values);
         }
-        return {
-            expression: factoryFn,
-            statements: [],
-            type: createFactoryType(meta),
-        };
-    }
-    function createFactoryType(meta) {
-        const ctorDepsType = meta.deps !== null && meta.deps !== 'invalid' ? createCtorDepsType(meta.deps) : NONE_TYPE;
-        return expressionType(importExpr(Identifiers$1.FactoryDeclaration, [typeWithParameters(meta.type.type, meta.typeArgumentCount), ctorDepsType]));
-    }
-    function injectDependencies(deps, target) {
-        return deps.map((dep, index) => compileInjectDependency(dep, target, index));
     }
-    function compileInjectDependency(dep, target, index) {
-        // Interpret the dependency according to its resolved type.
-        if (dep.token === null) {
-            return importExpr(Identifiers$1.invalidFactoryDep).callFn([literal$1(index)]);
-        }
-        else if (dep.attributeNameType === null) {
-            // Build up the injection flags according to the metadata.
-            const flags = 0 /* Default */ | (dep.self ? 2 /* Self */ : 0) |
-                (dep.skipSelf ? 4 /* SkipSelf */ : 0) | (dep.host ? 1 /* Host */ : 0) |
-                (dep.optional ? 8 /* Optional */ : 0) |
-                (target === FactoryTarget$1.Pipe ? 16 /* ForPipe */ : 0);
-            // If this dependency is optional or otherwise has non-default flags, then additional
-            // parameters describing how to inject the dependency must be passed to the inject function
-            // that's being used.
-            let flagsParam = (flags !== 0 /* Default */ || dep.optional) ? literal$1(flags) : null;
-            // Build up the arguments to the injectFn call.
-            const injectArgs = [dep.token];
-            if (flagsParam) {
-                injectArgs.push(flagsParam);
-            }
-            const injectFn = getInjectFn(target);
-            return importExpr(injectFn).callFn(injectArgs);
+    /**
+     * Extract a map of properties to values for a given element or template node, which can be used
+     * by the directive matching machinery.
+     *
+     * @param elOrTpl the element or template in question
+     * @return an object set up for directive matching. For attributes on the element/template, this
+     * object maps a property name to its (static) value. For any bindings, this map simply maps the
+     * property name to an empty string.
+     */
+    function getAttrsForDirectiveMatching(elOrTpl) {
+        const attributesMap = {};
+        if (elOrTpl instanceof Template && elOrTpl.tagName !== 'ng-template') {
+            elOrTpl.templateAttrs.forEach(a => attributesMap[a.name] = '');
         }
         else {
-            // The `dep.attributeTypeName` value is defined, which indicates that this is an `@Attribute()`
-            // type dependency. For the generated JS we still want to use the `dep.token` value in case the
-            // name given for the attribute is not a string literal. For example given `@Attribute(foo())`,
-            // we want to generate `ɵɵinjectAttribute(foo())`.
-            //
-            // The `dep.attributeTypeName` is only actually used (in `createCtorDepType()`) to generate
-            // typings.
-            return importExpr(Identifiers$1.injectAttribute).callFn([dep.token]);
+            elOrTpl.attributes.forEach(a => {
+                if (!isI18nAttribute(a.name)) {
+                    attributesMap[a.name] = a.value;
+                }
+            });
+            elOrTpl.inputs.forEach(i => {
+                attributesMap[i.name] = '';
+            });
+            elOrTpl.outputs.forEach(o => {
+                attributesMap[o.name] = '';
+            });
         }
+        return attributesMap;
     }
-    function createCtorDepsType(deps) {
-        let hasTypes = false;
-        const attributeTypes = deps.map(dep => {
-            const type = createCtorDepType(dep);
-            if (type !== null) {
-                hasTypes = true;
-                return type;
-            }
-            else {
-                return literal$1(null);
+    /** Returns a call expression to a chained instruction, e.g. `property(params[0])(params[1])`. */
+    function chainedInstruction(reference, calls, span) {
+        let expression = importExpr(reference, null, span);
+        if (calls.length > 0) {
+            for (let i = 0; i < calls.length; i++) {
+                expression = expression.callFn(calls[i], span);
             }
-        });
-        if (hasTypes) {
-            return expressionType(literalArr(attributeTypes));
         }
         else {
-            return NONE_TYPE;
+            // Add a blank invocation, in case the `calls` array is empty.
+            expression = expression.callFn([], span);
         }
+        return expression;
     }
-    function createCtorDepType(dep) {
-        const entries = [];
-        if (dep.attributeNameType !== null) {
-            entries.push({ key: 'attribute', value: dep.attributeNameType, quoted: false });
-        }
-        if (dep.optional) {
-            entries.push({ key: 'optional', value: literal$1(true), quoted: false });
-        }
-        if (dep.host) {
-            entries.push({ key: 'host', value: literal$1(true), quoted: false });
-        }
-        if (dep.self) {
-            entries.push({ key: 'self', value: literal$1(true), quoted: false });
-        }
-        if (dep.skipSelf) {
-            entries.push({ key: 'skipSelf', value: literal$1(true), quoted: false });
+    /**
+     * Gets the number of arguments expected to be passed to a generated instruction in the case of
+     * interpolation instructions.
+     * @param interpolation An interpolation ast
+     */
+    function getInterpolationArgsLength(interpolation) {
+        const { expressions, strings } = interpolation;
+        if (expressions.length === 1 && strings.length === 2 && strings[0] === '' && strings[1] === '') {
+            // If the interpolation has one interpolated value, but the prefix and suffix are both empty
+            // strings, we only pass one argument, to a special instruction like `propertyInterpolate` or
+            // `textInterpolate`.
+            return 1;
         }
-        return entries.length > 0 ? literalMap(entries) : null;
-    }
-    function isDelegatedFactoryMetadata(meta) {
-        return meta.delegateType !== undefined;
-    }
-    function isExpressionFactoryMetadata(meta) {
-        return meta.expression !== undefined;
-    }
-    function getInjectFn(target) {
-        switch (target) {
-            case FactoryTarget$1.Component:
-            case FactoryTarget$1.Directive:
-            case FactoryTarget$1.Pipe:
-                return Identifiers$1.directiveInject;
-            case FactoryTarget$1.NgModule:
-            case FactoryTarget$1.Injectable:
-            default:
-                return Identifiers$1.inject;
+        else {
+            return expressions.length + strings.length;
         }
     }
 
@@ -4928,9 +4881,6 @@ 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
      */
-    function createR3ProviderExpression(expression, isForwardRef) {
-        return { expression, isForwardRef };
-    }
     function compileInjectable(meta, resolveForwardRefs) {
         let result = null;
         const factoryMeta = {
@@ -5016,8 +4966,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         injectableProps.set('factory', result.expression);
         // Only generate providedIn property if it has a non-null value
         if (meta.providedIn.expression.value !== null) {
-            injectableProps.set('providedIn', meta.providedIn.isForwardRef ? generateForwardRef(meta.providedIn.expression) :
-                meta.providedIn.expression);
+            injectableProps.set('providedIn', convertFromMaybeForwardRefExpression(meta.providedIn));
         }
         const expression = importExpr(Identifiers$1.ɵɵdefineInjectable)
             .callFn([injectableProps.toLiteralMap()], undefined, true);
@@ -7431,6 +7380,10 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         Statement: ${ast.uninterpretedExpression} located at ${ast.location}`);
         }
         visitCall(ast, mode) {
+            const leftMostSafe = this.leftMostSafeNode(ast);
+            if (leftMostSafe) {
+                return this.convertSafeAccess(ast, leftMostSafe, mode);
+            }
             const convertedArgs = this.visitAll(ast.args, _Mode.Expression);
             if (ast instanceof BuiltinFunctionCall) {
                 return convertToStatementIfNeeded(mode, ast.converter(convertedArgs));
@@ -7445,10 +7398,6 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
                 return convertToStatementIfNeeded(mode, convertedArgs[0]
                     .cast(DYNAMIC_TYPE, this.convertSourceSpan(ast.span)));
             }
-            const leftMostSafe = this.leftMostSafeNode(ast);
-            if (leftMostSafe) {
-                return this.convertSafeAccess(ast, leftMostSafe, mode);
-            }
             const call = this._visit(receiver, _Mode.Expression)
                 .callFn(convertedArgs, this.convertSourceSpan(ast.span));
             return convertToStatementIfNeeded(mode, call);
@@ -19780,8 +19729,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function convertToR3QueryMetadata(facade) {
         return {
             ...facade,
-            predicate: Array.isArray(facade.predicate) ? facade.predicate :
-                new WrappedNodeExpr(facade.predicate),
+            predicate: convertQueryPredicate(facade.predicate),
             read: facade.read ? new WrappedNodeExpr(facade.read) : null,
             static: facade.static,
             emitDistinctChangesOnly: facade.emitDistinctChangesOnly,
@@ -19791,14 +19739,20 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         return {
             propertyName: declaration.propertyName,
             first: declaration.first ?? false,
-            predicate: Array.isArray(declaration.predicate) ? declaration.predicate :
-                new WrappedNodeExpr(declaration.predicate),
+            predicate: convertQueryPredicate(declaration.predicate),
             descendants: declaration.descendants ?? false,
             read: declaration.read ? new WrappedNodeExpr(declaration.read) : null,
             static: declaration.static ?? false,
             emitDistinctChangesOnly: declaration.emitDistinctChangesOnly ?? true,
         };
     }
+    function convertQueryPredicate(predicate) {
+        return Array.isArray(predicate) ?
+            // The predicate is an array of strings so pass it through.
+            predicate :
+            // The predicate is a type - assume that we will need to unwrap any `forwardRef()` calls.
+            createMayBeForwardRefExpression(new WrappedNodeExpr(predicate), 1 /* Wrapped */);
+    }
     function convertDirectiveFacadeToMetadata(facade) {
         const inputsFromMetadata = parseInputOutputs(facade.inputs || []);
         const outputsFromMetadata = parseInputOutputs(facade.outputs || []);
@@ -19920,7 +19874,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
     function parseJitTemplate(template, typeName, sourceMapUrl, preserveWhitespaces, interpolation) {
         const interpolationConfig = interpolation ? InterpolationConfig.fromArray(interpolation) : DEFAULT_INTERPOLATION_CONFIG;
         // Parse the template and check for errors.
-        const parsed = parseTemplate(template, sourceMapUrl, { preserveWhitespaces: preserveWhitespaces, interpolationConfig });
+        const parsed = parseTemplate(template, sourceMapUrl, { preserveWhitespaces, interpolationConfig });
         if (parsed.errors !== null) {
             const errors = parsed.errors.map(err => err.toString()).join(', ');
             throw new Error(`Errors during JIT compilation of template for ${typeName}: ${errors}`);
@@ -19933,11 +19887,11 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
      * In JIT mode we do not want the compiler to wrap the expression in a `forwardRef()` call because,
      * if it is referencing a type that has not yet been defined, it will have already been wrapped in
      * a `forwardRef()` - either by the application developer or during partial-compilation. Thus we can
-     * set `isForwardRef` to `false`.
+     * use `ForwardRefHandling.None`.
      */
     function convertToProviderExpression(obj, property) {
         if (obj.hasOwnProperty(property)) {
-            return createR3ProviderExpression(new WrappedNodeExpr(obj[property]), /* isForwardRef */ false);
+            return createMayBeForwardRefExpression(new WrappedNodeExpr(obj[property]), 0 /* None */);
         }
         else {
             return undefined;
@@ -19952,11 +19906,10 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         }
     }
     function computeProvidedIn(providedIn) {
-        const expression = (providedIn == null || typeof providedIn === 'string') ?
-            new LiteralExpr(providedIn ?? null) :
-            new WrappedNodeExpr(providedIn);
-        // See `convertToProviderExpression()` for why `isForwardRef` is false.
-        return createR3ProviderExpression(expression, /* isForwardRef */ false);
+        const expression = typeof providedIn === 'function' ? new WrappedNodeExpr(providedIn) :
+            new LiteralExpr(providedIn ?? null);
+        // See `convertToProviderExpression()` for why this uses `ForwardRefHandling.None`.
+        return createMayBeForwardRefExpression(expression, 0 /* None */);
     }
     function convertR3DependencyMetadataArray(facades) {
         return facades == null ? null : facades.map(convertR3DependencyMetadata);
@@ -20062,7 +20015,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.0');
+    new Version('13.0.1');
 
     /**
      * @license
@@ -20691,7 +20644,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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', metadata.type);
         definitionMap.set('decorators', metadata.decorators);
@@ -20700,6 +20653,83 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         return importExpr(Identifiers$1.declareClassMetadata).callFn([definitionMap.toLiteralMap()]);
     }
 
+    /**
+     * @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
+     */
+    /**
+     * Creates an array literal expression from the given array, mapping all values to an expression
+     * using the provided mapping function. If the array is empty or null, then null is returned.
+     *
+     * @param values The array to transfer into literal array expression.
+     * @param mapper The logic to use for creating an expression for the array's values.
+     * @returns An array literal expression representing `values`, or null if `values` is empty or
+     * is itself null.
+     */
+    function toOptionalLiteralArray(values, mapper) {
+        if (values === null || values.length === 0) {
+            return null;
+        }
+        return literalArr(values.map(value => mapper(value)));
+    }
+    /**
+     * Creates an object literal expression from the given object, mapping all values to an expression
+     * using the provided mapping function. If the object has no keys, then null is returned.
+     *
+     * @param object The object to transfer into an object literal expression.
+     * @param mapper The logic to use for creating an expression for the object's values.
+     * @returns An object literal expression representing `object`, or null if `object` does not have
+     * any keys.
+     */
+    function toOptionalLiteralMap(object, mapper) {
+        const entries = Object.keys(object).map(key => {
+            const value = object[key];
+            return { key, value: mapper(value), quoted: true };
+        });
+        if (entries.length > 0) {
+            return literalMap(entries);
+        }
+        else {
+            return null;
+        }
+    }
+    function compileDependencies(deps) {
+        if (deps === 'invalid') {
+            // The `deps` can be set to the string "invalid"  by the `unwrapConstructorDependencies()`
+            // function, which tries to convert `ConstructorDeps` into `R3DependencyMetadata[]`.
+            return literal$1('invalid');
+        }
+        else if (deps === null) {
+            return literal$1(null);
+        }
+        else {
+            return literalArr(deps.map(compileDependency));
+        }
+    }
+    function compileDependency(dep) {
+        const depMeta = new DefinitionMap();
+        depMeta.set('token', dep.token);
+        if (dep.attributeNameType !== null) {
+            depMeta.set('attribute', literal$1(true));
+        }
+        if (dep.host) {
+            depMeta.set('host', literal$1(true));
+        }
+        if (dep.optional) {
+            depMeta.set('optional', literal$1(true));
+        }
+        if (dep.self) {
+            depMeta.set('self', literal$1(true));
+        }
+        if (dep.skipSelf) {
+            depMeta.set('skipSelf', literal$1(true));
+        }
+        return depMeta.toLiteralMap();
+    }
+
     /**
      * @license
      * Copyright Google LLC All Rights Reserved.
@@ -20731,7 +20761,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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         // e.g. `type: MyDirective`
         definitionMap.set('type', meta.internalType);
         // e.g. `selector: 'some-dir'`
@@ -20770,7 +20800,8 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         if (query.first) {
             meta.set('first', literal$1(true));
         }
-        meta.set('predicate', Array.isArray(query.predicate) ? asLiteral(query.predicate) : query.predicate);
+        meta.set('predicate', Array.isArray(query.predicate) ? asLiteral(query.predicate) :
+            convertFromMaybeForwardRefExpression(query.predicate));
         if (!query.emitDistinctChangesOnly) {
             // `emitDistinctChangesOnly` is special because we expect it to be `true`.
             // Therefore we explicitly emit the field, and explicitly place it only when it's `false`.
@@ -20948,7 +20979,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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         definitionMap.set('deps', compileDependencies(meta.deps));
@@ -20990,24 +21021,24 @@ 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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         // Only generate providedIn property if it has a non-null value
         if (meta.providedIn !== undefined) {
-            const providedIn = convertFromProviderExpression(meta.providedIn);
+            const providedIn = convertFromMaybeForwardRefExpression(meta.providedIn);
             if (providedIn.value !== null) {
                 definitionMap.set('providedIn', providedIn);
             }
         }
         if (meta.useClass !== undefined) {
-            definitionMap.set('useClass', convertFromProviderExpression(meta.useClass));
+            definitionMap.set('useClass', convertFromMaybeForwardRefExpression(meta.useClass));
         }
         if (meta.useExisting !== undefined) {
-            definitionMap.set('useExisting', convertFromProviderExpression(meta.useExisting));
+            definitionMap.set('useExisting', convertFromMaybeForwardRefExpression(meta.useExisting));
         }
         if (meta.useValue !== undefined) {
-            definitionMap.set('useValue', convertFromProviderExpression(meta.useValue));
+            definitionMap.set('useValue', convertFromMaybeForwardRefExpression(meta.useValue));
         }
         // Factories do not contain `ForwardRef`s since any types are already wrapped in a function call
         // so the types will not be eagerly evaluated. Therefore we do not need to process this expression
@@ -21020,27 +21051,6 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'os', 'typescript', 'fs', '
         }
         return definitionMap;
     }
-    /**
-     * Convert an `R3ProviderExpression` to an `Expression`, possibly wrapping its expression in a
-     * `forwardRef()` call.
-     *
-     * If `R3ProviderExpression.isForwardRef` is true then the expression was originally wrapped in a
-     * `forwardRef()` call to prevent the value from being eagerly evaluated in the code.
-     *
-     * Normally, the linker will statically process the code, putting the `expression` inside a factory
-     * function so the `forwardRef()` wrapper is not evaluated before it has been defined. But if the
-     * partial declaration is evaluated by the JIT compiler the `forwardRef()` call is still needed to
-     * prevent eager evaluation of the `expression`.
-     *
-     * So in partial declarations, expressions that could be forward-refs are wrapped in `forwardRef()`
-     * calls, and this is then unwrapped in the linker as necessary.
-     *
-     * See `packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts` and
-     * `packages/compiler/src/jit_compiler_facade.ts` for more information.
-     */
-    function convertFromProviderExpression({ expression, isForwardRef }) {
-        return isForwardRef ? generateForwardRef(expression) : expression;
-    }
 
     /**
      * @license
@@ -21069,7 +21079,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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         definitionMap.set('type', meta.internalType);
         definitionMap.set('providers', meta.providers);
@@ -21106,7 +21116,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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         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.
@@ -21164,7 +21174,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.0'));
+        definitionMap.set('version', literal$1('13.0.1'));
         definitionMap.set('ngImport', importExpr(Identifiers$1.core));
         // e.g. `type: MyPipe`
         definitionMap.set('type', meta.internalType);
@@ -21196,7 +21206,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.0');
+    new Version('13.0.1');
 
     /**
      * @license
@@ -29445,7 +29455,8 @@ Either add the @Injectable() decorator to '${provider.node.name
             throw new FatalDiagnosticError(ErrorCode.DECORATOR_ARITY_WRONG, exprNode, `@${name} must have arguments`);
         }
         const first = name === 'ViewChild' || name === 'ContentChild';
-        const node = tryUnwrapForwardRef(args[0], reflector) ?? args[0];
+        const forwardReferenceTarget = tryUnwrapForwardRef(args[0], reflector);
+        const node = forwardReferenceTarget ?? args[0];
         const arg = evaluator.evaluate(node);
         /** Whether or not this query should collect only static results (see view/api.ts)  */
         let isStatic = false;
@@ -29453,7 +29464,7 @@ Either add the @Injectable() decorator to '${provider.node.name
         let predicate = null;
         if (arg instanceof Reference || arg instanceof DynamicValue) {
             // References and predicates that could not be evaluated statically are emitted as is.
-            predicate = new WrappedNodeExpr(node);
+            predicate = createMayBeForwardRefExpression(new WrappedNodeExpr(node), forwardReferenceTarget !== null ? 2 /* Unwrapped */ : 0 /* None */);
         }
         else if (typeof arg === 'string') {
             predicate = [arg];
@@ -31519,7 +31530,7 @@ Either add the @Injectable() decorator to '${provider.node.name
                 type,
                 typeArgumentCount,
                 internalType,
-                providedIn: createR3ProviderExpression(new LiteralExpr(null), false),
+                providedIn: createMayBeForwardRefExpression(new LiteralExpr(null), 0 /* None */),
             };
         }
         else if (decorator.args.length === 1) {
@@ -31534,7 +31545,7 @@ Either add the @Injectable() decorator to '${provider.node.name
             const meta = reflectObjectLiteral(metaNode);
             const providedIn = meta.has('providedIn') ?
                 getProviderExpression(meta.get('providedIn'), reflector) :
-                createR3ProviderExpression(new LiteralExpr(null), false);
+                createMayBeForwardRefExpression(new LiteralExpr(null), 0 /* None */);
             let deps = undefined;
             if ((meta.has('useClass') || meta.has('useFactory')) && meta.has('deps')) {
                 const depsExpr = meta.get('deps');
@@ -31573,7 +31584,7 @@ Either add the @Injectable() decorator to '${provider.node.name
      */
     function getProviderExpression(expression, reflector) {
         const forwardRefValue = tryUnwrapForwardRef(expression, reflector);
-        return createR3ProviderExpression(new WrappedNodeExpr(forwardRefValue ?? expression), forwardRefValue !== null);
+        return createMayBeForwardRefExpression(new WrappedNodeExpr(forwardRefValue ?? expression), forwardRefValue !== null ? 2 /* Unwrapped */ : 0 /* None */);
     }
     function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, strictCtorDeps) {
         if (decorator.args === null) {
@@ -37232,17 +37243,7 @@ Either add the @Injectable() decorator to '${provider.node.name
             const inputs = getBoundInputs(this.dir, this.node, this.tcb);
             for (const input of inputs) {
                 // For bound inputs, the property is assigned the binding expression.
-                let expr = translateInput(input.attribute, this.tcb, this.scope);
-                if (!this.tcb.env.config.checkTypeOfInputBindings) {
-                    // If checking the type of bindings is disabled, cast the resulting expression to 'any'
-                    // before the assignment.
-                    expr = tsCastToAny(expr);
-                }
-                else if (!this.tcb.env.config.strictNullInputBindings) {
-                    // If strict null checks are disabled, erase `null` and `undefined` from the type by
-                    // wrapping the expression in a non-null assertion.
-                    expr = ts__default["default"].createNonNullExpression(expr);
-                }
+                const expr = widenBinding(translateInput(input.attribute, this.tcb, this.scope), this.tcb);
                 let assignment = wrapForDiagnostics(expr);
                 for (const fieldName of input.fieldNames) {
                     let target;
@@ -37431,17 +37432,7 @@ Either add the @Injectable() decorator to '${provider.node.name
                     // Skip this binding as it was claimed by a directive.
                     continue;
                 }
-                let expr = tcbExpression(binding.value, this.tcb, this.scope);
-                if (!this.tcb.env.config.checkTypeOfInputBindings) {
-                    // If checking the type of bindings is disabled, cast the resulting expression to 'any'
-                    // before the assignment.
-                    expr = tsCastToAny(expr);
-                }
-                else if (!this.tcb.env.config.strictNullInputBindings) {
-                    // If strict null checks are disabled, erase `null` and `undefined` from the type by
-                    // wrapping the expression in a non-null assertion.
-                    expr = ts__default["default"].createNonNullExpression(expr);
-                }
+                const expr = widenBinding(tcbExpression(binding.value, this.tcb, this.scope), this.tcb);
                 if (this.tcb.env.config.checkTypeOfDomBindings && binding.type === 0 /* Property */) {
                     if (binding.name !== 'style' && binding.name !== 'class') {
                         if (elId === null) {
@@ -38255,17 +38246,7 @@ Either add the @Injectable() decorator to '${provider.node.name
             const propertyName = ts__default["default"].createStringLiteral(input.field);
             if (input.type === 'binding') {
                 // For bound inputs, the property is assigned the binding expression.
-                let expr = input.expression;
-                if (!tcb.env.config.checkTypeOfInputBindings) {
-                    // If checking the type of bindings is disabled, cast the resulting expression to 'any'
-                    // before the assignment.
-                    expr = tsCastToAny(expr);
-                }
-                else if (!tcb.env.config.strictNullInputBindings) {
-                    // If strict null checks are disabled, erase `null` and `undefined` from the type by
-                    // wrapping the expression in a non-null assertion.
-                    expr = ts__default["default"].createNonNullExpression(expr);
-                }
+                const expr = widenBinding(input.expression, tcb);
                 const assignment = ts__default["default"].createPropertyAssignment(propertyName, wrapForDiagnostics(expr));
                 addParseSpanInfo(assignment, input.sourceSpan);
                 return assignment;
@@ -38318,6 +38299,33 @@ Either add the @Injectable() decorator to '${provider.node.name
             return ts__default["default"].createStringLiteral(attr.value);
         }
     }
+    /**
+     * Potentially widens the type of `expr` according to the type-checking configuration.
+     */
+    function widenBinding(expr, tcb) {
+        if (!tcb.env.config.checkTypeOfInputBindings) {
+            // If checking the type of bindings is disabled, cast the resulting expression to 'any'
+            // before the assignment.
+            return tsCastToAny(expr);
+        }
+        else if (!tcb.env.config.strictNullInputBindings) {
+            if (ts__default["default"].isObjectLiteralExpression(expr) || ts__default["default"].isArrayLiteralExpression(expr)) {
+                // Object literals and array literals should not be wrapped in non-null assertions as that
+                // would cause literals to be prematurely widened, resulting in type errors when assigning
+                // into a literal type.
+                return expr;
+            }
+            else {
+                // If strict null checks are disabled, erase `null` and `undefined` from the type by
+                // wrapping the expression in a non-null assertion.
+                return ts__default["default"].createNonNullExpression(expr);
+            }
+        }
+        else {
+            // No widening is requested, use the expression as is.
+            return expr;
+        }
+    }
     const EVENT_PARAMETER = '$event';
     /**
      * Creates an arrow function to be used as handler function for event bindings. The handler
@@ -45348,7 +45356,7 @@ https://angular.io/guide/ivy for more information.
             if (scriptInfo.scriptKind === ts__namespace.ScriptKind.External) {
                 // script info for typecheck file is marked as external, see
                 // getOrCreateTypeCheckScriptInfo() in
-                // packages/language-service/ivy/language_service.ts
+                // packages/language-service/src/language_service.ts
                 typecheckFiles.push(scriptInfo.fileName);
             }
         }