Skip to content

fix(@angular-devkit/build-optimizer): wrap TypeScript string enums in… #14810

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
Jun 19, 2019
Merged

fix(@angular-devkit/build-optimizer): wrap TypeScript string enums in… #14810

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
11 changes: 8 additions & 3 deletions packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,16 @@ function findTs2_3EnumIife(
}

const memberArgument = assignment.argumentExpression;
if (!memberArgument || !ts.isBinaryExpression(memberArgument)
|| memberArgument.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
return null;
// String enum
if (ts.isStringLiteral(memberArgument)) {
return [callExpression, exportExpression];
}

// Non string enums
if (!ts.isBinaryExpression(memberArgument)
|| memberArgument.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
return null;
}

if (!ts.isElementAccessExpression(memberArgument.left)) {
return null;
Expand Down
21 changes: 21 additions & 0 deletions packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,27 @@ describe('wrap enums and classes transformer', () => {
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
});

it('wraps TS string enums in IIFE', () => {
const input = tags.stripIndent`
export var NotificationKind;
(function (NotificationKind) {
NotificationKind["NEXT"] = "N";
NotificationKind["ERROR"] = "E";
NotificationKind["COMPLETE"] = "C";
})(NotificationKind || (NotificationKind = {}));
`;
const output = tags.stripIndent`
export var NotificationKind = /*@__PURE__*/ (function (NotificationKind) {
NotificationKind["NEXT"] = "N";
NotificationKind["ERROR"] = "E";
NotificationKind["COMPLETE"] = "C";
return NotificationKind;
})({});
`;

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

it('wraps tsickle enums in IIFE', () => {
const input = tags.stripIndent`
/** @enum {number} */
Expand Down