fix(@angular-devkit/build-optimizer): prefix classes with tslib namespace imports

clydin · hansl · commit 843e969e6dd8 · 2018-06-05T17:55:17.000-07:00
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
@@ -27,7 +27,7 @@ export function testPrefixClasses(content: string) {
       exportVarSetter, multiLineComment,
       /\(/, multiLineComment,
       /\s*function \(_super\) {/, newLine,
-      /\w*__extends\(\w+, _super\);/,
+      /\w*\.?__extends\(\w+, _super\);/,
     ],
   ].map(arr => new RegExp(arr.map(x => x.source).join(''), 'm'));
 
@@ -179,19 +179,24 @@ function isDownleveledClass(node: ts.Node): boolean {
     return false;
   }
 
-  if (functionStatements.length < 3) {
+  if (functionStatements.length < 3 || !ts.isExpressionStatement(firstStatement)) {
     return false;
   }
 
-  if (!ts.isExpressionStatement(firstStatement)
-      || !ts.isCallExpression(firstStatement.expression)) {
+  if (!ts.isCallExpression(firstStatement.expression)) {
     return false;
   }
 
   const extendCallExpression = firstStatement.expression;
 
-  if (!ts.isIdentifier(extendCallExpression.expression)
-      || !extendCallExpression.expression.text.endsWith(extendsHelperName)) {
+  let functionName;
+  if (ts.isIdentifier(extendCallExpression.expression)) {
+    functionName = extendCallExpression.expression.text;
+  } else if (ts.isPropertyAccessExpression(extendCallExpression.expression)) {
+    functionName = extendCallExpression.expression.name.text;
+  }
+
+  if (!functionName || !functionName.endsWith(extendsHelperName)) {
     return false;
   }
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
@@ -218,6 +218,30 @@ describe('prefix-classes', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
+  it('works with tslib namespace import', () => {
+    const input = tags.stripIndent`
+      var BufferSubscriber = /** @class */ (function (_super) {
+        tslib_1.__extends(BufferSubscriber, _super);
+        function BufferSubscriber() {
+          return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return BufferSubscriber;
+      }(OuterSubscriber));
+    `;
+    const output = tags.stripIndent`
+      var BufferSubscriber = /*@__PURE__*/ (function (_super) {
+        tslib_1.__extends(BufferSubscriber, _super);
+        function BufferSubscriber() {
+          return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return BufferSubscriber;
+      }(OuterSubscriber));
+    `;
+
+    expect(testPrefixClasses(input)).toBeTruthy();
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
   it('fixes the RxJS use case (issue #214)', () => {
     const input = `
       var ExtendedClass = /*@__PURE__*/ (/*@__PURE__*/ function (_super) {
