static-injector 1.0.10 → 2.1.0

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

@@ -6,33 +6,17 @@
  * 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;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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.InjectableDecoratorHandler = void 0;
-const compiler_1 = require("../../../../../compiler");
-const ts = __importStar(require("typescript"));
+const compiler_1 = require("static-injector/transform/compiler");
+const typescript_1 = __importDefault(require("typescript"));
+const common_1 = require("../../annotations/common");
 const diagnostics_1 = require("../../diagnostics");
 const reflection_1 = require("../../reflection");
-const factory_1 = require("./factory");
-const util_1 = require("./util");
+const common_2 = require("../common");
 /**
  * Adapts the `compileInjectable` compiler for `@Injectable` decorators to the Ivy compiler.
  */
@@ -54,7 +38,7 @@ class InjectableDecoratorHandler {
         if (!decorators) {
             return undefined;
         }
-        const decorator = util_1.findAngularDecorator(decorators, 'Injectable', this.isCore);
+        const decorator = (0, common_2.findAngularDecorator)(decorators, 'Injectable', this.isCore);
         if (decorator !== undefined) {
             return {
                 trigger: decorator.node,
@@ -78,13 +62,15 @@ class InjectableDecoratorHandler {
         };
     }
     compileFull(node, analysis) {
-        return this.compile(factory_1.compileNgFactoryDefField, (meta) => compiler_1.compileInjectable(meta, false), node, analysis);
+        return this.compile(common_2.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));
-        results.push(factoryRes);
+        if (true) {
+            const meta = analysis.meta;
+            const factoryRes = compileFactoryFn((0, common_2.toFactoryMetadata)(Object.assign(Object.assign({}, meta), { deps: analysis.ctorDeps }), compiler_1.FactoryTarget.Injectable));
+            results.push(factoryRes);
+        }
         const ɵprov = this.reflector
             .getMembersOfClass(node)
             .find((member) => member.name === 'ɵprov');
@@ -113,7 +99,7 @@ exports.InjectableDecoratorHandler = InjectableDecoratorHandler;
  */
 function extractInjectableMetadata(clazz, decorator, reflector) {
     const name = clazz.name.text;
-    const type = util_1.wrapTypeReference(reflector, clazz);
+    const type = (0, common_2.wrapTypeReference)(reflector, clazz);
     const internalType = new compiler_1.WrappedNodeExpr(reflector.getInternalNameOfClass(clazz));
     const typeArgumentCount = reflector.getGenericArityOfClass(clazz) || 0;
     if (decorator.args === null) {
@@ -125,7 +111,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) {
@@ -133,18 +119,18 @@ function extractInjectableMetadata(clazz, decorator, reflector) {
         // Firstly make sure the decorator argument is an inline literal - if not, it's illegal to
         // transport references from one location to another. This is the problem that lowering
         // used to solve - if this restriction proves too undesirable we can re-implement lowering.
-        if (!ts.isObjectLiteralExpression(metaNode)) {
+        if (!typescript_1.default.isObjectLiteralExpression(metaNode)) {
             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');
-            if (!ts.isArrayLiteralExpression(depsExpr)) {
+            if (!typescript_1.default.isArrayLiteralExpression(depsExpr)) {
                 throw new diagnostics_1.FatalDiagnosticError(diagnostics_1.ErrorCode.VALUE_NOT_LITERAL, depsExpr, `@Injectable deps metadata must be an inline array`);
             }
             deps = depsExpr.elements.map((dep) => getDep(dep, reflector));
@@ -184,8 +170,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, common_2.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) {
@@ -201,30 +189,35 @@ function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, st
         // To deal with this, @Injectable() without an argument is more lenient, and if the
         // 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);
+        if (strictCtorDeps && !(0, common_1.isAbstractClassDeclaration)(clazz)) {
+            ctorDeps = (0, common_2.getValidConstructorDependencies)(clazz, reflector, isCore);
         }
         else {
-            ctorDeps = util_1.unwrapConstructorDependencies(util_1.getConstructorDependencies(clazz, reflector, isCore));
+            ctorDeps = (0, common_2.unwrapConstructorDependencies)((0, common_2.getConstructorDependencies)(clazz, reflector, isCore));
         }
         return ctorDeps;
     }
     else if (decorator.args.length === 1) {
-        const rawCtorDeps = util_1.getConstructorDependencies(clazz, reflector, isCore);
+        const rawCtorDeps = (0, common_2.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, common_1.isAbstractClassDeclaration)(clazz) &&
+            requiresValidCtor(meta)) {
+            // Since use* was not provided for a concrete class, validate the deps according to
+            // strictCtorDeps.
+            ctorDeps = (0, common_2.validateConstructorDependencies)(clazz, rawCtorDeps);
         }
         else {
-            ctorDeps = util_1.unwrapConstructorDependencies(rawCtorDeps);
+            ctorDeps = (0, common_2.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),
@@ -258,18 +251,18 @@ function getDep(dep, reflector) {
         }
         return true;
     }
-    if (ts.isArrayLiteralExpression(dep)) {
+    if (typescript_1.default.isArrayLiteralExpression(dep)) {
         dep.elements.forEach((el) => {
-            let isParametersDecorator = false;
-            if (ts.isIdentifier(el)) {
-                isParametersDecorator = maybeUpdateDecorator(el, reflector);
+            let isDecorator = false;
+            if (typescript_1.default.isIdentifier(el)) {
+                isDecorator = maybeUpdateDecorator(el, reflector);
             }
-            else if (ts.isNewExpression(el) && ts.isIdentifier(el.expression)) {
+            else if (typescript_1.default.isNewExpression(el) && typescript_1.default.isIdentifier(el.expression)) {
                 const token = (el.arguments && el.arguments.length > 0 && el.arguments[0]) ||
                     undefined;
-                isParametersDecorator = maybeUpdateDecorator(el.expression, reflector, token);
+                isDecorator = maybeUpdateDecorator(el.expression, reflector, token);
             }
-            if (!isParametersDecorator) {
+            if (!isDecorator) {
                 meta.token = new compiler_1.WrappedNodeExpr(el);
             }
         });

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.d.ts

@@ -1,2 +1,9 @@
-export * from "./error";
-export * from "./error_code";
+/**
+ * @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
+ */
+export * from './error';
+export * from './error_code';

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

@@ -1,7 +1,18 @@
 "use strict";
+/**
+ * @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
+ */
 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.d.ts

@@ -1 +1,8 @@
+/**
+ * @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
+ */
 export * from './src/core';

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

@@ -1,7 +1,18 @@
 "use strict";
+/**
+ * @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
+ */
 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/src/default.d.ts

@@ -0,0 +1,19 @@
+/**
+ * @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
+ */
+import { WrappedNodeExpr } from 'static-injector/transform/compiler';
+import ts from 'typescript';
+/**
+ * Attaches a default import declaration to `expr` to indicate the dependency of `expr` on the
+ * default import.
+ */
+export declare function attachDefaultImportDeclaration(expr: WrappedNodeExpr<unknown>, importDecl: ts.ImportDeclaration): void;
+/**
+ * Obtains the default import declaration that `expr` depends on, or `null` if there is no such
+ * dependency.
+ */
+export declare function getDefaultImportDeclaration(expr: WrappedNodeExpr<unknown>): ts.ImportDeclaration | null;

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

@@ -0,0 +1,28 @@
+"use strict";
+/**
+ * @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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultImportDeclaration = exports.attachDefaultImportDeclaration = void 0;
+const DefaultImportDeclaration = Symbol('DefaultImportDeclaration');
+/**
+ * Attaches a default import declaration to `expr` to indicate the dependency of `expr` on the
+ * default import.
+ */
+function attachDefaultImportDeclaration(expr, importDecl) {
+    expr[DefaultImportDeclaration] = importDecl;
+}
+exports.attachDefaultImportDeclaration = attachDefaultImportDeclaration;
+/**
+ * Obtains the default import declaration that `expr` depends on, or `null` if there is no such
+ * dependency.
+ */
+function getDefaultImportDeclaration(expr) {
+    var _a;
+    return ((_a = expr[DefaultImportDeclaration]) !== null && _a !== void 0 ? _a : null);
+}
+exports.getDefaultImportDeclaration = getDefaultImportDeclaration;

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

@@ -1,3 +1,10 @@
-export * from "./src/host";
-export * from "./src/typescript";
-export * from "./src/util";
+/**
+ * @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
+ */
+export * from './src/host';
+export * from './src/typescript';
+export * from './src/util';

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

@@ -1,7 +1,18 @@
 "use strict";
+/**
+ * @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
+ */
 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

@@ -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;
 };
 /**
@@ -290,7 +289,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;
@@ -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,28 +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;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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) {
@@ -39,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;
 /**
@@ -93,6 +76,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 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.