fix(ngcc): correctly detect emitted TS helpers in ES5 (#35191)
In ES5 code, TypeScript requires certain helpers (such as `__spreadArrays()`) to be able to support ES2015+ features. These helpers can be either imported from `tslib` (by setting the `importHelpers` TS compiler option to `true`) or emitted inline (by setting the `importHelpers` and `noEmitHelpers` TS compiler options to `false`, which is the default value for both). Ngtsc's `StaticInterpreter` (which is also used during ngcc processing) is able to statically evaluate some of these helpers (currently `__assign()`, `__spread()` and `__spreadArrays()`), as long as `ReflectionHost#getDefinitionOfFunction()` correctly detects the declaration of the helper. For this to happen, the left-hand side of the corresponding call expression (i.e. `__spread(...)` or `tslib.__spread(...)`) must be evaluated as a function declaration for `getDefinitionOfFunction()` to be called with. In the case of imported helpers, the `tslib.__someHelper` expression was resolved to a function declaration of the form `export declare function __someHelper(...args: any[][]): any[];`, which allows `getDefinitionOfFunction()` to correctly map it to a TS helper. In contrast, in the case of emitted helpers (and regardless of the module format: `CommonJS`, `ESNext`, `UMD`, etc.)), the `__someHelper` identifier was resolved to a variable declaration of the form `var __someHelper = (this && this.__someHelper) || function () { ... }`, which upon further evaluation was categorized as a `DynamicValue` (prohibiting further evaluation by the `getDefinitionOfFunction()`). As a result of the above, emitted TypeScript helpers were not evaluated in ES5 code. --- This commit changes the detection of TS helpers to leverage the existing `KnownFn` feature (previously only used for built-in functions). `Esm5ReflectionHost` is changed to always return `KnownDeclaration`s for TS helpers, both imported (`getExportsOfModule()`) as well as emitted (`getDeclarationOfIdentifier()`). Similar changes are made to `CommonJsReflectionHost` and `UmdReflectionHost`. The `KnownDeclaration`s are then mapped to `KnownFn`s in `StaticInterpreter`, allowing it to statically evaluate call expressions involving any kind of TS helpers. Jira issue: https://angular-team.atlassian.net/browse/FW-1689 PR Close #35191
This commit is contained in:

committed by
Miško Hevery

parent
14744f27c5
commit
bd6a39c364
@ -7,6 +7,7 @@
|
||||
*/
|
||||
import * as ts from 'typescript';
|
||||
import {AbsoluteFsPath, FileSystem, absoluteFrom} from '../../src/ngtsc/file_system';
|
||||
import {KnownDeclaration} from '../../src/ngtsc/reflection';
|
||||
|
||||
/**
|
||||
* A list (`Array`) of partially ordered `T` items.
|
||||
@ -132,6 +133,40 @@ export function resolveFileWithPostfixes(
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether a function declaration corresponds with a TypeScript helper function, returning
|
||||
* its kind if so or null if the declaration does not seem to correspond with such a helper.
|
||||
*/
|
||||
export function getTsHelperFnFromDeclaration(decl: ts.Declaration): KnownDeclaration|null {
|
||||
if (!ts.isFunctionDeclaration(decl) && !ts.isVariableDeclaration(decl)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (decl.name === undefined || !ts.isIdentifier(decl.name)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return getTsHelperFnFromIdentifier(decl.name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether an identifier corresponds with a TypeScript helper function (based on its
|
||||
* name), returning its kind if so or null if the identifier does not seem to correspond with such a
|
||||
* helper.
|
||||
*/
|
||||
export function getTsHelperFnFromIdentifier(id: ts.Identifier): KnownDeclaration|null {
|
||||
switch (stripDollarSuffix(id.text)) {
|
||||
case '__assign':
|
||||
return KnownDeclaration.TsHelperAssign;
|
||||
case '__spread':
|
||||
return KnownDeclaration.TsHelperSpread;
|
||||
case '__spreadArrays':
|
||||
return KnownDeclaration.TsHelperSpreadArrays;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An identifier may become repeated when bundling multiple source files into a single bundle, so
|
||||
* bundlers have a strategy of suffixing non-unique identifiers with a suffix like $2. This function
|
||||
|
Reference in New Issue
Block a user