@angular-devkit/build-optimizer 0.803.0-rc.0 → 0.803.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/build-optimizer",
-  "version": "0.803.0-rc.0",
+  "version": "0.803.3",
   "description": "Angular Build Optimizer",
   "experimental": true,
   "main": "src/index.js",

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

@@ -3,3 +3,13 @@ export declare function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind:
 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;
+/**
+ * In FESM's when not using `importHelpers` there might be multiple in the same file.
+  @example
+  ```
+  var __decorate$1 = '';
+  var __decorate$2 = '';
+  ```
+ * @returns Helper name without the '$' and number suffix or `undefined` if it's not a helper.
+ */
+export declare function getCleanHelperName(name: string): string | undefined;

package/src/helpers/ast-utils.js

@@ -42,3 +42,21 @@ function isHelperName(name) {
     return tslibHelpers.has(name);
 }
 exports.isHelperName = isHelperName;
+/**
+ * In FESM's when not using `importHelpers` there might be multiple in the same file.
+  @example
+  ```
+  var __decorate$1 = '';
+  var __decorate$2 = '';
+  ```
+ * @returns Helper name without the '$' and number suffix or `undefined` if it's not a helper.
+ */
+function getCleanHelperName(name) {
+    const parts = name.split('$');
+    const cleanName = parts[0];
+    if (parts.length > 2 || (parts.length === 2 && isNaN(+parts[1]))) {
+        return undefined;
+    }
+    return isHelperName(cleanName) ? cleanName : undefined;
+}
+exports.getCleanHelperName = getCleanHelperName;

package/src/transforms/import-tslib.js

@@ -13,7 +13,7 @@ const ast_utils_1 = require("../helpers/ast-utils");
  * @deprecated From 0.9.0
  */
 function testImportTslib(content) {
-    const regex = /var (__extends|__decorate|__metadata|__param) = \(.*\r?\n\s+(.*\r?\n)*\s*\};/;
+    const regex = /var (__extends|__decorate|__metadata|__param)(\$\d+)? = \(.*\r?\n\s+(.*\r?\n)*\s*\};/;
     return regex.test(content);
 }
 exports.testImportTslib = testImportTslib;
@@ -29,9 +29,11 @@ function getImportTslibTransformer() {
                     const declarations = node.declarationList.declarations;
                     if (declarations.length === 1 && ts.isIdentifier(declarations[0].name)) {
                         const name = declarations[0].name.text;
-                        if (ast_utils_1.isHelperName(name)) {
+                        const helperName = ast_utils_1.getCleanHelperName(name);
+                        if (helperName) {
                             // TODO: maybe add a few more checks, like checking the first part of the assignment.
-                            const tslibImport = createTslibImport(name, useRequire);
+                            const alias = name === helperName ? undefined : name;
+                            const tslibImport = createTslibImport(helperName, alias, useRequire);
                             tslibImports.push(tslibImport);
                             return undefined;
                         }
@@ -52,19 +54,21 @@ function getImportTslibTransformer() {
     };
 }
 exports.getImportTslibTransformer = getImportTslibTransformer;
-function createTslibImport(name, useRequire = false) {
+function createTslibImport(name, aliases, useRequire = false) {
     if (useRequire) {
         // Use `var __helper = /*@__PURE__*/ require("tslib").__helper`.
         const requireCall = ts.createCall(ts.createIdentifier('require'), undefined, [ts.createLiteral('tslib')]);
         const pureRequireCall = ts.addSyntheticLeadingComment(requireCall, ts.SyntaxKind.MultiLineCommentTrivia, '@__PURE__', false);
         const helperAccess = ts.createPropertyAccess(pureRequireCall, name);
-        const variableDeclaration = ts.createVariableDeclaration(name, undefined, helperAccess);
+        const variableDeclaration = ts.createVariableDeclaration(aliases || name, undefined, helperAccess);
         const variableStatement = ts.createVariableStatement(undefined, [variableDeclaration]);
         return variableStatement;
     }
     else {
         // Use `import { __helper } from "tslib"`.
-        const namedImports = ts.createNamedImports([ts.createImportSpecifier(undefined, ts.createIdentifier(name))]);
+        const namedImports = ts.createNamedImports([
+            ts.createImportSpecifier(aliases ? ts.createIdentifier(name) : undefined, ts.createIdentifier(aliases || name)),
+        ]);
         const importClause = ts.createImportClause(undefined, namedImports);
         const newNode = ts.createImportDeclaration(undefined, undefined, importClause, ts.createLiteral('tslib'));
         return newNode;

package/src/transforms/prefix-functions.js

@@ -66,7 +66,7 @@ function findTopLevelFunctions(parentNode) {
             }
             else if (ts.isCallExpression(innerNode)) {
                 let expression = innerNode.expression;
-                if (ts.isIdentifier(expression) && ast_utils_1.isHelperName(expression.text)) {
+                if (ts.isIdentifier(expression) && ast_utils_1.getCleanHelperName(expression.text)) {
                     return;
                 }
                 while (expression && ts.isParenthesizedExpression(expression)) {