static-injector 3.0.0 → 4.0.0

package/transform/compiler/src/output/output_ast.d.ts

@@ -83,12 +83,13 @@ export declare enum BinaryOperator {
     Modulo = 8,
     And = 9,
     Or = 10,
-    BitwiseAnd = 11,
-    Lower = 12,
-    LowerEquals = 13,
-    Bigger = 14,
-    BiggerEquals = 15,
-    NullishCoalesce = 16
+    BitwiseOr = 11,
+    BitwiseAnd = 12,
+    Lower = 13,
+    LowerEquals = 14,
+    Bigger = 15,
+    BiggerEquals = 16,
+    NullishCoalesce = 17
 }
 export declare function nullSafeIsEquivalent<T extends {
     isEquivalent(other: T): boolean;
@@ -114,6 +115,7 @@ export declare abstract class Expression {
     prop(name: string, sourceSpan?: ParseSourceSpan | null): ReadPropExpr;
     key(index: Expression, type?: Type | null, sourceSpan?: ParseSourceSpan | null): ReadKeyExpr;
     callFn(params: Expression[], sourceSpan?: ParseSourceSpan | null, pure?: boolean): InvokeFunctionExpr;
+    bitwiseOr(rhs: Expression, sourceSpan?: ParseSourceSpan | null, parens?: boolean): BinaryOperatorExpr;
     toStmt(): Statement;
 }
 export declare class ReadVarExpr extends Expression {

package/transform/compiler/src/output/output_ast.js

@@ -120,12 +120,13 @@ var BinaryOperator;
     BinaryOperator[BinaryOperator["Modulo"] = 8] = "Modulo";
     BinaryOperator[BinaryOperator["And"] = 9] = "And";
     BinaryOperator[BinaryOperator["Or"] = 10] = "Or";
-    BinaryOperator[BinaryOperator["BitwiseAnd"] = 11] = "BitwiseAnd";
-    BinaryOperator[BinaryOperator["Lower"] = 12] = "Lower";
-    BinaryOperator[BinaryOperator["LowerEquals"] = 13] = "LowerEquals";
-    BinaryOperator[BinaryOperator["Bigger"] = 14] = "Bigger";
-    BinaryOperator[BinaryOperator["BiggerEquals"] = 15] = "BiggerEquals";
-    BinaryOperator[BinaryOperator["NullishCoalesce"] = 16] = "NullishCoalesce";
+    BinaryOperator[BinaryOperator["BitwiseOr"] = 11] = "BitwiseOr";
+    BinaryOperator[BinaryOperator["BitwiseAnd"] = 12] = "BitwiseAnd";
+    BinaryOperator[BinaryOperator["Lower"] = 13] = "Lower";
+    BinaryOperator[BinaryOperator["LowerEquals"] = 14] = "LowerEquals";
+    BinaryOperator[BinaryOperator["Bigger"] = 15] = "Bigger";
+    BinaryOperator[BinaryOperator["BiggerEquals"] = 16] = "BiggerEquals";
+    BinaryOperator[BinaryOperator["NullishCoalesce"] = 17] = "NullishCoalesce";
 })(BinaryOperator || (exports.BinaryOperator = BinaryOperator = {}));
 function nullSafeIsEquivalent(base, other) {
     if (base == null || other == null) {
@@ -166,6 +167,9 @@ class Expression {
     callFn(params, sourceSpan, pure) {
         return new InvokeFunctionExpr(this, params, null, sourceSpan, pure);
     }
+    bitwiseOr(rhs, sourceSpan, parens = true) {
+        return new BinaryOperatorExpr(BinaryOperator.BitwiseOr, this, rhs, null, sourceSpan, parens);
+    }
     toStmt() {
         return new ExpressionStatement(this, null);
     }

package/transform/compiler/src/render3/partial/api.d.ts

@@ -26,6 +26,11 @@ export interface R3PartialDeclaration {
      */
     type: o.Expression;
 }
+export type LegacyInputPartialMapping = string | [
+    bindingPropertyName: string,
+    classPropertyName: string,
+    transformFunction?: o.Expression
+];
 /**
  * Describes the shape of the objects that the `ɵɵngDeclareInjector()` accepts.
  */

package/transform/compiler/src/render3/r3_identifiers.js

@@ -10,6 +10,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Identifiers = void 0;
 const CORE = 'static-injector';
 class Identifiers {
+    /* Methods */
+    /* Instructions */
     static inject = { name: 'ɵɵinject', moduleName: CORE };
     static directiveInject = {
         name: 'ɵɵdirectiveInject',
@@ -43,6 +45,8 @@ class Identifiers {
         name: 'ɵɵFactoryDeclaration',
         moduleName: CORE,
     };
+    // Signal queries
+    // Two-way bindings
     static getInheritedFactory = {
         name: 'ɵɵgetInheritedFactory',
         moduleName: CORE,

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

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

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

@@ -1,11 +1,4 @@
 "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;
     var desc = Object.getOwnPropertyDescriptor(m, k);

package/transform/compiler-cli/src/ngtsc/annotations/common/src/di.d.ts

@@ -7,7 +7,6 @@
  */
 import { R3DependencyMetadata } from 'static-injector/transform/compiler';
 import { ClassDeclaration, CtorParameter, ReflectionHost, UnavailableValue } from '../../../reflection';
-import { CompilationMode } from '../../../transform';
 export type ConstructorDeps = {
     deps: R3DependencyMetadata[];
 } | {
@@ -19,7 +18,7 @@ export interface ConstructorDepError {
     param: CtorParameter;
     reason: UnavailableValue;
 }
-export declare function getConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean, compilationMode: CompilationMode): ConstructorDeps | null;
+export declare function getConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean): ConstructorDeps | null;
 /**
  * Convert `ConstructorDeps` into the `R3DependencyMetadata` array for those deps if they're valid,
  * or into an `'invalid'` signal if they're not.
@@ -27,7 +26,7 @@ export declare function getConstructorDependencies(clazz: ClassDeclaration, refl
  * This is a companion function to `validateConstructorDependencies` which accepts invalid deps.
  */
 export declare function unwrapConstructorDependencies(deps: ConstructorDeps | null): R3DependencyMetadata[] | 'invalid' | null;
-export declare function getValidConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean, compilationMode: CompilationMode): R3DependencyMetadata[] | null;
+export declare function getValidConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean): R3DependencyMetadata[] | null;
 /**
  * Validate that `ConstructorDeps` does not have any invalid dependencies and convert them into the
  * `R3DependencyMetadata` array if so, or raise a diagnostic if some deps are invalid.

package/transform/compiler-cli/src/ngtsc/annotations/common/src/di.js

@@ -14,9 +14,8 @@ exports.validateConstructorDependencies = exports.getValidConstructorDependencie
 const compiler_1 = require("static-injector/transform/compiler");
 const typescript_1 = __importDefault(require("typescript"));
 const diagnostics_1 = require("../../../diagnostics");
-const transform_1 = require("../../../transform");
 const util_1 = require("./util");
-function getConstructorDependencies(clazz, reflector, isCore, compilationMode) {
+function getConstructorDependencies(clazz, reflector, isCore) {
     const deps = [];
     const errors = [];
     let ctorParams = reflector.getConstructorParameters(clazz);
@@ -29,26 +28,7 @@ function getConstructorDependencies(clazz, reflector, isCore, compilationMode) {
         }
     }
     ctorParams.forEach((param, idx) => {
-        let token = null;
-        if (compilationMode === transform_1.CompilationMode.LOCAL &&
-            param.typeValueReference.kind === 2 /* TypeValueReferenceKind.UNAVAILABLE */ &&
-            param.typeValueReference.reason.kind !== 0 /* ValueUnavailableKind.MISSING_TYPE */) {
-            // The case of local compilation where injection token cannot be resolved because it is
-            // "probably" imported from another file
-            const typeNode = param.typeValueReference.reason.typeNode;
-            if (typescript_1.default.isTypeReferenceNode(typeNode)) {
-                // Here we manually create the token out of the typeName without caring about its
-                // references for better TS tracking. This is because in this code path the typeNode is
-                // imported from another file and since we are in local compilation mode (=single file
-                // mode) the reference of this node (or its typeName node) cannot be resolved. So all we
-                // can do is just to create a new expression.
-                token = toQualifiedExpression(typeNode.typeName);
-            }
-        }
-        else {
-            // In all other cases resolve the injection token
-            token = (0, util_1.valueReferenceToExpression)(param.typeValueReference);
-        }
+        let token = (0, util_1.valueReferenceToExpression)(param.typeValueReference);
         let attributeNameType = null;
         let optional = false, self = false, skipSelf = false, host = false;
         (param.decorators || [])
@@ -100,13 +80,6 @@ function getConstructorDependencies(clazz, reflector, isCore, compilationMode) {
     }
 }
 exports.getConstructorDependencies = getConstructorDependencies;
-/** Converts a TS qualified name to output expression. */
-function toQualifiedExpression(entity) {
-    if (typescript_1.default.isIdentifier(entity)) {
-        return new compiler_1.WrappedNodeExpr(entity);
-    }
-    return new compiler_1.ReadPropExpr(toQualifiedExpression(entity.left), entity.right.text);
-}
 /**
  * Convert `ConstructorDeps` into the `R3DependencyMetadata` array for those deps if they're valid,
  * or into an `'invalid'` signal if they're not.
@@ -127,8 +100,8 @@ function unwrapConstructorDependencies(deps) {
     }
 }
 exports.unwrapConstructorDependencies = unwrapConstructorDependencies;
-function getValidConstructorDependencies(clazz, reflector, isCore, compilationMode) {
-    return validateConstructorDependencies(clazz, getConstructorDependencies(clazz, reflector, isCore, compilationMode));
+function getValidConstructorDependencies(clazz, reflector, isCore) {
+    return validateConstructorDependencies(clazz, getConstructorDependencies(clazz, reflector, isCore));
 }
 exports.getValidConstructorDependencies = getValidConstructorDependencies;
 /**

package/transform/compiler-cli/src/ngtsc/annotations/common/src/util.d.ts

@@ -8,6 +8,8 @@
 import { Expression, FactoryTarget, R3FactoryMetadata, R3Reference } from 'static-injector/transform/compiler';
 import ts from 'typescript';
 import { ClassDeclaration, Decorator, Import, ImportedTypeValueReference, LocalTypeValueReference, ReflectionHost, TypeValueReference } from '../../../reflection';
+/** Module name of the framework core. */
+export declare const CORE_MODULE = "static-injector";
 /**
  * Convert a `TypeValueReference` to an `Expression` which refers to the type as a value.
  *
@@ -22,6 +24,7 @@ export declare function isAngularCore(decorator: Decorator): decorator is Decora
 };
 export declare function findAngularDecorator(decorators: Decorator[], name: string, isCore: boolean): Decorator | undefined;
 export declare function isAngularDecorator(decorator: Decorator, name: string, isCore: boolean): boolean;
+export declare function getAngularDecorators(decorators: Decorator[], names: readonly string[], isCore: boolean): Decorator[];
 /**
  * Unwrap a `ts.Expression`, removing outer type-casts or parentheses until the expression is in its
  * lowest level form.

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

@@ -10,9 +10,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAbstractClassDeclaration = exports.toFactoryMetadata = exports.wrapTypeReference = exports.wrapFunctionExpressionsInParens = exports.tryUnwrapForwardRef = exports.unwrapExpression = exports.isAngularDecorator = exports.findAngularDecorator = exports.isAngularCore = exports.valueReferenceToExpression = void 0;
+exports.isAbstractClassDeclaration = exports.toFactoryMetadata = exports.wrapTypeReference = exports.wrapFunctionExpressionsInParens = exports.tryUnwrapForwardRef = exports.unwrapExpression = exports.getAngularDecorators = exports.isAngularDecorator = exports.findAngularDecorator = exports.isAngularCore = exports.valueReferenceToExpression = exports.CORE_MODULE = void 0;
 const compiler_1 = require("static-injector/transform/compiler");
 const typescript_1 = __importDefault(require("typescript"));
+/** Module name of the framework core. */
+exports.CORE_MODULE = 'static-injector';
 function valueReferenceToExpression(valueRef) {
     if (valueRef.kind === 2 /* TypeValueReferenceKind.UNAVAILABLE */) {
         return null;
@@ -36,7 +38,7 @@ function valueReferenceToExpression(valueRef) {
 }
 exports.valueReferenceToExpression = valueReferenceToExpression;
 function isAngularCore(decorator) {
-    return (decorator.import !== null && decorator.import.from === 'static-injector');
+    return decorator.import !== null && decorator.import.from === exports.CORE_MODULE;
 }
 exports.isAngularCore = isAngularCore;
 function findAngularDecorator(decorators, name, isCore) {
@@ -53,6 +55,16 @@ function isAngularDecorator(decorator, name, isCore) {
     return false;
 }
 exports.isAngularDecorator = isAngularDecorator;
+function getAngularDecorators(decorators, names, isCore) {
+    return decorators.filter((decorator) => {
+        const name = isCore ? decorator.name : decorator.import?.name;
+        if (name === undefined || !names.includes(name)) {
+            return false;
+        }
+        return isCore || isAngularCore(decorator);
+    });
+}
+exports.getAngularDecorators = getAngularDecorators;
 /**
  * Unwrap a `ts.Expression`, removing outer type-casts or parentheses until the expression is in its
  * lowest level form.

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

@@ -63,7 +63,7 @@ class InjectableDecoratorHandler {
         return {
             analysis: {
                 meta,
-                ctorDeps: extractInjectableCtorDeps(node, meta, decorator, this.reflector, this.isCore, this.strictCtorDeps, this.compilationMode),
+                ctorDeps: extractInjectableCtorDeps(node, meta, decorator, this.reflector, this.isCore, this.strictCtorDeps),
                 // Avoid generating multiple factories if a class has
                 // more Angular decorators, apart from Injectable.
             },
@@ -181,7 +181,7 @@ function getProviderExpression(expression, reflector) {
         ? 2 /* ForwardRefHandling.Unwrapped */
         : 0 /* ForwardRefHandling.None */);
 }
-function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, strictCtorDeps, compilationMode) {
+function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, strictCtorDeps) {
     if (decorator.args === null) {
         throw new diagnostics_1.FatalDiagnosticError(diagnostics_1.ErrorCode.DECORATOR_NOT_CALLED, decorator.node, '@Injectable must be called');
     }
@@ -196,15 +196,15 @@ 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 && !(0, common_1.isAbstractClassDeclaration)(clazz)) {
-            ctorDeps = (0, common_2.getValidConstructorDependencies)(clazz, reflector, isCore, compilationMode);
+            ctorDeps = (0, common_2.getValidConstructorDependencies)(clazz, reflector, isCore);
         }
         else {
-            ctorDeps = (0, common_2.unwrapConstructorDependencies)((0, common_2.getConstructorDependencies)(clazz, reflector, isCore, compilationMode));
+            ctorDeps = (0, common_2.unwrapConstructorDependencies)((0, common_2.getConstructorDependencies)(clazz, reflector, isCore));
         }
         return ctorDeps;
     }
     else if (decorator.args.length === 1) {
-        const rawCtorDeps = (0, common_2.getConstructorDependencies)(clazz, reflector, isCore, compilationMode);
+        const rawCtorDeps = (0, common_2.getConstructorDependencies)(clazz, reflector, isCore);
         if (strictCtorDeps &&
             !(0, common_1.isAbstractClassDeclaration)(clazz) &&
             requiresValidCtor(meta)) {

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

@@ -1,9 +1,2 @@
-/**
- * @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,11 +1,4 @@
 "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;
     var desc = Object.getOwnPropertyDescriptor(m, k);

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

@@ -1,8 +1 @@
-/**
- * @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,11 +1,4 @@
 "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;
     var desc = Object.getOwnPropertyDescriptor(m, k);

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

@@ -1,10 +1,3 @@
-/**
- * @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,11 +1,4 @@
 "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;
     var desc = Object.getOwnPropertyDescriptor(m, k);

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

@@ -209,7 +209,7 @@ export interface ImportedTypeValueReference {
      * When `null` or empty, the `importedName` itself is the symbol being referenced.
      */
     nestedPath: string[] | null;
-    valueDeclaration: DeclarationNode;
+    valueDeclaration: DeclarationNode | null;
 }
 /**
  * A representation for a type value reference that is used when no value is available. This can
@@ -410,6 +410,11 @@ export interface Import {
  * A type that is used to identify a declaration.
  */
 export type DeclarationNode = ts.Declaration;
+export type AmbientImport = {
+    __brand: 'AmbientImport';
+};
+/** Indicates that a declaration is referenced through an ambient type. */
+export declare const AmbientImport: AmbientImport;
 /**
  * The declaration of a symbol, along with information about how it was imported into the
  * application.
@@ -420,7 +425,7 @@ export interface Declaration<T extends ts.Declaration = ts.Declaration> {
      * was imported via an absolute module (even through a chain of re-exports). If the symbol is part
      * of the application and was not imported from an absolute path, this will be `null`.
      */
-    viaModule: string | null;
+    viaModule: string | AmbientImport | null;
     /**
      * TypeScript reference to the declaration itself, if one exists.
      */

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

@@ -10,7 +10,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClassMemberKind = exports.isDecoratorIdentifier = void 0;
+exports.AmbientImport = exports.ClassMemberKind = exports.isDecoratorIdentifier = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 function isDecoratorIdentifier(exp) {
     return (typescript_1.default.isIdentifier(exp) ||
@@ -30,3 +30,5 @@ var ClassMemberKind;
     ClassMemberKind[ClassMemberKind["Property"] = 3] = "Property";
     ClassMemberKind[ClassMemberKind["Method"] = 4] = "Method";
 })(ClassMemberKind || (exports.ClassMemberKind = ClassMemberKind = {}));
+/** Indicates that a declaration is referenced through an ambient type. */
+exports.AmbientImport = {};

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

@@ -14,7 +14,7 @@ import { TypeValueReference } from './host';
  * This can return `null` if the `typeNode` is `null`, if it does not refer to a symbol with a value
  * declaration, or if it is not possible to statically understand.
  */
-export declare function typeToValue(typeNode: ts.TypeNode | null, checker: ts.TypeChecker): TypeValueReference;
+export declare function typeToValue(typeNode: ts.TypeNode | null, checker: ts.TypeChecker, isLocalCompilation: boolean): TypeValueReference;
 /**
  * Attempt to extract a `ts.Expression` that's equivalent to a `ts.TypeNode`, as the two have
  * different AST shapes but can reference the same symbols.
@@ -22,3 +22,4 @@ export declare function typeToValue(typeNode: ts.TypeNode | null, checker: ts.Ty
  * This will return `null` if an equivalent expression cannot be constructed.
  */
 export declare function typeNodeToValueExpr(node: ts.TypeNode): ts.Expression | null;
+export declare function entityNameToValue(node: ts.EntityName): ts.Expression | null;

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

@@ -10,7 +10,7 @@ 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;
+exports.entityNameToValue = exports.typeNodeToValueExpr = exports.typeToValue = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 /**
  * Potentially convert a `ts.TypeNode` to a `TypeValueReference`, which indicates how to use the
@@ -19,7 +19,7 @@ const typescript_1 = __importDefault(require("typescript"));
  * This can return `null` if the `typeNode` is `null`, if it does not refer to a symbol with a value
  * declaration, or if it is not possible to statically understand.
  */
-function typeToValue(typeNode, checker) {
+function typeToValue(typeNode, checker, isLocalCompilation) {
     // It's not possible to get a value expression if the parameter doesn't even have a type.
     if (typeNode === null) {
         return missingType();
@@ -41,7 +41,17 @@ function typeToValue(typeNode, checker) {
         if (decl.declarations !== undefined && decl.declarations.length > 0) {
             typeOnlyDecl = decl.declarations[0];
         }
-        return noValueDeclaration(typeNode, typeOnlyDecl);
+        // In local compilation mode a declaration is considered invalid only if it is a type related
+        // declaration.
+        if (!isLocalCompilation ||
+            (typeOnlyDecl &&
+                [
+                    typescript_1.default.SyntaxKind.TypeParameter,
+                    typescript_1.default.SyntaxKind.TypeAliasDeclaration,
+                    typescript_1.default.SyntaxKind.InterfaceDeclaration,
+                ].includes(typeOnlyDecl.kind))) {
+            return noValueDeclaration(typeNode, typeOnlyDecl);
+        }
     }
     // The type points to a valid value declaration. Rewrite the TypeReference into an
     // Expression which references the value pointed to by the TypeReference, if possible.
@@ -85,7 +95,7 @@ function typeToValue(typeNode, checker) {
             const moduleName = extractModuleName(firstDecl.parent.parent.parent);
             return {
                 kind: 1 /* TypeValueReferenceKind.IMPORTED */,
-                valueDeclaration: decl.valueDeclaration,
+                valueDeclaration: decl.valueDeclaration ?? null,
                 moduleName,
                 importedName,
                 nestedPath,
@@ -109,7 +119,7 @@ function typeToValue(typeNode, checker) {
             const moduleName = extractModuleName(firstDecl.parent.parent);
             return {
                 kind: 1 /* TypeValueReferenceKind.IMPORTED */,
-                valueDeclaration: decl.valueDeclaration,
+                valueDeclaration: decl.valueDeclaration ?? null,
                 moduleName,
                 importedName,
                 nestedPath,
@@ -252,6 +262,7 @@ function entityNameToValue(node) {
         return null;
     }
 }
+exports.entityNameToValue = entityNameToValue;
 function extractModuleName(node) {
     if (!typescript_1.default.isStringLiteral(node.moduleSpecifier)) {
         throw new Error('not a module specifier');

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

@@ -12,7 +12,8 @@ import { ClassDeclaration, ClassMember, CtorParameter, DeclarationNode, Decorato
  */
 export declare class TypeScriptReflectionHost implements ReflectionHost {
     protected checker: ts.TypeChecker;
-    constructor(checker: ts.TypeChecker);
+    private readonly isLocalCompilation;
+    constructor(checker: ts.TypeChecker, isLocalCompilation?: boolean);
     getDecoratorsOfDeclaration(declaration: DeclarationNode): Decorator[] | null;
     getMembersOfClass(clazz: ClassDeclaration): ClassMember[];
     getConstructorParameters(clazz: ClassDeclaration): CtorParameter[] | null;
@@ -43,10 +44,10 @@ export declare class TypeScriptReflectionHost implements ReflectionHost {
     protected getImportOfNamespacedIdentifier(id: ts.Identifier, namespaceIdentifier: ts.Identifier | null): Import | null;
     private _reflectDecorator;
     private _reflectMember;
+    private _viaModule;
 }
 export declare function reflectObjectLiteral(node: ts.ObjectLiteralExpression): Map<string, ts.Expression>;
 /**
- * Return the ImportDeclaration for the given `node` if it is either an `ImportSpecifier` or a
- * `NamespaceImport`. If not return `null`.
+ * Gets the closest ancestor `ImportDeclaration` to a node.
  */
 export declare function getContainingImportDeclaration(node: ts.Node): ts.ImportDeclaration | null;

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

@@ -20,8 +20,10 @@ const util_1 = require("./util");
  */
 class TypeScriptReflectionHost {
     checker;
-    constructor(checker) {
+    isLocalCompilation;
+    constructor(checker, isLocalCompilation = false) {
         this.checker = checker;
+        this.isLocalCompilation = isLocalCompilation;
     }
     getDecoratorsOfDeclaration(declaration) {
         const decorators = typescript_1.default.canHaveDecorators(declaration)
@@ -70,7 +72,7 @@ class TypeScriptReflectionHost {
                     typeNode = childTypeNodes[0];
                 }
             }
-            const typeValueReference = (0, type_to_value_1.typeToValue)(typeNode, this.checker);
+            const typeValueReference = (0, type_to_value_1.typeToValue)(typeNode, this.checker, this.isLocalCompilation);
             return {
                 name,
                 nameNode: node.name,
@@ -280,6 +282,18 @@ class TypeScriptReflectionHost {
             isStatic,
         };
     }
+    _viaModule(declaration, originalId, importInfo) {
+        if (importInfo === null &&
+            originalId !== null &&
+            declaration.getSourceFile() !== originalId.getSourceFile()) {
+            return host_1.AmbientImport;
+        }
+        return importInfo !== null &&
+            importInfo.from !== null &&
+            !importInfo.from.startsWith('.')
+            ? importInfo.from
+            : null;
+    }
 }
 exports.TypeScriptReflectionHost = TypeScriptReflectionHost;
 function reflectObjectLiteral(node) {
@@ -353,15 +367,17 @@ function getFarLeftIdentifier(propertyAccess) {
         : null;
 }
 /**
- * Return the ImportDeclaration for the given `node` if it is either an `ImportSpecifier` or a
- * `NamespaceImport`. If not return `null`.
+ * Gets the closest ancestor `ImportDeclaration` to a node.
  */
 function getContainingImportDeclaration(node) {
-    return typescript_1.default.isImportSpecifier(node)
-        ? node.parent.parent.parent
-        : typescript_1.default.isNamespaceImport(node)
-            ? node.parent.parent
-            : null;
+    let parent = node.parent;
+    while (parent && !typescript_1.default.isSourceFile(parent)) {
+        if (typescript_1.default.isImportDeclaration(parent)) {
+            return parent;
+        }
+        parent = parent.parent;
+    }
+    return null;
 }
 exports.getContainingImportDeclaration = getContainingImportDeclaration;
 /**

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

@@ -1,9 +1,2 @@
-/**
- * @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/api';
 export * from './src/utils';

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

@@ -1,11 +1,4 @@
 "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;
     var desc = Object.getOwnPropertyDescriptor(m, k);

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

@@ -12,4 +12,4 @@ import { ImportManager } from '../../translator';
  * and before the module body.
  * Can optionally add extra statements (e.g. new constants) before the body as well.
  */
-export declare function addImports(importManager: ImportManager, sf: ts.SourceFile, extraStatements?: ts.Statement[]): ts.SourceFile;
+export declare function addImports(factory: ts.NodeFactory | undefined, importManager: ImportManager, sf: ts.SourceFile, extraStatements?: ts.Statement[]): ts.SourceFile;