fix(@angular-devkit/build-optimizer): support 2.7+ exported enums

angular · May 10, 2018 · 959826b · 959826b
1 parent d043289
commit 959826b
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
@@ -63,7 +63,7 @@ describe('build-optimizer', () => {
           ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
           ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
           return ChangeDetectionStrategy;
-        })({});
+        })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
         var Clazz = /*@__PURE__*/ (function () { function Clazz() { } ${staticProperty} return Clazz; }());
         var ComponentClazz = /*@__PURE__*/ (function () {
           function ComponentClazz() { }

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -174,16 +174,32 @@ function findTs2_3EnumIife(name: string, statement: ts.Statement): ts.CallExpres
 
   const callExpression = expression;
 
-  const argument = expression.arguments[0];
-  if (!ts.isBinaryExpression(argument)
-      || argument.operatorToken.kind !== ts.SyntaxKind.BarBarToken) {
+  let argument = expression.arguments[0];
+  if (!ts.isBinaryExpression(argument)) {
     return null;
   }
 
   if (!ts.isIdentifier(argument.left) || argument.left.text !== name) {
     return null;
   }
 
+  if (argument.operatorToken.kind === ts.SyntaxKind.FirstAssignment) {
+    if (!ts.isBinaryExpression(argument.right)
+        || argument.right.operatorToken.kind !== ts.SyntaxKind.BarBarToken) {
+      return null;
+    }
+
+    argument = argument.right;
+  }
+
+  if (!ts.isBinaryExpression(argument)) {
+    return null;
+  }
+
+  if (argument.operatorToken.kind !== ts.SyntaxKind.BarBarToken) {
+    return null;
+  }
+
   expression = expression.expression;
   while (ts.isParenthesizedExpression(expression)) {
     expression = expression.expression;
@@ -406,7 +422,7 @@ function updateEnumIife(hostNode: ts.VariableStatement, iife: ts.CallExpression)
       updatedFunction,
     ),
     iife.typeArguments,
-    [ts.createObjectLiteral()],
+    iife.arguments,
   );
 
   return updateHostNode(hostNode, updatedIife);

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -50,7 +50,7 @@ describe('wrap-enums', () => {
         ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
         ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
         return ChangeDetectionStrategy;
-      })({});
+      })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
     `;
 
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
@@ -73,7 +73,7 @@ describe('wrap-enums', () => {
           AnimatorControlState[AnimatorControlState["FINISHED"] = 3] = "FINISHED";
           AnimatorControlState[AnimatorControlState["DESTROYED"] = 4] = "DESTROYED";
           return AnimatorControlState;
-      })({});
+      })(AnimatorControlState || (AnimatorControlState = {}));
     `;
 
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
@@ -155,9 +155,31 @@ describe('wrap-enums', () => {
           RequestMethod[RequestMethod["Head"] = 5] = "Head";
           RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
           return RequestMethod;
-      })({});
+      })(RequestMethod || (RequestMethod = {}));
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('wraps exported enums in IIFE', () => {
+    const input = tags.stripIndent`
+      var ExportEnum;
+      (function (ExportEnum) {
+        ExportEnum[ExportEnum["A"] = 0] = "A";
+        ExportEnum[ExportEnum["B"] = 1] = "B";
+        ExportEnum[ExportEnum["C"] = 2] = "C";
+      })(ExportEnum = exports.ExportEnum || (exports.ExportEnum = {}));
+    `;
+    const output = tags.stripIndent`
+      var ExportEnum = /*@__PURE__*/ (function (ExportEnum) {
+        ExportEnum[ExportEnum["A"] = 0] = "A";
+        ExportEnum[ExportEnum["B"] = 1] = "B";
+        ExportEnum[ExportEnum["C"] = 2] = "C";
+        return ExportEnum;
+      })(ExportEnum = exports.ExportEnum || (exports.ExportEnum = {}));
     `;
 
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
+
 });