static-injector 2.0.0 → 2.1.0

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

@@ -5,12 +5,12 @@
  * 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 ts from 'typescript';
 /**
  * Metadata extracted from an instance of a decorator on another declaration, or synthesized from
  * other information about a class.
  */
-export declare type Decorator = ConcreteDecorator | SyntheticDecorator;
+export type Decorator = ConcreteDecorator | SyntheticDecorator;
 export interface BaseDecorator {
     /**
      * Name by which the decorator was invoked in the user's code.
@@ -68,12 +68,11 @@ export declare const Decorator: {
  * A decorator is identified by either a simple identifier (e.g. `Decorator`) or, in some cases,
  * a namespaced property access (e.g. `core.Decorator`).
  */
-export declare type DecoratorIdentifier = ts.Identifier | NamespacedIdentifier;
-export declare type NamespacedIdentifier = ts.PropertyAccessExpression & {
+export type DecoratorIdentifier = ts.Identifier | NamespacedIdentifier;
+export type NamespacedIdentifier = ts.PropertyAccessExpression & {
     expression: ts.Identifier;
     name: ts.Identifier;
 };
-/** 装饰器可能是 Injectable或者xx.Injectable */
 export declare function isDecoratorIdentifier(exp: ts.Expression): exp is DecoratorIdentifier;
 /**
  * The `ts.Declaration` of a "class".
@@ -90,7 +89,7 @@ export declare function isDecoratorIdentifier(exp: ts.Expression): exp is Decora
  * For `ReflectionHost` purposes, a class declaration should always have a `name` identifier,
  * because we need to be able to reference it in other parts of the program.
  */
-export declare type ClassDeclaration<T extends DeclarationNode = DeclarationNode> = T & {
+export type ClassDeclaration<T extends DeclarationNode = DeclarationNode> = T & {
     name: ts.Identifier;
 };
 /**
@@ -307,7 +306,7 @@ export interface MissingType {
 /**
  * The various reasons why a type node may not be referred to as a value.
  */
-export declare type UnavailableValue = UnsupportedType | NoValueDeclaration | TypeOnlyImport | NamespaceImport | UnknownReference | MissingType;
+export type UnavailableValue = UnsupportedType | NoValueDeclaration | TypeOnlyImport | NamespaceImport | UnknownReference | MissingType;
 /**
  * A reference to a value that originated from a type position.
  *
@@ -317,7 +316,7 @@ export declare type UnavailableValue = UnsupportedType | NoValueDeclaration | Ty
  *
  * See the individual types for additional information.
  */
-export declare type TypeValueReference = LocalTypeValueReference | ImportedTypeValueReference | UnavailableTypeValueReference;
+export type TypeValueReference = LocalTypeValueReference | ImportedTypeValueReference | UnavailableTypeValueReference;
 /**
  * A parameter to a constructor.
  */
@@ -441,7 +440,7 @@ export interface Import {
     /**
      * The module from which the symbol was imported.
      *
-     * This could either be an absolute module name (static-injector for example) or a relative path.
+     * This could either be an absolute module name (@angular/core for example) or a relative path.
      */
     from: string;
 }
@@ -470,7 +469,7 @@ export interface EnumMember {
  * An example of this is `exports.someVar = 42` where the declaration expression would be
  * `exports.someVar`.
  */
-export declare type DeclarationNode = ts.Declaration | ts.Expression;
+export type DeclarationNode = ts.Declaration | ts.Expression;
 /**
  * The type of a Declaration - whether its node is concrete (ts.Declaration) or inline
  * (ts.Expression). See `ConcreteDeclaration`, `InlineDeclaration` and `DeclarationNode` for more
@@ -516,7 +515,7 @@ export interface ConcreteDeclaration<T extends ts.Declaration = ts.Declaration>
      */
     identity: SpecialDeclarationIdentity | null;
 }
-export declare type SpecialDeclarationIdentity = DownleveledEnum;
+export type SpecialDeclarationIdentity = DownleveledEnum;
 export declare const enum SpecialDeclarationKind {
     DownleveledEnum = 0
 }
@@ -544,7 +543,7 @@ export interface InlineDeclaration extends BaseDeclaration<Exclude<DeclarationNo
  * The declaration of a symbol, along with information about how it was imported into the
  * application.
  */
-export declare type Declaration<T extends ts.Declaration = ts.Declaration> = ConcreteDeclaration<T> | InlineDeclaration;
+export type Declaration<T extends ts.Declaration = ts.Declaration> = ConcreteDeclaration<T> | InlineDeclaration;
 /**
  * Abstracts reflection operations on a TypeScript AST.
  *
@@ -599,7 +598,7 @@ export interface ReflectionHost {
      * Determine if an identifier was imported from another module and return `Import` metadata
      * describing its origin.
      *
-     * @param id a TypeScript `ts.Identifer` to reflect.
+     * @param id a TypeScript `ts.Identifier` to reflect.
      *
      * @returns metadata about the `Import` if the identifier was imported from another module, or
      * `null` if the identifier doesn't resolve to an import but instead is locally defined.

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

@@ -6,32 +6,12 @@
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isConcreteDeclaration = exports.KnownDeclaration = exports.ClassMemberKind = exports.isDecoratorIdentifier = exports.Decorator = void 0;
-const ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 exports.Decorator = {
     nodeForError: (decorator) => {
         if (decorator.node !== null) {
@@ -43,12 +23,11 @@ exports.Decorator = {
         }
     },
 };
-/** 装饰器可能是 Injectable或者xx.Injectable */
 function isDecoratorIdentifier(exp) {
-    return (ts.isIdentifier(exp) ||
-        (ts.isPropertyAccessExpression(exp) &&
-            ts.isIdentifier(exp.expression) &&
-            ts.isIdentifier(exp.name)));
+    return (typescript_1.default.isIdentifier(exp) ||
+        (typescript_1.default.isPropertyAccessExpression(exp) &&
+            typescript_1.default.isIdentifier(exp.expression) &&
+            typescript_1.default.isIdentifier(exp.name)));
 }
 exports.isDecoratorIdentifier = isDecoratorIdentifier;
 /**

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

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

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

@@ -6,32 +6,12 @@
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeNodeToValueExpr = exports.typeToValue = void 0;
-const ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 /**
  * Potentially convert a `ts.TypeNode` to a `TypeValueReference`, which indicates how to use the
  * type given in the `ts.TypeNode` in a value position.
@@ -44,7 +24,7 @@ function typeToValue(typeNode, checker) {
     if (typeNode === null) {
         return missingType();
     }
-    if (!ts.isTypeReferenceNode(typeNode)) {
+    if (!typescript_1.default.isTypeReferenceNode(typeNode)) {
         return unsupportedType(typeNode);
     }
     const symbols = resolveTypeSymbols(typeNode, checker);
@@ -56,7 +36,7 @@ function typeToValue(typeNode, checker) {
     // has a value declaration associated with it. Note that const enums are an exception,
     // because while they do have a value declaration, they don't exist at runtime.
     if (decl.valueDeclaration === undefined ||
-        decl.flags & ts.SymbolFlags.ConstEnum) {
+        decl.flags & typescript_1.default.SymbolFlags.ConstEnum) {
         let typeOnlyDecl = null;
         if (decl.declarations !== undefined && decl.declarations.length > 0) {
             typeOnlyDecl = decl.declarations[0];
@@ -69,7 +49,7 @@ function typeToValue(typeNode, checker) {
     // statement. If so, extract the module specifier and the name of the imported type.
     const firstDecl = local.declarations && local.declarations[0];
     if (firstDecl !== undefined) {
-        if (ts.isImportClause(firstDecl) && firstDecl.name !== undefined) {
+        if (typescript_1.default.isImportClause(firstDecl) && firstDecl.name !== undefined) {
             // This is a default import.
             //   import Foo from 'foo';
             if (firstDecl.isTypeOnly) {
@@ -82,7 +62,7 @@ function typeToValue(typeNode, checker) {
                 defaultImportStatement: firstDecl.parent,
             };
         }
-        else if (ts.isImportSpecifier(firstDecl)) {
+        else if (typescript_1.default.isImportSpecifier(firstDecl)) {
             // The symbol was imported by name
             //   import {Foo} from 'foo';
             // or
@@ -111,7 +91,7 @@ function typeToValue(typeNode, checker) {
                 nestedPath,
             };
         }
-        else if (ts.isNamespaceImport(firstDecl)) {
+        else if (typescript_1.default.isNamespaceImport(firstDecl)) {
             // The import is a namespace import
             //   import * as Foo from 'foo';
             if (firstDecl.parent.isTypeOnly) {
@@ -165,11 +145,7 @@ function noValueDeclaration(typeNode, decl) {
 function typeOnlyImport(typeNode, node) {
     return {
         kind: 2 /* TypeValueReferenceKind.UNAVAILABLE */,
-        reason: {
-            kind: 2 /* ValueUnavailableKind.TYPE_ONLY_IMPORT */,
-            typeNode,
-            node: node,
-        },
+        reason: { kind: 2 /* ValueUnavailableKind.TYPE_ONLY_IMPORT */, typeNode, node },
     };
 }
 function unknownReference(typeNode) {
@@ -197,7 +173,7 @@ function missingType() {
  * This will return `null` if an equivalent expression cannot be constructed.
  */
 function typeNodeToValueExpr(node) {
-    if (ts.isTypeReferenceNode(node)) {
+    if (typescript_1.default.isTypeReferenceNode(node)) {
         return entityNameToValue(node.typeName);
     }
     else {
@@ -242,7 +218,7 @@ function resolveTypeSymbols(typeRef, checker) {
     //   type is not qualified.
     let leftMost = typeName;
     const symbolNames = [];
-    while (ts.isQualifiedName(leftMost)) {
+    while (typescript_1.default.isQualifiedName(leftMost)) {
         symbolNames.unshift(leftMost.right.text);
         leftMost = leftMost.left;
     }
@@ -255,20 +231,20 @@ function resolveTypeSymbols(typeRef, checker) {
     }
     // De-alias the top-level type reference symbol to get the symbol of the actual declaration.
     let decl = typeRefSymbol;
-    if (typeRefSymbol.flags & ts.SymbolFlags.Alias) {
+    if (typeRefSymbol.flags & typescript_1.default.SymbolFlags.Alias) {
         decl = checker.getAliasedSymbol(typeRefSymbol);
     }
     return { local, decl, symbolNames };
 }
 function entityNameToValue(node) {
-    if (ts.isQualifiedName(node)) {
+    if (typescript_1.default.isQualifiedName(node)) {
         const left = entityNameToValue(node.left);
         return left !== null
-            ? ts.factory.createPropertyAccessExpression(left, node.right)
+            ? typescript_1.default.factory.createPropertyAccessExpression(left, node.right)
             : null;
     }
-    else if (ts.isIdentifier(node)) {
-        const clone = ts.setOriginalNode(ts.factory.createIdentifier(node.text), node);
+    else if (typescript_1.default.isIdentifier(node)) {
+        const clone = typescript_1.default.setOriginalNode(typescript_1.default.factory.createIdentifier(node.text), node);
         clone.parent = node.parent;
         return clone;
     }
@@ -277,7 +253,7 @@ function entityNameToValue(node) {
     }
 }
 function extractModuleName(node) {
-    if (!ts.isStringLiteral(node.moduleSpecifier)) {
+    if (!typescript_1.default.isStringLiteral(node.moduleSpecifier)) {
         throw new Error('not a module specifier');
     }
     return node.moduleSpecifier.text;

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

@@ -5,7 +5,7 @@
  * 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 ts from 'typescript';
 import { ClassDeclaration, ClassMember, CtorParameter, DeclarationNode, Decorator, Import, ReflectionHost } from './host';
 /**
  * reflector.ts implements static reflection of declarations using the TypeScript `ts.TypeChecker`.

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

@@ -6,33 +6,12 @@
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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 typescript_1 = __importDefault(require("typescript"));
 const host_1 = require("./host");
 const type_to_value_1 = require("./type_to_value");
 const util_1 = require("./util");
@@ -44,7 +23,9 @@ class TypeScriptReflectionHost {
         this.checker = checker;
     }
     getDecoratorsOfDeclaration(declaration) {
-        const decorators = (0, ts_compatibility_1.getDecorators)(declaration);
+        const decorators = typescript_1.default.canHaveDecorators(declaration)
+            ? typescript_1.default.getDecorators(declaration)
+            : undefined;
         return decorators !== undefined && decorators.length
             ? decorators
                 .map((decorator) => this._reflectDecorator(decorator))
@@ -64,7 +45,7 @@ class TypeScriptReflectionHost {
         // without a `body` are overloads whereas we want the implementation since it's the one that'll
         // be executed and which can have decorators. For declaration files, we take the first one that
         // we get.
-        const ctor = tsClazz.members.find((member) => ts.isConstructorDeclaration(member) &&
+        const ctor = tsClazz.members.find((member) => typescript_1.default.isConstructorDeclaration(member) &&
             (isDeclaration || member.body !== undefined));
         if (ctor === undefined) {
             return null;
@@ -81,9 +62,9 @@ class TypeScriptReflectionHost {
             // and extract the type. More complex union types e.g. `foo: Foo|Bar` are not supported.
             // We also don't need to support `foo: Foo|undefined` because Angular's DI injects `null` for
             // optional tokes that don't have providers.
-            if (typeNode && ts.isUnionTypeNode(typeNode)) {
-                let childTypeNodes = typeNode.types.filter((childTypeNode) => !(ts.isLiteralTypeNode(childTypeNode) &&
-                    childTypeNode.literal.kind === ts.SyntaxKind.NullKeyword));
+            if (typeNode && typescript_1.default.isUnionTypeNode(typeNode)) {
+                let childTypeNodes = typeNode.types.filter((childTypeNode) => !(typescript_1.default.isLiteralTypeNode(childTypeNode) &&
+                    childTypeNode.literal.kind === typescript_1.default.SyntaxKind.NullKeyword));
                 if (childTypeNodes.length === 1) {
                     typeNode = childTypeNodes[0];
                 }
@@ -103,10 +84,10 @@ class TypeScriptReflectionHost {
         if (directImport !== null) {
             return directImport;
         }
-        else if (ts.isQualifiedName(id.parent) && id.parent.right === id) {
+        else if (typescript_1.default.isQualifiedName(id.parent) && id.parent.right === id) {
             return this.getImportOfNamespacedIdentifier(id, getQualifiedNameRoot(id.parent));
         }
-        else if (ts.isPropertyAccessExpression(id.parent) &&
+        else if (typescript_1.default.isPropertyAccessExpression(id.parent) &&
             id.parent.name === id) {
             return this.getImportOfNamespacedIdentifier(id, getFarLeftIdentifier(id.parent));
         }
@@ -123,11 +104,11 @@ class TypeScriptReflectionHost {
         return this.getBaseClassExpression(clazz) !== null;
     }
     getBaseClassExpression(clazz) {
-        if (!(ts.isClassDeclaration(clazz) || ts.isClassExpression(clazz)) ||
+        if (!(typescript_1.default.isClassDeclaration(clazz) || typescript_1.default.isClassExpression(clazz)) ||
             clazz.heritageClauses === undefined) {
             return null;
         }
-        const extendsClause = clazz.heritageClauses.find((clause) => clause.token === ts.SyntaxKind.ExtendsKeyword);
+        const extendsClause = clazz.heritageClauses.find((clause) => clause.token === typescript_1.default.SyntaxKind.ExtendsKeyword);
         if (extendsClause === undefined) {
             return null;
         }
@@ -138,7 +119,7 @@ class TypeScriptReflectionHost {
         return extendsType.expression;
     }
     getGenericArityOfClass(clazz) {
-        if (!ts.isClassDeclaration(clazz)) {
+        if (!typescript_1.default.isClassDeclaration(clazz)) {
             return null;
         }
         return clazz.typeParameters !== undefined ? clazz.typeParameters.length : 0;
@@ -166,7 +147,7 @@ class TypeScriptReflectionHost {
             return null;
         }
         // The module specifier is guaranteed to be a string literal, so this should always pass.
-        if (!ts.isStringLiteral(importDecl.moduleSpecifier)) {
+        if (!typescript_1.default.isStringLiteral(importDecl.moduleSpecifier)) {
             // Not allowed to happen in TypeScript ASTs.
             return null;
         }
@@ -207,14 +188,14 @@ class TypeScriptReflectionHost {
         if (!declaration) {
             return null;
         }
-        const namespaceDeclaration = ts.isNamespaceImport(declaration)
+        const namespaceDeclaration = typescript_1.default.isNamespaceImport(declaration)
             ? declaration
             : null;
         if (!namespaceDeclaration) {
             return null;
         }
         const importDeclaration = namespaceDeclaration.parent.parent;
-        if (!ts.isStringLiteral(importDeclaration.moduleSpecifier)) {
+        if (!typescript_1.default.isStringLiteral(importDeclaration.moduleSpecifier)) {
             // Should not happen as this would be invalid TypesScript
             return null;
         }
@@ -230,7 +211,7 @@ class TypeScriptReflectionHost {
         let decoratorExpr = node.expression;
         let args = null;
         // Check for call expressions.
-        if (ts.isCallExpression(decoratorExpr)) {
+        if (typescript_1.default.isCallExpression(decoratorExpr)) {
             args = Array.from(decoratorExpr.arguments);
             decoratorExpr = decoratorExpr.expression;
         }
@@ -239,7 +220,7 @@ class TypeScriptReflectionHost {
         if (!(0, host_1.isDecoratorIdentifier)(decoratorExpr)) {
             return null;
         }
-        const decoratorIdentifier = ts.isIdentifier(decoratorExpr)
+        const decoratorIdentifier = typescript_1.default.isIdentifier(decoratorExpr)
             ? decoratorExpr
             : decoratorExpr.name;
         const importDecl = this.getImportOfIdentifier(decoratorIdentifier);
@@ -256,33 +237,33 @@ class TypeScriptReflectionHost {
         let value = null;
         let name = null;
         let nameNode = null;
-        if (ts.isPropertyDeclaration(node)) {
+        if (typescript_1.default.isPropertyDeclaration(node)) {
             kind = host_1.ClassMemberKind.Property;
             value = node.initializer || null;
         }
-        else if (ts.isGetAccessorDeclaration(node)) {
+        else if (typescript_1.default.isGetAccessorDeclaration(node)) {
             kind = host_1.ClassMemberKind.Getter;
         }
-        else if (ts.isSetAccessorDeclaration(node)) {
+        else if (typescript_1.default.isSetAccessorDeclaration(node)) {
             kind = host_1.ClassMemberKind.Setter;
         }
-        else if (ts.isMethodDeclaration(node)) {
+        else if (typescript_1.default.isMethodDeclaration(node)) {
             kind = host_1.ClassMemberKind.Method;
         }
-        else if (ts.isConstructorDeclaration(node)) {
+        else if (typescript_1.default.isConstructorDeclaration(node)) {
             kind = host_1.ClassMemberKind.Constructor;
         }
         else {
             return null;
         }
-        if (ts.isConstructorDeclaration(node)) {
+        if (typescript_1.default.isConstructorDeclaration(node)) {
             name = 'constructor';
         }
-        else if (ts.isIdentifier(node.name)) {
+        else if (typescript_1.default.isIdentifier(node.name)) {
             name = node.name.text;
             nameNode = node.name;
         }
-        else if (ts.isStringLiteral(node.name)) {
+        else if (typescript_1.default.isStringLiteral(node.name)) {
             name = node.name.text;
             nameNode = node.name;
         }
@@ -290,9 +271,9 @@ class TypeScriptReflectionHost {
             return null;
         }
         const decorators = this.getDecoratorsOfDeclaration(node);
-        const modifiers = (0, ts_compatibility_1.getModifiers)(node);
+        const modifiers = typescript_1.default.getModifiers(node);
         const isStatic = modifiers !== undefined &&
-            modifiers.some((mod) => mod.kind === ts.SyntaxKind.StaticKeyword);
+            modifiers.some((mod) => mod.kind === typescript_1.default.SyntaxKind.StaticKeyword);
         return {
             node,
             implementation: node,
@@ -310,14 +291,14 @@ exports.TypeScriptReflectionHost = TypeScriptReflectionHost;
 function reflectObjectLiteral(node) {
     const map = new Map();
     node.properties.forEach((prop) => {
-        if (ts.isPropertyAssignment(prop)) {
+        if (typescript_1.default.isPropertyAssignment(prop)) {
             const name = propertyNameToString(prop.name);
             if (name === null) {
                 return;
             }
             map.set(name, prop.initializer);
         }
-        else if (ts.isShorthandPropertyAssignment(prop)) {
+        else if (typescript_1.default.isShorthandPropertyAssignment(prop)) {
             map.set(prop.name.text, prop.name);
         }
         else {
@@ -328,13 +309,13 @@ function reflectObjectLiteral(node) {
 }
 exports.reflectObjectLiteral = reflectObjectLiteral;
 function castDeclarationToClassOrDie(declaration) {
-    if (!ts.isClassDeclaration(declaration)) {
-        throw new Error(`Reflecting on a ${ts.SyntaxKind[declaration.kind]} instead of a ClassDeclaration.`);
+    if (!typescript_1.default.isClassDeclaration(declaration)) {
+        throw new Error(`Reflecting on a ${typescript_1.default.SyntaxKind[declaration.kind]} instead of a ClassDeclaration.`);
     }
     return declaration;
 }
 function parameterName(name) {
-    if (ts.isIdentifier(name)) {
+    if (typescript_1.default.isIdentifier(name)) {
         return name.text;
     }
     else {
@@ -342,9 +323,9 @@ function parameterName(name) {
     }
 }
 function propertyNameToString(node) {
-    if (ts.isIdentifier(node) ||
-        ts.isStringLiteral(node) ||
-        ts.isNumericLiteral(node)) {
+    if (typescript_1.default.isIdentifier(node) ||
+        typescript_1.default.isStringLiteral(node) ||
+        typescript_1.default.isNumericLiteral(node)) {
         return node.text;
     }
     else {
@@ -358,10 +339,10 @@ function propertyNameToString(node) {
  * @returns the left most identifier in the chain or `null` if it is not an identifier.
  */
 function getQualifiedNameRoot(qualifiedName) {
-    while (ts.isQualifiedName(qualifiedName.left)) {
+    while (typescript_1.default.isQualifiedName(qualifiedName.left)) {
         qualifiedName = qualifiedName.left;
     }
-    return ts.isIdentifier(qualifiedName.left) ? qualifiedName.left : null;
+    return typescript_1.default.isIdentifier(qualifiedName.left) ? qualifiedName.left : null;
 }
 /**
  * Compute the left most identifier in a property access chain. E.g. the `a` of `a.b.c.d`.
@@ -370,10 +351,10 @@ function getQualifiedNameRoot(qualifiedName) {
  * @returns the left most identifier in the chain or `null` if it is not an identifier.
  */
 function getFarLeftIdentifier(propertyAccess) {
-    while (ts.isPropertyAccessExpression(propertyAccess.expression)) {
+    while (typescript_1.default.isPropertyAccessExpression(propertyAccess.expression)) {
         propertyAccess = propertyAccess.expression;
     }
-    return ts.isIdentifier(propertyAccess.expression)
+    return typescript_1.default.isIdentifier(propertyAccess.expression)
         ? propertyAccess.expression
         : null;
 }
@@ -382,9 +363,9 @@ function getFarLeftIdentifier(propertyAccess) {
  * `NamespaceImport`. If not return `null`.
  */
 function getContainingImportDeclaration(node) {
-    return ts.isImportSpecifier(node)
+    return typescript_1.default.isImportSpecifier(node)
         ? node.parent.parent.parent
-        : ts.isNamespaceImport(node)
+        : typescript_1.default.isNamespaceImport(node)
             ? node.parent.parent
             : null;
 }
@@ -394,8 +375,8 @@ function getContainingImportDeclaration(node) {
  * then fallback to the `originalId`.
  */
 function getExportedName(decl, originalId) {
-    return ts.isImportSpecifier(decl)
+    return typescript_1.default.isImportSpecifier(decl)
         ? (decl.propertyName !== undefined ? decl.propertyName : decl.name).text
         : originalId.text;
 }
-const LocalExportedClasses = Symbol('LocalExportedClasses');
+const LocalExportedDeclarations = Symbol('LocalExportedDeclarations');

package/transform/compiler-cli/src/ngtsc/reflection/src/util.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 { ClassDeclaration } from "./host";
+import ts from 'typescript';
+import { ClassDeclaration } from './host';
 export declare function isNamedClassDeclaration(node: ts.Node): node is ClassDeclaration<ts.ClassDeclaration>;
 export declare function isNamedFunctionDeclaration(node: ts.Node): node is ClassDeclaration<ts.FunctionDeclaration>;
 export declare function isNamedVariableDeclaration(node: ts.Node): node is ClassDeclaration<ts.VariableDeclaration>;