static-injector 2.0.0 → 2.1.0

package/transform/compiler-cli/src/ngtsc/ts_compatibility/src/ts_cross_version_utils.js

@@ -10,170 +10,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combineModifiers = exports.getModifiers = exports.getDecorators = exports.updateConstructorDeclaration = exports.createSetAccessorDeclaration = exports.updateSetAccessorDeclaration = exports.createGetAccessorDeclaration = exports.updateGetAccessorDeclaration = exports.createPropertyDeclaration = exports.updatePropertyDeclaration = exports.createMethodDeclaration = exports.updateMethodDeclaration = exports.createClassDeclaration = exports.updateClassDeclaration = exports.updateImportDeclaration = exports.updateParameterDeclaration = void 0;
+exports.createIndexSignature = exports.createFunctionDeclaration = exports.createImportDeclaration = exports.createParameterDeclaration = void 0;
 const typescript_1 = __importDefault(require("typescript"));
-/** Whether the current TypeScript version is after 4.8. */
-const IS_AFTER_TS_48 = isAfterVersion(4, 8);
+/** Whether the current TypeScript version is after 4.9. */
+const IS_AFTER_TS_49 = isAfterVersion(4, 9);
 /**
- * Updates a `ts.ParameterDeclaration` declaration.
+ * Creates a `ts.ParameterDeclaration` declaration.
  *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
+ * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
  * We should remove it once we have dropped support for the older versions.
  */
-exports.updateParameterDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateParameterDeclaration
-    : (node, modifiers, dotDotDotToken, name, questionToken, type, initializer) => typescript_1.default.factory.updateParameterDeclaration(node, ...splitModifiers(modifiers), dotDotDotToken, name, questionToken, type, initializer);
+exports.createParameterDeclaration = IS_AFTER_TS_49
+    ? typescript_1.default.factory.createParameterDeclaration
+    : (modifiers, dotDotDotToken, name, questionToken, type, initializer) => typescript_1.default.factory.createParameterDeclaration(...splitModifiers(modifiers), dotDotDotToken, name, questionToken, type, initializer);
 /**
- * Updates a `ts.ImportDeclaration` declaration.
+ * Creates a `ts.ImportDeclaration` declaration.
  *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
+ * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
  * We should remove it once we have dropped support for the older versions.
  */
-exports.updateImportDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateImportDeclaration
-    : (node, modifiers, importClause, moduleSpecifier, assertClause) => typescript_1.default.factory.updateImportDeclaration(node, undefined, modifiers, importClause, moduleSpecifier, assertClause);
+exports.createImportDeclaration = IS_AFTER_TS_49
+    ? typescript_1.default.factory.createImportDeclaration
+    : (modifiers, importClause, moduleSpecifier, assertClause) => typescript_1.default.factory.createImportDeclaration(undefined, modifiers, importClause, moduleSpecifier, assertClause);
 /**
- * Updates a `ts.ClassDeclaration` declaration.
+ * Creates a `ts.FunctionDeclaration` declaration.
  *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
+ * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
  * We should remove it once we have dropped support for the older versions.
  */
-exports.updateClassDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateClassDeclaration
-    : (node, combinedModifiers, name, typeParameters, heritageClauses, members) => typescript_1.default.factory.updateClassDeclaration(node, ...splitModifiers(combinedModifiers), name, typeParameters, heritageClauses, members);
+exports.createFunctionDeclaration = IS_AFTER_TS_49
+    ? typescript_1.default.factory.createFunctionDeclaration
+    : (modifiers, asteriskToken, name, typeParameters, parameters, type, body) => typescript_1.default.factory.createFunctionDeclaration(...splitModifiers(modifiers), asteriskToken, name, typeParameters, parameters, type, body);
 /**
- * Creates a `ts.ClassDeclaration` declaration.
+ * Creates a `ts.IndexSignatureDeclaration` declaration.
  *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
+ * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
  * We should remove it once we have dropped support for the older versions.
  */
