@ngtools/webpack 17.0.0-next.0 → 17.0.0-next.3

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ngtools/webpack",
3
- "version": "17.0.0-next.0",
3
+ "version": "17.0.0-next.3",
4
4
  "description": "Webpack plugin that AoT compiles your Angular components and modules.",
5
5
  "main": "./src/index.js",
6
6
  "typings": "src/index.d.ts",
@@ -37,20 +37,21 @@ function removeIvyJitSupportCalls(classMetadata, ngModuleScope, getTypeChecker)
37
37
  return (context) => {
38
38
  const removedNodes = [];
39
39
  const visitNode = (node) => {
40
- const innerStatement = ts.isExpressionStatement(node) && getIifeStatement(node);
41
- if (innerStatement) {
40
+ const innerExpression = ts.isExpressionStatement(node) ? getIifeExpression(node) : null;
41
+ if (innerExpression) {
42
42
  if (ngModuleScope &&
43
- ts.isBinaryExpression(innerStatement.expression) &&
44
- isIvyPrivateCallExpression(innerStatement.expression.right, 'ɵɵsetNgModuleScope')) {
45
- removedNodes.push(innerStatement);
43
+ ts.isBinaryExpression(innerExpression) &&
44
+ isIvyPrivateCallExpression(innerExpression.right, 'ɵɵsetNgModuleScope')) {
45
+ removedNodes.push(innerExpression);
46
46
  return undefined;
47
47
  }
48
48
  if (classMetadata) {
49
- const expression = ts.isBinaryExpression(innerStatement.expression)
50
- ? innerStatement.expression.right
51
- : innerStatement.expression;
52
- if (isIvyPrivateCallExpression(expression, 'ɵsetClassMetadata')) {
53
- removedNodes.push(innerStatement);
49
+ const expression = ts.isBinaryExpression(innerExpression)
50
+ ? innerExpression.right
51
+ : innerExpression;
52
+ if (isIvyPrivateCallExpression(expression, 'ɵsetClassMetadata') ||
53
+ isIvyPrivateCallExpression(expression, 'ɵsetClassMetadataAsync')) {
54
+ removedNodes.push(innerExpression);
54
55
  return undefined;
55
56
  }
56
57
  }
@@ -76,7 +77,7 @@ function removeIvyJitSupportCalls(classMetadata, ngModuleScope, getTypeChecker)
76
77
  }
77
78
  exports.removeIvyJitSupportCalls = removeIvyJitSupportCalls;
78
79
  // Each Ivy private call expression is inside an IIFE
79
- function getIifeStatement(exprStmt) {
80
+ function getIifeExpression(exprStmt) {
80
81
  const expression = exprStmt.expression;
81
82
  if (!expression || !ts.isCallExpression(expression) || expression.arguments.length !== 0) {
82
83
  return null;
@@ -86,9 +87,12 @@ function getIifeStatement(exprStmt) {
86
87
  return null;
87
88
  }
88
89
  const funExpr = parenExpr.expression.expression;
89
- if (!ts.isFunctionExpression(funExpr)) {
90
+ if (!ts.isFunctionExpression(funExpr) && !ts.isArrowFunction(funExpr)) {
90
91
  return null;
91
92
  }
93
+ if (!ts.isBlock(funExpr.body)) {
94
+ return funExpr.body;
95
+ }
92
96
  const innerStmts = funExpr.body.statements;
93
97
  if (innerStmts.length !== 1) {
94
98
  return null;
@@ -97,7 +101,7 @@ function getIifeStatement(exprStmt) {
97
101
  if (!ts.isExpressionStatement(innerExprStmt)) {
98
102
  return null;
99
103
  }
100
- return innerExprStmt;
104
+ return innerExprStmt.expression;
101
105
  }
102
106
  function isIvyPrivateCallExpression(expression, name) {
103
107
  // Now we're in the IIFE and have the inner expression statement. We can check if it matches
@@ -109,9 +113,9 @@ function isIvyPrivateCallExpression(expression, name) {
109
113
  if (!ts.isPropertyAccessExpression(propAccExpr)) {
110
114
  return false;
111
115
  }
112
- if (propAccExpr.name.text != name) {
116
+ if (propAccExpr.name.text !== name) {
113
117
  return false;
114
118
  }
115
119
  return true;
116
120
  }
117
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"remove-ivy-jit-support-calls.js","sourceRoot":"","sources":["../../../../../../../../packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC 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 */\n\nimport * as ts from 'typescript';\nimport { elideImports } from './elide_imports';\n\nexport function removeIvyJitSupportCalls(\n  classMetadata: boolean,\n  ngModuleScope: boolean,\n  getTypeChecker: () => ts.TypeChecker,\n): ts.TransformerFactory<ts.SourceFile> {\n  return (context: ts.TransformationContext) => {\n    const removedNodes: ts.Node[] = [];\n\n    const visitNode: ts.Visitor = (node: ts.Node) => {\n      const innerStatement = ts.isExpressionStatement(node) && getIifeStatement(node);\n      if (innerStatement) {\n        if (\n          ngModuleScope &&\n          ts.isBinaryExpression(innerStatement.expression) &&\n          isIvyPrivateCallExpression(innerStatement.expression.right, 'ɵɵsetNgModuleScope')\n        ) {\n          removedNodes.push(innerStatement);\n\n          return undefined;\n        }\n\n        if (classMetadata) {\n          const expression = ts.isBinaryExpression(innerStatement.expression)\n            ? innerStatement.expression.right\n            : innerStatement.expression;\n          if (isIvyPrivateCallExpression(expression, 'ɵsetClassMetadata')) {\n            removedNodes.push(innerStatement);\n\n            return undefined;\n          }\n        }\n      }\n\n      return ts.visitEachChild(node, visitNode, context);\n    };\n\n    return (sourceFile: ts.SourceFile) => {\n      let updatedSourceFile = ts.visitEachChild(sourceFile, visitNode, context);\n\n      if (removedNodes.length > 0) {\n        // Remove any unused imports\n        const importRemovals = elideImports(\n          updatedSourceFile,\n          removedNodes,\n          getTypeChecker,\n          context.getCompilerOptions(),\n        );\n        if (importRemovals.size > 0) {\n          updatedSourceFile = ts.visitEachChild(\n            updatedSourceFile,\n            function visitForRemoval(node): ts.Node | undefined {\n              return importRemovals.has(node)\n                ? undefined\n                : ts.visitEachChild(node, visitForRemoval, context);\n            },\n            context,\n          );\n        }\n      }\n\n      return updatedSourceFile;\n    };\n  };\n}\n\n// Each Ivy private call expression is inside an IIFE\nfunction getIifeStatement(exprStmt: ts.ExpressionStatement): null | ts.ExpressionStatement {\n  const expression = exprStmt.expression;\n  if (!expression || !ts.isCallExpression(expression) || expression.arguments.length !== 0) {\n    return null;\n  }\n\n  const parenExpr = expression;\n  if (!ts.isParenthesizedExpression(parenExpr.expression)) {\n    return null;\n  }\n\n  const funExpr = parenExpr.expression.expression;\n  if (!ts.isFunctionExpression(funExpr)) {\n    return null;\n  }\n\n  const innerStmts = funExpr.body.statements;\n  if (innerStmts.length !== 1) {\n    return null;\n  }\n\n  const innerExprStmt = innerStmts[0];\n  if (!ts.isExpressionStatement(innerExprStmt)) {\n    return null;\n  }\n\n  return innerExprStmt;\n}\n\nfunction isIvyPrivateCallExpression(expression: ts.Expression, name: string) {\n  // Now we're in the IIFE and have the inner expression statement. We can check if it matches\n  // a private Ivy call.\n  if (!ts.isCallExpression(expression)) {\n    return false;\n  }\n\n  const propAccExpr = expression.expression;\n  if (!ts.isPropertyAccessExpression(propAccExpr)) {\n    return false;\n  }\n\n  if (propAccExpr.name.text != name) {\n    return false;\n  }\n\n  return true;\n}\n"]}
121
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"remove-ivy-jit-support-calls.js","sourceRoot":"","sources":["../../../../../../../../packages/ngtools/webpack/src/transformers/remove-ivy-jit-support-calls.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC 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 */\n\nimport * as ts from 'typescript';\nimport { elideImports } from './elide_imports';\n\nexport function removeIvyJitSupportCalls(\n  classMetadata: boolean,\n  ngModuleScope: boolean,\n  getTypeChecker: () => ts.TypeChecker,\n): ts.TransformerFactory<ts.SourceFile> {\n  return (context: ts.TransformationContext) => {\n    const removedNodes: ts.Node[] = [];\n\n    const visitNode: ts.Visitor = (node: ts.Node) => {\n      const innerExpression = ts.isExpressionStatement(node) ? getIifeExpression(node) : null;\n      if (innerExpression) {\n        if (\n          ngModuleScope &&\n          ts.isBinaryExpression(innerExpression) &&\n          isIvyPrivateCallExpression(innerExpression.right, 'ɵɵsetNgModuleScope')\n        ) {\n          removedNodes.push(innerExpression);\n\n          return undefined;\n        }\n\n        if (classMetadata) {\n          const expression = ts.isBinaryExpression(innerExpression)\n            ? innerExpression.right\n            : innerExpression;\n          if (\n            isIvyPrivateCallExpression(expression, 'ɵsetClassMetadata') ||\n            isIvyPrivateCallExpression(expression, 'ɵsetClassMetadataAsync')\n          ) {\n            removedNodes.push(innerExpression);\n\n            return undefined;\n          }\n        }\n      }\n\n      return ts.visitEachChild(node, visitNode, context);\n    };\n\n    return (sourceFile: ts.SourceFile) => {\n      let updatedSourceFile = ts.visitEachChild(sourceFile, visitNode, context);\n\n      if (removedNodes.length > 0) {\n        // Remove any unused imports\n        const importRemovals = elideImports(\n          updatedSourceFile,\n          removedNodes,\n          getTypeChecker,\n          context.getCompilerOptions(),\n        );\n        if (importRemovals.size > 0) {\n          updatedSourceFile = ts.visitEachChild(\n            updatedSourceFile,\n            function visitForRemoval(node): ts.Node | undefined {\n              return importRemovals.has(node)\n                ? undefined\n                : ts.visitEachChild(node, visitForRemoval, context);\n            },\n            context,\n          );\n        }\n      }\n\n      return updatedSourceFile;\n    };\n  };\n}\n\n// Each Ivy private call expression is inside an IIFE\nfunction getIifeExpression(exprStmt: ts.ExpressionStatement): null | ts.Expression {\n  const expression = exprStmt.expression;\n  if (!expression || !ts.isCallExpression(expression) || expression.arguments.length !== 0) {\n    return null;\n  }\n\n  const parenExpr = expression;\n  if (!ts.isParenthesizedExpression(parenExpr.expression)) {\n    return null;\n  }\n\n  const funExpr = parenExpr.expression.expression;\n  if (!ts.isFunctionExpression(funExpr) && !ts.isArrowFunction(funExpr)) {\n    return null;\n  }\n\n  if (!ts.isBlock(funExpr.body)) {\n    return funExpr.body;\n  }\n\n  const innerStmts = funExpr.body.statements;\n  if (innerStmts.length !== 1) {\n    return null;\n  }\n\n  const innerExprStmt = innerStmts[0];\n  if (!ts.isExpressionStatement(innerExprStmt)) {\n    return null;\n  }\n\n  return innerExprStmt.expression;\n}\n\nfunction isIvyPrivateCallExpression(expression: ts.Expression, name: string) {\n  // Now we're in the IIFE and have the inner expression statement. We can check if it matches\n  // a private Ivy call.\n  if (!ts.isCallExpression(expression)) {\n    return false;\n  }\n\n  const propAccExpr = expression.expression;\n  if (!ts.isPropertyAccessExpression(propAccExpr)) {\n    return false;\n  }\n\n  if (propAccExpr.name.text !== name) {\n    return false;\n  }\n\n  return true;\n}\n"]}