@ngtools/webpack 7.2.0 → 7.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ngtools/webpack",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.4",
|
|
4
4
|
"description": "Webpack plugin that AoT compiles your Angular components and modules.",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "src/index.d.ts",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"homepage": "https://github.com/angular/angular-cli",
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@angular-devkit/core": "7.2.
|
|
28
|
+
"@angular-devkit/core": "7.2.4",
|
|
29
29
|
"enhanced-resolve": "4.1.0",
|
|
30
30
|
"rxjs": "6.3.3",
|
|
31
31
|
"tree-kill": "1.2.0",
|
|
@@ -3,7 +3,7 @@ import { WebpackCompilerHost } from '../compiler_host';
|
|
|
3
3
|
export declare function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.SyntaxKind): T[];
|
|
4
4
|
export declare function getFirstNode(sourceFile: ts.SourceFile): ts.Node;
|
|
5
5
|
export declare function getLastNode(sourceFile: ts.SourceFile): ts.Node | null;
|
|
6
|
-
export declare function createTypescriptContext(content: string): {
|
|
6
|
+
export declare function createTypescriptContext(content: string, additionalFiles?: Record<string, string>): {
|
|
7
7
|
compilerHost: WebpackCompilerHost;
|
|
8
8
|
program: ts.Program;
|
|
9
9
|
};
|
|
@@ -40,12 +40,13 @@ exports.getLastNode = getLastNode;
|
|
|
40
40
|
// Test transform helpers.
|
|
41
41
|
const basePath = '/project/src/';
|
|
42
42
|
const fileName = basePath + 'test-file.ts';
|
|
43
|
-
function createTypescriptContext(content) {
|
|
43
|
+
function createTypescriptContext(content, additionalFiles) {
|
|
44
44
|
// Set compiler options.
|
|
45
45
|
const compilerOptions = {
|
|
46
46
|
noEmitOnError: false,
|
|
47
47
|
allowJs: true,
|
|
48
48
|
newLine: ts.NewLineKind.LineFeed,
|
|
49
|
+
moduleResolution: ts.ModuleResolutionKind.NodeJs,
|
|
49
50
|
target: ts.ScriptTarget.ESNext,
|
|
50
51
|
skipLibCheck: true,
|
|
51
52
|
sourceMap: false,
|
|
@@ -55,6 +56,11 @@ function createTypescriptContext(content) {
|
|
|
55
56
|
const compilerHost = new compiler_host_1.WebpackCompilerHost(compilerOptions, basePath, new core_1.virtualFs.SimpleMemoryHost(), false);
|
|
56
57
|
// Add a dummy file to host content.
|
|
57
58
|
compilerHost.writeFile(fileName, content, false);
|
|
59
|
+
if (additionalFiles) {
|
|
60
|
+
for (const key in additionalFiles) {
|
|
61
|
+
compilerHost.writeFile(basePath + key, additionalFiles[key], false);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
58
64
|
// Create the TypeScript program.
|
|
59
65
|
const program = ts.createProgram([fileName], compilerOptions, compilerHost);
|
|
60
66
|
return { compilerHost, program };
|
|
@@ -81,4 +87,4 @@ function transformTypescript(content, transformers, program, compilerHost) {
|
|
|
81
87
|
return compilerHost.readFile(fileName.replace(/\.tsx?$/, '.js'));
|
|
82
88
|
}
|
|
83
89
|
exports.transformTypescript = transformTypescript;
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXN0X2hlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiLi8iLCJzb3VyY2VzIjpbInBhY2thZ2VzL25ndG9vbHMvd2VicGFjay9zcmMvdHJhbnNmb3JtZXJzL2FzdF9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUE7Ozs7OztHQU1HO0FBQ0gsK0NBQWlEO0FBQ2pELGlDQUFpQztBQUNqQyxvREFBdUQ7QUFHdkQseUVBQXlFO0FBQ3pFLFNBQWdCLGdCQUFnQixDQUFvQixJQUFhLEVBQUUsSUFBbUI7SUFDcEYsTUFBTSxLQUFLLEdBQVEsRUFBRSxDQUFDO0lBQ3RCLE1BQU0sTUFBTSxHQUFHLENBQUMsS0FBYyxFQUFFLEVBQUU7UUFDaEMsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLElBQUksRUFBRTtZQUN2QixLQUFLLENBQUMsSUFBSSxDQUFDLEtBQVUsQ0FBQyxDQUFDO1NBQ3hCO1FBQ0QsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDakMsQ0FBQyxDQUFDO0lBQ0YsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFOUIsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDO0FBWEQsNENBV0M7QUFFRCxTQUFnQixZQUFZLENBQUMsVUFBeUI7SUFDcEQsSUFBSSxVQUFVLENBQUMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7UUFDcEMsT0FBTyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pDO0lBRUQsT0FBTyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xDLENBQUM7QUFORCxvQ0FNQztBQUVELFNBQWdCLFdBQVcsQ0FBQyxVQUF5QjtJQUNuRCxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtRQUNwQyxPQUFPLFVBQVUsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDO0tBQ3hFO0lBRUQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDO0FBTkQsa0NBTUM7QUFHRCwwQkFBMEI7QUFDMUIsTUFBTSxRQUFRLEdBQUcsZUFBZSxDQUFDO0FBQ2pDLE1BQU0sUUFBUSxHQUFHLFFBQVEsR0FBRyxjQUFjLENBQUM7QUFFM0MsU0FBZ0IsdUJBQXVCLENBQUMsT0FBZSxFQUFFLGVBQXdDO0lBQy9GLHdCQUF3QjtJQUN4QixNQUFNLGVBQWUsR0FBdUI7UUFDMUMsYUFBYSxFQUFFLEtBQUs7UUFDcEIsT0FBTyxFQUFFLElBQUk7UUFDYixPQUFPLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxRQUFRO1FBQ2hDLGdCQUFnQixFQUFFLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNO1FBQ2hELE1BQU0sRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU07UUFDOUIsWUFBWSxFQUFFLElBQUk7UUFDbEIsU0FBUyxFQUFFLEtBQUs7UUFDaEIsYUFBYSxFQUFFLElBQUk7S0FDcEIsQ0FBQztJQUVGLHdCQUF3QjtJQUN4QixNQUFNLFlBQVksR0FBRyxJQUFJLG1DQUFtQixDQUMxQyxlQUFlLEVBQ2YsUUFBUSxFQUNSLElBQUksZ0JBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxFQUNoQyxLQUFLLENBQ04sQ0FBQztJQUVGLG9DQUFvQztJQUNwQyxZQUFZLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFakQsSUFBSSxlQUFlLEVBQUU7UUFDbkIsS0FBSyxNQUFNLEdBQUcsSUFBSSxlQUFlLEVBQUU7WUFDakMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEdBQUcsR0FBRyxFQUFFLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztTQUNyRTtLQUNGO0lBRUQsaUNBQWlDO0lBQ2pDLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxlQUFlLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFFNUUsT0FBTyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsQ0FBQztBQUNuQyxDQUFDO0FBbENELDBEQWtDQztBQUVELFNBQWdCLG1CQUFtQixDQUNqQyxPQUEyQixFQUMzQixZQUFvRCxFQUNwRCxPQUFvQixFQUNwQixZQUFrQztJQUdsQyx5Q0FBeUM7SUFDekMsSUFBSSxPQUFPLEtBQUssU0FBUyxFQUFFO1FBQ3pCLE1BQU0saUJBQWlCLEdBQUcsdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0QsT0FBTyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQztRQUNwQyxZQUFZLEdBQUcsaUJBQWlCLENBQUMsWUFBWSxDQUFDO0tBQy9DO1NBQU0sSUFBSSxDQUFDLE9BQU8sSUFBSSxDQUFDLFlBQVksRUFBRTtRQUNwQyxNQUFNLElBQUksS0FBSyxDQUFDLDZFQUE2RSxDQUFDLENBQUM7S0FDaEc7SUFFRCxRQUFRO0lBQ1IsTUFBTSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUMvQyxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLENBQ3JFLENBQUM7SUFFRiw4Q0FBOEM7SUFDOUMsSUFBSSxXQUFXLEVBQUU7UUFDZixPQUFPLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBRTNCLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFFRCw0QkFBNEI7SUFDNUIsT0FBTyxZQUFZLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7QUFDbkUsQ0FBQztBQTlCRCxrREE4QkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5pbXBvcnQgeyB2aXJ0dWFsRnMgfSBmcm9tICdAYW5ndWxhci1kZXZraXQvY29yZSc7XG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7IFdlYnBhY2tDb21waWxlckhvc3QgfSBmcm9tICcuLi9jb21waWxlcl9ob3N0JztcblxuXG4vLyBGaW5kIGFsbCBub2RlcyBmcm9tIHRoZSBBU1QgaW4gdGhlIHN1YnRyZWUgb2Ygbm9kZSBvZiBTeW50YXhLaW5kIGtpbmQuXG5leHBvcnQgZnVuY3Rpb24gY29sbGVjdERlZXBOb2RlczxUIGV4dGVuZHMgdHMuTm9kZT4obm9kZTogdHMuTm9kZSwga2luZDogdHMuU3ludGF4S2luZCk6IFRbXSB7XG4gIGNvbnN0IG5vZGVzOiBUW10gPSBbXTtcbiAgY29uc3QgaGVscGVyID0gKGNoaWxkOiB0cy5Ob2RlKSA9PiB7XG4gICAgaWYgKGNoaWxkLmtpbmQgPT09IGtpbmQpIHtcbiAgICAgIG5vZGVzLnB1c2goY2hpbGQgYXMgVCk7XG4gICAgfVxuICAgIHRzLmZvckVhY2hDaGlsZChjaGlsZCwgaGVscGVyKTtcbiAgfTtcbiAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIGhlbHBlcik7XG5cbiAgcmV0dXJuIG5vZGVzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0Rmlyc3ROb2RlKHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiB0cy5Ob2RlIHtcbiAgaWYgKHNvdXJjZUZpbGUuc3RhdGVtZW50cy5sZW5ndGggPiAwKSB7XG4gICAgcmV0dXJuIHNvdXJjZUZpbGUuc3RhdGVtZW50c1swXTtcbiAgfVxuXG4gIHJldHVybiBzb3VyY2VGaWxlLmdldENoaWxkQXQoMCk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRMYXN0Tm9kZShzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlKTogdHMuTm9kZSB8IG51bGwge1xuICBpZiAoc291cmNlRmlsZS5zdGF0ZW1lbnRzLmxlbmd0aCA+IDApIHtcbiAgICByZXR1cm4gc291cmNlRmlsZS5zdGF0ZW1lbnRzW3NvdXJjZUZpbGUuc3RhdGVtZW50cy5sZW5ndGggLSAxXSB8fCBudWxsO1xuICB9XG5cbiAgcmV0dXJuIG51bGw7XG59XG5cblxuLy8gVGVzdCB0cmFuc2Zvcm0gaGVscGVycy5cbmNvbnN0IGJhc2VQYXRoID0gJy9wcm9qZWN0L3NyYy8nO1xuY29uc3QgZmlsZU5hbWUgPSBiYXNlUGF0aCArICd0ZXN0LWZpbGUudHMnO1xuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlVHlwZXNjcmlwdENvbnRleHQoY29udGVudDogc3RyaW5nLCBhZGRpdGlvbmFsRmlsZXM/OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+KSB7XG4gIC8vIFNldCBjb21waWxlciBvcHRpb25zLlxuICBjb25zdCBjb21waWxlck9wdGlvbnM6IHRzLkNvbXBpbGVyT3B0aW9ucyA9IHtcbiAgICBub0VtaXRPbkVycm9yOiBmYWxzZSxcbiAgICBhbGxvd0pzOiB0cnVlLFxuICAgIG5ld0xpbmU6IHRzLk5ld0xpbmVLaW5kLkxpbmVGZWVkLFxuICAgIG1vZHVsZVJlc29sdXRpb246IHRzLk1vZHVsZVJlc29sdXRpb25LaW5kLk5vZGVKcyxcbiAgICB0YXJnZXQ6IHRzLlNjcmlwdFRhcmdldC5FU05leHQsXG4gICAgc2tpcExpYkNoZWNrOiB0cnVlLFxuICAgIHNvdXJjZU1hcDogZmFsc2UsXG4gICAgaW1wb3J0SGVscGVyczogdHJ1ZSxcbiAgfTtcblxuICAvLyBDcmVhdGUgY29tcGlsZXIgaG9zdC5cbiAgY29uc3QgY29tcGlsZXJIb3N0ID0gbmV3IFdlYnBhY2tDb21waWxlckhvc3QoXG4gICAgY29tcGlsZXJPcHRpb25zLFxuICAgIGJhc2VQYXRoLFxuICAgIG5ldyB2aXJ0dWFsRnMuU2ltcGxlTWVtb3J5SG9zdCgpLFxuICAgIGZhbHNlLFxuICApO1xuXG4gIC8vIEFkZCBhIGR1bW15IGZpbGUgdG8gaG9zdCBjb250ZW50LlxuICBjb21waWxlckhvc3Qud3JpdGVGaWxlKGZpbGVOYW1lLCBjb250ZW50LCBmYWxzZSk7XG5cbiAgaWYgKGFkZGl0aW9uYWxGaWxlcykge1xuICAgIGZvciAoY29uc3Qga2V5IGluIGFkZGl0aW9uYWxGaWxlcykge1xuICAgICAgY29tcGlsZXJIb3N0LndyaXRlRmlsZShiYXNlUGF0aCArIGtleSwgYWRkaXRpb25hbEZpbGVzW2tleV0sIGZhbHNlKTtcbiAgICB9XG4gIH1cblxuICAvLyBDcmVhdGUgdGhlIFR5cGVTY3JpcHQgcHJvZ3JhbS5cbiAgY29uc3QgcHJvZ3JhbSA9IHRzLmNyZWF0ZVByb2dyYW0oW2ZpbGVOYW1lXSwgY29tcGlsZXJPcHRpb25zLCBjb21waWxlckhvc3QpO1xuXG4gIHJldHVybiB7IGNvbXBpbGVySG9zdCwgcHJvZ3JhbSB9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdHJhbnNmb3JtVHlwZXNjcmlwdChcbiAgY29udGVudDogc3RyaW5nIHwgdW5kZWZpbmVkLFxuICB0cmFuc2Zvcm1lcnM6IHRzLlRyYW5zZm9ybWVyRmFjdG9yeTx0cy5Tb3VyY2VGaWxlPltdLFxuICBwcm9ncmFtPzogdHMuUHJvZ3JhbSxcbiAgY29tcGlsZXJIb3N0PzogV2VicGFja0NvbXBpbGVySG9zdCxcbikge1xuXG4gIC8vIFVzZSBnaXZlbiBjb250ZXh0IG9yIGNyZWF0ZSBhIG5ldyBvbmUuXG4gIGlmIChjb250ZW50ICE9PSB1bmRlZmluZWQpIHtcbiAgICBjb25zdCB0eXBlc2NyaXB0Q29udGV4dCA9IGNyZWF0ZVR5cGVzY3JpcHRDb250ZXh0KGNvbnRlbnQpO1xuICAgIHByb2dyYW0gPSB0eXBlc2NyaXB0Q29udGV4dC5wcm9ncmFtO1xuICAgIGNvbXBpbGVySG9zdCA9IHR5cGVzY3JpcHRDb250ZXh0LmNvbXBpbGVySG9zdDtcbiAgfSBlbHNlIGlmICghcHJvZ3JhbSB8fCAhY29tcGlsZXJIb3N0KSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCd0cmFuc2Zvcm1UeXBlc2NyaXB0IG5lZWRzIGVpdGhlciBgY29udGVudGAgb3IgYSBgcHJvZ3JhbWAgYW5kIGBjb21waWxlckhvc3QnKTtcbiAgfVxuXG4gIC8vIEVtaXQuXG4gIGNvbnN0IHsgZW1pdFNraXBwZWQsIGRpYWdub3N0aWNzIH0gPSBwcm9ncmFtLmVtaXQoXG4gICAgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCB7IGJlZm9yZTogdHJhbnNmb3JtZXJzIH0sXG4gICk7XG5cbiAgLy8gTG9nIGRpYWdub3N0aWNzIGlmIGVtaXQgd2Fzbid0IHN1Y2Nlc3NmdWxsLlxuICBpZiAoZW1pdFNraXBwZWQpIHtcbiAgICBjb25zb2xlLmVycm9yKGRpYWdub3N0aWNzKTtcblxuICAgIHJldHVybiBudWxsO1xuICB9XG5cbiAgLy8gUmV0dXJuIHRoZSB0cmFuc3BpbGVkIGpzLlxuICByZXR1cm4gY29tcGlsZXJIb3N0LnJlYWRGaWxlKGZpbGVOYW1lLnJlcGxhY2UoL1xcLnRzeD8kLywgJy5qcycpKTtcbn1cbiJdfQ==
|
|
@@ -22,7 +22,6 @@ function elideImports(sourceFile, removedNodes, getTypeChecker) {
|
|
|
22
22
|
}
|
|
23
23
|
const typeChecker = getTypeChecker();
|
|
24
24
|
// Collect all imports and used identifiers
|
|
25
|
-
const specialCaseNames = new Set();
|
|
26
25
|
const usedSymbols = new Set();
|
|
27
26
|
const imports = [];
|
|
28
27
|
ts.forEachChild(sourceFile, function visit(node) {
|
|
@@ -35,21 +34,20 @@ function elideImports(sourceFile, removedNodes, getTypeChecker) {
|
|
|
35
34
|
imports.push(node);
|
|
36
35
|
return;
|
|
37
36
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
37
|
+
let symbol;
|
|
38
|
+
switch (node.kind) {
|
|
39
|
+
case ts.SyntaxKind.Identifier:
|
|
40
|
+
symbol = typeChecker.getSymbolAtLocation(node);
|
|
41
|
+
break;
|
|
42
|
+
case ts.SyntaxKind.ExportSpecifier:
|
|
43
|
+
symbol = typeChecker.getExportSpecifierLocalTargetSymbol(node);
|
|
44
|
+
break;
|
|
45
|
+
case ts.SyntaxKind.ShorthandPropertyAssignment:
|
|
46
|
+
symbol = typeChecker.getShorthandAssignmentValueSymbol(node);
|
|
47
|
+
break;
|
|
49
48
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
specialCaseNames.add(node.name.text);
|
|
49
|
+
if (symbol) {
|
|
50
|
+
usedSymbols.add(symbol);
|
|
53
51
|
}
|
|
54
52
|
ts.forEachChild(node, visit);
|
|
55
53
|
});
|
|
@@ -57,9 +55,6 @@ function elideImports(sourceFile, removedNodes, getTypeChecker) {
|
|
|
57
55
|
return [];
|
|
58
56
|
}
|
|
59
57
|
const isUnused = (node) => {
|
|
60
|
-
if (specialCaseNames.has(node.text)) {
|
|
61
|
-
return false;
|
|
62
|
-
}
|
|
63
58
|
const symbol = typeChecker.getSymbolAtLocation(node);
|
|
64
59
|
return symbol && !usedSymbols.has(symbol);
|
|
65
60
|
};
|
|
@@ -68,29 +63,39 @@ function elideImports(sourceFile, removedNodes, getTypeChecker) {
|
|
|
68
63
|
// "import 'abc';"
|
|
69
64
|
continue;
|
|
70
65
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (isUnused(node.importClause.name)) {
|
|
74
|
-
ops.push(new interfaces_1.RemoveNodeOperation(sourceFile, node));
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
else if (node.importClause.namedBindings
|
|
78
|
-
&& ts.isNamespaceImport(node.importClause.namedBindings)) {
|
|
66
|
+
const namedBindings = node.importClause.namedBindings;
|
|
67
|
+
if (namedBindings && ts.isNamespaceImport(namedBindings)) {
|
|
79
68
|
// "import * as XYZ from 'abc';"
|
|
80
|
-
if (isUnused(
|
|
69
|
+
if (isUnused(namedBindings.name)) {
|
|
81
70
|
ops.push(new interfaces_1.RemoveNodeOperation(sourceFile, node));
|
|
82
71
|
}
|
|
83
72
|
}
|
|
84
|
-
else
|
|
85
|
-
&& ts.isNamedImports(node.importClause.namedBindings)) {
|
|
86
|
-
// "import { XYZ, ... } from 'abc';"
|
|
73
|
+
else {
|
|
87
74
|
const specifierOps = [];
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
75
|
+
let clausesCount = 0;
|
|
76
|
+
// "import { XYZ, ... } from 'abc';"
|
|
77
|
+
if (namedBindings && ts.isNamedImports(namedBindings)) {
|
|
78
|
+
let removedClausesCount = 0;
|
|
79
|
+
clausesCount += namedBindings.elements.length;
|
|
80
|
+
for (const specifier of namedBindings.elements) {
|
|
81
|
+
if (isUnused(specifier.name)) {
|
|
82
|
+
removedClausesCount++;
|
|
83
|
+
// in case we don't have any more namedImports we should remove the parent ie the {}
|
|
84
|
+
const nodeToRemove = clausesCount === removedClausesCount
|
|
85
|
+
? specifier.parent
|
|
86
|
+
: specifier;
|
|
87
|
+
specifierOps.push(new interfaces_1.RemoveNodeOperation(sourceFile, nodeToRemove));
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
// "import XYZ from 'abc';"
|
|
92
|
+
if (node.importClause.name) {
|
|
93
|
+
clausesCount++;
|
|
94
|
+
if (isUnused(node.importClause.name)) {
|
|
95
|
+
specifierOps.push(new interfaces_1.RemoveNodeOperation(sourceFile, node.importClause.name));
|
|
91
96
|
}
|
|
92
97
|
}
|
|
93
|
-
if (specifierOps.length ===
|
|
98
|
+
if (specifierOps.length === clausesCount) {
|
|
94
99
|
ops.push(new interfaces_1.RemoveNodeOperation(sourceFile, node));
|
|
95
100
|
}
|
|
96
101
|
else {
|
|
@@ -101,4 +106,4 @@ function elideImports(sourceFile, removedNodes, getTypeChecker) {
|
|
|
101
106
|
return ops;
|
|
102
107
|
}
|
|
103
108
|
exports.elideImports = elideImports;
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"elide_imports.js","sourceRoot":"./","sources":["packages/ngtools/webpack/src/transformers/elide_imports.ts"],"names":[],"mappings":";;AAAA;;;;;;GAMG;AACH,iCAAiC;AACjC,6CAAuE;AAGvE,8DAA8D;AAC9D,wEAAwE;AACxE,iFAAiF;AACjF,kGAAkG;AAClG,qCAAqC;AACrC,iFAAiF;AACjF,SAAgB,YAAY,CAC1B,UAAyB,EACzB,YAAuB,EACvB,cAAoC;IAEpC,MAAM,GAAG,GAAyB,EAAE,CAAC;IAErC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,2CAA2C;IAC3C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAa,CAAC;IACzC,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,IAAI;QAC7C,qBAAqB;QACrB,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO;SACR;QAED,yBAAyB;QACzB,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEnB,OAAO;SACR;QAED,IAAI,MAA6B,CAAC;QAElC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU;gBAC3B,MAAM,GAAG,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBAC/C,MAAM;YACR,KAAK,EAAE,CAAC,UAAU,CAAC,eAAe;gBAChC,MAAM,GAAG,WAAW,CAAC,mCAAmC,CAAC,IAA0B,CAAC,CAAC;gBACrF,MAAM;YACR,KAAK,EAAE,CAAC,UAAU,CAAC,2BAA2B;gBAC5C,MAAM,GAAG,WAAW,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;gBAC7D,MAAM;SACT;QAED,IAAI,MAAM,EAAE;YACV,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACzB;QAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,QAAQ,GAAG,CAAC,IAAmB,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAErD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;QAC1B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,kBAAkB;YAClB,SAAS;SACV;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;QAEtD,IAAI,aAAa,IAAI,EAAE,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE;YACxD,gCAAgC;YAChC,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;gBAChC,GAAG,CAAC,IAAI,CAAC,IAAI,gCAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;aACrD;SACF;aAAM;YACL,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,IAAI,YAAY,GAAG,CAAC,CAAC;YAErB,oCAAoC;YACpC,IAAI,aAAa,IAAI,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;gBACrD,IAAI,mBAAmB,GAAG,CAAC,CAAC;gBAC5B,YAAY,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAE9C,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,QAAQ,EAAE;oBAC9C,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAC5B,mBAAmB,EAAE,CAAC;wBACtB,oFAAoF;wBACpF,MAAM,YAAY,GAAG,YAAY,KAAK,mBAAmB;4BACvD,CAAC,CAAC,SAAS,CAAC,MAAM;4BAClB,CAAC,CAAC,SAAS,CAAC;wBAEd,YAAY,CAAC,IAAI,CAAC,IAAI,gCAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;qBACtE;iBACF;aACF;YAED,2BAA2B;YAC3B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;gBAC1B,YAAY,EAAE,CAAC;gBAEf,IAAI,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;oBACpC,YAAY,CAAC,IAAI,CAAC,IAAI,gCAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;iBAChF;aACF;YAED,IAAI,YAAY,CAAC,MAAM,KAAK,YAAY,EAAE;gBACxC,GAAG,CAAC,IAAI,CAAC,IAAI,gCAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;aACrD;iBAAM;gBACL,GAAG,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;aAC3B;SACF;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAlHD,oCAkHC","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { RemoveNodeOperation, TransformOperation } from './interfaces';\n\n\n// Remove imports for which all identifiers have been removed.\n// Needs type checker, and works even if it's not the first transformer.\n// Works by removing imports for symbols whose identifiers have all been removed.\n// Doesn't use the `symbol.declarations` because that previous transforms might have removed nodes\n// but the type checker doesn't know.\n// See https://github.com/Microsoft/TypeScript/issues/17552 for more information.\nexport function elideImports(\n  sourceFile: ts.SourceFile,\n  removedNodes: ts.Node[],\n  getTypeChecker: () => ts.TypeChecker,\n): TransformOperation[] {\n  const ops: TransformOperation[] = [];\n\n  if (removedNodes.length === 0) {\n    return [];\n  }\n\n  const typeChecker = getTypeChecker();\n\n  // Collect all imports and used identifiers\n  const usedSymbols = new Set<ts.Symbol>();\n  const imports: ts.ImportDeclaration[] = [];\n\n  ts.forEachChild(sourceFile, function visit(node) {\n    // Skip removed nodes\n    if (removedNodes.includes(node)) {\n      return;\n    }\n\n    // Record import and skip\n    if (ts.isImportDeclaration(node)) {\n      imports.push(node);\n\n      return;\n    }\n\n    let symbol: ts.Symbol | undefined;\n\n    switch (node.kind) {\n      case ts.SyntaxKind.Identifier:\n        symbol = typeChecker.getSymbolAtLocation(node);\n        break;\n      case ts.SyntaxKind.ExportSpecifier:\n        symbol = typeChecker.getExportSpecifierLocalTargetSymbol(node as ts.ExportSpecifier);\n        break;\n      case ts.SyntaxKind.ShorthandPropertyAssignment:\n        symbol = typeChecker.getShorthandAssignmentValueSymbol(node);\n        break;\n    }\n\n    if (symbol) {\n      usedSymbols.add(symbol);\n    }\n\n    ts.forEachChild(node, visit);\n  });\n\n  if (imports.length === 0) {\n    return [];\n  }\n\n  const isUnused = (node: ts.Identifier) => {\n    const symbol = typeChecker.getSymbolAtLocation(node);\n\n    return symbol && !usedSymbols.has(symbol);\n  };\n\n  for (const node of imports) {\n    if (!node.importClause) {\n      // \"import 'abc';\"\n      continue;\n    }\n\n    const namedBindings = node.importClause.namedBindings;\n\n    if (namedBindings && ts.isNamespaceImport(namedBindings)) {\n      // \"import * as XYZ from 'abc';\"\n      if (isUnused(namedBindings.name)) {\n        ops.push(new RemoveNodeOperation(sourceFile, node));\n      }\n    } else {\n      const specifierOps = [];\n      let clausesCount = 0;\n\n      // \"import { XYZ, ... } from 'abc';\"\n      if (namedBindings && ts.isNamedImports(namedBindings)) {\n        let removedClausesCount = 0;\n        clausesCount += namedBindings.elements.length;\n\n        for (const specifier of namedBindings.elements) {\n          if (isUnused(specifier.name)) {\n            removedClausesCount++;\n            // in case we don't have any more namedImports we should remove the parent ie the {}\n            const nodeToRemove = clausesCount === removedClausesCount\n              ? specifier.parent\n              : specifier;\n\n            specifierOps.push(new RemoveNodeOperation(sourceFile, nodeToRemove));\n          }\n        }\n      }\n\n      // \"import XYZ from 'abc';\"\n      if (node.importClause.name) {\n        clausesCount++;\n\n        if (isUnused(node.importClause.name)) {\n          specifierOps.push(new RemoveNodeOperation(sourceFile, node.importClause.name));\n        }\n      }\n\n      if (specifierOps.length === clausesCount) {\n        ops.push(new RemoveNodeOperation(sourceFile, node));\n      } else {\n        ops.push(...specifierOps);\n      }\n    }\n  }\n\n  return ops;\n}\n"]}
|