@ngtools/webpack 14.2.0-next.0 → 14.2.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "14.2.0-next.0",
+  "version": "14.2.0-next.1",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",

package/src/transformers/elide_imports.js

@@ -48,7 +48,7 @@ function elideImports(sourceFile, removedNodes, getTypeChecker, compilerOptions)
     const usedSymbols = new Set();
     const imports = [];
     ts.forEachChild(sourceFile, function visit(node) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         // Skip removed nodes.
         if (removedNodes.includes(node)) {
             return;
@@ -66,35 +66,8 @@ function elideImports(sourceFile, removedNodes, getTypeChecker, compilerOptions)
             }
             return;
         }
-        let symbol;
-        if (ts.isTypeReferenceNode(node)) {
-            if (!compilerOptions.emitDecoratorMetadata) {
-                // Skip and mark as unused if emitDecoratorMetadata is disabled.
-                return;
-            }
-            const parent = node.parent;
-            let isTypeReferenceForDecoratoredNode = false;
-            switch (parent.kind) {
-                case ts.SyntaxKind.GetAccessor:
-                case ts.SyntaxKind.PropertyDeclaration:
-                case ts.SyntaxKind.MethodDeclaration:
-                    isTypeReferenceForDecoratoredNode = !!((_b = parent.decorators) === null || _b === void 0 ? void 0 : _b.length);
-                    break;
-                case ts.SyntaxKind.Parameter:
-                    // - A constructor parameter can be decorated or the class itself is decorated.
-                    // - The parent of the parameter is decorated example a method declaration or a set accessor.
-                    // In all cases we need the type reference not to be elided.
-                    isTypeReferenceForDecoratoredNode = !!(((_c = parent.decorators) === null || _c === void 0 ? void 0 : _c.length) ||
-                        (ts.isSetAccessor(parent.parent) && !!((_d = parent.parent.decorators) === null || _d === void 0 ? void 0 : _d.length)) ||
-                        (ts.isConstructorDeclaration(parent.parent) &&
-                            !!((_e = parent.parent.parent.decorators) === null || _e === void 0 ? void 0 : _e.length)));
-                    break;
-            }
-            if (isTypeReferenceForDecoratoredNode) {
-                symbol = typeChecker.getSymbolAtLocation(node.typeName);
-            }
-        }
-        else {
+        if (!ts.isTypeReferenceNode(node)) {
+            let symbol;
             switch (node.kind) {
                 case ts.SyntaxKind.Identifier:
                     const parent = node.parent;
@@ -115,9 +88,9 @@ function elideImports(sourceFile, removedNodes, getTypeChecker, compilerOptions)
                     symbol = typeChecker.getShorthandAssignmentValueSymbol(node);
                     break;
             }
-        }
-        if (symbol) {
-            usedSymbols.add(symbol);
+            if (symbol) {
+                usedSymbols.add(symbol);
+            }
         }
         ts.forEachChild(node, visit);
     });
@@ -152,7 +125,7 @@ function elideImports(sourceFile, removedNodes, getTypeChecker, compilerOptions)
                 let removedClausesCount = 0;
                 clausesCount += namedBindings.elements.length;
                 for (const specifier of namedBindings.elements) {
-                    if (isUnused(specifier.name)) {
+                    if (specifier.isTypeOnly || isUnused(specifier.name)) {
                         removedClausesCount++;
                         // in case we don't have any more namedImports we should remove the parent ie the {}
                         const nodeToRemove = clausesCount === removedClausesCount ? specifier.parent : specifier;
@@ -163,7 +136,7 @@ function elideImports(sourceFile, removedNodes, getTypeChecker, compilerOptions)
             // "import XYZ from 'abc';"
             if (node.importClause.name) {
                 clausesCount++;
-                if (isUnused(node.importClause.name)) {
+                if (node.importClause.isTypeOnly || isUnused(node.importClause.name)) {
                     specifierNodeRemovals.push(node.importClause.name);
                 }
             }