Skip to content

fix(@ngtools/webpack): elide type only named imports when using emitDecoratorMetadata #23671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2022
Merged

fix(@ngtools/webpack): elide type only named imports when using emitDecoratorMetadata #23671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 7 additions & 38 deletions packages/ngtools/webpack/src/transformers/elide_imports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,39 +54,8 @@ export function elideImports(
return;
}

let symbol: ts.Symbol | undefined;
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 = !!parent.decorators?.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 = !!(
parent.decorators?.length ||
(ts.isSetAccessor(parent.parent) && !!parent.parent.decorators?.length) ||
(ts.isConstructorDeclaration(parent.parent) &&
!!parent.parent.parent.decorators?.length)
);
break;
}

if (isTypeReferenceForDecoratoredNode) {
symbol = typeChecker.getSymbolAtLocation(node.typeName);
}
} else {
if (!ts.isTypeReferenceNode(node)) {
let symbol: ts.Symbol | undefined;
switch (node.kind) {
case ts.SyntaxKind.Identifier:
const parent = node.parent;
Expand All @@ -106,10 +75,10 @@ export function elideImports(
symbol = typeChecker.getShorthandAssignmentValueSymbol(node);
break;
}
}

if (symbol) {
usedSymbols.add(symbol);
if (symbol) {
usedSymbols.add(symbol);
}
}

ts.forEachChild(node, visit);
Expand Down Expand Up @@ -153,7 +122,7 @@ export function elideImports(
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 =
Expand All @@ -168,7 +137,7 @@ export function elideImports(
if (node.importClause.name) {
clausesCount++;

if (isUnused(node.importClause.name)) {
if (node.importClause.isTypeOnly || isUnused(node.importClause.name)) {
specifierNodeRemovals.push(node.importClause.name);
}
}
Expand Down
38 changes: 38 additions & 0 deletions packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,44 @@ describe('@ngtools/webpack transformers', () => {
experimentalDecorators: true,
};

it('should elide type only named imports', () => {
const input = tags.stripIndent`
import { Decorator } from './decorator';
import { type OnChanges, type SimpleChanges } from './type';
@Decorator()
export class Foo implements OnChanges {
ngOnChanges(changes: SimpleChanges) { }
}
${dummyNode}
`;

const output = tags.stripIndent`
import { __decorate } from "tslib";
import { Decorator } from './decorator';
let Foo = class Foo { ngOnChanges(changes) { } };
Foo = __decorate([ Decorator() ], Foo);
export { Foo };
`;

const { program, compilerHost } = createTypescriptContext(
input,
additionalFiles,
true,
extraCompilerOptions,
);
const result = transformTypescript(
undefined,
[transformer(program)],
program,
compilerHost,
);

expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
});

it('should not remove ctor parameter type reference', () => {
const input = tags.stripIndent`
import { Decorator } from './decorator';
Expand Down