@angular-devkit/build-optimizer 0.802.0-next.1 → 0.802.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/build-optimizer",
-  "version": "0.802.0-next.1",
+  "version": "0.802.2",
   "description": "Angular Build Optimizer",
   "experimental": true,
   "main": "src/index.js",
@@ -11,7 +11,8 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.4.5",
+    "tslib": "1.10.0",
+    "typescript": "3.5.3",
     "webpack-sources": "1.3.0"
   },
   "keywords": [

package/src/build-optimizer/build-optimizer.js

@@ -106,7 +106,7 @@ function buildOptimizer(options) {
     if (!isWebpackBundle && (ignoreTest || import_tslib_1.testImportTslib(content))) {
         getTransforms.unshift(import_tslib_1.getImportTslibTransformer);
     }
-    getTransforms.unshift(wrap_enums_1.getWrapEnumsTransformer);
+    getTransforms.push(wrap_enums_1.getWrapEnumsTransformer);
     const transformJavascriptOpts = {
         content: content,
         inputFilePath: options.inputFilePath,

package/src/build-optimizer/webpack-plugin.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class BuildOptimizerWebpackPlugin {
     apply(compiler) {
-        compiler.hooks.normalModuleFactory.tap("BuildOptimizerWebpackPlugin", nmf => {
-            nmf.hooks.module.tap("BuildOptimizerWebpackPlugin", (module, data) => {
+        compiler.hooks.normalModuleFactory.tap('BuildOptimizerWebpackPlugin', nmf => {
+            nmf.hooks.module.tap('BuildOptimizerWebpackPlugin', (module, data) => {
                 const resolveData = data.resourceResolveData;
                 if (resolveData && resolveData.descriptionFileData) {
                     // Only TS packages should use Build Optimizer.

package/src/helpers/ast-utils.d.ts

@@ -1,11 +1,5 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
 import * as ts from 'typescript';
 export declare function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.SyntaxKind): T[];
 export declare function addPureComment<T extends ts.Node>(node: T): T;
 export declare function hasPureComment(node: ts.Node): boolean;
+export declare function isHelperName(name: string): boolean;

package/src/helpers/ast-utils.js

@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+const tslib = require("tslib");
 const ts = require("typescript");
 const pureFunctionComment = '@__PURE__';
+// We include only exports that start with '__' because tslib helpers
+// all start with a suffix of two underscores.
+const tslibHelpers = new Set(Object.keys(tslib).filter(h => h.startsWith('__')));
 // Find all nodes from the AST in the subtree of node of SyntaxKind kind.
 function collectDeepNodes(node, kind) {
     const nodes = [];
@@ -34,3 +38,7 @@ function hasPureComment(node) {
     return !!leadingComment && leadingComment.some(comment => comment.text === pureFunctionComment);
 }
 exports.hasPureComment = hasPureComment;
+function isHelperName(name) {
+    return tslibHelpers.has(name);
+}
+exports.isHelperName = isHelperName;

package/src/transforms/import-tslib.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const ts = require("typescript");
+const ast_utils_1 = require("../helpers/ast-utils");
 /**
  * @deprecated From 0.9.0
  */
@@ -28,7 +29,7 @@ function getImportTslibTransformer() {
                     const declarations = node.declarationList.declarations;
                     if (declarations.length === 1 && ts.isIdentifier(declarations[0].name)) {
                         const name = declarations[0].name.text;
-                        if (isHelperName(name)) {
+                        if (ast_utils_1.isHelperName(name)) {
                             // TODO: maybe add a few more checks, like checking the first part of the assignment.
                             const tslibImport = createTslibImport(name, useRequire);
                             tslibImports.push(tslibImport);
@@ -69,13 +70,3 @@ function createTslibImport(name, useRequire = false) {
         return newNode;
     }
 }
-function isHelperName(name) {
-    // TODO: there are more helpers than these, should we replace them all?
-    const tsHelpers = [
-        '__extends',
-        '__decorate',
-        '__metadata',
-        '__param',
-    ];
-    return tsHelpers.indexOf(name) !== -1;
-}

package/src/transforms/prefix-functions.js

@@ -38,10 +38,8 @@ function findTopLevelFunctions(parentNode) {
         // need to mark function calls inside them as pure.
         // Class static initializers in ES2015 are an exception we don't cover. They would need similar
         // processing as enums to prevent property setting from causing the class to be retained.
-        if (ts.isFunctionDeclaration(node)
-            || ts.isFunctionExpression(node)
-            || ts.isClassDeclaration(node)
-            || ts.isClassExpression(node)
+        if (ts.isFunctionLike(node)
+            || ts.isClassLike(node)
             || ts.isArrowFunction(node)
             || ts.isMethodDeclaration(node)) {
             return;
@@ -68,6 +66,9 @@ function findTopLevelFunctions(parentNode) {
             }
             else if (ts.isCallExpression(innerNode)) {
                 let expression = innerNode.expression;
+                if (ts.isIdentifier(expression) && ast_utils_1.isHelperName(expression.text)) {
+                    return;
+                }
                 while (expression && ts.isParenthesizedExpression(expression)) {
                     expression = expression.expression;
                 }

package/src/transforms/wrap-enums.js

@@ -50,7 +50,7 @@ function visitBlockStatements(statements, context) {
             }
         }
         else {
-            return ts.visitEachChild(node, visitor, context);
+            return node;
         }
     };
     // 'oIndex' is the original statement index; 'uIndex' is the updated statement index
@@ -96,7 +96,7 @@ function visitBlockStatements(statements, context) {
                         // skip the export
                         oIndex++;
                     }
-                    const enumStatements = findStatements(name, statements, oIndex + 1);
+                    const enumStatements = findStatements(name, statements, oIndex, 1);
                     if (!enumStatements) {
                         continue;
                     }
@@ -233,7 +233,7 @@ function updateHostNode(hostNode, expression) {
  Foo = __decorate([]);
  ```
  */
-function findStatements(name, statements, statementIndex) {
+function findStatements(name, statements, statementIndex, offset = 0) {
     let count = 1;
     for (let index = statementIndex + 1; index < statements.length; ++index) {
         const statement = statements[index];
@@ -277,7 +277,7 @@ function findStatements(name, statements, statementIndex) {
         break;
     }
     if (count > 1) {
-        return statements.slice(statementIndex, statementIndex + count);
+        return statements.slice(statementIndex + offset, statementIndex + count);
     }
     return undefined;
 }