static-injector 1.0.10 → 2.0.0

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

@@ -0,0 +1,210 @@
+"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 __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;
+const typescript_1 = __importDefault(require("typescript"));
+/** Whether the current TypeScript version is after 4.8. */
+const IS_AFTER_TS_48 = isAfterVersion(4, 8);
+/**
+ * Updates a `ts.ParameterDeclaration` 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.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);
+/**
+ * Updates a `ts.ImportDeclaration` 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.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);
+/**
+ * Updates a `ts.ClassDeclaration` 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.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);
+/**
+ * Creates a `ts.ClassDeclaration` 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.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;
+/**
+ * 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`
+ * and `modifiers` arrays.
+ */
+function splitModifiers(allModifiers) {
+    if (!allModifiers) {
+        return [undefined, undefined];
+    }
+    const decorators = [];
+    const modifiers = [];
+    for (const current of allModifiers) {
+        if (typescript_1.default.isDecorator(current)) {
+            decorators.push(current);
+        }
+        else {
+            modifiers.push(current);
+        }
+    }
+    return [
+        decorators.length ? decorators : undefined,
+        modifiers.length ? modifiers : undefined,
+    ];
+}
+/** Checks if the current version of TypeScript is after the specified major/minor versions. */
+function isAfterVersion(targetMajor, targetMinor) {
+    const [major, minor] = typescript_1.default.versionMajorMinor
+        .split('.')
+        .map((part) => parseInt(part));
+    if (major < targetMajor) {
+        return false;
+    }
+    return major === targetMajor ? minor >= targetMinor : true;
+}

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

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/transform/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/transform/injectable-transform.js

@@ -1,31 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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.InjectableTransformerFactory = exports.createTransformer = void 0;
-const typescript_1 = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 const injectable_1 = require("./compiler-cli/src/ngtsc/annotations/src/injectable");
 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) {
@@ -48,8 +33,8 @@ class InjectableTransformerFactory {
         return typescript_1.default.visitEachChild(node, (node) => {
             let result = map.get(node);
             if (result) {
-                let decoratorList = node.decorators.filter((item) => item !== result.decorator);
-                return typescript_1.factory.updateClassDeclaration(node, decoratorList.length ? decoratorList : undefined, node.modifiers, node.name, node.typeParameters, node.heritageClauses, [
+                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, [
                     ...node.members.map((node) => this._stripAngularDecorators(node)),
                     ...result.members,
                 ]);
@@ -68,9 +53,9 @@ class InjectableTransformerFactory {
         let classMetadataMap = new Map();
         let write = new imports_1.NoopImportRewriter();
         let importManager = new translator_1.ImportManager(write);
-        node_Iteration_1.nodeIteration(sf, (node) => {
+        (0, node_Iteration_1.nodeIteration)(sf, (node) => {
             if (typescript_1.default.isClassDeclaration(node) &&
-                node.decorators &&
+                typescript_1.default.getDecorators(node) &&
                 this.reflectionHost.isClass(node)) {
                 const decorators = this.reflectionHost.getDecoratorsOfDeclaration(node);
                 let result = this.handler.detect(node, decorators);
@@ -95,9 +80,9 @@ class InjectableTransformerFactory {
         const members = [];
         for (const field of compileResult) {
             // Translate the initializer for the field into TS nodes.
-            const exprNode = translator_1.translateExpression(field.initializer, importManager);
+            const exprNode = (0, translator_1.translateExpression)(field.initializer, importManager);
             // Create a static property declaration for the new field.
-            const property = typescript_1.default.createProperty(undefined, [typescript_1.default.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], field.name, undefined, undefined, exprNode);
+            const property = (0, ts_compatibility_1.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.
@@ -107,7 +92,7 @@ class InjectableTransformerFactory {
                 /* hasTrailingNewLine */ false);
             }
             field.statements
-                .map((stmt) => translator_1.translateStatement(stmt, importManager))
+                .map((stmt) => (0, translator_1.translateStatement)(stmt, importManager))
                 .forEach((stmt) => statements.push(stmt));
             members.push(property);
         }
@@ -122,12 +107,12 @@ class InjectableTransformerFactory {
     _stripAngularDecorators(node) {
         if (typescript_1.default.isParameter(node)) {
             // Strip decorators from parameters (probably of the constructor).
-            node = typescript_1.default.updateParameter(node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer);
+            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);
         }
         else if (typescript_1.default.isConstructorDeclaration(node)) {
             // For constructors, strip decorators of the parameters.
             const parameters = node.parameters.map((param) => this._stripAngularDecorators(param));
-            node = typescript_1.default.updateConstructor(node, node.decorators, node.modifiers, parameters, node.body);
+            node = (0, ts_compatibility_1.updateConstructorDeclaration)(node, (0, ts_compatibility_1.getModifiers)(node), parameters, node.body);
         }
         return node;
     }
@@ -158,35 +143,33 @@ class InjectableTransformerFactory {
      * `undefined`.
      */
     _nonCoreDecoratorsOnly(node) {
+        const decorators = (0, ts_compatibility_1.getDecorators)(node);
         // Shortcut if the node has no decorators.
-        if (node.decorators === undefined) {
+        if (decorators === undefined) {
             return undefined;
         }
-        // Build a Set of the decorators on this node from static-injector.
+        // Build a Set of the decorators on this node from @angular/core.
         const coreDecorators = this._angularCoreDecorators(node);
-        if (coreDecorators.size === node.decorators.length) {
+        if (coreDecorators.size === decorators.length) {
             // If all decorators are to be removed, return `undefined`.
             return undefined;
         }
         else if (coreDecorators.size === 0) {
             // If no decorators need to be removed, return the original decorators array.
-            return node.decorators;
+            return nodeArrayFromDecoratorsArray(decorators);
         }
         // Filter out the core decorators.
-        const filtered = node.decorators.filter((dec) => !coreDecorators.has(dec));
+        const filtered = decorators.filter((dec) => !coreDecorators.has(dec));
         // If no decorators survive, return `undefined`. This can only happen if a core decorator is
         // repeated on the node.
         if (filtered.length === 0) {
             return undefined;
         }
         // Create a new `NodeArray` with the filtered decorators that sourcemaps back to the original.
-        const array = typescript_1.default.createNodeArray(filtered);
-        array.pos = node.decorators.pos;
-        array.end = node.decorators.end;
-        return array;
+        return nodeArrayFromDecoratorsArray(filtered);
     }
     updateStatements(node, importManager) {
-        return transform_1.addImports(importManager, node);
+        return (0, transform_1.addImports)(importManager, node);
     }
 }
 exports.InjectableTransformerFactory = InjectableTransformerFactory;
@@ -196,3 +179,12 @@ exports.InjectableTransformerFactory = InjectableTransformerFactory;
 function isFromAngularCore(decorator) {
     return (decorator.import !== null && decorator.import.from === 'static-injector');
 }
+/** Creates a `NodeArray` with the correct offsets from an array of decorators. */
+function nodeArrayFromDecoratorsArray(decorators) {
+    const array = typescript_1.default.factory.createNodeArray(decorators);
+    if (array.length > 0) {
+        array.pos = decorators[0].pos;
+        array.end = decorators[decorators.length - 1].end;
+    }
+    return array;
+}