-exports.createClassDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.createClassDeclaration
-    : (combinedModifiers, name, typeParameters, heritageClauses, members) => typescript_1.default.factory.createClassDeclaration(...splitModifiers(combinedModifiers), name, typeParameters, heritageClauses, members);
-/**
- * Updates a `ts.MethodDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.updateMethodDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateMethodDeclaration
-    : (node, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) => typescript_1.default.factory.updateMethodDeclaration(node, ...splitModifiers(modifiers), asteriskToken, name, questionToken, typeParameters, parameters, type, body);
-/**
- * Creates a `ts.MethodDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createMethodDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.createMethodDeclaration
-    : (modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) => typescript_1.default.factory.createMethodDeclaration(...splitModifiers(modifiers), asteriskToken, name, questionToken, typeParameters, parameters, type, body);
-/**
- * Updates a `ts.PropertyDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.updatePropertyDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updatePropertyDeclaration
-    : (node, modifiers, name, questionOrExclamationToken, type, initializer) => typescript_1.default.factory.updatePropertyDeclaration(node, ...splitModifiers(modifiers), name, questionOrExclamationToken, type, initializer);
-/**
- * Creates a `ts.PropertyDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createPropertyDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.createPropertyDeclaration
-    : (modifiers, name, questionOrExclamationToken, type, initializer) => typescript_1.default.factory.createPropertyDeclaration(...splitModifiers(modifiers), name, questionOrExclamationToken, type, initializer);
-/**
- * Updates a `ts.GetAccessorDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.updateGetAccessorDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateGetAccessorDeclaration
-    : (node, modifiers, name, parameters, type, body) => typescript_1.default.factory.updateGetAccessorDeclaration(node, ...splitModifiers(modifiers), name, parameters, type, body);
-/**
- * Creates a `ts.GetAccessorDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createGetAccessorDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.createGetAccessorDeclaration
-    : (modifiers, name, parameters, type, body) => typescript_1.default.factory.createGetAccessorDeclaration(...splitModifiers(modifiers), name, parameters, type, body);
-/**
- * Updates a `ts.GetAccessorDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.updateSetAccessorDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateSetAccessorDeclaration
-    : (node, modifiers, name, parameters, body) => typescript_1.default.factory.updateSetAccessorDeclaration(node, ...splitModifiers(modifiers), name, parameters, body);
-/**
- * Creates a `ts.GetAccessorDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createSetAccessorDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.createSetAccessorDeclaration
-    : (modifiers, name, parameters, body) => typescript_1.default.factory.createSetAccessorDeclaration(...splitModifiers(modifiers), name, parameters, body);
-/**
- * Updates a `ts.ConstructorDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.updateConstructorDeclaration = IS_AFTER_TS_48
-    ? typescript_1.default.factory.updateConstructorDeclaration
-    : (node, modifiers, parameters, body) => typescript_1.default.factory.updateConstructorDeclaration(node, undefined, modifiers, parameters, body);
-/**
- * Gets the decorators that have been applied to a node.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.getDecorators = IS_AFTER_TS_48
-    ? typescript_1.default.getDecorators
-    : (node) => node.decorators;
-/**
- * Gets the modifiers that have been set on a node.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.getModifiers = IS_AFTER_TS_48
-    ? typescript_1.default.getModifiers
-    : (node) => node.modifiers;
-/**
- * Combines an optional array of decorators with an optional array of modifiers into a single
- * `ts.ModifierLike` array. Used in version of TypeScript after 4.8 where the `decorators` and
- * `modifiers` arrays have been combined.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.8.
- * We should remove it once we have dropped support for the older versions.
- */
-function combineModifiers(decorators, modifiers) {
-    const hasDecorators = decorators === null || decorators === void 0 ? void 0 : decorators.length;
-    const hasModifiers = modifiers === null || modifiers === void 0 ? void 0 : modifiers.length;
-    // This function can be written more compactly, but it is somewhat performance-sensitive
-    // so we have some additional logic only to create new arrays when necessary.
-    if (hasDecorators && hasModifiers) {
-        return [...decorators, ...modifiers];
-    }
-    if (hasDecorators && !hasModifiers) {
-        return decorators;
-    }
-    if (hasModifiers && !hasDecorators) {
-        return modifiers;
-    }
-    return undefined;
-}
-exports.combineModifiers = combineModifiers;
+exports.createIndexSignature = IS_AFTER_TS_49
+    ? typescript_1.default.factory.createIndexSignature
+    : (modifiers, parameters, type) => typescript_1.default.factory.createIndexSignature(modifiers, parameters, type);
 /**
  * Splits a `ModifierLike` into two arrays: decorators and modifiers. Used for backwards
  * compatibility with TS 4.7 and below where most factory functions require separate `decorators`

package/transform/compiler-cli/src/ngtsc/util/src/typescript.d.ts

@@ -1,11 +1,4 @@
-/**
- * @license
- * Copyright Google LLC 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";
+import ts from 'typescript';
 export declare function identifierOfNode(decl: ts.Node & {
     name?: ts.Node;
 }): ts.Identifier | null;

package/transform/compiler-cli/src/ngtsc/util/src/typescript.js

@@ -1,39 +1,12 @@
 "use strict";
-/**
- * @license
- * Copyright Google LLC 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
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.identifierOfNode = void 0;
-const ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 function identifierOfNode(decl) {
-    if (decl.name !== undefined && ts.isIdentifier(decl.name)) {
+    if (decl.name !== undefined && typescript_1.default.isIdentifier(decl.name)) {
         return decl.name;
     }
     else {

package/transform/injectable-transform.js

@@ -10,7 +10,6 @@ const imports_1 = require("./compiler-cli/src/ngtsc/imports");
 const reflection_1 = require("./compiler-cli/src/ngtsc/reflection");
 const transform_1 = require("./compiler-cli/src/ngtsc/transform");
 const translator_1 = require("./compiler-cli/src/ngtsc/translator");
-const ts_compatibility_1 = require("./compiler-cli/src/ngtsc/ts_compatibility");
 const node_Iteration_1 = require("./node-Iteration");
 const NO_DECORATORS = new Set();
 function createTransformer(program, options) {
@@ -33,8 +32,18 @@ class InjectableTransformerFactory {
         return typescript_1.default.visitEachChild(node, (node) => {
             let result = map.get(node);
             if (result) {
-                let decoratorList = (0, ts_compatibility_1.getDecorators)(node).filter((item) => item !== result.decorator);
-                return (0, ts_compatibility_1.updateClassDeclaration)(node, (0, ts_compatibility_1.combineModifiers)(decoratorList.length ? decoratorList : undefined, (0, ts_compatibility_1.getModifiers)(node)), node.name, node.typeParameters, node.heritageClauses, [
+                const filteredDecorators = 
+                // Remove the decorator which triggered this compilation, leaving the others alone.
+                maybeFilterDecorator(typescript_1.default.getDecorators(node), [result.decorator]);
+                const nodeModifiers = typescript_1.default.getModifiers(node);
+                let updatedModifiers;
+                if ((filteredDecorators === null || filteredDecorators === void 0 ? void 0 : filteredDecorators.length) || (nodeModifiers === null || nodeModifiers === void 0 ? void 0 : nodeModifiers.length)) {
+                    updatedModifiers = [
+                        ...(filteredDecorators || []),
+                        ...(nodeModifiers || []),
+                    ];
+                }
+                return typescript_1.default.factory.updateClassDeclaration(node, updatedModifiers, node.name, node.typeParameters, node.heritageClauses, [
                     ...node.members.map((node) => this._stripAngularDecorators(node)),
                     ...result.members,
                 ]);
@@ -82,7 +91,7 @@ class InjectableTransformerFactory {
             // Translate the initializer for the field into TS nodes.
             const exprNode = (0, translator_1.translateExpression)(field.initializer, importManager);
             // Create a static property declaration for the new field.
-            const property = (0, ts_compatibility_1.createPropertyDeclaration)([typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], field.name, undefined, undefined, exprNode);
+            const property = typescript_1.default.factory.createPropertyDeclaration([typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], field.name, undefined, undefined, exprNode);
             if (false) {
                 // Closure compiler transforms the form `Service.ɵprov = X` into `Service$ɵprov = X`. To
                 // prevent this transformation, such assignments need to be annotated with @nocollapse.
@@ -105,14 +114,24 @@ class InjectableTransformerFactory {
      * as parameters of constructors.
      */
     _stripAngularDecorators(node) {
+        const modifiers = typescript_1.default.canHaveModifiers(node)
+            ? typescript_1.default.getModifiers(node)
+            : undefined;
+        const nonCoreDecorators = typescript_1.default.canHaveDecorators(node)
+            ? this._nonCoreDecoratorsOnly(node)
+            : undefined;
+        const combinedModifiers = [
+            ...(nonCoreDecorators || []),
+            ...(modifiers || []),
+        ];
         if (typescript_1.default.isParameter(node)) {
             // Strip decorators from parameters (probably of the constructor).
-            node = (0, ts_compatibility_1.updateParameterDeclaration)(node, (0, ts_compatibility_1.combineModifiers)(this._nonCoreDecoratorsOnly(node), (0, ts_compatibility_1.getModifiers)(node)), node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer);
+            node = typescript_1.default.factory.updateParameterDeclaration(node, combinedModifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer);
         }
         else if (typescript_1.default.isConstructorDeclaration(node)) {
             // For constructors, strip decorators of the parameters.
             const parameters = node.parameters.map((param) => this._stripAngularDecorators(param));
-            node = (0, ts_compatibility_1.updateConstructorDeclaration)(node, (0, ts_compatibility_1.getModifiers)(node), parameters, node.body);
+            node = typescript_1.default.factory.updateConstructorDeclaration(node, modifiers, parameters, node.body);
         }
         return node;
     }
@@ -143,7 +162,7 @@ class InjectableTransformerFactory {
      * `undefined`.
      */
     _nonCoreDecoratorsOnly(node) {
-        const decorators = (0, ts_compatibility_1.getDecorators)(node);
+        const decorators = typescript_1.default.getDecorators(node);
         // Shortcut if the node has no decorators.
         if (decorators === undefined) {
             return undefined;
@@ -188,3 +207,13 @@ function nodeArrayFromDecoratorsArray(decorators) {
     }
     return array;
 }
+function maybeFilterDecorator(decorators, toRemove) {
+    if (decorators === undefined) {
+        return undefined;
+    }
+    const filtered = decorators.filter((dec) => toRemove.find((decToRemove) => typescript_1.default.getOriginalNode(dec) === decToRemove) === undefined);
+    if (filtered.length === 0) {
+        return undefined;
+    }
+    return typescript_1.default.factory.createNodeArray(filtered);
+}