static-injector 1.0.10 → 2.0.0

package/transform/compiler-cli/src/ngtsc/annotations/{src → common/src}/util.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -26,11 +30,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toFactoryMetadata = exports.wrapTypeReference = exports.wrapFunctionExpressionsInParens = exports.tryUnwrapForwardRef = exports.unwrapExpression = exports.isAngularDecorator = exports.findAngularDecorator = exports.isAngularCore = exports.validateConstructorDependencies = exports.getValidConstructorDependencies = exports.unwrapConstructorDependencies = exports.valueReferenceToExpression = exports.getConstructorDependencies = void 0;
-const compiler_1 = require("../../../../../compiler");
+exports.isAbstractClassDeclaration = exports.toFactoryMetadata = exports.wrapTypeReference = exports.wrapFunctionExpressionsInParens = exports.tryUnwrapForwardRef = exports.unwrapExpression = exports.isAngularDecorator = exports.findAngularDecorator = exports.isAngularCore = exports.validateConstructorDependencies = exports.getValidConstructorDependencies = exports.unwrapConstructorDependencies = exports.valueReferenceToExpression = exports.getConstructorDependencies = void 0;
+const compiler_1 = require("../../../../../../compiler");
 const ts = __importStar(require("typescript"));
-const diagnostics_1 = require("../../diagnostics");
-const reflection_1 = require("../../reflection");
+const diagnostics_1 = require("../../../diagnostics");
+const reflection_1 = require("../../../reflection");
 function getConstructorDependencies(clazz, reflector, isCore) {
     const deps = [];
     const errors = [];
@@ -71,7 +75,7 @@ function getConstructorDependencies(clazz, reflector, isCore) {
             }
         });
         if (token === null) {
-            if (param.typeValueReference.kind !== 2 /* UNAVAILABLE */) {
+            if (param.typeValueReference.kind !== 2 /* TypeValueReferenceKind.UNAVAILABLE */) {
                 throw new Error('Illegal state: expected value reference to be unavailable if no token is present');
             }
             errors.push({
@@ -93,10 +97,10 @@ function getConstructorDependencies(clazz, reflector, isCore) {
 }
 exports.getConstructorDependencies = getConstructorDependencies;
 function valueReferenceToExpression(valueRef) {
-    if (valueRef.kind === 2 /* UNAVAILABLE */) {
+    if (valueRef.kind === 2 /* TypeValueReferenceKind.UNAVAILABLE */) {
         return null;
     }
-    else if (valueRef.kind === 0 /* LOCAL */) {
+    else if (valueRef.kind === 0 /* TypeValueReferenceKind.LOCAL */) {
         const expr = new compiler_1.WrappedNodeExpr(valueRef.expression);
         return expr;
     }
@@ -170,46 +174,46 @@ function createUnsuitableInjectionTokenError(clazz, error) {
     let chainMessage = undefined;
     let hints = undefined;
     switch (reason.kind) {
-        case 5 /* UNSUPPORTED */:
+        case 5 /* ValueUnavailableKind.UNSUPPORTED */:
             chainMessage =
                 'Consider using the @Inject decorator to specify an injection token.';
             hints = [
-                diagnostics_1.makeRelatedInformation(reason.typeNode, 'This type is not supported as injection token.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.typeNode, 'This type is not supported as injection token.'),
             ];
             break;
-        case 1 /* NO_VALUE_DECLARATION */:
+        case 1 /* ValueUnavailableKind.NO_VALUE_DECLARATION */:
             chainMessage =
                 'Consider using the @Inject decorator to specify an injection token.';
             hints = [
-                diagnostics_1.makeRelatedInformation(reason.typeNode, 'This type does not have a value, so it cannot be used as injection token.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.typeNode, 'This type does not have a value, so it cannot be used as injection token.'),
             ];
             if (reason.decl !== null) {
-                hints.push(diagnostics_1.makeRelatedInformation(reason.decl, 'The type is declared here.'));
+                hints.push((0, diagnostics_1.makeRelatedInformation)(reason.decl, 'The type is declared here.'));
             }
             break;
-        case 2 /* TYPE_ONLY_IMPORT */:
+        case 2 /* ValueUnavailableKind.TYPE_ONLY_IMPORT */:
             chainMessage =
                 'Consider changing the type-only import to a regular import, or use the @Inject decorator to specify an injection token.';
             hints = [
-                diagnostics_1.makeRelatedInformation(reason.typeNode, 'This type is imported using a type-only import, which prevents it from being usable as an injection token.'),
-                diagnostics_1.makeRelatedInformation(reason.importClause, 'The type-only import occurs here.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.typeNode, 'This type is imported using a type-only import, which prevents it from being usable as an injection token.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.node, 'The type-only import occurs here.'),
             ];
             break;
-        case 4 /* NAMESPACE */:
+        case 4 /* ValueUnavailableKind.NAMESPACE */:
             chainMessage =
                 'Consider using the @Inject decorator to specify an injection token.';
             hints = [
-                diagnostics_1.makeRelatedInformation(reason.typeNode, 'This type corresponds with a namespace, which cannot be used as injection token.'),
-                diagnostics_1.makeRelatedInformation(reason.importClause, 'The namespace import occurs here.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.typeNode, 'This type corresponds with a namespace, which cannot be used as injection token.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.importClause, 'The namespace import occurs here.'),
             ];
             break;
-        case 3 /* UNKNOWN_REFERENCE */:
+        case 3 /* ValueUnavailableKind.UNKNOWN_REFERENCE */:
             chainMessage = 'The type should reference a known declaration.';
             hints = [
-                diagnostics_1.makeRelatedInformation(reason.typeNode, 'This type could not be resolved.'),
+                (0, diagnostics_1.makeRelatedInformation)(reason.typeNode, 'This type could not be resolved.'),
             ];
             break;
-        case 0 /* MISSING_TYPE */:
+        case 0 /* ValueUnavailableKind.MISSING_TYPE */:
             chainMessage =
                 'Consider adding a type to the parameter or use the @Inject decorator to specify an injection token.';
             break;
@@ -351,7 +355,7 @@ exports.wrapFunctionExpressionsInParens = wrapFunctionExpressionsInParens;
 function wrapTypeReference(reflector, clazz) {
     const dtsClass = reflector.getDtsDeclaration(clazz);
     const value = new compiler_1.WrappedNodeExpr(clazz.name);
-    const type = dtsClass !== null && reflection_1.isNamedClassDeclaration(dtsClass)
+    const type = dtsClass !== null && (0, reflection_1.isNamedClassDeclaration)(dtsClass)
         ? new compiler_1.WrappedNodeExpr(dtsClass.name)
         : value;
     return { value, type };
@@ -368,3 +372,8 @@ function toFactoryMetadata(meta, target) {
     };
 }
 exports.toFactoryMetadata = toFactoryMetadata;
+function isAbstractClassDeclaration(clazz) {
+    return (clazz.modifiers !== undefined &&
+        clazz.modifiers.some((mod) => mod.kind === ts.SyntaxKind.AbstractKeyword));
+}
+exports.isAbstractClassDeclaration = isAbstractClassDeclaration;

package/transform/compiler-cli/src/ngtsc/annotations/src/factory.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileNgFactoryDefField = void 0;
 const compiler_1 = require("../../../../../compiler");
 function compileNgFactoryDefField(metadata) {
-    const res = compiler_1.compileFactoryFunction(metadata);
+    const res = (0, compiler_1.compileFactoryFunction)(metadata);
     return {
         name: "ɵfac",
         initializer: res.expression,

package/transform/compiler-cli/src/ngtsc/annotations/src/injectable.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -32,7 +36,8 @@ const ts = __importStar(require("typescript"));
 const diagnostics_1 = require("../../diagnostics");
 const reflection_1 = require("../../reflection");
 const factory_1 = require("./factory");
-const util_1 = require("./util");
+const util_1 = require("../common/src/util");
+const util_2 = require("../common/src/util");
 /**
  * Adapts the `compileInjectable` compiler for `@Injectable` decorators to the Ivy compiler.
  */
@@ -54,7 +59,7 @@ class InjectableDecoratorHandler {
         if (!decorators) {
             return undefined;
         }
-        const decorator = util_1.findAngularDecorator(decorators, 'Injectable', this.isCore);
+        const decorator = (0, util_1.findAngularDecorator)(decorators, 'Injectable', this.isCore);
         if (decorator !== undefined) {
             return {
                 trigger: decorator.node,
@@ -78,12 +83,12 @@ class InjectableDecoratorHandler {
         };
     }
     compileFull(node, analysis) {
-        return this.compile(factory_1.compileNgFactoryDefField, (meta) => compiler_1.compileInjectable(meta, false), node, analysis);
+        return this.compile(factory_1.compileNgFactoryDefField, (meta) => (0, compiler_1.compileInjectable)(meta, false), node, analysis);
     }
     compile(compileFactoryFn, compileInjectableFn, node, analysis) {
         const results = [];
         const meta = analysis.meta;
-        const factoryRes = compileFactoryFn(util_1.toFactoryMetadata(Object.assign(Object.assign({}, meta), { deps: analysis.ctorDeps }), compiler_1.FactoryTarget.Injectable));
+        const factoryRes = compileFactoryFn((0, util_1.toFactoryMetadata)(Object.assign(Object.assign({}, meta), { deps: analysis.ctorDeps }), compiler_1.FactoryTarget.Injectable));
         results.push(factoryRes);
         const ɵprov = this.reflector
             .getMembersOfClass(node)
@@ -113,7 +118,7 @@ exports.InjectableDecoratorHandler = InjectableDecoratorHandler;
  */
 function extractInjectableMetadata(clazz, decorator, reflector) {
     const name = clazz.name.text;
-    const type = util_1.wrapTypeReference(reflector, clazz);
+    const type = (0, util_1.wrapTypeReference)(reflector, clazz);
     const internalType = new compiler_1.WrappedNodeExpr(reflector.getInternalNameOfClass(clazz));
     const typeArgumentCount = reflector.getGenericArityOfClass(clazz) || 0;
     if (decorator.args === null) {
@@ -125,7 +130,7 @@ function extractInjectableMetadata(clazz, decorator, reflector) {
             type,
             typeArgumentCount,
             internalType,
-            providedIn: compiler_1.createR3ProviderExpression(new compiler_1.LiteralExpr(null), false),
+            providedIn: (0, compiler_1.createMayBeForwardRefExpression)(new compiler_1.LiteralExpr(null), 0 /* ForwardRefHandling.None */),
         };
     }
     else if (decorator.args.length === 1) {
@@ -137,10 +142,10 @@ function extractInjectableMetadata(clazz, decorator, reflector) {
             throw new diagnostics_1.FatalDiagnosticError(diagnostics_1.ErrorCode.DECORATOR_ARG_NOT_LITERAL, metaNode, `@Injectable argument must be an object literal`);
         }
         // Resolve the fields of the literal into a map of field name to expression.
-        const meta = reflection_1.reflectObjectLiteral(metaNode);
+        const meta = (0, reflection_1.reflectObjectLiteral)(metaNode);
         const providedIn = meta.has('providedIn')
             ? getProviderExpression(meta.get('providedIn'), reflector)
-            : compiler_1.createR3ProviderExpression(new compiler_1.LiteralExpr(null), false);
+            : (0, compiler_1.createMayBeForwardRefExpression)(new compiler_1.LiteralExpr(null), 0 /* ForwardRefHandling.None */);
         let deps = undefined;
         if ((meta.has('useClass') || meta.has('useFactory')) && meta.has('deps')) {
             const depsExpr = meta.get('deps');
@@ -184,8 +189,10 @@ function extractInjectableMetadata(clazz, decorator, reflector) {
  * object to indicate whether the value needed unwrapping.
  */
 function getProviderExpression(expression, reflector) {
-    const forwardRefValue = util_1.tryUnwrapForwardRef(expression, reflector);
-    return compiler_1.createR3ProviderExpression(new compiler_1.WrappedNodeExpr(forwardRefValue !== null && forwardRefValue !== void 0 ? forwardRefValue : expression), forwardRefValue !== null);
+    const forwardRefValue = (0, util_1.tryUnwrapForwardRef)(expression, reflector);
+    return (0, compiler_1.createMayBeForwardRefExpression)(new compiler_1.WrappedNodeExpr(forwardRefValue !== null && forwardRefValue !== void 0 ? forwardRefValue : expression), forwardRefValue !== null
+        ? 2 /* ForwardRefHandling.Unwrapped */
+        : 0 /* ForwardRefHandling.None */);
 }
 function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, strictCtorDeps) {
     if (decorator.args === null) {
@@ -202,29 +209,34 @@ function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, st
         // constructor signature does not work for DI then a factory definition (ɵfac) that throws is
         // generated.
         if (strictCtorDeps) {
-            ctorDeps = util_1.getValidConstructorDependencies(clazz, reflector, isCore);
+            ctorDeps = (0, util_1.getValidConstructorDependencies)(clazz, reflector, isCore);
         }
         else {
-            ctorDeps = util_1.unwrapConstructorDependencies(util_1.getConstructorDependencies(clazz, reflector, isCore));
+            ctorDeps = (0, util_1.unwrapConstructorDependencies)((0, util_1.getConstructorDependencies)(clazz, reflector, isCore));
         }
         return ctorDeps;
     }
     else if (decorator.args.length === 1) {
-        const rawCtorDeps = util_1.getConstructorDependencies(clazz, reflector, isCore);
+        const rawCtorDeps = (0, util_1.getConstructorDependencies)(clazz, reflector, isCore);
         if (strictCtorDeps &&
-            meta.useValue === undefined &&
-            meta.useExisting === undefined &&
-            meta.useClass === undefined &&
-            meta.useFactory === undefined) {
-            // Since use* was not provided, validate the deps according to strictCtorDeps.
-            ctorDeps = util_1.validateConstructorDependencies(clazz, rawCtorDeps);
+            !(0, util_2.isAbstractClassDeclaration)(clazz) &&
+            requiresValidCtor(meta)) {
+            // Since use* was not provided for a concrete class, validate the deps according to
+            // strictCtorDeps.
+            ctorDeps = (0, util_1.validateConstructorDependencies)(clazz, rawCtorDeps);
         }
         else {
-            ctorDeps = util_1.unwrapConstructorDependencies(rawCtorDeps);
+            ctorDeps = (0, util_1.unwrapConstructorDependencies)(rawCtorDeps);
         }
     }
     return ctorDeps;
 }
+function requiresValidCtor(meta) {
+    return (meta.useValue === undefined &&
+        meta.useExisting === undefined &&
+        meta.useClass === undefined &&
+        meta.useFactory === undefined);
+}
 function getDep(dep, reflector) {
     const meta = {
         token: new compiler_1.WrappedNodeExpr(dep),

package/transform/compiler-cli/src/ngtsc/diagnostics/error.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -49,7 +53,7 @@ function makeDiagnostic(code, node, messageText, relatedInformation) {
     node = ts.getOriginalNode(node);
     return {
         category: ts.DiagnosticCategory.Error,
-        code: error_code_1.ngErrorCode(code),
+        code: (0, error_code_1.ngErrorCode)(code),
         file: ts.getOriginalNode(node).getSourceFile(),
         start: node.getStart(undefined, false),
         length: node.getWidth(),

package/transform/compiler-cli/src/ngtsc/diagnostics/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/transform/compiler-cli/src/ngtsc/imports/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/transform/compiler-cli/src/ngtsc/reflection/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/transform/compiler-cli/src/ngtsc/reflection/src/host.d.ts

@@ -290,7 +290,7 @@ export interface NoValueDeclaration {
 export interface TypeOnlyImport {
     kind: ValueUnavailableKind.TYPE_ONLY_IMPORT;
     typeNode: ts.TypeNode;
-    importClause: ts.ImportClause;
+    node: ts.ImportClause | ts.ImportSpecifier;
 }
 export interface NamespaceImport {
     kind: ValueUnavailableKind.NAMESPACE;

package/transform/compiler-cli/src/ngtsc/reflection/src/host.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -93,6 +97,6 @@ var KnownDeclaration;
  * `ts.Declaration`).
  */
 function isConcreteDeclaration(decl) {
-    return decl.kind === 0 /* Concrete */;
+    return decl.kind === 0 /* DeclarationKind.Concrete */;
 }
 exports.isConcreteDeclaration = isConcreteDeclaration;

package/transform/compiler-cli/src/ngtsc/reflection/src/type_to_value.d.ts

@@ -5,8 +5,8 @@
  * 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
  */
-import * as ts from "typescript";
-import { TypeValueReference } from "./host";
+import * as ts from 'typescript';
+import { TypeValueReference } from './host';
 /**
  * Potentially convert a `ts.TypeNode` to a `TypeValueReference`, which indicates how to use the
  * type given in the `ts.TypeNode` in a value position.

package/transform/compiler-cli/src/ngtsc/reflection/src/type_to_value.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -73,7 +77,7 @@ function typeToValue(typeNode, checker) {
                 return typeOnlyImport(typeNode, firstDecl);
             }
             return {
-                kind: 0 /* LOCAL */,
+                kind: 0 /* TypeValueReferenceKind.LOCAL */,
                 expression: firstDecl.name,
                 defaultImportStatement: firstDecl.parent,
             };
@@ -83,8 +87,13 @@ function typeToValue(typeNode, checker) {
             //   import {Foo} from 'foo';
             // or
             //   import {Foo as Bar} from 'foo';
+            if (firstDecl.isTypeOnly) {
+                // The import specifier can't be type-only (e.g. `import {type Foo} from '...')`.
+                return typeOnlyImport(typeNode, firstDecl);
+            }
             if (firstDecl.parent.parent.isTypeOnly) {
-                // Type-only imports cannot be represented as value.
+                // The import specifier can't be inside a type-only import clause
+                // (e.g. `import type {Foo} from '...')`.
                 return typeOnlyImport(typeNode, firstDecl.parent.parent);
             }
             // Determine the name to import (`Foo`) from the import specifier, as the symbol names of
@@ -95,7 +104,7 @@ function typeToValue(typeNode, checker) {
             const [_localName, ...nestedPath] = symbols.symbolNames;
             const moduleName = extractModuleName(firstDecl.parent.parent.parent);
             return {
-                kind: 1 /* IMPORTED */,
+                kind: 1 /* TypeValueReferenceKind.IMPORTED */,
                 valueDeclaration: decl.valueDeclaration,
                 moduleName,
                 importedName,
@@ -119,7 +128,7 @@ function typeToValue(typeNode, checker) {
             const [_ns, importedName, ...nestedPath] = symbols.symbolNames;
             const moduleName = extractModuleName(firstDecl.parent.parent);
             return {
-                kind: 1 /* IMPORTED */,
+                kind: 1 /* TypeValueReferenceKind.IMPORTED */,
                 valueDeclaration: decl.valueDeclaration,
                 moduleName,
                 importedName,
@@ -131,7 +140,7 @@ function typeToValue(typeNode, checker) {
     const expression = typeNodeToValueExpr(typeNode);
     if (expression !== null) {
         return {
-            kind: 0 /* LOCAL */,
+            kind: 0 /* TypeValueReferenceKind.LOCAL */,
             expression,
             defaultImportStatement: null,
         };
@@ -143,42 +152,42 @@ function typeToValue(typeNode, checker) {
 exports.typeToValue = typeToValue;
 function unsupportedType(typeNode) {
     return {
-        kind: 2 /* UNAVAILABLE */,
-        reason: { kind: 5 /* UNSUPPORTED */, typeNode },
+        kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
+        reason: { kind: 5 /* ValueUnavailableKind.UNSUPPORTED */, typeNode },
     };
 }
 function noValueDeclaration(typeNode, decl) {
     return {
-        kind: 2 /* UNAVAILABLE */,
-        reason: { kind: 1 /* NO_VALUE_DECLARATION */, typeNode, decl },
+        kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
+        reason: { kind: 1 /* ValueUnavailableKind.NO_VALUE_DECLARATION */, typeNode, decl },
     };
 }
-function typeOnlyImport(typeNode, importClause) {
+function typeOnlyImport(typeNode, node) {
     return {
-        kind: 2 /* UNAVAILABLE */,
+        kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
         reason: {
-            kind: 2 /* TYPE_ONLY_IMPORT */,
+            kind: 2 /* ValueUnavailableKind.TYPE_ONLY_IMPORT */,
             typeNode,
-            importClause,
+            node: node,
         },
     };
 }
 function unknownReference(typeNode) {
     return {
-        kind: 2 /* UNAVAILABLE */,
-        reason: { kind: 3 /* UNKNOWN_REFERENCE */, typeNode },
+        kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
+        reason: { kind: 3 /* ValueUnavailableKind.UNKNOWN_REFERENCE */, typeNode },
     };
 }
 function namespaceImport(typeNode, importClause) {
     return {
-        kind: 2 /* UNAVAILABLE */,
-        reason: { kind: 4 /* NAMESPACE */, typeNode, importClause },
+        kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
+        reason: { kind: 4 /* ValueUnavailableKind.NAMESPACE */, typeNode, importClause },
     };
 }
 function missingType() {
     return {
-        kind: 2 /* UNAVAILABLE */,
-        reason: { kind: 0 /* MISSING_TYPE */ },
+        kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
+        reason: { kind: 0 /* ValueUnavailableKind.MISSING_TYPE */ },
     };
 }
 /**
@@ -254,10 +263,14 @@ function resolveTypeSymbols(typeRef, checker) {
 function entityNameToValue(node) {
     if (ts.isQualifiedName(node)) {
         const left = entityNameToValue(node.left);
-        return left !== null ? ts.createPropertyAccess(left, node.right) : null;
+        return left !== null
+            ? ts.factory.createPropertyAccessExpression(left, node.right)
+            : null;
     }
     else if (ts.isIdentifier(node)) {
-        return ts.getMutableClone(node);
+        const clone = ts.setOriginalNode(ts.factory.createIdentifier(node.text), node);
+        clone.parent = node.parent;
+        return clone;
     }
     else {
         return null;
@@ -265,7 +278,7 @@ function entityNameToValue(node) {
 }
 function extractModuleName(node) {
     if (!ts.isStringLiteral(node.moduleSpecifier)) {
-        throw new Error("not a module specifier");
+        throw new Error('not a module specifier');
     }
     return node.moduleSpecifier.text;
 }

package/transform/compiler-cli/src/ngtsc/reflection/src/typescript.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -28,6 +32,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reflectObjectLiteral = exports.TypeScriptReflectionHost = void 0;
 const ts = __importStar(require("typescript"));
+const ts_compatibility_1 = require("../../ts_compatibility");
 const host_1 = require("./host");
 const type_to_value_1 = require("./type_to_value");
 const util_1 = require("./util");
@@ -39,13 +44,12 @@ class TypeScriptReflectionHost {
         this.checker = checker;
     }
     getDecoratorsOfDeclaration(declaration) {
-        if (declaration.decorators === undefined ||
-            declaration.decorators.length === 0) {
-            return null;
-        }
-        return declaration.decorators
-            .map((decorator) => this._reflectDecorator(decorator))
-            .filter((dec) => dec !== null);
+        const decorators = (0, ts_compatibility_1.getDecorators)(declaration);
+        return decorators !== undefined && decorators.length
+            ? decorators
+                .map((decorator) => this._reflectDecorator(decorator))
+                .filter((dec) => dec !== null)
+            : null;
     }
     getMembersOfClass(clazz) {
         const tsClazz = castDeclarationToClassOrDie(clazz);
@@ -84,7 +88,7 @@ class TypeScriptReflectionHost {
                     typeNode = childTypeNodes[0];
                 }
             }
-            const typeValueReference = type_to_value_1.typeToValue(typeNode, this.checker);
+            const typeValueReference = (0, type_to_value_1.typeToValue)(typeNode, this.checker);
             return {
                 name,
                 nameNode: node.name,
@@ -113,7 +117,7 @@ class TypeScriptReflectionHost {
     isClass(node) {
         // For our purposes, classes are "named" ts.ClassDeclarations;
         // (`node.name` can be undefined in unnamed default exports: `default export class { ... }`).
-        return util_1.isNamedClassDeclaration(node);
+        return (0, util_1.isNamedClassDeclaration)(node);
     }
     hasBaseClass(clazz) {
         return this.getBaseClassExpression(clazz) !== null;
@@ -232,7 +236,7 @@ class TypeScriptReflectionHost {
         }
         // The final resolved decorator should be a `ts.Identifier` - if it's not, then something is
         // wrong and the decorator can't be resolved statically.
-        if (!host_1.isDecoratorIdentifier(decoratorExpr)) {
+        if (!(0, host_1.isDecoratorIdentifier)(decoratorExpr)) {
             return null;
         }
         const decoratorIdentifier = ts.isIdentifier(decoratorExpr)
@@ -286,8 +290,9 @@ class TypeScriptReflectionHost {
             return null;
         }
         const decorators = this.getDecoratorsOfDeclaration(node);
-        const isStatic = node.modifiers !== undefined &&
-            node.modifiers.some((mod) => mod.kind === ts.SyntaxKind.StaticKeyword);
+        const modifiers = (0, ts_compatibility_1.getModifiers)(node);
+        const isStatic = modifiers !== undefined &&
+            modifiers.some((mod) => mod.kind === ts.SyntaxKind.StaticKeyword);
         return {
             node,
             implementation: node,

package/transform/compiler-cli/src/ngtsc/reflection/src/util.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/transform/compiler-cli/src/ngtsc/transform/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/transform/compiler-cli/src/ngtsc/transform/src/utils.d.ts

@@ -5,8 +5,8 @@
  * 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
  */
-import * as ts from "typescript";
-import { ImportManager } from "../../translator";
+import * as ts from 'typescript';
+import { ImportManager } from '../../translator';
 /**
  * Adds extra imports in the import manage for this source file, after the existing imports
  * and before the module body.