@angular-devkit/build-optimizer 0.13.4 → 0.13.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/transforms/prefix-functions.js +8 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@angular-devkit/build-optimizer",
3
- "version": "0.13.4",
3
+ "version": "0.13.8",
4
4
  "description": "Angular Build Optimizer",
5
5
  "main": "src/index.js",
6
6
  "typings": "src/index.d.ts",
package/src/transforms/prefix-functions.js CHANGED
@@ -54,6 +54,13 @@ function findTopLevelFunctions(parentNode) {
54
54
  if (!innerNode) {
55
55
  return;
56
56
  }
57
+ if ((ts.isFunctionExpression(innerNode) || ts.isArrowFunction(innerNode))
58
+ && ts.isParenthesizedExpression(node)) {
59
+ // pure functions can be wrapped in parentizes
60
+ // we should not add pure comments to this sort of syntax.
61
+ // example var foo = (() => x)
62
+ return;
63
+ }
57
64
  if (noPureComment) {
58
65
  if (ts.isNewExpression(innerNode)) {
59
66
  topLevelFunctions.add(node);
@@ -83,4 +90,4 @@ function findTopLevelFunctions(parentNode) {
83
90
  return topLevelFunctions;
84
91
  }
85
92
  exports.findTopLevelFunctions = findTopLevelFunctions;
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlZml4LWZ1bmN0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIuLyIsInNvdXJjZXMiOlsicGFja2FnZXMvYW5ndWxhcl9kZXZraXQvYnVpbGRfb3B0aW1pemVyL3NyYy90cmFuc2Zvcm1zL3ByZWZpeC1mdW5jdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQTs7Ozs7O0dBTUc7QUFDSCxpQ0FBaUM7QUFDakMsb0RBQXNFO0FBRXRFLFNBQWdCLDZCQUE2QjtJQUMzQyxPQUFPLENBQUMsT0FBaUMsRUFBaUMsRUFBRTtRQUMxRSxNQUFNLFdBQVcsR0FBa0MsQ0FBQyxFQUFpQixFQUFFLEVBQUU7WUFFdkUsTUFBTSxpQkFBaUIsR0FBRyxxQkFBcUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUVwRCxNQUFNLE9BQU8sR0FBZSxDQUFDLElBQWEsRUFBVyxFQUFFO2dCQUNyRCxvREFBb0Q7Z0JBQ3BELElBQUksaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUMvQixNQUFNLE9BQU8sR0FBRywwQkFBYyxDQUFDLElBQUksQ0FBQyxDQUFDO29CQUVyQyxrQ0FBa0M7b0JBQ2xDLE9BQU8sRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO2lCQUNyRDtnQkFFRCwrQkFBK0I7Z0JBQy9CLE9BQU8sRUFBRSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQ25ELENBQUMsQ0FBQztZQUVGLE9BQU8sRUFBRSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDbkMsQ0FBQyxDQUFDO1FBRUYsT0FBTyxXQUFXLENBQUM7SUFDckIsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQXhCRCxzRUF3QkM7QUFFRCxTQUFnQixxQkFBcUIsQ0FBQyxVQUFtQjtJQUN2RCxNQUFNLGlCQUFpQixHQUFHLElBQUksR0FBRyxFQUFXLENBQUM7SUFFN0MsU0FBUyxFQUFFLENBQUMsSUFBYTtRQUN2QixrRUFBa0U7UUFDbEUsMEZBQTBGO1FBQzFGLHFGQUFxRjtRQUNyRixtREFBbUQ7UUFDbkQsK0ZBQStGO1FBQy9GLHlGQUF5RjtRQUN6RixJQUFJLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUM7ZUFDN0IsRUFBRSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQztlQUM3QixFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDO2VBQzNCLEVBQUUsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDO2VBQ3hCLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsRUFDL0I7WUFDQSxPQUFPO1NBQ1I7UUFFRCxJQUFJLGFBQWEsR0FBRyxDQUFDLDBCQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUMsSUFBSSxTQUFTLEdBQUcsSUFBSSxDQUFDO1FBQ3JCLE9BQU8sU0FBUyxJQUFJLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxTQUFTLENBQUMsRUFBRTtZQUMzRCxTQUFTLEdBQUcsU0FBUyxDQUFDLFVBQVUsQ0FBQztZQUNqQyxhQUFhLEdBQUcsYUFBYSxJQUFJLENBQUMsMEJBQWMsQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUM3RDtRQUVELElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDZCxPQUFPO1NBQ1I7UUFFRCxJQUFJLGFBQWEsRUFBRTtZQUNqQixJQUFJLEVBQUUsQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDLEVBQUU7Z0JBQ2pDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUM3QjtpQkFBTSxJQUFJLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRTtnQkFDekMsSUFBSSxVQUFVLEdBQWtCLFNBQVMsQ0FBQyxVQUFVLENBQUM7Z0JBQ3JELE9BQU8sVUFBVSxJQUFJLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxVQUFVLENBQUMsRUFBRTtvQkFDN0QsVUFBVSxHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUM7aUJBQ3BDO2dCQUNELElBQUksVUFBVSxFQUFFO29CQUNkLElBQUksRUFBRSxDQUFDLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxFQUFFO3dCQUN2Qyw2QkFBNkI7d0JBQzdCLDJFQUEyRTt3QkFDM0UsSUFBSSxTQUFTLENBQUMsU0FBUyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7NEJBQ3BDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQzt5QkFDN0I7cUJBQ0Y7eUJBQU07d0JBQ0wsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO3FCQUM3QjtpQkFDRjthQUNGO1NBQ0Y7UUFFRCxFQUFFLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsRUFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFaEMsT0FBTyxpQkFBaUIsQ0FBQztBQUMzQixDQUFDO0FBMURELHNEQTBEQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuaW1wb3J0IHsgYWRkUHVyZUNvbW1lbnQsIGhhc1B1cmVDb21tZW50IH0gZnJvbSAnLi4vaGVscGVycy9hc3QtdXRpbHMnO1xuXG5leHBvcnQgZnVuY3Rpb24gZ2V0UHJlZml4RnVuY3Rpb25zVHJhbnNmb3JtZXIoKTogdHMuVHJhbnNmb3JtZXJGYWN0b3J5PHRzLlNvdXJjZUZpbGU+IHtcbiAgcmV0dXJuIChjb250ZXh0OiB0cy5UcmFuc2Zvcm1hdGlvbkNvbnRleHQpOiB0cy5UcmFuc2Zvcm1lcjx0cy5Tb3VyY2VGaWxlPiA9PiB7XG4gICAgY29uc3QgdHJhbnNmb3JtZXI6IHRzLlRyYW5zZm9ybWVyPHRzLlNvdXJjZUZpbGU+ID0gKHNmOiB0cy5Tb3VyY2VGaWxlKSA9PiB7XG5cbiAgICAgIGNvbnN0IHRvcExldmVsRnVuY3Rpb25zID0gZmluZFRvcExldmVsRnVuY3Rpb25zKHNmKTtcblxuICAgICAgY29uc3QgdmlzaXRvcjogdHMuVmlzaXRvciA9IChub2RlOiB0cy5Ob2RlKTogdHMuTm9kZSA9PiB7XG4gICAgICAgIC8vIEFkZCBwdXJlIGZ1bmN0aW9uIGNvbW1lbnQgdG8gdG9wIGxldmVsIGZ1bmN0aW9ucy5cbiAgICAgICAgaWYgKHRvcExldmVsRnVuY3Rpb25zLmhhcyhub2RlKSkge1xuICAgICAgICAgIGNvbnN0IG5ld05vZGUgPSBhZGRQdXJlQ29tbWVudChub2RlKTtcblxuICAgICAgICAgIC8vIFJlcGxhY2Ugbm9kZSB3aXRoIG1vZGlmaWVkIG9uZS5cbiAgICAgICAgICByZXR1cm4gdHMudmlzaXRFYWNoQ2hpbGQobmV3Tm9kZSwgdmlzaXRvciwgY29udGV4dCk7XG4gICAgICAgIH1cblxuICAgICAgICAvLyBPdGhlcndpc2UgcmV0dXJuIG5vZGUgYXMgaXMuXG4gICAgICAgIHJldHVybiB0cy52aXNpdEVhY2hDaGlsZChub2RlLCB2aXNpdG9yLCBjb250ZXh0KTtcbiAgICAgIH07XG5cbiAgICAgIHJldHVybiB0cy52aXNpdE5vZGUoc2YsIHZpc2l0b3IpO1xuICAgIH07XG5cbiAgICByZXR1cm4gdHJhbnNmb3JtZXI7XG4gIH07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmaW5kVG9wTGV2ZWxGdW5jdGlvbnMocGFyZW50Tm9kZTogdHMuTm9kZSk6IFNldDx0cy5Ob2RlPiB7XG4gIGNvbnN0IHRvcExldmVsRnVuY3Rpb25zID0gbmV3IFNldDx0cy5Ob2RlPigpO1xuXG4gIGZ1bmN0aW9uIGNiKG5vZGU6IHRzLk5vZGUpIHtcbiAgICAvLyBTdG9wIHJlY3Vyc2luZyBpbnRvIHRoaXMgYnJhbmNoIGlmIGl0J3MgYSBkZWZpbml0aW9uIGNvbnN0cnVjdC5cbiAgICAvLyBUaGVzZSBhcmUgZnVuY3Rpb24gZXhwcmVzc2lvbiwgZnVuY3Rpb24gZGVjbGFyYXRpb24sIGNsYXNzLCBvciBhcnJvdyBmdW5jdGlvbiAobGFtYmRhKS5cbiAgICAvLyBUaGUgYm9keSBvZiB0aGVzZSBjb25zdHJ1Y3RzIHdpbGwgbm90IGV4ZWN1dGUgd2hlbiBsb2FkaW5nIHRoZSBtb2R1bGUsIHNvIHdlIGRvbid0XG4gICAgLy8gbmVlZCB0byBtYXJrIGZ1bmN0aW9uIGNhbGxzIGluc2lkZSB0aGVtIGFzIHB1cmUuXG4gICAgLy8gQ2xhc3Mgc3RhdGljIGluaXRpYWxpemVycyBpbiBFUzIwMTUgYXJlIGFuIGV4Y2VwdGlvbiB3ZSBkb24ndCBjb3Zlci4gVGhleSB3b3VsZCBuZWVkIHNpbWlsYXJcbiAgICAvLyBwcm9jZXNzaW5nIGFzIGVudW1zIHRvIHByZXZlbnQgcHJvcGVydHkgc2V0dGluZyBmcm9tIGNhdXNpbmcgdGhlIGNsYXNzIHRvIGJlIHJldGFpbmVkLlxuICAgIGlmICh0cy5pc0Z1bmN0aW9uRGVjbGFyYXRpb24obm9kZSlcbiAgICAgIHx8IHRzLmlzRnVuY3Rpb25FeHByZXNzaW9uKG5vZGUpXG4gICAgICB8fCB0cy5pc0NsYXNzRGVjbGFyYXRpb24obm9kZSlcbiAgICAgIHx8IHRzLmlzQXJyb3dGdW5jdGlvbihub2RlKVxuICAgICAgfHwgdHMuaXNNZXRob2REZWNsYXJhdGlvbihub2RlKVxuICAgICkge1xuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGxldCBub1B1cmVDb21tZW50ID0gIWhhc1B1cmVDb21tZW50KG5vZGUpO1xuICAgIGxldCBpbm5lck5vZGUgPSBub2RlO1xuICAgIHdoaWxlIChpbm5lck5vZGUgJiYgdHMuaXNQYXJlbnRoZXNpemVkRXhwcmVzc2lvbihpbm5lck5vZGUpKSB7XG4gICAgICBpbm5lck5vZGUgPSBpbm5lck5vZGUuZXhwcmVzc2lvbjtcbiAgICAgIG5vUHVyZUNvbW1lbnQgPSBub1B1cmVDb21tZW50ICYmICFoYXNQdXJlQ29tbWVudChpbm5lck5vZGUpO1xuICAgIH1cblxuICAgIGlmICghaW5uZXJOb2RlKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaWYgKG5vUHVyZUNvbW1lbnQpIHtcbiAgICAgIGlmICh0cy5pc05ld0V4cHJlc3Npb24oaW5uZXJOb2RlKSkge1xuICAgICAgICB0b3BMZXZlbEZ1bmN0aW9ucy5hZGQobm9kZSk7XG4gICAgICB9IGVsc2UgaWYgKHRzLmlzQ2FsbEV4cHJlc3Npb24oaW5uZXJOb2RlKSkge1xuICAgICAgICBsZXQgZXhwcmVzc2lvbjogdHMuRXhwcmVzc2lvbiA9IGlubmVyTm9kZS5leHByZXNzaW9uO1xuICAgICAgICB3aGlsZSAoZXhwcmVzc2lvbiAmJiB0cy5pc1BhcmVudGhlc2l6ZWRFeHByZXNzaW9uKGV4cHJlc3Npb24pKSB7XG4gICAgICAgICAgZXhwcmVzc2lvbiA9IGV4cHJlc3Npb24uZXhwcmVzc2lvbjtcbiAgICAgICAgfVxuICAgICAgICBpZiAoZXhwcmVzc2lvbikge1xuICAgICAgICAgIGlmICh0cy5pc0Z1bmN0aW9uRXhwcmVzc2lvbihleHByZXNzaW9uKSkge1xuICAgICAgICAgICAgLy8gU2tpcCBJSUZFJ3Mgd2l0aCBhcmd1bWVudHNcbiAgICAgICAgICAgIC8vIFRoaXMgY291bGQgYmUgaW1wcm92ZWQgdG8gY2hlY2sgaWYgdGhlcmUgYXJlIGFueSByZWZlcmVuY2VzIHRvIHZhcmlhYmxlc1xuICAgICAgICAgICAgaWYgKGlubmVyTm9kZS5hcmd1bWVudHMubGVuZ3RoID09PSAwKSB7XG4gICAgICAgICAgICAgIHRvcExldmVsRnVuY3Rpb25zLmFkZChub2RlKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgdG9wTGV2ZWxGdW5jdGlvbnMuYWRkKG5vZGUpO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cblxuICAgIHRzLmZvckVhY2hDaGlsZChpbm5lck5vZGUsIGNiKTtcbiAgfVxuXG4gIHRzLmZvckVhY2hDaGlsZChwYXJlbnROb2RlLCBjYik7XG5cbiAgcmV0dXJuIHRvcExldmVsRnVuY3Rpb25zO1xufVxuIl19
93
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prefix-functions.js","sourceRoot":"./","sources":["packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport * as ts from 'typescript';\nimport { addPureComment, hasPureComment } from '../helpers/ast-utils';\n\nexport function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.SourceFile> {\n  return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {\n    const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {\n\n      const topLevelFunctions = findTopLevelFunctions(sf);\n\n      const visitor: ts.Visitor = (node: ts.Node): ts.Node => {\n        // Add pure function comment to top level functions.\n        if (topLevelFunctions.has(node)) {\n          const newNode = addPureComment(node);\n\n          // Replace node with modified one.\n          return ts.visitEachChild(newNode, visitor, context);\n        }\n\n        // Otherwise return node as is.\n        return ts.visitEachChild(node, visitor, context);\n      };\n\n      return ts.visitNode(sf, visitor);\n    };\n\n    return transformer;\n  };\n}\n\nexport function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {\n  const topLevelFunctions = new Set<ts.Node>();\n\n  function cb(node: ts.Node) {\n    // Stop recursing into this branch if it's a definition construct.\n    // These are function expression, function declaration, class, or arrow function (lambda).\n    // The body of these constructs will not execute when loading the module, so we don't\n    // need to mark function calls inside them as pure.\n    // Class static initializers in ES2015 are an exception we don't cover. They would need similar\n    // processing as enums to prevent property setting from causing the class to be retained.\n    if (ts.isFunctionDeclaration(node)\n      || ts.isFunctionExpression(node)\n      || ts.isClassDeclaration(node)\n      || ts.isArrowFunction(node)\n      || ts.isMethodDeclaration(node)\n    ) {\n      return;\n    }\n\n    let noPureComment = !hasPureComment(node);\n    let innerNode = node;\n    while (innerNode && ts.isParenthesizedExpression(innerNode)) {\n      innerNode = innerNode.expression;\n      noPureComment = noPureComment && !hasPureComment(innerNode);\n    }\n\n    if (!innerNode) {\n      return;\n    }\n\n    if ((ts.isFunctionExpression(innerNode) || ts.isArrowFunction(innerNode))\n      && ts.isParenthesizedExpression(node)) {\n        // pure functions can be wrapped in parentizes\n        // we should not add pure comments to this sort of syntax.\n        // example var foo = (() => x)\n      return;\n    }\n\n    if (noPureComment) {\n      if (ts.isNewExpression(innerNode)) {\n        topLevelFunctions.add(node);\n      } else if (ts.isCallExpression(innerNode)) {\n        let expression: ts.Expression = innerNode.expression;\n        while (expression && ts.isParenthesizedExpression(expression)) {\n          expression = expression.expression;\n        }\n        if (expression) {\n          if (ts.isFunctionExpression(expression)) {\n            // Skip IIFE's with arguments\n            // This could be improved to check if there are any references to variables\n            if (innerNode.arguments.length === 0) {\n              topLevelFunctions.add(node);\n            }\n          } else {\n            topLevelFunctions.add(node);\n          }\n        }\n      }\n    }\n\n    ts.forEachChild(innerNode, cb);\n  }\n\n  ts.forEachChild(parentNode, cb);\n\n  return topLevelFunctions;\n}\n"]}